From c4c3b23c6c0379a80d0e857a47bbcc93cb59cfa4 Mon Sep 17 00:00:00 2001
From: Aylong <alexanderkitsa@gmail.com>
Date: Tue, 27 Jun 2023 11:45:13 +0300
Subject: [PATCH] Gate maps fix

---
 _maps/map_files/RandomZLevels/academy.dmm     |  147 +-
 _maps/map_files/RandomZLevels/beach.dmm       |  253 ++--
 _maps/map_files/RandomZLevels/centcomAway.dmm | 1209 ++++-------------
 _maps/map_files/RandomZLevels/evil_santa.dmm  |    3 +-
 _maps/map_files/RandomZLevels/example.dmm     |   92 +-
 .../map_files/RandomZLevels/moonoutpost19.dmm |   64 +-
 .../map_files/RandomZLevels/terrorspiders.dmm |  197 ++-
 .../RandomZLevels/undergroundoutpost45.dmm    |  243 ++--
 code/game/objects/structures/aliens.dm        |    2 +-
 9 files changed, 663 insertions(+), 1547 deletions(-)

diff --git a/_maps/map_files/RandomZLevels/academy.dmm b/_maps/map_files/RandomZLevels/academy.dmm
index 052784bc990..51fab37febe 100644
--- a/_maps/map_files/RandomZLevels/academy.dmm
+++ b/_maps/map_files/RandomZLevels/academy.dmm
@@ -6,10 +6,7 @@
 /turf/simulated/wall/r_wall,
 /area/awaymission/academy/headmaster)
 "ac" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/headmaster)
 "ad" = (
@@ -614,7 +611,6 @@
 	},
 /area/awaymission/academy/headmaster)
 "bU" = (
-/obj/structure/grille,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -623,9 +619,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/headmaster)
 "bV" = (
@@ -743,15 +737,12 @@
 	},
 /area/awaymission/academy/headmaster)
 "ci" = (
-/obj/structure/grille,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
 	},
 /obj/structure/cable,
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/headmaster)
 "cj" = (
@@ -1018,11 +1009,8 @@
 	},
 /area/awaymission/academy/headmaster)
 "cW" = (
-/obj/structure/grille,
 /obj/structure/cable,
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/headmaster)
 "cX" = (
@@ -1328,7 +1316,9 @@
 /turf/simulated/floor/plating,
 /area/awaymission/academy/classrooms)
 "dH" = (
-/obj/machinery/computer/mech_bay_power_console,
+/obj/machinery/computer/mech_bay_power_console{
+	dir = 1
+	},
 /obj/structure/cable,
 /turf/simulated/floor/greengrid,
 /area/awaymission/academy/classrooms)
@@ -1595,12 +1585,12 @@
 	},
 /area/awaymission/academy/classrooms)
 "er" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 5
+/obj/structure/computerframe{
+	anchored = 1;
+	dir = 8
 	},
