diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 3b9beee06e03..c79d98e121cb 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -1432,11 +1432,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/cargo/storage)
-"aqa" = (
-/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/snack,
-/turf/open/floor/carpet/black,
-/area/station/maintenance/port)
 "aqc" = (
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
 	dir = 4
@@ -2113,14 +2108,6 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron/dark,
 /area/station/science/circuits)
-"awC" = (
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/port)
 "awD" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -8730,13 +8717,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/service/electronic_marketing_den)
-"bYR" = (
-/obj/structure/closet/cabinet,
-/obj/effect/spawner/random/food_or_drink/booze,
-/obj/effect/spawner/random/food_or_drink/booze,
-/obj/effect/spawner/random/food_or_drink/booze,
-/turf/open/floor/plating,
-/area/station/maintenance/port)
 "bYV" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
@@ -10461,6 +10441,12 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
+"cvB" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/station/maintenance/port)
 "cvE" = (
 /obj/machinery/computer/cargo/request{
 	dir = 4
@@ -13088,6 +13074,23 @@
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/iron,
 /area/station/security/checkpoint/escape)
+"ddR" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/engineering/main)
 "ddW" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/effect/turf_decal/box/white/corners,
@@ -14141,9 +14144,7 @@
 /turf/open/floor/iron,
 /area/station/science/lobby)
 "dsj" = (
-/obj/structure/closet/secure_closet/engineering_personal,
 /obj/machinery/light/small/directional/south,
-/obj/effect/turf_decal/delivery,
 /obj/machinery/newscaster/directional/south,
 /turf/open/floor/iron,
 /area/station/engineering/main)
@@ -16482,6 +16483,21 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
+"dWs" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable,
+/turf/open/floor/circuit/green,
+/area/station/engineering/main)
 "dWt" = (
 /obj/structure/cable,
 /turf/open/floor/carpet/blue,
@@ -19917,12 +19933,6 @@
 /obj/machinery/coffeemaker/impressa,
 /turf/open/floor/iron/dark,
 /area/station/medical/break_room)
-"eOF" = (
-/obj/structure/chair/office{
-	dir = 1
-	},
-/turf/open/floor/carpet/black,
-/area/station/maintenance/port)
 "eOL" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
 /obj/effect/turf_decal/stripes/line{
@@ -20684,14 +20694,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/maintenance/port/aft)
-"eXN" = (
-/obj/machinery/vending/wardrobe/engi_wardrobe,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/station/engineering/main)
 "eXW" = (
 /obj/machinery/navbeacon{
 	codes_txt = "patrol;next_patrol=hall6";
@@ -25461,6 +25463,7 @@
 /area/station/science/genetics)
 "gfX" = (
 /obj/structure/table,
+/obj/effect/spawner/random/food_or_drink/snack,
 /obj/effect/spawner/random/entertainment/deck,
 /turf/open/floor/carpet/black,
 /area/station/maintenance/port)
@@ -27265,22 +27268,18 @@
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/aisat/exterior)
 "gCn" = (
-/obj/structure/sign/warning/electric_shock/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
 	},
 /turf/open/floor/iron/dark,
 /area/station/engineering/main)
@@ -27789,6 +27788,14 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/main)
+"gIA" = (
+/obj/structure/closet/cabinet,
+/obj/effect/spawner/random/food_or_drink/booze,
+/obj/effect/spawner/random/food_or_drink/booze,
+/obj/effect/spawner/random/food_or_drink/booze,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plating,
+/area/station/maintenance/port)
 "gIB" = (
 /obj/structure/table/reinforced,
 /obj/machinery/newscaster/directional/west,
@@ -28933,6 +28940,7 @@
 "gXn" = (
 /obj/structure/table,
 /obj/effect/spawner/random/entertainment/dice,
+/obj/effect/spawner/random/entertainment/toy,
 /turf/open/floor/carpet/black,
 /area/station/maintenance/port)
 "gXr" = (
@@ -29426,6 +29434,22 @@
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/plating,
 /area/station/maintenance/solars/starboard/aft)
+"heO" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/machinery/light_switch/directional/east,
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable,
+/turf/open/floor/circuit/green,
+/area/station/engineering/main)
 "heP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -29859,12 +29883,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/maintenance/department/chapel)
