diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index f6fe72e803c..4943c68eccc 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -171,11 +171,7 @@ /turf/closed/wall, /area/ruin/space/derelict/solar_control) "at" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/ruin/space/derelict/solar_control) "au" = ( @@ -190,11 +186,7 @@ /turf/open/floor/plating, /area/ruin/space/derelict/solar_control) "av" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -203,11 +195,7 @@ /turf/open/floor/plating, /area/ruin/space/derelict/solar_control) "aw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -264,16 +252,7 @@ /turf/open/floor/plating/airless, /area/template_noop) "aF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /obj/structure/window/reinforced, /turf/open/floor/plating, /area/ruin/space/derelict/solar_control) @@ -437,13 +416,7 @@ /turf/open/floor/plasteel, /area/ruin/space/derelict/solar_control) "bc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/ruin/space/derelict/solar_control) "bd" = ( @@ -1008,22 +981,11 @@ /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) "cT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/ruin/space/derelict/bridge/access) "cU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/ruin/space/derelict/bridge/access) "cV" = ( @@ -1056,22 +1018,11 @@ /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) "cY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, /turf/open/floor/plating/airless, /area/ruin/space/derelict/gravity_generator) "cZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating/airless, /area/ruin/space/derelict/gravity_generator) "da" = ( @@ -1082,20 +1033,11 @@ /turf/open/floor/plasteel, /area/ruin/space/derelict/gravity_generator) "db" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, /turf/open/floor/plating/airless, /area/ruin/space/derelict/gravity_generator) "dc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, /turf/open/floor/plating/airless, /area/ruin/space/derelict/gravity_generator) "dd" = ( @@ -1546,23 +1488,15 @@ /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "ev" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "ew" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "ex" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 @@ -1729,13 +1663,7 @@ /turf/template_noop, /area/template_noop) "eW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "eX" = ( @@ -1769,20 +1697,11 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "fc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "fd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "fe" = ( @@ -1864,10 +1783,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/bridge) "fq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/west, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "fr" = ( @@ -1891,10 +1807,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "ft" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "fu" = ( @@ -1977,11 +1890,7 @@ }, /area/ruin/space/derelict/singularity_engine) "fI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, @@ -2050,11 +1959,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/bridge/access) "fS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating/airless, /area/ruin/space/derelict/bridge/access) "fT" = ( @@ -2223,13 +2128,7 @@ }, /area/ruin/space/derelict/singularity_engine) "gt" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, /obj/item/weapon/shard{ icon_state = "medium" }, @@ -2247,16 +2146,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "gw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "gx" = ( @@ -2304,13 +2194,7 @@ }, /area/ruin/unpowered/no_grav) "gE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "gF" = ( @@ -2384,14 +2268,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "gT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "gU" = ( @@ -2415,11 +2292,7 @@ /turf/closed/wall, /area/ruin/space/derelict/singularity_engine) "gZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "ha" = ( @@ -2531,18 +2404,11 @@ /turf/closed/wall, /area/ruin/space/derelict/medical) "hw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating/airless, /area/ruin/space/derelict/medical) "hx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, /turf/open/floor/plating/airless, /area/ruin/space/derelict/medical) "hy" = ( @@ -2825,11 +2691,7 @@ /turf/template_noop, /area/template_noop) "iu" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/corner, /turf/template_noop, /area/template_noop) "iv" = ( @@ -3263,22 +3125,11 @@ /turf/open/floor/plasteel, /area/ruin/space/derelict/arrival) "jJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/ruin/space/derelict/arrival) "jK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/ruin/space/derelict/arrival) "jL" = ( @@ -3693,33 +3544,15 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/primary) "kO" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "kP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "kQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "kR" = ( @@ -3943,14 +3776,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/unpowered/no_grav) "lD" = ( -/obj/structure/grille, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "lE" = ( @@ -4028,13 +3854,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/unpowered/no_grav) "lR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "lS" = ( @@ -4071,14 +3891,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/atmospherics) "lX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "lY" = ( @@ -4253,13 +4066,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/secondary) "mD" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) "mE" = ( @@ -4371,16 +4178,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/secondary) "mY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) "mZ" = ( @@ -4572,27 +4370,15 @@ /turf/template_noop, /area/ruin/space/derelict/hallway/secondary) "ny" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) "nz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) "nA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) "nB" = ( @@ -4635,10 +4421,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/secondary) "nH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) "nI" = ( @@ -4679,11 +4462,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/se_solar) "nM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating/airless, /area/ruin/space/derelict/se_solar) "nN" = ( diff --git a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm index e48f086afe5..1947b23ce62 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm @@ -36,25 +36,11 @@ /turf/open/floor/plating/airless, /area/ruin/space/abandoned_tele) "j" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating/airless, /area/ruin/space/abandoned_tele) "k" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating/airless, /area/ruin/space/abandoned_tele) "l" = ( @@ -92,14 +78,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/abandoned_tele) "t" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating/airless, /area/ruin/space/abandoned_tele) "u" = ( diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index ecc3332dde4..341f192fa50 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -17,16 +17,7 @@ /turf/closed/wall/mineral/titanium/overspace, /area/awaymission/BMPship/Aft) "af" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/engine, /area/awaymission/BMPship/Aft) "ag" = ( @@ -47,13 +38,7 @@ /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "aj" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/engine, /area/awaymission/BMPship/Aft) "ak" = ( @@ -69,13 +54,7 @@ /area/template_noop) "an" = ( /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/engine, /area/awaymission/BMPship/Aft) "ao" = ( @@ -245,16 +224,7 @@ /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "aQ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Fore) "aR" = ( @@ -380,13 +350,7 @@ /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "bl" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Fore) "bm" = ( @@ -430,13 +394,7 @@ /area/awaymission/BMPship/Aft) "bt" = ( /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Fore) "bu" = ( @@ -1207,16 +1165,7 @@ /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) "dG" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating, /area/awaymission/BMPship/Fore) "dH" = ( @@ -1423,13 +1372,7 @@ /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) "ed" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/awaymission/BMPship/Fore) "ee" = ( @@ -1649,11 +1592,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/corner, /turf/open/floor/plating, /area/awaymission/BMPship/Fore) "eI" = ( @@ -2176,16 +2115,7 @@ /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) "gk" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Fore) "gl" = ( @@ -2317,10 +2247,7 @@ /turf/open/floor/plating/asteroid/airless, /area/awaymission/BMPship) "gF" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east, /obj/item/weapon/shard{ icon_state = "small" }, @@ -2381,11 +2308,7 @@ /turf/open/floor/plating/asteroid/airless, /area/awaymission/BMPship) "gR" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/corner, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Fore) "gS" = ( @@ -2525,16 +2448,7 @@ /turf/open/floor/plating/asteroid/airless, /area/awaymission/BMPship) "ho" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/engine, /area/awaymission/BMPship/Aft) "hp" = ( @@ -2561,14 +2475,7 @@ /turf/closed/wall/mineral/titanium/interior, /area/awaymission/BMPship/Aft) "hu" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/engine, /area/awaymission/BMPship/Aft) "hv" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm index 80a6af4f0d7..78be8b491a8 100644 --- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm @@ -452,40 +452,19 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "bA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating/airless, /area/tcommsat/chamber) "bB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, /turf/open/floor/plating/airless, /area/tcommsat/chamber) "bC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating/airless, /area/tcommsat/chamber) "bD" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating/airless, /area/tcommsat/chamber) "bE" = ( @@ -534,32 +513,15 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "bK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, /turf/open/floor/plating, /area/tcommsat/chamber) "bL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/tcommsat/chamber) "bM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/tcommsat/chamber) "bN" = ( @@ -579,13 +541,7 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "bP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/tcommsat/chamber) "bQ" = ( @@ -598,13 +554,7 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "bS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /obj/structure/window/reinforced, /turf/open/floor/plating, /area/tcommsat/chamber) @@ -660,16 +610,7 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "cc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating, /area/tcommsat/chamber) "cd" = ( @@ -692,11 +633,7 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "ch" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, /turf/open/floor/plating, /area/tcommsat/chamber) "ci" = ( @@ -818,25 +755,11 @@ /turf/template_noop, /area/template_noop) "cA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating/airless, /area/tcommsat/chamber) "cB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/tcommsat/chamber) "cC" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index ee965a36cd6..a5c81740fd7 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -53,39 +53,21 @@ /turf/closed/wall/rust, /area/ruin/space/has_grav/ancientstation/comm) "al" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /obj/machinery/door/poddoor{ id = "ancient" }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/comm) "am" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /obj/machinery/door/poddoor{ id = "ancient" }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/comm) "an" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /obj/machinery/door/poddoor{ id = "ancient" }, @@ -501,25 +483,11 @@ /turf/closed/wall/rust, /area/ruin/space/has_grav/ancientstation/comm) "bz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/comm) "bA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/comm) "bB" = ( @@ -559,31 +527,11 @@ /turf/closed/wall/rust, /area/ruin/space/has_grav/ancientstation/betanorth) "bK" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/betanorth) "bL" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) "bM" = ( @@ -662,17 +610,7 @@ /turf/closed/wall/rust, /area/ruin/space/has_grav/ancientstation) "bY" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) "bZ" = ( @@ -962,14 +900,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) "cK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating/airless, /area/template_noop) "cL" = ( @@ -1015,33 +946,15 @@ /turf/closed/wall/rust, /area/ruin/space/has_grav/ancientstation/hydroponics) "cR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hydroponics) "cS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hydroponics) "cT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hydroponics) "cU" = ( @@ -1327,17 +1240,7 @@ }, /area/template_noop) "dE" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/template_noop) "dF" = ( @@ -1420,17 +1323,7 @@ }, /area/ruin/space/has_grav/ancientstation/engi) "dP" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hydroponics) "dQ" = ( @@ -1901,16 +1794,7 @@ /turf/open/floor/plating/airless, /area/template_noop) "fb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "fc" = ( @@ -2090,44 +1974,19 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) "fA" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating/airless, /area/template_noop) "fB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "fC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "fD" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "fE" = ( @@ -2508,17 +2367,7 @@ /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/engi) "gn" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -2704,17 +2553,7 @@ /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation) "gA" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -2775,17 +2614,7 @@ }, /area/ruin/space/has_grav/ancientstation/sec) "gE" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -2811,17 +2640,7 @@ /turf/open/floor/plating/airless, /area/space) "gG" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -2986,13 +2805,7 @@ /turf/open/floor/plasteel/airless/floorgrime, /area/template_noop) "gV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "gW" = ( @@ -3056,35 +2869,17 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) "hf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/rnd) "hg" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/rnd) "hh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/rnd) @@ -3098,14 +2893,7 @@ /turf/open/floor/plating/airless, /area/template_noop) "hk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "hl" = ( @@ -3390,17 +3178,7 @@ }, /area/ruin/space/has_grav/ancientstation/engi) "hR" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/kitchen) "hS" = ( @@ -3961,33 +3739,15 @@ /turf/closed/wall/rust, /area/ruin/space/has_grav/ancientstation/engi) "iY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/kitchen) "iZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/kitchen) "ja" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/kitchen) "jb" = ( @@ -4312,25 +4072,11 @@ /turf/open/floor/plating/airless, /area/template_noop) "jS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) "jT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) "jU" = ( @@ -4484,16 +4230,7 @@ /turf/open/floor/engine/airless, /area/ruin/space/has_grav/ancientstation/atmo) "ko" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating/airless, /area/template_noop) "kp" = ( @@ -4595,13 +4332,7 @@ /turf/open/floor/engine/airless, /area/ruin/space/has_grav/ancientstation/atmo) "kB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating/airless, /area/template_noop) "kC" = ( @@ -4843,14 +4574,7 @@ /turf/open/floor/engine/air, /area/ruin/space/has_grav/ancientstation/atmo) "lf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating/airless, /area/template_noop) "lg" = ( @@ -4862,25 +4586,11 @@ /turf/closed/mineral/plasma, /area/ruin/unpowered) "li" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/proto) "lj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/proto) "lk" = ( diff --git a/_maps/RandomZLevels/centcomAway.dmm b/_maps/RandomZLevels/centcomAway.dmm index ea3d101368b..ef5ebc7ddb8 100644 --- a/_maps/RandomZLevels/centcomAway.dmm +++ b/_maps/RandomZLevels/centcomAway.dmm @@ -9,33 +9,15 @@ /turf/closed/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 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "ae" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/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 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "ag" = ( @@ -119,16 +101,7 @@ }, /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 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "au" = ( @@ -163,13 +136,7 @@ }, /area/awaymission/centcomAway/cafe) "aB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "aC" = ( @@ -210,17 +177,7 @@ /turf/open/floor/plasteel/redyellow, /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{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "aL" = ( @@ -266,33 +223,15 @@ }, /area/awaymission/centcomAway/maint) "aS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/closed/wall/r_wall, /area/awaymission/centcomAway/maint) "aT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/closed/wall/r_wall, /area/awaymission/centcomAway/maint) "aU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/closed/wall/r_wall, /area/awaymission/centcomAway/maint) "aV" = ( @@ -326,14 +265,7 @@ }, /area/awaymission/centcomAway/cafe) "ba" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "bb" = ( @@ -656,17 +588,7 @@ }, /area/awaymission/centcomAway/general) "ce" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) @@ -687,16 +609,7 @@ /turf/open/floor/plasteel/hydrofloor, /area/awaymission/centcomAway/cafe) "ci" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating, /area/awaymission/centcomAway/maint) "cj" = ( @@ -746,13 +659,7 @@ /turf/open/floor/plasteel/hydrofloor, /area/awaymission/centcomAway/cafe) "cu" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/awaymission/centcomAway/maint) "cv" = ( @@ -913,14 +820,7 @@ }, /area/awaymission/centcomAway/general) "cZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating, /area/awaymission/centcomAway/maint) "da" = ( @@ -1062,14 +962,7 @@ /turf/open/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "dA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /obj/structure/window/reinforced{ dir = 1 }, @@ -1174,33 +1067,15 @@ }, /area/awaymission/centcomAway/hangar) "dS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "dT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "dU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "dV" = ( @@ -1281,17 +1156,7 @@ }, /area/awaymission/centcomAway/cafe) "ei" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "ej" = ( @@ -1374,10 +1239,7 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/maint) "ey" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east, /turf/open/floor/plating, /area/awaymission/centcomAway/maint) "ez" = ( @@ -1500,17 +1362,7 @@ /turf/open/floor/carpet, /area/awaymission/centcomAway/courtroom) "eV" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "eW" = ( @@ -1596,33 +1448,15 @@ /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/courtroom) "fn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "fo" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "fp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "fq" = ( @@ -1642,44 +1476,19 @@ /turf/closed/wall/r_wall, /area/awaymission/centcomAway/general) "fu" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "fv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "fw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "fx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "fy" = ( @@ -1870,53 +1679,26 @@ }, /area/awaymission/centcomAway/general) "gd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "ge" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "gf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /obj/structure/window/reinforced{ dir = 8 }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "gg" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "gh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "gi" = ( @@ -1970,14 +1752,7 @@ }, /area/awaymission/centcomAway/general) "gr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "gs" = ( @@ -2094,16 +1869,7 @@ /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/general) "gM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "gN" = ( @@ -2163,13 +1929,7 @@ }, /area/awaymission/centcomAway/general) "gX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "gY" = ( @@ -2208,17 +1968,7 @@ /turf/open/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "he" = ( -/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/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "hf" = ( @@ -2284,25 +2034,11 @@ }, /area/awaymission/centcomAway/general) "hq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/closed/wall/r_wall, /area/awaymission/centcomAway/courtroom) "hr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/awaymission/centcomAway/courtroom) "hs" = ( @@ -2310,30 +2046,11 @@ /turf/open/floor/carpet, /area/awaymission/centcomAway/courtroom) "ht" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating, /area/awaymission/centcomAway/courtroom) "hu" = ( -/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/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "hv" = ( @@ -2401,13 +2118,7 @@ /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/courtroom) "hF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/awaymission/centcomAway/courtroom) "hG" = ( @@ -2537,14 +2248,7 @@ /turf/open/floor/wood, /area/awaymission/centcomAway/courtroom) "id" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating, /area/awaymission/centcomAway/courtroom) "ie" = ( @@ -2636,36 +2340,15 @@ }, /area/awaymission/centcomAway/general) "iv" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/space) "iw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/closed/wall/r_wall, /area/awaymission/centcomAway/courtroom) "ix" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/closed/wall/r_wall, /area/awaymission/centcomAway/courtroom) "iy" = ( @@ -2695,14 +2378,7 @@ }, /area/awaymission/centcomAway/hangar) "iC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "iD" = ( @@ -3051,49 +2727,25 @@ }, /area/awaymission/centcomAway/general) "jH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plasteel{ name = "plating" }, /area/awaymission/centcomAway/general) "jI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plasteel{ name = "plating" }, /area/awaymission/centcomAway/general) "jJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plasteel{ name = "plating" }, /area/awaymission/centcomAway/general) "jK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /obj/structure/window/reinforced, /turf/open/floor/plating, /area/awaymission/centcomAway/general) @@ -3153,14 +2805,7 @@ /turf/open/floor/plasteel, /area/awaymission/centcomAway/general) "jT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "jU" = ( @@ -3209,14 +2854,7 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "kb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "kc" = ( @@ -3273,42 +2911,16 @@ }, /area/awaymission/centcomAway/general) "kk" = ( -/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/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "kl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /obj/structure/window/reinforced, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "km" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "kn" = ( @@ -3361,11 +2973,7 @@ }, /area/awaymission/centcomAway/general) "kv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, /obj/structure/window/reinforced{ dir = 4 }, @@ -3476,16 +3084,7 @@ }, /area/awaymission/centcomAway/general) "kM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "kN" = ( @@ -3583,17 +3182,7 @@ }, /area/awaymission/centcomAway/thunderdome) "lf" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, /area/awaymission/centcomAway/thunderdome) "lg" = ( @@ -3698,33 +3287,15 @@ /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/thunderdome) "lw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating, /area/awaymission/centcomAway/thunderdome) "lx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/awaymission/centcomAway/thunderdome) "ly" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/awaymission/centcomAway/thunderdome) "lz" = ( diff --git a/_maps/RandomZLevels/challenge.dmm b/_maps/RandomZLevels/challenge.dmm index 8ab66089fa5..8c6f3060d31 100644 --- a/_maps/RandomZLevels/challenge.dmm +++ b/_maps/RandomZLevels/challenge.dmm @@ -248,25 +248,11 @@ /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "aY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/west, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "aZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "ba" = ( @@ -470,11 +456,7 @@ /turf/open/floor/plasteel, /area/awaymission/challenge/main) "bA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "bB" = ( @@ -892,41 +874,19 @@ /turf/open/space, /area/space) "cM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, /turf/open/floor/plating, /area/awaymission/challenge/end) "cN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/awaymission/challenge/end) "cO" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, /turf/open/floor/plating, /area/awaymission/challenge/end) "cP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/awaymission/challenge/end) "cQ" = ( @@ -1034,14 +994,7 @@ /turf/open/space, /area/space) "de" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating, /area/awaymission/challenge/end) "df" = ( @@ -1091,16 +1044,7 @@ /turf/open/floor/plasteel/black, /area/awaymission/challenge/end) "dl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating, /area/awaymission/challenge/end) "dm" = ( diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index f5fdd3d4965..9f145fe3313 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -857,16 +857,7 @@ /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "cY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "cZ" = ( @@ -889,13 +880,7 @@ /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/cruiser) "dd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /obj/structure/window/reinforced, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) @@ -1045,38 +1030,19 @@ /turf/open/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "dE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "dF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "dG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "dH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "dI" = ( @@ -1171,13 +1137,7 @@ /turf/open/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "dY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "dZ" = ( @@ -1198,13 +1158,7 @@ }, /area/awaymission/spacebattle/cruiser) "eb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "ec" = ( @@ -1260,14 +1214,7 @@ /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "ek" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "el" = ( @@ -1380,16 +1327,7 @@ /turf/open/floor/plasteel/blue, /area/awaymission/spacebattle/cruiser) "eF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "eG" = ( @@ -1443,13 +1381,7 @@ /turf/open/floor/plasteel/blue, /area/awaymission/spacebattle/cruiser) "eQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "eR" = ( @@ -2129,14 +2061,7 @@ }, /area/awaymission/spacebattle/cruiser) "ha" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "hb" = ( @@ -2179,16 +2104,7 @@ /turf/open/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "hi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/plating, /area/awaymission/spacebattle/syndicate7) "hj" = ( @@ -2247,13 +2163,7 @@ /turf/closed/wall/r_wall, /area/awaymission/spacebattle/cruiser) "hu" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/awaymission/spacebattle/syndicate7) "hv" = ( @@ -3050,16 +2960,7 @@ /turf/open/floor/plasteel/white, /area/awaymission/spacebattle/cruiser) "ki" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kj" = ( @@ -3088,16 +2989,7 @@ /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "ko" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kp" = ( @@ -3114,13 +3006,7 @@ /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "ks" = ( @@ -3141,24 +3027,15 @@ /turf/open/floor/plasteel/white, /area/awaymission/spacebattle/cruiser) "kv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "ky" = ( @@ -3166,11 +3043,7 @@ /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kA" = ( diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm index 243f74b6d2d..ae0777260bf 100644 --- a/_maps/RandomZLevels/wildwest.dmm +++ b/_maps/RandomZLevels/wildwest.dmm @@ -449,10 +449,7 @@ /obj/structure/window/reinforced{ icon_state = "fwindow" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/west, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" }, @@ -554,10 +551,7 @@ icon_state = "fwindow"; dir = 8 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" }, @@ -878,10 +872,7 @@ icon_state = "fwindow"; dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" }, @@ -1707,8 +1698,7 @@ icon_state = "fwindow"; dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side, /turf/open/floor/plasteel, /area/awaymission/wwrefine) "fB" = ( @@ -2167,16 +2157,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/awaymission/wwrefine) "gX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /obj/structure/window/reinforced{ icon_state = "fwindow" }, diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm index e246c836a9b..514d38bd019 100644 --- a/_maps/map_files/Cerestation/cerestation.dmm +++ b/_maps/map_files/Cerestation/cerestation.dmm @@ -20558,7 +20558,6 @@ }, /area/hallway/primary/fore) "aOc" = ( -/obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, @@ -20567,14 +20566,10 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/cargo_ai) "aOd" = ( -/obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -20583,10 +20578,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/cargo_ai) "aOe" = ( @@ -23143,25 +23135,17 @@ }, /area/hallway/primary/fore) "aSh" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/cargo_ai) "aSi" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/cargo_ai) "aSj" = ( @@ -25324,29 +25308,17 @@ /turf/open/space, /area/space) "aWc" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, /obj/structure/girder, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/com_serv) "aWd" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/com_serv) "aWe" = ( @@ -25383,22 +25355,13 @@ /turf/open/floor/plasteel/black, /area/ai_monitored/nuke_storage) "aWi" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/com_engi) "aWj" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -25407,10 +25370,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/com_engi) "aWk" = ( @@ -25499,19 +25459,13 @@ /turf/open/floor/plating/airless, /area/space) "aWs" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/structure/girder, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/com_serv) "aWt" = ( @@ -25542,30 +25496,18 @@ /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "aWx" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/com_engi) "aWy" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/com_engi) "aWz" = ( @@ -25854,9 +25796,6 @@ /turf/open/space, /area/space) "aWX" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -25865,37 +25804,22 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/med_cargo) "aWY" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/girder, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/med_cargo) "aWZ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/med_cargo) "aXa" = ( @@ -26381,19 +26305,13 @@ /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/port/west) "aYk" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, /obj/structure/girder, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/com_serv) "aYl" = ( @@ -26444,22 +26362,13 @@ }, /area/crew_quarters/rehab_dome) "aYr" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/com_engi) "aYs" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -26468,10 +26377,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/com_engi) "aYt" = ( @@ -26647,9 +26553,6 @@ /turf/open/space, /area/space) "aYQ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, @@ -26658,10 +26561,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/med_cargo) "aYR" = ( @@ -34805,7 +34705,6 @@ }, /area/maintenance/asteroid/port/neast) "bnM" = ( -/obj/structure/window/reinforced, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -34814,14 +34713,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/serv_engi) "bnN" = ( -/obj/structure/window/reinforced, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -34830,14 +34725,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/serv_engi) "bnO" = ( -/obj/structure/window/reinforced, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -34846,10 +34737,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/serv_engi) "bnP" = ( @@ -34910,7 +34798,6 @@ }, /area/hallway/primary/central) "bnV" = ( -/obj/structure/window/reinforced, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -34923,14 +34810,10 @@ dir = 1; icon_state = "pipe-c" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/engi_med) "bnW" = ( -/obj/structure/window/reinforced, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -34942,14 +34825,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/engi_med) "bnX" = ( -/obj/structure/window/reinforced, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -34962,10 +34841,7 @@ dir = 8; icon_state = "pipe-c" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/engi_med) "bnY" = ( @@ -38011,14 +37887,10 @@ /turf/closed/wall/r_wall, /area/hallway/secondary/bridges/serv_engi) "btm" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/serv_engi) "btn" = ( @@ -38310,9 +38182,6 @@ }, /area/maintenance/asteroid/central) "btL" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, @@ -38320,28 +38189,20 @@ dir = 4; icon_state = "pipe-c" }, -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/engi_med) "btM" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/engi_med) "btN" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, @@ -38349,8 +38210,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/engi_med) "btO" = ( @@ -53062,9 +52922,6 @@ }, /area/maintenance/asteroid/central) "bVb" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, @@ -53072,16 +52929,10 @@ dir = 2; icon_state = "pipe-c" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/dock_med) "bVc" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, @@ -53091,10 +52942,7 @@ icon_state = "2-4" }, /obj/structure/girder, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/dock_med) "bVd" = ( @@ -53400,21 +53248,12 @@ }, /area/engine/atmos) "bVD" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/dock_med) "bVE" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ d1 = 1; @@ -53422,10 +53261,7 @@ icon_state = "1-2" }, /obj/structure/girder, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/dock_med) "bVF" = ( @@ -56398,16 +56234,10 @@ name = "Civilian Asteroid" }) "cbZ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -56431,9 +56261,6 @@ }, /area/hallway/secondary/bridges/serv_sci) "ccc" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, @@ -56442,10 +56269,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -56477,9 +56301,6 @@ /turf/open/space, /area/space) "ccf" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, @@ -56487,16 +56308,10 @@ dir = 8; icon_state = "pipe-c" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/dock_med) "ccg" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -56506,10 +56321,7 @@ dir = 5 }, /obj/structure/girder, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/dock_med) "cch" = ( @@ -56557,32 +56369,20 @@ name = "Top Secret Clown HQ" }) "ccl" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/hallway/secondary/bridges/serv_sci) "ccm" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -57703,24 +57503,15 @@ name = "Research Asteroid" }) "cew" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/hallway/secondary/bridges/serv_sci) "cex" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, @@ -57729,10 +57520,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -61655,11 +61443,7 @@ }, /area/teleporter/quantum/research) "cme" = ( -/obj/structure/window/reinforced, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/sci_dock) "cmf" = ( @@ -63709,12 +63493,8 @@ }, /area/maintenance/asteroid/aft/science) "cpC" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/girder, -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/sci_dock) "cpD" = ( @@ -81177,14 +80957,10 @@ }, /area/hallway/secondary/bridges/serv_engi) "cWS" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/serv_engi) "cWT" = ( @@ -81445,30 +81221,18 @@ /turf/open/floor/plating, /area/hallway/secondary/bridges/cargo_ai) "cXv" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/cargo_ai) "cXw" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /turf/open/floor/plating, /area/hallway/secondary/bridges/cargo_ai) "cXx" = ( @@ -81527,14 +81291,10 @@ /turf/closed/wall/r_wall, /area/hallway/secondary/bridges/cargo_ai) "cXE" = ( -/obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/cargo_ai) "cXF" = ( @@ -81544,14 +81304,10 @@ /turf/closed/wall/r_wall, /area/hallway/secondary/bridges/cargo_ai) "cXG" = ( -/obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/cargo_ai) "cXH" = ( @@ -81647,14 +81403,10 @@ /turf/closed/wall/r_wall, /area/hallway/secondary/bridges/cargo_ai) "cXS" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/hallway/secondary/bridges/cargo_ai) "cXT" = ( @@ -94321,13 +94073,7 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "dzg" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index e66c630d63a..b856122eb22 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -83535,16 +83535,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/north, /obj/structure/cable/white{ d2 = 4; icon_state = "0-4" @@ -83573,13 +83564,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, /obj/structure/cable/white{ d1 = 4; d2 = 8; @@ -83596,10 +83581,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dfJ" = ( @@ -83612,13 +83594,7 @@ icon_state = "0-8" }, /obj/structure/cable/white, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dfK" = ( @@ -84131,10 +84107,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/west, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dgT" = ( @@ -84155,10 +84128,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dgW" = ( @@ -86740,11 +86710,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/corner, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dma" = ( @@ -87945,11 +87911,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "doH" = ( @@ -87961,8 +87923,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced, +/obj/effect/spawner/structure/window/hollow/reinforced/one_side, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "doI" = ( @@ -87971,14 +87932,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/end/east, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "doJ" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 682a951d60a..6654f9628de 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -11137,17 +11137,7 @@ /turf/open/floor/plasteel/white, /area/tdome/tdomeobserve) "CL" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plasteel, /area/centcom/holding) "CM" = ( @@ -11155,17 +11145,7 @@ /turf/open/floor/plasteel, /area/centcom/holding) "CN" = ( -/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/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plasteel, /area/centcom/holding) "CO" = ( diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm index 89ed34f8ec9..94c301991c1 100644 --- a/code/game/objects/effects/spawners/structure.dm +++ b/code/game/objects/effects/spawners/structure.dm @@ -15,33 +15,295 @@ again. new I(get_turf(src)) qdel(src) + +//normal windows + /obj/effect/spawner/structure/window - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/structures_spawners.dmi' icon_state = "window_spawner" name = "window spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/fulltile) +/obj/effect/spawner/structure/window/hollow + name = "hollow window spawner" + icon_state = "hwindow_spawner_full" + spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west) + +/obj/effect/spawner/structure/window/hollow/corner + icon_state = "hwindow_spawner_corner_se" + spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east) + +/obj/effect/spawner/structure/window/hollow/corner/northeast + icon_state = "hwindow_spawner_corner_ne" + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east) + +/obj/effect/spawner/structure/window/hollow/corner/northwest + icon_state = "hwindow_spawner_corner_nw" + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/west) + +/obj/effect/spawner/structure/window/hollow/corner/southwest + icon_state = "hwindow_spawner_corner_sw" + spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/west) + +/obj/effect/spawner/structure/window/hollow/end + icon_state = "hwindow_spawner_end_s" + spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west) + +/obj/effect/spawner/structure/window/hollow/end/north + icon_state = "hwindow_spawner_end_n" + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west) + +/obj/effect/spawner/structure/window/hollow/end/east + icon_state = "hwindow_spawner_end_e" + spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east) + +/obj/effect/spawner/structure/window/hollow/end/west + icon_state = "hwindow_spawner_end_w" + spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/west) + +/obj/effect/spawner/structure/window/hollow/middle + icon_state = "hwindow_spawner_ns" + spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north) + +/obj/effect/spawner/structure/window/hollow/middle/vertical + icon_state = "hwindow_spawner_ew" + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west) + +/obj/effect/spawner/structure/window/hollow/one_side + icon_state = "hwindow_spawner_single_s" + spawn_list = list(/obj/structure/grille, /obj/structure/window) + +/obj/effect/spawner/structure/window/hollow/one_side/north + icon_state = "hwindow_spawner_single_n" + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north) + +/obj/effect/spawner/structure/window/hollow/one_side/east + icon_state = "hwindow_spawner_single_e" + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/east) + +/obj/effect/spawner/structure/window/hollow/one_side/west + icon_state = "hwindow_spawner_single_w" + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/west) + + +//reinforced + /obj/effect/spawner/structure/window/reinforced name = "reinforced window spawner" icon_state = "rwindow_spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/fulltile) +/obj/effect/spawner/structure/window/hollow/reinforced + name = "hollow reinforced window spawner" + icon_state = "hrwindow_spawner_full" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west) + +/obj/effect/spawner/structure/window/hollow/reinforced/corner + icon_state = "hrwindow_spawner_corner_se" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east) + +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast + icon_state = "hrwindow_spawner_corner_ne" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east) + +/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest + icon_state = "hrwindow_spawner_corner_nw" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west) + +/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest + icon_state = "hrwindow_spawner_corner_sw" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/west) + +/obj/effect/spawner/structure/window/hollow/reinforced/end + icon_state = "hrwindow_spawner_end_s" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west) + +/obj/effect/spawner/structure/window/hollow/reinforced/end/north + icon_state = "hrwindow_spawner_end_n" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west) + +/obj/effect/spawner/structure/window/hollow/reinforced/end/east + icon_state = "hrwindow_spawner_end_e" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east) + +/obj/effect/spawner/structure/window/hollow/reinforced/end/west + icon_state = "hrwindow_spawner_end_w" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west) + +/obj/effect/spawner/structure/window/hollow/reinforced/middle + icon_state = "hrwindow_spawner_ns" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north) + +/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical + icon_state = "hrwindow_spawner_ew" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west) + +/obj/effect/spawner/structure/window/hollow/reinforced/one_side + icon_state = "hrwindow_spawner_single_s" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced) + +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north + icon_state = "hrwindow_spawner_single_n" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north) + +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east + icon_state = "hrwindow_spawner_single_e" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/east) + +/obj/effect/spawner/structure/window/hollow/reinforced/one_side/west + icon_state = "hrwindow_spawner_single_w" + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/west) + + +//tinted + /obj/effect/spawner/structure/window/reinforced/tinted name = "tinted reinforced window spawner" icon_state = "twindow_spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile) + +//shuttle window + /obj/effect/spawner/structure/window/shuttle name = "reinforced tinted window spawner" icon_state = "swindow_spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle) + +//plasma windows + /obj/effect/spawner/structure/window/plasma name = "plasma window spawner" icon_state = "pwindow_spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/fulltile) +/obj/effect/spawner/structure/window/hollow/plasma + name = "hollow plasma window spawner" + icon_state = "phwindow_spawner_full" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west) + +/obj/effect/spawner/structure/window/hollow/plasma/corner + icon_state = "phwindow_spawner_corner_se" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east) + +/obj/effect/spawner/structure/window/hollow/plasma/corner/northeast + icon_state = "phwindow_spawner_corner_ne" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east) + +/obj/effect/spawner/structure/window/hollow/plasma/corner/northwest + icon_state = "phwindow_spawner_corner_nw" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west) + +/obj/effect/spawner/structure/window/hollow/plasma/corner/southwest + icon_state = "phwindow_spawner_corner_sw" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/west) + +/obj/effect/spawner/structure/window/hollow/plasma/end + icon_state = "phwindow_spawner_end_s" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west) + +/obj/effect/spawner/structure/window/hollow/plasma/end/north + icon_state = "phwindow_spawner_end_n" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west) + +/obj/effect/spawner/structure/window/hollow/plasma/end/east + icon_state = "phwindow_spawner_end_e" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east) + +/obj/effect/spawner/structure/window/hollow/plasma/end/west + icon_state = "phwindow_spawner_end_w" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west) + +/obj/effect/spawner/structure/window/hollow/plasma/middle + icon_state = "phwindow_spawner_ns" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north) + +/obj/effect/spawner/structure/window/hollow/plasma/middle/vertical + icon_state = "phwindow_spawner_ew" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west) + +/obj/effect/spawner/structure/window/hollow/plasma/one_side + icon_state = "phwindow_spawner_single_s" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma) + +/obj/effect/spawner/structure/window/hollow/plasma/one_side/north + icon_state = "phwindow_spawner_single_n" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north) + +/obj/effect/spawner/structure/window/hollow/plasma/one_side/east + icon_state = "phwindow_spawner_single_e" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/east) + +/obj/effect/spawner/structure/window/hollow/plasma/one_side/west + icon_state = "phwindow_spawner_single_w" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/west) + + +//plasma reinforced + /obj/effect/spawner/structure/window/plasma/reinforced name = "reinforced plasma window spawner" icon_state = "prwindow_spawner" - spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/fulltile) \ No newline at end of file + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/fulltile) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced + 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) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/corner + icon_state = "phrwindow_spawner_corner_se" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/corner/northeast + icon_state = "phrwindow_spawner_corner_ne" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/corner/northwest + icon_state = "phrwindow_spawner_corner_nw" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/corner/southwest + icon_state = "phrwindow_spawner_corner_sw" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/west) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end + icon_state = "phrwindow_spawner_end_s" + 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) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/north + icon_state = "phrwindow_spawner_end_n" + 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) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/east + icon_state = "phrwindow_spawner_end_e" + 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/effect/spawner/structure/window/hollow/plasma/reinforced/end/west + icon_state = "phrwindow_spawner_end_w" + 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) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle + icon_state = "phrwindow_spawner_ns" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle/vertical + icon_state = "phrwindow_spawner_ew" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/one_side + icon_state = "phrwindow_spawner_single_s" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/one_side/north + icon_state = "phrwindow_spawner_single_n" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/one_side/east + icon_state = "phrwindow_spawner_single_e" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east) + +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/one_side/west + icon_state = "phrwindow_spawner_single_w" + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/west) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index df0d9450f4d..756402c3a90 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -408,6 +408,15 @@ /obj/structure/window/GetExplosionBlock() return reinf && fulltile ? real_explosion_block : 0 +/obj/structure/window/spawner/east + dir = EAST + +/obj/structure/window/spawner/west + dir = WEST + +/obj/structure/window/spawner/north + dir = NORTH + /obj/structure/window/unanchored anchored = FALSE @@ -422,6 +431,15 @@ explosion_block = 1 glass_type = /obj/item/stack/sheet/rglass +/obj/structure/window/reinforced/spawner/east + dir = EAST + +/obj/structure/window/reinforced/spawner/west + dir = WEST + +/obj/structure/window/reinforced/spawner/north + dir = NORTH + /obj/structure/window/reinforced/unanchored anchored = FALSE @@ -436,6 +454,15 @@ explosion_block = 1 glass_type = /obj/item/stack/sheet/plasmaglass +/obj/structure/window/plasma/spawner/east + dir = EAST + +/obj/structure/window/plasma/spawner/west + dir = WEST + +/obj/structure/window/plasma/spawner/north + dir = NORTH + /obj/structure/window/plasma/unanchored anchored = FALSE @@ -450,6 +477,15 @@ explosion_block = 2 glass_type = /obj/item/stack/sheet/plasmarglass +/obj/structure/window/plasma/reinforced/spawner/east + dir = EAST + +/obj/structure/window/plasma/reinforced/spawner/west + dir = WEST + +/obj/structure/window/plasma/reinforced/spawner/north + dir = NORTH + /obj/structure/window/plasma/reinforced/unanchored anchored = FALSE diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index 8888b23d532..95f117c53f5 100644 Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ diff --git a/icons/obj/structures_spawners.dmi b/icons/obj/structures_spawners.dmi new file mode 100644 index 00000000000..5d71b4fd446 Binary files /dev/null and b/icons/obj/structures_spawners.dmi differ