diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index f9144cd3ef..a083ac48f6 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -252,7 +252,9 @@ /turf/open/floor/plating/airless, /area/template_noop) "aF" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /obj/structure/window/reinforced, /turf/open/floor/plating, /area/ruin/space/derelict/solar_control) @@ -416,7 +418,9 @@ /turf/open/floor/plasteel, /area/ruin/space/derelict/solar_control) "bc" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating, /area/ruin/space/derelict/solar_control) "bd" = ( @@ -985,7 +989,9 @@ /turf/open/floor/plating, /area/ruin/space/derelict/bridge/access) "cU" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/ruin/space/derelict/bridge/access) "cV" = ( @@ -1018,11 +1024,15 @@ /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) "cY" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 10 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/gravity_generator) "cZ" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/gravity_generator) "da" = ( @@ -1033,11 +1043,15 @@ /turf/open/floor/plasteel, /area/ruin/space/derelict/gravity_generator) "db" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/gravity_generator) "dc" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 5 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/gravity_generator) "dd" = ( @@ -1488,15 +1502,19 @@ /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "ev" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side, +/obj/effect/spawner/structure/window/hollow/reinforced/directional, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "ew" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 6 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "ex" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 @@ -1663,7 +1681,9 @@ /turf/template_noop, /area/template_noop) "eW" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 9 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "eX" = ( @@ -1697,11 +1717,15 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "fc" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "fd" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 5 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "fe" = ( @@ -1783,7 +1807,9 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/bridge) "fq" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/west, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 8 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "fr" = ( @@ -1807,7 +1833,9 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "ft" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "fu" = ( @@ -1890,7 +1918,9 @@ }, /area/ruin/space/derelict/singularity_engine) "fI" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 10 + }, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, @@ -2128,7 +2158,9 @@ }, /area/ruin/space/derelict/singularity_engine) "gt" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 9 + }, /obj/item/shard{ icon_state = "medium" }, @@ -2146,7 +2178,9 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "gw" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "gx" = ( @@ -2194,7 +2228,9 @@ }, /area/ruin/unpowered/no_grav) "gE" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "gF" = ( @@ -2292,7 +2328,9 @@ /turf/closed/wall, /area/ruin/space/derelict/singularity_engine) "gZ" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 10 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "ha" = ( @@ -2408,7 +2446,9 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/medical) "hx" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/medical) "hy" = ( @@ -2691,7 +2731,9 @@ /turf/template_noop, /area/template_noop) "iu" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 6 + }, /turf/template_noop, /area/template_noop) "iv" = ( @@ -3129,7 +3171,9 @@ /turf/open/floor/plating, /area/ruin/space/derelict/arrival) "jK" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/ruin/space/derelict/arrival) "jL" = ( @@ -3548,11 +3592,15 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "kP" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "kQ" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "kR" = ( @@ -3772,7 +3820,9 @@ /turf/open/floor/plasteel/airless, /area/ruin/unpowered/no_grav) "lD" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "lE" = ( @@ -3850,7 +3900,9 @@ /turf/open/floor/plasteel/airless, /area/ruin/unpowered/no_grav) "lR" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "lS" = ( @@ -4062,7 +4114,9 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/secondary) "mD" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) "mE" = ( @@ -4174,7 +4228,9 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/secondary) "mY" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) "mZ" = ( @@ -4366,7 +4422,7 @@ /turf/template_noop, /area/ruin/space/derelict/hallway/secondary) "ny" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side, +/obj/effect/spawner/structure/window/hollow/reinforced/directional, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) "nz" = ( @@ -4417,7 +4473,9 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/secondary) "nH" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) "nI" = ( diff --git a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm index 11dcb8561f..c08a68b6c7 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm @@ -36,11 +36,15 @@ /turf/open/floor/plating/airless, /area/ruin/space/abandoned_tele) "j" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating/airless, /area/ruin/space/abandoned_tele) "k" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/ruin/space/abandoned_tele) "l" = ( @@ -78,7 +82,9 @@ /turf/open/floor/plating/airless, /area/ruin/space/abandoned_tele) "t" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /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 f577ec5143..5016189876 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -17,7 +17,9 @@ /turf/closed/wall/mineral/titanium/overspace, /area/awaymission/BMPship/Aft) "af" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/engine, /area/awaymission/BMPship/Aft) "ag" = ( @@ -38,7 +40,9 @@ /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "aj" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/engine, /area/awaymission/BMPship/Aft) "ak" = ( @@ -54,7 +58,9 @@ /area/template_noop) "an" = ( /obj/structure/window/reinforced, -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/engine, /area/awaymission/BMPship/Aft) "ao" = ( @@ -224,7 +230,9 @@ /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "aQ" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Fore) "aR" = ( @@ -350,7 +358,9 @@ /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "bl" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Fore) "bm" = ( @@ -394,7 +404,9 @@ /area/awaymission/BMPship/Aft) "bt" = ( /obj/structure/window/reinforced, -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Fore) "bu" = ( @@ -1165,7 +1177,9 @@ /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) "dG" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating, /area/awaymission/BMPship/Fore) "dH" = ( @@ -1372,7 +1386,9 @@ /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) "ed" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/BMPship/Fore) "ee" = ( @@ -1592,7 +1608,9 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/spawner/structure/window/hollow/reinforced/corner, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 6 + }, /turf/open/floor/plating, /area/awaymission/BMPship/Fore) "eI" = ( @@ -2115,7 +2133,9 @@ /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) "gk" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Fore) "gl" = ( @@ -2247,7 +2267,9 @@ /turf/open/floor/plating/asteroid/airless, /area/awaymission/BMPship) "gF" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, /obj/item/shard{ icon_state = "small" }, @@ -2308,7 +2330,9 @@ /turf/open/floor/plating/asteroid/airless, /area/awaymission/BMPship) "gR" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 6 + }, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Fore) "gS" = ( @@ -2448,7 +2472,9 @@ /turf/open/floor/plating/asteroid/airless, /area/awaymission/BMPship) "ho" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/engine, /area/awaymission/BMPship/Aft) "hp" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm index 193242e689..dab408a8b1 100644 --- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm @@ -451,11 +451,15 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "bA" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating/airless, /area/tcommsat/chamber) "bB" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/tcommsat/chamber) "bC" = ( @@ -463,7 +467,9 @@ /turf/open/floor/plating/airless, /area/tcommsat/chamber) "bD" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/tcommsat/chamber) "bE" = ( @@ -512,7 +518,9 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "bK" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 9 + }, /turf/open/floor/plating, /area/tcommsat/chamber) "bL" = ( @@ -520,7 +528,9 @@ /turf/open/floor/plating, /area/tcommsat/chamber) "bM" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/tcommsat/chamber) "bN" = ( @@ -540,7 +550,9 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "bP" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating, /area/tcommsat/chamber) "bQ" = ( @@ -553,7 +565,9 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "bS" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /obj/structure/window/reinforced, /turf/open/floor/plating, /area/tcommsat/chamber) @@ -609,7 +623,9 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "cc" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating, /area/tcommsat/chamber) "cd" = ( @@ -632,7 +648,9 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "ch" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 10 + }, /turf/open/floor/plating, /area/tcommsat/chamber) "ci" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 32ed7321e7..a00a789b9e 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -53,7 +53,9 @@ /turf/closed/wall/rust, /area/ruin/space/has_grav/ancientstation/comm) "al" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /obj/machinery/door/poddoor{ id = "ancient" }, @@ -67,7 +69,9 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/comm) "an" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /obj/machinery/door/poddoor{ id = "ancient" }, @@ -483,11 +487,15 @@ /turf/closed/wall/rust, /area/ruin/space/has_grav/ancientstation/comm) "bz" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/comm) "bA" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/comm) "bB" = ( @@ -900,7 +908,9 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) "cK" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/template_noop) "cL" = ( @@ -946,7 +956,9 @@ /turf/closed/wall/rust, /area/ruin/space/has_grav/ancientstation/hydroponics) "cR" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hydroponics) "cS" = ( @@ -954,7 +966,9 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hydroponics) "cT" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hydroponics) "cU" = ( @@ -1794,7 +1808,9 @@ /turf/open/floor/plating/airless, /area/template_noop) "fb" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "fc" = ( @@ -1978,7 +1994,9 @@ /turf/open/floor/plating/airless, /area/template_noop) "fB" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "fC" = ( @@ -1986,7 +2004,9 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "fD" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 6 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "fE" = ( @@ -2805,7 +2825,9 @@ /turf/open/floor/plasteel/airless/floorgrime, /area/template_noop) "gV" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 5 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "gW" = ( @@ -2869,7 +2891,9 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) "hf" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/rnd) @@ -2879,7 +2903,9 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/rnd) "hh" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/rnd) @@ -3736,7 +3762,9 @@ /turf/closed/wall/rust, /area/ruin/space/has_grav/ancientstation/engi) "iY" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/kitchen) "iZ" = ( @@ -3744,7 +3772,9 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/kitchen) "ja" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/kitchen) "jb" = ( @@ -4069,11 +4099,15 @@ /turf/open/floor/plating/airless, /area/template_noop) "jS" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) "jT" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) "jU" = ( @@ -4227,7 +4261,9 @@ /turf/open/floor/engine/airless, /area/ruin/space/has_grav/ancientstation/atmo) "ko" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/template_noop) "kp" = ( @@ -4329,7 +4365,9 @@ /turf/open/floor/engine/airless, /area/ruin/space/has_grav/ancientstation/atmo) "kB" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/template_noop) "kC" = ( @@ -4583,11 +4621,15 @@ /turf/closed/mineral/plasma, /area/ruin/unpowered) "li" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/proto) "lj" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /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 f62787babf..e652a73e95 100644 --- a/_maps/RandomZLevels/centcomAway.dmm +++ b/_maps/RandomZLevels/centcomAway.dmm @@ -9,7 +9,9 @@ /turf/closed/wall/r_wall, /area/awaymission/centcomAway/cafe) "ad" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "ae" = ( @@ -17,7 +19,9 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "af" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "ag" = ( @@ -101,7 +105,9 @@ }, /area/awaymission/centcomAway/cafe) "at" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "au" = ( @@ -136,7 +142,9 @@ }, /area/awaymission/centcomAway/cafe) "aB" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "aC" = ( @@ -223,7 +231,9 @@ }, /area/awaymission/centcomAway/maint) "aS" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/closed/wall/r_wall, /area/awaymission/centcomAway/maint) "aT" = ( @@ -231,7 +241,9 @@ /turf/closed/wall/r_wall, /area/awaymission/centcomAway/maint) "aU" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/closed/wall/r_wall, /area/awaymission/centcomAway/maint) "aV" = ( @@ -582,7 +594,9 @@ /turf/open/floor/plasteel/hydrofloor, /area/awaymission/centcomAway/cafe) "ci" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/maint) "cj" = ( @@ -632,7 +646,9 @@ /turf/open/floor/plasteel/hydrofloor, /area/awaymission/centcomAway/cafe) "cu" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/maint) "cv" = ( @@ -1016,11 +1032,15 @@ /turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "dS" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "dT" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "dU" = ( @@ -1178,7 +1198,9 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/maint) "ey" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/maint) "ez" = ( @@ -1387,7 +1409,9 @@ /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/courtroom) "fn" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "fo" = ( @@ -1395,7 +1419,9 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "fp" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "fq" = ( @@ -1415,7 +1441,9 @@ /turf/closed/wall/r_wall, /area/awaymission/centcomAway/general) "fu" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "fv" = ( @@ -1423,11 +1451,15 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/general) "fw" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "fx" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "fy" = ( @@ -1618,11 +1650,15 @@ }, /area/awaymission/centcomAway/general) "gd" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 9 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "ge" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "gf" = ( @@ -1637,7 +1673,9 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/general) "gh" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 5 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "gi" = ( @@ -1808,7 +1846,9 @@ /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/general) "gM" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "gN" = ( @@ -1868,7 +1908,9 @@ }, /area/awaymission/centcomAway/general) "gX" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "gY" = ( @@ -1973,11 +2015,15 @@ }, /area/awaymission/centcomAway/general) "hq" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/closed/wall/r_wall, /area/awaymission/centcomAway/courtroom) "hr" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/courtroom) "hs" = ( @@ -1985,7 +2031,9 @@ /turf/open/floor/carpet, /area/awaymission/centcomAway/courtroom) "ht" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/courtroom) "hu" = ( @@ -2049,7 +2097,9 @@ /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/courtroom) "hF" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/courtroom) "hG" = ( @@ -2279,7 +2329,9 @@ /turf/closed/wall/r_wall, /area/awaymission/centcomAway/courtroom) "ix" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/closed/wall/r_wall, /area/awaymission/centcomAway/courtroom) "iy" = ( @@ -2309,7 +2361,9 @@ }, /area/awaymission/centcomAway/hangar) "iC" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "iD" = ( @@ -2658,7 +2712,9 @@ }, /area/awaymission/centcomAway/general) "jH" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plasteel{ name = "plating" }, @@ -2670,13 +2726,17 @@ }, /area/awaymission/centcomAway/general) "jJ" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plasteel{ name = "plating" }, /area/awaymission/centcomAway/general) "jK" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /obj/structure/window/reinforced, /turf/open/floor/plating, /area/awaymission/centcomAway/general) @@ -2736,7 +2796,9 @@ /turf/open/floor/plasteel, /area/awaymission/centcomAway/general) "jT" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "jU" = ( @@ -2785,7 +2847,9 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "kb" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "kc" = ( @@ -2846,12 +2910,16 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/general) "kl" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /obj/structure/window/reinforced, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "km" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "kn" = ( @@ -2904,7 +2972,9 @@ }, /area/awaymission/centcomAway/general) "kv" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 10 + }, /obj/structure/window/reinforced{ dir = 4 }, @@ -3015,7 +3085,9 @@ }, /area/awaymission/centcomAway/general) "kM" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/general) "kN" = ( @@ -3218,7 +3290,9 @@ /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/thunderdome) "lw" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/thunderdome) "lx" = ( @@ -3226,7 +3300,9 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/thunderdome) "ly" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/centcomAway/thunderdome) "lz" = ( diff --git a/_maps/RandomZLevels/challenge.dmm b/_maps/RandomZLevels/challenge.dmm index a50ac00aab..f22805b750 100644 --- a/_maps/RandomZLevels/challenge.dmm +++ b/_maps/RandomZLevels/challenge.dmm @@ -248,11 +248,15 @@ /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "aY" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/west, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "aZ" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "ba" = ( @@ -874,7 +878,9 @@ /turf/open/space, /area/space) "cM" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 9 + }, /turf/open/floor/plating, /area/awaymission/challenge/end) "cN" = ( @@ -882,11 +888,15 @@ /turf/open/floor/plating, /area/awaymission/challenge/end) "cO" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 5 + }, /turf/open/floor/plating, /area/awaymission/challenge/end) "cP" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/challenge/end) "cQ" = ( @@ -1044,7 +1054,9 @@ /turf/open/floor/plasteel/black, /area/awaymission/challenge/end) "dl" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating, /area/awaymission/challenge/end) "dm" = ( diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index 1b803966d3..4339d91cfa 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -842,7 +842,9 @@ /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "cY" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "cZ" = ( @@ -865,7 +867,9 @@ /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/cruiser) "dd" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /obj/structure/window/reinforced, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) @@ -1002,7 +1006,9 @@ /turf/open/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "dE" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 9 + }, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "dF" = ( @@ -1010,11 +1016,15 @@ /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "dG" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "dH" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 5 + }, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "dI" = ( @@ -1109,7 +1119,9 @@ /turf/open/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "dY" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "dZ" = ( @@ -1130,7 +1142,9 @@ }, /area/awaymission/spacebattle/cruiser) "eb" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "ec" = ( @@ -1296,7 +1310,9 @@ /turf/open/floor/plasteel/blue, /area/awaymission/spacebattle/cruiser) "eF" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "eG" = ( @@ -1345,7 +1361,9 @@ /turf/open/floor/plasteel/blue, /area/awaymission/spacebattle/cruiser) "eQ" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "eR" = ( @@ -2063,7 +2081,9 @@ /turf/open/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "hi" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/plating, /area/awaymission/spacebattle/syndicate7) "hj" = ( @@ -2122,7 +2142,9 @@ /turf/closed/wall/r_wall, /area/awaymission/spacebattle/cruiser) "hu" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating, /area/awaymission/spacebattle/syndicate7) "hv" = ( @@ -2912,7 +2934,9 @@ /turf/open/floor/plasteel/white, /area/awaymission/spacebattle/cruiser) "ki" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kj" = ( @@ -2941,7 +2965,9 @@ /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "ko" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kp" = ( @@ -2958,7 +2984,9 @@ /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kr" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "ks" = ( @@ -2983,11 +3011,13 @@ /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kw" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 10 + }, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kx" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/one_side, +/obj/effect/spawner/structure/window/hollow/reinforced/directional, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "ky" = ( @@ -2995,7 +3025,9 @@ /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kz" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/corner, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 6 + }, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kA" = ( diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm index 237fa11a45..139f974861 100644 --- a/_maps/RandomZLevels/wildwest.dmm +++ b/_maps/RandomZLevels/wildwest.dmm @@ -447,7 +447,9 @@ /obj/structure/window/reinforced{ icon_state = "fwindow" }, -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/west, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 8 + }, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" }, @@ -549,7 +551,9 @@ icon_state = "fwindow"; dir = 8 }, -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" }, @@ -870,7 +874,9 @@ icon_state = "fwindow"; dir = 4 }, -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" }, @@ -1696,7 +1702,7 @@ icon_state = "fwindow"; dir = 4 }, -/obj/effect/spawner/structure/window/hollow/reinforced/one_side, +/obj/effect/spawner/structure/window/hollow/reinforced/directional, /turf/open/floor/plasteel, /area/awaymission/wwrefine) "fB" = ( @@ -2141,7 +2147,9 @@ /turf/open/floor/mineral/titanium/yellow, /area/awaymission/wwrefine) "gX" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /obj/structure/window/reinforced{ icon_state = "fwindow" }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index a2a4ef519f..c022f191a6 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -83165,7 +83165,9 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/spawner/structure/window/hollow/reinforced/end/north, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, /obj/structure/cable/white{ d2 = 4; icon_state = "0-4" @@ -83194,7 +83196,9 @@ d2 = 4; icon_state = "0-4" }, -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 9 + }, /obj/structure/cable/white{ d1 = 4; d2 = 8; @@ -83211,7 +83215,9 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dfJ" = ( @@ -83224,7 +83230,9 @@ icon_state = "0-8" }, /obj/structure/cable/white, -/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 5 + }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dfK" = ( @@ -83734,7 +83742,9 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/west, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 8 + }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dgT" = ( @@ -83755,7 +83765,9 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dgW" = ( @@ -86332,7 +86344,9 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/spawner/structure/window/hollow/reinforced/corner, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 6 + }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dma" = ( @@ -87531,7 +87545,9 @@ d2 = 4; icon_state = "0-4" }, -/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 10 + }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "doH" = ( @@ -87543,7 +87559,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/spawner/structure/window/hollow/reinforced/one_side, +/obj/effect/spawner/structure/window/hollow/reinforced/directional, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "doI" = ( @@ -87552,7 +87568,9 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/spawner/structure/window/hollow/reinforced/end/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "doJ" = ( diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm index 94c301991c..285aeeaf8c 100644 --- a/code/game/objects/effects/spawners/structure.dm +++ b/code/game/objects/effects/spawners/structure.dm @@ -9,7 +9,7 @@ again. var/list/spawn_list /obj/effect/spawner/structure/Initialize() - ..() + . = ..() if(spawn_list && spawn_list.len) for(var/I in spawn_list) new I(get_turf(src)) @@ -22,145 +22,130 @@ again. icon = 'icons/obj/structures_spawners.dmi' icon_state = "window_spawner" name = "window spawner" - spawn_list = list(/obj/structure/grille, /obj/structure/window/fulltile) + spawn_list = list(/obj/structure/grille, /obj/structure/window/fulltile) + dir = SOUTH /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) + 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/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) + icon_state = "hwindow_spawner_end" -/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/end/Initialize() + switch(dir) + if(NORTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west) + if(EAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east) + if(SOUTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west) + if(WEST) + 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) + icon_state = "hwindow_spawner_middle" -/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/middle/Initialize() + switch(dir) + if(NORTH,SOUTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north) + if(EAST,WEST) + 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) +/obj/effect/spawner/structure/window/hollow/directional + icon_state = "hwindow_spawner_directional" +/obj/effect/spawner/structure/window/hollow/directional/Initialize() + switch(dir) + if(NORTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north) + if(NORTHEAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east) + if(EAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/east) + if(SOUTHEAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east) + if(SOUTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window) + if(SOUTHWEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/west) + if(WEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/west) + if(NORTHWEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /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) + 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) + 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/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) + icon_state = "hrwindow_spawner_end" -/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/end/Initialize() + switch(dir) + if(NORTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west) + if(EAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east) + if(SOUTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west) + if(WEST) + 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) + icon_state = "hrwindow_spawner_middle" -/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/middle/Initialize() + switch(dir) + if(NORTH,SOUTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north) + if(EAST,WEST) + 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) +/obj/effect/spawner/structure/window/hollow/reinforced/directional + icon_state = "hrwindow_spawner_directional" +/obj/effect/spawner/structure/window/hollow/reinforced/directional/Initialize() + switch(dir) + if(NORTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north) + if(NORTHEAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east) + if(EAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/east) + if(SOUTHEAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east) + if(SOUTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced) + if(SOUTHWEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/west) + if(WEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/west) + if(NORTHWEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /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) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile) //shuttle window @@ -168,7 +153,7 @@ again. /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) + spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle) //plasma windows @@ -176,134 +161,119 @@ again. /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) + 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) + 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/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) + icon_state = "phwindow_spawner_end" -/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/end/Initialize() + switch(dir) + if(NORTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west) + if(EAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east) + if(SOUTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west) + if(WEST) + 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) + icon_state = "phwindow_spawner_middle" -/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/middle/Initialize() + switch(dir) + if(NORTH,SOUTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north) + if(EAST,WEST) + 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) +/obj/effect/spawner/structure/window/hollow/plasma/directional + icon_state = "phwindow_spawner_directional" +/obj/effect/spawner/structure/window/hollow/plasma/directional/Initialize() + switch(dir) + if(NORTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north) + if(NORTHEAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east) + if(EAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/east) + if(SOUTHEAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east) + if(SOUTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma) + if(SOUTHWEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/west) + if(WEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/west) + if(NORTHWEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /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) + 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" + name = "hollow 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) + 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/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) + icon_state = "phrwindow_spawner_end" -/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/end/Initialize() + switch(dir) + if(NORTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west) + if(EAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east) + if(SOUTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west) + if(WEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west) + . = ..() /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) + icon_state = "phrwindow_spawner_middle" -/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/middle/Initialize() + switch(dir) + if(NORTH,SOUTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north) + if(EAST,WEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west) + . = ..() -/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/directional + icon_state = "phrwindow_spawner_directional" -/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) +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional/Initialize() + switch(dir) + if(NORTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north) + if(NORTHEAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east) + if(EAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east) + if(SOUTHEAST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east) + if(SOUTH) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced) + if(SOUTHWEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/west) + if(WEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/west) + if(NORTHWEST) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west) + . = ..() diff --git a/icons/obj/structures_spawners.dmi b/icons/obj/structures_spawners.dmi index 5d71b4fd44..cdf2191191 100644 Binary files a/icons/obj/structures_spawners.dmi and b/icons/obj/structures_spawners.dmi differ