-"hjP" = (
-/obj/structure/table,
-/obj/effect/spawner/random/entertainment/toy,
-/obj/effect/spawner/random/entertainment/toy,
-/turf/open/floor/carpet/black,
-/area/station/maintenance/port)
 "hjQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -35912,6 +35930,27 @@
 "iLr" = (
 /turf/closed/wall,
 /area/station/service/theater/abandoned)
+"iLy" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/engineering/main)
 "iLB" = (
 /obj/structure/sign/directions/evac{
 	pixel_y = -8
@@ -39949,6 +39988,13 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
+"jIe" = (
+/obj/effect/turf_decal/tile/neutral/anticorner{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/maintenance/port)
 "jIg" = (
 /obj/effect/turf_decal/trimline/blue/filled/corner{
 	dir = 1
@@ -44114,6 +44160,20 @@
 /obj/machinery/status_display/evac/directional/west,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
+"kIA" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/structure/closet/secure_closet/engineering_personal,
+/turf/open/floor/iron/dark,
+/area/station/engineering/main)
 "kIJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/command{
@@ -46947,6 +47007,7 @@
 /area/station/maintenance/port/fore)
 "ltt" = (
 /obj/effect/turf_decal/bot_white,
+/obj/effect/landmark/start/hangover,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/port)
 "ltu" = (
@@ -49293,6 +49354,13 @@
 /obj/effect/turf_decal/box/corners,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"lWf" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 1
+	},
+/obj/effect/spawner/random/structure/steam_vent,
+/turf/open/floor/iron,
+/area/station/maintenance/port)
 "lWi" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/item/radio/intercom/directional/north,
@@ -57161,6 +57229,23 @@
 /obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/command/storage/eva)
+"nTG" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/structure/sign/warning/electric_shock/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/engineering/main)
 "nTN" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -57925,6 +58010,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/bot,
 /obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/vending/wardrobe/engi_wardrobe,
+/obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/station/engineering/main)
 "odI" = (
@@ -60837,6 +60924,20 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/maintenance/department/chapel)
+"oTa" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/station/engineering/main)
 "oTg" = (
 /obj/structure/sink/directional/west,
 /obj/machinery/light_switch/directional/east,
@@ -60915,6 +61016,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/grimy,
 /area/station/command/heads_quarters/ce)
+"oTN" = (
+/obj/structure/chair/office,
+/obj/structure/sign/poster/random/directional/north,
+/turf/open/floor/carpet/black,
+/area/station/maintenance/port)
 "oTY" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
