From 3449f5175dc21fa5b34a60c3067a5e8c7fbfa76c Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Mon, 22 Apr 2024 16:33:14 -0400 Subject: [PATCH] ci: add maplints/fix matching stacked disposals/pipes (#25120) --- .../map_files/RandomRuins/SpaceRuins/onehalf.dmm | 15 +-------------- _maps/map_files/stations/boxstation.dmm | 2 -- _maps/map_files/stations/cerestation.dmm | 7 ------- _maps/map_files/stations/deltastation.dmm | 14 -------------- _maps/map_files/stations/metastation.dmm | 16 +--------------- .../maplint/lints/stacked_matching_disposals.yml | 4 ++++ tools/maplint/lints/stacked_matching_pipes.yml | 9 +++++++++ 7 files changed, 15 insertions(+), 52 deletions(-) create mode 100644 tools/maplint/lints/stacked_matching_disposals.yml create mode 100644 tools/maplint/lints/stacked_matching_pipes.yml diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm index 9cca10a3239..da0e0f1d570 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm @@ -259,7 +259,6 @@ /area/ruin/space/onehalf/hallway) "aM" = ( /obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor{ id_tag = "bayint1"; name = "mining drone bay blast door" @@ -636,9 +635,6 @@ /area/ruin/space/onehalf/hallway) "bA" = ( /obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -653,15 +649,6 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/onehalf/drone_bay) -"bC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/space/onehalf/drone_bay) "bD" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -1643,7 +1630,7 @@ aD aq aX bm -bC +bn bT aa cn diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 57c028ebbfc..31bfcbabf97 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -52972,7 +52972,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment, /obj/structure/sign/securearea{ pixel_x = -32 }, @@ -74887,7 +74886,6 @@ /area/station/maintenance/apmaint) "owP" = ( /obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating/airless, /area/station/maintenance/asmaint) "oxe" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index b5c68898d43..a66c0aa95ce 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -41465,9 +41465,6 @@ name = "Port Asteroid Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -65218,7 +65215,6 @@ /turf/simulated/wall, /area/station/hallway/primary/aft/west) "nOU" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance/external{ name = "External Airlock Access" }, @@ -85428,9 +85424,6 @@ name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index e890932b2be..37a1dedd289 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -10845,7 +10845,6 @@ /area/station/maintenance/incinerator) "aLk" = ( /obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -11828,7 +11827,6 @@ }, /area/station/service/bar) "aOd" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, @@ -70042,9 +70040,6 @@ /area/station/command/office/hop) "gFa" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ dir = 4 @@ -82625,15 +82620,6 @@ }, /area/station/security/prison/cell_block) "ont" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index e45238c442c..2876dab601b 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -71465,20 +71465,6 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) -"oDZ" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "oEe" = ( /obj/machinery/atmospherics/trinary/filter{ dir = 4; @@ -115249,7 +115235,7 @@ nBj cgt cdT wfa -oDZ +bqQ cCj cdT kNJ diff --git a/tools/maplint/lints/stacked_matching_disposals.yml b/tools/maplint/lints/stacked_matching_disposals.yml new file mode 100644 index 00000000000..d12befb8a3c --- /dev/null +++ b/tools/maplint/lints/stacked_matching_disposals.yml @@ -0,0 +1,4 @@ +/obj/structure/disposalpipe/segment: + banned_neighbors: + /obj/structure/disposalpipe/segment: + identical: true diff --git a/tools/maplint/lints/stacked_matching_pipes.yml b/tools/maplint/lints/stacked_matching_pipes.yml new file mode 100644 index 00000000000..b89d6366ecc --- /dev/null +++ b/tools/maplint/lints/stacked_matching_pipes.yml @@ -0,0 +1,9 @@ +/obj/machinery/atmospherics/pipe/simple/hidden: + banned_neighbors: + /obj/machinery/atmospherics/pipe/simple/hidden: + identical: true + +/obj/machinery/atmospherics/pipe/simple/visible: + banned_neighbors: + /obj/machinery/atmospherics/pipe/simple/visible: + identical: true