From 60b71e79a0c739f86f102770d8beaa0d9fc6c836 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Tue, 4 Jul 2023 19:48:25 -0500 Subject: [PATCH] Ratlen't He did it ladies and gentlemen --- .../Pahrump-Sunset/Pahrump-Sunset.dmm | 342 ++++++++++-------- _maps/map_files/Pahrump-Sunset/RedRiver.dmm | 258 ++++++------- 2 files changed, 304 insertions(+), 296 deletions(-) diff --git a/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset.dmm b/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset.dmm index c27bbe9677e..9ff9ef6d3c7 100644 --- a/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset.dmm +++ b/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset.dmm @@ -48,7 +48,7 @@ /obj/effect/decal/marking{ icon_state = "doubleverticalbottom" }, -/turf/closed/indestructible/rock, +/turf/open/indestructible/ground/inside/mountain, /area/f13/tunnel/northeast) "aan" = ( /obj/effect/decal/cleanable/dirt, @@ -117,13 +117,13 @@ }, /area/f13/wasteland/city) "aaz" = ( -/obj/effect/decal/marking{ - icon_state = "doublevertical" - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" }, -/area/f13/tunnel/northeast) +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/city) "aaA" = ( /turf/closed/wall/r_wall/rust, /area/f13/caves) @@ -240,9 +240,7 @@ /area/f13/building/coyote/nash/massfus/groundfloor/east) "aaS" = ( /obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, +/turf/open/indestructible/ground/inside/mountain, /area/f13/tunnel/northeast) "aaT" = ( /turf/open/indestructible/ground/outside/dirt, @@ -15317,6 +15315,16 @@ "bat" = ( /obj/structure/spacevine, /obj/structure/spacevine, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" + }, /turf/open/water, /area/f13/caves) "bau" = ( @@ -16828,6 +16836,11 @@ "bfC" = ( /obj/structure/sink/deep_water, /obj/structure/spacevine, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" + }, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland/city) "bfD" = ( @@ -25606,7 +25619,7 @@ /area/f13/wasteland/city/nash/suburbs) "cwz" = ( /obj/structure/flora/tallgrass1, -/turf/open/water, +/turf/closed/mineral/random/low_chance, /area/f13/caves) "cwC" = ( /obj/effect/turf_decal/weather/dirt{ @@ -46210,7 +46223,7 @@ /turf/open/floor/f13/wood, /area/f13/ruins) "hHx" = ( -/turf/closed/indestructible/rock, +/turf/open/indestructible/ground/inside/mountain, /area/f13/tunnel/northeast) "hHy" = ( /obj/structure/simple_door/room/dirty, @@ -56136,6 +56149,11 @@ /area/f13/wasteland/city/nash/theloop) "keN" = ( /obj/structure/flora/tallgrass1, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" + }, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) "keU" = ( @@ -60547,11 +60565,18 @@ }, /area/f13/wasteland/city) "ljV" = ( -/obj/structure/debris/v1{ - pixel_x = -16 +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" }, -/turf/closed/indestructible/rock, -/area/f13/tunnel/northeast) +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" + }, +/turf/open/water, +/area/f13/caves) "lkl" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/f13/common, @@ -65075,7 +65100,7 @@ /area/f13/underground/cave/coyote/antmound) "mlW" = ( /obj/structure/spacevine, -/turf/closed/indestructible/rock, +/turf/open/indestructible/ground/inside/mountain, /area/f13/tunnel/northeast) "mlY" = ( /obj/structure/flora/grass/wasteland{ @@ -78803,11 +78828,13 @@ }, /area/f13/building/abandoned) "pAP" = ( -/obj/effect/decal/marking{ - icon_state = "doublevertical" +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" }, -/turf/closed/indestructible/rock, -/area/f13/tunnel/northeast) +/turf/closed/mineral/random/low_chance, +/area/f13/caves) "pAQ" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt{ @@ -82576,13 +82603,13 @@ }, /area/f13/wasteland/city/nash/redriverdepotroad) "qBQ" = ( -/obj/structure/debris/v1{ - pixel_x = -16 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" }, -/area/f13/tunnel/northeast) +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland) "qBW" = ( /turf/open/indestructible/ground/outside/dirt{ icon_state = "dirt" @@ -88085,16 +88112,19 @@ }, /area/f13/building/coyote/nash/mall/groundfloor) "rXs" = ( -/obj/effect/decal/marking{ - icon_state = "doublevertical" - }, -/obj/structure/debris/v1{ - pixel_x = -16 +/obj/structure/spacevine, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" }, -/area/f13/tunnel/northeast) +/turf/open/water, +/area/f13/caves) "rXt" = ( /obj/structure/chair/booth{ icon_state = "booth_west_north" @@ -112744,13 +112774,13 @@ /area/f13/building/abandoned) "ydv" = ( /obj/structure/spacevine, -/obj/structure/debris/v1{ - pixel_x = -16 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" }, -/area/f13/tunnel/northeast) +/turf/open/water, +/area/f13/caves) "ydE" = ( /obj/machinery/shower{ dir = 4 @@ -170770,9 +170800,9 @@ aaa aae aae aae -aae -aae -aae +aaB +aaB +aaB aae aae aae @@ -171026,11 +171056,11 @@ kEE aaa aae aae +aaB +aaB +aaB aae -aae -aae -aae -aae +aaB aae aae aae @@ -171282,12 +171312,12 @@ kEE (226,1,1) = {" aaa aae +aaB +aaB aae aae -aae -aae -aae -aae +aaB +aaB aae aae aae @@ -171539,14 +171569,14 @@ kEE (227,1,1) = {" aaa aae +aaB aae +aaB +aaB aae aae -aae -aae -aae -aae -aae +aaB +aaB aae aae aOk @@ -171795,15 +171825,15 @@ kEE "} (228,1,1) = {" aaa +aaB aae -aae -aae -aae -aae -aae -aae -aae -aae +aaB +aaB +aaB +aaB +aaB +aaB +aaB aae aae bna @@ -172052,14 +172082,14 @@ kEE "} (229,1,1) = {" gGm -gGm -gGm -aaf -aaf -aaf -aaf +mlW +mlW +hHx aaf aaf +hHx +hHx +hHx aaf aaf aaf @@ -172310,13 +172340,13 @@ kEE (230,1,1) = {" opW hHx -qBQ -aao -aao -aao aao +hHx +hHx +hHx aao aao +hHx aao aao acL @@ -172568,14 +172598,14 @@ kEE opW hHx hHx -qBQ -dKg -aao -aao -aao -aao aao +mlW +hHx +hHx +hHx aao +hHx +hHx aaf aax aaE @@ -172825,15 +172855,15 @@ kEE opW hHx hHx -ljV +hHx aas aao -aao -dKg +hHx dKg -aas -aao -aao +mlW +hHx +hHx +hHx oFO ozv oFO @@ -173083,15 +173113,15 @@ opW hHx hHx hHx -qBQ -aas -aao -dKg -aao -aao +hHx +hHx +hHx +mlW +hHx +hHx lqh -aao -oFO +hHx +gIw vjU ozv ozv @@ -173337,15 +173367,15 @@ aaa "} (234,1,1) = {" opW -pAP -pAP +hHx +hHx aam -rXs -dKg +hHx +mlW aaS -aaz -aaz -aaz +aao +hHx +aao aao aao xUV @@ -173598,12 +173628,12 @@ mlW hHx hHx hHx -ydv +mlW aaS -aao -aao -aao -aao +hHx +hHx +hHx +hHx aao xUV oFO @@ -173854,14 +173884,14 @@ opW hHx hHx hHx -ydv -aas -aao +mlW +hHx aao aao aao -aas -aao +hHx +hHx +hHx xUV oFO oFO @@ -174111,12 +174141,12 @@ opW hHx hHx hHx -qBQ -aao -aao -aao -aao -aao +hHx +hHx +hHx +hHx +hHx +hHx aao aaf aay @@ -174367,9 +174397,9 @@ aaa opW hHx hHx -qBQ -aao -aao +hHx +hHx +hHx aao aao aao @@ -174622,12 +174652,12 @@ aaa "} (239,1,1) = {" aaf -aaf -aaf -aaf -aaf -aaf -aaf +hHx +hHx +hHx +hHx +hHx +hHx aaf aaf aaf @@ -174635,7 +174665,7 @@ aaf aaf fit vXb -vXb +aaz bfC fit oFI @@ -174880,14 +174910,14 @@ aaa (240,1,1) = {" aaa aae -aae -aae -aae -aae -aae -aae -aae -aae +aaB +aaB +aaB +aaB +aaB +aaB +aaB +aaB aae aOk fit @@ -175137,19 +175167,19 @@ aaa (241,1,1) = {" aaa aae -xzI -xzI +pAP +pAP cwz -iNC -aae +pFn aae aae aae +aaB aae aae hVd -lVH -lVH +qBQ +qBQ aOk aOk heG @@ -175396,15 +175426,15 @@ aaa euu euu xzI -iNC -iNC +ydv +ydv bat -iNC +ydv xzI aae aae -iNC -iNC +ydv +rXs keN aOk bmJ @@ -175656,12 +175686,12 @@ aae aae xzI mKl -xzI -xzI -iNC -iNC -bzQ +ljV +ljV iNC +ydv +ljV +ydv aae adg mdh @@ -175914,10 +175944,10 @@ aae aae aae aae -bzQ -bzQ -iNC -bzQ +xzI +ljV +ydv +xzI aae aae aae diff --git a/_maps/map_files/Pahrump-Sunset/RedRiver.dmm b/_maps/map_files/Pahrump-Sunset/RedRiver.dmm index bfdccd9f2b2..d33cb70cabf 100644 --- a/_maps/map_files/Pahrump-Sunset/RedRiver.dmm +++ b/_maps/map_files/Pahrump-Sunset/RedRiver.dmm @@ -428,9 +428,13 @@ /turf/open/indestructible/ground/outside/savannah/edgesnew, /area/f13/wasteland) "akz" = ( -/obj/structure/spacevine, -/turf/open/indestructible/ground/outside/dirthole, -/area/f13/caves) +/obj/effect/decal/marking{ + icon_state = "doublevertical" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "akB" = ( /obj/structure/car/rubbish1, /obj/effect/decal/cleanable/dirt, @@ -10138,6 +10142,10 @@ }, /turf/open/indestructible/ground/inside/subway, /area/f13/building) +"flm" = ( +/obj/structure/flora/small_bush, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "flw" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -14633,6 +14641,12 @@ icon_state = "floordirty" }, /area/f13/building/abandoned) +"hGP" = ( +/obj/structure/flora/tree/jungle/small{ + color = "#d9b51c" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "hGU" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/f13/outside/road{ @@ -14994,15 +15008,8 @@ /turf/open/floor/carpet/arcade, /area/f13/building/abandoned) "hPy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/spacevine, -/obj/structure/debris/v1{ - pixel_x = -16 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, -/area/f13/caves) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "hPE" = ( /turf/open/indestructible/ground/outside/roaddirt{ dir = 4; @@ -19431,12 +19438,10 @@ /turf/closed/wall/rust, /area/f13/wasteland/city) "jXa" = ( -/obj/effect/decal/marking{ - icon_state = "doubleverticaltop" - }, /obj/effect/decal/cleanable/dirt, -/turf/closed/indestructible/rock, -/area/f13/caves) +/obj/structure/spacevine, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "jXj" = ( /obj/effect/decal/cleanable/oil/slippery, /obj/effect/decal/cleanable/dirt, @@ -19951,15 +19956,7 @@ /obj/effect/decal/marking{ icon_state = "doubleverticalbottom" }, -/obj/structure/debris/v1{ - pixel_x = -16 - }, -/obj/structure/debris/v1{ - pixel_x = -16 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, +/turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "knk" = ( /obj/structure/window/fulltile/house{ @@ -20892,13 +20889,10 @@ /turf/open/floor/plating/rust, /area/f13/building) "kMn" = ( -/obj/effect/decal/marking{ - icon_state = "doublevertical" - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/closed/indestructible/rock, -/area/f13/caves) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "kMp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -26121,11 +26115,9 @@ }, /area/f13/wasteland/city) "nCK" = ( -/obj/effect/decal/marking{ - icon_state = "doubleverticalcorroded" - }, -/turf/closed/indestructible/rock, -/area/f13/caves) +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "nCR" = ( /obj/structure/fence{ pixel_x = -14 @@ -30141,9 +30133,7 @@ /obj/effect/decal/marking{ icon_state = "doubleverticalcorroded" }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, +/turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "pEz" = ( /turf/open/indestructible/ground/outside/sidewalk{ @@ -31881,9 +31871,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/spacevine, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, +/turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "qAQ" = ( /obj/effect/decal/cleanable/dirt, @@ -38420,12 +38408,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/debris/v1{ - pixel_x = -16 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, +/turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "tXb" = ( /obj/structure/table, @@ -39724,9 +39707,7 @@ /obj/structure/debris/v1{ pixel_x = -16 }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, +/turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "uEm" = ( /obj/structure/spacevine, @@ -41775,13 +41756,10 @@ /area/f13/caves) "vOT" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/debris/v1{ - pixel_x = -16 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, -/area/f13/caves) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "vOY" = ( /obj/structure/flora/grass/wasteland, /turf/open/indestructible/ground/outside/dirthole, @@ -104493,9 +104471,9 @@ aCW aCW iKf iKf -iKf -iKf -iKf +hPy +hPy +hPy iKf gMW gMW @@ -104752,7 +104730,7 @@ iKf iKf iKf iKf -iKf +hPy iKf iKf gMW @@ -105007,10 +104985,10 @@ iKf iKf iKf iKf +hPy iKf iKf -iKf -iKf +hPy iKf iKf iKf @@ -105265,10 +105243,10 @@ kgF iyJ ccy kgF -kgF -fhy -tnY -tnY +hPy +wWK +ppl +ppl tnY tnY fhy @@ -105524,11 +105502,11 @@ oMa pVV pVV ebm -vWU -nNT +ppl +aDY nNT pXM -xbv +aDY pUU "} (231,1,1) = {" @@ -105776,16 +105754,16 @@ osB pVV oMa oMa -oMa -fJv -oMa -pVV +hPy +hGP +hPy +nCK ebm nNT -aFQ -uEl -fRP -fRP +wWK +wWK +ppl +ppl pUU "} (232,1,1) = {" @@ -106036,13 +106014,13 @@ lHJ oMa oMa mAH -pVV -vWU -vWU -vOT -rYb -rYb -rYb +nCK +ppl +ppl +ppl +wWK +wWK +wWK pUU "} (233,1,1) = {" @@ -106289,17 +106267,17 @@ pVV pVV oMa sEq -aGc -vHN -oMa -pVV -ezc -aFQ -uEl -rYb -rYb -fRP -fRP +nCK +nCK +hPy +nCK +vOT +wWK +wWK +wWK +wWK +ppl +ppl pUU "} (234,1,1) = {" @@ -106550,13 +106528,13 @@ mQs sXy dKL aeO -mQs +akz pEf knd -jXa -nCK -kMn -kMn +ppl +wWK +aDY +aDY pUU "} (235,1,1) = {" @@ -106804,16 +106782,16 @@ pVV oMa pVV fJv -lHJ -pVV -lHJ +kMn +nCK +kMn pVV vWU -aFQ +wWK tWY -fRP -fRP -fRP +ppl +ppl +ppl pUU "} (236,1,1) = {" @@ -107063,14 +107041,14 @@ pVV pVV fbj pVV -pVV -oMa -vWU -akz +nCK hPy -rYb -xbv -xbv +ppl +wZz +vWU +wWK +aDY +aDY pUU "} (237,1,1) = {" @@ -107319,15 +107297,15 @@ pVV pVV oMa pVV -pVV -ojX -ezc +nCK +jXa +vOT qAG srI qKb -rYb -rYb -rYb +wWK +wWK +wWK pUU "} (238,1,1) = {" @@ -107578,13 +107556,13 @@ pVV pVV oMa lHJ -lHJ +kMn vWU aFQ -nNT +aDY uEl -fRP -fRP +ppl +ppl pUU "} (239,1,1) = {" @@ -107833,14 +107811,14 @@ rMX dlq dlq pnb +hPy +nCK pnb -rMX -pnb -fhy -tnY -tnY fhy -tnY +ppl +ppl +wWK +ppl tnY rYb "} @@ -108090,13 +108068,13 @@ aCW iKf iKf iKf -tiN -iKf +nCK iKf iKf iKf +hPy wEK -iKf +hPy iKf gMW rYb @@ -108350,9 +108328,9 @@ iKf yai iKf whc -whc -iKf +hGP iKf +hPy iKf iKf gMW @@ -108606,7 +108584,7 @@ iKf iKf iKf iKf -pkw +flm pkw pkw iKf @@ -108862,8 +108840,8 @@ iKf whc cPT tiN -iKf -iKf +hPy +hPy iKf pkw pkw