From ea721327997060b64dc72840510b1fd46c79d41f Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sun, 12 Nov 2023 14:19:50 -0500 Subject: [PATCH 1/2] Always something --- maps/groundbase/rp-z1.dmm | 47 +++++++++++++++++++++++++-------------- maps/groundbase/rp-z2.dmm | 7 +----- maps/groundbase/rp-z3.dmm | 5 ++++- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/maps/groundbase/rp-z1.dmm b/maps/groundbase/rp-z1.dmm index eaa98c9eed1..641c016c758 100644 --- a/maps/groundbase/rp-z1.dmm +++ b/maps/groundbase/rp-z1.dmm @@ -16186,6 +16186,19 @@ }, /turf/simulated/floor, /area/groundbase/civilian/arrivals) +"qLn" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor, +/area/groundbase/level1/ne) "qLp" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -17925,7 +17938,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/outdoors/grass/seasonal, +/turf/simulated/floor/outdoors/grass/seasonal/notrees, /area/groundbase/level1/se) "siZ" = ( /obj/structure/mirror{ @@ -35235,15 +35248,15 @@ jUi jUi jUi ddP -eiI -eiI +jUi +jUi bTX rhA rhA rhA bTX -ksX -fdO +jUi +dzL gLQ sdm sdm @@ -35377,7 +35390,6 @@ eiI eiI eiI ddP -eiI jUi jUi jUi @@ -35385,7 +35397,8 @@ jUi jUi jUi jUi -fdO +jUi +dzL ubv uWG uWG @@ -35519,15 +35532,15 @@ xxV eiI xxV ddP -eiI -eiI +jUi +jUi axN dOk dOk dOk axN -eiI -fdO +jUi +dzL deH wZZ sfQ @@ -35669,7 +35682,7 @@ uht rBN axN axN -sfQ +dzL deH sfQ sfQ @@ -35811,7 +35824,7 @@ wwp mii nVR axN -sfQ +dzL deH sfQ sfQ @@ -36379,7 +36392,7 @@ gJY qAC pNQ axN -sfQ +dzL bXj sfQ sfQ @@ -36805,7 +36818,7 @@ nnq mii qCN axN -sfQ +dzL bXj sfQ sfQ @@ -36947,7 +36960,7 @@ cbV uZR axN axN -sfQ +dzL bXj sfQ sfQ @@ -40187,7 +40200,7 @@ dPX ero ero ero -ero +qLn ero ero ero diff --git a/maps/groundbase/rp-z2.dmm b/maps/groundbase/rp-z2.dmm index fa8a5099c65..b677982a967 100644 --- a/maps/groundbase/rp-z2.dmm +++ b/maps/groundbase/rp-z2.dmm @@ -1440,11 +1440,6 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level2/ne) -"fa" = ( -/turf/simulated/floor/outdoors/grass/seasonal{ - outdoors = 0 - }, -/area/groundbase/level2/ne) "fb" = ( /obj/machinery/station_map{ dir = 4; @@ -28052,7 +28047,7 @@ ZF ZF Ng Ng -fa +Ng Ng Jv of diff --git a/maps/groundbase/rp-z3.dmm b/maps/groundbase/rp-z3.dmm index d7d1bbaaf80..75e542fb3c0 100644 --- a/maps/groundbase/rp-z3.dmm +++ b/maps/groundbase/rp-z3.dmm @@ -2934,6 +2934,9 @@ /obj/effect/floor_decal/industrial/stand_clear/red{ dir = 8 }, +/obj/machinery/status_display/supply_display{ + pixel_y = -32 + }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/cargo/bay) "Pv" = ( @@ -18321,7 +18324,7 @@ YB YB YB Pu -nk +Wk Af xF YS From 2eabfe125c223cf6ba236bd25c66a750499efe04 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sun, 12 Nov 2023 15:31:54 -0500 Subject: [PATCH 2/2] 1531 --- maps/groundbase/rp-z1.dmm | 129 ++++++++++++++++++++++++-------------- 1 file changed, 81 insertions(+), 48 deletions(-) diff --git a/maps/groundbase/rp-z1.dmm b/maps/groundbase/rp-z1.dmm index 641c016c758..2462b25678a 100644 --- a/maps/groundbase/rp-z1.dmm +++ b/maps/groundbase/rp-z1.dmm @@ -3669,7 +3669,9 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/storage) "dMt" = ( -/turf/simulated/floor/outdoors/newdirt, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 + }, /area/groundbase/unexplored/rock) "dMz" = ( /obj/machinery/firealarm{ @@ -3710,6 +3712,20 @@ /obj/effect/landmark/start/bartender, /turf/simulated/floor/wood, /area/groundbase/civilian/bar) +"dOT" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/catwalk, +/turf/simulated/floor, +/area/groundbase/level1/ne) "dPT" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/highsecurity{ @@ -8487,7 +8503,9 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/outdoors/newdirt, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 + }, /area/groundbase/level1/ne) "iQN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -14867,6 +14885,20 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) +"pwp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/catwalk, +/turf/simulated/floor, +/area/groundbase/level1/ne) "pxg" = ( /obj/item/weapon/storage/box/bodybags, /obj/item/weapon/storage/box/bodybags, @@ -16672,6 +16704,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor, /area/groundbase/level1/ne) "rfL" = ( @@ -36796,7 +36829,7 @@ kgt qVR awx awx -eBk +irP ftw amy amy @@ -36938,7 +36971,7 @@ iGE qVR amy amy -eBk +irP rfx amy amy @@ -37080,7 +37113,7 @@ amy jSa amy amy -eBk +irP rfx amy amy @@ -37215,16 +37248,16 @@ xuw mXP iGE amy -eBk -eBk -eBk -eBk +irP +irP +irP +irP jSa -eBk -eBk -eBk +irP +irP +irP rfx -amy +irP amy amy amy @@ -37357,16 +37390,16 @@ nyp rDy iGE amy -eBk -eBk -eBk -eBk +irP +irP +irP +irP jSa -eBk -eBk -eBk +irP +irP +irP rfx -amy +irP amy amy amy @@ -37498,8 +37531,8 @@ sbh fFQ gWe iGE -eBk -eBk +irP +irP amy amy amy @@ -37507,8 +37540,8 @@ cMq gfG amy iPP -rfx -amy +pwp +dOT amy amy amy @@ -37640,13 +37673,13 @@ iGE ykP iGE iGE -eBk -eBk -amy -amy -amy +irP +irP amy -jSa +lBC +lBC +lBC +uAa lBC lBC lBC @@ -37782,7 +37815,7 @@ xib eZY teZ amy -eBk +irP amy amy lBC @@ -37924,7 +37957,7 @@ ifE jcv teZ amy -eBk +irP amy amy lBC @@ -38066,11 +38099,11 @@ fCe sKx teZ amy -eBk -amy +irP amy lBC lBC +lBC wvw kYg uPB @@ -38208,9 +38241,9 @@ teZ oRI teZ amy -eBk -amy +irP amy +lBC wye gHZ oeZ @@ -38352,7 +38385,7 @@ awx awx dMt awx -awx +lBC eNh pSX wWY @@ -40195,7 +40228,7 @@ amy amy amy amy -eBk +irP dPX ero ero @@ -40339,15 +40372,15 @@ amy irP irP irP -eBk -eBk -eBk -eBk -eBk -eBk -eBk -eBk -eBk +irP +irP +irP +irP +irP +irP +irP +irP +irP awx awx awx