From 311b9da86bce447ed81c2ffc7c49150f522bb00e Mon Sep 17 00:00:00 2001 From: TiviPlus <57223640+TiviPlus@users.noreply.github.com> Date: Mon, 30 Nov 2020 22:12:44 +0100 Subject: [PATCH] grep for pixelx/y = 0 varedits (#54845) Co-authored-by: Jordan Brown --- .../IceRuins/icemoon_surface_engioutpost.dmm | 1 - _maps/RandomZLevels/SnowCabin.dmm | 10 +--------- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 1 - _maps/map_files/MetaStation/MetaStation.dmm | 2 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 17 ++++++++++------- _maps/shuttles/whiteship_kilo.dmm | 3 +-- tools/ci/check_grep.sh | 4 ++++ 7 files changed, 17 insertions(+), 21 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm index 2cf2ab4a196..8d39db24950 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm @@ -795,7 +795,6 @@ /area/icemoon/surface/outdoors) "cj" = ( /obj/structure/sign/poster/official/pda_ad{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/icemoon, diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index 0b791826670..aa9b6a23bfa 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -426,7 +426,6 @@ dir = 4 }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/freezer, @@ -2339,8 +2338,7 @@ /area/awaymission/cabin/caves/mountain) "gp" = ( /obj/structure/sign/poster/contraband/pwr_game{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, @@ -2722,7 +2720,6 @@ /obj/structure/cable, /obj/item/reagent_containers/food/drinks/mug/coco{ desc = "Still hot!"; - pixel_x = 0; pixel_y = -2 }, /obj/item/reagent_containers/food/drinks/mug/coco{ @@ -2907,7 +2904,6 @@ /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/mug/coco{ desc = "Still hot!"; - pixel_x = 0; pixel_y = 2 }, /turf/open/floor/carpet, @@ -3150,7 +3146,6 @@ "io" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -24; - pixel_y = 0 }, /turf/open/floor/wood, /area/awaymission/cabin) @@ -3758,7 +3753,6 @@ desc = "A decent axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."; force = 4; name = "weak hatchet"; - pixel_x = 0; throwforce = 4 }, /obj/item/hatchet{ @@ -3796,7 +3790,6 @@ pixel_y = 4 }, /obj/item/radio/off{ - pixel_x = 0; pixel_y = 4 }, /obj/item/radio/off{ @@ -4075,7 +4068,6 @@ desc = "A decent axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."; force = 4; name = "weak hatchet"; - pixel_x = 0; throwforce = 4 }, /obj/item/hatchet{ diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index c93be8ceff2..d7542402112 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -34631,7 +34631,6 @@ areastring = "/area/crew_quarters/heads/hor"; dir = 1; name = "RD Office APC"; - pixel_x = 0; pixel_y = 25 }, /obj/structure/cable, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 595329adffd..73167021f8c 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -76130,7 +76130,7 @@ "tgQ" = ( /obj/structure/water_source/puddle, /obj/structure/flora/junglebush/large{ - pixel_y = 0 + pixel_y = 1 }, /obj/structure/cable, /turf/open/floor/grass, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 1c009c0d623..fab1a14e94d 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -27612,7 +27612,9 @@ "bwB" = ( /obj/structure/window/reinforced/spawner/west, /obj/structure/window/reinforced/spawner/east, -/obj/structure/flora/junglebush/large, +/obj/structure/flora/junglebush/large{ + pixel_y = 1 + }, /turf/open/floor/grass, /area/medical/medbay/central) "bwC" = ( @@ -29620,8 +29622,8 @@ /obj/structure/window/reinforced/spawner/west, /obj/structure/window/reinforced/spawner/east, /obj/structure/flora/junglebush/large{ - pixel_y = 0 - }, + pixel_y = 1 + }, /obj/structure/flora/grass/jungle, /turf/open/floor/grass, /area/medical/storage) @@ -29651,8 +29653,8 @@ /obj/structure/window/reinforced/spawner, /obj/structure/flora/grass/jungle/b, /obj/structure/flora/junglebush/large{ - pixel_y = 0 - }, + pixel_y = 1 + }, /turf/open/floor/grass, /area/medical/medbay/central) "bCg" = ( @@ -45268,7 +45270,6 @@ /area/maintenance/department/crew_quarters/dorms) "cPT" = ( /obj/machinery/power/apc/auto_name/east{ - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable, @@ -46258,7 +46259,9 @@ "ezx" = ( /obj/structure/window/reinforced/spawner/west, /obj/structure/window/reinforced/spawner/east, -/obj/structure/flora/junglebush/large, +/obj/structure/flora/junglebush/large{ + pixel_y = 1 + }, /turf/open/floor/grass, /area/medical/storage) "ezF" = ( diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm index 488a7090051..0544519e1ab 100644 --- a/_maps/shuttles/whiteship_kilo.dmm +++ b/_maps/shuttles/whiteship_kilo.dmm @@ -74,8 +74,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating, diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index 44a00adb9f8..7573398b364 100644 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -31,6 +31,10 @@ if grep -P '\td[1-2] =' _maps/**/*.dmm; then echo "ERROR: d1/d2 cable variables detected in maps, please remove them." st=1 fi; +echo "Checking for pixel_[xy]" +if grep -P 'pixel_[xy] = 0' _maps/**/*.dmm; then + echo "pixel_x/pixel_y = 0 variables detected in maps, please review to ensure they are not dirty varedits." +fi; echo "Checking for stacked cables" if grep -P '"\w+" = \(\n([^)]+\n)*/obj/structure/cable,\n([^)]+\n)*/obj/structure/cable,\n([^)]+\n)*/area/.+\)' _maps/**/*.dmm; then echo "found multiple cables on the same tile, please remove them."