-/turf/simulated/floor/plating,
-/area/awaymission/academy/classrooms)
+/turf/simulated/floor/carpet,
+/area/awaymission/academy/headmaster)
 "es" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -2165,7 +2155,6 @@
 	},
 /area/awaymission/academy/classrooms)
 "fO" = (
-/obj/structure/grille,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -2174,9 +2163,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/classrooms)
 "fP" = (
@@ -2283,15 +2270,12 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/academy/classrooms)
 "ge" = (
-/obj/structure/grille,
 /obj/structure/cable,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/classrooms)
 "gf" = (
@@ -2309,7 +2293,6 @@
 	},
 /area/awaymission/academy/classrooms)
 "gh" = (
-/obj/structure/grille,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -2318,9 +2301,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/classrooms)
 "gi" = (
@@ -2465,27 +2446,21 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/academy/classrooms)
 "gB" = (
-/obj/structure/grille,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
 	},
 /obj/structure/cable,
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/classrooms)
 "gC" = (
-/obj/structure/grille,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
 	},
 /obj/structure/cable,
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/classrooms)
 "gD" = (
@@ -2619,15 +2594,12 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/academy/classrooms)
 "gV" = (
-/obj/structure/grille,
 /obj/structure/cable,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/classrooms)
 "gW" = (
@@ -3383,14 +3355,11 @@
 /turf/space,
 /area/awaymission/academy/academyaft)
 "iY" = (
-/obj/structure/grille,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/academyaft)
 "iZ" = (
@@ -3448,14 +3417,11 @@
 	},
 /area/awaymission/academy/academyaft)
 "je" = (
-/obj/structure/grille,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/academyaft)
 "jf" = (
@@ -3548,12 +3514,11 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/academy/academyaft)
 "jq" = (
-/obj/structure/grille,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/item/shard,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating/airless,
 /area/awaymission/academy/academyaft)
 "jr" = (
@@ -3610,11 +3575,12 @@
 	},
 /area/awaymission/academy/academyaft)
 "jy" = (
-/obj/item/shard{
-	icon_state = "medium"
+/obj/structure/computerframe{
+	anchored = 1;
+	dir = 4
 	},
-/turf/space,
-/area/space/nearstation)
+/turf/simulated/floor/carpet,
+/area/awaymission/academy/headmaster)
 "jz" = (
 /obj/machinery/igniter/on,
 /turf/simulated/floor/plating,
@@ -3624,11 +3590,8 @@
 /turf/simulated/floor/carpet,
 /area/awaymission/academy/academyaft)
 "jB" = (
-/obj/structure/grille,
 /obj/structure/cable,
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/academyaft)
 "jC" = (
@@ -3724,7 +3687,6 @@
 /turf/simulated/floor/grass,
 /area/awaymission/academy/academygate)
 "jR" = (
-/obj/structure/grille,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -3732,9 +3694,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/academyaft)
 "jS" = (
@@ -3744,10 +3704,7 @@
 /turf/simulated/floor/carpet,
 /area/awaymission/academy/academygate)
 "jU" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/academygate)
 "jV" = (
@@ -3839,13 +3796,11 @@
 /turf/simulated/floor/plating,
 /area/awaymission/academy/academygate)
 "kg" = (
-/obj/structure/grille,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable,
-/obj/structure/window/reinforced{
-	dir = 5
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/academy/academyaft)
@@ -3856,15 +3811,12 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/academy/academyaft)
 "ki" = (
-/obj/structure/grille,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
 	},
 /obj/structure/cable,
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/academyaft)
 "kj" = (
@@ -3954,15 +3906,12 @@
 /turf/simulated/floor/carpet,
 /area/awaymission/academy/academygate)
 "ku" = (
-/obj/structure/grille,
 /obj/structure/cable,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/structure/window/reinforced{
-	dir = 5
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/academyaft)
 "kv" = (
@@ -12705,12 +12654,12 @@ bs
 bs
 bs
 dZ
-er
+LR
 bB
 bB
 bB
 bB
-er
+LR
 dZ
 bs
 bs
@@ -12835,12 +12784,12 @@ dG
 de
 bs
 dZ
-er
+LR
 hH
 bB
 bB
 bB
-er
+LR
 dZ
 bs
 bB
@@ -12967,8 +12916,8 @@ bs
 bs
 bs
 hG
-er
-er
+LR
+LR
 eA
 bs
 bs
@@ -14402,7 +14351,7 @@ BT
 ek
 ei
 fE
-er
+LR
 Uo
 gb
 zu
@@ -14532,7 +14481,7 @@ Rh
 wG
 ei
 Sz
-er
+LR
 wP
 dc
 dc
@@ -14662,7 +14611,7 @@ Ec
 ek
 ei
 RH
-er
+LR
 mu
 dc
 dc
@@ -14792,7 +14741,7 @@ fb
 ev
 ex
 fF
-er
+LR
 JW
 dc
 dc
@@ -15013,9 +14962,9 @@ ab
 ab
 ak
 ar
-ae
+jy
 aC
-ae
+jy
 aM
 aN
 ab
@@ -16443,9 +16392,9 @@ ab
 ab
 aq
 aw
-ae
+er
 aI
-ae
+er
 ak
 af
 ab
@@ -17029,7 +16978,7 @@ aa
 aa
 aa
 aa
-jy
+aa
 aa
 aa
 aa
diff --git a/_maps/map_files/RandomZLevels/beach.dmm b/_maps/map_files/RandomZLevels/beach.dmm
index 0340f7e7957..5c009e04fc6 100644
--- a/_maps/map_files/RandomZLevels/beach.dmm
+++ b/_maps/map_files/RandomZLevels/beach.dmm
@@ -719,21 +719,6 @@
 /obj/structure/flora/ausbushes/leafybush,
 /turf/simulated/floor/indestructible/beach/sand/dense,
 /area/awaymission/beach)
-"cD" = (
-/turf/simulated/wall/indestructible{
-	icon_state = "sandstone12"
-	},
-/area/awaymission/beach)
-"cE" = (
-/turf/simulated/wall/indestructible{
-	icon_state = "sandstone6"
-	},
-/area/awaymission/beach)
-"cF" = (
-/turf/simulated/wall/indestructible{
-	icon_state = "sandstone10"
-	},
-/area/awaymission/beach)
 "cG" = (
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/effect/decal/snow/sand/edge{
@@ -743,15 +728,8 @@
 	},
 /turf/simulated/floor/indestructible/beach/sand,
 /area/awaymission/beach)
-"cH" = (
-/turf/simulated/wall/indestructible{
-	icon_state = "sandstone3"
-	},
-/area/awaymission/beach)
 "cI" = (
-/turf/simulated/wall/indestructible{
-	icon_state = "sandstone1"
-	},
+/turf/simulated/wall/indestructible/sandstone,
 /area/awaymission/beach)
 "cJ" = (
 /obj/effect/decal/snow/sand/edge{
@@ -978,16 +956,14 @@
 /area/awaymission/beach)
 "dC" = (
 /obj/structure/table/wood,
-/obj/machinery/chem_dispenser/soda,
+/obj/machinery/chem_dispenser/soda{
+	dir = 1;
+	pixel_y = 6
+	},
 /turf/simulated/floor/indestructible{
 	icon_state = "wood"
 	},
 /area/awaymission/beach)
-"dD" = (
-/turf/simulated/wall/indestructible{
-	icon_state = "sandstone0"
-	},
-/area/awaymission/beach)
 "dE" = (
 /obj/effect/decal/snow/sand/edge{
 	name = "rough sand"
@@ -997,7 +973,10 @@
 /area/awaymission/beach)
 "dF" = (
 /obj/structure/table/wood,
-/obj/machinery/chem_dispenser/beer,
+/obj/machinery/chem_dispenser/beer{
+	dir = 1;
+	pixel_y = 6
+	},
 /turf/simulated/floor/indestructible{
 	icon_state = "wood"
 	},
@@ -6479,11 +6458,11 @@ bW
 bj
 bj
 bi
-cE
-cH
+cI
+cI
 cI
 dA
-dD
+cI
 by
 bj
 bj
@@ -6736,7 +6715,7 @@ bT
 bj
 bj
 bi
-cD
+cI
 cS
 dq
 dq
@@ -6993,7 +6972,7 @@ bV
 bj
 bj
 cq
-cD
+cI
 cU
 dq
 dq
@@ -7250,7 +7229,7 @@ bX
 bj
 bj
 cr
-cD
+cI
 cW
 dq
 dq
@@ -7507,7 +7486,7 @@ bW
 bj
 bj
 cq
-cD
+cI
 cX
 dq
 dq
@@ -7764,7 +7743,7 @@ bV
 bj
 bj
 bi
-cD
+cI
 cV
 dq
 dq
@@ -8021,7 +8000,7 @@ bX
 bj
 bj
 bi
-cD
+cI
 da
 dq
 dq
@@ -8278,7 +8257,7 @@ bT
 bj
 bj
 bi
-cD
+cI
 cZ
 dq
 dq
@@ -8535,7 +8514,7 @@ bZ
 ce
 bj
 bi
-cD
+cI
 dl
 dq
 dq
@@ -8792,7 +8771,7 @@ ca
 bj
 bj
 bi
-cD
+cI
 db
 dq
 dq
@@ -9049,7 +9028,7 @@ bX
 cf
 bj
 bi
-cD
+cI
 dm
 dq
 dq
@@ -9306,10 +9285,10 @@ bT
 cd
 bj
 bi
-cF
-cH
-cH
-cH
+cI
+cI
+cI
+cI
 cI
 by
 bj
@@ -10076,8 +10055,8 @@ bj
 cc
 bj
 bi
-cE
-cH
+cI
+cI
 cI
 by
 bj
@@ -10333,7 +10312,7 @@ bN
 bX
 bj
 bi
-cD
+cI
 cO
 dn
 by
@@ -10590,8 +10569,8 @@ bj
 bW
 bj
 bi
-cF
-cH
+cI
+cI
 cI
 by
 bj
@@ -11361,8 +11340,8 @@ bf
 bX
 bj
 bi
-cE
-cH
+cI
+cI
 cI
 by
 bj
@@ -11618,7 +11597,7 @@ bj
 bT
 bj
 bi
-cD
+cI
 cO
 dn
 by
@@ -11875,8 +11854,8 @@ bN
 bV
 bj
 bi
-cF
-cH
+cI
+cI
 cI
 by
 bF
@@ -12646,8 +12625,8 @@ bL
 bX
 bj
 bi
-cE
-cH
+cI
+cI
 cI
 by
 bj
@@ -12903,7 +12882,7 @@ bR
 cb
 bf
 bi
-cD
+cI
 cO
 dn
 by
@@ -13160,8 +13139,8 @@ bf
 bX
 bz
 bi
-cF
-cH
+cI
+cI
 cI
 by
 bj
@@ -14705,8 +14684,8 @@ bl
 bl
 bl
 bz
-bz
-bz
+bj
+bj
 bj
 bD
 bj
@@ -17270,11 +17249,11 @@ bf
 bL
 bj
 cc
-cE
-cH
-cH
-cH
-cH
+cI
+cI
+cI
+cI
+cI
 cI
 bj
 bj
@@ -17527,7 +17506,7 @@ bj
 bz
 bf
 bX
-cD
+cI
 dr
 dr
 dr
@@ -17784,7 +17763,7 @@ bz
 bj
 bj
 bT
-cD
+cI
 dr
 dr
 dr
@@ -18041,7 +18020,7 @@ bL
 bj
 bN
 bV
-cD
+cI
 dr
 dr
 dW
@@ -18298,7 +18277,7 @@ bj
 bz
 bj
 bW
-cD
+cI
 dr
 dr
 dr
@@ -18555,7 +18534,7 @@ bj
 bD
 bj
 cc
-cD
+cI
 dr
 dr
 dr
@@ -18812,11 +18791,11 @@ bz
 bz
 bL
 bX
-cF
-cH
-cH
-cH
-cH
+cI
+cI
+cI
+cI
+cI
 cI
 bj
 bj
@@ -19326,18 +19305,18 @@ bj
 bz
 bf
 bX
-cE
-cH
-cH
-cH
-cH
-cH
-cH
-cH
+cI
+cI
+cI
+cI
+cI
+cI
+cI
+cI
 cI
 cL
 cL
-dD
+cI
 bf
 bX
 cg
@@ -19583,10 +19562,10 @@ by
 bj
 bN
 bT
-cD
+cI
 dI
 dO
-cD
+cI
 bj
 dL
 bj
@@ -19594,7 +19573,7 @@ cL
 bj
 bj
 bj
-cD
+cI
 bN
 bT
 cg
@@ -19840,18 +19819,18 @@ bB
 bL
 bj
 ca
-cD
+cI
 dK
 bj
-cD
+cI
 bj
 bj
 bj
-dD
+cI
 bj
 bj
 bj
-cD
+cI
 bj
 ca
 cg
@@ -20097,18 +20076,18 @@ ci
 bE
 bj
 bj
-cD
+cI
 dJ
 bj
-cD
+cI
 ed
 bj
 bj
-dD
+cI
 bj
 en
 bj
-cD
+cI
 bj
 bj
 bx
@@ -20354,10 +20333,10 @@ bz
 bj
 bL
 bL
-cD
+cI
 bj
 bj
-cD
+cI
 ee
 bj
 bj
@@ -20365,7 +20344,7 @@ cL
 bj
 bj
 bj
-cD
+cI
 bL
 bL
 by
@@ -20611,18 +20590,18 @@ bj
 bz
 bj
 bz
-cD
+cI
 cI
 cL
-cF
-cH
-cH
-cH
-cH
+cI
+cI
+cI
+cI
+cI
 cI
 bj
 bj
-cD
+cI
 bj
 bz
 bJ
@@ -20868,7 +20847,7 @@ bj
 bD
 bj
 bz
-cD
+cI
 dL
 bj
 bj
@@ -20879,7 +20858,7 @@ bj
 bj
 bj
 bj
-cD
+cI
 bj
 bz
 bj
@@ -21125,7 +21104,7 @@ bD
 bj
 bK
 bj
-cD
+cI
 bj
 bj
 bj
@@ -21136,7 +21115,7 @@ bj
 bj
 bj
 bj
-cD
+cI
 bK
 bj
 bJ
@@ -21382,7 +21361,7 @@ bj
 bD
 bj
 bz
-cD
+cI
 dL
 bj
 bj
@@ -21393,7 +21372,7 @@ bj
 bj
 bj
 bj
-cD
+cI
 bj
 bz
 bj
@@ -21639,18 +21618,18 @@ bD
 bj
 bK
 bD
-cD
-cH
+cI
+cI
 cI
 cL
-cE
-cH
-cH
-cH
+cI
+cI
+cI
+cI
 cI
 bj
 bj
-cD
+cI
 bK
 bD
 bj
@@ -21896,11 +21875,11 @@ bz
 bD
 bj
 bS
-cD
+cI
 dN
 bj
 bj
-cD
+cI
 ej
 bj
 bj
@@ -22153,11 +22132,11 @@ bE
 bj
 bz
 bf
-cD
+cI
 dM
 dQ
 cT
-cD
+cI
 bj
 dL
 bj
@@ -22410,17 +22389,17 @@ bz
 bN
 bf
 bT
-cF
-cH
-cH
-cH
-cD
-cH
-cH
-cH
-cH
-cH
-cH
+cI
+cI
+cI
+cI
+cI
+cI
+cI
+cI
+cI
+cI
+cI
 cI
 bj
 ca
diff --git a/_maps/map_files/RandomZLevels/centcomAway.dmm b/_maps/map_files/RandomZLevels/centcomAway.dmm
index f50457a53c4..4703e786d9d 100644
--- a/_maps/map_files/RandomZLevels/centcomAway.dmm
+++ b/_maps/map_files/RandomZLevels/centcomAway.dmm
@@ -8,36 +8,6 @@
 "ac" = (
 /turf/simulated/wall/r_wall,
 /area/awaymission/centcomAway/cafe)
-"ad" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/cafe)
-"ae" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/cafe)
-"af" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/cafe)
 "ag" = (
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/maint)
@@ -145,19 +115,6 @@
 	dir = 1
 	},
 /area/awaymission/centcomAway/cafe)
-"at" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/cafe)
 "au" = (
 /obj/machinery/hydroponics/constructable,
 /turf/simulated/floor/plasteel{
@@ -205,16 +162,6 @@
 	icon_state = "cafeteria"
 	},
 /area/awaymission/centcomAway/cafe)
-"aB" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/cafe)
 "aC" = (
 /obj/structure/closet/secure_closet/freezer/kitchen,
 /turf/simulated/floor/plasteel{
@@ -261,19 +208,13 @@
 	},
 /area/awaymission/centcomAway/cafe)
 "aK" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
+/obj/structure/computerframe{
 	dir = 8
 	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/cafe)
+/turf/simulated/floor/plasteel{
+	icon_state = "grimy"
+	},
+/area/awaymission/centcomAway/general)
 "aL" = (
 /obj/structure/table,
 /turf/simulated/floor/plasteel{
@@ -329,35 +270,9 @@
 	dir = 8
 	},
 /area/awaymission/centcomAway/cafe)
-"aT" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/wall/r_wall,
-/area/awaymission/centcomAway/maint)
-"aU" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/wall/r_wall,
-/area/awaymission/centcomAway/maint)
 "aV" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/wall/r_wall,
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
 /area/awaymission/centcomAway/maint)
 "aW" = (
 /turf/simulated/wall/r_wall,
@@ -396,17 +311,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/maint)
-"bb" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/cafe)
 "bc" = (
 /obj/structure/chair{
 	dir = 1
@@ -813,18 +717,8 @@
 /turf/simulated/floor/shuttle,
 /area/awaymission/centcomAway/hangar)
 "ch" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/cafe)
 "ci" = (
@@ -852,19 +746,6 @@
 	layer = 2
 	},
 /area/awaymission/centcomAway/hangar)
-"cl" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/maint)
 "cm" = (
 /obj/machinery/door/airlock/external,
 /turf/simulated/floor/plating,
@@ -938,16 +819,6 @@
 	icon_state = "hydrofloor"
 	},
 /area/awaymission/centcomAway/cafe)
-"cx" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/maint)
 "cy" = (
 /obj/structure/sign/vacuum,
 /turf/simulated/wall/r_wall,
@@ -1132,7 +1003,9 @@
 	},
 /area/awaymission/centcomAway/cafe)
 "cY" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+	dir = 4
+	},
 /turf/simulated/floor/shuttle{
 	icon_state = "floor2"
 	},
