Merge branch 'BeeStation:master' into antag-per-character

BeeStation · Sep 13, 2023 · 5fe66e0 · 5fe66e0
2 parents 43653db + 480a23a
commit 5fe66e0
Show file tree

Hide file tree

Showing 124 changed files with 45,155 additions and 43,360 deletions.
diff --git a/_maps/atlas.json b/_maps/atlas.json
@@ -21,7 +21,6 @@
     "shuttles": {
         "cargo": "cargo_atlas",
         "ferry": "ferry_fancy",
-        "arrival": "arrival_atlas",
         "emergency": "emergency_atlas"
     },
     "mine_disable": 1,