From e38ab5c4d94585b5dd0fbb8e5f94b2d1bf70c830 Mon Sep 17 00:00:00 2001 From: 1080pCat <96908085+1080pCat@users.noreply.github.com> Date: Thu, 3 Apr 2025 23:41:20 +1000 Subject: [PATCH] Bans the use of `/area/noop/` from being used where turf are (#28570) * (hopefully) Bans the use of `/area/noop/` from being used where turf/structures are * Update test_ventcrawl.dmm * Update spacebar.dmm * Update clockwork_monastery.dmm * Update debris2.dmm * Update casino.dmm * Update debris3.dmm * Update oldstation.dmm * Update debris1.dmm * Update voyager.dmm * Update lavaland_surface_monster_nest.dmm * submaps * woops * oops again on the same map * warrior review * missed one * Update oldstation.dmm * Update area_noop_on_turf.yml * Update clockwork_monastery.dmm --- .../lavaland_surface_monster_nest.dmm | 107 ++++++++---------- .../RandomRuins/SpaceRuins/casino.dmm | 6 +- .../SpaceRuins/clockwork_monastery.dmm | 7 +- .../RandomRuins/SpaceRuins/debris1.dmm | 24 ++-- .../RandomRuins/SpaceRuins/debris2.dmm | 32 +++--- .../RandomRuins/SpaceRuins/debris3.dmm | 14 +-- .../RandomRuins/SpaceRuins/oldstation.dmm | 2 +- .../RandomRuins/SpaceRuins/spacebar.dmm | 5 +- .../RandomRuins/SpaceRuins/voyager.dmm | 2 +- _maps/map_files/tests/test_ventcrawl.dmm | 6 +- tools/maplint/lints/area_noop_on_turf.yml | 7 ++ 11 files changed, 103 insertions(+), 109 deletions(-) create mode 100644 tools/maplint/lints/area_noop_on_turf.yml diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_monster_nest.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_monster_nest.dmm index f91d857af1d..424cec8657f 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_monster_nest.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_monster_nest.dmm @@ -1,7 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/mineral/random/volcanic, -/area/template_noop) "d" = ( /obj/effect/decal/remains/human, /obj/effect/mapping_helpers/no_lava, @@ -19,10 +16,6 @@ /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) -"w" = ( -/obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/template_noop) "E" = ( /obj/structure/flora/ash/cacti, /obj/effect/mapping_helpers/no_lava, @@ -48,22 +41,8 @@ /area/lavaland/surface/outdoors) (1,1,1) = {" -a -a -a -a -a -a -a -w -a -a -a -a -"} -(2,1,1) = {" -a -a +X +X X X X @@ -73,11 +52,25 @@ r X X X -a +X +"} +(2,1,1) = {" +X +X +X +X +X +X +X +r +X +X +X +X "} (3,1,1) = {" -a -a +X +X X X r @@ -87,11 +80,11 @@ r X X X -a +X "} (4,1,1) = {" -a -a +X +X X X r @@ -101,11 +94,11 @@ r V r X -a +X "} (5,1,1) = {" -a -a +X +X X E r @@ -115,11 +108,11 @@ d r r r -w +r "} (6,1,1) = {" -a -a +X +X X Z u @@ -129,11 +122,11 @@ m m r X -a +X "} (7,1,1) = {" -a -a +X +X X X X @@ -143,11 +136,11 @@ m m Z X -a +X "} (8,1,1) = {" -a -a +X +X X X X @@ -157,11 +150,9 @@ r r E X -a +X "} (9,1,1) = {" -a -a X X X @@ -171,19 +162,21 @@ X X X X -a +X +X +X "} (10,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a +X +X +X +X +X +X +X +X +X +X +X +X "} diff --git a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm index a696d867ac0..b86e29f64d1 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm @@ -59,7 +59,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/template_noop) +/area/ruin/space/powered/casino/engine) "bq" = ( /obj/structure/rack, /obj/item/radio{ @@ -737,7 +737,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/template_noop) +/area/ruin/space/powered/casino/engine) "vb" = ( /obj/structure/shuttle/engine/propulsion/burst{ dir = 4 @@ -994,7 +994,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/template_noop) +/area/ruin/space/powered/casino/engine) "BC" = ( /obj/machinery/light/small{ dir = 8 diff --git a/_maps/map_files/RandomRuins/SpaceRuins/clockwork_monastery.dmm b/_maps/map_files/RandomRuins/SpaceRuins/clockwork_monastery.dmm index 11f6d9615fb..ce2b2de53b7 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/clockwork_monastery.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/clockwork_monastery.dmm @@ -249,9 +249,6 @@ /obj/effect/spawner/random/food_or_drink/soup, /turf/simulated/floor/clockwork, /area/ruin/space/clockwork_monastery) -"yp" = ( -/turf/simulated/mineral/ancient/outer, -/area/template_noop) "yy" = ( /obj/structure/chair/brass{ dir = 1 @@ -2073,7 +2070,7 @@ gV gV gV gV -yp +dx Ht kC kC @@ -2143,7 +2140,7 @@ gV gV gV gV -yp +dx Ht Ht kC diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm index fb4e77a195c..022a9a203e1 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm @@ -61,11 +61,11 @@ /area/template_noop) "ay" = ( /turf/simulated/floor/plating/burnt/airless, -/area/template_noop) +/area/ruin) "az" = ( /obj/item/stack/sheet/metal, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/ruin) "aB" = ( /obj/structure/lattice, /obj/item/stack/sheet/metal, @@ -83,11 +83,11 @@ /area/template_noop) "aF" = ( /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/ruin) "aG" = ( /obj/effect/spawner/random/engineering/toolbox, /turf/simulated/floor/plating/burnt/airless, -/area/template_noop) +/area/ruin) "aI" = ( /obj/structure/grille/broken, /obj/structure/lattice, @@ -105,25 +105,25 @@ /obj/machinery/power/apc/worn_out/directional/south, /obj/structure/cable, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/ruin) "aQ" = ( /obj/effect/decal/cleanable/shreds{ pixel_x = 4; pixel_y = 3 }, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/ruin) "aT" = ( /obj/structure/girder, /turf/simulated/floor/plating/burnt/airless, -/area/template_noop) +/area/ruin) "aU" = ( /obj/effect/spawner/random/barrier/wall_probably, /turf/template_noop, -/area/template_noop) +/area/ruin) "aV" = ( /turf/simulated/wall, -/area/template_noop) +/area/ruin) "aW" = ( /obj/structure/lattice, /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/space, @@ -132,7 +132,7 @@ "aY" = ( /obj/item/shard, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/ruin) "aZ" = ( /obj/item/stack/sheet/metal, /turf/template_noop, @@ -148,11 +148,11 @@ icon_state = "4-8" }, /turf/simulated/floor/plating/burnt/airless, -/area/template_noop) +/area/ruin) "QL" = ( /obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, /turf/simulated/floor/plating/burnt/airless, -/area/template_noop) +/area/ruin) (1,1,1) = {" aa diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm index 586ce7c912a..d4c90eeab19 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm @@ -4,13 +4,13 @@ /area/template_noop) "ab" = ( /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/ruin/unpowered) "ac" = ( /turf/simulated/floor/plasteel/airless, -/area/template_noop) +/area/ruin/unpowered) "ad" = ( /turf/simulated/wall/r_wall, -/area/template_noop) +/area/ruin/unpowered) "ae" = ( /obj/item/stack/cable_coil/cut, /turf/template_noop, @@ -26,13 +26,13 @@ "al" = ( /obj/structure/girder, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/ruin/unpowered) "ao" = ( /obj/machinery/door/airlock/command{ max_integrity = 40 }, /turf/simulated/floor/plating/burnt/airless, -/area/template_noop) +/area/ruin/unpowered) "ap" = ( /mob/living/simple_animal/hostile/carp, /turf/template_noop, @@ -40,7 +40,7 @@ "ar" = ( /obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/ruin/unpowered) "as" = ( /obj/item/stack/rods, /turf/template_noop, @@ -59,12 +59,12 @@ anchored = 1 }, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/ruin/unpowered) "aA" = ( /obj/structure/closet/crate, /obj/item/reagent_containers/glass/beaker/bluespace, /turf/simulated/floor/plasteel/airless, -/area/template_noop) +/area/ruin/unpowered) "aC" = ( /obj/item/stack/sheet/metal, /turf/template_noop, @@ -75,7 +75,7 @@ /area/template_noop) "aF" = ( /turf/simulated/floor/plating/burnt/airless, -/area/template_noop) +/area/ruin/unpowered) "aG" = ( /obj/structure/safe, /obj/item/stack/sheet/mineral/bananium{ @@ -86,12 +86,12 @@ }, /obj/item/dnainjector/comic, /turf/simulated/floor/plasteel/airless, -/area/template_noop) +/area/ruin/unpowered) "aH" = ( /obj/structure/table, /obj/item/salvage/ruin/brick, /turf/simulated/floor/plasteel/airless, -/area/template_noop) +/area/ruin/unpowered) "aL" = ( /obj/item/shard, /turf/template_noop, @@ -99,7 +99,7 @@ "aM" = ( /obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless, -/area/template_noop) +/area/ruin/unpowered) "aN" = ( /obj/item/clothing/suit/bio_suit/virology, /turf/template_noop, @@ -116,7 +116,7 @@ /area/template_noop) "aT" = ( /turf/simulated/wall, -/area/template_noop) +/area/ruin/unpowered) "aV" = ( /obj/structure/lattice, /turf/template_noop, @@ -124,16 +124,16 @@ "aY" = ( /obj/structure/girder/reinforced, /turf/simulated/floor/plating/damaged/airless, -/area/template_noop) +/area/ruin/unpowered) "aZ" = ( /obj/machinery/computer/pandemic, /turf/simulated/floor/plasteel/airless, -/area/template_noop) +/area/ruin/unpowered) "Di" = ( /obj/effect/mapping_helpers/turfs/burn, /obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, /turf/simulated/floor/plasteel/airless, -/area/template_noop) +/area/ruin/unpowered) (1,1,1) = {" aa diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm index e8f94ba21d8..bd07b50dc38 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm @@ -5,7 +5,7 @@ "b" = ( /obj/item/stack/rods, /turf/simulated/floor/plating/damaged/airless, -/area/template_noop) +/area/ruin/unpowered) "c" = ( /obj/structure/girder/displaced, /turf/template_noop, @@ -45,7 +45,7 @@ /area/template_noop) "m" = ( /turf/simulated/wall, -/area/template_noop) +/area/ruin/unpowered) "n" = ( /obj/item/trash/popcorn, /turf/template_noop, @@ -62,7 +62,7 @@ "t" = ( /obj/machinery/computer/arcade/battle, /turf/simulated/floor/plasteel/airless, -/area/template_noop) +/area/ruin/unpowered) "u" = ( /obj/item/poster/random_official, /turf/template_noop, @@ -78,10 +78,10 @@ "x" = ( /obj/structure/bookcase/random, /turf/simulated/floor/plating/damaged/airless, -/area/template_noop) +/area/ruin/unpowered) "z" = ( /turf/simulated/floor/plating/damaged/airless, -/area/template_noop) +/area/ruin/unpowered) "A" = ( /obj/effect/spawner/random/engineering/tools, /turf/template_noop, @@ -97,7 +97,7 @@ "F" = ( /obj/effect/spawner/random/engineering/tools, /turf/simulated/floor/plating/damaged/airless, -/area/template_noop) +/area/ruin/unpowered) "G" = ( /obj/item/stack/sheet/glass, /turf/template_noop, @@ -131,7 +131,7 @@ "P" = ( /obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, /turf/simulated/floor/plating/damaged/airless, -/area/template_noop) +/area/ruin/unpowered) "Q" = ( /obj/structure/girder, /turf/template_noop, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index b26d174a2ea..8a16c5dd637 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -4098,7 +4098,7 @@ "my" = ( /obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, -/area/template_noop) +/area/ruin/unpowered) "mB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm index e67ddd0b3b2..4fa31d186e5 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm @@ -736,9 +736,6 @@ }, /turf/simulated/floor/plating/asteroid/ancient, /area/space/nearstation) -"Gz" = ( -/turf/simulated/wall/mineral/iron, -/area/template_noop) "HX" = ( /obj/structure/table, /obj/item/book/manual/barman_recipes, @@ -3188,7 +3185,7 @@ aw ab aw ab -Gz +aw ad ab ab diff --git a/_maps/map_files/RandomRuins/SpaceRuins/voyager.dmm b/_maps/map_files/RandomRuins/SpaceRuins/voyager.dmm index 456b85f46a6..8f037a389f9 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/voyager.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/voyager.dmm @@ -10,7 +10,7 @@ /obj/structure/safe/floor, /obj/item/golden_record, /turf/simulated/wall/satellite, -/area/template_noop) +/area/ruin/unpowered) "e" = ( /turf/template_noop, /area/template_noop) diff --git a/_maps/map_files/tests/test_ventcrawl.dmm b/_maps/map_files/tests/test_ventcrawl.dmm index e14c7c9036e..bfddc1d6f7f 100644 --- a/_maps/map_files/tests/test_ventcrawl.dmm +++ b/_maps/map_files/tests/test_ventcrawl.dmm @@ -4,20 +4,20 @@ dir = 4 }, /turf/simulated/floor, -/area/template_noop) +/area/game_test) "d" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor, -/area/template_noop) +/area/game_test) "X" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/structure/table, /turf/simulated/floor, -/area/template_noop) +/area/game_test) (1,1,1) = {" a diff --git a/tools/maplint/lints/area_noop_on_turf.yml b/tools/maplint/lints/area_noop_on_turf.yml new file mode 100644 index 00000000000..3a395d44be3 --- /dev/null +++ b/tools/maplint/lints/area_noop_on_turf.yml @@ -0,0 +1,7 @@ +help: "Please use a proper relative area for turfs. If this error is on a submap template, add the file path to the exclude list on `area_noop_on_turf.yml`" +exclude_files: + - _maps/map_files/RandomRuins/SpaceRuins/submaps/rocky_motel_submap.dmm + - _maps/map_files/RandomRuins/SpaceRuins/submaps/telecomns_returns_submap.dmm +/area/template_noop: + banned_neighbors: + - /turf/simulated