diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm
index d8dc782f14e..801b9b75cd1 100644
--- a/_maps/map_files/Atlas/atlas.dmm
+++ b/_maps/map_files/Atlas/atlas.dmm
@@ -74,7 +74,7 @@
 /obj/effect/landmark/start/warden,
 /obj/structure/chair/stool,
 /turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
 "al" = (
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/durasteel/techfloor,
@@ -150,8 +150,10 @@
 /turf/open/floor/plasteel/techmaint,
 /area/quartermaster/miningoffice)
 "au" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
 /turf/open/floor/durasteel/techfloor_grid,
 /area/security/prison)
 "av" = (
@@ -177,9 +179,6 @@
 /turf/open/floor/plasteel/grid/steel,
 /area/hallway/secondary/exit/departure_lounge)
 "ax" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
@@ -265,6 +264,9 @@
 	dir = 4
 	},
 /obj/structure/extinguisher_cabinet/south,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck2/primary)
 "aP" = (
@@ -302,7 +304,7 @@
 	},
 /obj/item/clothing/under/rank/prisoner,
 /turf/open/floor/plasteel/techmaint,
-/area/security/brig)
+/area/security/main)
 "aY" = (
 /obj/effect/turf_decal/tile/ship/half/green{
 	dir = 8
@@ -493,7 +495,7 @@
 	},
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/plating,
-/area/security/brig)
+/area/security/main)
 "bB" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -538,7 +540,7 @@
 	dir = 8
 	},
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "bJ" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -582,6 +584,10 @@
 	codes_txt = "patrol;next_patrol=hmain2";
 	location = "hmain1"
 	},
+/obj/structure/cable{
+	icon_state = "2-8";
+	tag = ""
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "bX" = (
@@ -614,6 +620,13 @@
 	},
 /turf/open/floor/engine/vacuum,
 /area/engine/atmos)