@@ -61020,16 +61126,14 @@
 /turf/open/floor/iron/dark,
 /area/station/medical/chemistry)
 "oVo" = (
-/obj/structure/cable,
 /obj/structure/sign/warning/no_smoking/circle{
 	pixel_x = 28;
 	pixel_y = -28
 	},
-/obj/machinery/modular_computer/console/preset/engineering{
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/computer/station_alert{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/radio/intercom/directional/east,
 /turf/open/floor/iron/dark,
 /area/station/engineering/main)
 "oVp" = (
@@ -62217,12 +62321,6 @@
 /obj/structure/chair/stool/bar/directional/north,
 /turf/open/floor/carpet/green,
 /area/station/commons/lounge)
-"pky" = (
-/obj/structure/cable,
-/obj/machinery/power/smes/engineering,
-/obj/machinery/light_switch/directional/east,
-/turf/open/floor/circuit/green,
-/area/station/engineering/main)
 "pkA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -62293,12 +62391,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/brig)
-"pll" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/spawner/random/structure/steam_vent,
-/turf/open/floor/plating,
-/area/station/maintenance/port)
 "pln" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/portable_atmospherics/canister/water_vapor,
@@ -63194,12 +63286,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/maintenance/fore)
-"pyh" = (
-/obj/structure/chair/office,
-/obj/structure/sign/poster/random/directional/north,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/carpet/black,
-/area/station/maintenance/port)
 "pyq" = (
 /obj/effect/landmark/start/hangover,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -67061,11 +67147,9 @@
 /area/station/hallway/secondary/entry)
 "qsv" = (
 /obj/machinery/light/directional/south,
-/obj/machinery/computer/station_alert{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/machinery/firealarm/directional/south,
+/obj/structure/closet/secure_closet/engineering_personal,
 /turf/open/floor/iron/dark,
 /area/station/engineering/main)
 "qsw" = (
@@ -73181,14 +73265,6 @@
 /obj/effect/spawner/random/trash/soap,
 /turf/open/floor/iron,
 /area/station/maintenance/department/medical/morgue)
-"rSG" = (
-/obj/structure/chair/office{
-	dir = 1
-	},
-/obj/effect/landmark/start/hangover,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/carpet/black,
-/area/station/maintenance/port)
 "rSJ" = (
 /obj/machinery/telecomms/server/presets/engineering,
 /obj/effect/turf_decal/tile/brown/anticorner/contrasted{
@@ -80039,15 +80115,11 @@
 "tCS" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/power/terminal{
 	dir = 1
 	},
-/obj/structure/extinguisher_cabinet/directional/east,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/station/engineering/main)
 "tCW" = (
@@ -81584,6 +81656,11 @@
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/dark/corner,
 /area/station/maintenance/disposal/incinerator)
+"tVV" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/maintenance/port)
 "tWa" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -81932,7 +82009,6 @@
 /turf/open/floor/iron,
 /area/station/engineering/supermatter/room)
 "tZa" = (
-/obj/structure/closet/secure_closet/engineering_personal,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/requests_console/directional/south{
 	assistance_requestable = 1;
@@ -81943,7 +82019,7 @@
 /obj/structure/sign/poster/official/do_not_question{
 	pixel_x = 32
 	},
-/obj/effect/turf_decal/delivery,
+/obj/item/kirbyplants/random,
 /turf/open/floor/iron,
 /area/station/engineering/main)
 "tZi" = (
@@ -85488,6 +85564,24 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/prison/safe)
+"uSm" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/item/radio/intercom/directional/east,
+/obj/structure/cable,
+/obj/machinery/modular_computer/console/preset/engineering{
+	dir = 1
+	},
+/turf/open/floor/iron/dark,
+/area/station/engineering/main)
 "uSp" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -89466,6 +89560,7 @@
 "vRy" = (
 /obj/structure/table,
 /obj/effect/spawner/random/entertainment/cigarette_pack,
+/obj/effect/spawner/random/entertainment/toy,
 /turf/open/floor/carpet/black,
 /area/station/maintenance/port)
 "vRB" = (
@@ -91644,6 +91739,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
+/obj/effect/landmark/start/hangover,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/port)
 "wqk" = (
@@ -95407,6 +95503,15 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/station/commons/dorms)
+"xnG" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 1
+	},
+/obj/machinery/light/dim/directional/south,
+/obj/effect/landmark/start/hangover,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port)
 "xnM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -99045,8 +99150,8 @@
 /turf/open/floor/plating,
 /area/station/maintenance/port)
 "yix" = (
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 8
+/obj/effect/turf_decal/tile/neutral/anticorner{
+	dir = 1
 	},
 /turf/open/floor/iron,
 /area/station/maintenance/port)
@@ -99128,11 +99233,6 @@
 /obj/effect/turf_decal/bot_white,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/science/genetics)
