lints against turf overlaying (#6730)

byond lets you put two /turf's on one turf, which makes one turf look like the other i don't know why it does this but this is never used in ss13 because it's absolutely horrible to deal with as you now have turfs using 1. underlays (ss13 doesn't) and 2. doing different things than it should this removes all cases of it, and adds a lint. this will not catch cases where there's more than two turfs but they're not adjacent but here's hoping people don't fuck up so royally hard that they somehow cause non-continuous turfs.
Citadel-Station-13 · Sep 8, 2024 · 5e57d4e · 5e57d4e
1 parent 0c8dd52
commit 5e57d4e
Show file tree

Hide file tree

Showing 25 changed files with 4 additions and 98 deletions.
diff --git a/maps/away_missions/140x140/snow_outpost.dmm b/maps/away_missions/140x140/snow_outpost.dmm
@@ -853,7 +853,6 @@
 /turf/simulated/floor/snow/snow2,
 /area/awaymission/snow_outpost/outside/nospawn)
 "dN" = (
-/turf/simulated/floor/snow/snow2,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark6";
 	name = "Unknown Shuttle"
@@ -866,7 +865,6 @@
 	},
 /area/awaymission/snow_outpost/outside/nospawn)
 "dP" = (
-/turf/simulated/floor/snow/snow2,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark10";
 	name = "Unknown Shuttle"
@@ -972,7 +970,6 @@
 /turf/simulated/floor/tiled/white,
 /area/awaymission/snow_outpost/powered)
 "eb" = (
-/turf/simulated/floor/tiled/steel,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark5";
 	name = "Unknown Shuttle"
@@ -1030,14 +1027,12 @@
 /turf/simulated/floor/tiled/white,
 /area/awaymission/snow_outpost/powered)
 "em" = (
-/turf/simulated/floor/tiled/steel,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark9";
 	name = "Unknown Shuttle"
 	},
 /area/awaymission/snow_outpost/powered)
 "en" = (
-/turf/simulated/floor/tiled/steel,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark6";
 	name = "Unknown Shuttle"
@@ -1196,7 +1191,6 @@
 /turf/simulated/floor/tiled/white,
 /area/awaymission/snow_outpost/powered)
 "eL" = (
-/turf/simulated/floor/tiled/steel,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark10";
 	name = "Unknown Shuttle"
@@ -2350,14 +2344,12 @@
 /turf/simulated/floor/tiled/steel,
 /area/awaymission/snow_outpost/powered)
 "iU" = (
-/turf/simulated/floor/snow/snow2,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark5";
 	name = "Unknown Shuttle"
 	},
 /area/awaymission/snow_outpost/outside/nospawn)
 "iV" = (
-/turf/simulated/floor/snow/snow2,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark9";
 	name = "Unknown Shuttle"
@@ -2531,7 +2523,6 @@
 /turf/simulated/floor/plating/outdoors,
 /area/awaymission/snow_outpost/dark)
 "DR" = (
-/turf/simulated/floor/tiled/steel,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark9";
 	name = "Unknown Shuttle"

diff --git a/maps/away_missions/archive/blackmarketpackers.dmm b/maps/away_missions/archive/blackmarketpackers.dmm
@@ -57,7 +57,6 @@
 /turf/simulated/floor/plating,
 /area/awaymission/BMPship3)
 "an" = (
-/turf/simulated/floor/plating,
 /turf/simulated/shuttle/wall,
 /area/awaymission/BMPship3)
 "ao" = (
@@ -591,7 +590,6 @@
 	},
 /area/awaymission/BMPship1)
 "cy" = (
-/turf/simulated/floor,
 /turf/simulated/shuttle/wall,
 /area/awaymission/BMPship3)
 "cA" = (

diff --git a/maps/away_missions/archive/jungle.dmm b/maps/away_missions/archive/jungle.dmm
@@ -661,7 +661,6 @@
 /turf/simulated/floor/outdoors/dirt,
 /area/jungle/crash_ship_source)
 "dA" = (
-/turf/simulated/floor/outdoors/dirt,
 /turf/simulated/shuttle/wall,
 /area/jungle/crash_ship_source)
 "dB" = (
@@ -689,7 +688,6 @@
 /turf/simulated/floor/tiled/white,
 /area/jungle/crash_ship_source)
 "dF" = (
-/turf/simulated/floor/tiled/white,
 /turf/simulated/shuttle/wall{
 	icon_state = "swall_c"
 	},

diff --git a/maps/away_missions/archive/spacebattle.dmm b/maps/away_missions/archive/spacebattle.dmm
@@ -5,7 +5,6 @@
 /turf/space,
 /area)
 "ac" = (
-/turf/simulated/shuttle/wall/dark,
 /turf/space,
 /area/awaymission/spacebattle/syndicate2)
 "ad" = (
@@ -73,7 +72,6 @@
 /turf/simulated/floor,
 /area/awaymission/spacebattle/syndicate2)
 "av" = (
-/turf/simulated/shuttle/wall/dark,
 /turf/space,
 /area/awaymission/spacebattle/syndicate3)
 "aw" = (
@@ -132,7 +130,6 @@
 /turf/simulated/floor,
 /area/awaymission/spacebattle/syndicate2)
 "aP" = (
-/turf/simulated/shuttle/wall/dark,
 /turf/space,
 /area/awaymission/spacebattle/syndicate1)
 "aQ" = (
@@ -307,7 +304,6 @@
 /turf/simulated/floor/plating,
 /area/awaymission/spacebattle/syndicate1)
 "bJ" = (
-/turf/simulated/shuttle/wall/dark,
 /turf/space,
 /area/awaymission/spacebattle/cruiser)
 "bK" = (
@@ -812,7 +808,6 @@
 /turf/simulated/floor/plating,
 /area/awaymission/spacebattle/cruiser)
 "et" = (
-/turf/simulated/shuttle/wall/dark,
 /turf/space,
 /area/awaymission/spacebattle/syndicate4)
 "eu" = (
@@ -1196,7 +1191,6 @@
 	},
 /area/awaymission/spacebattle/syndicate7)
 "gV" = (
-/turf/simulated/shuttle/wall/dark,
 /turf/space,
 /area/awaymission/spacebattle/syndicate7)
 "gW" = (
@@ -1561,7 +1555,6 @@
 /turf/simulated/shuttle/wall/dark,
 /area)
 "iE" = (
-/turf/simulated/shuttle/wall/dark,
 /turf/space,
 /area)
 "iF" = (
@@ -1594,7 +1587,6 @@
 	},
 /area)
 "iL" = (
-/turf/simulated/shuttle/wall/dark,
 /turf/space,
 /area/awaymission/spacebattle/syndicate5)
 "iM" = (
@@ -1644,7 +1636,6 @@
 /turf/space,
 /area/awaymission/spacebattle/syndicate5)
 "jc" = (
-/turf/simulated/shuttle/wall/dark,
 /turf/space,
 /area/awaymission/spacebattle/syndicate6)
 "jd" = (

diff --git a/maps/away_missions/archive/stationCollision.dmm b/maps/away_missions/archive/stationCollision.dmm
@@ -109,7 +109,6 @@
 /turf/simulated/shuttle/wall/dark,
 /area/awaymission/syndishuttle)
 "aD" = (
-/turf/simulated/shuttle/wall/dark,
 /turf/space,
 /area/awaymission/syndishuttle)
 "aH" = (
@@ -285,7 +284,6 @@
 /turf/simulated/shuttle/plating,
 /area/awaymission/syndishuttle)
 "bF" = (
-/turf/simulated/floor/airless,
 /turf/simulated/shuttle/wall{
 	dir = 4;
 	icon_state = "diagonalWall3"
@@ -1370,7 +1368,6 @@
 /turf/simulated/shuttle/plating,
 /area/awaymission/arrivalblock)
 "fT" = (
-/turf/space,
 /turf/simulated/shuttle/wall,
 /area/awaymission/arrivalblock)
 "fU" = (

diff --git a/maps/minitest/levels/minitest.dmm b/maps/minitest/levels/minitest.dmm
@@ -2898,12 +2898,10 @@
 /area/shuttle/webdemo)
 "hA" = (
 /obj/structure/shuttle/engine/heater,
-/turf/space,
 /turf/simulated/shuttle/plating/carry,
 /area/shuttle/webdemo)
 "hB" = (
 /obj/structure/shuttle/engine/propulsion,
-/turf/space,
 /turf/simulated/shuttle/plating/carry,
 /area/shuttle/webdemo)
 "hC" = (
@@ -2914,7 +2912,6 @@
 /obj/machinery/ion_engine{
 	dir = 1
 	},
-/turf/space,
 /turf/simulated/shuttle/plating/carry,
 /area/shuttle/overmapdemo)
 "hH" = (
@@ -3106,7 +3103,6 @@
 /area/space)
 "sA" = (
 /obj/structure/shuttle/engine/heater,
-/turf/space,
 /turf/simulated/shuttle/plating/carry,
 /area/shuttle/multidemo)
 "ts" = (
@@ -3621,7 +3617,6 @@
 /area/medical/medbay)
 "Pg" = (
 /obj/structure/shuttle/engine/propulsion,
-/turf/space,
 /turf/simulated/shuttle/plating/carry,
 /area/shuttle/multidemo)
 "Ps" = (

diff --git a/maps/rift/engines/burn.dmm b/maps/rift/engines/burn.dmm
@@ -170,7 +170,6 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor,
-/turf/simulated/floor,
 /area/template_noop)
 "gK" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
@@ -292,7 +291,6 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor,
-/turf/simulated/floor,
 /area/template_noop)
 "nL" = (
 /obj/machinery/atmospherics/pipe/simple/visible/purple{
@@ -534,14 +532,12 @@
 /area/engineering/engine_room)
 "Ab" = (
 /turf/simulated/floor,
-/turf/simulated/floor,
 /area/template_noop)
 "Ao" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /turf/simulated/floor,
-/turf/simulated/floor,
 /area/template_noop)
 "AP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{