+"ch" = (
+/obj/structure/lattice/catwalk/over/ship,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
 "cj" = (
 /obj/machinery/airalarm/directional/north,
 /obj/effect/turf_decal/ship/techfloor{
@@ -662,13 +675,13 @@
 /turf/open/floor/plating,
 /area/engine/atmos)
 "ct" = (
-/obj/structure/lattice/catwalk/over/ship,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "cv" = (
@@ -701,7 +714,7 @@
 	pixel_y = 26
 	},
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "cx" = (
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
@@ -785,7 +798,7 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "cH" = (
 /obj/structure/grille/wall,
 /turf/open/floor/engine/airless,
@@ -806,7 +819,7 @@
 	dir = 8
 	},
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "cQ" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -934,7 +947,7 @@
 	dir = 8
 	},
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "dp" = (
 /obj/structure/rack,
 /obj/effect/turf_decal/tile/ship/half/blue{
@@ -990,7 +1003,7 @@
 	pixel_y = 26
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "dv" = (
 /obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/dark,
@@ -1071,7 +1084,7 @@
 /obj/effect/turf_decal/ship/delivery/yellow,
 /obj/item/clothing/under/rank/prisoner,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "dJ" = (
 /obj/effect/turf_decal/tile/ship/half/red{
 	dir = 8
@@ -1082,7 +1095,7 @@
 /obj/item/poster/random_contraband,
 /obj/item/clothing/under/rank/prisoner,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "dK" = (
 /obj/machinery/computer/deckgun,
 /obj/effect/turf_decal/stripes/line{
@@ -1121,12 +1134,12 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "dS" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -1152,7 +1165,7 @@
 	dir = 1
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "dU" = (
 /obj/machinery/atmospherics/pipe/simple/general/hidden{
 	dir = 4
@@ -1211,7 +1224,19 @@
 /obj/item/reagent_containers/spray/cleaner,
 /obj/item/clothing/mask/surgical,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
+"ed" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck2/primary)
 "ef" = (
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 4
@@ -1226,11 +1251,11 @@
 /obj/machinery/iv_drip,
 /obj/structure/closet/crate/freezer/blood,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "ei" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
 /turf/open/floor/plasteel/grid/steel,
 /area/hallway/secondary/exit/departure_lounge)
@@ -1282,12 +1307,12 @@
 	icon_state = "1-2"
 	},
 /obj/effect/turf_decal/ship/delivery/yellow,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/steel,
 /area/science)
 "eq" = (
@@ -1367,6 +1392,13 @@
 /obj/item/rcl/pre_loaded,
 /turf/open/floor/carpet/orange,
 /area/engine/engine_room)
+"eC" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
 "eD" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1378,6 +1410,19 @@
 	icon_state = "panelscorched"
 	},
 /area/maintenance/department/engine/atmos)
+"eE" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
 "eF" = (
 /obj/machinery/atmospherics/components/trinary/mixer/layer4{
 	dir = 8
@@ -1451,7 +1496,7 @@
 	dir = 4
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "eX" = (
 /obj/machinery/atmospherics/components/trinary/mixer/layer4{
 	dir = 8
@@ -1471,10 +1516,10 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
-/obj/structure/lattice/catwalk/over/ship,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "fb" = (
@@ -1597,9 +1642,6 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port/fore)
 "ft" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 8
@@ -1670,6 +1712,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port)
+"fA" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
 "fB" = (
 /obj/structure/chair{
 	dir = 4
@@ -1769,7 +1818,7 @@
 	icon_state = "0-4"
 	},
 /turf/open/floor/plating,
-/area/security/brig)
+/area/security/main)
 "fV" = (
 /obj/effect/turf_decal/tile/ship/half/red{
 	dir = 4
@@ -1778,7 +1827,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "fW" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1793,7 +1842,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "fZ" = (
 /obj/structure/table/glass,
 /obj/item/stack/sheet/mineral/plasma{
@@ -1844,18 +1893,18 @@
 /obj/machinery/computer/ship/viewscreen,
 /obj/machinery/recharger,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "gc" = (
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "gd" = (
@@ -1889,7 +1938,7 @@
 /obj/machinery/airalarm/directional/north,
 /obj/machinery/vending/wardrobe/sec_wardrobe,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "gh" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1901,7 +1950,7 @@
 "gi" = (
 /obj/machinery/vending/security,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "gk" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 1
@@ -1955,6 +2004,12 @@
 /area/engine/engine_room)
 "gq" = (
 /obj/machinery/advanced_airlock_controller/directional/north,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "gs" = (
@@ -1985,6 +2040,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck2/primary)
 "gx" = (
@@ -2079,7 +2137,7 @@
 	},
 /obj/machinery/recharger,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "gN" = (
 /obj/structure/shuttle/engine/huge{
 	dir = 8
@@ -2105,6 +2163,12 @@
 	},
 /turf/open/floor/monotile/dark,
 /area/ai_monitored/security/armory)
+"gQ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel/ridged/steel,
+/area/hallway/nsv/deck2/primary)
 "gS" = (
 /turf/open/floor/engine/airless,
 /area/space/nearstation)
@@ -2231,7 +2295,7 @@
 	},
 /obj/machinery/flasher/portable,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "hn" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2250,7 +2314,7 @@
 	dir = 6
 	},
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "ho" = (
 /obj/structure/closet/radiation,
 /turf/open/floor/plating,
@@ -2288,7 +2352,7 @@
 	},
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "hr" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
@@ -2297,6 +2361,9 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/ship/yellow,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck2/primary)
 "ht" = (
@@ -2473,6 +2540,9 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/science)
 "hX" = (
@@ -2605,7 +2675,7 @@
 	},
 /obj/effect/landmark/start/security_officer,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "iz" = (
 /obj/item/restraints/handcuffs,
 /obj/item/restraints/handcuffs,
@@ -2613,7 +2683,7 @@
 /obj/structure/closet/secure_closet/warden,
 /obj/machinery/status_display/ai/east,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "iA" = (
 /obj/machinery/computer/ship/munitions_computer/west{
 	dir = 4
@@ -2838,7 +2908,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "jn" = (
 /obj/machinery/requests_console{
 	department = "Cargo Bay";
@@ -3053,7 +3123,7 @@
 /area/engine/atmos)
 "jQ" = (
 /turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
 "jS" = (
 /mob/living/simple_animal/slime,
 /turf/open/floor/engine,
@@ -3079,10 +3149,14 @@
 /turf/open/floor/monotile/dark,
 /area/engine/engine_room)
 "jX" = (
-/obj/structure/lattice/catwalk/over/ship,
 /obj/structure/chair/office{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "jY" = (
@@ -3092,7 +3166,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "jZ" = (
@@ -3159,7 +3232,7 @@
 /obj/structure/chair/stool,
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "kl" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -3304,7 +3377,6 @@
 /area/chapel/main)
 "kA" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3316,6 +3388,7 @@
 	id = "deck2_brig";
 	next_id = "deck2_ladder"
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "kB" = (
@@ -3467,6 +3540,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/science)
 "kW" = (
@@ -3802,6 +3878,9 @@
 	codes_txt = "patrol;next_patrol=hmains2";
 	location = "hsouth2"
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "lO" = (
@@ -3889,7 +3968,7 @@
 /obj/structure/closet/secure_closet/security/sec,
 /obj/item/book/granter/martial/jujitsu,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "mj" = (
 /turf/open/floor/plating,
 /area/engine/atmos)
@@ -3981,21 +4060,22 @@
 /turf/open/floor/monotile/steel,
 /area/engine/engine_room)
 "mz" = (
-/obj/structure/lattice/catwalk/over/ship,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "mC" = (
 /turf/open/floor/monotile/steel,
 /area/quartermaster/storage)
 "mD" = (
-/obj/structure/lattice/catwalk/over/ship,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -4008,6 +4088,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "mE" = (
@@ -4237,7 +4318,6 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port)
 "nw" = (
-/obj/structure/lattice/catwalk/over/ship,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -4247,6 +4327,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "nx" = (
@@ -4479,8 +4560,8 @@
 /obj/effect/turf_decal/pool{
 	dir = 1
 	},
-/obj/effect/landmark/start/depsec/engineering,
 /obj/machinery/light_switch/east,
+/obj/effect/landmark/start/depsec/engineering,
 /turf/open/floor/monotile/steel,
 /area/engine/engine_room)
 "oi" = (
@@ -4567,7 +4648,7 @@
 	},
 /obj/item/clothing/under/rank/prisoner,
 /turf/open/floor/plasteel/techmaint,
-/area/security/brig)
+/area/security/main)
 "ot" = (
 /obj/machinery/firealarm/directional/west,
 /obj/structure/tank_dispenser/oxygen,
@@ -4659,7 +4740,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/monotile/steel,
 /area/science)
 "oI" = (
@@ -4689,7 +4772,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "oQ" = (
 /obj/structure/ladder,
 /obj/effect/turf_decal/tile/ship/half/green{
@@ -4712,16 +4795,11 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port)
 "oS" = (
-/obj/item/organ/body_egg/alien_embryo{
-	layer = 2.35
-	},
-/obj/machinery/atmospherics/pipe/simple/general/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
 	},
-/turf/open/floor/wood,
-/area/crew_quarters/abandoned_gambling_den{
-	name = "Abandoned Bar"
-	})
+/turf/open/floor/durasteel/techfloor_grid,
+/area/security/prison)
 "oU" = (
 /turf/closed/wall/steel,
 /area/hallway/secondary/exit/departure_lounge)
@@ -4804,18 +4882,6 @@
 "pd" = (
 /obj/item/paper_bin/construction,
 /obj/item/pen/fountain,
-/obj/machinery/button/door{
-	id = "gaussgang_atlas";
-	name = "public gauss access";
-	pixel_y = 32;
-	req_one_access_txt = "69"
-	},
-/obj/machinery/button/door{
-	id = "muni_atlas";
-	name = "public munitions access";
-	pixel_y = 24;
-	req_one_access_txt = "69"
-	},
 /obj/structure/closet/secure_closet/master_at_arms,
 /obj/machinery/requests_console{
 	announcementConsole = 1;
@@ -4895,12 +4961,12 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "po" = (
@@ -4925,7 +4991,7 @@
 "pp" = (
 /obj/structure/chair/office,
 /turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
 "pq" = (
 /obj/effect/turf_decal/ship/delivery/yellow,
 /obj/machinery/door/firedoor/border_only,
@@ -4959,10 +5025,6 @@
 /turf/open/floor/plating,
 /area/maintenance/department/engine/atmos)
 "pw" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
 /obj/machinery/navbeacon{
 	codes_txt = "patrol;next_patrol=hmains4";
 	location = "hmains2"
@@ -4970,8 +5032,11 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
@@ -5198,9 +5263,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "qc" = (
@@ -5235,8 +5298,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
 /turf/open/floor/monotile/dark,
 /area/science)
@@ -5280,15 +5343,9 @@
 /turf/open/floor/engine,
 /area/quartermaster/storage)
 "qo" = (
-/obj/effect/turf_decal/tile/ship/half/green,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/monotile/steel,
-/area/hallway/nsv/deck2/primary)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/grid/steel,
+/area/hallway/secondary/exit/departure_lounge)
 "qp" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -5317,7 +5374,7 @@
 	},
 /obj/effect/landmark/start/security_officer,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "qx" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -5355,6 +5412,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "qI" = (
@@ -5445,9 +5505,6 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/effect/landmark/zebra_interlock_point,
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/ship/green{
@@ -5630,10 +5687,17 @@
 	},
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons/gauss/battery/deck2/port)
-"rH" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+"rG" = (
+/obj/effect/turf_decal/tile/ship/half/green,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
 	},
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck2/primary)
+"rH" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 8
@@ -5781,12 +5845,6 @@
 /turf/open/floor/plating,
 /area/nsv/weapons)
 "rZ" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
@@ -5845,6 +5903,14 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/starboard)
+"sk" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
 "sl" = (
 /obj/machinery/door/airlock/ship/maintenance,
 /obj/machinery/door/firedoor/border_only{
@@ -5942,12 +6008,13 @@
 	},
 /obj/effect/turf_decal/tile/ship/red,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "sJ" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/steel,
 /area/science)
 "sL" = (
@@ -5975,9 +6042,6 @@
 	},
 /area/maintenance/nsv/deck2/starboard)
 "sQ" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 8
@@ -5985,6 +6049,9 @@
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 1
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck2/primary)
 "sR" = (
@@ -6072,10 +6139,12 @@
 /obj/effect/turf_decal/tile/orange{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/camera/autoname{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/durasteel/alt,
 /area/nsv/weapons/gauss/battery/deck2/port)
 "ti" = (
@@ -6127,13 +6196,16 @@
 	name = "Isolation"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/effect/turf_decal/ship/delivery/yellow,
 /obj/effect/landmark/zebra_interlock_point,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/monotile/dark,
 /area/security/brig)
 "tr" = (
@@ -6174,7 +6246,7 @@
 	dir = 1
 	},
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "tt" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -6284,6 +6356,22 @@
 	},
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons/gauss/battery/deck2/port)
+"tH" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
 "tJ" = (
 /obj/structure/chair,
 /turf/open/floor/plating{
@@ -6304,7 +6392,7 @@
 	dir = 1
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "tN" = (
 /obj/effect/turf_decal/tile/ship/half/green,
 /obj/effect/turf_decal/tile/ship/green{
@@ -6327,6 +6415,13 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/quartermaster/storage)
+"tS" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/monotile/dark,
+/area/science)
 "tT" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/light_switch/east,
@@ -6341,7 +6436,6 @@
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons)
 "tZ" = (
-/obj/structure/lattice/catwalk/over/ship,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -6351,15 +6445,15 @@
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "ua" = (
 /obj/effect/turf_decal/ship/delivery/yellow,
+/obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/monotile/steel,
 /area/science)
 "ub" = (
@@ -6437,7 +6531,7 @@
 /obj/effect/landmark/start/security_officer,
 /obj/structure/chair/stool,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "uk" = (
 /obj/effect/turf_decal/ship/delivery/yellow,
 /obj/machinery/door/firedoor/border_only,
@@ -6461,7 +6555,7 @@
 	},
 /obj/machinery/disposal/bin,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "un" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -6478,6 +6572,9 @@
 /obj/structure/sign/warning/enginesafety{
 	pixel_y = 26
 	},
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "uq" = (
@@ -6511,15 +6608,13 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/monotile/steel,
 /area/quartermaster/storage)
 "ut" = (
@@ -6540,7 +6635,7 @@
 	dir = 8
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "uv" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -6699,7 +6794,6 @@
 /turf/open/floor/carpet/royalblack,
 /area/chapel/main)
 "uP" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/effect/turf_decal/tile/ship/half/red{
 	dir = 1
 	},
@@ -6965,9 +7059,15 @@
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "vO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/durasteel/techfloor_grid,
-/area/security/prison)
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck2/primary)
 "vR" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -7078,6 +7178,12 @@
 "wd" = (
 /turf/closed/wall/steel,
 /area/maintenance/nsv/deck2/port)
+"wf" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/ridged/steel,
+/area/hallway/nsv/deck2/primary)
 "wh" = (
 /obj/machinery/light{
 	dir = 8
@@ -7086,6 +7192,9 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons/gauss/battery/deck2/port)
 "wk" = (
@@ -7182,15 +7291,18 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/layer_manifold{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/structure/sign/warning/enginesafety{
 	pixel_y = 26
 	},
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/plasteel/techmaint,
 /area/nsv/weapons)
 "wG" = (
@@ -7251,12 +7363,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /turf/open/floor/monotile/steel,
 /area/quartermaster/storage)
 "wQ" = (
@@ -7280,12 +7390,8 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/machinery/door/airlock/ship/external/glass{
 	name = "Pressurization Chamber";
 	req_one_access_txt = "79"
@@ -7427,7 +7533,7 @@
 	dir = 8
 	},
 /turf/open/floor/durasteel/alt,
-/area/security/brig)
+/area/security/main)
 "xs" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
@@ -7471,6 +7577,10 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/monotile/dark,
 /area/ai_monitored/security/armory)
+"xC" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/monotile/dark,
+/area/nsv/weapons)
 "xD" = (
 /obj/machinery/computer/ship/dradis/minor{
 	dir = 8
@@ -7506,7 +7616,7 @@
 	},
 /obj/effect/landmark/start/brig_physician,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "xI" = (
 /obj/structure/cable{
 	icon_state = "2-8";
@@ -7777,10 +7887,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/navbeacon{
 	codes_txt = "patrol;next_patrol=hsouth1";
 	location = "hmains1"
@@ -7792,6 +7898,11 @@
 	id = "deck2_munitions";
 	next_id = "deck2_eva"
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "yF" = (
@@ -7825,22 +7936,20 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /obj/machinery/navbeacon{
 	codes_txt = "patrol;next_patrol=sci";
 	location = "hsouth1"
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "yM" = (
@@ -7926,8 +8035,11 @@
 /turf/open/floor/engine/o2,
 /area/engine/atmos)
 "za" = (
-/turf/open/floor/monotile/steel,
-/area/ai_monitored/security/armory)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/ridged/steel,
+/area/hallway/nsv/deck2/primary)
 "zc" = (
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
 	dir = 4
@@ -8003,6 +8115,12 @@
 	})
 "zk" = (
 /obj/machinery/light,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "zl" = (
@@ -8172,14 +8290,17 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
+"zT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/grid/steel,
+/area/hallway/secondary/exit/departure_lounge)
 "zU" = (
 /obj/structure/table/reinforced,
 /obj/item/lighter,
@@ -8258,11 +8379,17 @@
 /turf/open/floor/monotile/dark,
 /area/science)
 "Ae" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
-/turf/open/floor/plasteel/grid/steel,
-/area/hallway/secondary/exit/departure_lounge)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck2/primary)
 "Aj" = (
 /obj/structure/railing,
 /obj/effect/turf_decal/ship/delivery/yellow,
@@ -8306,6 +8433,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck2/primary)
 "Ap" = (
@@ -8326,6 +8454,15 @@
 	},
 /turf/open/floor/monotile/steel,
 /area/hallway/secondary/exit/departure_lounge)
+"Av" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/durasteel/techfloor_grid,
+/area/security/prison)
 "Ax" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -8356,6 +8493,18 @@
 /obj/machinery/door/airlock/ship/maintenance/defaultaccess,
 /turf/open/floor/monotile/steel,
 /area/maintenance/nsv/deck2/port/fore)
+"AG" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/nsv/weapons)
 "AI" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -8420,6 +8569,26 @@
 /obj/machinery/power/tracker,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"AX" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck2/primary)
+"AZ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/monotile/steel,
+/area/engine/engine_room)
 "Ba" = (
 /obj/effect/turf_decal/tile/ship/half/yellow,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -8451,9 +8620,6 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -8535,14 +8701,12 @@
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/quartermaster/qm)
 "By" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/effect/turf_decal/ship/delivery/yellow,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
 	},
-/turf/open/floor/monotile/steel,
-/area/engine/engine_room)
+/turf/open/floor/engine,
+/area/quartermaster/storage)
 "BC" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 4
@@ -8601,14 +8765,15 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engine_room)
+"BL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/monotile/steel,
+/area/ai_monitored/security/armory)
 "BM" = (
 /obj/machinery/firealarm{
 	dir = 4;
 	pixel_x = -26
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 8
@@ -8616,6 +8781,9 @@
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 1
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck2/primary)
 "BN" = (
@@ -8664,9 +8832,10 @@
 	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "BX" = (
@@ -8836,16 +9005,19 @@
 /turf/open/floor/monotile/steel,
 /area/hallway/secondary/exit/departure_lounge)
 "CA" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/monotile/dark,
+/obj/structure/lattice/catwalk/over/ship,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "CC" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
 	},
 /turf/open/floor/monotile/steel,
 /area/hallway/secondary/exit/departure_lounge)
@@ -8872,9 +9044,12 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
 /turf/open/floor/plasteel/ridged/steel,
 /area/hallway/nsv/deck2/primary)
 "CG" = (
@@ -9073,6 +9248,13 @@
 "Dy" = (
 /turf/closed/wall/r_wall,
 /area/quartermaster/qm)
+"DC" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/monotile/dark,
+/area/science)
 "DD" = (
 /obj/machinery/light/small{
 	brightness = 3;
@@ -9099,6 +9281,18 @@
 "DH" = (
 /turf/closed/wall/r_wall,
 /area/quartermaster/miningoffice)
+"DK" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/monotile/steel,
+/area/science)
 "DM" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -9112,6 +9306,16 @@
 /obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port)
+"DN" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck2/primary)
 "DT" = (
 /obj/effect/turf_decal/loading_area{
 	dir = 4
@@ -9127,23 +9331,35 @@
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons/gauss/battery/deck2/starboard)
 "DV" = (
-/obj/structure/lattice/catwalk/over/ship,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "DX" = (
-/obj/structure/overmap/small_craft/combat/light,
-/obj/machinery/light,
-/turf/open/floor/plasteel/techmaint{
-	initial_gas_mix = "TEMP=2.7"
+/obj/machinery/button/door{
+	id = "muni_atlas";
+	name = "public munitions access";
+	pixel_y = 24;
+	req_one_access_txt = "69"
 	},
-/area/nsv/hanger/notkmcstupidhanger)
+/obj/machinery/button/door{
+	id = "gaussgang_atlas";
+	name = "public gauss access";
+	pixel_y = 32;
+	req_one_access_txt = "69"
+	},
+/obj/item/tank/internals/oxygen,
+/obj/machinery/suit_storage_unit/maa,
+/turf/open/floor/carpet/ship,
+/area/nsv/weapons)
 "DZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -9166,7 +9382,7 @@
 "Ea" = (
 /obj/machinery/holopad,
 /turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
 "Eb" = (
 /obj/machinery/door/airlock/ship/external/glass{
 	req_one_access_txt = "31; 48";
@@ -9187,9 +9403,6 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 8
@@ -9223,6 +9436,10 @@
 /obj/structure/toilet{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/apc/auto_name/north,
 /turf/open/floor/monotile/steel,
 /area/security/brig)
 "Ej" = (
@@ -9239,6 +9456,11 @@
 	},
 /turf/open/floor/plasteel/airless/solarpanel,
 /area/space/nearstation)
+"El" = (
+/obj/item/control_rod,
+/obj/item/control_rod,
+/turf/open/indestructible/sound/pool/spentfuel,
+/area/engine/engine_room)
 "Eo" = (
 /obj/machinery/door/poddoor/shutters/ship{
 	id = "gaussgang_atlas";
@@ -9264,7 +9486,7 @@
 	dir = 1
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "Et" = (
 /obj/structure/shuttle/engine/huge{
 	dir = 8
@@ -9275,6 +9497,7 @@
 /obj/structure/rack,
 /obj/item/clothing/ears/earmuffs,
 /obj/item/clothing/ears/earmuffs,
+/obj/item/clothing/ears/earmuffs,
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons)
 "Ex" = (
@@ -9574,6 +9797,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "FL" = (
@@ -9642,7 +9866,7 @@
 	},
 /obj/effect/landmark/start/lawyer,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "FU" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
@@ -9712,6 +9936,9 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port)
+"Gg" = (
+/turf/closed/wall/r_wall,
+/area/security/main)
 "Gh" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/mechanical{
@@ -9742,9 +9969,6 @@
 /area/space/nearstation)
 "Gj" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
 /obj/structure/disposalpipe/sorting/mail{
 	dir = 8;
 	sortType = 6
@@ -9752,6 +9976,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "Gk" = (
@@ -9822,6 +10047,12 @@
 	},
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons)
+"Gv" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
 "Gw" = (
 /obj/machinery/airalarm/directional/north,
 /obj/machinery/light_switch/west,
@@ -9835,6 +10066,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
 /turf/open/floor/monotile/steel,
 /area/science)
 "GA" = (
@@ -10314,12 +10548,17 @@
 /obj/machinery/deck_turret/payload_gate,
 /turf/open/floor/plating,
 /area/nsv/weapons)
+"Ih" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/monotile/dark,
+/area/nsv/weapons)
 "Ii" = (
 /obj/machinery/computer/crew{
 	dir = 8
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "Il" = (
 /obj/machinery/door/airlock/ship/external/glass{
 	req_one_access_txt = "24"
@@ -10336,13 +10575,13 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port)
 "Im" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
 /obj/machinery/meter/atmos{
 	target_layer = 4;
 	name = "Scrubber loop gas flow meter"
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/engine/atmos)
 "In" = (
@@ -10382,13 +10621,13 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/machinery/light,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/light,
 /turf/open/floor/plasteel/techmaint,
 /area/nsv/weapons)
 "IE" = (
@@ -10486,13 +10725,15 @@
 	},
 /area/nsv/hanger/notkmcstupidhanger)
 "Je" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/tile/ship/green,
+/obj/effect/turf_decal/tile/ship/green{
+	dir = 4
 	},
+/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
+	dir = 8
 	},
-/turf/open/floor/monotile/steel,
+/turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck2/primary)
 "Jf" = (
 /obj/structure/ladder,
@@ -10545,6 +10786,19 @@
 	},
 /turf/open/floor/circuit/telecomms,
 /area/science)
+"Jj" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/ship/brown,
+/obj/effect/turf_decal/tile/ship/brown{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck2/primary)
 "Jk" = (
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
@@ -10555,7 +10809,6 @@
 /obj/effect/turf_decal/tile/orange{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/durasteel/alt,
 /area/nsv/weapons/gauss/battery/deck2/port)
@@ -10671,7 +10924,7 @@
 	dir = 4
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "JB" = (
 /obj/structure/sign/departments/minsky/research/xenobiology,
 /turf/closed/wall/r_wall,
@@ -10680,6 +10933,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons)
 "JD" = (
@@ -10707,21 +10963,21 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/starboard)
 "JF" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
 	},
 /obj/machinery/door/airlock/ship/external/glass{
 	name = "Pressurization Chamber";
 	req_one_access_txt = "79"
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
 	},
 /turf/open/floor/plasteel/techmaint,
 /area/nsv/weapons)
@@ -10750,21 +11006,21 @@
 	},
 /obj/machinery/light,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "JN" = (
-/obj/structure/lattice/catwalk/over/ship,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "JO" = (
@@ -10792,6 +11048,9 @@
 "JR" = (
 /obj/structure/lattice/catwalk/over/ship,
 /obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "JS" = (
@@ -10800,7 +11059,7 @@
 	icon_state = "0-8"
 	},
 /turf/open/floor/plating,
-/area/security/brig)
+/area/security/main)
 "JT" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -10996,7 +11255,7 @@
 	dir = 4
 	},
 /turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
 "Kw" = (
 /turf/open/floor/durasteel/techfloor_grid,
 /area/security/prison)
@@ -11035,7 +11294,7 @@
 	dir = 4
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "KF" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{
 	dir = 1
@@ -11103,8 +11362,8 @@
 /obj/effect/turf_decal/tile/orange{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
 /turf/open/floor/durasteel/alt,
 /area/nsv/weapons/gauss/battery/deck2/port)
@@ -11153,6 +11412,9 @@
 /obj/machinery/camera/autoname{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
 /turf/open/floor/monotile/steel,
 /area/security/brig)
 "KX" = (
@@ -11241,6 +11503,18 @@
 	},
 /turf/open/floor/plating,
 /area/engine/atmos)
+"Lf" = (
+/obj/effect/turf_decal/tile/ship/green{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/ship/green{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck2/primary)
 "Li" = (
 /obj/effect/turf_decal/ship/delivery/yellow,
 /obj/machinery/door/firedoor/border_only,
@@ -11375,12 +11649,12 @@
 	dir = 8
 	},
 /obj/machinery/advanced_airlock_controller/directional/north,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/plasteel/techmaint,
 /area/nsv/weapons)
 "LD" = (
@@ -11468,7 +11742,7 @@
 	dir = 8
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "LR" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
@@ -11601,6 +11875,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "Mi" = (
@@ -12062,13 +12339,16 @@
 /turf/open/floor/monotile/steel,
 /area/engine/engine_room)
 "NR" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
 	},
 /obj/machinery/door/airlock/ship/external/glass{
 	name = "Pressurization Chamber";
 	req_one_access_txt = "79"
 	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
 /turf/open/floor/plasteel/techmaint,
 /area/nsv/weapons)
 "NT" = (
@@ -12091,7 +12371,7 @@
 	dir = 8
 	},
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "NW" = (
 /obj/machinery/computer/ship/munitions_computer/west,
 /turf/open/floor/monotile/steel,
@@ -12288,7 +12568,7 @@
 	dir = 4
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "Ov" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/vending/sovietsoda,
@@ -12449,12 +12729,13 @@
 	})
 "OV" = (
 /obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "OW" = (
@@ -12487,10 +12768,10 @@
 /turf/template_noop,
 /area/maintenance/nsv/deck2/port)
 "Pd" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /turf/open/floor/monotile/steel,
@@ -12558,18 +12839,18 @@
 /turf/closed/wall/r_wall,
 /area/nsv/hanger/mining)
 "Pp" = (
-/obj/effect/turf_decal/tile/ship/green,
-/obj/effect/turf_decal/tile/ship/green{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/durasteel/alt,
-/area/hallway/nsv/deck2/primary)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
 "Pq" = (
 /obj/machinery/camera/autoname,
 /obj/structure/rack,
@@ -12686,7 +12967,13 @@
 /turf/open/floor/plasteel/grid/steel,
 /area/hallway/secondary/exit/departure_lounge)
 "PO" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/monotile/steel,
 /area/security/brig)
 "PP" = (
@@ -12742,16 +13029,16 @@
 	dir = 8
 	},
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "PV" = (
-/obj/structure/lattice/catwalk/over/ship,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "PX" = (
@@ -12917,7 +13204,7 @@
 	dir = 4
 	},
 /turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
 "Qx" = (
 /obj/item/beacon,
 /obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{
@@ -13120,6 +13407,18 @@
 	},
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons/gauss/battery/deck2/port)
+"Rc" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/monotile/steel,
+/area/science)
 "Rf" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -13131,7 +13430,7 @@
 	dir = 1
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "Rh" = (
 /obj/structure/chair/office{
 	dir = 8
@@ -13189,6 +13488,9 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/engine/engine_room)
 "Rq" = (
@@ -13335,9 +13637,12 @@
 /turf/open/floor/monotile/dark/airless,
 /area/nsv/hanger/notkmcstupidhanger)
 "RJ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/effect/turf_decal/pool{
 	dir = 1
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
 /turf/open/floor/monotile/steel,
 /area/engine/engine_room)
 "RK" = (
@@ -13389,6 +13694,12 @@
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons/gauss/battery/deck2/starboard)
 "RV" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
+	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
@@ -13396,9 +13707,6 @@
 	name = "Pressurization Chamber";
 	req_one_access_txt = "79"
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /turf/open/floor/plasteel/techmaint,
 /area/nsv/weapons)
 "RW" = (
@@ -13433,7 +13741,7 @@
 	dir = 4
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "RZ" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -13451,12 +13759,10 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "Se" = (
@@ -13480,6 +13786,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "Si" = (
@@ -13498,7 +13807,7 @@
 	dir = 4
 	},
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "Sj" = (
 /obj/effect/decal/cleanable/blood/tracks{
 	dir = 6
@@ -13633,7 +13942,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
 /turf/open/floor/monotile/steel,
 /area/science)
 "SP" = (
@@ -13686,7 +13998,7 @@
 	},
 /obj/structure/table/reinforced,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "SX" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -13827,7 +14139,7 @@
 "Tq" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
 "Tt" = (
 /obj/machinery/door/airlock/ship/maintenance/defaultaccess{
 	name = "EVA";
@@ -13964,6 +14276,9 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "TL" = (
@@ -14002,7 +14317,7 @@
 	dir = 8
 	},
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "TS" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
@@ -14104,6 +14419,9 @@
 /turf/open/floor/plating,
 /area/engine/atmos)
 "Uc" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "Uf" = (
@@ -14123,6 +14441,7 @@
 "Ug" = (
 /obj/structure/bed,
 /obj/machinery/airalarm/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/monotile/dark,
 /area/security/brig)
 "Ul" = (
@@ -14136,7 +14455,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/item/clothing/under/rank/prisoner,
 /turf/open/floor/plasteel/techmaint,
-/area/security/brig)
+/area/security/main)
 "Um" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
@@ -14393,6 +14712,9 @@
 /area/maintenance/nsv/deck2/port/fore)
 "Vc" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "Vd" = (
@@ -14613,10 +14935,12 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "VM" = (
@@ -14758,7 +15082,6 @@
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons/gauss/battery/deck2/starboard)
 "Wk" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/machinery/camera/autoname,
 /obj/effect/turf_decal/tile/ship/red{
 	dir = 1
@@ -14778,7 +15101,7 @@
 	},
 /obj/machinery/light_switch/west,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "Wn" = (
 /obj/machinery/suit_storage_unit/security,
 /obj/effect/turf_decal/tile/ship/half/red{
@@ -14790,13 +15113,11 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/steel,
 /area/science)
 "Wr" = (
@@ -14871,6 +15192,12 @@
 	},
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons)
+"WF" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/engine/atmos)
 "WH" = (
 /obj/effect/turf_decal/tile/ship/half/green{
 	dir = 1
@@ -14907,7 +15234,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
 "WT" = (
 /obj/machinery/conveyor{
 	dir = 4;
@@ -14916,9 +15243,8 @@
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons)
 "WW" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
-	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
@@ -14927,7 +15253,8 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer{
-	dir = 1
+	dir = 8;
+	piping_layer = 4
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -14984,6 +15311,8 @@
 /obj/structure/disposaloutlet{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons)
 "Xl" = (
@@ -14991,7 +15320,7 @@
 	name = "Munitions Department"
 	},
 /turf/closed/wall/r_wall,
-/area/security/brig)
+/area/security/main)
 "Xn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -15101,6 +15430,7 @@
 /obj/item/clothing/ears/earmuffs,
 /obj/item/clothing/ears/earmuffs,
 /obj/machinery/light,
+/obj/item/clothing/ears/earmuffs,
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons)
 "XG" = (
@@ -15259,7 +15589,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "Yh" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output,
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
@@ -15394,6 +15724,10 @@
 /obj/machinery/rnd/production/techfab/department/munitions,
 /turf/open/floor/carpet/red,
 /area/nsv/weapons)
+"YL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/ridged/steel,
+/area/hallway/nsv/deck2/primary)
 "YM" = (
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 4
@@ -15425,16 +15759,19 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/layer_manifold{
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/plasteel/techmaint,
 /area/nsv/weapons)
 "YS" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
 /turf/open/floor/plating,
-/area/security/brig)
+/area/security/main)
 "YT" = (
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /turf/open/floor/plating,
@@ -15450,9 +15787,6 @@
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "YW" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -15460,6 +15794,18 @@
 /obj/structure/munitions_trolley,
 /turf/open/floor/engine,
 /area/quartermaster/storage)
+"YX" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/nsv/weapons)
 "YZ" = (
 /obj/effect/turf_decal/ship/delivery/yellow,
 /obj/machinery/door/firedoor/border_only,
@@ -15510,7 +15856,7 @@
 	},
 /obj/machinery/rnd/production/techfab/department/security,
 /turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
 "Zh" = (
 /obj/machinery/particle_accelerator/control_box,
 /obj/effect/turf_decal/stripes/line{
@@ -15671,7 +16017,7 @@
 	dir = 10
 	},
 /turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
 "ZK" = (
 /obj/structure/table,
 /obj/item/storage/backpack/duffelbag/med/surgery,
@@ -15736,6 +16082,10 @@
 /area/nsv/weapons)
 "ZT" = (
 /obj/machinery/smartfridge/extract/preloaded,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
 /turf/closed/wall/r_wall,
 /area/science)
 "ZW" = (
@@ -42622,7 +42972,7 @@ MO
 qe
 wW
 Sl
-Sl
+AZ
 Sl
 nx
 of
@@ -43136,7 +43486,7 @@ MO
 cB
 lK
 mH
-Rr
+RJ
 Yy
 nB
 ul
@@ -43392,13 +43742,13 @@ yI
 YQ
 fP
 lK
-mH
+El
 Rr
 Zh
 mM
 ul
-By
-RJ
+lL
+oz
 NI
 MO
 YQ
@@ -43649,7 +43999,7 @@ qK
 qI
 oF
 lK
-mH
+El
 Rr
 ZH
 VQ
@@ -44159,7 +44509,7 @@ YQ
 YQ
 vs
 sG
-dQ
+Pd
 jl
 oF
 oF
@@ -44420,7 +44770,7 @@ Pd
 Cq
 YF
 gX
-jt
+Lf
 Or
 TN
 vm
@@ -44430,7 +44780,7 @@ Us
 jt
 uk
 rS
-Je
+Mh
 ao
 qI
 rr
@@ -44677,12 +45027,12 @@ ko
 vd
 lu
 zY
-zY
+vd
 zY
 zY
 Tw
 zY
-zY
+vO
 zY
 wG
 lu
@@ -44939,7 +45289,7 @@ am
 ps
 tm
 kL
-kL
+Je
 uq
 mv
 YZ
@@ -45719,9 +46069,9 @@ un
 NC
 ew
 Nr
-wx
-wx
-wx
+gQ
+YL
+za
 PA
 ks
 gl
@@ -45955,8 +46305,8 @@ Hu
 Gs
 wd
 ie
+Jk
 Tm
-Vc
 ju
 SX
 ny
@@ -45978,7 +46328,7 @@ xt
 qb
 CF
 Mj
-wx
+wf
 sp
 YQ
 Ie
@@ -46472,7 +46822,7 @@ wd
 wd
 jE
 rf
-un
+ed
 aM
 zI
 KB
@@ -47257,8 +47607,8 @@ jh
 UZ
 RN
 oY
-pn
-qo
+rB
+rG
 qi
 hP
 rL
@@ -47514,8 +47864,8 @@ YT
 Ob
 RN
 YM
-rB
-Pp
+un
+Ef
 qI
 al
 rT
@@ -48542,7 +48892,7 @@ YT
 bY
 RN
 FI
-wq
+AX
 TG
 xE
 MA
@@ -48785,7 +49135,7 @@ dC
 dC
 MZ
 Ao
-un
+DN
 Ef
 RN
 ZF
@@ -49544,19 +49894,19 @@ wl
 wl
 wl
 wl
-WN
+Gg
 bA
-WN
-WN
+Gg
+Gg
 xr
 fU
 fU
-WN
-WN
-WN
-WN
+Gg
+Gg
+Gg
+Gg
 Wk
-SX
+un
 Yv
 RN
 yZ
@@ -49570,7 +49920,7 @@ YT
 SK
 RN
 sR
-un
+Ae
 gv
 tN
 IW
@@ -49584,7 +49934,7 @@ JT
 PM
 em
 ei
-Ae
+Vj
 Vj
 SF
 Ni
@@ -49813,7 +50163,7 @@ Ou
 Si
 YS
 uP
-tk
+pn
 Ss
 RN
 rh
@@ -49842,7 +50192,7 @@ zA
 dd
 Zl
 Vj
-Vj
+qo
 CC
 Qe
 kv
@@ -50055,7 +50405,7 @@ ga
 LU
 wl
 fG
-vO
+Kw
 au
 vV
 Ul
@@ -50077,7 +50427,7 @@ RN
 RN
 OK
 Im
-mj
+WF
 HW
 nz
 RN
@@ -50099,7 +50449,7 @@ bg
 pm
 gH
 lC
-lC
+zT
 Cz
 Ni
 Ni
@@ -50313,19 +50663,19 @@ LU
 wl
 kB
 aC
-aC
+Av
 Aa
 aW
 TP
 LQ
 dJ
-WN
+Gg
 JS
 hq
-WN
+Gg
 JA
 gI
-WN
+Gg
 XW
 bW
 Vc
@@ -50570,13 +50920,13 @@ LU
 wl
 kM
 Kw
-Kw
+oS
 Kw
 ym
 NV
 FT
 dI
-WN
+Gg
 du
 KE
 SW
@@ -50833,13 +51183,13 @@ AI
 NV
 qv
 JM
-WN
+Gg
 mg
 Kv
 jQ
 jQ
 Zg
-WN
+Gg
 eY
 ZS
 XB
@@ -51083,20 +51433,20 @@ oD
 oD
 aB
 wl
-wl
-wl
-wl
-wl
+WN
+WN
+WN
+WN
 cw
 Rg
 dT
-WN
+Gg
 gb
 Qw
 Ea
 pp
 tM
-WN
+Gg
 Wy
 Dk
 Te
@@ -51347,7 +51697,7 @@ WN
 PT
 xH
 ec
-WN
+Gg
 gg
 ZJ
 ak
@@ -51377,8 +51727,8 @@ GM
 FE
 eY
 Jz
-un
-GP
+rB
+Jj
 tR
 IM
 jd
@@ -51604,13 +51954,13 @@ tq
 cF
 Rg
 eg
-WN
+Gg
 gi
 kk
 Ii
 iz
-WN
-WN
+Gg
+Gg
 eY
 zh
 XB
@@ -51629,7 +51979,7 @@ eY
 pE
 zO
 eY
-eY
+DX
 pd
 Ty
 eY
@@ -51861,12 +52211,12 @@ WN
 cO
 sI
 RY
-WN
-WN
-WN
-WN
-WN
-WN
+Gg
+Gg
+Gg
+Gg
+Gg
+Gg
 eY
 Gw
 Dk
@@ -51876,7 +52226,7 @@ Cl
 Te
 Te
 Te
-WW
+Te
 Te
 GK
 Te
@@ -51885,7 +52235,7 @@ Dl
 VU
 mq
 vu
-Eu
+eY
 Dy
 Dy
 Dy
@@ -51898,7 +52248,7 @@ bf
 Zj
 ox
 YW
-CT
+By
 if
 qm
 qm
@@ -52385,12 +52735,12 @@ eY
 ds
 mP
 mP
-CA
-DV
 mP
+DV
+mk
 mP
 mP
-Te
+eC
 mP
 DT
 mP
@@ -52627,8 +52977,8 @@ sh
 iV
 VI
 kb
-za
 Fv
+BL
 Tz
 OQ
 VI
@@ -52647,12 +52997,12 @@ mz
 mP
 mP
 mP
-Te
+eC
 mP
 mP
 mP
 gc
-mk
+mP
 mP
 PX
 qB
@@ -52900,7 +53250,7 @@ PF
 hi
 eY
 Zn
-Dk
+Pp
 NO
 hI
 HR
@@ -53161,7 +53511,7 @@ mD
 dK
 CG
 uY
-Te
+ch
 qQ
 CG
 tn
@@ -53414,7 +53764,7 @@ AR
 Ce
 eY
 MG
-dH
+tH
 fx
 ig
 uG
@@ -53433,7 +53783,7 @@ jS
 tp
 Mi
 sf
-kg
+Rc
 Gy
 td
 VM
@@ -53671,7 +54021,7 @@ Xz
 xL
 eY
 Gt
-dH
+tH
 mP
 mP
 mP
@@ -53928,7 +54278,7 @@ WQ
 Ce
 eY
 HK
-dH
+tH
 mP
 kQ
 kQ
@@ -54185,7 +54535,7 @@ WQ
 rC
 eY
 lf
-dH
+tH
 mP
 qq
 qq
@@ -54442,15 +54792,15 @@ Ql
 zU
 eY
 zw
-dH
+tH
 mP
 qq
 qq
-Te
+fA
 qq
 qq
-mP
-ct
+xC
+sk
 Gm
 eY
 oM
@@ -54703,7 +55053,7 @@ JN
 JC
 iA
 iA
-Te
+CA
 iA
 iA
 mP
@@ -54956,15 +55306,15 @@ RQ
 VE
 eY
 Cx
-Dk
+eE
 Xe
-Te
-Te
+WW
+WW
 jX
-Te
-Te
-mP
-ct
+WW
+WW
+Ih
+Gv
 mP
 eY
 LZ
@@ -55492,7 +55842,7 @@ px
 ku
 vT
 oH
-lj
+tS
 Ci
 Pm
 qk
@@ -56499,13 +56849,13 @@ sh
 iV
 eY
 JF
-eY
+AG
 eY
 sx
 sx
 sx
 eY
-eY
+YX
 wT
 eY
 eY
@@ -56519,8 +56869,8 @@ pq
 zD
 Mi
 Ab
-QV
-lj
+DK
+DC
 ZK
 Pm
 Ju
@@ -57792,8 +58142,8 @@ Jc
 BN
 US
 Ok
-Jc
 UK
+Jc
 Ph
 et
 fI
@@ -58313,7 +58663,7 @@ QD
 uF
 uE
 OT
-oS
+lp
 HO
 QD
 dA
@@ -58563,8 +58913,8 @@ Jc
 hy
 US
 BN
-Jc
 UK
+Jc
 jx
 QD
 yP
@@ -59334,8 +59684,8 @@ Jc
 BN
 US
 BN
-Jc
-DX
+UK
+yB
 jx
 QD
 Ko
diff --git a/_maps/map_files/Atlas/atlas2.dmm b/_maps/map_files/Atlas/atlas2.dmm
index 99ddd01f70e..23922a9c5e6 100644
--- a/_maps/map_files/Atlas/atlas2.dmm
+++ b/_maps/map_files/Atlas/atlas2.dmm
@@ -224,6 +224,9 @@
 /obj/structure/table/reinforced,
 /obj/item/storage/bag/tray,
 /obj/item/kitchen/fork,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
 /turf/open/floor/monotile/dark,
 /area/crew_quarters/bar/mess_hall)
 "aX" = (
@@ -270,6 +273,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
 /turf/open/floor/durasteel/lino,
 /area/medical/medbay)
 "bj" = (
@@ -292,7 +298,6 @@
 /area/crew_quarters/kitchen)
 "bs" = (
 /obj/machinery/computer/ship/viewscreen,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 4
 	},
@@ -305,12 +310,8 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/durasteel/techfloor,
 /area/engine/gravity_generator)
 "by" = (
@@ -591,6 +592,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/xo)
 "cV" = (
@@ -631,11 +635,19 @@
 /obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck1/starboard)
+"dd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/durasteel/techfloor,
+/area/ai_monitored/turret_protected/aisat)
 "dg" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
@@ -646,6 +658,9 @@
 	dir = 8;
 	sortType = 22
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "dk" = (
@@ -678,7 +693,7 @@
 	dir = 8
 	},
 /turf/open/floor/engine,
-/area/maintenance/nsv/deck1/port)
+/area/nsv/weapons/gauss/battery/deck2/port)
 "do" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/poddoor/shutters/ship/preopen{
@@ -702,6 +717,9 @@
 /obj/machinery/door/window/eastright{
 	req_one_access_txt = "20"
 	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/captain)
 "dp" = (
@@ -715,20 +733,9 @@
 /turf/open/floor/durasteel/techfloor,
 /area/ai_monitored/turret_protected/ai)
 "dv" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/turf/open/floor/monotile/steel,
-/area/bridge/cic)
+/obj/structure/hull_plate,
+/turf/open/floor/engine/airless,
+/area/nsv/weapons/gauss/battery/deck2/starboard)
 "dw" = (
 /obj/effect/turf_decal/tile/ship/half/green{
 	dir = 8
@@ -834,10 +841,16 @@
 /obj/structure/closet/crate/freezer/blood,
 /obj/machinery/iv_drip,
 /obj/item/reagent_containers/blood/APlus,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
 /turf/open/floor/monotile/dark,
 /area/medical/medbay)
 "dO" = (
 /obj/effect/landmark/start/geneticist,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
 /turf/open/floor/durasteel/lino,
 /area/medical/medbay)
 "dQ" = (
@@ -850,6 +863,9 @@
 /obj/structure/table/wood,
 /obj/item/storage/box/squad_lanyards,
 /obj/item/stamp/xo,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/xo)
 "dW" = (
@@ -873,6 +889,7 @@
 /area/crew_quarters/bar/mess_hall)
 "eb" = (
 /obj/item/kirbyplants/photosynthetic,
+/obj/structure/pool_ladder,
 /turf/open/floor/carpet/ship,
 /area/crew_quarters/dorms)
 "ec" = (
@@ -896,13 +913,6 @@
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "eg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/effect/landmark/start/assistant,
 /obj/structure/chair/stool{
 	dir = 4
 	},
@@ -1054,6 +1064,12 @@
 /obj/structure/chair/stool{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/dark,
 /area/crew_quarters/bar/mess_hall)
 "eL" = (
@@ -1361,7 +1377,6 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/machinery/airalarm/directional/north,
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 4
@@ -1569,18 +1584,18 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/bar/mess_hall)
 "gY" = (
@@ -1614,6 +1629,12 @@
 /obj/structure/sign/ship/deck,
 /turf/closed/wall/steel,
 /area/maintenance/nsv/deck1/port)
+"hp" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/durasteel/techfloor,
+/area/engine/gravity_generator)
 "hq" = (
 /obj/machinery/computer/ship/dradis{
 	dir = 8
@@ -1716,6 +1737,21 @@
 "hN" = (
 /turf/closed/wall/r_wall,
 /area/medical/morgue)
+"hO" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck1/hallway)
 "hP" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -1744,13 +1780,21 @@
 /obj/machinery/light_switch/west,
 /turf/open/floor/durasteel/lino,
 /area/ai_monitored/nuke_storage)
+"hZ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/durasteel/techfloor,
+/area/engine/gravity_generator)
 "if" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
 /turf/open/floor/carpet/blue,
 /area/bridge/cic)
 "ig" = (
@@ -1826,6 +1870,12 @@
 /obj/structure/disposalpipe/junction/flip{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/bar/mess_hall)
 "iv" = (
@@ -2184,10 +2234,13 @@
 /turf/open/floor/carpet/red,
 /area/security/detectives_office)
 "jH" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/effect/landmark/start/geneticist,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
-/obj/effect/landmark/start/geneticist,
 /turf/open/floor/durasteel/lino,
 /area/medical/medbay)
 "jI" = (
@@ -2409,6 +2462,10 @@
 /obj/item/wrench/medical,
 /turf/open/floor/durasteel/lino,
 /area/medical/medbay)
+"kJ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/monotile/dark,
+/area/hydroponics)
 "kK" = (
 /obj/machinery/computer/ship/viewscreen,
 /obj/structure/table/reinforced,
@@ -2426,13 +2483,16 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/xo)
 "kN" = (
 /obj/structure/hull_plate,
 /obj/machinery/ship_weapon/gauss_gun,
 /turf/open/floor/engine/airless,
-/area/space/nearstation)
+/area/nsv/weapons/gauss/battery/deck2/starboard)
 "kO" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -2504,6 +2564,7 @@
 /obj/machinery/camera/autoname{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/bar/mess_hall)
 "kZ" = (
@@ -2635,6 +2696,15 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck1/starboard)
+"ls" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/carpet/blue,
+/area/bridge/cic)
 "lu" = (
 /obj/structure/fluff/bleepypanel{
 	dir = 8
@@ -2757,7 +2827,7 @@
 	dir = 4
 	},
 /turf/open/floor/engine,
-/area/maintenance/nsv/deck1/port)
+/area/nsv/weapons/gauss/battery/deck2/port)
 "lZ" = (
 /obj/effect/turf_decal/tile/ship/half/yellow{
 	dir = 8
@@ -2826,6 +2896,7 @@
 	dir = 1
 	},
 /obj/machinery/suit_storage_unit/captain,
+/obj/item/tank/internals/oxygen,
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/captain)
 "ms" = (
@@ -2850,8 +2921,9 @@
 /turf/open/floor/plating,
 /area/medical/morgue)
 "mv" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
+/obj/effect/landmark/start/head_of_personnel{
+	icon_state = "Executive Officer";
+	name = "Executive Officer"
 	},
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/xo)
@@ -2944,8 +3016,10 @@
 /obj/effect/turf_decal/tile/ship/half/green{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/monotile/dark,
 /area/hallway/nsv/deck1/hallway)
 "mW" = (
@@ -2971,7 +3045,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /turf/open/floor/engine,
-/area/maintenance/nsv/deck1/port)
+/area/nsv/weapons/gauss/battery/deck2/port)
+"ne" = (
+/obj/structure/lattice/catwalk/over/ship,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/monotile/dark,
+/area/hydroponics)
 "nf" = (
 /obj/machinery/porta_turret/ai,
 /obj/effect/turf_decal/stripes/box,
@@ -3072,7 +3151,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "nL" = (
@@ -3105,6 +3186,9 @@
 /obj/effect/landmark/zebra_interlock_point,
 /obj/machinery/door/firedoor/border_only/directional/west,
 /obj/machinery/door/firedoor/border_only/directional/east,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/monotile/dark,
 /area/bridge/cic)
 "nP" = (
@@ -3236,6 +3320,16 @@
 	},
 /turf/open/floor/monotile/steel,
 /area/hydroponics)