-"yjV" = (
-/obj/structure/chair/office,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/carpet/black,
-/area/station/maintenance/port)
 "ykb" = (
 /obj/structure/table,
 /obj/item/storage/bag/plants/portaseeder,
@@ -125424,7 +125524,7 @@ gRE
 bEN
 ogj
 jaZ
-eXN
+ogj
 tqo
 grl
 iJU
@@ -126960,7 +127060,7 @@ rAH
 kdd
 gzF
 wGA
-pky
+aJu
 tCS
 gCn
 oVo
@@ -127217,10 +127317,10 @@ wGA
 wGA
 wGA
 wGA
-pTC
-pTC
-pTC
-gXx
+dWs
+ddR
+oTa
+kIA
 pTC
 vcB
 eru
@@ -127473,14 +127573,14 @@ emB
 hza
 ejp
 hza
-quQ
-vcB
-lmJ
-qVA
-qAR
-qev
+pPy
+heO
+iLy
+nTG
+uSm
+pTC
 yix
-pps
+jIe
 pTC
 qNN
 req
@@ -127730,14 +127830,14 @@ opq
 rrw
 fAX
 tAh
-crT
-xhw
-fBp
-miM
-uiM
-rQi
-qzu
-cOt
+pPy
+pTC
+pTC
+pTC
+gXx
+pTC
+lWf
+tVV
 pTC
 pFP
 pFP
@@ -127987,14 +128087,14 @@ svI
 oEV
 sOM
 tFa
-bPD
-vcB
-vcB
-vcB
-vcB
+quQ
 vcB
-qcM
-cOt
+lmJ
+qVA
+qAR
+qev
+cvB
+pps
 pTC
 jVS
 nED
@@ -128244,14 +128344,14 @@ vBX
 dsy
 nps
 nps
-vcB
-vcB
-dGQ
-caW
-bYR
-vcB
-jPf
+crT
+xhw
+fBp
+miM
+uiM
 rQi
+qzu
+cOt
 pTC
 rnr
 lRx
@@ -128501,12 +128601,12 @@ dGS
 slx
 uED
 fdJ
+bPD
+vcB
+vcB
+vcB
+vcB
 vcB
-qcM
-ieM
-iMH
-gnW
-ofk
 lhZ
 rQi
 pTC
@@ -128759,14 +128859,14 @@ iCO
 uED
 ozx
 vcB
-jtp
-aqa
-iPb
-kCi
+vcB
+dGQ
+caW
+gIA
 vcB
 lbX
 pgV
-pll
+jTw
 jTw
 lvI
 pxo
@@ -129016,11 +129116,11 @@ iCO
 uED
 nXK
 vcB
-pyh
-hjP
-eOF
-awC
-vcB
+qcM
+ieM
+iMH
+gnW
+ofk
 qcM
 win
 vcB
@@ -129273,10 +129373,10 @@ iCO
 axQ
 ilo
 vcB
-yjV
+jtp
 gfX
-rSG
-qcM
+iPb
+kCi
 vcB
 jPf
 ant
@@ -129530,10 +129630,10 @@ kAS
 uED
 nXK
 vcB
-jtp
+oTN
 gXn
 vRy
-kCi
+xnG
 vcB
 lbX
 pps
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 202a5feb524f..e0ec65bc8bb2 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -360,6 +360,10 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/treatment_center)
+"aii" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/plating,
+/area/station/engineering/engine_smes)
 "ait" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -502,10 +506,10 @@
 	dir = 1
 	},
 /obj/structure/cable,
-/obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/machinery/light/small/directional/west,
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/reagent_dispensers/fueltank/large,
 /turf/open/floor/iron/dark,
 /area/station/engineering/engine_smes)
 "akQ" = (
@@ -1992,6 +1996,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
+"aJf" = (
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/dark/smooth_half{
+	dir = 1
+	},
+/area/station/engineering/engine_smes)
 "aJh" = (
 /obj/item/kirbyplants/random,
 /turf/open/floor/iron,
@@ -19721,8 +19731,8 @@
 	},
 /obj/structure/cable,
 /obj/machinery/airalarm/directional/north,
-/obj/structure/reagent_dispensers/fueltank/large,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/power/smes/engineering,
 /turf/open/floor/iron/dark,
 /area/station/engineering/engine_smes)
 "gmW" = (
@@ -24372,6 +24382,16 @@
 /obj/machinery/newscaster/directional/south,
 /turf/open/floor/iron,
 /area/station/security/processing)
+"hSY" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/engineering/engine_smes)
 "hSZ" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/trimline/dark_blue/line{
@@ -24702,6 +24722,10 @@
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
 /turf/closed/wall/r_wall,
 /area/station/science/ordnance/burnchamber)
