diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index c4b77cdb3ff9..1a21864ee7fd 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -992,7 +992,6 @@
 	},
 /obj/effect/turf_decal/tile/red,
 /obj/machinery/incident_display/delam/directional/north,
-/mob/living/basic/pet/poppy,
 /turf/open/floor/iron,
 /area/station/engineering/storage_shared)
 "amy" = (
@@ -4338,10 +4337,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/showroomfloor,
 /area/station/science/xenobiology)
-"bwr" = (
-/obj/structure/flora/rock/pile/style_random,
-/turf/open/misc/asteroid/airless,
-/area/space)
 "bwA" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -5780,15 +5775,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
-"bUN" = (
-/turf/open/floor/plating/airless,
-/area/space)
 "bUO" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 8
 	},
 /turf/open/floor/plating/airless,
-/area/space)
+/area/space/nearstation)
 "bVh" = (
 /obj/structure/urinal/directional/west,
 /obj/effect/decal/remains/human,
@@ -6836,12 +6828,6 @@
 /obj/structure/cable/layer3,
 /turf/closed/wall/rust,
 /area/station/ai_monitored/turret_protected/aisat_interior)
-"cic" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plating/airless,
-/area/space)
 "cij" = (
 /obj/effect/turf_decal/loading_area{
 	dir = 8
@@ -7353,7 +7339,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/airless,
-/area/space)
+/area/space/nearstation)
 "cov" = (
 /obj/structure/disposaloutlet{
 	dir = 8
@@ -7539,7 +7525,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/airless,
-/area/space)
+/area/space/nearstation)
 "crR" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/decal/cleanable/dirt,
@@ -10463,6 +10449,10 @@
 	pixel_x = 10;
 	pixel_y = 15
 	},