@@ -1172,15 +1045,7 @@
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/maint)
 "dd" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
+/turf/space,
 /area/awaymission/centcomAway/maint)
 "de" = (
 /obj/structure/table,
@@ -1234,7 +1099,8 @@
 /obj/machinery/power/solar_control{
 	id = "centcomawaysolar";
 	name = "Solar Control";
-	track = 1
+	track = 1;
+	dir = 8
 	},
 /obj/structure/cable,
 /obj/structure/cable{
@@ -1541,33 +1407,7 @@
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/hangar)
 "dZ" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/cafe)
-"ea" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/cafe)
-"eb" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/cafe)
 "ec" = (
@@ -1688,20 +1528,6 @@
 	icon_state = "redfull"
 	},
 /area/awaymission/centcomAway/cafe)
-"es" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/cafe)
 "et" = (
 /obj/structure/sink/kitchen{
 	pixel_y = 28
@@ -1957,20 +1783,6 @@
 	icon_state = "asteroid2"
 	},
 /area/awaymission/centcomAway/cafe)
-"fg" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
 "fh" = (
 /obj/structure/chair{
 	dir = 1
@@ -2003,7 +1815,9 @@
 /turf/simulated/floor/shuttle,
 /area/awaymission/centcomAway/hangar)
 "fm" = (
-/obj/structure/computerframe,
+/obj/structure/computerframe{
+	dir = 1
+	},
 /turf/simulated/floor/shuttle,
 /area/awaymission/centcomAway/hangar)
 "fn" = (
@@ -2100,34 +1914,8 @@
 	},
 /area/awaymission/centcomAway/courtroom)
 "fz" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/turf/simulated/floor/shuttle/plating,
-/area/awaymission/centcomAway/hangar)
-"fA" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/turf/simulated/floor/shuttle/plating,
-/area/awaymission/centcomAway/hangar)
-"fB" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
 /area/awaymission/centcomAway/hangar)
 "fC" = (
 /obj/structure/closet/secure_closet/freezer/fridge,
@@ -2153,70 +1941,29 @@
 /obj/structure/sign/electricshock,
 /turf/simulated/wall/r_wall,
 /area/awaymission/centcomAway/general)
-"fG" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
+"fL" = (
+/obj/structure/table,
+/obj/item/storage/box/donkpockets{
+	pixel_x = 3;
+	pixel_y = 3
 	},
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/item/kitchen/rollingpin,
+/turf/simulated/floor/plasteel{
+	tag = "icon-redfull";
+	icon_state = "redfull"
 	},
+/area/awaymission/centcomAway/cafe)
+"fM" = (
 /turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
-"fH" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
-"fI" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
-"fJ" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
-"fL" = (
-/obj/structure/table,
-/obj/item/storage/box/donkpockets{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/kitchen/rollingpin,
-/turf/simulated/floor/plasteel{
-	tag = "icon-redfull";
-	icon_state = "redfull"
-	},
-/area/awaymission/centcomAway/cafe)
-"fM" = (
-/turf/simulated/floor/plating,
-/turf/simulated/wall/shuttle{
-	icon_state = "swall_f5";
-	dir = 2
-	},
-/area/awaymission/centcomAway/hangar)
-"fN" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
+/turf/simulated/wall/shuttle{
+	icon_state = "swall_f5";
+	dir = 2
+	},
+/area/awaymission/centcomAway/hangar)
+"fN" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
@@ -2447,56 +2194,6 @@
 	dir = 5
 	},
 /area/awaymission/centcomAway/general)
-"gv" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
-"gw" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
-"gx" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
-"gy" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
-"gz" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
 "gA" = (
 /obj/machinery/sleeper{
 	icon_state = "sleeper-open";
@@ -2566,14 +2263,7 @@
 	},
 /area/awaymission/centcomAway/general)
 "gK" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/general)
 "gL" = (
@@ -2746,21 +2436,10 @@
 	dir = 5
 	},
 /area/awaymission/centcomAway/general)
-"hk" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
+"hl" = (
+/obj/machinery/computer/robotics{
 	dir = 4
 	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
-"hl" = (
-/obj/machinery/computer/robotics,
 /turf/simulated/floor/plasteel{
 	icon_state = "floor"
 	},
@@ -2782,7 +2461,9 @@
 	},
 /area/awaymission/centcomAway/general)
 "ho" = (
-/obj/machinery/computer/med_data,
+/obj/machinery/computer/med_data{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "floor"
 	},
@@ -2845,18 +2526,10 @@
 /obj/item/storage/lockbox,
 /turf/simulated/floor/shuttle,
 /area/awaymission/centcomAway/hangar)
-"hy" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
+"hz" = (
+/obj/machinery/computer/card{
 	dir = 4
 	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
-"hz" = (
-/obj/machinery/computer/card,
 /turf/simulated/floor/plasteel{
 	icon_state = "floor"
 	},
@@ -2868,7 +2541,9 @@
 	},
 /area/awaymission/centcomAway/general)
 "hB" = (
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "floor"
 	},
@@ -2896,17 +2571,7 @@
 /turf/simulated/floor/shuttle,
 /area/awaymission/centcomAway/hangar)
 "hF" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/shuttle/plating,
 /area/awaymission/centcomAway/hangar)
 "hG" = (
@@ -2950,7 +2615,9 @@
 	},
 /area/awaymission/centcomAway/general)
 "hN" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "floor"
 	},
@@ -2966,7 +2633,9 @@
 	},
 /area/awaymission/centcomAway/general)
 "hP" = (
-/obj/machinery/computer/security,
+/obj/machinery/computer/security{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "floor"
 	},
@@ -2992,28 +2661,6 @@
 	icon_state = "floor"
 	},
 /area/awaymission/centcomAway/general)
-"hS" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/wall/r_wall,
-/area/awaymission/centcomAway/courtroom)
-"hT" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/courtroom)
 "hU" = (
 /obj/structure/dispenser,
 /turf/simulated/floor/plasteel{
@@ -3027,31 +2674,8 @@
 	icon_state = "dark"
 	},
 /area/awaymission/centcomAway/courtroom)
-"hW" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/courtroom)
 "hX" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/hangar)
 "hY" = (
@@ -3118,16 +2742,6 @@
 	icon_state = "dark"
 	},
 /area/awaymission/centcomAway/courtroom)
-"ii" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/courtroom)
 "ij" = (
 /obj/machinery/power/apc/noalarm{
 	cell_type = 15000;
@@ -3328,14 +2942,7 @@
 	},
 /area/awaymission/centcomAway/courtroom)
 "iH" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/courtroom)
 "iI" = (
@@ -3482,25 +3089,6 @@
 	dir = 4
 	},
 /area/awaymission/centcomAway/general)
-"ja" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/wall/r_wall,
-/area/awaymission/centcomAway/courtroom)
-"jb" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/wall/r_wall,
-/area/awaymission/centcomAway/courtroom)
 "jc" = (
 /obj/structure/cable{
 	icon_state = "1-4";
@@ -3558,17 +3146,6 @@
 	icon_state = "dark"
 	},
 /area/awaymission/centcomAway/courtroom)
-"jh" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
 "ji" = (
 /obj/structure/chair{
 	dir = 8
@@ -4059,53 +3636,6 @@
 	icon_state = "white"
 	},
 /area/awaymission/centcomAway/general)
-"kp" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel{
-	name = "plating"
-	},
-/area/awaymission/centcomAway/general)
-"kq" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	name = "plating"
-	},
-/area/awaymission/centcomAway/general)
-"kr" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel{
-	name = "plating"
-	},
-/area/awaymission/centcomAway/general)
-"ks" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
 "kt" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/mechanical,
@@ -4169,17 +3699,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/hangar)
-"kC" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
 "kD" = (
 /obj/effect/landmark/awaystart,
 /turf/simulated/floor/plasteel{
@@ -4230,17 +3749,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/hangar)
-"kL" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
 "kM" = (
 /obj/machinery/gateway{
 	dir = 8
@@ -4290,45 +3798,6 @@
 	icon_state = "greencorner"
 	},
 /area/awaymission/centcomAway/general)
-"kU" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
-"kV" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
-"kW" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
 "kX" = (
 /obj/structure/table,
 /obj/item/flash,
@@ -4407,17 +3876,6 @@
 /obj/item/paper_bin,
 /turf/simulated/floor/wood,
 /area/awaymission/centcomAway/courtroom)
-"lg" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
 "lh" = (
 /obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/plasteel{
@@ -4560,19 +4018,6 @@
 /obj/effect/decal/warning_stripes/west,
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/hangar)
-"lx" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
 "ly" = (
 /obj/structure/table/wood,
 /obj/item/clothing/accessory/medal,
@@ -4620,14 +4065,6 @@
 	dir = 5
 	},
 /area/awaymission/centcomAway/hangar)
-"lG" = (
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plasteel{
-	tag = "icon-vault (NORTHEAST)";
-	icon_state = "vault";
-	dir = 5
-	},
-/area/awaymission/centcomAway/general)
 "lH" = (
 /obj/machinery/light{
 	dir = 1;
@@ -4637,24 +4074,6 @@
 	icon_state = "dark"
 	},
 /area/awaymission/centcomAway/general)
-"lI" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/general)
 "lJ" = (
 /obj/machinery/door/airlock/external,
 /turf/simulated/floor/plating,
@@ -4676,6 +4095,7 @@
 	},
 /area/awaymission/centcomAway/hangar)
 "lM" = (
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plasteel{
 	tag = "icon-ironsand3 (WEST)";
 	icon_state = "ironsand3";
@@ -4683,26 +4103,6 @@
 	heat_capacity = 1
 	},
 /area/awaymission/centcomAway/general)
-"lN" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel{
-	tag = "icon-vault (NORTHEAST)";
-	icon_state = "vault";
-	dir = 5
-	},
-/area/awaymission/centcomAway/general)
-"lO" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel{
-	tag = "icon-vault (NORTHEAST)";
-	icon_state = "vault";
-	dir = 5
-	},
-/area/awaymission/centcomAway/general)
 "lP" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Thunderdome Administration";
@@ -4801,6 +4201,7 @@
 	},
 /area/awaymission/centcomAway/general)
 "lZ" = (
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plasteel{
 	tag = "icon-ironsand11 (WEST)";
 	icon_state = "ironsand11";
@@ -4829,6 +4230,7 @@
 	},
 /area/awaymission/centcomAway/general)
 "md" = (
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plasteel{
 	tag = "icon-ironsand9 (WEST)";
 	icon_state = "ironsand9";
@@ -4871,37 +4273,11 @@
 	name = "XCC Shutter 3 Control"
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/awaymission/centcomAway/general)
-"mi" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/thunderdome)
-"mj" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/thunderdome)
-"mk" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
+	icon_state = "dark"
 	},