+"iap" = (
+/obj/structure/cable,
+/turf/closed/wall/r_wall,
+/area/station/engineering/engine_smes)
 "iar" = (
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
@@ -53988,6 +54012,7 @@
 	id = "Secure Storage";
 	name = "Secure Storage"
 	},
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/engineering/engine_smes)
 "rqH" = (
@@ -232583,7 +232608,7 @@ xYI
 mNY
 oXX
 mNY
-hpd
+aii
 hpd
 hpd
 wkw
@@ -232840,7 +232865,7 @@ csT
 mNY
 kCn
 mNY
-yaL
+iap
 rqF
 rqF
 yaL
@@ -233098,7 +233123,7 @@ mNY
 kCn
 mNY
 akL
-tvF
+aJf
 tvF
 izF
 gTK
@@ -233355,7 +233380,7 @@ mNY
 kCn
 mNY
 gmR
-tMD
+hSY
 rMG
 lui
 twt
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 20b55db673a0..44aef6d8298b 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -5216,6 +5216,7 @@
 /obj/structure/rack,
 /obj/effect/spawner/random/maintenance,
 /obj/effect/mapping_helpers/broken_floor,
+/obj/item/clothing/suit/hazardvest,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/fore)
 "bTj" = (
@@ -5661,6 +5662,8 @@
 /area/station/security/prison)
 "ceD" = (
 /obj/structure/table,
+/obj/effect/spawner/random/maintenance,
+/obj/item/clothing/gloves/color/fyellow,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/fore)
 "ceF" = (
@@ -6739,6 +6742,10 @@
 	},
 /turf/open/floor/wood,
 /area/station/service/library)
