diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 92e0f7a5b9..2c871a90bd 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -43566,22 +43566,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
-"cXc" = (
-/obj/structure/cable/white{
-	icon_state = "4-8"
-	},
-/obj/machinery/shower{
-	dir = 4;
-	name = "emergency shower"
-	},
-/obj/effect/turf_decal/stripes/end{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/science/xenobiology)
 "cXd" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -43619,22 +43603,6 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
-"cXg" = (
-/obj/structure/cable/white{
-	icon_state = "4-8"
-	},
-/obj/machinery/shower{
-	dir = 8;
-	name = "emergency shower"
-	},
-/obj/effect/turf_decal/stripes/end{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/science/xenobiology)
 "cXh" = (
 /obj/structure/cable/white{
 	icon_state = "2-4"
@@ -73923,6 +73891,15 @@
 	},
 /turf/open/floor/plasteel/grimy,
 /area/commons/dorms)
+"ffl" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/shower{
+	dir = 8;
+	name = "emergency shower";
+	pixel_y = -4
+	},
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
 "ffE" = (
 /obj/structure/cable/white{
 	icon_state = "0-2"
@@ -81764,6 +81741,18 @@
 	},
 /turf/open/floor/plasteel,
 /area/ai_monitored/command/storage/eva)
+"hMb" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/end{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
 "hMm" = (
 /obj/structure/table/wood,
 /obj/item/toy/cards/deck,
@@ -101594,6 +101583,18 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/closed/wall,
 /area/engineering/break_room)
+"oCd" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/end{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
 "oCi" = (
 /obj/structure/bookcase/manuals/engineering,
 /turf/open/floor/wood,
@@ -157550,7 +157551,7 @@ cQv
 cRY
 cTJ
 tXb
-cXc
+oCd
 cYS
 dax
 dci
@@ -159092,7 +159093,7 @@ kiv
 cSc
 cTO
 hDD
-cXg
+hMb
 oJE
 dav
 dcm
@@ -160889,7 +160890,7 @@ cNh
 cOQ
 cQy
 cSh
-cTT
+ffl
 cVR
 cXk
 cYZ
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 0570a6d480..6f6872b11a 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -4911,22 +4911,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/brig)
-"anj" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 27
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/security/brig)
 "ank" = (
 /obj/structure/table,
 /obj/item/storage/box/evidence,
@@ -29465,19 +29449,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/research)
-"ckg" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 11
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 9
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/science/research)
 "ckh" = (
 /obj/machinery/light{
 	dir = 4
@@ -30069,21 +30040,6 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel/white,
 /area/science/research)
-"clH" = (
-/obj/machinery/shower{
-	dir = 8
-	},
-/obj/item/radio/intercom{
-	dir = 8;
-	name = "Station Intercom (General)";
-	pixel_y = -28
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel/white,
-/area/science/research)
 "clI" = (
 /obj/machinery/firealarm{
 	dir = 8;
@@ -50265,6 +50221,21 @@
 	},
 /turf/open/floor/plasteel,
 /area/service/hydroponics)
+"egm" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 27
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/security/brig)
 "egt" = (
 /obj/machinery/camera/autoname,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -51280,6 +51251,13 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/commons/fitness/recreation)
+"eHV" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/air_sensor/atmos/nitrous_tank,
+/turf/open/floor/engine/n2o,
+/area/engineering/atmos)
 "eJd" = (
 /obj/structure/closet/secure_closet/RD,
 /obj/machinery/keycard_auth{
@@ -51449,6 +51427,15 @@
 	},
 /turf/open/floor/engine,
 /area/engineering/main)
+"eOP" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 9
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/science/research)
 "ePg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -52531,10 +52518,6 @@
 	dir = 8
 	},
 /area/service/chapel/main)