+/area/awaymission/centcomAway/general)
+"mj" = (
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/thunderdome)
 "ml" = (
@@ -4931,6 +4307,7 @@
 	},
 /area/awaymission/centcomAway/hangar)
 "mo" = (
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plasteel{
 	tag = "icon-ironsand4 (WEST)";
 	icon_state = "ironsand4";
@@ -4970,16 +4347,6 @@
 	dir = 1
 	},
 /area/awaymission/centcomAway/hangar)
-"mu" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	tag = "icon-vault (NORTHEAST)";
-	icon_state = "vault";
-	dir = 5
-	},
-/area/awaymission/centcomAway/general)
 "mv" = (
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -5105,18 +4472,11 @@
 	},
 /area/awaymission/centcomAway/hangar)
 "mN" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "1-2";
 	pixel_y = 0
 	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/general)
 "mO" = (
@@ -5297,15 +4657,6 @@
 	icon_state = "dark"
 	},
 /area/awaymission/centcomAway/hangar)
-"nj" = (
-/obj/structure/flora/ausbushes,
-/turf/simulated/floor/plasteel{
-	dir = 6;
-	icon_state = "asteroid8";
-	name = "sand";
-	tag = "icon-asteroid8 (SOUTHEAST)"
-	},
-/area/awaymission/centcomAway/general)
 "nk" = (
 /obj/structure/flora/ausbushes,
 /obj/machinery/light{
@@ -5313,9 +4664,9 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "asteroid6";
-	name = "sand";
-	tag = "icon-asteroid6"
+	tag = "icon-asteroid";
+	name = "plating";
+	icon_state = "asteroid"
 	},
 /area/awaymission/centcomAway/general)
 "nl" = (
@@ -5330,14 +4681,6 @@
 	icon_state = "asteroid"
 	},
 /area/awaymission/centcomAway/general)
-"nm" = (
-/obj/structure/flora/ausbushes,
-/turf/simulated/floor/plasteel{
-	tag = "icon-asteroid5";
-	name = "plating";
-	icon_state = "asteroid5"
-	},
-/area/awaymission/centcomAway/general)
 "nn" = (
 /obj/machinery/light{
 	icon_state = "tube1";
@@ -5429,7 +4772,9 @@
 	},
 /area/awaymission/centcomAway/general)
 "nw" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	tag = "icon-vault (NORTH)";
 	icon_state = "vault";
@@ -5470,7 +4815,9 @@
 	},
 /area/awaymission/centcomAway/general)
 "nB" = (
-/obj/machinery/computer/card,
+/obj/machinery/computer/card{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	tag = "icon-vault (NORTH)";
 	icon_state = "vault";
@@ -5641,7 +4988,9 @@
 /turf/simulated/floor/shuttle/plating,
 /area/awaymission/centcomAway/thunderdome)
 "nY" = (
-/obj/structure/computerframe,
+/obj/structure/computerframe{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "floor"
 	},
@@ -11914,7 +11263,7 @@ fP
 cS
 cq
 fl
-fA
+fz
 bn
 bn
 jp
@@ -12044,7 +11393,7 @@ fR
 bY
 fc
 fm
-fA
+fz
 bn
 bn
 bn
@@ -12174,7 +11523,7 @@ bO
 dg
 cq
 hH
-fA
+fz
 bn
 bn
 bn
@@ -12304,7 +11653,7 @@ bP
 eM
 fr
 hL
-fB
+fz
 bn
 bo
 bn
@@ -12578,12 +11927,12 @@ bk
 lw
 aW
 aa
-fG
+gK
 hg
 fY
 fY
 hg
-fG
+gK
 aa
 aW
 gX
@@ -12708,12 +12057,12 @@ cU
 kB
 aW
 aa
-fH
+gK
 hg
 fY
 fY
 hg
-fH
+gK
 aa
 aW
 gX
@@ -12838,12 +12187,12 @@ cU
 is
 aW
 aa
-fH
+gK
 hg
 fY
 fY
 hg
-fH
+gK
 aa
 aW
 nb
@@ -12968,12 +12317,12 @@ cU
 od
 aW
 aa
-fH
+gK
 hg
 lY
 fY
 hg
-fH
+gK
 aa
 aW
 cU
@@ -13098,12 +12447,12 @@ cU
 iu
 aW
 aa
-fH
+gK
 hg
 fY
 fY
 hg
-fH
+gK
 aa
 aW
 gX
@@ -13228,12 +12577,12 @@ kt
 kt
 aW
 aa
-jh
+gK
 hg
 fY
 fY
 hg
-jh
+gK
 aa
 aW
 aW
@@ -13369,9 +12718,9 @@ eF
 eF
 kw
 eO
-fG
+gK
 nk
-fG
+gK
 eO
 go
 eF
@@ -13499,12 +12848,12 @@ lh
 eF
 kw
 eO
-fH
-nj
-fH
+gK
+mW
+gK
 eO
 go
-fG
+gK
 aa
 bm
 bm
@@ -13619,22 +12968,22 @@ eF
 fY
 hg
 fY
-lN
-lN
-lN
-lN
+fY
+fY
+fY
+fY
 fY
 hg
 fY
 eF
 kw
 eO
-fH
-mO
-fH
+gK
+mW
+gK
 eO
 go
-fH
+gK
 aa
 aa
 bm
@@ -13748,23 +13097,23 @@ hf
 eF
 fY
 hg
-lG
+fY
 lM
 lZ
 md
 mo
-mu
+fY
 hg
 fY
 eF
 kw
 eO
-fH
+gK
 mW
-fH
+gK
 eO
 go
-fH
+gK
 aa
 aa
 aa
@@ -13879,22 +13228,22 @@ eF
 fY
 hg
 fY
-lO
-lO
-lO
-lO
+fY
+fY
+fY
+fY
 fY
 hg
 fY
 eF
 kw
 eO
-fH
-nm
-fH
+gK
+mW
+gK
 eO
 go
-jh
+gK
 aa
 aa
 aa
@@ -14019,9 +13368,9 @@ lh
 eF
 kw
 eO
-jh
+gK
 nl
-jh
+gK
 eO
 go
 eF
@@ -14378,7 +13727,7 @@ aG
 ak
 aH
 aG
-ea
+dZ
 fi
 eF
 ge
@@ -14536,7 +13885,7 @@ jj
 fD
 eF
 mO
-kp
+gK
 ku
 nf
 nf
@@ -14666,7 +14015,7 @@ jK
 or
 eF
 mQ
-kq
+gK
 ku
 nf
 nf
@@ -14695,7 +14044,7 @@ oD
 oC
 oC
 oP
-mi
+mj
 oX
 oQ
 oQ
@@ -14703,7 +14052,7 @@ oQ
 oQ
 oQ
 pH
-mi
+mj
 pN
 pN
 pN
@@ -14748,7 +14097,7 @@ aa
 aa
 aa
 aa
-ad
+dZ
 ai
 ai
 ai
@@ -14796,7 +14145,7 @@ jL
 oq
 eF
 mP
-kr
+gK
 eO
 eO
 eO
@@ -14878,7 +14227,7 @@ aa
 aa
 aa
 aa
-ae
+dZ
 ai
 ai
 aM
@@ -14904,7 +14253,7 @@ eF
 gt
 eO
 hb
-fG
+gK
 iQ
 gn
 ju
@@ -14922,7 +14271,7 @@ jj
 fD
 jj
 mg
-jM
+aK
 jj
 eF
 eF
@@ -14930,7 +14279,7 @@ eF
 eF
 iD
 eF
-fg
+gK
 eF
 iD
 eF
@@ -15008,7 +14357,7 @@ aa
 aa
 aa
 aa
-ae
+dZ
 ai
 ai
 aL
@@ -15028,20 +14377,20 @@ ai
 aL
 aL
 ai
-eb
+dZ
 fi
 eF
 gp
 eO
 hb
-fH
+gK
 iV
 go
-gv
+gK
 gK
 jH
-hk
-hy
+gK
+gK
 gK
 eF
 kw
@@ -15068,13 +14417,13 @@ pG
 eF
 le
 eO
-fg
+gK
 nI
 nJ
 eF
-lx
-hy
-ks
+gK
+gK
+gK
 eF
 aa
 lD
@@ -15138,7 +14487,7 @@ aa
 aa
 aa
 aa
-ae
+dZ
 ai
 ai
 aL
@@ -15158,22 +14507,22 @@ ai
 ep
 aL
 ai
-ea
+dZ
 fo
 eF
 ge
 eO
 hU
-fI
+gK
 iQ
 go
-gw
+gK
 gL
 eO
 hl
 hz
 ki
-fG
+gK
 kw
 eO
 eF
@@ -15185,16 +14534,16 @@ eF
 eF
 eF
 eF
-hk
-ks
+gK
+gK
 eF
 iD
 eF
-fg
+gK
 eF
 iD
 eF
-kU
+gK
 eF
 nx
 lk
@@ -15268,7 +14617,7 @@ aa
 aa
 aa
 aa
-ae
+dZ
 ai
 ai
 ai
@@ -15303,7 +14652,7 @@ eO
 hm
 eO
 kh
-fH
+gK
 kw
 kG
 eF
@@ -15314,7 +14663,7 @@ ma
 jv
 mp
 mp
-fH
+gK
 mS
 mS
 nd
@@ -15325,18 +14674,18 @@ np
 eO
 mS
 mp
-gv
-lg
+gK
+gK
 le
-fg
+gK
 eO
 nK
 eF
-hk
-hy
-hy
-hy
-ks
+gK
+gK
+gK
+gK
+gK
 lD
 lD
 ou
@@ -15398,7 +14747,7 @@ aa
 aa
 aa
 aa
-ae
+dZ
 ai
 ai
 ai
@@ -15427,24 +14776,24 @@ hY
 eO
 ik
 go
-gx
+gK
 gN
 eO
 eO
 hA
 hN
-fH
+gK
 kw
 kP
 eF
 lE
-fg
+gK
 jG
 eO
 eO
 eO
 mv
-fJ
+gK
 eO
 eO
 eO
@@ -15455,7 +14804,7 @@ eO
 eO
 eO
 go
-fJ
+gK
 nz
 nz
 nz
@@ -15528,7 +14877,7 @@ aa
 aa
 aa
 aa
-af
+dZ
 ai
 ai
 ai
@@ -15549,21 +14898,21 @@ ai
 ai
 ai
 ai
-es
+dZ
 fY
 fY
-fg
+gK
 eO
 eO
 ik
 go
-gy
+gK
 jE
 kF
 eO
 eO
 nY
-fH
+gK
 kw
 eO
 iD
@@ -15589,14 +14938,14 @@ fY
 fY
 fY
 fY
-hk
-ks
+gK
+gK
 ic
 fY
 fY
 nS
-lx
-ks
+gK
+gK
 lD
 om
 ot
@@ -15687,18 +15036,18 @@ hZ
 ir
 jc
 go
-gw
+gK
 jF
 eO
 eO
 hA
 hP
-fH
+gK
 kw
 kZ
 li
 nc
-lI
+mN
 lT
 hM
 hM
@@ -15791,23 +15140,23 @@ aa
 ac
 ak
 ak
-aK
+dZ
 aZ
-aK
+dZ
 bp
 bp
 bp
 ak
-aK
+dZ
 cF
-aK
+dZ
 ak
 bp
 bp
 bp
-aK
+dZ
 dM
-aK
+dZ
 ak
 ak
 eF
@@ -15823,7 +15172,7 @@ eO
 hn
 eO
 kj
-fH
+gK
 kw
 kT
 eF
@@ -15834,7 +15183,7 @@ mb
 ju
 mq
 mq
-fH
+gK
 mT
 mT
 ne
@@ -15845,18 +15194,18 @@ nq
 eO
 mT
 mq
-gz
+gK
 gK
 le
-fg
+gK
 eO
 go
 eF
-hk
-hy
-hy
-hy
-ks
+gK
+gK
+gK
+gK
+gK
 lD
 lD
 ou
@@ -15944,16 +15293,16 @@ eF
 gA
 eU
 gA
-fG
+gK
 jf
 go
-gx
+gK
 gR
 eO
 ho
 hB
 hR
-fJ
+gK
 kw
 ik
 eF
@@ -15965,16 +15314,16 @@ ml
 ms
 mz
 eF
-hk
-ks
+gK
+gK
 eF
 iD
 eF
-fg
+gK
 eF
 iD
 eF
-kV
+gK
 eF
 nx
 ll
@@ -16074,20 +15423,20 @@ eF
 eU
 eU
 eU
-fH
+gK
 je
 go
-gz
+gK
 gK
 jH
-hk
-hy
+gK
+gK
 gK
 eF
 kw
 la
 eF
-fg
+gK
 eF
 lU
 hg
@@ -16108,13 +15457,13 @@ qk
 eF
 le
 eO
-fg
+gK
 ju
 mq
 eF
-lx
-hy
-ks
+gK
+gK
+gK
 eF
 aa
 lD
@@ -16187,11 +15536,11 @@ dL
 ax
 ax
 bV
-aK
+dZ
 cs
 cG
 cs
-aK
+dZ
 dK
 ax
 ax
@@ -16204,7 +15553,7 @@ eF
 gF
 eU
 eU
-fJ
+gK
 jf
 jm
 jv
@@ -16230,7 +15579,7 @@ eF
 eF
 iD
 eF
-fg
+gK
 eF
 iD
 eF
@@ -16347,7 +15696,7 @@ eO
 oa
 lb
 eF
-fg
+gK
 eF
 lV
 mc
@@ -16356,7 +15705,7 @@ mm
 mD
 eF
 mW
-fG
+gK
 eO
 eO
 eO
@@ -16486,7 +15835,7 @@ eF
 eF
 eF
 mZ
-fH
+gK
 ku
 eO
 eO
@@ -16515,7 +15864,7 @@ oJ
 oC
 oC
 oP
-mk
+mj
 pf
 oT
 oT
@@ -16523,7 +15872,7 @@ oT
 oT
 oT
 pL
-mk
+mj
 pN
 pN
 pN
@@ -16616,7 +15965,7 @@ bm
 bm
 eF
 mX
-fH
+gK
 ku
 eO
 eO
@@ -16746,7 +16095,7 @@ aa
 aa
 eF
 na
-jh
+gK
 eO
 eO
 eO
@@ -16878,15 +16227,15 @@ eF
 eF
 eF
 kx
-kC
+gK
 kE
 eF
 kE
-kL
+gK
 kx
-gx
+gK
 kx
-fG
+gK
 eF
 eF
 eF
@@ -16959,11 +16308,11 @@ aa
 aa
 aa
 ac
-at
-aB
-aB
-aB
-bb
+dZ
+dZ
+dZ
+dZ
+dZ
 ak
 ak
 ak
@@ -16975,11 +16324,11 @@ ak
 ak
 ak
 ak
-at
-aB
-aB
-aB
-bb
+dZ
+dZ
+dZ
+dZ
+dZ
 eF
 gM
 eU
@@ -17006,17 +16355,17 @@ aa
 aa
 aa
 aa
-fG
+gK
 fD
-fH
+gK
 aa
 aa
 aa
-fH
+gK
 fD
-gy
+gK
 fD
-fH
+gK
 aa
 aa
 aa
@@ -17122,7 +16471,7 @@ gT
 fU
 fy
 fy
-hS
+iH
 aa
 aa
 aa
@@ -17136,17 +16485,17 @@ aa
 aa
 aa
 aa
-jh
+gK
 kx
-jh
+gK
 aa
 aa
 aa
-jh
+gK
 kx
-kW
+gK
 kx
-jh
+gK
 aa
 aa
 aa
@@ -17252,7 +16601,7 @@ gT
 fU
 fy
 fy
-hT
+iH
 aa
 aa
 aa
@@ -17487,11 +16836,11 @@ au
 bs
 bB
 bB
-aK
+dZ
 cw
 cI
 cw
-aK
+dZ
 bB
 ee
 em
@@ -17872,7 +17221,7 @@ aa
 aa
 aa
 aa
-aT
+aV
 ag
 ag
 ag
@@ -18002,16 +17351,16 @@ aa
 aa
 aa
 aa
-aU
+aV
 bc
 ag
 ag
 ac
-at
-aB
-aB
-aB
-bb
+dZ
+dZ
+dZ
+dZ
+dZ
 ac
 ag
 ag
@@ -18132,7 +17481,7 @@ aa
 aa
 aa
 aa
-aU
+aV
 bc
 ag
 ag
@@ -18167,7 +17516,7 @@ fQ
 iz
 lf
 gV
-hS
+iH
 aa
 aa
 aa
@@ -18267,10 +17616,10 @@ ag
 ag
 ag
 ab
-cl
-cx
-cx
-cx
+dd
+dd
+dd
+dd
 dd
 ab
 ag
@@ -18297,7 +17646,7 @@ fQ
 fU
 gE
 gW
-ja
+iH
 aa
 aa
 aa
@@ -18427,7 +17776,7 @@ fQ
 fQ
 gE
 gC
-ja
+iH
 aa
 aa
 aa
@@ -18557,7 +17906,7 @@ fQ
 fQ
 gC
 gC
-jb
+iH
 aa
 aa
 aa
@@ -19319,7 +18668,7 @@ aa
 aa
 aa
 aa
-aT
+aV
 ag
 ag
 fj
@@ -19449,7 +18798,7 @@ aa
 aa
 aa
 aa
-aU
+aV
 ag
 nC
 fj
@@ -19465,7 +18814,7 @@ fj
 fj
 fj
 gT
-hW
+iH
 iH
 gT
 aa
@@ -19579,7 +18928,7 @@ aa
 aa
 aa
 aa
-aU
+aV
 ag
 ag
 fj
@@ -20372,10 +19721,10 @@ aa
 aa
 gT
 gT
-hW
-ii
-ii
-ii
+iH
+iH
+iH
+iH
 iH
 gT
 aa
diff --git a/_maps/map_files/RandomZLevels/evil_santa.dmm b/_maps/map_files/RandomZLevels/evil_santa.dmm
index c57829e57fe..c2b2cc8b642 100644
--- a/_maps/map_files/RandomZLevels/evil_santa.dmm
+++ b/_maps/map_files/RandomZLevels/evil_santa.dmm
@@ -119,8 +119,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/challenge/main)
 "au" = (
-/obj/structure/grille,
-/obj/structure/window/full/basic,
+/obj/effect/spawner/window,
 /turf/simulated/floor/plating,
 /area/awaymission/challenge/main)
 "av" = (
diff --git a/_maps/map_files/RandomZLevels/example.dmm b/_maps/map_files/RandomZLevels/example.dmm
index 62c87f9002d..17db47fb6c0 100644
--- a/_maps/map_files/RandomZLevels/example.dmm
+++ b/_maps/map_files/RandomZLevels/example.dmm
@@ -336,39 +336,15 @@
 	},
 /area/awaymission/example)
 "aY" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/grille,
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
 	icon_state = "open";
 	id_tag = "example";
 	name = "Privacy Shutters";
