diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index ff9c1b4f314..582b2126b74 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -9381,14 +9381,6 @@ icon_state = "neutralfull" }, /area/station/security/permabrig) -"aGW" = ( -/obj/structure/lattice, -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, -/turf/space, -/area/space/nearstation) "aGY" = ( /turf/simulated/wall/r_wall, /area/station/maintenance/auxsolarport) @@ -12656,10 +12648,6 @@ /obj/item/storage/fancy/crayons, /turf/simulated/floor/plasteel, /area/station/public/storage/art) -"aPT" = ( -/obj/effect/landmark/damageturf, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "aPU" = ( /obj/structure/table/wood, /obj/item/instrument/guitar, @@ -13286,15 +13274,6 @@ icon_state = "bar" }, /area/station/service/bar) -"aRu" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/eight, -/obj/effect/landmark/damageturf, -/turf/simulated/floor/plasteel/airless{ - dir = 10; - icon_state = "darkblue" - }, -/area/space/nearstation) "aRv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -24894,10 +24873,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/hallway/primary/central) -"btJ" = ( -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "btL" = ( /turf/simulated/wall/r_wall, /area/station/command/vault) @@ -45227,10 +45202,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "ctS" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/effect/spawner/random_spawners/oil_maybe, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -49668,10 +49640,7 @@ }, /area/station/security/brig) "cFR" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -59981,10 +59950,7 @@ /turf/simulated/floor/wood, /area/station/command/office/ntrep) "drs" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -60545,10 +60511,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/medical/surgery/observation) "dtU" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/simulated/floor/plating, /area/station/maintenance/port) "dtY" = ( @@ -66571,10 +66534,7 @@ /turf/simulated/wall/r_wall, /area/station/hallway/secondary/exit) "dXo" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -66602,10 +66562,7 @@ /turf/simulated/floor/plasteel, /area/station/science/robotics) "dXs" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -69245,10 +69202,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/sorting) "fhI" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, /obj/item/shard, /turf/simulated/floor/plating, @@ -73789,10 +73743,7 @@ }, /area/station/medical/cryo) "ieW" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, /obj/item/shard{ icon_state = "small" @@ -80685,6 +80636,10 @@ }, /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) +"mIl" = ( +/obj/structure/grille, +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "mJw" = ( /obj/machinery/light{ dir = 8 @@ -83852,10 +83807,6 @@ icon_state = "whitepurple" }, /area/station/science/break_room) -"ozK" = ( -/obj/effect/spawner/window/reinforced/grilled, -/turf/simulated/floor/plating, -/area/station/medical/virology) "ozS" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -92504,7 +92455,6 @@ /area/station/medical/medbay) "tKX" = ( /obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable, /turf/simulated/floor/plating, /area/station/medical/virology) "tLO" = ( @@ -95213,6 +95163,11 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/supply/miningdock) +"vuL" = ( +/obj/effect/spawner/window/reinforced/grilled, +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/station/medical/virology) "vuX" = ( /obj/machinery/alarm{ dir = 4; @@ -97971,6 +97926,10 @@ /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, /area/station/maintenance/aft) +"xcn" = ( +/obj/effect/landmark/damageturf, +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "xcs" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -98943,6 +98902,15 @@ icon_state = "neutral" }, /area/station/maintenance/fsmaint) +"xGL" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/landmark/damageturf, +/turf/simulated/floor/plasteel/airless{ + dir = 10; + icon_state = "darkblue" + }, +/area/space/nearstation) "xGY" = ( /obj/structure/cable{ d1 = 1; @@ -117626,7 +117594,7 @@ aaa aaa dij dij -aGW +sso dij dij aaa @@ -121738,7 +121706,7 @@ aaa aaa dij dij -aGW +sso dij abj aaa @@ -121748,7 +121716,7 @@ abj aaa abj dij -aGW +sso dij dij abj @@ -132800,7 +132768,7 @@ azd aAp awX abj -aRu +xGL ghZ aFq aVK @@ -133056,7 +133024,7 @@ aCo azd aAq awX -aPT +xcn abj aVK aGp @@ -145363,7 +145331,7 @@ aaa aaa dij dij -aGW +sso dij abj adg @@ -146891,7 +146859,7 @@ aaa aaa aaa dij -aGW +sso dij dij abj @@ -148335,9 +148303,9 @@ cBf wdL dGw dGw -ozK -ozK -ozK +tKX +tKX +tKX dGw dGw hGZ @@ -148435,7 +148403,7 @@ aaa aaa aaa aaa -aGW +sso abj ace aco @@ -150650,7 +150618,7 @@ dFG dFG vOB kce -tKX +vuL dFG dFG abj @@ -151566,7 +151534,7 @@ abj aaa abj abj -btJ +mIl aaa ygH tFK @@ -151823,7 +151791,7 @@ aaa aaa aaa aaa -btJ +mIl abj ygH aJx @@ -152080,7 +152048,7 @@ aaa aaa aaa aaa -btJ +mIl aaa ygH uUu @@ -154958,7 +154926,7 @@ nlB aaa abj abj -btJ +mIl abj abj iuY @@ -155472,7 +155440,7 @@ aaa aaa aaa abj -btJ +mIl abj abj iuY @@ -155987,7 +155955,7 @@ aaa aaa abj abj -btJ +mIl abj iuY rEQ @@ -157220,7 +157188,7 @@ aaa aaa aaa aaa -aGW +sso abj abj abj @@ -158020,10 +157988,10 @@ aaa aaa abj abj -btJ -btJ -btJ -btJ +mIl +mIl +mIl +mIl abj abj fhF @@ -158282,7 +158250,7 @@ aaa abj abj aaa -btJ +mIl fhF fhF fhF @@ -158292,7 +158260,7 @@ fhF fhF abj abj -btJ +mIl aaa aaa aaa @@ -158536,10 +158504,10 @@ aaa abj abj abj -btJ -btJ -btJ -btJ +mIl +mIl +mIl +mIl fhF fhF fhF @@ -158549,7 +158517,7 @@ fhF fhF abj aaa -btJ +mIl aaa aaa aaa @@ -158806,7 +158774,7 @@ fhF fhF abj aaa -btJ +mIl aaa aaa aaa @@ -159053,7 +159021,7 @@ aaa aaa aaa aaa -btJ +mIl fhF fhF fhF @@ -159061,9 +159029,9 @@ fhF fhF fhF fhF -btJ +mIl abj -btJ +mIl aaa aaa aaa @@ -159304,13 +159272,13 @@ aaa aaa aaa aaa -btJ +mIl aaa aaa aaa aaa aaa -btJ +mIl fhF fhF fhF @@ -159318,7 +159286,7 @@ fhF fhF fhF fhF -btJ +mIl abj abj aaa @@ -159561,20 +159529,20 @@ aaa aaa aaa aaa -btJ +mIl aaa aaa aaa aaa aaa bPS -btJ -btJ +mIl +mIl abj bPS abj -btJ -btJ +mIl +mIl bPS aaa aaa @@ -159818,7 +159786,7 @@ aaa aaa aaa aaa -btJ +mIl aaa aaa aaa @@ -160083,11 +160051,11 @@ aaa aaa aaa aaa -btJ -btJ -btJ -btJ -btJ +mIl +mIl +mIl +mIl +mIl aaa aaa aaa diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 6834f3f82d2..b8adc1ddba7 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -63702,10 +63702,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "kQv" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/item/reagent_containers/food/snacks/grown/poppy, /turf/simulated/floor/plating/airless, /area/space/nearstation) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm index c633cc96f1d..0950d75b262 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm @@ -7,10 +7,7 @@ /turf/template_noop, /area/space/nearstation) "ac" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/template_noop, /area/space/nearstation) "ad" = ( @@ -43,10 +40,7 @@ /turf/template_noop, /area/ruin/space/djstation/solars) "ag" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/structure/lattice, /turf/template_noop, /area/space/nearstation) @@ -64,10 +58,7 @@ /area/ruin/space/djstation) "aj" = ( /obj/structure/lattice, -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/template_noop, /area/space/nearstation) "al" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index 33b6ddcc975..b48172ed975 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -1347,10 +1347,7 @@ }, /area/ruin/space/derelict/arrival) "du" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/simulated/floor/plasteel/airless{ icon_state = "floorscorched2" }, @@ -1461,10 +1458,7 @@ /turf/simulated/floor/plating, /area/ruin/space/derelict/arrival) "dG" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/item/shard{ icon_state = "small" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm index 9f24bfbf844..226dd030077 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm @@ -38,10 +38,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/teleporter) "i" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/teleporter) "j" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm index a443506ad95..a517eb1ceae 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm @@ -9,10 +9,7 @@ /turf/simulated/mineral, /area/ruin/space/unpowered) "ad" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/item/shard{ icon_state = "small" }, @@ -35,10 +32,7 @@ }, /area/ruin/space/unpowered) "ah" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/item/shard, /turf/simulated/floor/wood{ icon_state = "wood-broken3" @@ -307,10 +301,7 @@ }, /area/ruin/space/unpowered) "be" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/wood, /area/ruin/space/unpowered) diff --git a/tools/UpdatePaths/Scripts/23331_grille_varedits.txt b/tools/UpdatePaths/Scripts/23331_grille_varedits.txt new file mode 100644 index 00000000000..b46d5dad846 --- /dev/null +++ b/tools/UpdatePaths/Scripts/23331_grille_varedits.txt @@ -0,0 +1 @@ +/obj/structure/grille{icon_state="brokengrille"} : /obj/structure/grille/broken{@OLD;icon_state=@SKIP;density=@SKIP;broken=@SKIP} diff --git a/tools/maplint/lints/grille_varedits.yml b/tools/maplint/lints/grille_varedits.yml new file mode 100644 index 00000000000..82cfd2184d2 --- /dev/null +++ b/tools/maplint/lints/grille_varedits.yml @@ -0,0 +1,6 @@ +help: "Use the broken grille subtype. Run updatepaths script 23331_grille_varedits.txt to fix this." +/obj/structure/grille: + banned_variables: + - icon_state + - density + - broken