diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm
index e73192cd68..ff66dd7e39 100644
--- a/maps/southern_cross/southern_cross-1.dmm
+++ b/maps/southern_cross/southern_cross-1.dmm
@@ -54,7 +54,6 @@
 /turf/space,
 /area/space)
 "aag" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
 	d1 = 1;
@@ -2779,9 +2778,6 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 9
-	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/monotile,
 /area/hallway/primary/firstdeck/auxdockfore)
@@ -5018,7 +5014,6 @@
 "ayf" = (
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/fore)
 "ayg" = (
@@ -5573,9 +5568,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/fore)
 "aBt" = (
@@ -5586,12 +5578,6 @@
 /obj/machinery/door/airlock/glass_mining,
 /turf/simulated/floor/tiled/steel_grid,
 /area/quartermaster/mininglockerroom)
-"aBy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 10
-	},
-/turf/simulated/floor/tiled,
-/area/hallway/primary/firstdeck/fore)
 "aBD" = (
 /obj/structure/sign/directions/engineering{
 	dir = 8;
@@ -5644,11 +5630,6 @@
 	},
 /turf/simulated/floor/grass,
 /area/hallway/primary/firstdeck/vaultlobby)
-"aBW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/random/junk,
-/turf/simulated/floor/plating,
-/area/maintenance/firstdeck/forestarboard)
 "aBX" = (
 /obj/structure/bed/chair/sofa{
 	dir = 8
@@ -6489,22 +6470,9 @@
 /turf/simulated/floor/wood,
 /area/hallway/primary/firstdeck/vaultlobby)
 "aFI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
 /obj/structure/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
 /obj/random/trash,
+/obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/forestarboard)
 "aFL" = (
@@ -6613,12 +6581,10 @@
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "aGj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/structure/catwalk,
+/obj/effect/wingrille_spawn/reinforced,
+/obj/machinery/door/firedoor/border_only,
 /turf/simulated/floor/plating,
-/area/maintenance/firstdeck/forestarboard)
+/area/hallway/primary/firstdeck/auxdockfore)
 "aGk" = (
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/wingrille_spawn/reinforced,
@@ -7107,7 +7073,6 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/binary/passive_gate{
-	dir = 1;
 	regulate_mode = 0;
 	unlocked = 1
 	},
@@ -7486,18 +7451,8 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/vaultcheckpoint)
 "aLa" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/structure/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/maintenance/firstdeck/forestarboard)
-"aLe" = (
-/obj/structure/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/forestarboard)
 "aLf" = (
@@ -7749,13 +7704,6 @@
 /obj/machinery/computer/timeclock/premade/east,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/fore)
-"aMe" = (
-/obj/machinery/atmospherics/binary/passive_gate{
-	regulate_mode = 0;
-	unlocked = 1
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/firstdeck/forestarboard)
 "aMf" = (
 /obj/structure/ore_box,
 /turf/simulated/floor/plating,
@@ -7901,14 +7849,6 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/security/checkpoint3)
-"aNd" = (
-/obj/machinery/deployable/barrier,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/security/checkpoint3)
 "aNe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -8201,21 +8141,6 @@
 "aOh" = (
 /turf/simulated/wall/r_wall,
 /area/security/nuke_storage)
-"aOi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/firstdeck/forestarboard)
-"aOj" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/maintenance/firstdeck/forestarboard)
 "aOm" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -8226,8 +8151,8 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "aOo" = (
-/obj/machinery/atmospherics/valve/shutoff{
-	name = "Deck 1 Fore Starboard automatic shutoff valve"
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 10
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/forestarboard)
@@ -9194,7 +9119,9 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/vaultcheckpoint)
 "aUG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/forestarboard)
 "aUH" = (
@@ -9815,7 +9742,8 @@
 /obj/effect/floor_decal/industrial/warning/corner,
 /obj/machinery/atmospherics/binary/passive_gate{
 	regulate_mode = 0;
-	unlocked = 1
+	unlocked = 1;
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/aftstarboard)
@@ -9945,47 +9873,26 @@
 /turf/simulated/floor,
 /area/hallway/primary/firstdeck/auxdockaft)
 "bhj" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/machinery/atmospherics/portables_connector{
+	dir = 4
 	},