+"os" = (
+/obj/effect/turf_decal/tile/ship/green,
+/obj/effect/turf_decal/tile/ship/green{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck1/hallway)
 "ot" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
@@ -3363,13 +3457,13 @@
 	pixel_x = -25;
 	pixel_y = -6
 	},
-/obj/effect/landmark/start/head_of_security,
 /obj/machinery/firealarm/directional/west{
 	pixel_y = 12
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
+/obj/effect/landmark/start/head_of_security,
 /turf/open/floor/carpet/red,
 /area/crew_quarters/heads/hos)
 "pe" = (
@@ -3409,9 +3503,6 @@
 /obj/effect/turf_decal/tile/ship/half/green{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
 /obj/machinery/status_display/evac/east,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
@@ -3450,6 +3541,15 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/xo)
 "pz" = (
@@ -3465,6 +3565,12 @@
 "pD" = (
 /obj/structure/cable,
 /obj/machinery/power/apc/auto_name/south,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/captain)
 "pE" = (
@@ -3479,6 +3585,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/bar/mess_hall)
 "pG" = (
@@ -3572,6 +3679,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
+/obj/effect/landmark/start/chief_medical_officer,
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/cmo)
 "qi" = (
@@ -3580,6 +3688,9 @@
 /obj/structure/chair/stool{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/monotile/dark,
 /area/crew_quarters/bar/mess_hall)
 "qk" = (
@@ -3594,6 +3705,13 @@
 	dir = 4;
 	id = "atlas_xo"
 	},
+/obj/structure/cable{
+	icon_state = "2-8";
+	tag = ""
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/open/floor/plating,
 /area/crew_quarters/heads/xo)
 "ql" = (
@@ -3613,13 +3731,13 @@
 /obj/structure/railing/corner{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
-	},
 /obj/structure/disposalpipe/sorting/mail{
 	sortType = 5;
 	dir = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "qo" = (
@@ -3629,9 +3747,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
 /obj/machinery/hydroponics/constructable,
 /obj/effect/turf_decal/tile/ship/half/green{
 	dir = 1
@@ -3643,6 +3758,7 @@
 /area/crew_quarters/kitchen)
 "qx" = (
 /obj/machinery/suit_storage_unit/cmo,
+/obj/item/tank/internals/oxygen,
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/cmo)
 "qz" = (
@@ -3681,6 +3797,9 @@
 /obj/structure/chair/office{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/durasteel/lino,
 /area/medical/medbay)
 "qM" = (
@@ -3704,6 +3823,7 @@
 /area/hallway/nsv/deck1/hallway)
 "qS" = (
 /obj/machinery/light,
+/obj/machinery/computer/pandemic,
 /turf/open/floor/durasteel/lino,
 /area/medical/medbay)
 "qT" = (
@@ -3840,6 +3960,7 @@
 /area/maintenance/nsv/deck1/port)
 "rv" = (
 /obj/machinery/suit_storage_unit/ce,
+/obj/item/tank/internals/oxygen,
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/chief)
 "rw" = (
@@ -3851,7 +3972,6 @@
 	},
 /obj/effect/landmark/nuclear_waste_spawner,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/durasteel/techfloor,
 /area/ai_monitored/turret_protected/aisat)
 "ry" = (
@@ -3886,15 +4006,10 @@
 "rN" = (
 /obj/structure/table/reinforced,
 /obj/item/paicard,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/monotile/dark,
 /area/crew_quarters/bar/mess_hall)
 "rO" = (
@@ -4052,7 +4167,7 @@
 	dir = 9
 	},
 /turf/open/floor/engine,
-/area/maintenance/nsv/deck1/port)
+/area/nsv/weapons/gauss/battery/deck2/port)
 "su" = (
 /obj/effect/turf_decal/tile/ship/green,
 /obj/effect/turf_decal/tile/ship/green{
@@ -4164,6 +4279,11 @@
 	},
 /turf/open/floor/plating,
 /area/tcommsat/server)
+"sS" = (
+/obj/effect/landmark/start/botanist,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/monotile/dark,
+/area/hydroponics)
 "sT" = (
 /obj/effect/turf_decal/tile/ship/blue,
 /obj/effect/turf_decal/tile/ship/blue{
@@ -4200,11 +4320,11 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/machinery/door/airlock/ship/maintenance,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/airlock/ship/maintenance,
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck1/starboard)
 "tb" = (
@@ -4291,6 +4411,16 @@
 	icon_state = "platingdmg3"
 	},
 /area/maintenance/nsv/deck1/port)
+"tv" = (
+/obj/effect/turf_decal/tile/ship/green,
+/obj/effect/turf_decal/tile/ship/green{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck1/hallway)
 "tx" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4314,6 +4444,12 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
 /turf/open/floor/durasteel/techfloor,
 /area/engine/gravity_generator)
 "tC" = (
@@ -4465,6 +4601,21 @@
 "uj" = (
 /turf/closed/wall/r_wall,
 /area/ai_monitored/turret_protected/ai_upload)
+"uk" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck1/hallway)
 "ur" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/firealarm/directional/north,
@@ -4573,6 +4724,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck1/starboard)
+"uV" = (
+/obj/effect/turf_decal/tile/ship/half/green,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck1/hallway)
 "uX" = (
 /obj/machinery/door/airlock/ship/maintenance,
 /obj/structure/cable{
@@ -4687,8 +4845,18 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/monotile/dark,
 /area/crew_quarters/bar/mess_hall)
+"vq" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/carpet/blue,
+/area/bridge/cic)
 "vs" = (
 /obj/effect/turf_decal/tile/ship/green,
 /obj/effect/turf_decal/tile/ship/green{
@@ -4829,7 +4997,7 @@
 /obj/structure/hull_plate,
 /obj/machinery/ship_weapon/gauss_gun/north,
 /turf/open/floor/engine/airless,
-/area/space/nearstation)
+/area/nsv/weapons/gauss/battery/deck2/port)
 "vZ" = (
 /turf/open/floor/monotile/light,
 /area/crew_quarters/kitchen)
@@ -4938,6 +5106,9 @@
 "wH" = (
 /obj/structure/table/reinforced,
 /obj/item/folder,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
 /turf/open/floor/monotile/dark,
 /area/crew_quarters/bar/mess_hall)
 "wK" = (
@@ -4989,6 +5160,9 @@
 /obj/effect/landmark/zebra_interlock_point,
 /obj/machinery/door/firedoor/border_only/directional/west,
 /obj/machinery/door/firedoor/border_only/directional/east,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/monotile/steel,
 /area/bridge/cic)
 "wX" = (
@@ -5037,6 +5211,12 @@
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "xd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/captain)
 "xf" = (
@@ -5080,9 +5260,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
@@ -5093,6 +5270,9 @@
 	id = "deck1_medical";
 	next_id = "deck1_stairs"
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "xo" = (
@@ -5139,9 +5319,6 @@
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/chief)
 "xr" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/carpet/blue,
 /area/bridge/cic)
@@ -5172,6 +5349,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/rnd/production/protolathe/department/service,
 /turf/open/floor/plasteel/freezer,
 /area/crew_quarters/kitchen)
 "xx" = (
@@ -5313,6 +5491,12 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/bridge/cic)
 "yl" = (
@@ -5345,8 +5529,8 @@
 /obj/machinery/computer/cryopod{
 	pixel_y = 26
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/effect/landmark/latejoin,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/carpet/green,
 /area/hallway/nsv/deck1/hallway)
 "ys" = (
@@ -5398,11 +5582,12 @@
 /obj/machinery/camera/autoname{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
 /turf/open/floor/durasteel/techfloor,
 /area/engine/gravity_generator)
+"yA" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/monotile/dark,
+/area/hydroponics)
 "yB" = (
 /obj/structure/chair/fancy/sofa/old/left{
 	dir = 1
@@ -5583,6 +5768,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/monotile/dark,
 /area/bridge/cic)
 "zK" = (
@@ -5614,12 +5802,10 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/item/beacon,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/carpet/blue,
 /area/bridge/cic)
 "zS" = (
@@ -5639,10 +5825,12 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "zW" = (
@@ -5652,6 +5840,10 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/captain)
 "zY" = (
@@ -5668,11 +5860,15 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/disposalpipe/sorting/mail/flip{
 	sortType = 15
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/monotile/steel,
 /area/bridge/cic)
 "Aa" = (
@@ -5769,6 +5965,9 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/xo)
 "Ar" = (
@@ -5780,6 +5979,11 @@
 /obj/machinery/power/apc/auto_name/north,
 /turf/open/floor/carpet/ship,
 /area/crew_quarters/dorms)
+"As" = (
+/obj/structure/hull_plate,
+/obj/machinery/camera/autoname,
+/turf/open/floor/engine/airless,
+/area/nsv/weapons/gauss/battery/deck2/starboard)
 "Ax" = (
 /obj/structure/lattice/catwalk,
 /turf/open/space/basic,
@@ -5800,6 +6004,12 @@
 /obj/structure/extinguisher_cabinet/north{
 	pixel_x = -6
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/xo)
 "AE" = (
@@ -5838,6 +6048,9 @@
 /obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck1/port)
+"AS" = (
+/turf/closed/wall/r_wall,
+/area/nsv/weapons/gauss/battery/deck2/starboard)
 "AT" = (
 /obj/machinery/hydroponics/constructable,
 /obj/effect/turf_decal/tile/ship/half/green,
@@ -5853,6 +6066,12 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/bridge/cic)
 "AX" = (
@@ -5867,8 +6086,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
 	},
 /turf/open/floor/monotile/dark,
 /area/medical/medbay)
@@ -5902,9 +6121,6 @@
 /turf/open/floor/monotile/dark,
 /area/hydroponics)
 "Bk" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
-	},
 /obj/machinery/light/small,
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 8
@@ -5979,11 +6195,13 @@
 /area/medical/medbay)
 "BE" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/landmark/start/assistant,
 /obj/structure/chair/stool{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/monotile/dark,
 /area/crew_quarters/bar/mess_hall)
 "BF" = (
@@ -6147,6 +6365,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/effect/landmark/start/chief_engineer,
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/chief)
 "Ct" = (
@@ -6350,6 +6569,9 @@
 	pixel_x = -2;
 	pixel_y = 3
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
 /turf/open/floor/monotile/dark,
 /area/crew_quarters/bar/mess_hall)
 "Dp" = (
@@ -6447,6 +6669,9 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/bar/mess_hall)
 "DA" = (
@@ -6476,6 +6701,20 @@
 /obj/machinery/door/window,
 /turf/open/floor/monotile/dark,
 /area/medical/medbay)
+"DD" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "2-8";
+	tag = ""
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck1/hallway)
 "DE" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -6483,15 +6722,13 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "DJ" = (
@@ -6579,14 +6816,8 @@
 /turf/open/floor/circuit/green/telecomms/mainframe,
 /area/tcommsat/server)
 "Ea" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/monotile/dark,
-/area/crew_quarters/bar/mess_hall)
+/turf/closed/wall/r_wall,
+/area/nsv/weapons/gauss/battery/deck2/port)
 "Ed" = (
 /obj/structure/railing,
 /turf/open/openspace,
@@ -6619,6 +6850,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/captain)
 "Em" = (
@@ -6689,10 +6923,10 @@
 /turf/open/floor/plating,
 /area/crew_quarters/heads/xo)
 "EA" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
 /obj/item/beacon,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/medical/medbay)
 "EB" = (
@@ -6728,6 +6962,16 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/carpet/blue,
 /area/bridge/cic)
+"EI" = (
+/obj/effect/turf_decal/tile/ship/green,
+/obj/effect/turf_decal/tile/ship/green{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck1/hallway)
 "EL" = (
 /obj/structure/grille/broken,
 /obj/structure/reagent_dispensers/fueltank,
@@ -6806,12 +7050,6 @@
 /obj/structure/chair/office{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
 /obj/effect/landmark/start/head_of_personnel{
 	icon_state = "Executive Officer";
 	name = "Executive Officer"
@@ -6928,7 +7166,6 @@
 	},
 /area/maintenance/nsv/deck1/starboard)
 "FC" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/effect/landmark/patrol_node{
 	id = "deck1_bar";
 	next_id = "deck1_bridge"
@@ -7040,16 +7277,18 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
-/obj/effect/landmark/start/assistant,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /obj/structure/chair/stool{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/dark,
 /area/crew_quarters/bar/mess_hall)
 "Ge" = (
@@ -7159,6 +7398,11 @@
 	icon_state = "panelscorched"
 	},
 /area/maintenance/nsv/deck1/starboard)
+"GK" = (
+/obj/structure/lattice/catwalk/over/ship,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/monotile/dark,
+/area/hydroponics)
 "GM" = (
 /turf/closed/wall/r_wall,
 /area/crew_quarters/heads/cmo)
@@ -7190,10 +7434,10 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck1/starboard)
 "GZ" = (
-/obj/structure/lattice/catwalk/over/ship,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck1/starboard)
 "Hb" = (
@@ -7311,6 +7555,7 @@
 	dir = 1
 	},
 /obj/item/radio/intercom/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck1/hallway)
 "Ht" = (
@@ -7340,6 +7585,7 @@
 	dir = 1
 	},
 /obj/machinery/firealarm/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck1/hallway)
 "HB" = (
@@ -7463,6 +7709,7 @@
 /turf/open/floor/plating,
 /area/hydroponics)
 "Ig" = (
+/obj/effect/landmark/start/research_director,
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/crew_quarters/heads/hor)
 "Ih" = (
@@ -7707,6 +7954,9 @@
 /area/hallway/nsv/deck1/hallway)
 "IX" = (
 /obj/effect/landmark/start/paramedic,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
 /turf/open/floor/monotile/dark,
 /area/medical/medbay)
 "IY" = (
@@ -7758,17 +8008,14 @@
 /turf/closed/wall/r_wall,
 /area/ai_monitored/turret_protected/ai_upload)
 "Jl" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
 /obj/machinery/hydroponics/constructable,
 /obj/effect/turf_decal/tile/ship/half/green{
 	dir = 1
 	},
 /obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/hydroponics)
 "Jn" = (
@@ -7791,6 +8038,9 @@
 	dir = 8
 	},
 /obj/machinery/door/firedoor/border_only/directional/east,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/monotile/steel,
 /area/bridge/cic)
 "Jo" = (
@@ -7853,6 +8103,21 @@
 /obj/machinery/light,
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/cmo)
+"JE" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck1/hallway)
 "JG" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -8270,6 +8535,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/monotile/dark,
 /area/bridge/cic)
 "Ll" = (
@@ -8330,10 +8598,11 @@
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "LG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/monotile/dark,
-/area/crew_quarters/bar/mess_hall)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck1/hallway)
 "LJ" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