-"fwH" = (
-/obj/machinery/air_sensor/atmos/nitrogen_tank,
-/turf/open/floor/engine/n2,
-/area/engineering/atmos)
 "fxb" = (
 /obj/machinery/vending/engivend,
 /obj/structure/cable/yellow{
@@ -52880,6 +52863,10 @@
 /obj/item/clothing/under/misc/burial,
 /turf/open/floor/plasteel/grimy,
 /area/service/chapel/office)
+"fId" = (
+/obj/effect/turf_decal/vg_decals/atmos/nitrogen,
+/turf/open/floor/engine/n2,
+/area/engineering/atmos)
 "fIC" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
@@ -53288,10 +53275,6 @@
 	},
 /turf/open/floor/wood,
 /area/service/theater)
-"fXs" = (
-/obj/machinery/light/small,
-/turf/open/floor/engine/n2,
-/area/engineering/atmos)
 "fXZ" = (
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -53609,6 +53592,11 @@
 /obj/machinery/atmospherics/components/trinary/filter/flipped/critical,
 /turf/open/floor/engine,
 /area/engineering/main)
+"gim" = (
+/obj/machinery/light/small,
+/obj/machinery/air_sensor/atmos/oxygen_tank,
+/turf/open/floor/engine/o2,
+/area/engineering/atmos)
 "gin" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -55483,6 +55471,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/miningoffice)
+"htG" = (
+/obj/effect/turf_decal/vg_decals/atmos/air,
+/turf/open/floor/engine/air,
+/area/engineering/atmos)
 "htH" = (
 /obj/machinery/firealarm{
 	dir = 8;
@@ -57096,10 +57088,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/service/hydroponics)
-"iqT" = (
-/obj/machinery/air_sensor/atmos/air_tank,
-/turf/open/floor/engine/air,
-/area/engineering/atmos)
 "iqU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/chair/stool,
@@ -59323,12 +59311,6 @@
 /obj/machinery/light,
 /turf/open/floor/wood,
 /area/service/bar)
-"jGW" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/engine/n2o,
-/area/engineering/atmos)
 "jIg" = (
 /obj/structure/sign/directions/evac,
 /obj/structure/sign/directions/medical{
@@ -60383,10 +60365,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/service/bar)
-"kro" = (
-/obj/machinery/air_sensor/atmos/oxygen_tank,
-/turf/open/floor/engine/o2,
-/area/engineering/atmos)
 "krD" = (
 /turf/closed/wall,
 /area/science/circuit)
@@ -62374,10 +62352,6 @@
 	dir = 5
 	},
 /area/service/kitchen)
-"lwJ" = (
-/obj/machinery/light/small,
-/turf/open/floor/engine/o2,
-/area/engineering/atmos)
 "lwL" = (
 /turf/open/floor/plasteel,
 /area/service/janitor)
@@ -62593,6 +62567,13 @@
 	dir = 1
 	},
 /area/engineering/atmos)
+"lCt" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/air_sensor/atmos/toxin_tank,
+/turf/open/floor/engine/plasma,
+/area/engineering/atmos)
 "lDu" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable/yellow{
@@ -62632,6 +62613,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/commons/dorms)
+"lFn" = (
+/obj/effect/turf_decal/vg_decals/atmos/mix,
+/turf/open/floor/engine/vacuum,
+/area/engineering/atmos)
 "lFD" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 1
@@ -62883,6 +62868,10 @@
 	dir = 1
 	},
 /area/command/gateway)
+"lNP" = (
+/obj/effect/turf_decal/vg_decals/atmos/plasma,
+/turf/open/floor/engine/plasma,
+/area/engineering/atmos)
 "lOi" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -63714,12 +63703,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/construction/storage_wing)
-"mkz" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/engine/vacuum,
-/area/engineering/atmos)
 "mkS" = (
 /obj/structure/closet/boxinggloves,
 /obj/effect/turf_decal/tile/neutral{
@@ -64408,12 +64391,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/qm)
-"mEw" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/engine/plasma,
-/area/engineering/atmos)
 "mEE" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -64896,10 +64873,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/chapel,
 /area/service/chapel/main)