+/obj/machinery/door/window/left/directional/west{
+	name = "Medbay Storage"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
 /turf/open/floor/iron/dark,
 /area/station/medical/storage)
 "dqw" = (
@@ -11693,7 +11683,6 @@
 	},
 /area/station/service/chapel)
 "dKz" = (
-/obj/structure/rack,
 /obj/effect/turf_decal/bot,
 /obj/item/storage/belt/utility{
 	pixel_x = 5;
@@ -11714,6 +11703,9 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
+/obj/structure/table,
+/obj/machinery/cell_charger_multi,
+/obj/item/stock_parts/cell/high,
 /turf/open/floor/iron/dark,
 /area/station/engineering/storage_shared)
 "dKJ" = (
@@ -21332,9 +21324,8 @@
 "gIY" = (
 /obj/structure/sign/poster/random/directional/south,
 /obj/machinery/shower/directional/north,
-/obj/effect/turf_decal/box,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/box/red,
+/turf/open/floor/noslip,
 /area/station/medical/treatment_center)
 "gJc" = (
 /obj/structure/railing{
@@ -23849,6 +23840,7 @@
 	pixel_y = -3
 	},
 /obj/machinery/light/directional/north,
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/storage)
 "hxi" = (
@@ -24743,7 +24735,7 @@
 "hJY" = (
 /obj/machinery/door/airlock/medical/glass{
 	id_tag = "medbay_front_door";
-	name = "Medbay"
+	name = "Medbay Storage"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/medical/general,
 /obj/machinery/door/firedoor,
@@ -29248,6 +29240,7 @@
 	pixel_y = 3
 	},
 /obj/item/defibrillator/loaded,
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/storage)
 "iUF" = (
@@ -38023,7 +38016,7 @@
 	width = 7
 	},
 /turf/open/floor/plating/airless,
-/area/space)
+/area/space/nearstation)
 "lOA" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -54752,10 +54745,9 @@
 /area/station/maintenance/port/fore)
 "rhl" = (
 /obj/machinery/shower/directional/north,
-/obj/effect/turf_decal/box,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
 /obj/machinery/station_map/engineering/directional/south,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/box/red,
+/turf/open/floor/noslip,
 /area/station/medical/treatment_center)
 "rhv" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59442,9 +59434,6 @@
 	},
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
-"sFf" = (
-/turf/open/misc/asteroid/airless,
-/area/space)
 "sFg" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59895,12 +59884,10 @@
 /turf/open/floor/iron,
 /area/station/service/janitor)
 "sLU" = (
-/obj/machinery/power/smes{
-	charge = 5e+006
-	},
 /obj/machinery/light/small/directional/north,
 /obj/structure/sign/warning/electric_shock/directional/north,
 /obj/structure/cable,
+/obj/machinery/power/smes/full,
 /turf/open/floor/circuit/red/telecomms,
 /area/station/tcommsat/server)
 "sLW" = (
@@ -66012,6 +65999,7 @@
 	name = "medical camera";
 	network = list("ss13","medical")
 	},
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/storage)
 "uIs" = (
@@ -69728,14 +69716,10 @@
 /turf/open/floor/iron,
 /area/station/security/courtroom)
 "vNt" = (
-/obj/structure/table,
-/obj/item/stock_parts/cell/high,
 /obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/machinery/cell_charger_multi,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/box/red,
+/obj/machinery/shower/directional/north,
+/turf/open/floor/noslip,
 /area/station/engineering/storage_shared)
 "vNB" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70488,6 +70472,7 @@
 	pixel_y = 3
 	},
 /obj/machinery/light/directional/north,
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/storage)
 "vXp" = (
@@ -71486,6 +71471,7 @@
 	department = "Medbay";
 	name = "Medbay Requests Console"
 	},
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/storage)
 "wlO" = (
@@ -85007,7 +84993,7 @@ aaa
 aaa
 aaB
 aaa
-sFf
+aeU
 aeu
 aeu
 dWG
@@ -85263,8 +85249,8 @@ aaa
 aaa
 aaa
 aaa
-sFf
-sFf
+aeU
+aeU
 aeu
 aeu
 aeu
@@ -85520,11 +85506,11 @@ aaa
 aaa
 aaa
 aaa
-bwr
-sFf
-sFf
-sFf
-sFf
+aUz
+aeU
+aeU
+aeU
+aeU
 aaa
 aaa
 acm
@@ -85777,10 +85763,10 @@ aaa
 aaa
 aaa
 aaa
-sFf
-sFf
-sFf
-sFf
+aeU
+aeU
+aeU
+aeU
 aaa
 aaa
 aaa
@@ -86034,10 +86020,10 @@ aeU
 aeu
 aeu
 aeU
-sFf
-sFf
-bwr
-sFf
+aeU
+aeU
+aUz
+aeU
 aaa
 aaa
 aaa
@@ -86294,7 +86280,7 @@ aeU
 aeU
 aeU
 aeU
-sFf
+aeU
 aaa
 aaa
 aaa
@@ -116650,13 +116636,13 @@ hGX
 mkk
 aeu
 bPP
-bUN
-bUN
-bUN
+cko
+cko
+cko
 lOt
-bUN
-bUN
-bUN
+cko
+cko
+cko
 bUd
 aeu
 aeu
@@ -116907,13 +116893,13 @@ itC
 rCi
 aeu
 fIn
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
+cko
+cko
 bUe
 aeu
 aeu
@@ -117164,13 +117150,13 @@ cvM
 mkk
 rCi
 jEK
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
+cko
+cko
 bUk
 bUE
 aeu
@@ -117421,13 +117407,13 @@ wSM
 tbE
 rFN
 gJj
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
+cko
+cko
 bUp
 aUz
 aeu
@@ -117678,13 +117664,13 @@ owX
 lAB
 lAB
 lAB
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
+cko
+cko
 cHu
 eob
 rCi
@@ -117935,13 +117921,13 @@ lMo
 rrm
 lAB
 bPR
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
+cko
+cko
 bUk
 aeu
 aeu
@@ -118192,13 +118178,13 @@ wGe
 srf
 rCi
 fIn
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
+cko
+cko
 lWC
 rCi
 rCi
@@ -118449,13 +118435,13 @@ pZj
 nuh
 lAB
 bPX
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
+cko
+cko
 bUd
 aeu
 aeu
@@ -118706,13 +118692,13 @@ tla
 lAB
 lAB
 lAB
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
+cko
+cko
 cHu
 eob
 rCi
@@ -118963,13 +118949,13 @@ xbx
 cOT
 wNr
 gJj
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
+cko
+cko
 bUy
 aeu
 aeu
@@ -119220,13 +119206,13 @@ mkk
 rCi
 mkk
 jEK
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
+cko
+cko
 bUe
 bUF
 aeu
@@ -119477,13 +119463,13 @@ vOW
 aeu
 aeu
 vFc
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
+cko
+cko
 bUk
 ctu
 aeu
@@ -119734,13 +119720,13 @@ sMh
 aeu
 bPK
 bPZ
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
+cko
+cko
 bUC
 aeU
 aeu
@@ -119992,11 +119978,11 @@ aeu
 aeu
 bTT
 bUO
-bUN
-bUN
-bUN
-bUN
-bUN
+cko
+cko
+cko
+cko
+cko
 crK
 bUD
 aeu
@@ -120248,13 +120234,13 @@ vOW
 aeu
 aeu
 vJm
-cic
-cic
-cic
+aeZ
+aeZ
+aeZ
 cos
-cic
-cic
-cic
+aeZ
+aeZ
+aeZ
 nZG
 aeu
 aeu
diff --git a/_maps/~monkestation/RandomEngines/KiloStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/KiloStation/supermatter.dmm
index f51397998c38..035cd4379c0c 100644
--- a/_maps/~monkestation/RandomEngines/KiloStation/supermatter.dmm
+++ b/_maps/~monkestation/RandomEngines/KiloStation/supermatter.dmm
@@ -486,21 +486,14 @@
 /obj/structure/cable,
 /turf/open/floor/circuit/red,
 /area/station/engineering/supermatter/room)