@@ -8369,6 +8638,9 @@
 /area/maintenance/nsv/deck1/port)
 "LN" = (
 /obj/effect/landmark/start/medical_doctor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/dark,
 /area/medical/medbay)
 "LP" = (
@@ -8418,12 +8690,12 @@
 	name = "Head of Security RC";
 	pixel_y = 26
 	},
+/obj/item/tank/internals/oxygen,
 /turf/open/floor/carpet/red,
 /area/crew_quarters/heads/hos)
 "LT" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/landmark/start/captain,
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/captain)
 "LU" = (
@@ -8514,13 +8786,14 @@
 	dir = 4;
 	id = "atlas_cap"
 	},
+/obj/structure/cable{
+	icon_state = "2-8";
+	tag = ""
+	},
 /turf/open/floor/plating,
 /area/crew_quarters/heads/captain)
 "Mq" = (
 /obj/machinery/light/small,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
-	},
 /turf/open/floor/durasteel/techfloor,
 /area/engine/gravity_generator)
 "Mr" = (
@@ -8598,11 +8871,15 @@
 /turf/open/floor/durasteel/techfloor,
 /area/ai_monitored/turret_protected/aisat)
 "MJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/monotile/dark,
-/area/hydroponics)
+/obj/effect/turf_decal/tile/ship/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/ship/blue,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck1/hallway)
 "MN" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -8955,11 +9232,24 @@
 	req_one_access_txt = "20"
 	},
 /obj/effect/landmark/zebra_interlock_point,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/captain)
 "NU" = (
 /turf/open/floor/plating,
 /area/medical/morgue)