+/obj/machinery/portable_atmospherics/canister/air/airlock,
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/forestarboard)
 "bhn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/random/junk,
+/obj/machinery/atmospherics/pipe/manifold/hidden,
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/forestarboard)
 "bjk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+/obj/machinery/atmospherics/binary/pump/on{
+	dir = 8;
+	target_pressure = 200
 	},
 /obj/structure/cable{
 	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
+	d2 = 4;
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/forestarboard)
@@ -10002,27 +9909,21 @@
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/centralstarboard)
 "bkk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/random/trash,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/forestarboard)
 "bmq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -10055,9 +9956,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
 /obj/structure/cable{
 	d1 = 2;
 	d2 = 8;
@@ -10827,7 +10725,6 @@
 /area/maintenance/firstdeck/aftstarboard)
 "bUU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -11137,6 +11034,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/steel_grid,
 /area/hallway/secondary/escape/firstdeck/ep_aftstarboard)
 "ciy" = (
@@ -11487,7 +11385,6 @@
 /area/hallway/secondary/escape/firstdeck/ep_starboard)
 "czv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -12048,7 +11945,6 @@
 /area/hallway/primary/firstdeck/apcenter)
 "dgH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -12962,7 +12858,6 @@
 /area/storage/emergency_storage/firstdeck/fs_emergency)
 "dWe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -13495,7 +13390,6 @@
 /area/hallway/primary/firstdeck/fscenter)
 "dXo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -13875,17 +13769,6 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/forestarboard)
-"dYu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/firstdeck/forestarboard)
 "dYv" = (
 /obj/structure/table/rack{
 	dir = 8;
@@ -14974,7 +14857,6 @@
 /area/maintenance/firstdeck/forestarboard)
 "eax" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -17224,13 +17106,6 @@
 	},
 /turf/space,
 /area/space)
-"grI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/random/trash,
-/turf/simulated/floor/plating,
-/area/maintenance/firstdeck/forestarboard)
 "gtw" = (
 /obj/structure/table/rack{
 	dir = 8;
@@ -18882,18 +18757,6 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/tcomm/entrance)
-"itB" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 9
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/firstdeck/forestarboard)
 "itQ" = (
 /obj/structure/closet,
 /obj/random/maintenance/clean,
@@ -20790,7 +20653,6 @@
 /area/hallway/primary/firstdeck/aft)
 "kzN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -22035,9 +21897,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
 /obj/structure/cable{
 	d1 = 2;
 	d2 = 4;
@@ -22100,9 +21959,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/storage/tech)
 "mkd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
@@ -22985,13 +22841,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /turf/simulated/floor/tiled,
 /area/tcomm/computer)
-"nbn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/random/junk,
-/turf/simulated/floor/plating,
-/area/maintenance/firstdeck/forestarboard)
 "nbu" = (
 /turf/simulated/wall/r_wall,
 /area/hallway/primary/firstdeck/aft)
@@ -24837,7 +24686,6 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/aft)
 "poy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
 	d1 = 1;
@@ -25710,9 +25558,6 @@
 	req_access = null;
 	req_one_access = null
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/forestarboard)
 "qgf" = (
@@ -26156,7 +26001,6 @@
 /turf/simulated/floor/plating,
 /area/hallway/primary/firstdeck/starboard)
 "qDn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
 	d1 = 1;