-"sz" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
 "sF" = (
 /obj/effect/mapping_helpers/broken_floor,
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/engineering/supermatter/room)
 "sG" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "th" = (
@@ -610,6 +603,16 @@
 /obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/plating,
 /area/station/engineering/supermatter/room)
+"vH" = (
+/obj/effect/turf_decal/siding/dark_red{
+	dir = 9
+	},
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/iron/dark/textured,
+/area/station/engineering/supermatter/room)
 "vL" = (
 /obj/machinery/light/directional/east,
 /obj/effect/decal/cleanable/dirt,
@@ -839,6 +842,16 @@
 /obj/structure/lattice,
 /turf/open/space,
 /area/space/nearstation)
+"Ew" = (
+/obj/effect/turf_decal/siding/dark_red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/iron/dark/textured,
+/area/station/engineering/supermatter/room)
 "EA" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -1462,6 +1475,14 @@
 /obj/effect/turf_decal/stripes/corner,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
+"Xz" = (
+/mob/living/basic/pet/poppy,
+/obj/structure/bed/dogbed/ian{
+	name = "Poppy's Bed"
+	},
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/iron/dark/textured,
+/area/station/engineering/supermatter/room)
 "XE" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
 /obj/effect/turf_decal/stripes/corner{
@@ -1483,7 +1504,15 @@
 /turf/closed/wall/r_wall,
 /area/station/engineering/supermatter)
 "Yu" = (
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark_red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/yellow,
+/obj/structure/tank_holder/extinguisher/advanced,
+/turf/open/floor/iron/dark/textured,
 /area/station/engineering/supermatter/room)
 "YC" = (
 /obj/effect/turf_decal/delivery,
@@ -1741,7 +1770,7 @@ aK
 fN
 BL
 sG
-Yu
+vH
 Yu
 pk
 FB
@@ -1763,9 +1792,9 @@ aK
 (10,1,1) = {"
 BM
 Qj
-sz
-Yu
-Yu
+sG
+Ew
+Xz
 ZC
 wk
 EA