+"cyB" = (
+/obj/structure/easel,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
 "cyG" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/public/glass{
@@ -7084,6 +7091,11 @@
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
 /area/station/commons/storage/primary)
+"cFS" = (
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/effect/spawner/random/structure/crate,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
 "cFU" = (
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
@@ -7360,9 +7372,12 @@
 /turf/open/floor/iron,
 /area/station/engineering/atmos/pumproom)
 "cML" = (
+/obj/machinery/light_switch/directional/west,
+/obj/machinery/power/smes/engineering,
 /obj/structure/cable,
-/turf/closed/wall/r_wall,
-/area/station/maintenance/starboard/fore)
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/engineering/main)
 "cMQ" = (
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "hopqueue";
@@ -7517,12 +7532,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/fore)
-"cPQ" = (
-/obj/structure/rack,
-/obj/item/clothing/gloves/color/fyellow,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/fore)
 "cPT" = (
 /obj/machinery/door/airlock/research{
 	name = "Ordnance Lab"
@@ -9640,7 +9649,7 @@
 	pixel_y = 32
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/computer/atmos_alert,
+/obj/machinery/computer/station_alert,
 /turf/open/floor/iron/dark,
 /area/station/engineering/main)
 "dHG" = (
@@ -17806,11 +17815,8 @@
 /area/station/command/heads_quarters/captain/private)
 "gLo" = (
 /obj/machinery/power/terminal,
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
 /obj/structure/cable,
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron,
 /area/station/engineering/main)
 "gLy" = (
@@ -17908,7 +17914,7 @@
 	c_tag = "Engineering - Power Monitoring"
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/computer/station_alert,
+/obj/item/kirbyplants/random,
 /turf/open/floor/iron/dark,
 /area/station/engineering/main)
 "gMO" = (
@@ -27469,6 +27475,10 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/brig)
+"jVA" = (
+/obj/structure/cable,
+/turf/closed/wall/r_wall,
+/area/station/engineering/main)
 "jVG" = (
 /obj/structure/table,
 /obj/item/storage/box/bodybags{
@@ -29195,10 +29205,8 @@
 	icon_state = "map-left-MS";
 	pixel_y = 32
 	},
-/obj/machinery/firealarm/directional/west,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/modular_computer/console/preset/engineering,
-/obj/structure/cable,
+/obj/machinery/computer/atmos_alert,
 /turf/open/floor/iron/dark,
 /area/station/engineering/main)
 "kCC" = (
@@ -38770,11 +38778,6 @@
 /obj/effect/spawner/random/entertainment/deck,
 /turf/open/floor/wood,
 /area/station/maintenance/port/aft)
-"nXT" = (
-/obj/machinery/light/small/directional/west,
-/obj/structure/easel,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/fore)
 "nYa" = (
 /obj/machinery/door/airlock/research{
 	name = "Ordnance Lab"
@@ -39256,10 +39259,9 @@
 /turf/open/floor/iron/dark,
 /area/station/command/teleporter)
 "ofk" = (
-/obj/machinery/light_switch/directional/west,
 /obj/machinery/power/smes/engineering,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/engineering/main)
 "ofQ" = (
@@ -42398,6 +42400,16 @@
 /obj/machinery/holopad,
 /turf/open/floor/iron/white,
 /area/station/command/heads_quarters/rd)
+"poD" = (
+/obj/structure/sign/warning/electric_shock{
+	pixel_x = -31
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron,
+/area/station/engineering/main)
 "poJ" = (
 /obj/machinery/telecomms/hub/preset,
 /turf/open/floor/circuit/green/telecomms/mainframe,
@@ -47176,6 +47188,15 @@
 /obj/structure/cable,
 /turf/open/floor/iron/white,
 /area/station/science/research)
+"qYI" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
 "qYY" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/button/door/directional/east{
@@ -52426,6 +52447,13 @@
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
+"sQl" = (
+/obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/modular_computer/console/preset/engineering,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/engineering/main)
 "sQp" = (
 /obj/machinery/exodrone_launcher,
 /obj/item/exodrone,
@@ -52913,12 +52941,8 @@
 /area/station/maintenance/aft/greater)
 "sXe" = (
 /obj/effect/landmark/start/station_engineer,
-/obj/machinery/light/directional/west,
-/obj/structure/sign/warning/electric_shock{
-	pixel_x = -31
-	},
 /obj/effect/turf_decal/stripes/line{
-	dir = 9
+	dir = 1
 	},
 /turf/open/floor/iron,
 /area/station/engineering/main)
@@ -60783,8 +60807,8 @@
 /turf/open/floor/iron,
 /area/station/cargo/drone_bay)
 "vKm" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/hazardvest,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/fore)
 "vKt" = (
@@ -63516,6 +63540,15 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
+"wLj" = (
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/machinery/power/terminal,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/iron,
+/area/station/engineering/main)
 "wLw" = (
 /obj/machinery/duct,
 /turf/open/floor/plating,
@@ -105975,11 +106008,11 @@ qXB
 fwG
 ldO
 vKm
-tbd
-cPQ
-nXT
-wyG
-qXB
+psZ
+mSB
+psZ
+edC
+psZ
 psZ
 qXB
 ttA
@@ -106232,12 +106265,12 @@ eqt
 psZ
 psZ
 ckX
-psZ
-mSB
-edC
-psZ
-psZ
-psZ
+uXd
+jVA
+uXd
+uXd
+jVA
+uXd
 qXB
 gAU
 kQD
@@ -106489,12 +106522,12 @@ tCS
 tCS
 tCS
 tCS
-tCS
-cML
-tCS
-tCS
+uXd
+sQl
+poD
+wLj
 cML
-tCS
+uXd
 tCS
 sqE
 sqE
@@ -107007,7 +107040,7 @@ uXd
 dHg
 gLK
 qul
-acs
+ofk
 uXd
 tKS
 nLz
@@ -107245,7 +107278,7 @@ qXB
 dOx
 jCw
 jCw
-jCw
+cFS
 qXB
 lOK
 jcy
@@ -107762,7 +107795,7 @@ jRz
 ceD
 qXB
 cgL
-wrn
+cyB
 tCS
 mHe
 wYx
@@ -108018,7 +108051,7 @@ qXB
 qXB
 qXB
 qXB
-igz
+qYI
 tCS
 tCS
 cnK
diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm
index 99bb93b3be96..438fb32b3a56 100644
--- a/_maps/map_files/Oshan/oshan.dmm
+++ b/_maps/map_files/Oshan/oshan.dmm
@@ -4114,11 +4114,6 @@
 /obj/effect/spawner/random/trash,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/central)
-"cbM" = (
-/obj/effect/turf_decal/tile/yellow/opposingcorners,
-/obj/structure/cable/industrial,
-/turf/open/floor/iron/dark/textured,
-/area/station/engineering/main)
 "cbS" = (
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
 /turf/open/floor/engine,
@@ -5659,6 +5654,9 @@
 /obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{
 	dir = 4
 	},
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 14
+	},
 /turf/open/floor/iron/dark/textured_corner{
 	dir = 8
 	},
@@ -6427,18 +6425,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible,
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos)
-"dnj" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
-	dir = 8
-	},
-/obj/structure/table/glass,
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = 7
-	},
-/obj/item/lightreplacer,
-/obj/item/construction/plumbing/engineering,
-/turf/open/floor/iron/dark/textured,
-/area/station/engineering/main)
 "dnm" = (
 /obj/structure/window/spawner/directional/south,
 /obj/effect/turf_decal/trimline/green/line{
@@ -11423,6 +11409,17 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
+"fMr" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes{
+	dir = 4
+	},
+/turf/open/floor/iron/dark/textured_edge{
+	dir = 4
+	},
+/area/station/engineering/main)
 "fMs" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -17090,6 +17087,13 @@
 /obj/machinery/requests_console/auto_name/directional/north,
 /turf/open/floor/iron/dark/textured,
 /area/station/engineering/atmos/office)