-	opacity = 0
-	},
-/turf/simulated/floor/plating,
-/area/awaymission/example)
-"aZ" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
+	opacity = 0;
 	dir = 1
 	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	icon_state = "open";
-	id_tag = "example";
-	name = "Privacy Shutters";
-	opacity = 0
-	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/example)
 "ba" = (
@@ -461,20 +437,6 @@
 	icon_state = "yellowcorner"
 	},
 /area/awaymission/example)
-"bn" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/example)
 "bo" = (
 /turf/simulated/floor/plasteel{
 	tag = "icon-stage_stairs (WEST)";
@@ -482,34 +444,8 @@
 	dir = 8
 	},
 /area/awaymission/example)
-"bp" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/example)
 "bq" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/example)
-"br" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/grille,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/example)
 "bs" = (
@@ -1980,7 +1916,7 @@ ab
 ac
 aQ
 bk
-bn
+bq
 bt
 by
 by
@@ -1990,7 +1926,7 @@ ab
 bV
 ac
 ac
-bp
+bq
 aP
 aQ
 ac
@@ -2112,7 +2048,7 @@ ab
 ac
 aQ
 bm
-bn
+bq
 bt
 bz
 bt
@@ -2188,7 +2124,7 @@ ab
 bX
 ac
 ac
-br
+bq
 aN
 aQ
 bm
@@ -2244,9 +2180,9 @@ ab
 ac
 aQ
 ac
-bp
+bq
 aa
-bp
+bq
 bJ
 bt
 by
@@ -2376,9 +2312,9 @@ ab
 ac
 aQ
 ac
-br
+bq
 aa
-br
+bq
 bK
 bt
 bJ
@@ -2508,7 +2444,7 @@ ab
 ac
 aQ
 bk
-bn
+bq
 bt
 bA
 bt
@@ -2640,7 +2576,7 @@ ab
 ac
 aQ
 bm
-bn
+bq
 bt
 bB
 bM
@@ -3813,7 +3749,7 @@ aR
 aT
 aT
 aT
-aZ
+aY
 bb
 be
 bi
diff --git a/_maps/map_files/RandomZLevels/moonoutpost19.dmm b/_maps/map_files/RandomZLevels/moonoutpost19.dmm
index 93bf612ae9b..c29598a870a 100644
--- a/_maps/map_files/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/map_files/RandomZLevels/moonoutpost19.dmm
@@ -1,9 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
-/turf/simulated/wall/indestructible{
-	icon_state = "rock";
-	name = "rock"
-	},
+/turf/simulated/wall/indestructible/rock,
 /area/moonoutpost19/khonsu19)
 "ab" = (
 /turf/simulated/mineral/random/labormineral,
@@ -755,8 +752,7 @@
 /turf/simulated/floor/plasteel,
 /area/moonoutpost19/syndicateoutpost)
 "bP" = (
-/obj/structure/grille,
-/obj/structure/window/full/basic,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/moonoutpost19/syndicateoutpost)
 "bQ" = (
@@ -1013,11 +1009,6 @@
 /obj/effect/decal/warning_stripes/east,
 /turf/simulated/floor/plating,
 /area/moonoutpost19/syndicateoutpost)
