diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
index 1d61355a7501ad..cf5046d9964862 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
@@ -173,7 +173,7 @@
/turf/open/floor/iron/icemoon,
/area/icemoon/surface/outdoors)
"aM" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/turf/open/floor/engine/airless,
/area/icemoon/surface/outdoors)
@@ -747,12 +747,12 @@
/turf/open/floor/iron/icemoon,
/area/icemoon/surface/outdoors)
"cZ" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible,
/turf/open/floor/engine/airless,
/area/icemoon/surface/outdoors)
"db" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible,
/turf/open/floor/engine/airless,
/area/icemoon/surface/outdoors)
@@ -908,17 +908,17 @@
/turf/open/floor/iron/icemoon,
/area/icemoon/surface/outdoors)
"na" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
/turf/open/floor/engine/airless,
/area/icemoon/surface/outdoors)
"tH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/brown,
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/engine/airless,
/area/icemoon/surface/outdoors)
"xA" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/brown,
/turf/open/floor/engine/airless,
/area/icemoon/surface/outdoors)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
index b9b5c0326042bc..d74d9c304e9bf9 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
@@ -166,7 +166,7 @@
/turf/closed/wall/mineral/titanium,
/area/ruin/powered/graveyard_shuttle)
"aI" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/powered/graveyard_shuttle)
"aJ" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
index 76dd4cd41a0ba5..62bf087926716d 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -162,7 +162,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/ruin/powered)
"J" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating{
initial_gas_mix = "LAVALAND_ATMOS"
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 0cc7f3ab54d436..eabe3415321b9a 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -97,7 +97,7 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/chemistry)
"at" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/poddoor{
id = "lavalandsyndi_chemistry"
},
@@ -425,7 +425,7 @@
/turf/open/floor/iron/dark,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"dS" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/preopen{
id = "lavalandsyndi";
@@ -639,7 +639,7 @@
/turf/open/floor/iron/dark,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"ek" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"el" = (
@@ -909,7 +909,7 @@
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"eF" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor{
id = "lavalandsyndi_cargo"
@@ -932,7 +932,7 @@
},
/area/ruin/unpowered/syndicate_lava_base/virology)
"eI" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/virology)
"eJ" = (
@@ -1179,7 +1179,7 @@
/turf/open/floor/iron/dark,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"fa" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/cargo)
@@ -1319,7 +1319,7 @@
/turf/open/floor/iron/white,
/area/ruin/unpowered/syndicate_lava_base/chemistry)
"fn" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/chemistry)
@@ -2341,7 +2341,7 @@
},
/area/ruin/unpowered/syndicate_lava_base/virology)
"hH" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/poddoor/preopen{
id = "lavalandsyndi_virology"
},
@@ -3192,7 +3192,7 @@
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"jx" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/preopen{
id = "lavalandsyndi_bar"
@@ -3915,7 +3915,7 @@
/obj/machinery/atmospherics/pipe/layer_manifold/visible{
dir = 4
},
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"ld" = (
@@ -4421,7 +4421,7 @@
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"mm" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible{
dir = 4
},
@@ -4434,7 +4434,7 @@
/turf/closed/wall/mineral/plastitanium/explosive,
/area/ruin/unpowered/syndicate_lava_base/telecomms)
"mp" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/preopen{
id = "lavalandsyndi_telecomms"
@@ -4631,7 +4631,7 @@
/area/ruin/unpowered/syndicate_lava_base/arrivals)
"mU" = (
/obj/machinery/door/firedoor,
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/bar)
"mX" = (
@@ -5476,7 +5476,7 @@
/turf/open/floor/iron/dark,
/area/ruin/unpowered/syndicate_lava_base/telecomms)
"ox" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor{
id = "lavalandsyndi_arrivals"
@@ -5578,7 +5578,7 @@
/turf/open/floor/engine/n2,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"rF" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
/turf/open/floor/plating/airless,
/area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -5614,7 +5614,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange{
dir = 8
},
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating/airless,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"tW" = (
@@ -5673,7 +5673,7 @@
/turf/open/floor/engine/co2,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"BF" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/preopen{
id = "lavalandsyndi";
@@ -5771,7 +5771,7 @@
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"IH" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating/airless,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"IJ" = (
@@ -5915,7 +5915,7 @@
/turf/open/floor/engine/co2,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"ZU" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/engineering)
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index ec13104513d42a..a414458d7de4c5 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -3396,7 +3396,7 @@
},
/area/template_noop)
"ES" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/obj/structure/grille,
/turf/open/floor/plating/airless,
@@ -3629,7 +3629,7 @@
},
/area/ruin/space/derelict/medical/chapel)
"Qt" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible,
/obj/structure/grille,
/turf/open/floor/plating/airless,
diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
index b59d64cdfb4f2f..edc127f1fcaf59 100644
--- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -672,7 +672,7 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"cc" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/ruin/space/has_grav/derelictoutpost/dockedship)
"cd" = (
diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index e6dad7655e490c..ca3ea5c31d9802 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -371,7 +371,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/caravan/freighter3)
"gd" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/caravan/freighter3)
"gk" = (
@@ -567,7 +567,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/caravan/freighter2)
"ht" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/caravan/freighter2)
"hu" = (
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index d48a0f4b8e6618..c62ad2e411a415 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -1076,7 +1076,7 @@
/obj/machinery/shower{
dir = 4
},
-/obj/structure/window/plasma/reinforced,
+/obj/structure/window/reinforced/plasma,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/deepstorage)
"cN" = (
diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
index 54838e4c7fd126..257a342225cfae 100644
--- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
@@ -96,7 +96,7 @@
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"au" = (
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/poddoor{
id = "fslockdown";
name = "Ship blast door";
diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
index 53ecc61fb882fd..94c7d6bea150e9 100644
--- a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
+++ b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
@@ -33,7 +33,7 @@
/turf/open/floor/mineral/titanium/white,
/area/ruin/space/has_grav/whiteship/box)
"gO" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/ruin/space/has_grav/whiteship/box)
"hT" = (
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index a483856ead448b..8ab128fafbccc1 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -6742,7 +6742,7 @@
/area/awaymission/snowdin/cave/cavern)
"rW" = (
/obj/structure/lattice/catwalk,
-/obj/structure/window/plasma/reinforced/unanchored,
+/obj/structure/window/reinforced/plasma/unanchored,
/turf/open/lava/plasma,
/area/awaymission/snowdin/cave/cavern)
"rY" = (
@@ -6832,12 +6832,12 @@
/area/awaymission/snowdin/cave/cavern)
"sn" = (
/obj/structure/lattice/catwalk,
-/obj/structure/window/plasma/reinforced/spawner/east,
+/obj/structure/window/reinforced/plasma/spawner/east,
/turf/open/lava/plasma,
/area/awaymission/snowdin/cave/cavern)
"so" = (
/obj/structure/lattice/catwalk,
-/obj/structure/window/plasma/reinforced/spawner/west,
+/obj/structure/window/reinforced/plasma/spawner/west,
/turf/open/lava/plasma,
/area/awaymission/snowdin/cave/cavern)
"sp" = (
@@ -6964,7 +6964,7 @@
/area/awaymission/snowdin/cave/cavern)
"sG" = (
/obj/structure/lattice/catwalk,
-/obj/structure/window/plasma/reinforced/spawner/north,
+/obj/structure/window/reinforced/plasma/spawner/north,
/turf/open/lava/plasma,
/area/awaymission/snowdin/cave/cavern)
"sH" = (
@@ -7831,11 +7831,11 @@
/turf/closed/wall/mineral/titanium,
/area/awaymission/snowdin/post/broken_shuttle)
"vM" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/broken_shuttle)
"vN" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/effect/baseturf_helper/asteroid/snow,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/broken_shuttle)
@@ -8994,8 +8994,8 @@
/area/awaymission/snowdin/cave/cavern)
"zl" = (
/obj/structure/lattice/catwalk,
-/obj/structure/window/plasma/reinforced/spawner/north,
-/obj/structure/window/plasma/reinforced/unanchored,
+/obj/structure/window/reinforced/plasma/spawner/north,
+/obj/structure/window/reinforced/plasma/unanchored,
/turf/open/lava/plasma,
/area/awaymission/snowdin/cave/cavern)
"zm" = (
@@ -10491,7 +10491,7 @@
/turf/open/floor/iron/dark,
/area/awaymission/snowdin/cave)
"DH" = (
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/reinforced/plasma/plastitanium,
/obj/structure/grille,
/turf/open/floor/plating,
/area/awaymission/snowdin/cave)
diff --git a/_maps/map_files/CTF/cruiser.dmm b/_maps/map_files/CTF/cruiser.dmm
index 7d7f849ca86b80..aaaf14b271473b 100644
--- a/_maps/map_files/CTF/cruiser.dmm
+++ b/_maps/map_files/CTF/cruiser.dmm
@@ -60,7 +60,7 @@
/turf/open/floor/pod/light,
/area/ctf)
"cK" = (
-/obj/structure/window/shuttle{
+/obj/structure/window/reinforced/shuttle{
max_integrity = 5000;
name = "hardened window";
atom_integrity = 5000
@@ -72,12 +72,12 @@
/turf/open/floor/circuit/green/anim,
/area/ctf)
"dq" = (
-/obj/structure/window/shuttle{
+/obj/structure/window/reinforced/shuttle{
max_integrity = 5000;
name = "hardened window";
atom_integrity = 5000
},
-/obj/structure/window/shuttle{
+/obj/structure/window/reinforced/shuttle{
max_integrity = 5000;
name = "hardened window";
atom_integrity = 5000
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 27fd8b1dc7e4c4..5c2b2b491e9497 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -6206,7 +6206,7 @@
/area/science/misc_lab/range)
"aTe" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"aTB" = (
@@ -6893,7 +6893,7 @@
/turf/open/floor/iron,
/area/security/checkpoint/supply)
"bcd" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
@@ -16194,7 +16194,7 @@
/area/medical/medbay/central)
"cmq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible,
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"cmw" = (
@@ -43834,7 +43834,7 @@
/area/command/heads_quarters/captain/private)
"hfC" = (
/obj/structure/lattice,
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/atmos/upper)
"hfD" = (
@@ -46795,7 +46795,7 @@
/turf/open/floor/iron/white,
/area/command/heads_quarters/rd)
"hVW" = (
-/obj/structure/window/plasma/reinforced/spawner/west{
+/obj/structure/window/reinforced/plasma/spawner/west{
dir = 4
},
/obj/machinery/power/rad_collector/anchored,
@@ -46819,7 +46819,7 @@
/turf/open/floor/iron,
/area/hallway/primary/starboard)
"hWu" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter)
"hWv" = (
@@ -51655,7 +51655,7 @@
/area/engineering/break_room)
"jvK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
@@ -52277,7 +52277,7 @@
/turf/open/floor/iron,
/area/cargo/qm)
"jEV" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/atmos)
"jFf" = (
@@ -57570,7 +57570,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"lgt" = (
@@ -60406,7 +60406,7 @@
/turf/open/floor/iron,
/area/engineering/break_room)
"lUP" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/turf/open/floor/plating,
/area/engineering/atmos/upper)
@@ -60469,7 +60469,7 @@
/turf/open/floor/iron/white,
/area/hallway/primary/central/aft)
"lVD" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
dir = 8
},
@@ -70411,7 +70411,7 @@
/turf/open/floor/iron,
/area/ai_monitored/command/storage/eva)
"oKZ" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/main)
"oLa" = (
@@ -76154,7 +76154,7 @@
/turf/open/floor/iron/dark,
/area/maintenance/starboard/fore)
"qvW" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/atmos/upper)
"qvX" = (
@@ -87242,7 +87242,7 @@
/turf/open/floor/iron,
/area/cargo/storage)
"tLP" = (
-/obj/structure/window/plasma/reinforced/spawner/west{
+/obj/structure/window/reinforced/plasma/spawner/west{
dir = 1
},
/obj/machinery/power/rad_collector/anchored,
@@ -97851,7 +97851,7 @@
/turf/open/floor/iron/dark,
/area/service/bar/atrium)
"wTm" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"wTo" = (
@@ -98242,7 +98242,7 @@
/turf/open/floor/iron/dark,
/area/science/misc_lab)
"wZs" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 829a97a1ed3763..6d10caf0ae5e85 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -13723,8 +13723,8 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cIv" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"cIW" = (
@@ -23450,7 +23450,7 @@
/area/engineering/main)
"ifB" = (
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden,
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"ifU" = (
@@ -24641,7 +24641,7 @@
/turf/open/floor/iron,
/area/hallway/primary/starboard)
"iLd" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"iLm" = (
@@ -27396,7 +27396,7 @@
/area/hallway/primary/aft)
"kpY" = (
/obj/machinery/power/rad_collector/anchored,
-/obj/structure/window/plasma/reinforced{
+/obj/structure/window/reinforced/plasma{
dir = 8
},
/obj/structure/cable,
@@ -27510,7 +27510,7 @@
/area/science/xenobiology)
"ksu" = (
/obj/machinery/power/rad_collector/anchored,
-/obj/structure/window/plasma/reinforced{
+/obj/structure/window/reinforced/plasma{
dir = 4
},
/obj/structure/cable,
@@ -29620,7 +29620,7 @@
},
/area/maintenance/department/medical)
"lBH" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
@@ -31760,7 +31760,7 @@
},
/area/service/hydroponics)
"mFX" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
@@ -32833,7 +32833,7 @@
/turf/open/floor/iron,
/area/cargo/miningdock)
"nid" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
@@ -38055,7 +38055,7 @@
/turf/open/floor/iron,
/area/command/teleporter)
"pWt" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter)
"pXw" = (
@@ -40054,7 +40054,7 @@
/turf/open/floor/carpet,
/area/service/chapel)
"riF" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating/icemoon,
/area/engineering/atmos)
"riK" = (
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 853892d2fd5d53..5ceba79596fbc9 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -30059,7 +30059,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"ehf" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/maintenance/disposal/incinerator)
"ehj" = (
@@ -41340,7 +41340,7 @@
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat/atmos)
"iyz" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"iyQ" = (
@@ -48261,7 +48261,7 @@
/area/hallway/primary/fore)
"kVo" = (
/obj/machinery/power/rad_collector/anchored,
-/obj/structure/window/plasma/reinforced{
+/obj/structure/window/reinforced/plasma{
dir = 4
},
/obj/structure/cable,
@@ -57588,7 +57588,7 @@
/turf/open/floor/iron/dark,
/area/maintenance/port)
"oAn" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
dir = 8
},
@@ -59386,7 +59386,7 @@
},
/area/ai_monitored/command/storage/satellite)
"pim" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible,
/turf/open/floor/plating/airless,
/area/engineering/main)
@@ -65919,7 +65919,7 @@
/area/science/mixing)
"rzN" = (
/obj/machinery/power/rad_collector/anchored,
-/obj/structure/window/plasma/reinforced{
+/obj/structure/window/reinforced/plasma{
dir = 8
},
/obj/structure/cable,
@@ -67964,7 +67964,7 @@
/turf/open/floor/wood,
/area/commons/locker)
"shz" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
@@ -70322,7 +70322,7 @@
/turf/open/floor/plating,
/area/engineering/break_room)
"tjq" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
@@ -70449,7 +70449,7 @@
},
/area/maintenance/disposal)
"tmq" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/atmos)
"tmu" = (
@@ -79867,7 +79867,7 @@
/turf/open/floor/iron/dark,
/area/command/bridge)
"wTq" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter)
"wTC" = (
diff --git a/_maps/map_files/Mafia/mafia_ayylmao.dmm b/_maps/map_files/Mafia/mafia_ayylmao.dmm
index bfdb1e98d56312..207416174e6a49 100644
--- a/_maps/map_files/Mafia/mafia_ayylmao.dmm
+++ b/_maps/map_files/Mafia/mafia_ayylmao.dmm
@@ -81,7 +81,7 @@
max_integrity = 99999;
name = "Station Night Shutters"
},
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating/abductor2,
/area/mafia)
"z" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 4d37c00be173ae..1f905bd705e187 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -18838,7 +18838,7 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"eBe" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{
dir = 4
},
@@ -24495,7 +24495,7 @@
/turf/open/floor/iron,
/area/service/hydroponics)
"gyl" = (
-/obj/structure/window/plasma/reinforced/spawner/east,
+/obj/structure/window/reinforced/plasma/spawner/east,
/turf/open/space/basic,
/area/space/nearstation)
"gyB" = (
@@ -34502,7 +34502,7 @@
/turf/open/floor/iron,
/area/hallway/primary/central)
"kkt" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"kkA" = (
@@ -39802,7 +39802,7 @@
/area/engineering/atmos)
"mfL" = (
/obj/machinery/power/rad_collector/anchored,
-/obj/structure/window/plasma/reinforced,
+/obj/structure/window/reinforced/plasma,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/turf/open/floor/engine,
@@ -44841,7 +44841,7 @@
/area/hallway/primary/fore)
"nQq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"nQF" = (
@@ -48253,7 +48253,7 @@
/area/security/brig)
"pdy" = (
/obj/machinery/power/rad_collector/anchored,
-/obj/structure/window/plasma/reinforced{
+/obj/structure/window/reinforced/plasma{
dir = 1
},
/obj/structure/cable,
@@ -48958,7 +48958,7 @@
/turf/open/floor/iron,
/area/service/hydroponics)
"ppN" = (
-/obj/structure/window/plasma/reinforced/spawner/west,
+/obj/structure/window/reinforced/plasma/spawner/west,
/turf/open/space/basic,
/area/space/nearstation)
"ppT" = (
@@ -51199,7 +51199,7 @@
/turf/open/floor/iron/white,
/area/medical/surgery/room_b)
"qdD" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter)
"qdX" = (
@@ -56591,7 +56591,7 @@
/turf/open/floor/iron/dark,
/area/hallway/secondary/exit/departure_lounge)
"scK" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/atmos)
"scO" = (
@@ -61492,7 +61492,7 @@
/area/commons/vacant_room/office)
"tNb" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/junction,
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"tNy" = (
@@ -63589,7 +63589,7 @@
/turf/open/floor/iron/white,
/area/science/robotics/lab)
"uCe" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
@@ -64947,7 +64947,7 @@
/turf/open/floor/iron/white,
/area/medical/chemistry)
"vcI" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
@@ -67199,7 +67199,7 @@
/turf/open/floor/iron,
/area/engineering/atmos)
"vQt" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 52af549b2471af..7ff489e9eaa33c 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -13134,7 +13134,7 @@
/turf/open/floor/plating,
/area/centcom/evac)
"KP" = (
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/obj/structure/grille,
/turf/open/floor/plating,
/area/centcom/evac)
@@ -13310,7 +13310,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/centcom/evac)
"Lw" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/centcom/evac)
"Lx" = (
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index 7cb7d0e4b78186..d8672e99b803d9 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -9772,7 +9772,7 @@
/area/hallway/secondary/construction/engineering)
"bdI" = (
/obj/machinery/power/rad_collector/anchored,
-/obj/structure/window/plasma/reinforced{
+/obj/structure/window/reinforced/plasma{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
@@ -11816,7 +11816,7 @@
/obj/structure/industrial_lift/tram{
icon_state = "plating"
},
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/obj/structure/grille,
/obj/structure/fluff/tram_rail,
/turf/open/openspace,
@@ -12077,7 +12077,7 @@
/obj/structure/industrial_lift/tram{
icon_state = "plating"
},
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/obj/structure/grille,
/obj/structure/fluff/tram_rail{
dir = 1
@@ -25351,7 +25351,7 @@
/obj/structure/industrial_lift/tram{
icon_state = "plating"
},
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/obj/structure/grille,
/obj/effect/turf_decal/stripes{
dir = 1
@@ -40998,7 +40998,7 @@
/turf/open/floor/iron,
/area/security/prison/rec)
"ntZ" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating/icemoon,
/area/engineering/atmos)
"nur" = (
@@ -43567,7 +43567,7 @@
/turf/open/floor/iron/white,
/area/science/research)
"ouR" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter)
"ouV" = (
@@ -45291,7 +45291,7 @@
/turf/open/floor/iron,
/area/commons/lounge)
"paJ" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"paP" = (
@@ -49644,7 +49644,7 @@
/obj/structure/industrial_lift/tram{
icon_state = "plating"
},
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/obj/structure/grille,
/obj/effect/turf_decal/stripes{
dir = 1
@@ -55741,7 +55741,7 @@
/area/science/robotics/lab)
"tip" = (
/obj/machinery/power/rad_collector/anchored,
-/obj/structure/window/plasma/reinforced{
+/obj/structure/window/reinforced/plasma{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
@@ -55877,7 +55877,7 @@
/obj/structure/industrial_lift/tram{
icon_state = "plating"
},
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/obj/structure/grille,
/turf/open/openspace,
/area/hallway/primary/tram/center)
diff --git a/_maps/shuttles/arrival_box.dmm b/_maps/shuttles/arrival_box.dmm
index f02a8293a34cd7..ff7ec36ff68d66 100644
--- a/_maps/shuttles/arrival_box.dmm
+++ b/_maps/shuttles/arrival_box.dmm
@@ -12,7 +12,7 @@
/turf/open/floor/plating,
/area/shuttle/arrival)
"d" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/arrival)
"e" = (
diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm
index a8e910c6cfdb54..7703735be9d287 100644
--- a/_maps/shuttles/arrival_delta.dmm
+++ b/_maps/shuttles/arrival_delta.dmm
@@ -41,7 +41,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/arrival)
"h" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/arrival)
"i" = (
@@ -259,7 +259,7 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/sunnybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/grass,
/area/shuttle/arrival)
"y" = (
@@ -267,7 +267,7 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/fernybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/grass,
/area/shuttle/arrival)
"z" = (
diff --git a/_maps/shuttles/arrival_donut.dmm b/_maps/shuttles/arrival_donut.dmm
index 2648c7435d6219..47af40e844f8b8 100644
--- a/_maps/shuttles/arrival_donut.dmm
+++ b/_maps/shuttles/arrival_donut.dmm
@@ -56,7 +56,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/arrival)
"o" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/arrival)
"p" = (
diff --git a/_maps/shuttles/arrival_kilo.dmm b/_maps/shuttles/arrival_kilo.dmm
index a1dc9d74e6b41a..6a01b3bf745606 100644
--- a/_maps/shuttles/arrival_kilo.dmm
+++ b/_maps/shuttles/arrival_kilo.dmm
@@ -23,7 +23,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/arrival)
"f" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/arrival)
"g" = (
@@ -112,7 +112,7 @@
/obj/structure/shuttle/engine/heater{
dir = 8
},
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/arrival)
"p" = (
@@ -230,7 +230,7 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/fernybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/grass,
/area/shuttle/arrival)
"B" = (
diff --git a/_maps/shuttles/arrival_pubby.dmm b/_maps/shuttles/arrival_pubby.dmm
index 17c873f104963e..0d8f9c0d1c9f6d 100644
--- a/_maps/shuttles/arrival_pubby.dmm
+++ b/_maps/shuttles/arrival_pubby.dmm
@@ -12,7 +12,7 @@
/turf/open/floor/plating,
/area/shuttle/arrival)
"d" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/arrival)
"e" = (
@@ -68,7 +68,7 @@
id = "arrivy";
name = "ship shutters"
},
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/arrival)
"n" = (
diff --git a/_maps/shuttles/cargo_kilo.dmm b/_maps/shuttles/cargo_kilo.dmm
index 279ae2ed4b2261..81dc1775fedd92 100644
--- a/_maps/shuttles/cargo_kilo.dmm
+++ b/_maps/shuttles/cargo_kilo.dmm
@@ -259,7 +259,7 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/supply)
"A" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/shuttle/supply)
diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm
index 06bfb2ced59fac..d3d058b134c855 100644
--- a/_maps/shuttles/emergency_asteroid.dmm
+++ b/_maps/shuttles/emergency_asteroid.dmm
@@ -12,7 +12,7 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"ah" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ai" = (
diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm
index bc222316e3251a..a87647a7ec6a5c 100644
--- a/_maps/shuttles/emergency_bar.dmm
+++ b/_maps/shuttles/emergency_bar.dmm
@@ -6,7 +6,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm
index 568312f1b9029a..221916b1ffa150 100644
--- a/_maps/shuttles/emergency_birdboat.dmm
+++ b/_maps/shuttles/emergency_birdboat.dmm
@@ -6,7 +6,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm
index 800975d131f292..0d3e2bd26a6602 100644
--- a/_maps/shuttles/emergency_box.dmm
+++ b/_maps/shuttles/emergency_box.dmm
@@ -3,7 +3,7 @@
/turf/template_noop,
/area/template_noop)
"ac" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency_casino.dmm
index 7d87ecf3c83b25..6638fd742b04e6 100644
--- a/_maps/shuttles/emergency_casino.dmm
+++ b/_maps/shuttles/emergency_casino.dmm
@@ -520,7 +520,7 @@
/turf/open/floor/carpet/green,
/area/shuttle/escape)
"mz" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ni" = (
@@ -1035,7 +1035,7 @@
/obj/structure/shuttle/engine/heater{
dir = 8
},
-/obj/structure/window/plasma/reinforced{
+/obj/structure/window/reinforced/plasma{
dir = 4
},
/turf/open/floor/plating/airless,
diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm
index 3e441d8ce2c15e..2f028853d58f44 100644
--- a/_maps/shuttles/emergency_cere.dmm
+++ b/_maps/shuttles/emergency_cere.dmm
@@ -6,7 +6,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm
index e5e79993b106e2..21543570bf0173 100644
--- a/_maps/shuttles/emergency_clown.dmm
+++ b/_maps/shuttles/emergency_clown.dmm
@@ -6,7 +6,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
diff --git a/_maps/shuttles/emergency_construction.dmm b/_maps/shuttles/emergency_construction.dmm
index 532d3d8c954194..6bbf13d5f0be97 100644
--- a/_maps/shuttles/emergency_construction.dmm
+++ b/_maps/shuttles/emergency_construction.dmm
@@ -37,7 +37,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"h" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"i" = (
diff --git a/_maps/shuttles/emergency_cramped.dmm b/_maps/shuttles/emergency_cramped.dmm
index 7adef8c18757c6..d3753023b01c3b 100644
--- a/_maps/shuttles/emergency_cramped.dmm
+++ b/_maps/shuttles/emergency_cramped.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"b" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"c" = (
diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm
index 19267781c71edd..10d296c468c3eb 100644
--- a/_maps/shuttles/emergency_cruise.dmm
+++ b/_maps/shuttles/emergency_cruise.dmm
@@ -135,7 +135,7 @@
/turf/open/floor/iron/white,
/area/shuttle/escape)
"en" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"fB" = (
diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm
index 0256a99a04a785..13def813d22b1c 100644
--- a/_maps/shuttles/emergency_delta.dmm
+++ b/_maps/shuttles/emergency_delta.dmm
@@ -31,7 +31,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ag" = (
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/obj/structure/grille,
/turf/open/floor/plating,
/area/shuttle/escape)
@@ -309,7 +309,7 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/brflowers,
/obj/structure/flora/ausbushes/leafybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/grass,
/area/shuttle/escape)
"ay" = (
@@ -400,7 +400,7 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/genericbush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/grass,
/area/shuttle/escape)
"aJ" = (
@@ -513,7 +513,7 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/sunnybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/grass,
/area/shuttle/escape)
"aY" = (
@@ -588,7 +588,7 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/fernybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/grass,
/area/shuttle/escape)
"bf" = (
@@ -1278,7 +1278,7 @@
/turf/open/floor/iron,
/area/shuttle/escape)
"hB" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"jH" = (
diff --git a/_maps/shuttles/emergency_discoinferno.dmm b/_maps/shuttles/emergency_discoinferno.dmm
index 657bea66b91b88..fb91dba3220988 100644
--- a/_maps/shuttles/emergency_discoinferno.dmm
+++ b/_maps/shuttles/emergency_discoinferno.dmm
@@ -6,7 +6,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/escape)
"c" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating/elevatorshaft,
/area/shuttle/escape)
"d" = (
@@ -202,7 +202,7 @@
/area/shuttle/escape)
"M" = (
/obj/structure/shuttle/engine/heater,
-/obj/structure/window/plasma/reinforced{
+/obj/structure/window/reinforced/plasma{
dir = 1
},
/turf/open/floor/plating/airless,
diff --git a/_maps/shuttles/emergency_donut.dmm b/_maps/shuttles/emergency_donut.dmm
index fbe00416ced007..c0de4e4cf21652 100644
--- a/_maps/shuttles/emergency_donut.dmm
+++ b/_maps/shuttles/emergency_donut.dmm
@@ -6,7 +6,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm
index bbcc9f876b166e..3c8c6db56bf636 100644
--- a/_maps/shuttles/emergency_goon.dmm
+++ b/_maps/shuttles/emergency_goon.dmm
@@ -60,7 +60,7 @@
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape/brig)
"m" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"n" = (
diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm
index 5ca071bade101d..947b607f4cf780 100644
--- a/_maps/shuttles/emergency_kilo.dmm
+++ b/_maps/shuttles/emergency_kilo.dmm
@@ -6,7 +6,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
@@ -944,7 +944,7 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/brflowers,
/obj/structure/flora/ausbushes/leafybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/grass,
/area/shuttle/escape)
"bP" = (
@@ -952,7 +952,7 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/fernybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/grass,
/area/shuttle/escape)
"bR" = (
@@ -1453,7 +1453,7 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"cK" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm
index 3085c08f4c0546..731eb843d669c9 100644
--- a/_maps/shuttles/emergency_medisim.dmm
+++ b/_maps/shuttles/emergency_medisim.dmm
@@ -1365,7 +1365,7 @@
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"ZB" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ZI" = (
diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm
index 86cd6c100589f3..5ac532175811e4 100644
--- a/_maps/shuttles/emergency_meta.dmm
+++ b/_maps/shuttles/emergency_meta.dmm
@@ -3,7 +3,7 @@
/turf/template_noop,
/area/template_noop)
"ac" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm
index c4775f526a8cea..d27403ae93d835 100644
--- a/_maps/shuttles/emergency_mini.dmm
+++ b/_maps/shuttles/emergency_mini.dmm
@@ -70,7 +70,7 @@
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape/brig)
"n" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"o" = (
diff --git a/_maps/shuttles/emergency_nature.dmm b/_maps/shuttles/emergency_nature.dmm
index f6cf8600741acc..41273703f1b4e8 100644
--- a/_maps/shuttles/emergency_nature.dmm
+++ b/_maps/shuttles/emergency_nature.dmm
@@ -1225,7 +1225,7 @@
/turf/open/floor/grass,
/area/shuttle/escape)
"VI" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"VM" = (
diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm
index defb1601bc9e9f..485830862fcee7 100644
--- a/_maps/shuttles/emergency_omega.dmm
+++ b/_maps/shuttles/emergency_omega.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ab" = (
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/obj/structure/grille,
/turf/open/floor/plating,
/area/shuttle/escape)
@@ -336,7 +336,7 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/sunnybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/grass,
/area/shuttle/escape)
"aH" = (
@@ -424,7 +424,7 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/fernybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/grass,
/area/shuttle/escape)
"aJ" = (
@@ -820,7 +820,7 @@
/turf/open/floor/iron,
/area/shuttle/escape)
"sY" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_pod.dmm b/_maps/shuttles/emergency_pod.dmm
index acd6eedbad4915..5724b136bc23f7 100644
--- a/_maps/shuttles/emergency_pod.dmm
+++ b/_maps/shuttles/emergency_pod.dmm
@@ -9,7 +9,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"c" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"d" = (
diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm
index 5a503d0e380cde..5a710431e38ef6 100644
--- a/_maps/shuttles/emergency_pubby.dmm
+++ b/_maps/shuttles/emergency_pubby.dmm
@@ -6,7 +6,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
@@ -585,7 +585,7 @@
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape/brig)
"bv" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/escape)
"bw" = (
@@ -637,7 +637,7 @@
/area/shuttle/escape/brig)
"bE" = (
/obj/structure/shuttle/engine/heater,
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/escape)
"bG" = (
diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm
index 552b3b6fb1fc7c..6398d09cfc3c44 100644
--- a/_maps/shuttles/emergency_raven.dmm
+++ b/_maps/shuttles/emergency_raven.dmm
@@ -4,7 +4,7 @@
/area/template_noop)
"ab" = (
/obj/structure/grille,
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/poddoor/preopen{
id = "escape_cockpit_windows";
name = "Cockpit Blast Door"
@@ -568,7 +568,7 @@
},
/area/shuttle/escape)
"br" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/escape)
"bs" = (
diff --git a/_maps/shuttles/emergency_rollerdome.dmm b/_maps/shuttles/emergency_rollerdome.dmm
index 108b7c3078861e..8016f7cd85e123 100644
--- a/_maps/shuttles/emergency_rollerdome.dmm
+++ b/_maps/shuttles/emergency_rollerdome.dmm
@@ -125,7 +125,7 @@
/turf/open/floor/wood,
/area/shuttle/escape)
"wf" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating/elevatorshaft,
/area/shuttle/escape)
"wn" = (
diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency_scrapheap.dmm
index 13870d33ed03fa..218d1e176b816c 100644
--- a/_maps/shuttles/emergency_scrapheap.dmm
+++ b/_maps/shuttles/emergency_scrapheap.dmm
@@ -6,7 +6,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm
index 4e73b0e92abf11..4ae5e8e04c61da 100644
--- a/_maps/shuttles/emergency_supermatter.dmm
+++ b/_maps/shuttles/emergency_supermatter.dmm
@@ -7,7 +7,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ad" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ae" = (
diff --git a/_maps/shuttles/emergency_tram.dmm b/_maps/shuttles/emergency_tram.dmm
index 627bd548808dee..036dcec49cf2cd 100644
--- a/_maps/shuttles/emergency_tram.dmm
+++ b/_maps/shuttles/emergency_tram.dmm
@@ -3,7 +3,7 @@
/turf/template_noop,
/area/template_noop)
"ab" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ac" = (
diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm
index 1bbb0da5eec1cf..7518237fe370c2 100644
--- a/_maps/shuttles/emergency_wabbajack.dmm
+++ b/_maps/shuttles/emergency_wabbajack.dmm
@@ -7,7 +7,7 @@
/area/shuttle/escape)
"ac" = (
/obj/structure/grille,
-/obj/structure/window/shuttle/tinted,
+/obj/structure/window/reinforced/shuttle/tinted,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
@@ -132,7 +132,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"as" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"at" = (
diff --git a/_maps/shuttles/emergency_zeta.dmm b/_maps/shuttles/emergency_zeta.dmm
index 55b283fa27f823..dc777906bb099d 100644
--- a/_maps/shuttles/emergency_zeta.dmm
+++ b/_maps/shuttles/emergency_zeta.dmm
@@ -6,7 +6,7 @@
/turf/closed/wall/mineral/abductor,
/area/shuttle/escape)
"c" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating/abductor,
/area/shuttle/escape)
"d" = (
diff --git a/_maps/shuttles/escape_pod_default.dmm b/_maps/shuttles/escape_pod_default.dmm
index b5bfa044f4f61e..12a097b0299e1c 100644
--- a/_maps/shuttles/escape_pod_default.dmm
+++ b/_maps/shuttles/escape_pod_default.dmm
@@ -22,7 +22,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"Q" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/pod_1)
"U" = (
diff --git a/_maps/shuttles/escape_pod_large.dmm b/_maps/shuttles/escape_pod_large.dmm
index 03b35c6faaa6dc..716487130fc068 100644
--- a/_maps/shuttles/escape_pod_large.dmm
+++ b/_maps/shuttles/escape_pod_large.dmm
@@ -12,7 +12,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"u" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/pod_1)
"A" = (
diff --git a/_maps/shuttles/ferry_base.dmm b/_maps/shuttles/ferry_base.dmm
index ae6519eed2035d..9297a6e77516fa 100644
--- a/_maps/shuttles/ferry_base.dmm
+++ b/_maps/shuttles/ferry_base.dmm
@@ -12,7 +12,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"e" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/transport)
"g" = (
diff --git a/_maps/shuttles/ferry_fancy.dmm b/_maps/shuttles/ferry_fancy.dmm
index 3ef4c5960ea386..429c188eadb760 100644
--- a/_maps/shuttles/ferry_fancy.dmm
+++ b/_maps/shuttles/ferry_fancy.dmm
@@ -6,7 +6,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"c" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/transport)
"d" = (
diff --git a/_maps/shuttles/ferry_kilo.dmm b/_maps/shuttles/ferry_kilo.dmm
index a769eb297d9294..468a058b892345 100644
--- a/_maps/shuttles/ferry_kilo.dmm
+++ b/_maps/shuttles/ferry_kilo.dmm
@@ -12,7 +12,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"e" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/transport)
"f" = (
@@ -43,7 +43,7 @@
/obj/structure/shuttle/engine/heater{
dir = 8
},
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/transport)
"j" = (
diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm
index c89cdaf545dcec..f4c2a17fe23633 100644
--- a/_maps/shuttles/ferry_lighthouse.dmm
+++ b/_maps/shuttles/ferry_lighthouse.dmm
@@ -87,7 +87,7 @@
/turf/open/floor/wood,
/area/shuttle/transport)
"az" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/transport)
"aB" = (
diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm
index e72a706b840c9b..f69156aef90dd6 100644
--- a/_maps/shuttles/ferry_meat.dmm
+++ b/_maps/shuttles/ferry_meat.dmm
@@ -92,7 +92,7 @@
/turf/open/floor/iron/freezer,
/area/shuttle/transport)
"o" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/transport)
"p" = (
diff --git a/_maps/shuttles/hunter_bounty.dmm b/_maps/shuttles/hunter_bounty.dmm
index 4c3190de33143a..0905ed463afa82 100644
--- a/_maps/shuttles/hunter_bounty.dmm
+++ b/_maps/shuttles/hunter_bounty.dmm
@@ -36,7 +36,7 @@
/turf/open/floor/plating,
/area/shuttle/hunter)
"i" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/hunter)
"j" = (
diff --git a/_maps/shuttles/hunter_space_cop.dmm b/_maps/shuttles/hunter_space_cop.dmm
index d306a2b50e98fc..bc5671a04d3c1b 100644
--- a/_maps/shuttles/hunter_space_cop.dmm
+++ b/_maps/shuttles/hunter_space_cop.dmm
@@ -122,7 +122,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"An" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/hunter)
"Pq" = (
diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm
index 9aee53bffca8b1..df2de148dd995b 100644
--- a/_maps/shuttles/infiltrator_advanced.dmm
+++ b/_maps/shuttles/infiltrator_advanced.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/shuttle/syndicate/bridge)
"ab" = (
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/poddoor/shutters{
id = "syndieshutters";
name = "blast shutters"
@@ -379,7 +379,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/syndicate/airlock)
"aQ" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/syndicate/eva)
"aR" = (
@@ -852,7 +852,7 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate/medical)
"bQ" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/syndicate/hallway)
"bR" = (
@@ -1187,7 +1187,7 @@
/area/shuttle/syndicate/medical)
"cx" = (
/obj/structure/grille,
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/reinforced/plasma/plastitanium,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/shuttle/syndicate/medical)
@@ -1247,7 +1247,7 @@
/area/shuttle/syndicate/armory)
"cH" = (
/obj/structure/grille,
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/reinforced/plasma/plastitanium,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/shuttle/syndicate/armory)
@@ -1278,7 +1278,7 @@
/area/shuttle/syndicate/hallway)
"cN" = (
/obj/structure/grille,
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/reinforced/plasma/plastitanium,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/shuttle/syndicate/hallway)
diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm
index 9bfe2cb3ad75ae..ba25082edc4f83 100644
--- a/_maps/shuttles/infiltrator_basic.dmm
+++ b/_maps/shuttles/infiltrator_basic.dmm
@@ -18,7 +18,7 @@
/turf/closed/wall/r_wall/syndicate,
/area/shuttle/syndicate/hallway)
"ae" = (
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/poddoor/shutters{
id = "syndieshutters";
name = "blast shutters"
@@ -394,7 +394,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/eva)
"aV" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/syndicate/hallway)
"aW" = (
@@ -502,11 +502,11 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate/eva)
"bg" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/syndicate/eva)
"bh" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/syndicate/airlock)
"bi" = (
@@ -600,11 +600,11 @@
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/medical)
"bv" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/syndicate/medical)
"bw" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/syndicate/armory)
"bx" = (
diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm
index 149256a19a2737..d6405a9ce6e79b 100644
--- a/_maps/shuttles/labour_box.dmm
+++ b/_maps/shuttles/labour_box.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/labor)
"b" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/labor)
"c" = (
diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm
index dca2589813505a..87622fe64dabbb 100644
--- a/_maps/shuttles/labour_delta.dmm
+++ b/_maps/shuttles/labour_delta.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/labor)
"b" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/labor)
"c" = (
@@ -27,7 +27,7 @@
/area/shuttle/labor)
"f" = (
/obj/structure/cable,
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/labor)
"g" = (
diff --git a/_maps/shuttles/labour_kilo.dmm b/_maps/shuttles/labour_kilo.dmm
index 8df5382dffa50a..89a416ad070ea8 100644
--- a/_maps/shuttles/labour_kilo.dmm
+++ b/_maps/shuttles/labour_kilo.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/labor)
"b" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/labor)
"c" = (
@@ -238,7 +238,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/labor)
"w" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/shuttle/labor)
diff --git a/_maps/shuttles/mining_box.dmm b/_maps/shuttles/mining_box.dmm
index 4cfb962c0e4d32..80540b7c259bf8 100644
--- a/_maps/shuttles/mining_box.dmm
+++ b/_maps/shuttles/mining_box.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining)
"b" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/mining)
"c" = (
diff --git a/_maps/shuttles/mining_common_kilo.dmm b/_maps/shuttles/mining_common_kilo.dmm
index 5942996893f8ef..76b22ac96222af 100644
--- a/_maps/shuttles/mining_common_kilo.dmm
+++ b/_maps/shuttles/mining_common_kilo.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining)
"b" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/mining)
"c" = (
@@ -108,7 +108,7 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining)
"p" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/shuttle/mining)
diff --git a/_maps/shuttles/mining_common_meta.dmm b/_maps/shuttles/mining_common_meta.dmm
index 58071107f50208..013ff187afc34f 100644
--- a/_maps/shuttles/mining_common_meta.dmm
+++ b/_maps/shuttles/mining_common_meta.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining)
"b" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/mining)
"c" = (
diff --git a/_maps/shuttles/mining_delta.dmm b/_maps/shuttles/mining_delta.dmm
index 25638f33ddccd5..9b8453b5d4c2e6 100644
--- a/_maps/shuttles/mining_delta.dmm
+++ b/_maps/shuttles/mining_delta.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining)
"b" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/mining)
"c" = (
diff --git a/_maps/shuttles/mining_freight.dmm b/_maps/shuttles/mining_freight.dmm
index 3a9b104b725222..c6fe00f27ae48f 100644
--- a/_maps/shuttles/mining_freight.dmm
+++ b/_maps/shuttles/mining_freight.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining)
"b" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/mining)
"c" = (
@@ -106,7 +106,7 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining)
"p" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/template_noop)
diff --git a/_maps/shuttles/mining_kilo.dmm b/_maps/shuttles/mining_kilo.dmm
index be1d2ddd3ec834..0ed7a8aa21b9ec 100644
--- a/_maps/shuttles/mining_kilo.dmm
+++ b/_maps/shuttles/mining_kilo.dmm
@@ -3,7 +3,7 @@
/turf/template_noop,
/area/template_noop)
"b" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/mining/large)
"c" = (
@@ -245,7 +245,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining/large)
"D" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/shuttle/mining/large)
diff --git a/_maps/shuttles/mining_large.dmm b/_maps/shuttles/mining_large.dmm
index 32f1fbe21a464c..83403112309fd6 100644
--- a/_maps/shuttles/mining_large.dmm
+++ b/_maps/shuttles/mining_large.dmm
@@ -3,7 +3,7 @@
/turf/template_noop,
/area/template_noop)
"b" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/mining/large)
"c" = (
diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index a82abf586feb56..32b63913b56d2c 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -922,7 +922,7 @@
id = "piratebridge"
},
/obj/structure/grille,
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/pirate)
"ez" = (
diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm
index b4e362b41421e8..09286eeb1aad76 100644
--- a/_maps/shuttles/pirate_dutchman.dmm
+++ b/_maps/shuttles/pirate_dutchman.dmm
@@ -386,7 +386,7 @@
/turf/open/space/basic,
/area/shuttle/pirate/flying_dutchman)
"pG" = (
-/obj/structure/window/shuttle/survival_pod,
+/obj/structure/window/reinforced/shuttle/survival_pod,
/turf/open/floor/wood/airless,
/area/shuttle/pirate/flying_dutchman)
"rd" = (
diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm
index e48bfb4934befb..f53bccd8605a54 100644
--- a/_maps/shuttles/pirate_silverscale.dmm
+++ b/_maps/shuttles/pirate_silverscale.dmm
@@ -70,7 +70,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"em" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/structure/shuttle/engine/heater{
dir = 4
},
@@ -155,7 +155,7 @@
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"jo" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/plating,
/area/shuttle/pirate)
@@ -344,7 +344,7 @@
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"xs" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/pirate)
"xO" = (
@@ -408,7 +408,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"AE" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/structure/shuttle/engine/heater{
dir = 8
},
@@ -507,7 +507,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"HD" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor/shutters/preopen{
id = "silverbridge"
},
diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm
index 249b9136e568a7..6005951e67d2ea 100644
--- a/_maps/shuttles/ruin_caravan_victim.dmm
+++ b/_maps/shuttles/ruin_caravan_victim.dmm
@@ -762,7 +762,7 @@
/turf/open/floor/iron/airless,
/area/shuttle/caravan/freighter1)
"LM" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "caravantrade1_bridge"
},
diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm
index fadc30ff55baec..fd861ffdff8e92 100644
--- a/_maps/shuttles/ruin_pirate_cutter.dmm
+++ b/_maps/shuttles/ruin_pirate_cutter.dmm
@@ -670,11 +670,11 @@
/obj/machinery/door/poddoor{
id = "caravanpirate_bridge"
},
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/caravan/pirate)
"BC" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/poddoor{
id = "caravanpirate_bridge"
},
diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm
index e8047499d43806..b01e6b0832774e 100644
--- a/_maps/shuttles/ruin_syndicate_dropship.dmm
+++ b/_maps/shuttles/ruin_syndicate_dropship.dmm
@@ -165,7 +165,7 @@
/area/shuttle/caravan/syndicate3)
"rU" = (
/obj/structure/grille,
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/poddoor{
id = "caravansyndicate3_bridge"
},
diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm
index 218f32bf7b4fd3..8bd1c0ab5bcf7d 100644
--- a/_maps/shuttles/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship_box.dmm
@@ -34,7 +34,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/medbay)
"ah" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows"
},
@@ -71,7 +71,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/crew)
"ak" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows"
},
@@ -690,7 +690,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/bridge)
"bf" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_bridge"
},
@@ -1932,7 +1932,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/medbay)
"Hf" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows"
},
diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm
index 227775a6f648a2..5cc1bfe2a5c098 100644
--- a/_maps/shuttles/whiteship_cere.dmm
+++ b/_maps/shuttles/whiteship_cere.dmm
@@ -102,7 +102,7 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/abandoned)
"ar" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/abandoned)
"as" = (
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm
index e0a87c5a70a83c..4a8e2884bb6da6 100644
--- a/_maps/shuttles/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship_delta.dmm
@@ -36,7 +36,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/bar)
"af" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows"
},
@@ -799,7 +799,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/crew)
"bI" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows"
},
@@ -914,7 +914,7 @@
/area/shuttle/abandoned/bridge)
"bT" = (
/obj/machinery/door/firedoor,
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_bridge"
},
@@ -1265,7 +1265,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/cargo)
"cz" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows"
},
@@ -2207,7 +2207,7 @@
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
"SY" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows"
},
diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm
index 7de950cf3bd5ad..74962b0dcad4ee 100644
--- a/_maps/shuttles/whiteship_donut.dmm
+++ b/_maps/shuttles/whiteship_donut.dmm
@@ -454,7 +454,7 @@
/turf/open/floor/iron/airless,
/area/shuttle/abandoned)
"bq" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/abandoned)
"br" = (
diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm
index 917ecde51b585a..a605679b60d6da 100644
--- a/_maps/shuttles/whiteship_kilo.dmm
+++ b/_maps/shuttles/whiteship_kilo.dmm
@@ -74,7 +74,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/cargo)
"ah" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows";
name = "Exterior Window Blast door"
@@ -224,7 +224,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/engine)
"au" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows";
name = "Exterior Window Blast door"
@@ -956,7 +956,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/abandoned/crew)
"bP" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_bridge";
name = "Cockpit Emergency Blast door"
@@ -1242,7 +1242,7 @@
/turf/open/floor/carpet,
/area/shuttle/abandoned/crew)
"cs" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows";
name = "Exterior Window Blast door"
@@ -1693,7 +1693,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/crew)
"df" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows";
name = "Exterior Window Blast door"
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
index fa4ff374a37918..e138db6975bb2d 100644
--- a/_maps/shuttles/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship_meta.dmm
@@ -52,7 +52,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/crew)
"aj" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows"
},
@@ -75,7 +75,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"am" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows"
},
@@ -1133,7 +1133,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/bridge)
"bR" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_bridge"
},
@@ -1173,7 +1173,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/engine)
"bU" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
@@ -1200,7 +1200,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
"bY" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/shuttle/abandoned/bar)
@@ -2463,7 +2463,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
"eb" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows"
},
diff --git a/_maps/shuttles/whiteship_tram.dmm b/_maps/shuttles/whiteship_tram.dmm
index 192e2e1991f1e9..f111a53d30057f 100644
--- a/_maps/shuttles/whiteship_tram.dmm
+++ b/_maps/shuttles/whiteship_tram.dmm
@@ -31,7 +31,7 @@
/turf/open/floor/mineral/titanium/tiled/yellow,
/area/shuttle/abandoned/engine)
"af" = (
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
@@ -41,7 +41,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"ah" = (
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"ai" = (
@@ -304,7 +304,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/cargo)
"aZ" = (
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/abandoned/cargo)
"ba" = (
@@ -998,7 +998,7 @@
/turf/open/floor/mineral/titanium/tiled/blue,
/area/shuttle/abandoned/bridge)
"cV" = (
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/abandoned/bridge)
"cW" = (
diff --git a/_maps/templates/medium_shuttle1.dmm b/_maps/templates/medium_shuttle1.dmm
index b22c193d5c850f..eaccae9f8ae65f 100644
--- a/_maps/templates/medium_shuttle1.dmm
+++ b/_maps/templates/medium_shuttle1.dmm
@@ -122,7 +122,7 @@
/turf/open/floor/iron,
/area/ruin/powered/shuttle/medium_1)
"u" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/ruin/powered/shuttle/medium_1)
"v" = (
diff --git a/_maps/templates/medium_shuttle2.dmm b/_maps/templates/medium_shuttle2.dmm
index 06c14f58e917e3..d2d1de0c2693f2 100644
--- a/_maps/templates/medium_shuttle2.dmm
+++ b/_maps/templates/medium_shuttle2.dmm
@@ -130,7 +130,7 @@
/turf/open/floor/plating,
/area/ruin/powered/shuttle/medium_2)
"x" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/ruin/powered/shuttle/medium_2)
"y" = (
diff --git a/_maps/templates/small_shuttle_1.dmm b/_maps/templates/small_shuttle_1.dmm
index 2fccceb42c3704..aa2d8b5687f674 100644
--- a/_maps/templates/small_shuttle_1.dmm
+++ b/_maps/templates/small_shuttle_1.dmm
@@ -6,7 +6,7 @@
/turf/closed/wall/mineral/titanium/overspace,
/area/template_noop)
"c" = (
-/obj/effect/spawner/structure/window/shuttle,
+/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating/airless,
/area/template_noop)
"d" = (
diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm
index c26e72b29000c8..a02deed31cabc2 100644
--- a/code/__DEFINES/icon_smoothing.dm
+++ b/code/__DEFINES/icon_smoothing.dm
@@ -121,15 +121,15 @@ DEFINE_BITFIELD(smoothing_flags, list(
#define SMOOTH_GROUP_ABDUCTOR_WALLS S_OBJ(10) ///turf/closed/wall/mineral/abductor, /obj/structure/falsewall/abductor
#define SMOOTH_GROUP_TITANIUM_WALLS S_OBJ(11) ///turf/closed/wall/mineral/titanium, /obj/structure/falsewall/titanium
#define SMOOTH_GROUP_PLASTITANIUM_WALLS S_OBJ(13) ///turf/closed/wall/mineral/plastitanium, /obj/structure/falsewall/plastitanium
-#define SMOOTH_GROUP_SURVIVAL_TIANIUM_POD S_OBJ(14) ///turf/closed/wall/mineral/titanium/survival/pod, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod
+#define SMOOTH_GROUP_SURVIVAL_TIANIUM_POD S_OBJ(14) ///turf/closed/wall/mineral/titanium/survival/pod, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod
#define SMOOTH_GROUP_HIERO_WALL S_OBJ(15) ///obj/effect/temp_visual/elite_tumor_wall, /obj/effect/temp_visual/hierophant/wall
#define SMOOTH_GROUP_PAPERFRAME S_OBJ(20) ///obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe
-#define SMOOTH_GROUP_WINDOW_FULLTILE S_OBJ(21) ///turf/closed/indestructible/fakeglass, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile
+#define SMOOTH_GROUP_WINDOW_FULLTILE S_OBJ(21) ///turf/closed/indestructible/fakeglass, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/reinforced/plasma/fulltile
#define SMOOTH_GROUP_WINDOW_FULLTILE_BRONZE S_OBJ(22) ///obj/structure/window/bronze/fulltile
-#define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(23) ///turf/closed/indestructible/opsglass, /obj/structure/window/plasma/reinforced/plastitanium
-#define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(24) ///obj/structure/window/shuttle
+#define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(23) ///turf/closed/indestructible/opsglass, /obj/structure/window/reinforced/plasma/plastitanium
+#define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(24) ///obj/structure/window/reinforced/shuttle
#define SMOOTH_GROUP_LATTICE S_OBJ(30) ///obj/structure/lattice
#define SMOOTH_GROUP_CATWALK S_OBJ(31) ///obj/structure/lattice/catwalk
@@ -153,7 +153,7 @@ DEFINE_BITFIELD(smoothing_flags, list(
#define SMOOTH_GROUP_HEDGE_FLUFF S_OBJ(65) ///obj/structure/hedge
-#define SMOOTH_GROUP_SHUTTLE_PARTS S_OBJ(66) ///obj/structure/window/shuttle, /obj/structure/window/plasma/reinforced/plastitanium, /turf/closed/indestructible/opsglass, /obj/structure/shuttle
+#define SMOOTH_GROUP_SHUTTLE_PARTS S_OBJ(66) ///obj/structure/window/reinforced/shuttle, /obj/structure/window/reinforced/plasma/plastitanium, /turf/closed/indestructible/opsglass, /obj/structure/shuttle
#define SMOOTH_GROUP_CLEANABLE_DIRT S_OBJ(67) ///obj/effect/decal/cleanable/dirt
diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm
index b7a4d8a99e0eba..54bf077481e1f0 100644
--- a/code/game/objects/effects/spawners/structure.dm
+++ b/code/game/objects/effects/spawners/structure.dm
@@ -157,18 +157,18 @@ again.
//shuttle window
-/obj/effect/spawner/structure/window/shuttle
+/obj/effect/spawner/structure/window/reinforced/shuttle
name = "shuttle window spawner"
icon_state = "swindow_spawner"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle)
//plastitanium window
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium
name = "plastitanium window spawner"
icon_state = "plastitaniumwindow_spawner"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/plastitanium)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/plastitanium)
//ice window
@@ -184,12 +184,12 @@ again.
/obj/effect/spawner/structure/window/survival_pod
name = "pod window spawner"
icon_state = "podwindow_spawner"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod)
/obj/effect/spawner/structure/window/hollow/survival_pod
name = "hollow pod window spawner"
icon_state = "podwindow_spawner_full"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod, /obj/structure/window/shuttle/survival_pod/spawner/north, /obj/structure/window/shuttle/survival_pod/spawner/east, /obj/structure/window/shuttle/survival_pod/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west)
/obj/effect/spawner/structure/window/hollow/survival_pod/end
icon_state = "podwindow_spawner_end"
@@ -197,13 +197,13 @@ again.
/obj/effect/spawner/structure/window/hollow/survival_pod/end/Initialize(mapload)
switch(dir)
if(NORTH)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod/spawner/north, /obj/structure/window/shuttle/survival_pod/spawner/east, /obj/structure/window/shuttle/survival_pod/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west)
if(EAST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod, /obj/structure/window/shuttle/survival_pod/spawner/north, /obj/structure/window/shuttle/survival_pod/spawner/east)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east)
if(SOUTH)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod, /obj/structure/window/shuttle/survival_pod/spawner/east, /obj/structure/window/shuttle/survival_pod/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west)
if(WEST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod, /obj/structure/window/shuttle/survival_pod/spawner/north, /obj/structure/window/shuttle/survival_pod/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west)
. = ..()
/obj/effect/spawner/structure/window/hollow/survival_pod/middle
@@ -212,9 +212,9 @@ again.
/obj/effect/spawner/structure/window/hollow/survival_pod/middle/Initialize(mapload)
switch(dir)
if(NORTH,SOUTH)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod, /obj/structure/window/shuttle/survival_pod/spawner/north)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north)
if(EAST,WEST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod/spawner/east, /obj/structure/window/shuttle/survival_pod/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west)
. = ..()
/obj/effect/spawner/structure/window/hollow/survival_pod/directional
@@ -223,21 +223,21 @@ again.
/obj/effect/spawner/structure/window/hollow/survival_pod/directional/Initialize(mapload)
switch(dir)
if(NORTH)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod/spawner/north)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north)
if(NORTHEAST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod/spawner/north, /obj/structure/window/shuttle/survival_pod/spawner/east)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east)
if(EAST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod/spawner/east)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east)
if(SOUTHEAST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod, /obj/structure/window/shuttle/survival_pod/spawner/east)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east)
if(SOUTH)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod)
if(SOUTHWEST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod, /obj/structure/window/shuttle/survival_pod/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west)
if(WEST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west)
if(NORTHWEST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod/spawner/north, /obj/structure/window/shuttle/survival_pod/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west)
. = ..()
@@ -302,63 +302,63 @@ again.
spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west)
. = ..()
-//plasma reinforced
+//reinforced plasma
-/obj/effect/spawner/structure/window/plasma/reinforced
+/obj/effect/spawner/structure/window/reinforced/plasma
name = "reinforced plasma window spawner"
icon_state = "prwindow_spawner"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/fulltile)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/fulltile)
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced
+/obj/effect/spawner/structure/window/hollow/reinforced/plasma
name = "hollow reinforced plasma window spawner"
icon_state = "phrwindow_spawner_full"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma, /obj/structure/window/reinforced/plasma/spawner/north, /obj/structure/window/reinforced/plasma/spawner/east, /obj/structure/window/reinforced/plasma/spawner/west)
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end
+/obj/effect/spawner/structure/window/hollow/reinforced/plasma/end
icon_state = "phrwindow_spawner_end"
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/Initialize(mapload)
+/obj/effect/spawner/structure/window/hollow/reinforced/plasma/end/Initialize(mapload)
switch(dir)
if(NORTH)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/spawner/north, /obj/structure/window/reinforced/plasma/spawner/east, /obj/structure/window/reinforced/plasma/spawner/west)
if(EAST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma, /obj/structure/window/reinforced/plasma/spawner/north, /obj/structure/window/reinforced/plasma/spawner/east)
if(SOUTH)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma, /obj/structure/window/reinforced/plasma/spawner/east, /obj/structure/window/reinforced/plasma/spawner/west)
if(WEST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma, /obj/structure/window/reinforced/plasma/spawner/north, /obj/structure/window/reinforced/plasma/spawner/west)
. = ..()
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle
+/obj/effect/spawner/structure/window/hollow/reinforced/plasma/middle
icon_state = "phrwindow_spawner_middle"
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle/Initialize(mapload)
+/obj/effect/spawner/structure/window/hollow/reinforced/plasma/middle/Initialize(mapload)
switch(dir)
if(NORTH,SOUTH)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma, /obj/structure/window/reinforced/plasma/spawner/north)
if(EAST,WEST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/spawner/east, /obj/structure/window/reinforced/plasma/spawner/west)
. = ..()
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional
+/obj/effect/spawner/structure/window/hollow/reinforced/plasma/directional
icon_state = "phrwindow_spawner_directional"
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional/Initialize(mapload)
+/obj/effect/spawner/structure/window/hollow/reinforced/plasma/directional/Initialize(mapload)
switch(dir)
if(NORTH)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/spawner/north)
if(NORTHEAST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/spawner/north, /obj/structure/window/reinforced/plasma/spawner/east)
if(EAST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/spawner/east)
if(SOUTHEAST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma, /obj/structure/window/reinforced/plasma/spawner/east)
if(SOUTH)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma)
if(SOUTHWEST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma, /obj/structure/window/reinforced/plasma/spawner/west)
if(WEST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/spawner/west)
if(NORTHWEST)
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/spawner/north, /obj/structure/window/reinforced/plasma/spawner/west)
. = ..()
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index a254d056d80427..356a1eee6ec60d 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -178,8 +178,8 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
. += GLOB.reinforced_glass_recipes
GLOBAL_LIST_INIT(prglass_recipes, list ( \
- new/datum/stack_recipe("directional reinforced window", /obj/structure/window/plasma/reinforced/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
- new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/plasma/reinforced/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ new/datum/stack_recipe("directional reinforced window", /obj/structure/window/reinforced/plasma/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/reinforced/plasma/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("plasma glass shard", /obj/item/shard/plasma, time = 0, on_floor = TRUE) \
))
@@ -204,7 +204,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
. += GLOB.prglass_recipes
GLOBAL_LIST_INIT(titaniumglass_recipes, list(
- new/datum/stack_recipe("shuttle window", /obj/structure/window/shuttle/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ new/datum/stack_recipe("shuttle window", /obj/structure/window/reinforced/shuttle/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("glass shard", /obj/item/shard, time = 0, on_floor = TRUE) \
))
@@ -226,7 +226,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
. += GLOB.titaniumglass_recipes
GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
- new/datum/stack_recipe("plastitanium window", /obj/structure/window/plasma/reinforced/plastitanium/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ new/datum/stack_recipe("plastitanium window", /obj/structure/window/reinforced/plasma/plastitanium/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("plasma glass shard", /obj/item/shard/plasma, time = 0, on_floor = TRUE) \
))
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 0abaf568d71623..fe095f5ea41b2f 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -220,15 +220,15 @@
return
var/obj/structure/window/WD
if(istype(W, /obj/item/stack/sheet/plasmarglass))
- WD = new/obj/structure/window/plasma/reinforced/fulltile(drop_location()) //reinforced plasma window
+ WD = new/obj/structure/window/reinforced/plasma/fulltile(drop_location()) //reinforced plasma window
else if(istype(W, /obj/item/stack/sheet/plasmaglass))
WD = new/obj/structure/window/plasma/fulltile(drop_location()) //plasma window
else if(istype(W, /obj/item/stack/sheet/rglass))
WD = new/obj/structure/window/reinforced/fulltile(drop_location()) //reinforced window
else if(istype(W, /obj/item/stack/sheet/titaniumglass))
- WD = new/obj/structure/window/shuttle(drop_location())
+ WD = new/obj/structure/window/reinforced/shuttle(drop_location())
else if(istype(W, /obj/item/stack/sheet/plastitaniumglass))
- WD = new/obj/structure/window/plasma/reinforced/plastitanium(drop_location())
+ WD = new/obj/structure/window/reinforced/plasma/plastitanium(drop_location())
else if(istype(W, /obj/item/stack/sheet/bronze))
WD = new/obj/structure/window/bronze/fulltile(drop_location())
else
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index b1aea45fc9d722..09a4f74d0a81b5 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -321,7 +321,6 @@
update_nearby_icons()
return ..()
-
/obj/structure/window/Move()
var/turf/T = loc
. = ..()
@@ -537,7 +536,7 @@
/obj/structure/window/plasma/unanchored
anchored = FALSE
-/obj/structure/window/plasma/reinforced
+/obj/structure/window/reinforced/plasma
name = "reinforced plasma window"
desc = "A window made out of a plasma-silicate alloy and a rod matrix. It looks hopelessly tough to break and is most likely nigh fireproof."
icon_state = "plasmarwindow"
@@ -549,80 +548,19 @@
explosion_block = 2
glass_type = /obj/item/stack/sheet/plasmarglass
-/obj/structure/window/plasma/reinforced/BlockSuperconductivity()
+/obj/structure/window/reinforced/plasma/BlockSuperconductivity()
return TRUE
-//entirely copypasted code
-//take this out when construction is made a component or otherwise modularized in some way
-/obj/structure/window/plasma/reinforced/attackby(obj/item/I, mob/living/user, params)
- switch(state)
- if(RWINDOW_SECURE)
- if(I.tool_behaviour == TOOL_WELDER && user.combat_mode)
- user.visible_message(span_notice("[user] holds \the [I] to the security screws on \the [src]..."),
- span_notice("You begin heating the security screws on \the [src]..."))
- if(I.use_tool(src, user, 180, volume = 100))
- to_chat(user, span_notice("The security screws are glowing white hot and look ready to be removed."))
- state = RWINDOW_BOLTS_HEATED
- addtimer(CALLBACK(src, .proc/cool_bolts), 300)
- return
- if(RWINDOW_BOLTS_HEATED)
- if(I.tool_behaviour == TOOL_SCREWDRIVER)
- user.visible_message(span_notice("[user] digs into the heated security screws and starts removing them..."),
- span_notice("You dig into the heated screws hard and they start turning..."))
- if(I.use_tool(src, user, 80, volume = 50))
- state = RWINDOW_BOLTS_OUT
- to_chat(user, span_notice("The screws come out, and a gap forms around the edge of the pane."))
- return
- if(RWINDOW_BOLTS_OUT)
- if(I.tool_behaviour == TOOL_CROWBAR)
- user.visible_message(span_notice("[user] wedges \the [I] into the gap in the frame and starts prying..."),
- span_notice("You wedge \the [I] into the gap in the frame and start prying..."))
- if(I.use_tool(src, user, 50, volume = 50))
- state = RWINDOW_POPPED
- to_chat(user, span_notice("The panel pops out of the frame, exposing some thin metal bars that looks like they can be cut."))
- return
- if(RWINDOW_POPPED)
- if(I.tool_behaviour == TOOL_WIRECUTTER)
- user.visible_message(span_notice("[user] starts cutting the exposed bars on \the [src]..."),
- span_notice("You start cutting the exposed bars on \the [src]"))
- if(I.use_tool(src, user, 30, volume = 50))
- state = RWINDOW_BARS_CUT
- to_chat(user, span_notice("The panels falls out of the way exposing the frame bolts."))
- return
- if(RWINDOW_BARS_CUT)
- if(I.tool_behaviour == TOOL_WRENCH)
- user.visible_message(span_notice("[user] starts unfastening \the [src] from the frame..."),
- span_notice("You start unfastening the bolts from the frame..."))
- if(I.use_tool(src, user, 50, volume = 50))
- to_chat(user, span_notice("You unfasten the bolts from the frame and the window pops loose."))
- state = WINDOW_OUT_OF_FRAME
- set_anchored(FALSE)
- return
- return ..()
-
-/obj/structure/window/plasma/reinforced/examine(mob/user)
- . = ..()
- switch(state)
- if(RWINDOW_SECURE)
- . += span_notice("It's been screwed in with one way screws, you'd need to heat them to have any chance of backing them out.")
- if(RWINDOW_BOLTS_HEATED)
- . += span_notice("The screws are glowing white hot, and you'll likely be able to unscrew them now.")
- if(RWINDOW_BOLTS_OUT)
- . += span_notice("The screws have been removed, revealing a small gap you could fit a prying tool in.")
- if(RWINDOW_POPPED)
- . += span_notice("The main plate of the window has popped out of the frame, exposing some bars that look like they can be cut.")
- if(RWINDOW_BARS_CUT)
- . += span_notice("The main pane can be easily moved out of the way to reveal some bolts holding the frame in.")
-/obj/structure/window/plasma/reinforced/spawner/east
+/obj/structure/window/reinforced/plasma/spawner/east
dir = EAST
-/obj/structure/window/plasma/reinforced/spawner/west
+/obj/structure/window/reinforced/plasma/spawner/west
dir = WEST
-/obj/structure/window/plasma/reinforced/spawner/north
+/obj/structure/window/reinforced/plasma/spawner/north
dir = NORTH
-/obj/structure/window/plasma/reinforced/unanchored
+/obj/structure/window/reinforced/plasma/unanchored
anchored = FALSE
state = WINDOW_OUT_OF_FRAME
@@ -666,7 +604,7 @@
/obj/structure/window/plasma/fulltile/unanchored
anchored = FALSE
-/obj/structure/window/plasma/reinforced/fulltile
+/obj/structure/window/reinforced/plasma/fulltile
icon = 'icons/obj/smooth_structures/rplasma_window.dmi'
icon_state = "rplasma_window-0"
base_icon_state = "rplasma_window"
@@ -679,7 +617,7 @@
canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE)
glass_amount = 2
-/obj/structure/window/plasma/reinforced/fulltile/unanchored
+/obj/structure/window/reinforced/plasma/fulltile/unanchored
anchored = FALSE
state = WINDOW_OUT_OF_FRAME
@@ -718,7 +656,8 @@
max_integrity = 150
glass_amount = 2
-/obj/structure/window/shuttle
+//there is a sub shuttle window in survival_pod.dm for mining pods
+/obj/structure/window/reinforced/shuttle//this is called reinforced because it is reinforced w/titanium
name = "shuttle window"
desc = "A reinforced, air-locked pod window."
icon = 'icons/obj/smooth_structures/shuttle_window.dmi'
@@ -726,6 +665,7 @@
base_icon_state = "shuttle_window"
max_integrity = 150
wtype = "shuttle"
+ reinf = TRUE
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
reinf = TRUE
@@ -739,16 +679,16 @@
glass_amount = 2
receive_ricochet_chance_mod = 1.2
-/obj/structure/window/shuttle/narsie_act()
+/obj/structure/window/reinforced/shuttle/narsie_act()
add_atom_colour("#3C3434", FIXED_COLOUR_PRIORITY)
-/obj/structure/window/shuttle/tinted
+/obj/structure/window/reinforced/shuttle/tinted
opacity = TRUE
-/obj/structure/window/shuttle/unanchored
+/obj/structure/window/reinforced/shuttle/unanchored
anchored = FALSE
-/obj/structure/window/plasma/reinforced/plastitanium
+/obj/structure/window/reinforced/plasma/plastitanium
name = "plastitanium window"
desc = "A durable looking window made of an alloy of of plasma and titanium."
icon = 'icons/obj/smooth_structures/plastitanium_window.dmi'
@@ -769,7 +709,7 @@
glass_amount = 2
rad_insulation = RAD_HEAVY_INSULATION
-/obj/structure/window/plasma/reinforced/plastitanium/unanchored
+/obj/structure/window/reinforced/plasma/plastitanium/unanchored
anchored = FALSE
state = WINDOW_OUT_OF_FRAME
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 629f22c1d38f8c..e9aad429733d1b 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -82,7 +82,7 @@
//Pod objects
//Window
-/obj/structure/window/shuttle/survival_pod
+/obj/structure/window/reinforced/shuttle/survival_pod
name = "pod window"
icon = 'icons/obj/smooth_structures/pod_window.dmi'
icon_state = "pod_window-0"
@@ -91,13 +91,13 @@
smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_SURVIVAL_TIANIUM_POD)
canSmoothWith = list(SMOOTH_GROUP_SURVIVAL_TIANIUM_POD)
-/obj/structure/window/shuttle/survival_pod/spawner/north
+/obj/structure/window/reinforced/shuttle/survival_pod/spawner/north
dir = NORTH
-/obj/structure/window/shuttle/survival_pod/spawner/east
+/obj/structure/window/reinforced/shuttle/survival_pod/spawner/east
dir = EAST
-/obj/structure/window/shuttle/survival_pod/spawner/west
+/obj/structure/window/reinforced/shuttle/survival_pod/spawner/west
dir = WEST
/obj/structure/window/reinforced/survival_pod
diff --git a/tools/UpdatePaths/reinforcedwindows.txt b/tools/UpdatePaths/reinforcedwindows.txt
new file mode 100644
index 00000000000000..c084b6bf87b16a
--- /dev/null
+++ b/tools/UpdatePaths/reinforcedwindows.txt
@@ -0,0 +1,35 @@
+#This replaces the window/shuttle and window/plasma/reinforced with the refactors from https://github.com/tgstation/tgstation/pull/61694#pullrequestreview-763648844
+
+/obj/structure/window/plasma/reinforced : /obj/structure/window/reinforced/plasma
+/obj/structure/window/plasma/reinforced/fulltile : /obj/structure/window/reinforced/plasma/fulltile
+/obj/structure/window/plasma/reinforced/unanchored : /obj/structure/window/reinforced/plasma/unanchored
+/obj/structure/window/plasma/reinforced/fulltile/unanchored : /obj/structure/window/reinforced/plasma/fulltile/unanchored
+/obj/structure/window/plasma/reinforced/plastitanium : /obj/structure/window/reinforced/plasma/plastitanium
+/obj/structure/window/plasma/reinforced/plastitanium/unanchored : /obj/structure/window/reinforced/plasma/plastitanium/unanchored
+
+/obj/structure/window/shuttle : /obj/structure/window/reinforced/shuttle
+/obj/structure/window/shuttle/unanchored : /obj/structure/window/reinforced/shuttle/unanchored
+/obj/structure/window/shuttle/tinted : /obj/structure/window/reinforced/shuttle/tinted
+/obj/structure/window/shuttle/survival_pod : /obj/structure/window/reinforced/shuttle/survival_pod
+
+/obj/structure/window/shuttle/survival_pod/spawner/east : /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east
+/obj/structure/window/shuttle/survival_pod/spawner/west : /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west
+/obj/structure/window/shuttle/survival_pod/spawner/north : /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north
+
+/obj/structure/window/plasma/reinforced/spawner/north : /obj/structure/window/reinforced/plasma/spawner/north
+/obj/structure/window/plasma/reinforced/spawner/east : /obj/structure/window/reinforced/plasma/spawner/east
+/obj/structure/window/plasma/reinforced/spawner/west : /obj/structure/window/reinforced/plasma/spawner/west
+/obj/effect/spawner/structure/window/shuttle : /obj/effect/spawner/structure/window/reinforced/shuttle
+
+/obj/effect/spawner/structure/window/hollow/plasma/reinforced : /obj/effect/spawner/structure/window/hollow/reinforced/plasma
+/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end : /obj/effect/spawner/structure/window/hollow/reinforced/plasma/end
+/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle : /obj/effect/spawner/structure/window/hollow/reinforced/plasma/middle
+/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional : /obj/effect/spawner/structure/window/hollow/reinforced/plasma/directional
+/obj/effect/spawner/structure/window/plasma/reinforced : /obj/effect/spawner/structure/window/reinforced/plasma/reinforced
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium : /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium
+
+
+/obj/structure/window/plasma/reinforced/spawner/east : /obj/structure/window/reinforced/plasma/spawner/east
+/obj/structure/window/plasma/reinforced/spawner/west : /obj/structure/window/reinforced/plasma/spawner/west
+/obj/structure/window/plasma/reinforced/spawner/north : /obj/structure/window/reinforced/plasma/spawner/north
+