+"iKa" = (
+/obj/structure/cable/industrial,
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/station/engineering/main)
 "iKC" = (
 /obj/structure/cable,
 /obj/machinery/plumbing/floor_pump/input/on/waste/directional/east,
@@ -19759,10 +19763,11 @@
 /area/station/commons/fitness)
 "kda" = (
 /obj/effect/turf_decal/trimline/yellow/filled/line{
-	dir = 4
+	dir = 6
 	},
 /obj/structure/closet/crate/decorations,
 /obj/effect/turf_decal/bot,
+/obj/item/lightreplacer,
 /turf/open/floor/iron/dark/textured,
 /area/station/engineering/main)
 "kdi" = (
@@ -31149,6 +31154,8 @@
 /obj/structure/closet/crate/rcd,
 /obj/effect/turf_decal/bot,
 /obj/machinery/light/no_nightlight/directional/east,
+/obj/item/construction/plumbing/engineering,
+/obj/item/construction/plumbing/engineering,
 /turf/open/floor/iron/dark/textured,
 /area/station/engineering/main)
 "pPR" = (
@@ -33410,7 +33417,6 @@
 /turf/open/floor/iron/dark/textured,
 /area/station/command/bridge)
 "qWq" = (
-/obj/effect/turf_decal/tile/yellow/opposingcorners,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
@@ -35765,6 +35771,8 @@
 "sgQ" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/closet/crate/decorations,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/glass/reinforced,
 /area/station/engineering/main)
 "shh" = (
@@ -36447,6 +36455,11 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/storage/tech)
+"sAN" = (
+/obj/structure/cable,
+/obj/machinery/power/smes/engineering,
+/turf/open/floor/plating,
+/area/station/engineering/main)
 "sAU" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/trimline/blue/filled/corner,
@@ -36754,6 +36767,17 @@
 /obj/effect/turf_decal/trimline/yellow/filled/corner,
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos)
+"sIo" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes{
+	dir = 8
+	},
+/turf/open/floor/iron/dark/textured_edge{
+	dir = 8
+	},
+/area/station/engineering/main)
 "sIH" = (
 /obj/effect/spawner/random/trash,
 /turf/open/misc/beach/coastline_t{
@@ -41951,15 +41975,6 @@
 	},
 /turf/open/floor/iron/dark/textured,
 /area/station/security/office)