+"NV" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/medical/morgue)
 "NX" = (
 /obj/machinery/light,
 /obj/machinery/telecomms/server/presets/command,
@@ -9055,13 +9345,13 @@
 /turf/open/floor/monotile/dark,
 /area/bridge/cic)
 "Ou" = (
-/obj/structure/lattice/catwalk/over/ship,
 /obj/machinery/light/small{
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
+/obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck1/starboard)
 "Ov" = (
@@ -9105,12 +9395,6 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/item/paper_bin,
 /obj/item/pen,
 /obj/effect/landmark/zebra_interlock_point,
@@ -9118,6 +9402,7 @@
 /obj/machinery/door/window/eastleft{
 	req_one_access_txt = "57"
 	},
+/obj/structure/cable,
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/xo)
 "OB" = (
@@ -9138,6 +9423,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck1/port)
+"OI" = (
+/obj/structure/pool_ladder,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/dorms)
 "OM" = (
 /obj/machinery/door/airlock/ship/public/glass{
 	name = "Hydroponics";
@@ -9217,7 +9506,6 @@
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/bar/mess_hall)
 "Pe" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 1
 	},
@@ -9254,6 +9542,16 @@
 	},
 /turf/closed/wall/r_wall,
 /area/maintenance/nsv/deck1/central)