-"mWu" = (
-/obj/machinery/air_sensor/atmos/toxin_tank,
-/turf/open/floor/engine/plasma,
-/area/engineering/atmos)
 "mWy" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -65067,10 +65040,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/service/hydroponics)
-"naS" = (
-/obj/machinery/air_sensor/atmos/carbon_tank,
-/turf/open/floor/engine/co2,
-/area/engineering/atmos)
 "nbl" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -65605,6 +65574,18 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/service)
+"nyA" = (
+/obj/item/radio/intercom{
+	dir = 8;
+	name = "Station Intercom (General)";
+	pixel_y = -28
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plasteel/white,
+/area/science/research)
 "nzp" = (
 /obj/structure/urinal{
 	pixel_y = 29
@@ -65730,10 +65711,6 @@
 /obj/machinery/bookbinder,
 /turf/open/floor/wood,
 /area/service/library)
-"nFp" = (
-/obj/machinery/air_sensor/atmos/nitrous_tank,
-/turf/open/floor/engine/n2o,
-/area/engineering/atmos)
 "nFz" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /turf/closed/wall/r_wall,
@@ -68497,10 +68474,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel,
 /area/commons/fitness/recreation)
-"pii" = (
-/obj/machinery/light/small,
-/turf/open/floor/engine/air,
-/area/engineering/atmos)
 "piB" = (
 /obj/machinery/vending/hydroseeds{
 	slogan_delay = 700
@@ -69708,6 +69681,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/miningoffice)
+"pSz" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/air_sensor/atmos/mix_tank,
+/turf/open/floor/engine/vacuum,
+/area/engineering/atmos)
 "pSE" = (
 /obj/effect/landmark/start/captain,
 /obj/machinery/airalarm{
@@ -72067,6 +72047,11 @@
 /obj/item/storage/dice,
 /turf/open/floor/plasteel,
 /area/commons/locker)
+"rjT" = (
+/obj/machinery/light/small,
+/obj/machinery/air_sensor/atmos/air_tank,
+/turf/open/floor/engine/air,
+/area/engineering/atmos)
 "rkx" = (
 /turf/closed/wall/r_wall,
 /area/engineering/supermatter)
@@ -73807,6 +73792,13 @@
 	},
 /turf/open/floor/plasteel/cafeteria,
 /area/command/heads_quarters/cmo)
+"smL" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/air_sensor/atmos/carbon_tank,
+/turf/open/floor/engine/co2,
+/area/engineering/atmos)
 "smU" = (
 /turf/closed/wall,
 /area/engineering/storage/tech)
@@ -74471,6 +74463,10 @@
 /obj/machinery/field/generator,
 /turf/open/floor/plating,
 /area/engineering/main)
+"sLx" = (
+/obj/effect/turf_decal/vg_decals/atmos/nitrous_oxide,
+/turf/open/floor/engine/n2o,
+/area/engineering/atmos)
 "sLW" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	dir = 4
@@ -74817,10 +74813,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engineering/main)
-"sZg" = (
-/obj/machinery/air_sensor/atmos/mix_tank,
-/turf/open/floor/engine/vacuum,
-/area/engineering/atmos)
 "sZz" = (
 /obj/structure/table,
 /obj/item/paper/fluff/holodeck/disclaimer,
@@ -76314,12 +76306,6 @@
 /obj/machinery/portable_atmospherics/canister/air,
 /turf/open/floor/plating,
 /area/maintenance/port)
