From 03bb726a801cff99ea4a93db0917da999e4a8bc0 Mon Sep 17 00:00:00 2001 From: san7890 Date: Wed, 8 Mar 2023 17:51:06 -0700 Subject: [PATCH] Lints for Empty Variable-Edit "List" in the TGM Syntax + Fixes Occurrence in Codebase (#73831) ## About The Pull Request Caused by #73758 due to improper search-and-delete (presumably) without running mapmerge or something to catch it, very sad. Let's add a linter to make sure this doesn't occur again. More information on what exactly was broken may be found here: https://github.com/tgstation/tgstation/pull/73758#issuecomment-1457508565 ## Why It's Good For The Game ![image](https://user-images.githubusercontent.com/34697715/223326428-7f02ea8d-a881-4fa8-b87d-717b39e1fff2.png) makes me sad to see it, it's ugly, and mapmerge will fix it away anyways over the next few months since it's an invalid/bugged case. let's just prevent it from happening again. (hopefully this hasn't been impacting the map loader at all? i don't see why it would but I know this case isn't exactly accounted for). i noticed that we're able to flatten a lot more keys now as well since we don't have literally nothing preventing that flattening, which is a plus. ## Changelog Nothing that concerns players. --- .../lavaland_surface_syndicate_base1.dmm | 6 +- .../map_files/Deltastation/DeltaStation2.dmm | 202 +++++------------- _maps/map_files/generic/CentCom.dmm | 21 +- _maps/shuttles/arrival_delta.dmm | 9 +- _maps/shuttles/emergency_delta.dmm | 6 +- tools/ci/check_grep.sh | 6 + 6 files changed, 75 insertions(+), 175 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 335a52546d0..7d6731e1668 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -4184,8 +4184,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/ruin/syndicate_lava_base/dormitories) "RK" = ( /turf/open/floor/iron, @@ -4397,8 +4396,7 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/ruin/syndicate_lava_base/dormitories) "Vp" = ( /obj/effect/decal/cleanable/dirt, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index def0345f035..e1f5714703f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -209,8 +209,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/locker) "act" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ @@ -2043,14 +2042,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"avT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - }, -/area/station/commons/locker) "avX" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 @@ -2557,8 +2548,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/hallway/primary/central/aft) "aCS" = ( /obj/machinery/door/airlock/external{ @@ -2976,8 +2966,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/command/heads_quarters/ce) "aHF" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -3574,8 +3563,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/toilet/locker) "aPl" = ( /obj/effect/turf_decal/tile/neutral{ @@ -3900,8 +3888,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "aUo" = ( /obj/effect/turf_decal/tile/neutral/full, @@ -5450,8 +5437,7 @@ "bmq" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/security/courtroom) "bmt" = ( /obj/structure/table, @@ -5890,14 +5876,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/office) -"brY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron{ - }, -/area/station/maintenance/port/aft) "brZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -6176,8 +6154,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/department/science) "bvj" = ( /obj/effect/decal/cleanable/dirt, @@ -6965,8 +6942,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/toilet/locker) "bEN" = ( /obj/structure/cable, @@ -6999,8 +6975,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/locker) "bFb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -7602,8 +7577,7 @@ dir = 8 }, /obj/structure/cable, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "bLo" = ( /obj/structure/disposalpipe/segment, @@ -9294,13 +9268,6 @@ }, /turf/open/floor/iron/checker, /area/station/service/bar/backroom) -"cfs" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron{ - }, -/area/station/commons/locker) "cfu" = ( /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai_upload) @@ -11105,8 +11072,7 @@ "cBN" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/security/courtroom) "cBT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -12847,8 +12813,7 @@ dir = 8 }, /obj/effect/spawner/random/structure/girder, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "cYD" = ( /obj/structure/closet/secure_closet/security/sec, @@ -13948,8 +13913,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "dnW" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ @@ -17379,8 +17343,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/command/heads_quarters/ce) "egU" = ( /obj/machinery/conveyor{ @@ -18262,8 +18225,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/command/heads_quarters/ce) "erZ" = ( /obj/structure/chair/office{ @@ -18719,8 +18681,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/locker) "exf" = ( /obj/effect/decal/cleanable/blood/old, @@ -19370,8 +19331,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/locker) "eHi" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -20773,8 +20733,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "eXN" = ( /obj/machinery/vending/wardrobe/engi_wardrobe, @@ -25049,8 +25008,7 @@ }, /obj/machinery/duct, /obj/structure/cable, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/department/science) "fZO" = ( /turf/open/floor/engine/vacuum, @@ -30905,8 +30863,7 @@ dir = 4 }, /obj/machinery/light/directional/north, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/locker) "hwC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31121,8 +31078,7 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/locker) "hzJ" = ( /obj/machinery/ai_slipper{ @@ -37200,8 +37156,7 @@ }, /obj/structure/extinguisher_cabinet/directional/north, /obj/item/radio/intercom/directional/west, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/locker) "jbG" = ( /obj/structure/rack, @@ -37957,8 +37912,7 @@ /area/station/medical/paramedic) "jjU" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "jjX" = ( /obj/item/storage/medkit/fire, @@ -38267,8 +38221,7 @@ /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/security/courtroom) "jnd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39862,8 +39815,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "jFz" = ( /obj/machinery/light/small/directional/east, @@ -46113,8 +46065,7 @@ dir = 4 }, /obj/structure/cable, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/hallway/primary/central/aft) "lgg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48196,8 +48147,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "lGU" = ( /obj/effect/decal/cleanable/dirt, @@ -50145,8 +50095,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/locker) "mgY" = ( /turf/open/floor/glass/reinforced, @@ -53494,8 +53443,7 @@ /obj/machinery/duct, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/toilet/locker) "mWF" = ( /obj/structure/cable, @@ -56173,8 +56121,7 @@ }, /obj/structure/closet, /obj/effect/spawner/random/maintenance/two, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/department/science) "nGS" = ( /obj/structure/cable, @@ -56712,8 +56659,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/fore) "nMT" = ( /obj/effect/decal/cleanable/dirt, @@ -57738,8 +57684,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/locker) "oaE" = ( /obj/structure/cable, @@ -59722,13 +59667,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) -"oBO" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron{ - }, -/area/station/maintenance/port/aft) "oBX" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/tile/neutral{ @@ -64175,8 +64113,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/duct, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/locker) "pIj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69490,8 +69427,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/toilet/locker) "qVJ" = ( /obj/machinery/disposal/bin, @@ -70675,8 +70611,7 @@ dir = 1 }, /obj/effect/decal/cleanable/cobweb, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "rlL" = ( /obj/effect/turf_decal/tile/blue, @@ -71110,8 +71045,7 @@ "rrF" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/security/courtroom) "rrL" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, @@ -75815,8 +75749,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/hallway/primary/central/aft) "sAh" = ( /obj/effect/spawner/structure/window, @@ -76057,8 +75990,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/locker) "sDk" = ( /obj/structure/disposalpipe/segment, @@ -78145,8 +78077,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/locker) "tcc" = ( /obj/structure/cable, @@ -84298,8 +84229,7 @@ dir = 1 }, /obj/effect/spawner/random/structure/steam_vent, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "uBA" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -85942,13 +85872,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/science) -"uXs" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron{ - }, -/area/station/commons/locker) "uXy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -86179,13 +86102,6 @@ /obj/machinery/vending/wallmed/directional/west, /turf/open/floor/iron, /area/station/command/gateway) -"uZS" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron{ - }, -/area/station/maintenance/port/aft) "uZV" = ( /obj/effect/turf_decal/plaque{ icon_state = "L6" @@ -87010,8 +86926,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "vkG" = ( /obj/effect/turf_decal/tile/yellow{ @@ -87060,8 +86975,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/landmark/event_spawn, /obj/effect/landmark/xeno_spawn, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "vkN" = ( /obj/structure/cable, @@ -93645,8 +93559,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/commons/toilet/locker) "wMx" = ( /obj/structure/chair/sofa/bench{ @@ -94856,8 +94769,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/command/heads_quarters/ce) "xex" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -95246,8 +95158,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/fore) "xjd" = ( /obj/structure/cable, @@ -95290,8 +95201,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "xjR" = ( /obj/structure/disposalpipe/segment, @@ -96365,8 +96275,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/command/heads_quarters/ce) "xyb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -99147,8 +99056,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/station/maintenance/port/aft) "yho" = ( /obj/structure/table/wood, @@ -128748,7 +128656,7 @@ xoR lou syJ kzc -brY +tlV dBs bvP ihO @@ -131319,8 +131227,8 @@ heP amy aKp qSJ -oBO -brY +iKd +tlV tTg sGI afK @@ -132612,7 +132520,7 @@ pUi bsN joB qQM -uZS +qBk jFp vkM jjU @@ -147205,7 +147113,7 @@ gwT rYA jbC ewZ -uXs +fse tcb oaB cXv @@ -147718,9 +147626,9 @@ rYA rYA rYA hwB -avT +oOx nVB -cfs +xCF mgX kbQ oCP diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 40a342dc412..c926267077c 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -205,8 +205,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/centcom/tdome/observation) "bi" = ( /turf/open/floor/iron/white, @@ -656,8 +655,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/centcom/tdome/observation) "el" = ( /obj/structure/filingcabinet/medical, @@ -4139,8 +4137,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/centcom/central_command_areas/control) "tN" = ( /obj/effect/turf_decal/tile/green{ @@ -4936,8 +4933,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/centcom/central_command_areas/control) "xo" = ( /obj/effect/turf_decal/tile/green, @@ -6143,8 +6139,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/centcom/tdome/observation) "DF" = ( /obj/structure/sign/warning/no_smoking, @@ -7408,8 +7403,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/centcom/tdome/observation) "Nn" = ( /obj/structure/table/reinforced, @@ -8204,8 +8198,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/centcom/tdome/observation) "Rj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm index 68cb5b736dd..a37cc0afa06 100644 --- a/_maps/shuttles/arrival_delta.dmm +++ b/_maps/shuttles/arrival_delta.dmm @@ -157,8 +157,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/shuttle/arrival) "p" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -184,8 +183,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/shuttle/arrival) "s" = ( /obj/machinery/holopad, @@ -257,8 +255,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/shuttle/arrival) "B" = ( /obj/structure/table/reinforced, diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index b9e8ead1059..ad6cc48f8e8 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -193,8 +193,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/shuttle/escape) "ap" = ( /obj/item/kirbyplants{ @@ -956,8 +955,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - }, +/turf/open/floor/iron, /area/shuttle/escape) "cB" = ( /obj/structure/chair/comfy/shuttle{ diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index af2fd163ed9..a4c1ee751f7 100644 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -205,6 +205,12 @@ fi; if [ "$pcre2_support" -eq 1 ]; then section "regexes requiring PCRE2" + part "empty variable values" + if $grep -PU '{\n\t},' $map_files; then + echo + echo -e "${RED}ERROR: Empty variable value list detected in map file. Please remove the curly brackets entirely.${NC}" + st=1 + fi; part "to_chat sanity" if $grep -P 'to_chat\((?!.*,).*\)' $code_files; then echo