diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
index 52862b3238f..a24c14cf07a 100644
--- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
+++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
@@ -11026,7 +11026,7 @@
 /turf/open/floor/iron/dark,
 /area/station/commons/vacant_room/office)
 "cQi" = (
-/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/plating,
 /area/station/engineering/atmos/office)
 "cQu" = (
@@ -18485,10 +18485,6 @@
 	},
 /turf/open/floor/plating/elevatorshaft,
 /area/station/security/prison/rec)
-"eTi" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/engineering/atmos/hfr_room)
 "eTm" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -22031,7 +22027,7 @@
 /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
 	dir = 1
 	},
-/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/plating,
 /area/station/engineering/atmos/upper)
 "fPy" = (
@@ -37871,7 +37867,6 @@
 /turf/open/floor/iron/dark,
 /area/station/science/lobby)
 "kbu" = (
-/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/engineering/atmos/upper)
 "kbA" = (
@@ -42058,7 +42053,7 @@
 /turf/open/floor/iron,
 /area/station/engineering/storage_shared)
 "lhw" = (
-/turf/open/floor/glass/reinforced,
+/turf/open/floor/glass/reinforced/plasma,
 /area/station/science/ordnance)
 "lhy" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -46240,12 +46235,9 @@
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "mnf" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/station/engineering/atmos/upper)
+/obj/machinery/atmospherics/components/unary/thermomachine,
+/turf/open/floor/engine,
+/area/station/engineering/atmos/hfr_room)
 "mnn" = (
 /obj/effect/mapping_helpers/airlock/locked,
 /obj/effect/mapping_helpers/airlock/welded,
@@ -66150,11 +66142,11 @@
 /turf/open/floor/grass,
 /area/station/science/cytology)
 "rFj" = (
-/obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "rdordnance";
 	name = "Ordnance Lab Shutters"
 	},
+/obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/plating,
 /area/station/science/ordnance)
 "rFk" = (
@@ -72510,6 +72502,10 @@
 /obj/structure/cable,
 /turf/open/openspace,
 /area/station/security/checkpoint/supply)
