diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index b8b361b8747..18d8b322d1a 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -4597,22 +4597,16 @@
 	pixel_y = 32
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/portable_atmospherics/canister,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 8
+/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible{
+	dir = 6
 	},
 /turf/open/floor/iron/checker,
 /area/maintenance/disposal/incinerator)
 "aGS" = (
 /obj/machinery/light/directional/north,
-/obj/machinery/portable_atmospherics/canister,
-/obj/effect/turf_decal/delivery,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -4626,6 +4620,9 @@
 /obj/machinery/airalarm/unlocked{
 	pixel_y = 23
 	},
+/obj/machinery/atmospherics/components/binary/thermomachine/heater{
+	dir = 8
+	},
 /turf/open/floor/iron/dark,
 /area/maintenance/disposal/incinerator)
 "aGT" = (
@@ -4633,7 +4630,6 @@
 	c_tag = "Atmospherics - Incinerator";
 	name = "atmospherics camera"
 	},
-/obj/effect/turf_decal/delivery,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -4644,20 +4640,13 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/tank/toxins,
 /obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
 /turf/open/floor/iron/dark,
 /area/maintenance/disposal/incinerator)
 "aGU" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
 /obj/structure/cable,
-/obj/structure/rack,
-/obj/item/storage/toolbox/emergency,
-/obj/item/wrench,
-/obj/item/tank/internals/emergency_oxygen/engi,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -4668,6 +4657,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
 /turf/open/floor/iron/dark,
 /area/maintenance/disposal/incinerator)
 "aGV" = (
@@ -4685,6 +4675,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
 /turf/open/floor/iron/dark,
 /area/maintenance/disposal/incinerator)
 "aGW" = (
@@ -4705,6 +4696,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
 /turf/open/floor/iron/dark,
 /area/maintenance/disposal/incinerator)
 "aGY" = (
@@ -4940,9 +4932,9 @@
 "aIy" = (
 /obj/machinery/light_switch/directional/north,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/fueltank/large,
 /obj/effect/turf_decal/bot,
 /obj/machinery/firealarm/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron,
 /area/maintenance/disposal/incinerator)
 "aIH" = (
@@ -5129,9 +5121,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 4
-	},
 /turf/open/floor/iron,
 /area/maintenance/disposal/incinerator)
 "aKc" = (
@@ -19261,7 +19250,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
 /turf/open/floor/iron/dark/corner,
 /area/maintenance/disposal/incinerator)
 "czq" = (
@@ -19854,7 +19842,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
 /turf/open/floor/iron,
 /area/maintenance/disposal/incinerator)
 "cGJ" = (
@@ -40450,11 +40437,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/security/checkpoint/customs/auxiliary)
-"eVv" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/engineering/atmos)
 "eVw" = (
 /obj/structure/table/reinforced,
 /obj/item/cartridge/quartermaster{
@@ -41999,6 +41981,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
 /turf/open/floor/iron,
 /area/maintenance/disposal/incinerator)
 "foK" = (
@@ -44512,7 +44495,6 @@
 /turf/open/floor/iron,
 /area/service/hydroponics/garden/abandoned)
 "gcW" = (
-/obj/structure/reagent_dispensers/watertank,
 /obj/effect/turf_decal/bot,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 9
@@ -46765,6 +46747,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible,
 /turf/closed/wall/r_wall,
 /area/engineering/atmos)
+"gMn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engineering/atmos)
 "gMy" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/neutral{
@@ -57480,13 +57467,11 @@
 /turf/open/floor/iron/dark,
 /area/commons/fitness/recreation)
 "jLK" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/package_wrap,
-/obj/item/hand_labeler,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
 /obj/machinery/status_display/ai/directional/south,
+/obj/machinery/pipedispenser,
 /turf/open/floor/iron,
 /area/engineering/atmos)
 "jLY" = (
@@ -59697,6 +59682,10 @@
 	},
 /turf/open/floor/iron,
 /area/hallway/primary/central/fore)
+"kqP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
+/turf/closed/wall,
+/area/engineering/atmos)
 "kry" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -59865,6 +59854,20 @@
 	},
 /turf/open/floor/iron,
 /area/commons/fitness/recreation)
+"kto" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
+/turf/open/floor/iron/dark,
+/area/engineering/atmos)
 "ktw" = (
 /obj/structure/table/wood,
 /obj/item/storage/fancy/donut_box,
@@ -60147,7 +60150,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
 /turf/open/floor/iron,
 /area/engineering/atmos)
 "kxn" = (
@@ -68745,6 +68748,17 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/hallway/primary/fore)
+"mKX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/maintenance/disposal/incinerator)
 "mLh" = (
 /obj/machinery/light/directional/east,
 /obj/effect/turf_decal/tile/neutral{
@@ -83418,6 +83432,9 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 9
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/open/floor/iron,
 /area/maintenance/disposal/incinerator)
 "qxg" = (
@@ -94143,17 +94160,6 @@
 	dir = 1
 	},
 /area/engineering/atmos)