+"Po" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/chair/stool{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/monotile/dark,
+/area/crew_quarters/bar/mess_hall)
 "Pp" = (
 /obj/structure/railing{
 	dir = 1
@@ -9296,12 +9594,6 @@
 /obj/structure/chair/office{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
 /obj/effect/landmark/start/captain,
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/captain)
@@ -9349,7 +9641,6 @@
 	},
 /obj/machinery/camera/autoname,
 /obj/item/radio/intercom/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck1/hallway)
 "PN" = (
@@ -9384,6 +9675,13 @@
 /obj/machinery/cryopod,
 /turf/open/floor/carpet/green,
 /area/hallway/nsv/deck1/hallway)
+"PU" = (
+/obj/effect/landmark/start/paramedic,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/monotile/dark,
+/area/medical/medbay)
 "PX" = (
 /obj/structure/closet/radiation,
 /turf/open/floor/plating,
@@ -9696,11 +9994,11 @@
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "Rw" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
 /obj/effect/landmark/latejoin,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "RC" = (
@@ -9745,6 +10043,12 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/bridge/cic)
 "RM" = (
@@ -9897,13 +10201,9 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/carpet/blue,
 /area/bridge/cic)
 "SM" = (
@@ -9945,6 +10245,16 @@
 	},
 /turf/open/floor/engine,
 /area/hallway/nsv/deck1/hallway)
