From 7103f24438dad477b16a601d3375d7e0a835ac9c Mon Sep 17 00:00:00 2001 From: HowToLoLu Date: Tue, 10 Sep 2024 20:21:43 -0500 Subject: [PATCH 1/5] despaces prison on fland --- _maps/map_files/FlandStation/FlandStation.dmm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm index 0de0b73ac4ee4..50a162e797a21 100644 --- a/_maps/map_files/FlandStation/FlandStation.dmm +++ b/_maps/map_files/FlandStation/FlandStation.dmm @@ -95213,10 +95213,15 @@ /turf/open/floor/grass, /area/hallway/secondary/entry) "xOR" = ( +/obj/effect/spawner/structure/window/reinforced/prison, +/obj/machinery/door/poddoor/preopen{ + id = "Prisongate"; + name = "Prison blast door" + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, -/turf/open/space/basic, +/turf/open/floor/plating, /area/security/prison) "xOV" = ( /obj/structure/sign/warning/vacuum/external, From 0a64e70589500db7c6045a7dc007c46f9dae756f Mon Sep 17 00:00:00 2001 From: HowToLoLu Date: Tue, 10 Sep 2024 20:49:03 -0500 Subject: [PATCH 2/5] capitalization, seriously? --- _maps/map_files/FlandStation/FlandStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm index 50a162e797a21..0c8da73e46f2a 100644 --- a/_maps/map_files/FlandStation/FlandStation.dmm +++ b/_maps/map_files/FlandStation/FlandStation.dmm @@ -95216,7 +95216,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" From 8a29aa0bac146d282e4395ba0cdc8722b7df72ed Mon Sep 17 00:00:00 2001 From: HowToLoLu Date: Wed, 11 Sep 2024 11:44:54 -0500 Subject: [PATCH 3/5] don't knock it till you try it? --- tools/maplint/lints/space_check.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 tools/maplint/lints/space_check.yml diff --git a/tools/maplint/lints/space_check.yml b/tools/maplint/lints/space_check.yml new file mode 100644 index 0000000000000..217a934ee32d5 --- /dev/null +++ b/tools/maplint/lints/space_check.yml @@ -0,0 +1,5 @@ +help: "Space is only allowed next to specific types" +/turf/open/space: + banned_neighbors: + - /obj/machinery/door + - /obj/effect/spawner/structure/window From 6480554f790d88c6fe342f9ed72e254fe11202a2 Mon Sep 17 00:00:00 2001 From: HowToLoLu Date: Wed, 11 Sep 2024 12:24:21 -0500 Subject: [PATCH 4/5] fixing linted errors --- _maps/RandomZLevels/undergroundoutpost45.dmm | 6 +- _maps/map_files/CorgStation/CorgStation.dmm | 2 +- .../map_files/Deltastation/DeltaStation2.dmm | 201 +++--------------- _maps/map_files/generic/CentCom.dmm | 18 +- 4 files changed, 41 insertions(+), 186 deletions(-) diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 8e823527c10bc..98068803b20a0 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -149,10 +149,6 @@ name = "Cave Floor" }, /area/awaymission/undergroundoutpost45/research) -"bd" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/space, -/area/awaymission/undergroundoutpost45/central) "be" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Office"; @@ -43375,7 +43371,7 @@ Ba Kj Mr aD -bd +qE uO Or qE diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm index 96863b1cf8f29..038ec31ca3030 100644 --- a/_maps/map_files/CorgStation/CorgStation.dmm +++ b/_maps/map_files/CorgStation/CorgStation.dmm @@ -22907,7 +22907,7 @@ /obj/machinery/door/poddoor{ id = "deathdoor" }, -/turf/open/space/basic, +/turf/open/floor/plating, /area/security/execution/education) "hoR" = ( /obj/structure/cable/yellow{ diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 3b772282a8e01..cdd3b61c02dae 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -13534,7 +13534,7 @@ }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced, -/turf/open/space/basic, +/turf/open/floor/plating, /area/quartermaster/storage) "bPv" = ( /obj/item/kirbyplants/random, @@ -27221,10 +27221,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hos) -"dyQ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/maintenance/starboard/aft) "dyT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -47773,12 +47769,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/library) -"jje" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/maintenance/port/aft) "jjk" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 9 @@ -50612,13 +50602,6 @@ /mob/living/basic/cockroach, /turf/open/floor/wood, /area/vacant_room/office) -"kej" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/maintenance/starboard/fore) "keP" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -62257,13 +62240,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"nQh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/maintenance/port) "nQl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -63820,10 +63796,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) -"orn" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/iron, -/area/maintenance/aft) "orI" = ( /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom{ @@ -65858,10 +65830,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/central) -"paG" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/maintenance/aft) "paK" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -68652,12 +68620,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"pWU" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/maintenance/starboard/aft) "pXs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -73513,21 +73475,6 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"rwT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/central) "rwY" = ( /obj/structure/closet/cardboard, /obj/item/storage/toolbox/mechanical, @@ -80524,13 +80471,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/brig/medbay) -"tDp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/maintenance/port/aft) "tDJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -81258,25 +81198,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"tSy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/central) "tSI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -84010,19 +83931,6 @@ /obj/item/storage/briefcase, /turf/open/floor/carpet/grimy, /area/vacant_room/office) -"uMP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/central) "uMW" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -87430,9 +87338,6 @@ }, /turf/open/floor/iron, /area/medical/patients_rooms) -"vQJ" = ( -/turf/open/floor/iron, -/area/maintenance/aft) "vQV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -87884,13 +87789,6 @@ }, /turf/open/floor/iron, /area/engine/atmospherics_engine) -"vXu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/maintenance/starboard/aft) "vXI" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/machinery/newscaster{ @@ -90998,13 +90896,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"wQF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/maintenance/port) "wQP" = ( /obj/item/kirbyplants/random, /obj/machinery/airalarm/directional/south{ @@ -91569,12 +91460,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/security/main) -"xcC" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/maintenance/starboard/fore) "xcD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -92334,12 +92219,6 @@ luminosity = 2 }, /area/security/main) -"xoi" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/maintenance/port) "xov" = ( /obj/item/kirbyplants/random, /obj/item/radio/intercom{ @@ -93892,18 +93771,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"xNf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/maintenance/port/aft) "xNg" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -116503,7 +116370,7 @@ cea cea cea caE -nQh +mZU xUI caE caE @@ -117017,7 +116884,7 @@ caE cWO caE caE -nQh +mZU cea caE dyW @@ -122930,7 +122797,7 @@ gdd vrP dce cMY -xoi +ahg pRU caE caE @@ -124515,7 +124382,7 @@ dLW tHM fjS nPV -tDp +grG dLW ecQ edl @@ -125774,7 +125641,7 @@ jiI ceb evv cea -wQF +lGz tCh dHe guv @@ -125999,7 +125866,7 @@ vWF gQW xzY caG -nQh +mZU cea tBD cMY @@ -127591,9 +127458,9 @@ skB dUg dUX xWv -xNf +fjS xIS -xNf +fjS riy gTw xDk @@ -127855,7 +127722,7 @@ dZg dYu dYu dZg -tDp +grG dLW ecQ edl @@ -131913,7 +131780,7 @@ qDG cHL cIF pkr -uMP +klf cNp cPa kyv @@ -131951,8 +131818,8 @@ oSm eGz dZg dNt -tDp -jje +grG +dvz dYu jgN dST @@ -137993,8 +137860,8 @@ xBm aiC ajj apw -kej -xcC +aOh +bwY xnW aig apw @@ -138595,7 +138462,7 @@ cvz cHT cxf bqW -tSy +csO ygm pDS pDS @@ -141206,7 +141073,7 @@ wIC fvp hFN hrC -vQJ +jXV dNT qYo aaa @@ -141720,7 +141587,7 @@ bkC rmK dPq pkR -vQJ +jXV dNT aaa wiQ @@ -141926,7 +141793,7 @@ bsW bvK cvM qHd -rwT +aTr cAm cBO oyy @@ -141976,8 +141843,8 @@ bkC nje mRg dPq -orn -vQJ +lFi +jXV dNT qYo wiQ @@ -142490,7 +142357,7 @@ dPq dPq dPq dPq -vQJ +jXV rDi dNT qYo @@ -142697,7 +142564,7 @@ pMO bsW cvM vll -rwT +aTr cAm sqY bKI @@ -143260,7 +143127,7 @@ rDi rDi dNS rDi -paG +gLi dNS dNS dNS @@ -143481,7 +143348,7 @@ wYb xPI jrz jZE -dyQ +diU kkL pJR fbX @@ -144027,9 +143894,9 @@ dNS eaM rDi hxe -paG +gLi sfI -vQJ +jXV sfI rDi dNS @@ -145026,8 +144893,8 @@ kUG mIs cIW cIW -vXu -vXu +rOD +rOD cIW dmf cHW @@ -146589,7 +146456,7 @@ cHU cHU cHU eRy -pWU +mIs wip cIW cIW @@ -147856,7 +147723,7 @@ tli cAw vLn oxV -vXu +rOD cIW cIW cHW @@ -147865,12 +147732,12 @@ mIs dkO cIX hKE -vXu +rOD cNH mIs due -vXu -vXu +rOD +rOD dyT mIs ooY diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index b5ea559ea7f2b..3c9e4f6ef72e4 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -5803,10 +5803,6 @@ /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron/white, /area/centcom/holding) -"wk" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/iron/dark, -/area/centcom/supplypod) "wl" = ( /obj/machinery/light, /turf/open/floor/wood, @@ -13107,7 +13103,7 @@ /area/centcom/control) "XK" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/iron, +/turf/open/floor/plating, /area/centcom/supplypod) "XL" = ( /obj/machinery/door/airlock/wood, @@ -13156,10 +13152,6 @@ }, /turf/open/floor/iron, /area/tdome/tdomeobserve) -"XT" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/space/basic, -/area/centcom/supplypod) "XW" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 @@ -64494,8 +64486,8 @@ Yn Yn Yn Yn -wk -wk +XK +XK Yn Yn Yn @@ -66283,8 +66275,8 @@ RC qx qx qx -XT -XT +XK +XK Yn Yn Yn From 57364d6d9e6cac1751f1a75e111dc5213e68657b Mon Sep 17 00:00:00 2001 From: HowToLoLu Date: Wed, 11 Sep 2024 13:47:48 -0500 Subject: [PATCH 5/5] update the help line to be more accurate --- tools/maplint/lints/space_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/maplint/lints/space_check.yml b/tools/maplint/lints/space_check.yml index 217a934ee32d5..789a39b12cf7c 100644 --- a/tools/maplint/lints/space_check.yml +++ b/tools/maplint/lints/space_check.yml @@ -1,4 +1,4 @@ -help: "Space is only allowed next to specific types" +help: "Space isn't supposed to be under doors or windows" /turf/open/space: banned_neighbors: - /obj/machinery/door