@@ -27136,7 +26980,6 @@
 "rKO" = (
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -28717,7 +28560,6 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "tvk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
 	d1 = 1;
@@ -29923,7 +29765,6 @@
 /area/hallway/primary/firstdeck/starboard)
 "uIa" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/structure/cable{
 	d1 = 2;
 	d2 = 4;
@@ -29939,6 +29780,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/hallway/primary/firstdeck/starboard)
 "uIb" = (
@@ -32505,9 +32349,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/fore)
 "xrX" = (
@@ -32974,7 +32815,6 @@
 	req_access = null;
 	req_one_access = null
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/plating,
 /area/hallway/primary/firstdeck/fore)
 "xVJ" = (
@@ -63365,7 +63205,7 @@ fBA
 fUB
 fBA
 aTh
-rmj
+bhg
 aTl
 aWw
 aaa
@@ -65615,7 +65455,7 @@ xrX
 aaf
 aaf
 abt
-abz
+aem
 aee
 ahw
 alf
@@ -65874,7 +65714,7 @@ aaa
 aaa
 abt
 aap
-aem
+aGj
 ahK
 aap
 aap
@@ -67945,11 +67785,11 @@ aap
 asl
 aww
 ayh
-aBy
-avJ
+aJz
+aJz
 xVH
-aBW
-kDc
+aVe
+bnt
 aCd
 aCd
 aCd
@@ -68207,7 +68047,7 @@ sCU
 qQM
 qQM
 qQM
-grI
+ppy
 awx
 aCd
 ppy
@@ -68260,7 +68100,7 @@ dYX
 eae
 gYy
 kLb
-aNd
+kLb
 aNY
 aRr
 xiD
@@ -68465,7 +68305,7 @@ amk
 aEE
 aBU
 qQM
-aOi
+bnt
 bRj
 aCd
 bnt
@@ -68723,7 +68563,7 @@ amk
 aFd
 aAT
 qQM
-aOi
+bnt
 pWz
 aCd
 bnt
@@ -68981,7 +68821,7 @@ bfF
 aFg
 aKO
 qQM
-grI
+ppy
 bnt
 anS
 bnt
@@ -69239,7 +69079,7 @@ amk
 aFk
 ify
 qQM
-aOi
+bnt
 pWY
 aCd
 bnt
@@ -69497,7 +69337,7 @@ agI
 edq
 qGt
 qQM
-nbn
+aVe
 cHi
 aCd
 ppy
@@ -69755,7 +69595,7 @@ agI
 edq
 aBU
 qQM
-aOi
+bnt
 aCd
 aCd
 bnt
@@ -70013,7 +69853,7 @@ aBX
 aFG
 awy
 qQM
-aOi
+bnt
 aCd
 syL
 bnt
@@ -70073,7 +69913,7 @@ aQY
 jKb
 aQY
 aTh
-rmj
+bhg
 gfy
 aTh
 aaa
@@ -70529,8 +70369,8 @@ aCi
 aFI
 aLa
 aLa
-itB
-aOj
+kDc
+bhj
 bhj
 bSH
 cxg
@@ -70784,9 +70624,9 @@ asT
 awZ
 aAG
 aCj
-aGj
-aLe
-aMe
+dWf
+dWf
+bnt
 aOo
 aUG
 bhn
@@ -71828,7 +71668,7 @@ dgH
 dgH
 dWe
 dXo
-dYu
+qDn
 eax
 dgH
 dgH
diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm
index 2daa0f9e15..21738aed81 100644
--- a/maps/southern_cross/southern_cross-2.dmm
+++ b/maps/southern_cross/southern_cross-2.dmm
@@ -46853,7 +46853,6 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only,
 /obj/effect/wingrille_spawn/reinforced,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/D1)
@@ -48060,7 +48059,6 @@
 /turf/simulated/floor/plating,
 /area/engineering/drone_fabrication)
 "eZp" = (
-/obj/machinery/door/firedoor/border_only,
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 8
 	},
@@ -52500,6 +52498,7 @@
 "hpn" = (
 /obj/effect/wingrille_spawn/reinforced,
 /obj/machinery/atmospherics/pipe/manifold/hidden,
+/obj/machinery/door/firedoor/border_only,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/D3)
 "hpA" = (
@@ -55251,6 +55250,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
 	},
