From ea700eb5d1bc036a5d18a31a604308e4ccfec04d Mon Sep 17 00:00:00 2001 From: Pepsilawn Date: Sat, 26 Feb 2022 19:40:31 +0100 Subject: [PATCH] Removes lattices from our walls (#65150) --- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 6 +---- .../map_files/Deltastation/DeltaStation2.dmm | 6 +---- .../IcemoonUnderground_Above.dmm | 7 +----- _maps/map_files/KiloStation/KiloStation.dmm | 22 +++++++++++++------ _maps/map_files/MetaStation/MetaStation.dmm | 8 +------ _maps/map_files/debug/runtimestation.dmm | 14 +++--------- tools/ci/check_grep.sh | 5 +++++ 7 files changed, 27 insertions(+), 41 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 550bf659261..64bc05942ab 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -588,10 +588,6 @@ /obj/structure/grille, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/ancientstation/medbay) -"bG" = ( -/obj/structure/lattice, -/turf/closed/wall/rust, -/area/ruin/space/has_grav/ancientstation/betastorage) "bH" = ( /obj/machinery/door/firedoor/closed, /obj/effect/decal/cleanable/dirt, @@ -7952,7 +7948,7 @@ mf DF DF br -bG +DF GU DF GU diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index e6882b95227..47b6bf827f0 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -67274,10 +67274,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/engineering/atmos) -"ndj" = ( -/obj/structure/lattice, -/turf/closed/wall, -/area/service/kitchen/abandoned) "ndp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/girder, @@ -156278,7 +156274,7 @@ aaa aad aaa aad -ndj +cqr cqr wom wom diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm index 0e25296f30e..ef827b5e17a 100644 --- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm +++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm @@ -9762,11 +9762,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, /area/service/chapel) -"Fz" = ( -/obj/structure/lattice, -/obj/structure/sign/warning/securearea, -/turf/closed/wall, -/area/icemoon/underground/explored) "FD" = ( /obj/structure/chair/plastic{ dir = 8 @@ -36882,7 +36877,7 @@ ak Fp Fp Fp -Fz +Xo Rj qs mO diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index ca51fc9dd04..a30784e2f0c 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -21166,7 +21166,6 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "cow" = ( -/obj/structure/lattice, /obj/structure/grille, /turf/closed/wall/r_wall, /area/space/nearstation) @@ -35569,6 +35568,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/cargo/office) +"gGF" = ( +/obj/structure/grille/broken, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "gGG" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -53776,7 +53780,6 @@ /turf/open/floor/engine, /area/engineering/gravity_generator) "mZT" = ( -/obj/structure/lattice, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/closed/wall/rust, /area/space/nearstation) @@ -59488,6 +59491,11 @@ icon_state = "platingdmg1" }, /area/maintenance/disposal/incinerator) +"pjr" = ( +/obj/structure/grille, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "pjy" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -112289,7 +112297,7 @@ aGc cFX dKD aaa -aeo +pjr aaa aaa aaa @@ -113568,9 +113576,9 @@ rko idD alm acm -aaQ +gGF acm -aaQ +gGF aaa aaa aaa @@ -114083,7 +114091,7 @@ idD acK aaa cow -aaQ +gGF cow aaa aaa @@ -115367,7 +115375,7 @@ oNT idD acm aaa -aaQ +gGF aaa aeU aeU diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 7bf0ce94e8b..dbedb289176 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1225,7 +1225,6 @@ /turf/open/floor/plating, /area/security/warden) "ajy" = ( -/obj/structure/lattice, /turf/closed/wall/mineral/plastitanium, /area/hallway/secondary/entry) "ajz" = ( @@ -54612,7 +54611,6 @@ /turf/open/floor/plating, /area/service/chapel) "rch" = ( -/obj/structure/lattice, /turf/closed/wall/mineral/plastitanium, /area/security/prison) "rcl" = ( @@ -54872,10 +54870,6 @@ /obj/item/target/alien, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"rgD" = ( -/obj/structure/lattice, -/turf/closed/wall/r_wall, -/area/medical/virology) "rgE" = ( /obj/item/radio/intercom/directional/south, /obj/structure/rack, @@ -88728,7 +88722,7 @@ dBN dBN dBN cBR -rgD +cBR dBN dBN hRK diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index ef5e244d0d7..ee5e990ca9d 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -26,10 +26,6 @@ "ah" = ( /turf/closed/wall/r_wall, /area/engineering/atmos) -"ai" = ( -/obj/structure/lattice, -/turf/closed/wall/r_wall, -/area/engineering/main) "aj" = ( /turf/closed/wall/r_wall, /area/engineering/main) @@ -1810,10 +1806,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science) -"ge" = ( -/obj/structure/lattice, -/turf/closed/wall/r_wall, -/area/hallway/secondary/entry) "gf" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -5865,7 +5857,7 @@ eh rn eh eh -ge +dY aa aa aa @@ -5957,7 +5949,7 @@ cN LH en dY -ge +dY dY aa aa @@ -7120,7 +7112,7 @@ aa aa aa aa -ai +aj aj aj aj diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index 0c2c8ab3432..7ea796120c0 100755 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -57,6 +57,11 @@ if grep -Pzo '/obj/machinery/power/apc[/\w]*?\{\n[^}]*?pixel_[xy] = -?[013-9]\d* echo "ERROR: found an APC with a manually set pixel_x or pixel_y that is not +-25." st=1 fi; +if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/lattice[/\w]*?,\n[^)]*?/turf/closed/wall[/\w]*?,\n[^)]*?/area/.+?\)' _maps/**/*.dmm; then + echo + echo "ERROR: found lattice stacked with a wall, please remove them." + st=1 +fi; if grep -P '^/area/.+[\{]' _maps/**/*.dmm; then echo "ERROR: Vareditted /area path use detected in maps, please replace with proper paths." st=1