-"tUr" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/engine/co2,
-/area/engineering/atmos)
 "tUN" = (
 /obj/machinery/conveyor_switch/oneway{
 	id = "packageSort2";
@@ -79928,6 +79914,11 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/sorting)
+"wlz" = (
+/obj/machinery/light/small,
+/obj/machinery/air_sensor/atmos/nitrogen_tank,
+/turf/open/floor/engine/n2,
+/area/engineering/atmos)
 "wlC" = (
 /obj/machinery/atmospherics/pipe/simple/orange/visible{
 	dir = 5
@@ -80973,6 +80964,10 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space/nearstation)
+"wNX" = (
+/obj/effect/turf_decal/vg_decals/atmos/oxygen,
+/turf/open/floor/engine/o2,
+/area/engineering/atmos)
 "wOW" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -81790,6 +81785,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/service/hydroponics)
+"xlP" = (
+/obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide,
+/turf/open/floor/engine/co2,
+/area/engineering/atmos)
 "xlU" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
@@ -108976,7 +108975,7 @@ aiw
 ajp
 akz
 ajQ
-anj
+egm
 aot
 apG
 apG
@@ -114185,8 +114184,8 @@ bZo
 bZo
 chp
 iTm
-ckg
-clH
+eOP
+nyA
 bZn
 coa
 cpl
@@ -125234,9 +125233,9 @@ rVI
 qHn
 aaf
 dYX
-fwH
+fId
 sTB
-fXs
+wlz
 dPI
 aaf
 aaa
@@ -126262,9 +126261,9 @@ rSI
 uKL
 aaf
 dYX
-kro
+wNX
 eFn
-lwJ
+gim
 dPI
 aaf
 aaa
@@ -127290,9 +127289,9 @@ rSI
 uKL
 aaf
 dYX
-iqT
+htG
 wFX
-pii
+rjT
 dPI
 aaf
 aaa
@@ -129068,19 +129067,19 @@ aaa
 aaf
 dPI
 xXd
-sZg
+lFn
 pAr
 dPI
 qGy
-nFp
+sLx
 kNs
 dPI
 iiP
-mWu
+lNP
 lBv
 dPI
 ipG
-naS
+xlP
 ktS
 dPI
 aaf
@@ -129582,19 +129581,19 @@ aaf
 aaf
 dPI
 jQT
-mkz
+pSz
 gdM
 dPI
 izZ
-jGW
+eHV
 mMU
 dPI
 oMq
-mEw
+lCt
 erE
 dPI
 hGX
-tUr
+smL
 rxl
 dPI
 aaf
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 27a4cb8491..2c13790db7 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -46715,15 +46715,6 @@
 	},
 /turf/open/floor/plating,
 /area/engineering/main)
-"cda" = (
-/obj/structure/reflector/single/anchored{
-	dir = 10
-	},
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/engineering/main)
 "cdc" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -57562,6 +57553,15 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
+"mQB" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/engineering/main)
 "mSc" = (
 /obj/machinery/space_heater,
 /turf/open/floor/plating,
@@ -58846,12 +58846,6 @@
 /obj/structure/lattice/catwalk,
 /turf/open/space/basic,
 /area/space/nearstation)
-"pCo" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/engineering/main)
 "pDP" = (
 /obj/machinery/vending/assist,
 /obj/effect/turf_decal/tile/neutral{
@@ -58929,6 +58923,19 @@
 /obj/structure/closet/crate,
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
+"pKU" = (
+/obj/machinery/power/emitter/anchored{
+	dir = 8;
+	state = 2
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/engineering/main)
 "pMG" = (
 /obj/structure/sink{
 	dir = 8;
@@ -61603,6 +61610,12 @@
 "wcs" = (
 /turf/open/floor/plasteel/dark,
 /area/engineering/main)
+"wcE" = (
+/obj/structure/reflector/single/anchored{
+	dir = 10
+	},
+/turf/open/floor/plating,
+/area/engineering/main)
 "wdx" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 6
@@ -93554,8 +93567,8 @@ bYT
 bZB
 caq
 cbk
-aac
-ccY
+bXk
+mQB
 cdT
 ccY
 cbX
@@ -94068,8 +94081,8 @@ bYV
 bZA
 cam
 ccW
-bXk
-cda
+aac
+wcE
 wcs
 wcs
 wcs
@@ -94582,8 +94595,8 @@ bYX
 bZA
 cam
 lfx
-bXk
-pCo
+aac
+cbX
 wcs
 wcs
 wcs
@@ -95096,8 +95109,8 @@ wjm
 bZF
 cbm
 mgz
-aac
-oHa
+bXk
+pKU
 oHa
 eWi
 cbX