-"cn" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
-/turf/simulated/floor/plating,
-/area/moonoutpost19/syndicateoutpost)
 "co" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
@@ -2173,8 +2164,7 @@
 	name = "Acid-Proof containment chamber blast door"
 	},
 /obj/structure/cable,
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/moonoutpost19/mo19research)
 "eA" = (
@@ -2261,13 +2251,12 @@
 	},
 /area/moonoutpost19/mo19research)
 "eM" = (
-/obj/structure/grille,
 /obj/machinery/door/poddoor{
 	desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating.";
 	id_tag = "Awaybiohazard";
 	name = "Acid-Proof biohazard containment door"
 	},
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/moonoutpost19/mo19research)
 "eN" = (
@@ -2570,8 +2559,7 @@
 	id_tag = "Awaylab";
 	name = "Acid-Proof containment chamber blast door"
 	},
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/moonoutpost19/mo19research)
 "fp" = (
@@ -2997,8 +2985,7 @@
 	},
 /area/moonoutpost19/mo19research)
 "fX" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/moonoutpost19/mo19research)
 "fY" = (
@@ -3289,8 +3276,7 @@
 	name = "Acid-Proof containment chamber blast door"
 	},
 /obj/structure/cable,
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/moonoutpost19/mo19research)
 "gw" = (
@@ -3512,8 +3498,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/moonoutpost19/mo19research)
 "gP" = (
@@ -3896,12 +3881,11 @@
 	},
 /area/moonoutpost19/mo19research)
 "hx" = (
-/obj/structure/grille,
 /obj/machinery/door/poddoor{
 	id_tag = "AwayRD";
 	name = "privacy shutter"
 	},
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/moonoutpost19/mo19research)
 "hy" = (
@@ -4401,8 +4385,7 @@
 	},
 /area/moonoutpost19/mo19research)
 "is" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/moonoutpost19/mo19arrivals)
 "it" = (
@@ -5023,11 +5006,6 @@
 	icon_state = "bar"
 	},
 /area/moonoutpost19/mo19arrivals)
-"jO" = (
-/obj/structure/grille,
-/obj/structure/window/full/basic,
-/turf/simulated/floor/plating,
-/area/moonoutpost19/mo19arrivals)
 "jP" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /turf/simulated/floor/plasteel{
@@ -5153,8 +5131,7 @@
 /turf/simulated/floor/plating,
 /area/moonoutpost19/mo19utilityroom)
 "kd" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating/airless{
 	name = "plating"
 	},
@@ -5677,8 +5654,7 @@
 	},
 /area/moonoutpost19/mo19arrivals)
 "ld" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating/asteroid/airless,
 /area/moonoutpost19/mo19arrivals)
 "lg" = (
@@ -6191,12 +6167,11 @@
 	},
 /area/moonoutpost19/mo19arrivals)
 "mx" = (
-/obj/structure/grille,
 /obj/structure/sign/vacuum{
 	desc = "A warning sign which reads 'HOSTILE ATMOSPHERE AHEAD'";
 	name = "\improper HOSTILE ATMOSPHERE AHEAD"
 	},
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/moonoutpost19/mo19arrivals)
 "my" = (
@@ -6776,9 +6751,8 @@
 	},
 /area/moonoutpost19/mo19arrivals)
 "nW" = (
-/obj/structure/grille,
 /obj/structure/disposalpipe/segment,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/moonoutpost19/mo19arrivals)
 "nX" = (
@@ -14230,10 +14204,10 @@ bv
 aT
 aT
 bX
-cn
+bP
 cD
-cn
-cn
+bP
+bP
 df
 dn
 aT
@@ -15527,10 +15501,10 @@ io
 iB
 hJ
 hJ
-jO
+is
 oq
 ko
-jO
+is
 hK
 kX
 hK
diff --git a/_maps/map_files/RandomZLevels/terrorspiders.dmm b/_maps/map_files/RandomZLevels/terrorspiders.dmm
index 1fe41dba8ea..ba1044420ef 100644
--- a/_maps/map_files/RandomZLevels/terrorspiders.dmm
+++ b/_maps/map_files/RandomZLevels/terrorspiders.dmm
@@ -1,9 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
-/turf/simulated/wall/indestructible{
-	icon_state = "rock";
-	name = "rock"
-	},
+/turf/simulated/wall/indestructible/rock,
 /area/awaymission/UO71/outside)
 "ab" = (
 /turf/simulated/mineral/random/labormineral,
@@ -115,11 +112,6 @@
 	icon_state = "dark"
 	},
 /area/awaymission/UO71/plaza)
-"at" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
-/turf/simulated/floor/plating,
-/area/awaymission/UO71/plaza)
 "au" = (
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralcorner"
@@ -1415,8 +1407,7 @@
 	},
 /area/awaymission/UO71/plaza)
 "dR" = (
-/obj/structure/grille,
-/obj/structure/window/full/basic,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/plaza)
 "dS" = (
@@ -2438,8 +2429,7 @@
 	},
 /area/awaymission/UO71/gateway)
 "gs" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/gateway)
 "gt" = (
@@ -2896,12 +2886,11 @@
 	},
 /area/awaymission/UO71/centralhall)
 "hr" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4;
 	level = 2
 	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/centralhall)
 "hs" = (
@@ -3369,11 +3358,10 @@
 /turf/simulated/wall,
 /area/awaymission/UO71/gateway)
 "iy" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/gateway)
 "iz" = (
@@ -3792,8 +3780,7 @@
 	},
 /area/awaymission/UO71/gateway)
 "jM" = (
-/obj/structure/grille,
-/obj/structure/window/full/basic,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/science)
 "jN" = (
@@ -5109,11 +5096,6 @@
 	icon_state = "cafeteria"
 	},
 /area/awaymission/UO71/science)
-"mu" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
-/turf/simulated/floor/plating,
-/area/awaymission/UO71/science)
 "mv" = (
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -7028,8 +7010,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO71/eng)
 "qe" = (
-/obj/structure/grille,
-/obj/structure/window/full/basic,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/medical)
 "qf" = (
@@ -7241,8 +7222,7 @@
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/science)
 "qy" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/eng)
 "qz" = (
@@ -8337,8 +8317,6 @@
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/science)
 "sF" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/door/poddoor/preopen{
 	id_tag = "UO71_Engineering";
 	name = "engineering security door"
@@ -8346,6 +8324,7 @@
 /obj/machinery/atmospherics/pipe/simple/visible/universal{
 	dir = 4
 	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/eng)
 "sG" = (
@@ -8810,7 +8789,8 @@
 	input_tag = "UO71_waste_in";
 	name = "Gas Mix Tank Control";
 	output_tag = "UO71_waste_out";
-	sensors = list("UO71_waste_sensor"="Tank")
+	sensors = list("UO71_waste_sensor"="Tank");
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/green{
 	dir = 6
@@ -8948,7 +8928,8 @@
 /area/awaymission/UO71/eng)
 "tW" = (
 /obj/machinery/computer/security{
-	network = list("UO71")
+	network = list("UO71");
+	dir = 1
 	},
 /obj/machinery/door_control{
 	desc = "A remote control-switch for the security privacy shutters.";
@@ -8990,8 +8971,6 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO71/eng)
 "ua" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -8999,6 +8978,7 @@
 	id_tag = "UO71_Engineering";
 	name = "engineering security door"
 	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/eng)
 "ub" = (
@@ -9400,7 +9380,8 @@
 	input_tag = "UO71_n2_in";
 	name = "Nitrogen Supply Control";
 	output_tag = "UO71_n2_out";
-	sensors = list("UO71_n2_sensor"="Tank")
+	sensors = list("UO71_n2_sensor"="Tank");
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/cyan,
 /turf/simulated/floor/plasteel{
@@ -9417,7 +9398,8 @@
 	input_tag = "UO71_o2_in";
 	name = "Oxygen Supply Control";
 	output_tag = "UO71_o2_out";
-	sensors = list("UO71_o2_sensor"="Tank")
+	sensors = list("UO71_o2_sensor"="Tank");
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
@@ -9513,7 +9495,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/computer/general_air_control{
 	name = "Tank Monitor";
-	sensors = list("UO71_n2_sensor"="Nitrogen","UO71_o2_sensor"="Oxygen","UO71_waste_sensor"="Gas Mix Tank")
+	sensors = list("UO71_n2_sensor"="Nitrogen","UO71_o2_sensor"="Oxygen","UO71_waste_sensor"="Gas Mix Tank");
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -9644,8 +9627,7 @@
 	},
 /area/awaymission/UO71/medical)
 "vu" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/centralhall)
 "vv" = (
@@ -9696,7 +9678,8 @@
 	frequency = 1443;
 	level = 3;
 	name = "Distribution and Waste Monitor";
-	sensors = list("UO71_mair_in_meter"="Mixed Air In","UO71_air_sensor"="Mixed Air Supply Tank","UO71_mair_out_meter"="Mixed Air Out","UO71_dloop_atm_meter"="Distribution Loop","UO71_wloop_atm_meter"="Waste Loop")
+	sensors = list("UO71_mair_in_meter"="Mixed Air In","UO71_air_sensor"="Mixed Air Supply Tank","UO71_mair_out_meter"="Mixed Air Out","UO71_dloop_atm_meter"="Distribution Loop","UO71_wloop_atm_meter"="Waste Loop");
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -9923,11 +9906,10 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO71/bridge)
 "vZ" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/centralhall)
 "wa" = (
@@ -9970,7 +9952,9 @@
 /area/awaymission/UO71/centralhall)
 "wf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/computer/atmos_alert,
+/obj/machinery/computer/atmos_alert{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "caution"
@@ -10185,7 +10169,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
-/obj/machinery/computer/station_alert,
+/obj/machinery/computer/station_alert{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
 	icon_state = "caution"
@@ -10412,8 +10398,6 @@
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/mining)
 "xf" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -10422,16 +10406,16 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/eng)
 "xg" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
 	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/eng)
 "xh" = (
@@ -11015,11 +10999,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO71/mining)
-"yl" = (
-/obj/structure/grille,
-/obj/structure/window/full/basic,
-/turf/simulated/floor/plating,
-/area/awaymission/UO71/mining)
 "ym" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