+"SV" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
+"SW" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/medical/morgue)
 "SX" = (
 /obj/structure/lattice,
 /turf/open/openspace,
@@ -9974,12 +10284,6 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck1/starboard)
 "Tg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/effect/landmark/start/assistant,
 /obj/structure/disposalpipe/segment,
 /obj/structure/disposalpipe/segment{
@@ -10011,6 +10315,9 @@
 /obj/item/bedsheet/hop{
 	name = "executive officer's bedsheet"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/xo)
 "Tk" = (
@@ -10094,8 +10401,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
 /turf/open/floor/plating,
 /area/medical/morgue)
@@ -10178,13 +10485,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "TZ" = (
@@ -10221,10 +10528,12 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "Uh" = (
@@ -10253,6 +10562,9 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/monotile/dark,
 /area/bridge/cic)
 "Ul" = (
@@ -10321,6 +10633,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
+/obj/effect/landmark/start/head_of_security,
 /turf/open/floor/carpet/red,
 /area/crew_quarters/heads/hos)
 "UA" = (
@@ -10333,14 +10646,9 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck1/central)
 "UE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/turf/open/floor/carpet/blue,
-/area/bridge/cic)
+/obj/structure/hull_plate,
+/turf/open/floor/engine/airless,
+/area/nsv/weapons/gauss/battery/deck2/port)
 "UG" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
@@ -10351,9 +10659,13 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
 /turf/open/floor/monotile/steel,
 /area/bridge/cic)
 "UH" = (
@@ -10432,6 +10744,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/firealarm/directional/east,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/bar/mess_hall)
 "US" = (
@@ -10443,6 +10756,13 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/dark,
 /area/crew_quarters/bar/mess_hall)
+"UV" = (
+/obj/structure/hull_plate,
+/obj/machinery/camera/autoname{
+	dir = 1
+	},
+/turf/open/floor/engine/airless,
+/area/nsv/weapons/gauss/battery/deck2/port)
 "UX" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -10481,6 +10801,15 @@
 	},
 /turf/open/floor/monotile/dark,
 /area/engine/gravity_generator)
+"Vk" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/durasteel/lino,
+/area/medical/medbay)
 "Vl" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -10553,7 +10882,7 @@
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "VE" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /turf/open/floor/monotile/dark,
@@ -10563,7 +10892,14 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck1/starboard)
 "VI" = (
-/obj/machinery/airalarm/directional/north,
+/obj/machinery/airalarm/all_access{
+	pixel_y = 25;
+	mode = 5
+	},
+/obj/item/paper/fluff/awaymissions{
+	default_raw_text = "<center>Remember to turn on the Air Alarm- Engineering</center>";
+	name = "IMPORTANT REMINDER"
+	},
 /turf/open/floor/carpet/red,
 /area/security/detectives_office)
 "VJ" = (
@@ -10629,6 +10965,12 @@
 	dir = 8
 	},
 /obj/machinery/door/firedoor/border_only/directional/east,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/monotile/dark,
 /area/bridge/cic)
 "VZ" = (
@@ -10643,6 +10985,12 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/bridge/cic)
 "Wf" = (
@@ -11028,9 +11376,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
@@ -11076,13 +11421,15 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/monotile/dark,
 /area/crew_quarters/bar/mess_hall)
 "Yt" = (
@@ -11174,10 +11521,13 @@
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "YP" = (
-/obj/machinery/hydroponics/constructable,
 /obj/effect/turf_decal/tile/ship/half/green{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/monotile/steel,
 /area/hydroponics)
 "YR" = (
@@ -11186,17 +11536,17 @@
 	pixel_y = 16
 	},
 /turf/open/floor/engine/airless,
-/area/space/nearstation)
+/area/nsv/weapons/gauss/battery/deck2/port)
 "YU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
 /obj/effect/turf_decal/tile/ship/half/green{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
 /turf/open/floor/monotile/steel,
 /area/hydroponics)
 "YV" = (
@@ -11259,8 +11609,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
 /turf/open/floor/durasteel/lino,
 /area/medical/medbay)
@@ -36961,11 +37311,11 @@ Ag
 WN
 Vi
 aj
-aj
+hp
 Mq
 yE
 mf
-em
+rZ
 Yk
 Ly
 wa
@@ -37475,12 +37825,12 @@ EB
 WN
 kB
 CP
-aj
+hZ
 yz
 yE
 QJ
-rZ
-ui
+em
+dd
 rZ
 sj
 cQ
@@ -40309,7 +40659,7 @@ Xv
 Ql
 Uf
 Bs
-Xv
+DD
 Lz
 Xv
 Nb
@@ -40566,7 +40916,7 @@ Zr
 nr
 pl
 Db
-Zr
+os
 Zr
 kp
 NL
@@ -41599,8 +41949,8 @@ uj
 UA
 gq
 hA
-wu
-YC
+JE
+uV
 TE
 DK
 lA
@@ -42370,7 +42720,7 @@ uj
 dF
 gq
 Hq
-wu
+jQ
 Sc
 XZ
 lo
@@ -42602,19 +42952,19 @@ HI
 qO
 qO
 tz
-HI
-HI
-HI
-HI
-HI
-HI
-HI
+Ea
+Ea
+Ea
+Ea
+Ea
+Ea
+Ea
 SX
 oj
 hk
-HT
-zV
-Sc
+MQ
+Cb
+tv
 Am
 Tc
 Tc
@@ -42626,7 +42976,7 @@ Fh
 Tc
 Tc
 jx
-HT
+MQ
 zV
 Sc
 MS
@@ -42859,13 +43209,13 @@ HI
 qO
 qO
 tz
-HI
-mK
-mK
-mK
-mK
-mK
-HI
+Ea
+UE
+UE
+UE
+UE
+UE
+Ea
 SX
 Pp
 Re
@@ -42890,11 +43240,11 @@ LQ
 Ya
 rO
 MS
-lx
-mK
-mK
-mK
-mK
+AS
+dv
+dv
+dv
+dv
 mK
 Rg
 cL
@@ -43116,18 +43466,18 @@ HI
 qO
 qO
 tz
-HI
-mK
-mK
-mK
-mK
+Ea
+UE
+UE
+UE
+UE
 vW
-HI
+Ea
 SX
 Ku
 HG
 PM
-cz
+hO
 Em
 aP
 xS
@@ -43147,11 +43497,11 @@ MS
 Va
 rO
 MS
-mK
-mK
+dv
+dv
 kN
-mK
-mK
+dv
+dv
 mK
 Rg
 cL
@@ -43373,13 +43723,13 @@ HI
 HI
 HI
 HX
-HI
-mK
-mK
-mK
-mK
-qG
-HI
+Ea
+UE
+UE
+UE
+UE
+UV
+Ea
 SX
 vu
 HG
@@ -43404,11 +43754,11 @@ MS
 wX
 db
 MS
-yg
-mK
-mK
-mK
-mK
+As
+dv
+dv
+dv
+dv
 mK
 Rg
 cx
@@ -43630,13 +43980,13 @@ HI
 HI
 Zf
 MF
-HI
+Ea
 lX
-HI
-mK
-mK
-mK
-HI
+Ea
+UE
+UE
+UE
+Ea
 SX
 vu
 HG
@@ -43656,16 +44006,16 @@ Tc
 Am
 IY
 xn
-Sc
+EI
 MS
 dH
 rV
 MS
-mK
-mK
-mK
-mK
-mK
+dv
+dv
+dv
+dv
+dv
 mK
 Rg
 cx
@@ -43887,18 +44237,18 @@ qb
 HI
 zK
 Bl
-HI
+Ea
 dn
-HI
-mK
-mK
+Ea
+UE
+UE
 vW
-HI
+Ea
 ZR
 BJ
 HG
-MQ
-wu
+vU
+cz
 Sc
 Tc
 Tc
@@ -43918,11 +44268,11 @@ MS
 Om
 bU
 MS
-mK
-mK
+dv
+dv
 kN
-mK
-mK
+dv
+dv
 mK
 Rg
 cx
@@ -44146,11 +44496,11 @@ rg
 ot
 na
 ss
-HI
+Ea
 YR
-mK
-mK
-HI
+UE
+UE
+Ea
 cm
 LL
 HG
@@ -44175,11 +44525,11 @@ MS
 Ge
 lh
 MS
-lx
-mK
-mK
-mK
-mK
+AS
+dv
+dv
+dv
+dv
 mK
 Rg
 cx
@@ -44433,8 +44783,8 @@ MS
 ta
 MS
 MS
-lx
-lx
+MS
+MS
 MS
 MS
 MS
@@ -44669,8 +45019,8 @@ ii
 Xw
 uG
 MQ
-wu
-Sc
+Cb
+tv
 MZ
 iB
 Lj
@@ -44682,8 +45032,8 @@ EZ
 NY
 kT
 zt
-MQ
-wu
+HT
+jQ
 Sc
 pB
 CF
@@ -45429,9 +45779,9 @@ qO
 HI
 PC
 NK
-XP
-Yj
-NK
+sS
+yA
+GK
 YP
 mz
 uG
@@ -45687,8 +46037,8 @@ HI
 Tw
 NK
 Ce
-mW
-MJ
+Yj
+NK
 Jl
 mz
 LX
@@ -45728,7 +46078,7 @@ Mf
 Jd
 MS
 aa
-NU
+NV
 jz
 hN
 FM
@@ -45967,7 +46317,7 @@ TO
 ej
 lD
 nV
-HT
+vU
 TX
 nD
 DQ
@@ -45985,7 +46335,7 @@ Mf
 av
 MS
 ZY
-NU
+SW
 jz
 hN
 FM
@@ -46201,8 +46551,8 @@ HI
 am
 NK
 Yj
-Yj
-NK
+kJ
+ne
 YU
 jc
 aq
@@ -46220,7 +46570,7 @@ SK
 EH
 zM
 if
-SK
+ls
 JW
 UG
 Dp
@@ -46473,11 +46823,11 @@ sH
 OY
 RL
 Qc
-UE
+pw
 gY
 xr
+vq
 pw
-UE
 Qc
 AU
 OY
@@ -46490,7 +46840,7 @@ Zl
 CG
 DQ
 AY
-bi
+Vk
 rX
 WJ
 MS
@@ -46730,11 +47080,11 @@ rc
 wz
 Wd
 bZ
-dv
+ht
 ht
 ht
 fe
-dv
+ht
 bZ
 yh
 ZN
@@ -46996,8 +47346,8 @@ Mp
 NP
 at
 fS
-zV
-sA
+uk
+MJ
 DQ
 Oe
 Mo
@@ -47016,7 +47366,7 @@ XN
 NU
 mt
 hN
-cL
+SV
 SP
 cL
 cL
@@ -47234,7 +47584,7 @@ mW
 rm
 Iw
 bk
-BE
+Po
 om
 UU
 UU
@@ -47273,8 +47623,8 @@ hN
 hN
 hN
 hN
-cL
-gn
+SV
+SP
 cL
 cL
 cL
@@ -47785,9 +48135,9 @@ dQ
 dQ
 lx
 cx
+vc
 cx
-cx
-Cf
+SP
 Zp
 cL
 cL
@@ -48008,8 +48358,8 @@ Pf
 hJ
 hJ
 FC
-LG
-Ea
+hJ
+hJ
 Ys
 nG
 SH
@@ -48029,7 +48379,7 @@ sc
 cH
 kE
 zH
-IX
+PU
 TM
 vf
 WJ
@@ -48042,10 +48392,10 @@ dQ
 dQ
 cx
 cx
-cx
+vc
 cx
 cL
-gn
+SP
 cL
 cL
 cL
@@ -48299,9 +48649,9 @@ cx
 cx
 cx
 cx
+vc
 cx
-cx
-gn
+SP
 SP
 cL
 cL
@@ -48551,15 +48901,15 @@ WJ
 cx
 cx
 cx
-cx
-cx
-cx
-cx
-cx
-cx
+vc
+vc
+vc
+vc
+vc
+vc
 cx
 SP
-Cf
+SP
 cL
 cL
 cL
@@ -48813,10 +49163,10 @@ cx
 cx
 cx
 cx
-cx
+vc
 cx
 cL
-Cf
+SP
 cL
 cL
 cL
@@ -49053,7 +49403,7 @@ Am
 Am
 Am
 ST
-Em
+LG
 qP
 Em
 Em
@@ -49070,10 +49420,10 @@ cx
 cx
 cx
 cx
+vc
 cx
-cx
-cL
-Cf
+SV
+SP
 cL
 cL
 cL
@@ -49327,10 +49677,10 @@ cx
 cx
 cx
 cx
+vc
 cx
-cx
-cL
-Cf
+SV
+SP
 cL
 cL
 cL
@@ -49584,10 +49934,10 @@ cx
 cx
 cx
 cx