-"voC" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
-	dir = 6
-	},
-/obj/structure/closet/crate/engineering,
-/obj/effect/turf_decal/bot,
-/obj/item/construction/plumbing/engineering,
-/turf/open/floor/iron/dark/textured,
-/area/station/engineering/main)
 "voJ" = (
 /obj/effect/spawner/random/entertainment/arcade{
 	dir = 1
@@ -88123,10 +88138,10 @@ bQC
 sgQ
 asg
 sli
-dnj
 cpM
 yab
 cTW
+sIo
 jZd
 pHe
 jZd
@@ -88380,13 +88395,13 @@ eXg
 qSp
 jbU
 sCq
-rvE
 xyp
 eIg
 aFk
 weN
 weN
 weN
+weN
 bOT
 hNe
 ijg
@@ -88638,9 +88653,9 @@ wUb
 yam
 sCq
 qWq
-lSE
 eIg
 qqf
+sAN
 fKr
 fKr
 fKr
@@ -88894,10 +88909,10 @@ fFQ
 jvI
 jRw
 auZ
-cbM
 xKz
 sAA
 aBO
+iKa
 ghz
 ghz
 ghz
@@ -89151,11 +89166,11 @@ dnr
 jvI
 cME
 rvE
-rvE
 dLS
 eIg
 huL
 hUd
+hUd
 trB
 hUd
 njm
@@ -89409,9 +89424,9 @@ jvI
 pPD
 iBn
 kda
-voC
 yab
 pVp
+fMr
 wPi
 mty
 kKW
diff --git a/monkestation/_maps/RandomEngines/KiloStation/singularity.dmm b/monkestation/_maps/RandomEngines/KiloStation/singularity.dmm
index 2aac264c7682..999c9dd8285e 100644
--- a/monkestation/_maps/RandomEngines/KiloStation/singularity.dmm
+++ b/monkestation/_maps/RandomEngines/KiloStation/singularity.dmm
@@ -38,7 +38,7 @@
 /turf/open/floor/iron,
 /area/station/engineering/supermatter/room)
 "fx" = (
-/obj/structure/cable,
+/obj/structure/cable/layer1,
 /turf/open/floor/plating,
 /area/station/engineering/supermatter/room)
 "fN" = (
@@ -195,6 +195,13 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/supermatter/room)
+"nB" = (
+/obj/structure/cable,
+/obj/machinery/power/terminal{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/station/engineering/supermatter/room)
 "ob" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
@@ -208,7 +215,7 @@
 "oe" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/window/plasma,
-/obj/structure/cable,
+/obj/structure/cable/multilayer/connected,
 /turf/open/floor/iron,
 /area/station/engineering/supermatter/room)
 "or" = (
@@ -592,6 +599,7 @@
 "NS" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/sign/directions/ptl/directional/east,
+/obj/machinery/light/blacklight/directional/east,
 /turf/open/floor/iron,
 /area/station/engineering/supermatter/room)
 "OT" = (
@@ -1206,8 +1214,8 @@ LD
 oK
 xG
 xG
+nB
 kI
-re
 NS
 oe
 RN
@@ -1229,9 +1237,9 @@ rW
 Qn
 nb
 dq
+nb
 mS
 zs
-zs
 fx
 Ar
 zs
diff --git a/monkestation/_maps/RandomEngines/KiloStation/supermatter.dmm b/monkestation/_maps/RandomEngines/KiloStation/supermatter.dmm
index f18c49ac4ab4..cffaeef55498 100644
--- a/monkestation/_maps/RandomEngines/KiloStation/supermatter.dmm
+++ b/monkestation/_maps/RandomEngines/KiloStation/supermatter.dmm
@@ -460,8 +460,9 @@
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
 "re" = (
-/obj/structure/sign/warning/no_smoking{
-	pixel_x = 30
+/obj/structure/cable,
+/obj/machinery/power/terminal{
+	dir = 4
 	},
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
@@ -538,6 +539,9 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/sign/warning/no_smoking{
+	pixel_x = 30
+	},
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "uc" = (
@@ -606,6 +610,11 @@
 /obj/structure/cable,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
+"vz" = (
+/obj/structure/cable,
+/obj/machinery/power/smes/engineering,
+/turf/open/floor/circuit/red,
+/area/station/engineering/supermatter/room)
 "vD" = (
 /obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/plating,
@@ -2012,7 +2021,7 @@ LO
 rW
 Qn
 dq
-Ar
+vz
 Ee
 fx
 Ar