@@ -11039,8 +11018,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO71/mining)
 "yp" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/mining)
 "yq" = (
@@ -11087,11 +11065,10 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO71/queen)
 "yv" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/mining)
 "yw" = (
@@ -11264,9 +11241,8 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO71/queen)
 "yR" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/mining)
 "yS" = (
@@ -11328,17 +11304,11 @@
 	},
 /area/awaymission/UO71/outside)
 "zd" = (
-/turf/simulated/wall/indestructible{
-	icon_state = "rock";
-	name = "rock"
-	},
+/turf/simulated/wall/indestructible/rock,
 /area/awaymission/UO71/queen)
 "ze" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/wall/indestructible{
-	icon_state = "rock";
-	name = "rock"
-	},
+/turf/simulated/wall/indestructible/rock,
 /area/awaymission/UO71/queen)
 "zf" = (
 /turf/simulated/floor/plasteel,
@@ -11609,11 +11579,10 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO71/plaza)
 "CP" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/plaza)
 "Eb" = (
@@ -11701,10 +11670,7 @@
 /turf/simulated/floor/vault,
 /area/awaymission/UO71/prince)
 "Lf" = (
-/turf/simulated/wall/indestructible{
-	icon_state = "rock";
-	name = "rock"
-	},
+/turf/simulated/wall/indestructible/rock,
 /area/awaymission/UO71/loot)
 "Lw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -11814,9 +11780,8 @@
 /turf/simulated/mineral/random/labormineral,
 /area/awaymission/UO71/outside)
 "ZV" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO71/science)
 
@@ -13912,9 +13877,9 @@ aa
 aa
 aa
 aa
-ab
-ab
-ab
+aa
+aa
+aa
 aa
 aa
 aa
@@ -14062,9 +14027,9 @@ aa
 aa
 aa
 aa
-ab
-ab
-ab
+aa
+aa
+aa
 aa
 aa
 aa
@@ -14212,9 +14177,9 @@ ab
 aa
 aa
 aa
-ab
-ab
-ab
+aa
+aa
+aa
 aa
 aa
 aa
@@ -14362,9 +14327,9 @@ ab
 aa
 aa
 aa
-ab
-ab
-ab
+aa
+aa
+aa
 aa
 aa
 aa
@@ -14512,9 +14477,9 @@ ab
 aa
 aa
 aa
-ab
-ab
-ab
+aa
+aa
+aa
 aa
 aa
 aa
@@ -14662,9 +14627,9 @@ ab
 aa
 aa
 aa
-ab
-ab
-ab
+aa
+aa
+aa
 aa
 aa
 aa
@@ -14812,12 +14777,12 @@ ab
 aa
 aa
 aa
-ab
-ab
-ab
-ab
-ab
-ab
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 "}
 (21,1,1) = {"
@@ -17740,9 +17705,9 @@ oj
 oj
 pF
 fO
-mu
+jM
 rj
-mu
+jM
 fO
 CE
 ol
@@ -18783,7 +18748,7 @@ ab
 fO
 kZ
 lX
-mu
+jM
 nd
 nE
 oq
@@ -18933,7 +18898,7 @@ ab
 fO
 la
 lX
-mu
+jM
 nf
 nG
 os
@@ -19083,10 +19048,10 @@ jG
 kn
 lb
 lY
-mu
-mu
-mu
-mu
+jM
+jM
+jM
+jM
 pc
 fO
 pX
@@ -19961,7 +19926,7 @@ ad
 Iq
 ad
 dx
-at
+dR
 ea
 ek
 CP
@@ -20544,7 +20509,7 @@ ab
 ad
 al
 al
-at
+dR
 ax
 ax
 aK
@@ -20694,7 +20659,7 @@ ab
 ad
 al
 al
-at
+dR
 aA
 aA
 aK
@@ -20844,7 +20809,7 @@ ab
 ad
 al
 ar
-at
+dR
 az
 aA
 aK
@@ -20994,7 +20959,7 @@ ab
 ac
 al
 ar
-at
+dR
 aC
 aG
 aK
@@ -21612,7 +21577,7 @@ ac
 CP
 dG
 dU
-at
+dR
 dt
 eA
 ac
@@ -21762,7 +21727,7 @@ ac
 CP
 dF
 al
-at
+dR
 ep
 ep
 ac
@@ -22857,9 +22822,9 @@ xm
 vP
 wv
 wi
-yl
+yp
 yn
-yl
+yp
 yC
 xe
 wu
diff --git a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
index e017a9b2c40..ffa29907013 100644
--- a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
@@ -1,9 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
-/turf/simulated/wall/indestructible{
-	icon_state = "rock";
-	name = "rock"
-	},
+/turf/simulated/wall/indestructible/rock,
 /area/awaymission/UO45/caves)
 "ac" = (
 /turf/simulated/mineral/random/labormineral,
@@ -227,11 +224,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO45/central_hall)
-"aP" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
-/turf/simulated/floor/plating,
-/area/awaymission/UO45/central_hall)
 "aQ" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plasteel{
@@ -1667,8 +1659,7 @@
 	},
 /area/awaymission/UO45/central_hall)
 "el" = (
-/obj/structure/grille,
-/obj/structure/window/full/basic,
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/central_hall)
 "em" = (
@@ -1868,7 +1859,7 @@
 /area/awaymission/UO45/central_hall)
 "eK" = (
 /obj/structure/alien/weeds,
-/obj/structure/alien/resin/wall,
+/obj/structure/alien/resin,
 /turf/simulated/floor/plating/asteroid/airless,
 /area/awaymission/UO45/caves)
 "eL" = (
@@ -2598,7 +2589,6 @@
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/central_hall)
 "gs" = (
-/obj/structure/grille,
 /obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/crew_quarters)
@@ -2643,11 +2633,6 @@
 	tag = "icon-floorgrime (WEST)"
 	},
 /area/awaymission/UO45/crew_quarters)
-"gC" = (
-/obj/structure/alien/resin/wall,
-/obj/structure/alien/weeds,
-/turf/simulated/floor/plating/asteroid/airless,
-/area/awaymission/UO45/caves)
 "gD" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
@@ -2807,7 +2792,6 @@
 	},
 /area/awaymission/UO45/gateaway)
 "gV" = (
-/obj/structure/grille,
 /obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/gateaway)
@@ -3147,7 +3131,6 @@
 	},
 /area/awaymission/UO45/research)
 "hH" = (
-/obj/structure/grille,
 /obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/research)
@@ -3279,12 +3262,11 @@
 	},
 /area/awaymission/UO45/crew_quarters)
 "hV" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4;
 	level = 2
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/crew_quarters)
 "hW" = (
@@ -3301,9 +3283,8 @@
 	},
 /area/awaymission/UO45/crew_quarters)
 "hX" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/central_hall)
 "hY" = (
@@ -3388,7 +3369,8 @@
 "ih" = (
 /obj/machinery/computer/rdconsole/core{
 	id = 3;
-	req_access = null
+	req_access = null;
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO45/research)
@@ -3730,11 +3712,10 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO45/gateaway)
 "iS" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/gateaway)
 "iT" = (
@@ -3919,11 +3900,10 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO45/gateaway)
 "jl" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/gateaway)
 "jm" = (
@@ -4171,14 +4151,8 @@
 /turf/simulated/floor/plating/asteroid/airless,
 /area/awaymission/UO45/crew_quarters)
 "jN" = (
-/obj/structure/grille,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/window/full/basic,
-/turf/simulated/floor/plating,
-/area/awaymission/UO45/research)
-"jO" = (
-/obj/structure/grille,
-/obj/structure/window/full/basic,
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/research)
 "jP" = (
@@ -4370,7 +4344,6 @@
 	tag = ""
 	},
 /obj/machinery/door/airlock/command{
-	icon_state = "door_closed";
 	name = "Gateway Chamber";
 	req_access = list(201)
 	},
@@ -5090,7 +5063,6 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/command{
-	icon_state = "door_closed";
 	name = "Gateway Ready Room";
 	req_access = list(201)
 	},
@@ -5551,22 +5523,22 @@
 	},
 /area/awaymission/UO45/research)
 "mj" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id_tag = "UO45_rdprivacy";
-	name = "privacy shutters"
+	name = "privacy shutters";
+	dir = 1
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/research)
 "mk" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id_tag = "UO45_rdprivacy";
-	name = "privacy shutters"
+	name = "privacy shutters";
+	dir = 1
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/research)
 "ml" = (
@@ -6104,7 +6076,8 @@
 /area/awaymission/UO45/research)
 "no" = (
 /obj/machinery/computer/security{
-	network = list("UO45")
+	network = list("UO45");
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -6891,7 +6864,9 @@
 	},
 /area/awaymission/UO45/research)
 "oA" = (
-/obj/machinery/computer/aifixer,
+/obj/machinery/computer/aifixer{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "cafeteria";
@@ -7642,7 +7617,6 @@
 /turf/simulated/floor/plating/asteroid/airless,
 /area/awaymission/UO45/gateaway)
 "qc" = (
-/obj/structure/grille,
 /obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/engineering)
@@ -7653,25 +7627,23 @@
 	},
 /area/awaymission/UO45/research)
 "qe" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/meter{
 	id = "UO45_mair_out_meter";
 	layer = 3.3;
 	name = "Mixed Air Tank Out"
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/engineering)
 "qf" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/visible/cyan,
 /obj/machinery/meter{
 	id = "UO45_mair_in_meter";
 	layer = 3.3;
 	name = "Mixed Air Tank In"
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/engineering)
 "qg" = (
@@ -7727,13 +7699,12 @@
 	},
 /area/awaymission/UO45/research)
 "ql" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/structure/sign/securearea{
 	desc = "A warning sign which reads 'SERVER ROOM'.";
 	name = "SERVER ROOM";
 	pixel_y = 32
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/research)
 "qm" = (
@@ -7874,12 +7845,6 @@
 	},
 /turf/simulated/floor/plating/asteroid/airless,
 /area/awaymission/UO45/caves)