-"tjK" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
-/turf/open/floor/iron/dark/corner,
-/area/maintenance/disposal/incinerator)
 "tjO" = (
 /obj/machinery/gibber,
 /obj/machinery/light/directional/north,
@@ -94335,6 +94341,7 @@
 /turf/open/floor/iron/dark,
 /area/commons/locker)
 "tmu" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
 /turf/closed/wall,
 /area/maintenance/disposal/incinerator)
 "tmA" = (
@@ -95426,16 +95433,6 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/service/kitchen)
-"tCX" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/binary/pump{
-	name = "Plasma to Turbine"
-	},
-/turf/open/floor/iron,
-/area/maintenance/disposal/incinerator)
 "tDa" = (
 /obj/structure/table,
 /obj/item/rcl/pre_loaded,
@@ -99111,6 +99108,13 @@
 	},
 /turf/open/floor/iron,
 /area/security/office)
+"uzg" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/iron,
+/area/engineering/atmos)
 "uzi" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -105066,9 +105070,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
-	dir = 10
-	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
 /turf/open/floor/iron,
 /area/maintenance/disposal/incinerator)
 "whq" = (
@@ -106494,10 +106496,10 @@
 /turf/closed/wall/r_wall,
 /area/science/misc_lab/range)
 "wAZ" = (
-/obj/machinery/pipedispenser/disposal,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/structure/reagent_dispensers/fueltank/large,
 /turf/open/floor/iron,
 /area/engineering/atmos)
 "wBb" = (
@@ -107189,23 +107191,6 @@
 	},
 /turf/open/floor/iron,
 /area/security/prison)
-"wNc" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8;
-	name = "Port to Turbine"
-	},
-/turf/open/floor/iron,
-/area/maintenance/disposal/incinerator)
 "wNi" = (
 /obj/structure/filingcabinet/medical,
 /obj/machinery/light/directional/north,
@@ -107651,19 +107636,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/service/bar/atrium)
-"wTf" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4
-	},
-/turf/open/floor/iron/dark/corner,
-/area/maintenance/disposal/incinerator)
 "wTm" = (
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /turf/open/floor/plating,
@@ -111651,9 +111623,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
-	dir = 4
-	},
 /turf/open/floor/iron,
 /area/maintenance/disposal/incinerator)
 "yaC" = (
@@ -111917,6 +111886,10 @@
 	heat_capacity = 1e+006
 	},
 /area/science/misc_lab)
+"yde" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/maintenance/disposal/incinerator)
 "ydg" = (
 /obj/machinery/door/poddoor/preopen{
 	id = "brigprison";
@@ -134473,7 +134446,7 @@ vsT
 aad
 aFr
 aGR
-aIs
+mKX
 baL
 pCj
 bsj
@@ -134733,9 +134706,9 @@ aGS
 aIt
 ooj
 pPs
-xXs
-xXs
-xXs
+jEV
+gMn
+gMn
 kPH
 kPH
 kPH
@@ -134987,12 +134960,12 @@ qvW
 qYo
 aFr
 aGT
-tCX
+aIt
 eDo
-wTf
-xXs
-ipq
+pPs
+jEV
 ipq
+pQf
 mhy
 bgH
 fVZ
@@ -135245,10 +135218,10 @@ qYo
 aFs
 aGU
 aIt
-wNc
+baL
 who
 kxk
-pQf
+kto
 tjD
 jZK
 kfU
@@ -135504,8 +135477,8 @@ aGV
 aIv
 cGj
 czo
-xXs
-ipq
+jEV
+kto
 cdV
 uyH
 ush
@@ -135760,9 +135733,9 @@ aFr
 aGW
 aIs
 aJP
-tjK
-xXs
-ipq
+pPs
+jEV
+kto
 ohn
 slk
 vzJ
@@ -136014,11 +135987,11 @@ hLW
 cJl
 cJl
 iqM
-aFr
+yde
 aIx
 xZZ
-tjK
-eVv
+pPs
+jEV
 owj
 fbu
 qFy
@@ -136532,7 +136505,7 @@ tmu
 tmu
 foG
 tmu
-mZD
+kqP
 aWE
 rMZ
 hSV
@@ -138341,7 +138314,7 @@ mZD
 utn
 xqx
 wAZ
-kPE
+uzg
 jLK
 mZD
 xcs