+"tpL" = (
+/obj/machinery/portable_atmospherics/canister/plasma,
+/turf/open/floor/engine,
+/area/station/engineering/atmos/hfr_room)
 "tpR" = (
 /obj/effect/landmark/blobstart,
 /obj/effect/landmark/generic_maintenance_landmark,
@@ -74142,8 +74138,8 @@
 /turf/open/floor/iron,
 /area/station/engineering/storage_shared)
 "tMN" = (
-/obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
+/obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
 "tMY" = (
@@ -79325,8 +79321,8 @@
 /turf/open/floor/iron/dark,
 /area/station/commons/vacant_room/commissary)
 "vcX" = (
-/obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/smart/simple/green/visible,
+/obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
 "vcY" = (
@@ -80508,7 +80504,7 @@
 /area/station/commons/lounge)
 "vsT" = (
 /obj/machinery/holopad,
-/turf/open/floor/glass/reinforced,
+/turf/open/floor/glass/reinforced/plasma,
 /area/station/science/ordnance)
 "vsW" = (
 /obj/machinery/flasher/directional/west,
@@ -85874,7 +85870,7 @@
 /turf/open/floor/carpet,
 /area/station/commons/storage/tools)
 "wNN" = (
-/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
 "wNO" = (
@@ -88376,7 +88372,7 @@
 /area/station/science/robotics)
 "xwF" = (
 /obj/effect/landmark/event_spawn,
-/turf/open/floor/glass/reinforced,
+/turf/open/floor/glass/reinforced/plasma,
 /area/station/science/ordnance)
 "xwJ" = (
 /obj/effect/spawner/structure/window/reinforced/tinted,
@@ -197032,7 +197028,7 @@ nlm
 nlm
 nlm
 xrx
-kbu
+yau
 txF
 jya
 eSI
@@ -197289,7 +197285,7 @@ nlm
 nlm
 nlm
 xrx
-kbu
+yau
 psU
 dyM
 rVb
@@ -197546,7 +197542,7 @@ slL
 dDL
 xtW
 xrx
-kbu
+yau
 orR
 dyM
 edC
@@ -198058,7 +198054,7 @@ nlm
 dDL
 nlm
 nlm
-kbu
+yau
 pcM
 uMG
 jOm
@@ -198315,7 +198311,7 @@ aDw
 aDw
 aDw
 aDw
-kbu
+yau
 aNP
 bLx
 rvv
@@ -198572,7 +198568,7 @@ mDG
 mDG
 mDG
 mDG
-kbu
+yau
 rSP
 uMG
 czx
@@ -200125,8 +200121,8 @@ tiN
 nWX
 xMJ
 unl
-kbu
-kbu
+yau
+yau
 gmD
 raE
 kPC
@@ -200629,7 +200625,7 @@ nKW
 mDG
 mDG
 mDG
-kbu
+yau
 qWr
 rPR
 lnX
@@ -201392,15 +201388,15 @@ bNX
 bNX
 bNX
 dKM
-bNX
-bNX
-bNX
+mnf
+mnf
+mnf
 sey
 bxd
 mDG
 mDG
 mDG
-kbu
+yau
 qWr
 gfi
 lrZ
@@ -201657,7 +201653,7 @@ bxd
 mDG
 mDG
 mDG
-kbu
+yau
 qWr
 iOi
 jfl
@@ -201911,9 +201907,9 @@ cZP
 bNX
 hTs
 bxd
-eTi
+ydS
 bxd
-eTi
+ydS
 unl
 tDq
 gfi
@@ -202939,9 +202935,9 @@ tVS
 bNX
 syi
 bxd
-eTi
+ydS
 bxd
-eTi
+ydS
 unl
 fGn
 wyz
@@ -203199,7 +203195,7 @@ bxd
 mDG
 mDG
 mDG
-kbu
+yau
 gfi
 gfi
 gfi
@@ -203448,7 +203444,7 @@ bNX
 bNX
 bNX
 lGE
-bNX
+tpL
 lmH
 lmH
 sUR
@@ -203456,7 +203452,7 @@ bxd
 mDG
 mDG
 mDG
-kbu
+yau
 gfi
 gfi
 lrZ
@@ -203977,7 +203973,7 @@ asE
 jkM
 dsZ
 wXQ
-kbu
+yau
 pqc
 gtC
 gtC
@@ -204227,14 +204223,14 @@ nKW
 mDG
 mDG
 mDG
-kbu
+yau
 gfi
 gfi
 gfi
 iUz
 ucy
 hSg
-kbu
+yau
 rqs
 nlm
 nlm
@@ -204484,7 +204480,7 @@ pGP
 pGP
 gjd
 fPv
-mnf
+fPv
 fHb
 wIi
 wkX
@@ -204740,7 +204736,7 @@ xst
 iqF
 lhP
 swS
-kbu
+yau
 ugA
 voO
 gfi
@@ -204748,7 +204744,7 @@ gfi
 klh
 yfx
 hSg
-kbu
+yau
 rqs
 nlm
 dDL
@@ -204997,7 +204993,7 @@ asM
 tBB
 kCh
 mDG
-kbu
+yau
 gMn
 gfi
 eDZ
@@ -205005,7 +205001,7 @@ ouD
 jkM
 gfi
 kHD
-kbu
+yau
 rqs
 nlm
 dDL
@@ -205254,7 +205250,7 @@ xst
 liE
 lhP
 qSj
-kbu
+yau
 qHW
 kbH
 gfi
@@ -205511,15 +205507,15 @@ pGP
 pGP
 pGP
 xKo
-mnf
-mnf
+fPv
+fPv
 tbE
 wIi
 kbA
 xGS
 gfi
 gfi
-kbu
+yau
 rqs
 nlm
 dDL
@@ -205776,7 +205772,7 @@ eaU
 oTi
 owk
 owk
-kbu
+yau
 rqs
 nlm
 dDL
@@ -206027,12 +206023,12 @@ dDL
 nlm
 msd
 unl
-kbu
-kbu
+yau
+yau
 unl
 unl
-kbu
-kbu
+yau
+yau
 unl
 roM
 nlm