-"qC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/purple{
-	dir = 4
-	},
-/turf/simulated/floor/plating/asteroid/airless,
-/area/awaymission/UO45/engineering)
 "qD" = (
 /obj/structure/cable{
 	d2 = 4;
@@ -8235,9 +8200,8 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO45/crew_quarters)
 "rh" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/purple,
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/crew_quarters)
 "ri" = (
@@ -8422,7 +8386,9 @@
 	},
 /area/awaymission/UO45/research)
 "rz" = (
-/obj/machinery/computer/rdservercontrol,
+/obj/machinery/computer/rdservercontrol{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -8457,13 +8423,12 @@
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/research)
 "rC" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/structure/sign/securearea{
 	desc = "A warning sign which reads 'SERVER ROOM'.";
 	name = "SERVER ROOM";
 	pixel_y = -32
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/research)
 "rD" = (
@@ -8893,8 +8858,6 @@
 	},
 /area/awaymission/UO45/research)
 "si" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/door/poddoor/preopen{
 	id_tag = "UO45_Engineering";
 	name = "engineering security door"
@@ -8902,6 +8865,7 @@
 /obj/machinery/atmospherics/pipe/simple/visible/universal{
 	dir = 4
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/engineering)
 "sj" = (
@@ -8954,14 +8918,13 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO45/engineering)
 "sq" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 4
 	},
 /obj/machinery/meter{
 	layer = 3.3
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/engineering)
 "sr" = (
@@ -9253,7 +9216,8 @@
 	input_tag = "UO45_waste_in";
 	name = "Gas Mix Tank Control";
 	output_tag = "UO45_waste_out";
-	sensors = list("UO45_waste_sensor"="Tank")
+	sensors = list("UO45_waste_sensor"="Tank");
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/green{
 	dir = 6
@@ -9331,14 +9295,13 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO45/engineering)
 "td" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/meter{
 	layer = 3.3
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/green{
 	dir = 4
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/engineering)
 "te" = (
@@ -9546,7 +9509,8 @@
 /area/awaymission/UO45/engineering)
 "ty" = (
 /obj/machinery/computer/security{
-	network = list("UO45")
+	network = list("UO45");
+	dir = 1
 	},
 /obj/machinery/door_control{
 	desc = "A remote control-switch for the security privacy shutters.";
@@ -9605,8 +9569,6 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO45/engineering)
 "tE" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -9614,6 +9576,7 @@
 	id_tag = "UO45_Engineering";
 	name = "engineering security door"
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/engineering)
 "tF" = (
@@ -9954,7 +9917,8 @@
 	input_tag = "UO45_n2_in";
 	name = "Nitrogen Supply Control";
 	output_tag = "UO45_n2_out";
-	sensors = list("UO45_n2_sensor"="Tank")
+	sensors = list("UO45_n2_sensor"="Tank");
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/cyan,
 /turf/simulated/floor/plasteel{
@@ -9971,7 +9935,8 @@
 	input_tag = "UO45_o2_in";
 	name = "Oxygen Supply Control";
 	output_tag = "UO45_o2_out";
-	sensors = list("UO45_o2_sensor"="Tank")
+	sensors = list("UO45_o2_sensor"="Tank");
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
@@ -10041,7 +10006,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/computer/general_air_control{
 	name = "Tank Monitor";
-	sensors = list("UO45_n2_sensor"="Nitrogen","UO45_o2_sensor"="Oxygen","UO45_waste_sensor"="Gas Mix Tank")
+	sensors = list("UO45_n2_sensor"="Nitrogen","UO45_o2_sensor"="Oxygen","UO45_waste_sensor"="Gas Mix Tank");
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -10143,21 +10109,19 @@
 /turf/simulated/wall/r_wall,
 /area/awaymission/UO45/engineering)
 "uJ" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/meter{
 	layer = 3.3
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/green,
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/engineering)
 "uK" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/meter{
 	layer = 3.3
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/engineering)
 "uL" = (
@@ -10224,7 +10188,8 @@
 	frequency = 1443;
 	level = 3;
 	name = "Distribution and Waste Monitor";
-	sensors = list("UO45_mair_in_meter"="Mixed Air In","UO45_air_sensor"="Mixed Air Supply Tank","UO45_mair_out_meter"="Mixed Air Out","UO45_dloop_atm_meter"="Distribution Loop","UO45_wloop_atm_meter"="Waste Loop")
+	sensors = list("UO45_mair_in_meter"="Mixed Air In","UO45_air_sensor"="Mixed Air Supply Tank","UO45_mair_out_meter"="Mixed Air Out","UO45_dloop_atm_meter"="Distribution Loop","UO45_wloop_atm_meter"="Waste Loop");
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -10417,11 +10382,10 @@
 /turf/simulated/floor/plating/asteroid/airless,
 /area/awaymission/UO45/caves)
 "vn" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/crew_quarters)
 "vo" = (
@@ -10447,7 +10411,9 @@
 /area/awaymission/UO45/crew_quarters)
 "vr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/computer/atmos_alert,
+/obj/machinery/computer/atmos_alert{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "caution"
@@ -10578,7 +10544,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
-/obj/machinery/computer/station_alert,
+/obj/machinery/computer/station_alert{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
 	icon_state = "caution";
@@ -10864,8 +10832,6 @@
 /turf/simulated/floor/plating/asteroid/airless,
 /area/awaymission/UO45/caves)
 "wl" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -10874,16 +10840,16 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/engineering)
 "wm" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/engineering)
 "wn" = (
@@ -10972,7 +10938,6 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO45/mining)
 "wx" = (
-/obj/structure/grille,
 /obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/mining)
@@ -11341,14 +11306,17 @@
 	},
 /area/awaymission/UO45/engineering)
 "xf" = (
-/obj/machinery/computer/station_alert,
+/obj/machinery/computer/station_alert{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
 /area/awaymission/UO45/engineering)
 "xg" = (
 /obj/machinery/computer/monitor{
-	name = "primary power monitoring console"
+	name = "primary power monitoring console";
+	dir = 1
 	},
 /obj/structure/cable,
 /turf/simulated/floor/plasteel{
@@ -11380,7 +11348,9 @@
 /area/awaymission/UO45/mining)
 "xj" = (
 /obj/machinery/light/small,
-/obj/machinery/computer/atmos_alert,
+/obj/machinery/computer/atmos_alert{
+	dir = 1
+	},
 /obj/machinery/door_control{
 	desc = "A remote control-switch for the engineering security doors.";
 	id = "UO45_Engineering";
@@ -11479,11 +11449,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO45/mining)
-"xt" = (
-/obj/structure/grille,
-/obj/structure/window/full/basic,
-/turf/simulated/floor/plating,
-/area/awaymission/UO45/mining)
 "xu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
@@ -11550,11 +11515,10 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO45/mining)
 "xC" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/mining)
 "xD" = (
@@ -11661,7 +11625,9 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO45/mining)
 "xR" = (
-/obj/machinery/computer/mech_bay_power_console,
+/obj/machinery/computer/mech_bay_power_console{
+	dir = 1
+	},
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -11691,9 +11657,8 @@
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/mining)
 "xY" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,
 /area/awaymission/UO45/mining)
 "ye" = (
@@ -11857,7 +11822,7 @@
 /turf/simulated/floor/plating/asteroid/airless,
 /area/awaymission/UO45/caves)
 "yz" = (
-/obj/structure/alien/resin/membrane,
+/obj/structure/alien/resin,
 /turf/simulated/floor/plating/asteroid/airless,
 /area/awaymission/UO45/caves)
 "yA" = (
@@ -14471,7 +14436,7 @@ ac
 yf
 yr
 eK
-gC
+eK
 ac
 ac
 ac
@@ -15383,7 +15348,7 @@ fo
 fo
 fo
 eK
-gC
+eK
 ac
 ac
 ac
@@ -17713,7 +17678,7 @@ ii
 iz
 hb
 gY
-jO
+hH
 kk
 kP
 lH
@@ -19523,7 +19488,7 @@ ns
 mV
 mV
 kX
-jO
+hH
 qq
 qV
 rG
@@ -20095,10 +20060,10 @@ aC
 bt
 am
 dR
-aP
+el
 ex
 eM
-aP
+el
 ad
 fD
 aB
@@ -20229,8 +20194,8 @@ aC
 aE
 aL
 aB
-aP
-aP
+el
+el
 aB
 aC
 bw
@@ -20678,7 +20643,7 @@ aA
 am
 aF
 aH
-aP
+el
 aU
 aU
 bf
@@ -20828,7 +20793,7 @@ an
 an
 aH
 aH
-aP
+el
 aX
 bc
 bh
@@ -20978,7 +20943,7 @@ ar
 an
 aH
 aM
-aP
+el
 aW
 bb
 bh
@@ -21128,7 +21093,7 @@ aA
 ad
 aH
 aM
-aP
+el
 aZ
 bd
 bh
@@ -21152,7 +21117,7 @@ el
 fq
 fF
 aM
-aP
+el
 fo
 fo
 fo
@@ -21302,7 +21267,7 @@ aY
 fs
 fH
 fX
-aP
+el
 fo
 fo
 fo
@@ -21452,7 +21417,7 @@ eo
 eo
 fJ
 fZ
-aP
+el
 fo
 fo
 fo
@@ -21579,10 +21544,10 @@ aB
 aJ
 aN
 aB
-aP
-aP
-aP
-aP
+el
+el
+el
+el
 aB
 aC
 aB
@@ -21743,10 +21708,10 @@ aB
 aC
 aC
 aB
-aP
+el
 ea
 ep
-aP
+el
 dN
 fe
 ad
@@ -21893,10 +21858,10 @@ cn
 cu
 dd
 aB
-aP
+el
 dZ
 aH
-aP
+el
 eR
 fd
 ad
@@ -22199,7 +22164,7 @@ eq
 aH
 aH
 ff
-aP
+el
 fo
 fo
 fo
@@ -22349,7 +22314,7 @@ ec
 ec
 ec
 ff
-aP
+el
 fo
 fo
 he
@@ -22499,7 +22464,7 @@ aH
 aH
 eT
 ff
-aP
+el
 fo
 fo
 fo
@@ -22649,7 +22614,7 @@ ec
 ec
 ec
 fg
-aP
+el
 fo
 fo
 fo
@@ -22991,9 +22956,9 @@ wt
 vR
 vL
 vW
-xt
+wx
 xy
-xt
+wx
 xN
 xm
 vJ
@@ -23239,7 +23204,7 @@ ac
 fo
 fo
 fo
-aP
+el
 cR
 dg
 aC
@@ -23389,7 +23354,7 @@ ac
 ac
 he
 fo
-aP
+el
 cQ
 dh
 cp
@@ -24445,9 +24410,9 @@ ac
 ac
 ac
 ad
-aP
+el
 eJ
-aP
+el
 am
 fo
 fo
@@ -25522,7 +25487,7 @@ fo
 fo
 fo
 fo
-qC
+qA
 nj
 lo
 ri
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index 6ba015fb4ec..6afb9296bf6 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -78,7 +78,7 @@
 	name = "resin wall"
 	desc = "Thick resin solidified into a wall."
 	icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi'
-	icon_state = "wall0"	//same as resin, but consistency ho!
+	icon_state = "resin"	//same as resin, but consistency ho!
 	resintype = "wall"
 	canSmoothWith = list(/obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane)