diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm index f6fa3e7593f..6fd1fabd3f9 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm @@ -982,8 +982,7 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "oi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner, +/obj/effect/spawner/structure/window/hollow/reinforced/directional, /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) @@ -1172,9 +1171,9 @@ /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/commons) "ri" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/east, -/obj/structure/window/reinforced/spawner/west, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /obj/structure/curtain/bounty, /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/commons) @@ -1194,8 +1193,9 @@ /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "rE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/west, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 8 + }, /obj/effect/decal/cleanable/glass, /obj/structure/window/reinforced/spawner, /turf/open/floor/plating/icemoon, @@ -1355,9 +1355,9 @@ /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "ul" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/east, -/obj/structure/window/reinforced/spawner/west, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /obj/effect/decal/cleanable/glass, /obj/structure/window/reinforced/spawner/north, /turf/open/floor/plating/icemoon, @@ -1392,8 +1392,9 @@ "ux" = ( /obj/structure/transit_tube/horizontal, /obj/effect/decal/cleanable/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/east, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating/icemoon, @@ -1753,10 +1754,9 @@ /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "Cm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner, -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced/spawner/east, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, /turf/open/floor/plating, /area/ruin/plasma_facility/commons) "Co" = ( @@ -1789,8 +1789,9 @@ }, /area/ruin/plasma_facility/operations) "CU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/east, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, /obj/item/shard, /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) @@ -1855,8 +1856,9 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "Ea" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/east, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, /obj/item/shard, /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/commons) @@ -1868,8 +1870,9 @@ /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "Ef" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/east, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) "El" = ( @@ -2004,9 +2007,7 @@ /turf/open/floor/plating/snowed/icemoon, /area/ruin/plasma_facility/operations) "HK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner, -/obj/structure/window/reinforced/spawner/north, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating/snowed/icemoon, /area/ruin/plasma_facility/commons) "HS" = ( @@ -2017,8 +2018,9 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "HX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /obj/item/shard, /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) @@ -2111,8 +2113,9 @@ /turf/open/floor/iron/dark/textured_half, /area/ruin/plasma_facility/commons) "Ju" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/west, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 8 + }, /obj/item/shard, /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) @@ -2220,8 +2223,9 @@ /turf/open/floor/stone, /area/ruin/plasma_facility/commons) "Kx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/east, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, /obj/item/shard, /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/icemoon, @@ -2698,8 +2702,9 @@ /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) "Rj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /obj/item/shard, /obj/structure/cable, /turf/open/floor/plating/icemoon, @@ -2735,13 +2740,6 @@ /obj/item/shard, /turf/open/floor/plating/icemoon, /area/icemoon/underground/explored) -"RX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/west, -/obj/structure/window/reinforced/spawner/east, -/obj/structure/curtain/bounty, -/turf/open/floor/plating/icemoon, -/area/ruin/plasma_facility/commons) "Sd" = ( /obj/structure/railing{ dir = 8 @@ -2858,13 +2856,6 @@ /obj/item/chair/plastic, /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) -"UT" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced/spawner/east, -/turf/open/floor/plating, -/area/ruin/plasma_facility/commons) "Ve" = ( /obj/structure/flora/tree/stump, /turf/open/misc/asteroid/snow/icemoon, @@ -2964,8 +2955,7 @@ }, /area/ruin/plasma_facility/operations) "Xj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner, +/obj/effect/spawner/structure/window/hollow/reinforced/directional, /obj/item/shard, /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/commons) @@ -3052,9 +3042,7 @@ /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "YP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner, -/obj/structure/window/reinforced/spawner/north, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/commons) "Zf" = ( @@ -3162,9 +3150,9 @@ /turf/open/floor/wood/large, /area/ruin/plasma_facility/commons) "ZN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/east, -/obj/structure/window/reinforced/spawner/west, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) "ZR" = ( @@ -3570,7 +3558,7 @@ AG vY vY XI -RX +ri Ea qW ri @@ -3715,7 +3703,7 @@ BJ hK ZH wF -UT +Cm pn PB eC diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm index 1d5c5cc71a7..0b0ebb5161f 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm @@ -114,8 +114,9 @@ }, /area/ruin/powered/shuttle) "sM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/east, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, /obj/item/shard, /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/icemoon, @@ -227,8 +228,9 @@ /area/icemoon/underground/explored) "CH" = ( /obj/structure/window/reinforced/spawner, -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/icemoon, /area/ruin/powered/shuttle) @@ -252,9 +254,9 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/ruin/powered/shuttle) "FP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/west, -/obj/structure/window/reinforced/spawner/east, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/icemoon, /area/ruin/powered/shuttle) @@ -267,8 +269,9 @@ }, /area/ruin/powered/shuttle) "GH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/north, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, /obj/item/shard, /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/icemoon, @@ -296,8 +299,9 @@ /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Jt" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/east, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/icemoon, /area/ruin/powered/shuttle) diff --git a/_maps/RandomRuins/SpaceRuins/clericden.dmm b/_maps/RandomRuins/SpaceRuins/clericden.dmm index 9dd18cf73e7..04160fea855 100644 --- a/_maps/RandomRuins/SpaceRuins/clericden.dmm +++ b/_maps/RandomRuins/SpaceRuins/clericden.dmm @@ -22,8 +22,7 @@ /turf/open/misc/asteroid/airless, /area/ruin/unpowered/no_grav) "g" = ( -/obj/structure/grille, -/obj/structure/window/fulltile, +/obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/ruin/unpowered/no_grav) "h" = ( @@ -159,8 +158,7 @@ /turf/open/floor/iron/dark/airless, /area/ruin/unpowered/no_grav) "K" = ( -/obj/structure/grille, -/obj/structure/window/fulltile, +/obj/effect/spawner/structure/window, /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "L" = ( @@ -177,8 +175,7 @@ /turf/open/misc/asteroid/airless, /area/ruin/unpowered/no_grav) "O" = ( -/obj/structure/grille, -/obj/structure/window/fulltile, +/obj/effect/spawner/structure/window, /obj/structure/barricade/wooden/crude, /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index afd2e019f9b..9d02bc3f1b5 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -2106,7 +2106,7 @@ "fJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/atmos_control/noreconnect{ - atmos_chambers = list("deepo2" = "Oxygen Supply"); + atmos_chambers = list("deepo2"="Oxygen Supply"); dir = 8 }, /turf/open/floor/iron, @@ -2426,7 +2426,7 @@ "gC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/atmos_control/noreconnect{ - atmos_chambers = list("deepn2" = "Nitrogen Supply"); + atmos_chambers = list("deepn2"="Nitrogen Supply"); dir = 8 }, /turf/open/floor/iron, @@ -2505,8 +2505,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage) "gR" = ( -/obj/structure/grille, -/obj/structure/cable, +/obj/effect/spawner/structure/electrified_grille, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "gT" = ( diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index b7565abd75e..8022b7c88ec 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -6310,9 +6310,8 @@ /area/awaymission/snowdin/cave/cavern) "rx" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, /obj/structure/window/reinforced/fulltile/ice, -/obj/structure/cable, +/obj/effect/spawner/structure/electrified_grille, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) "ry" = ( @@ -6965,9 +6964,8 @@ /area/awaymission/snowdin/post/cavern1) "uO" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, /obj/structure/window/reinforced/fulltile/ice, -/obj/structure/cable, +/obj/effect/spawner/structure/electrified_grille, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) "uS" = ( @@ -8144,9 +8142,8 @@ /area/awaymission/snowdin/igloo) "zR" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, /obj/structure/window/reinforced/fulltile/ice, -/obj/structure/cable, +/obj/effect/spawner/structure/electrified_grille, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "zS" = ( @@ -9511,8 +9508,7 @@ /turf/closed/wall/ice, /area/awaymission/snowdin/post/mining_main) "Ga" = ( -/obj/structure/window/reinforced/fulltile/ice, -/obj/structure/grille, +/obj/effect/spawner/structure/window/ice, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) "Gb" = ( @@ -9525,8 +9521,7 @@ /area/awaymission/snowdin/post/mining_main/robotics) "Ge" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile/ice, +/obj/effect/spawner/structure/window/ice, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/robotics) "Gf" = ( @@ -9811,8 +9806,7 @@ /area/awaymission/snowdin/post/mining_main/mechbay) "Hj" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile/ice, +/obj/effect/spawner/structure/window/ice, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) "Hk" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index ac04c9f89ec..c73debfaa08 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -10166,10 +10166,9 @@ /area/station/service/hydroponics) "dcJ" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/grille, /obj/structure/sign/warning/electric_shock/directional/west, -/obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/structure/electrified_grille, /turf/open/floor/plating, /area/station/maintenance/port/fore) "ddb" = ( @@ -11762,9 +11761,8 @@ /area/station/science/xenobiology) "dxz" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/grille, -/obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/structure/electrified_grille, /turf/open/floor/plating, /area/station/maintenance/port/fore) "dxB" = ( @@ -57415,11 +57413,7 @@ /obj/structure/transit_tube/horizontal{ dir = 1 }, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -60514,14 +60508,13 @@ }, /area/station/ai_monitored/turret_protected/ai) "rph" = ( -/obj/structure/grille, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/structure/electrified_grille, /turf/open/floor/plating, /area/station/maintenance/port/greater) "rpl" = ( @@ -67742,12 +67735,11 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "tmU" = ( -/obj/structure/grille, /obj/structure/barricade/wooden, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/structure/cable, +/obj/effect/spawner/structure/electrified_grille, /obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/port/aft) @@ -75120,16 +75112,15 @@ /turf/open/floor/iron, /area/station/security/brig) "vtl" = ( -/obj/structure/grille, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/spawner/structure/electrified_grille, /turf/open/floor/iron/dark, /area/station/maintenance/fore) "vto" = ( @@ -85258,8 +85249,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "yfP" = ( -/obj/structure/grille, -/obj/structure/cable, +/obj/effect/spawner/structure/electrified_grille, /turf/open/floor/plating/rust, /area/station/security/prison) "yfS" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index d3959326d7b..692f6916011 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -45383,9 +45383,7 @@ /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "pDW" = ( -/obj/structure/sign/warning/radiation/rad_area/directional/north{ - dir = 1 - }, +/obj/structure/sign/warning/radiation/rad_area/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -61307,8 +61305,7 @@ /turf/open/floor/plating, /area/station/engineering/engine_smes) "vfU" = ( -/obj/structure/cable, -/obj/structure/grille, +/obj/effect/spawner/structure/electrified_grille, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, /area/mine/explored) @@ -64572,9 +64569,7 @@ /turf/open/floor/iron, /area/station/security/checkpoint/engineering) "wpo" = ( -/obj/structure/sign/warning/radiation/rad_area/directional/north{ - dir = 1 - }, +/obj/structure/sign/warning/radiation/rad_area/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/neutral/filled/line{ diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index ea520109323..b91d493e4e5 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -970,8 +970,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "nK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/tinted/fulltile, +/obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/iron/dark, /area/shuttle/escape) "nQ" = ( @@ -2633,7 +2632,7 @@ /obj/docking_port/mobile/emergency{ dwidth = 40; height = 43; - movement_force = list("KNOCKDOWN" = 3, "THROW" = 6); + movement_force = list("KNOCKDOWN"=3,"THROW"=6); name = "\proper a monastery with engines strapped to it"; port_direction = 1; width = 80 diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index d0ba8d2b694..003535bca3b 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -3,8 +3,7 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/plasma/plastitanium, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/machinery/door/poddoor/preopen{ id = "escape_cockpit_windows"; name = "Cockpit Blast Door" @@ -2076,7 +2075,6 @@ lethal = 1; pixel_x = 5; pixel_y = 32; - req_access = null; req_access = list("command") }, /turf/open/floor/iron/dark, diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm index 9936f1fdf28..d628e665074 100644 --- a/_maps/shuttles/infiltrator_advanced.dmm +++ b/_maps/shuttles/infiltrator_advanced.dmm @@ -1184,8 +1184,7 @@ /turf/open/floor/pod/dark, /area/shuttle/syndicate/medical) "cx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/plasma/plastitanium, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/structure/shuttle/engine/heater, /turf/open/floor/plating, /area/shuttle/syndicate/medical) @@ -1244,8 +1243,7 @@ /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/armory) "cH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/plasma/plastitanium, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/structure/shuttle/engine/heater, /turf/open/floor/plating, /area/shuttle/syndicate/armory) @@ -1275,8 +1273,7 @@ /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/hallway) "cN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/plasma/plastitanium, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/structure/shuttle/engine/heater, /turf/open/floor/plating, /area/shuttle/syndicate/hallway) diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 5a999d43860..5a1abdae1fa 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -872,8 +872,7 @@ /obj/machinery/door/poddoor/shutters/preopen{ id = "piratebridge" }, -/obj/structure/grille, -/obj/structure/window/reinforced/plasma/plastitanium, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, /area/shuttle/pirate) "ez" = ( diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index 0a5d1544221..d43cf4eeb08 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -156,8 +156,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/syndicate3) "rU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/plasma/plastitanium, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/machinery/door/poddoor{ id = "caravansyndicate3_bridge" }, diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm index 40edbf913f0..e2066c6c5f2 100644 --- a/code/game/objects/effects/spawners/structure.dm +++ b/code/game/objects/effects/spawners/structure.dm @@ -369,3 +369,9 @@ again. if(NORTHWEST) spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/spawner/north, /obj/structure/window/reinforced/plasma/spawner/west) . = ..() + +/obj/effect/spawner/structure/electrified_grille + name = "electrified grill spawner" + icon = 'icons/obj/structures_spawners.dmi' + icon_state = "electrified_grille" + spawn_list = list(/obj/structure/grille, /obj/structure/cable) diff --git a/icons/obj/structures_spawners.dmi b/icons/obj/structures_spawners.dmi index 48bf32e9330..8f699f4d711 100644 Binary files a/icons/obj/structures_spawners.dmi and b/icons/obj/structures_spawners.dmi differ diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index c8abd410af1..31140fa33b5 100644 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -157,6 +157,31 @@ if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/stairs[/\w]*?,\n[^)]*?/turf/open/ echo -e "${RED}ERROR: Found a staircase on top of a gen_turf. Please replace the gen_turf with a proper turf.${NC}" st=1 fi; +if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/grille,\n[^)]*?/obj/structure/cable,\n[^)]*?/area/.+\)' _maps/**/*.dmm; then + echo + echo -e "${RED}ERROR: Found a grille above a cable. Please replace with the proper structure spawner.${NC}" + st=1 +fi; +if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/cable,\n[^)]*?/obj/structure/grille,\n[^)]*?/area/.+\)' _maps/**/*.dmm; then + echo + echo -e "${RED}ERROR: Found a grille above a cable. Please replace with the proper structure spawner.${NC}" + st=1 +fi; +if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/grille,\n[^)]*?/obj/structure/window/reinforced/fulltile/ice,\n[^)]*?/area/.+\)' _maps/**/*.dmm; then + echo + echo -e "${RED}ERROR: Found grille above a fulltile ice window. Please replace it with the proper structure spawner.${NC}" + st=1 +fi; +if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/grille,\n[^)]*?/obj/structure/window[/\w]*?fulltile,\n[^)]*?/area/.+\)' _maps/**/*.dmm; then + echo + echo -e "${RED}ERROR: Found grille above a fulltile window. Please replace it with the proper structure spawner.${NC}" + st=1 +fi; +if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/grille,\n[^)]*?/obj/structure/window/reinforced/plasma/plastitanium,\n[^)]*?/area/.+\)' _maps/**/*.dmm; then + echo + echo -e "${RED}ERROR: Found grille above a fulltile plastitanium window. Please replace it with the proper structure spawner.${NC}" + st=1 +fi; if grep -Pzo '/obj/machinery/conveyor/inverted[/\w]*?\{\n[^}]*?dir = [1248];[^}]*?\},?\n' _maps/**/*.dmm; then echo echo -e "${RED}ERROR: Found an inverted conveyor belt with a cardinal dir. Please replace it with a normal conveyor belt.${NC}"