+vc
 cx
-cx
-cL
-Cf
+SV
+SP
 cL
 cL
 cL
@@ -49841,10 +50191,10 @@ cx
 cx
 cx
 cx
-cx
+vc
 cx
 cL
-Cf
+SP
 cL
 cL
 cL
@@ -50067,7 +50417,7 @@ xf
 Ar
 LR
 eb
-xf
+OI
 xf
 mK
 mK
@@ -50323,8 +50673,8 @@ sh
 xf
 xf
 xf
-xf
-xf
+OI
+OI
 mK
 mK
 mK
@@ -50358,7 +50708,7 @@ cx
 cx
 cx
 cL
-Cf
+SP
 cL
 cL
 cL
@@ -50615,7 +50965,7 @@ cx
 cx
 cx
 SP
-Cf
+SP
 cL
 cL
 cL
diff --git a/_maps/map_files/Eclipse/Eclipse1.dmm b/_maps/map_files/Eclipse/Eclipse1.dmm
index 5864a40a510..325369bf636 100644
--- a/_maps/map_files/Eclipse/Eclipse1.dmm
+++ b/_maps/map_files/Eclipse/Eclipse1.dmm
@@ -638,12 +638,6 @@
 /turf/open/floor/plating,
 /area/nsv/weapons/fore)
 "dm" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/structure/ladder,
 /obj/effect/turf_decal/stripes/box,
 /obj/structure/sign/ship/space{
@@ -1491,7 +1485,6 @@
 	},
 /area/crew_quarters/lounge)
 "gL" = (
-/obj/structure/cable,
 /turf/open/floor/plasteel/dark/side{
 	dir = 10
 	},
@@ -2572,13 +2565,6 @@
 	},
 /turf/open/floor/noslip/white,
 /area/crew_quarters/toilet/restrooms)
-"kD" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/caution/stand_clear,
-/turf/open/floor/monotile/steel,
-/area/nsv/weapons/fore)
 "kE" = (
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/food/condiment/saltshaker{
@@ -3243,9 +3229,6 @@
 /turf/open/floor/plasteel/tiled/light,
 /area/medical/sleeper)
 "mZ" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/closed/wall/steel,
@@ -3348,6 +3331,15 @@
 /obj/structure/table/reinforced,
 /turf/open/floor/monotile/dark,
 /area/crew_quarters/bar)
+"nw" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/monotile/dark,
+/area/nsv/weapons/fore)
 "nz" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
@@ -3466,15 +3458,6 @@
 	},
 /turf/open/floor/plasteel/tiled/light,
 /area/medical/sleeper)
-"oa" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
-	},
-/turf/open/floor/monotile/steel,
-/area/nsv/weapons/fore)
 "ob" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
@@ -4366,16 +4349,18 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/structure/cable,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons/fore)
 "rT" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark/side{
+	dir = 4
 	},
-/turf/closed/wall/steel,
 /area/nsv/weapons/fore)
 "rX" = (
 /turf/closed/wall/r_wall,
@@ -4906,12 +4891,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/monotile/dark,
 /area/engine/engine_room)
-"ur" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/monotile/steel,
-/area/nsv/weapons/fore)
 "us" = (
 /turf/open/floor/plasteel/dark/side{
 	dir = 4
@@ -5028,9 +5007,6 @@
 /turf/open/floor/plasteel/dark/side,
 /area/engine/engine_smes)
 "uO" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/monotile/steel,
@@ -6475,12 +6451,6 @@
 /turf/open/floor/monotile/dark,
 /area/engine/engine_smes)
 "AN" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
 	},
@@ -6488,6 +6458,9 @@
 	dir = 8
 	},
 /obj/machinery/light,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons/fore)
 "AO" = (
@@ -7179,15 +7152,6 @@
 	},
 /turf/open/floor/monotile/dark,
 /area/engine/engine_room)
-"DV" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/loading_area{
-	dir = 1
-	},
-/turf/open/floor/monotile/steel,
-/area/nsv/weapons/fore)
 "DW" = (
 /obj/machinery/light{
 	dir = 8
@@ -8876,14 +8840,6 @@
 	dir = 4
 	},
 /area/hallway/primary/aft)
-"KK" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plasteel/dark/side{
-	dir = 8
-	},
-/area/nsv/weapons/fore)
 "KL" = (
 /obj/structure/sign/poster/contraband/lusty_xenomorph,
 /turf/closed/wall/r_wall,
@@ -12238,8 +12194,18 @@
 	},
 /area/nsv/weapons/fore)
 "Yo" = (
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/dark/side,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/arrows{
+	dir = 4
+	},
+/obj/effect/landmark/start/munitions_tech,
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/monotile/dark,
 /area/nsv/weapons/fore)
 "Yq" = (
 /obj/structure/chair/fancy/sofa/old/corner/concave{
@@ -12551,14 +12517,6 @@
 /obj/structure/grille,
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
-"Zz" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/dark/side{
-	dir = 8
-	},
-/area/nsv/weapons/fore)
 "ZA" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -42871,10 +42829,10 @@ rX
 Mw
 ih
 JX
-KK
-Zz
-Zz
-Zz
+JX
+JX
+JX
+JX
 gL
 rX
 gY
@@ -43128,7 +43086,7 @@ rX
 oN
 OK
 xH
-DV
+db
 OK
 xH
 db
@@ -43385,7 +43343,7 @@ rX
 Yu
 OK
 kl
-kD
+nR
 OK
 kl
 nR
@@ -43640,9 +43598,9 @@ Nn
 hz
 rX
 Yu
-oa
+Kz
 Pm
-ur
+OK
 OK
 Pm
 Kz
@@ -43898,12 +43856,12 @@ qu
 yH
 WC
 AN
-rT
+mZ
 dm
 uO
 mZ
 rR
-Yo
+gi
 rX
 gY
 Gs
@@ -44154,7 +44112,7 @@ Nn
 hz
 wJ
 Zj
-bK
+rT
 Xe
 SV
 SV
@@ -44410,8 +44368,8 @@ Az
 xP
 Uw
 rX
-Ak
-gN
+Yo
+nw
 Ak
 gN
 Ak
diff --git a/_maps/map_files/Eclipse/Eclipse2.dmm b/_maps/map_files/Eclipse/Eclipse2.dmm
index 9ccb2f487bf..fcc690233e5 100644
--- a/_maps/map_files/Eclipse/Eclipse2.dmm
+++ b/_maps/map_files/Eclipse/Eclipse2.dmm
@@ -38,7 +38,7 @@
 	dir = 1
 	},
 /turf/open/floor/monotile/dark/airless,
-/area/space/nearstation)
+/area/nsv/weapons/fore)
 "eE" = (
 /obj/structure/frame/machine,
 /obj/item/circuitboard/machine/anti_air,
@@ -47,7 +47,7 @@
 "eO" = (
 /obj/machinery/ship_weapon/gauss_gun/east,
 /turf/open/floor/monotile/dark/airless,
-/area/space/nearstation)
+/area/nsv/weapons/fore)
 "fb" = (
 /obj/effect/turf_decal/ship/letter{
 	icon_state = "2"
@@ -71,7 +71,7 @@
 "ho" = (
 /obj/item/stack/cable_coil/red,
 /turf/open/floor/plating/airless,
-/area/space/nearstation)
+/area/nsv/weapons/fore)
 "hM" = (
 /obj/machinery/light/runway{
 	use_power = 0
@@ -213,7 +213,7 @@
 	dir = 4
 	},
 /turf/open/floor/monotile/dark/airless,
-/area/space/nearstation)
+/area/nsv/weapons/fore)
 "ys" = (
 /obj/structure/lattice/catwalk,
 /turf/open/space/basic,
@@ -227,6 +227,10 @@
 	},
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"zg" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning,
+/turf/open/floor/monotile/dark/airless,
+/area/nsv/weapons/fore)
 "zj" = (
 /obj/effect/turf_decal/ship/letter{
 	icon_state = "I";
@@ -234,6 +238,11 @@
 	},
 /turf/open/floor/monotile/dark/airless,
 /area/space/nearstation)
+"zr" = (
+/obj/structure/ladder,
+/obj/effect/turf_decal/stripes/box,
+/turf/open/floor/plating/airless,
+/area/nsv/weapons/fore)
 "zx" = (
 /obj/effect/landmark/carpspawn,
 /turf/open/floor/monotile/dark/airless,
@@ -254,6 +263,10 @@
 	},
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"AH" = (
+/obj/item/stack/tile/durasteel/mono_dark,
+/turf/open/floor/monotile/dark/airless,
+/area/nsv/weapons/fore)
 "BP" = (
 /obj/structure/closet/crate/large{
 	anchored = 1;
@@ -268,6 +281,9 @@
 /obj/effect/landmark/carpspawn,
 /turf/open/space/basic,
 /area/space)
+"Ej" = (
+/turf/open/floor/monotile/dark/airless,
+/area/nsv/weapons/fore)
 "Fq" = (
 /obj/effect/turf_decal/ship/letter{
 	icon_state = "P"
@@ -280,7 +296,7 @@
 	},
 /obj/effect/turf_decal/trimline/yellow/filled/warning,
 /turf/open/floor/monotile/dark/airless,
-/area/space/nearstation)
+/area/nsv/weapons/fore)
 "Gm" = (
 /obj/effect/turf_decal/tile/ship/full/yellow,
 /obj/effect/turf_decal/tile/ship/full/yellow,
@@ -302,6 +318,16 @@
 	},
 /turf/open/floor/monotile/steel/airless,
 /area/space/nearstation)
+"Iv" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/monotile/dark/airless,
+/area/space/nearstation)
+"JE" = (
+/obj/item/stack/tile/durasteel/mono_dark,
+/turf/open/floor/plating/airless,
+/area/nsv/weapons/fore)
 "JV" = (
 /obj/effect/turf_decal/ship/letter{
 	icon_state = "S"
@@ -419,6 +445,9 @@
 /obj/effect/turf_decal/stripes/white/full,
 /turf/open/floor/monotile/dark/airless,
 /area/space/nearstation)
+"We" = (
+/turf/open/floor/plating/airless,
+/area/nsv/weapons/fore)
 "WV" = (
 /obj/structure/lattice,
 /turf/open/space/basic,
@@ -26813,7 +26842,7 @@ YI
 YI
 YI
 YI
-YI
+Iv
 YI
 YI
 YI
@@ -30419,15 +30448,15 @@ YI
 YI
 YI
 YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
 NC
 MS
 MS
@@ -30676,15 +30705,15 @@ YI
 YI
 YI
 YI
-YI
-YI
-YI
-YI
-UK
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+JE
+Ej
+Ej
+Ej
+Ej
 NC
 MS
 MS
@@ -30933,15 +30962,15 @@ YI
 YI
 YI
 YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
 NC
 MS
 MS
@@ -31190,15 +31219,15 @@ YI
 YI
 YI
 YI
-jF
-UK
-YI
+JE
+We
+Ej
 eO
-YI
-YI
+Ej
+Ej
 eO
-YI
-YI
+Ej
+Ej
 NC
 MS
 MS
@@ -31447,15 +31476,15 @@ pc
 YI
 YI
 YI
-YI
-YI
-YI
-YI
-YI
-YI
-UK
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+We
+Ej
+Ej
 NC
 MS
 MS
@@ -31704,15 +31733,15 @@ pc
 YI
 YI
 UK
-YI
-XJ
-YI
-YI
-Mm
-YI
-YI
-UK
-YI
+Ej
+AH
+Ej
+Ej
+zr
+Ej
+Ej
+We
+Ej
 NC
 MS
 MS
@@ -31961,15 +31990,15 @@ pc
 YI
 YI
 YI
-YI
+Ej
 ho
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
 NC
 MS
 MS
@@ -32218,15 +32247,15 @@ pc
 YI
 YI
 YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
 NC
 MS
 MS
@@ -32475,15 +32504,15 @@ pc
 YI
 YI
 YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
 NC
 MS
 MS
@@ -32732,15 +32761,15 @@ rW
 YI
 YI
 YI
-iw
+zg
 xw
 Gj
 xw
 ed
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
 NC
 MS
 MS
@@ -32989,15 +33018,15 @@ YI
 YI
 YI
 YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
 NC
 MS
 MS
@@ -33246,15 +33275,15 @@ YI
 YI
 YI
 YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
 NC
 MS
 MS
@@ -33503,15 +33532,15 @@ YI
 YI
 YI
 YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
 NC
 MS
 MS