+/obj/machinery/door/firedoor/border_only,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/D3)
 "iLA" = (
@@ -60570,6 +60570,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 1
 	},
+/obj/machinery/door/firedoor/border_only,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/D3)
 "lFN" = (
@@ -73872,6 +73873,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/coffee_shop)
+"teR" = (
+/obj/effect/wingrille_spawn/reinforced,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6
+	},
+/obj/machinery/door/firedoor/border_only,
+/turf/simulated/floor/plating,
+/area/hallway/secondary/entry/D2)
 "tfb" = (
 /obj/structure/table/standard,
 /obj/random/tech_supply,
@@ -77984,7 +77993,6 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/seconddeck/aft)
 "vCn" = (
-/obj/machinery/door/firedoor/border_only,
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 4
 	},
@@ -78074,7 +78082,6 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only,
 /obj/effect/wingrille_spawn/reinforced,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/D1)
@@ -115666,7 +115673,7 @@ jqz
 ogN
 tDT
 jqz
-tDT
+hax
 hax
 mLP
 xka
@@ -116698,7 +116705,7 @@ jqz
 ogN
 tDT
 jqz
-tDT
+hax
 hax
 jqz
 xka
@@ -116941,7 +116948,7 @@ aaa
 aaa
 aaa
 aaa
-uOF
+teR
 gUd
 aSp
 tDT
@@ -116951,7 +116958,7 @@ jqz
 tDT
 kZG
 hCW
-uOF
+teR
 aaa
 aaa
 aaa
diff --git a/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm b/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm
index b5d6587480..1450be2939 100644
--- a/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm
+++ b/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm
@@ -551,6 +551,15 @@
 /obj/effect/floor_decal/corner/purple/diagonal,
 /turf/simulated/floor/tiled/freezer,
 /area/survivalpod/superpose/RestaurationBar)
+"lJ" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/firealarm/alarms_hidden{
+	pixel_x = -33
+	},
+/turf/simulated/floor/carpet/brown,
+/area/survivalpod/superpose/RestaurationBar)
 "lN" = (
 /obj/machinery/light{
 	dir = 1
@@ -2467,6 +2476,12 @@
 /obj/structure/flora/ausbushes/palebush,
 /turf/simulated/floor/outdoors/grass/sif,
 /area/template_noop)
+"VX" = (
+/obj/machinery/firealarm/alarms_hidden{
+	pixel_y = -30
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod/superpose/RestaurationBar)
 "Wc" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /obj/effect/map_effect/perma_light,
@@ -2916,8 +2931,8 @@ ZL
 mp
 mp
 IR
-mp
-gC
+VX
+Ae
 "}
 (8,1,1) = {"
 Kc
@@ -3050,7 +3065,7 @@ FE
 tC
 Ae
 Ae
-gC
+Ae
 Ae
 mU
 Ae
@@ -3084,7 +3099,7 @@ Ci
 Ci
 Ci
 Ci
-Vh
+lJ
 Ci
 Ci
 Ti
diff --git a/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm b/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm
index 47b2e45f29..8e883ea760 100644
--- a/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm
+++ b/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm
@@ -86,9 +86,10 @@
 /turf/simulated/shuttle/floor/black,
 /area/survivalpod/superpose/TradingShip)
 "cC" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 10
+/obj/machinery/atmospherics/portables_connector{
+	dir = 8
 	},
+/obj/machinery/portable_atmospherics/canister/air/airlock,
 /turf/simulated/shuttle/floor/black,
 /area/survivalpod/superpose/TradingShip)
 "cM" = (
@@ -303,9 +304,11 @@
 /turf/simulated/shuttle/floor/black,
 /area/survivalpod/superpose/TradingShip)
 "kd" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
 /obj/machinery/meter,
 /obj/structure/largecrate/animal/cat,
+/obj/machinery/atmospherics/binary/pump/on{
+	target_pressure = 200
+	},
 /turf/simulated/shuttle/floor/black,
 /area/survivalpod/superpose/TradingShip)
 "kw" = (
@@ -350,7 +353,8 @@
 	master_tag = null;
 	pixel_x = 27;
 	pixel_y = -7;
-	req_one_access = null
+	req_one_access = null;
+	frequency = 1331
 	},
 /obj/machinery/door/airlock/external{
 	frequency = null;
@@ -361,6 +365,8 @@
 	req_access = null
 	},
 /obj/structure/fans/hardlight,