diff --git a/maps/rift/engines/rust.dmm b/maps/rift/engines/rust.dmm
@@ -172,11 +172,9 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor,
-/turf/simulated/floor,
 /area/template_noop)
 "iJ" = (
 /turf/simulated/floor,
-/turf/simulated/floor,
 /area/template_noop)
 "iN" = (
 /obj/fiftyspawner/tritium,
@@ -962,7 +960,6 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor,
-/turf/simulated/floor,
 /area/template_noop)
 "Pm" = (
 /obj/machinery/light{
@@ -1027,7 +1024,6 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor,
-/turf/simulated/floor,
 /area/template_noop)
 "Ta" = (
 /turf/simulated/floor/reinforced/airless,

diff --git a/maps/sectors/admin_planets_192/croatoan.dmm b/maps/sectors/admin_planets_192/croatoan.dmm
@@ -6931,7 +6931,6 @@
 /area/admin_planet/croatoan/sec_holding_cells)
 "yj" = (
 /obj/structure/reagent_dispensers/virusfood,
-/turf/simulated/floor/reinforced,
 /turf/simulated/wall/durasteel,
 /area/admin_planet/croatoan/high_sec_science_virology_lab)
 "yl" = (
@@ -14126,7 +14125,6 @@
 /turf/simulated/floor/cult,
 /area/admin_planet/croatoan/extreme_security_containment_facilities)
 "Xt" = (
-/turf/simulated/floor/reinforced,
 /turf/simulated/wall/durasteel,
 /area/admin_planet/croatoan/high_sec_science_virology_lab)
 "Xv" = (

diff --git a/maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm b/maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm
@@ -48,7 +48,6 @@
 /obj/machinery/atmospherics/component/unary/engine{
 	dir = 8
 	},
-/turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
 /area/submap/debrisfield_vr/tinyshuttle/engine)
 "ai" = (
@@ -1055,7 +1054,6 @@
 /turf/simulated/floor/reinforced/airless,
 /area/submap/debrisfield_vr/tinyshuttle/hangar)
 "cb" = (
-/turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
 /area/submap/debrisfield_vr/tinyshuttle/hangar)
 "cc" = (
@@ -1093,7 +1091,6 @@
 /area/submap/debrisfield_vr/tinyshuttle/engine)
 "cf" = (
 /obj/item/material/shard/phoron,
-/turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
 /area/submap/debrisfield_vr/tinyshuttle/hangar)
 "cg" = (
@@ -1117,7 +1114,6 @@
 "ci" = (
 /obj/structure/lattice,
 /mob/living/simple_mob/mechanical/combat_drone/lesser,
-/turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
 /area/submap/debrisfield_vr/tinyshuttle/hangar)
 "cj" = (
@@ -1139,7 +1135,6 @@
 /area/submap/debrisfield_vr/tinyshuttle/crew)
 "cl" = (
 /obj/effect/decal/mecha_wreckage/baron,
-/turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
 /area/submap/debrisfield_vr/tinyshuttle/hangar)
 "cm" = (

diff --git a/maps/submaps/level_specific/virgo2/Blackshuttledown.dmm b/maps/submaps/level_specific/virgo2/Blackshuttledown.dmm
@@ -28,7 +28,6 @@
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/Blackshuttledown)
 "ai" = (
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark6";
 	name = "Unknown Shuttle"
@@ -41,7 +40,6 @@
 	},
 /area/submap/virgo2/Blackshuttledown)
 "ak" = (
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark10";
 	name = "Unknown Shuttle"
@@ -114,7 +112,6 @@
 /turf/simulated/floor/tiled/steel,
 /area/submap/virgo2/Blackshuttledown)
 "au" = (
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark5";
 	name = "Unknown Shuttle"
@@ -141,7 +138,6 @@
 /turf/simulated/floor/tiled/steel,
 /area/submap/virgo2/Blackshuttledown)
 "az" = (
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /turf/simulated/shuttle/wall/dark{
 	icon_state = "dark9";
 	name = "Unknown Shuttle"