+/obj/effect/map_helper/airlock/door/ext_door,
+/obj/effect/map_helper/airlock/button/ext_button,
 /turf/simulated/shuttle/floor/voidcraft/dark,
 /area/survivalpod/superpose/TradingShip)
 "kV" = (
@@ -558,6 +564,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/visible,
 /obj/structure/fans/hardlight,
+/obj/effect/map_helper/airlock/door/int_door,
 /turf/simulated/shuttle/floor/voidcraft/dark,
 /area/survivalpod/superpose/TradingShip)
 "nC" = (
@@ -1002,9 +1009,12 @@
 	master_tag = null;
 	pixel_x = -27;
 	pixel_y = 7;
-	req_one_access = null
+	req_one_access = null;
+	frequency = 1331
 	},
 /obj/structure/fans/hardlight,
+/obj/effect/map_helper/airlock/door/int_door,
+/obj/effect/map_helper/airlock/button/int_button,
 /turf/simulated/shuttle/floor/voidcraft/dark,
 /area/survivalpod/superpose/TradingShip)
 "wT" = (
@@ -1185,21 +1195,23 @@
 /turf/simulated/shuttle/plating/airless/carry,
 /area/survivalpod/superpose/TradingShip)
 "AL" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	id_tag = null
-	},
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	dir = 4;
 	frequency = 1331;
 	id_tag = "trade2_control";
 	pixel_x = -25;
-	req_access = list(150);
+	req_access = list(160);
 	tag_airpump = null;
 	tag_chamber_sensor = null;
 	tag_exterior_door = null;
 	tag_interior_door = null
 	},
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 1;
+	frequency = 1331;
+	id_tag = "d1fore_port2_pump"
+	},
 /turf/simulated/shuttle/floor/black,
 /area/survivalpod/superpose/TradingShip)
 "AR" = (
@@ -1361,6 +1373,7 @@
 	req_access = null
 	},
 /obj/structure/fans/hardlight,
+/obj/effect/map_helper/airlock/door/ext_door,
 /turf/simulated/shuttle/floor/voidcraft/dark,
 /area/survivalpod/superpose/TradingShip)
 "Gb" = (
@@ -1381,9 +1394,12 @@
 	id_tag = null;
 	pixel_x = 27
 	},
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/obj/effect/map_helper/airlock/sensor/chamber_sensor,
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 1;
-	id_tag = null
+	frequency = 1331;
+	id_tag = "d1fore_port2_pump"
 	},
 /turf/simulated/shuttle/floor/black,
 /area/survivalpod/superpose/TradingShip)
@@ -1908,7 +1924,9 @@
 /turf/simulated/shuttle/floor/black,
 /area/survivalpod/superpose/TradingShip)
 "VY" = (
-/obj/machinery/suit_cycler/syndicate,
+/obj/machinery/suit_cycler/syndicate{
+	req_access = list(160)
+	},
 /turf/simulated/shuttle/floor/black,
 /area/survivalpod/superpose/TradingShip)
 "Wy" = (
@@ -2731,7 +2749,7 @@ rf
 Sp
 CV
 CV
-cC
+dy
 nh
 GN
 kU
@@ -2755,7 +2773,7 @@ SE
 HP
 Sp
 Sp
-Sp
+cC
 SE
 MT
 SE