From f7a0886f4a4bbe48530bc3041413aadd5029f016 Mon Sep 17 00:00:00 2001 From: Merek Date: Mon, 2 Oct 2023 17:11:26 -0500 Subject: [PATCH] Upgrade --- .../Pahrump-Sunset/Pahrump-Sunset-Lower.dmm | 28 +- .../Pahrump-Sunset/Pahrump-Sunset.dmm | 381 +++++------------- 2 files changed, 112 insertions(+), 297 deletions(-) diff --git a/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset-Lower.dmm b/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset-Lower.dmm index e519faa20cb..eec03e96f5b 100644 --- a/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset-Lower.dmm +++ b/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset-Lower.dmm @@ -4920,13 +4920,6 @@ /area/f13/building/museum) "bRC" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/button/door{ - id = "factbasementcontrol"; - max_integrity = 1000; - name = "shutters button"; - obj_integrity = 1000; - pixel_x = 28 - }, /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 }, @@ -8133,7 +8126,11 @@ /area/f13/building) "dOG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/hatch, +/obj/machinery/door/poddoor/shutters/old{ + id = "factorybasement2"; + name = "shutters"; + max_integrity = 1000000 + }, /turf/open/floor/plasteel/f13{ icon_state = "darkrustysolid" }, @@ -19317,6 +19314,13 @@ color = "#779999" }, /area/f13/building) +"los" = ( +/obj/machinery/button/door{ + id = "factorybasement2"; + pixel_x = -5 + }, +/turf/closed/indestructible/vaultdoor, +/area/f13/building/massfusion) "loD" = ( /obj/effect/decal/cleanable/ash, /obj/effect/decal/cleanable/generic, @@ -39421,7 +39425,11 @@ /turf/open/floor/plating/tunnel, /area/f13/building/sewers) "xZu" = ( -/obj/machinery/door/airlock/hatch, +/obj/machinery/door/poddoor/shutters/old{ + id = "factorybasement2"; + name = "shutters"; + max_integrity = 1000000 + }, /turf/open/floor/plasteel/f13{ icon_state = "darkrustysolid" }, @@ -94810,7 +94818,7 @@ ueb ueb ueb ueb -ueb +los ueb ueb ueb diff --git a/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset.dmm b/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset.dmm index dbd4251e881..45f009226e5 100644 --- a/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset.dmm +++ b/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset.dmm @@ -18419,14 +18419,6 @@ icon_state = "darkdirty" }, /area/f13/ruins) -"blt" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalbottombordertop3" - }, -/area/f13/building) "blu" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/instacoffee{ @@ -21441,14 +21433,6 @@ icon_state = "oakfloor1" }, /area/f13/ruins) -"bEE" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, -/area/f13/wasteland/nash) "bEK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -22577,12 +22561,6 @@ color = "#779999" }, /area/f13/building/abandoned) -"bSg" = ( -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, -/area/f13/wasteland/nash) "bSj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/reinforced{ @@ -31652,23 +31630,6 @@ icon_state = "innerpavement" }, /area/f13/wasteland/city/nash/suburbs) -"dHD" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/outside/water{ - light_color = null; - color = "#FFBB77"; - name = "the watering hole" - }, -/area/f13/wasteland/nash) "dHN" = ( /obj/effect/decal/cleanable/oil, /obj/effect/decal/cleanable/dirt, @@ -36652,13 +36613,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/f13/building/abandoned) -"eQT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, -/area/f13/wasteland/nash) "eQZ" = ( /obj/structure/table/wood, /obj/machinery/button/door{ @@ -42674,12 +42628,6 @@ icon_state = "innerpavement" }, /area/f13/wasteland/city/nash/starterroad) -"gkP" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/indestructible/ground/outside/gravel, -/area/f13/wasteland/nash) "gkQ" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4" @@ -45730,14 +45678,6 @@ icon_state = "greenrustychess" }, /area/f13/building/coyote/nash/massfus/groundfloor/east) -"gTw" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain2" - }, -/area/f13/building) "gTx" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/sidewalk, @@ -49272,9 +49212,6 @@ name = "dirty floor" }, /area/f13/building/abandoned) -"hLR" = ( -/turf/open/indestructible/ground/outside/gravel, -/area/f13/wasteland/nash) "hMc" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road, @@ -53343,14 +53280,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/abandoned) -"iEL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain2" - }, -/area/f13/wasteland/nash) "iEN" = ( /obj/structure/spider/stickyweb, /turf/open/floor/plasteel/f13/vault_floor/blue/white, @@ -56741,14 +56670,6 @@ /obj/structure/window/fulltile/house/broken, /turf/open/floor/f13/wood, /area/f13/ruins) -"juI" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalbottombordertop3" - }, -/area/f13/wasteland/nash) "juX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/flora/tree/jungle{ @@ -59374,7 +59295,9 @@ /area/f13/ruins) "kab" = ( /obj/effect/landmark/observer_start, -/turf/open/indestructible/ground/outside/road, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, /area/f13/wasteland/nash) "kai" = ( /obj/effect/turf_decal/weather/dirt{ @@ -63641,13 +63564,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"lau" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain2" - }, -/area/f13/wasteland/nash) "laF" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -28 @@ -64440,15 +64356,6 @@ icon_state = "verticaloutermain2" }, /area/f13/underground/cave/coyote/antmound) -"lik" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalbottombordertop3" - }, -/area/f13/wasteland/nash) "liq" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -69920,15 +69827,6 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave/coyote/antmound) -"mrO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, -/area/f13/wasteland/nash) "mrR" = ( /obj/effect/decal/remains/human, /turf/open/floor/f13/wood, @@ -70340,14 +70238,6 @@ icon_state = "floordirtysolid" }, /area/f13/ruins) -"mvW" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, -/area/f13/wasteland/nash) "mvX" = ( /obj/effect/spawner/lootdrop/trash, /obj/effect/decal/cleanable/dirt/dust, @@ -73705,11 +73595,6 @@ icon_state = "bluerustychess2" }, /area/f13/building/abandoned) -"njm" = ( -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontaltopborderbottom3" - }, -/area/f13/wasteland/nash) "njD" = ( /obj/structure/closet/fridge, /obj/effect/spawner/lootdrop/f13/foodspawner, @@ -76982,12 +76867,6 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) -"nVu" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalbottombordertop3" - }, -/area/f13/wasteland/nash) "nVx" = ( /obj/machinery/shower{ dir = 4 @@ -81975,11 +81854,6 @@ name = "the watering hole" }, /area/f13/wasteland) -"oZZ" = ( -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalbottombordertop3" - }, -/area/f13/wasteland/nash) "pab" = ( /obj/structure/junk/small/bed, /turf/open/floor/f13/wood, @@ -84957,14 +84831,6 @@ icon_state = "bluerustychess2" }, /area/f13/building/abandoned) -"pJj" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain2" - }, -/area/f13/wasteland/nash) "pJm" = ( /obj/effect/turf_decal/weather/dirt{ dir = 6 @@ -92044,24 +91910,6 @@ icon_state = "dirt" }, /area/f13/wasteland/city/nash/downtown) -"roM" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/effect/turf_decal/weather/dirt, -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/outside/water{ - light_color = null; - color = "#FFBB77"; - name = "the watering hole" - }, -/area/f13/wasteland/nash) "rpi" = ( /obj/item/gun/ballistic/automatic/pistol/pistol22, /obj/item/ammo_box/magazine/m22, @@ -95664,11 +95512,6 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"shl" = ( -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontaltopborderbottom2" - }, -/area/f13/wasteland/nash) "shm" = ( /obj/effect/turf_decal/weather/dirt, /obj/structure/flora/ausbushes/sparsegrass, @@ -99889,12 +99732,6 @@ icon_state = "horizontalbottombordertop2" }, /area/f13/wasteland/city/nash/redriverdepotroad) -"tdh" = ( -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalbottombordertop3" - }, -/area/f13/wasteland/nash) "tdk" = ( /turf/open/floor/f13{ icon_state = "floorrustysolid" @@ -113489,10 +113326,6 @@ icon_state = "redrustyfull" }, /area/f13/building/coyote/nash/school/groundfloor) -"wlr" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/gravel, -/area/f13/wasteland/nash) "wlt" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -116789,12 +116622,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"wVA" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain2" - }, -/area/f13/wasteland/nash) "wVB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -116807,12 +116634,6 @@ /obj/item/candle/tribal_torch, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"wWa" = ( -/turf/open/indestructible/ground/outside/roaddirt{ - dir = 4; - icon_state = "hole" - }, -/area/f13/building) "wWe" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -118640,14 +118461,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/building/coyote/nash/mall/groundfloor) -"xsH" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, -/area/f13/wasteland/nash) "xsM" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_3" @@ -120409,12 +120222,6 @@ /mob/living/simple_animal/hostile/stalker, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/coyote/nash/southeastcornercamp) -"xNl" = ( -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain2" - }, -/area/f13/wasteland/nash) "xNq" = ( /obj/structure/barricade/tentleatheredge{ dir = 8 @@ -130089,26 +129896,26 @@ vZx kcx rIC rIC -bSg -dHD -xsH -oZZ +rIC +rIC +rIC +rIC rMK rIC rIC rIC rIC -rIs -rIs -wVA +rIC +rIC +rMK rMK -iEL +una kxH lLh una una rMK -hLR +rIC ids rIC rMK @@ -130122,17 +129929,17 @@ rIC rMK rIC rMK -eQT -dHD -xsH -hLR +rMK +rIC +rIC +rIC rMK rIC rIC rIC rIC rMK -wVA +rMK rMK sim cJf @@ -130142,26 +129949,26 @@ rIC rIC rIC rIC -hLR +rIC rIC qOp rIC rIC rIC -xNl -roM -xsH +rIC +rIC +rIC rIC qOp qOp qOp rIC rIC -oZZ -oZZ +rIC +rIC rIC jxA -wWa +mJH mJH vZl pmM @@ -130343,83 +130150,83 @@ uMa sxp sxp uSC -njm rIC rIC rIC -mvW -rIs rIC -oZZ -hLR -oZZ rIC -oZZ -oZZ rIC -hLR -hLR -hLR -rIs +rIC +rIC +rIC +rIC +rIC +rIC +rIC +rIC +rIC +rIC +rIC +rIC rIC rMK rMK -bEE -oZZ -hLR -rIs +rIC +rIC +rIC +rIC rIC rIC rIC xRS hXx kab -rIs -rIs -rIs -lau +rIC +rIC +rIC +kxH +rMK rMK rMK -mrO -hLR -hLR +rIC +rIC rIC ids pxI rIC -hLR -hLR +rIC +rIC rIC rIC sim sim rIC -rIs -rIs -hLR -hLR +rIC +rIC +rIC +rIC rIC rIC rIC qOp -rIs rIC -hLR -hLR -mvW rIC rIC -rIs -pJj +rIC +rIC +rIC +rIC +rIC +rIC fHR qOp -gkP -gkP +qOp +qOp rIC ids gns -blt -gTw +gns +gns gns pmM eod @@ -130600,11 +130407,11 @@ uPF fZT bkc vZx -shl -rIs -rIs rIC -rIs +rIC +rIC +rIC +rIC rIC rIC rIC @@ -130614,16 +130421,16 @@ rIC rIC ids rIC -hLR -oZZ -oZZ -oZZ rIC rIC -bSg -dHD -lik -rIs +rIC +rIC +rIC +rIC +rIC +rIC +rMK +rIC rIC rIC rIC @@ -130634,25 +130441,23 @@ rIC rIC rIC rMK -nVu -oZZ +rMK rIC -wlr +rIC +rMK +rMK rMK -wVA rIC -rIs rIC -rIs rIC -hLR -hLR -oZZ +rIC +rIC +rIC +rIC +rIC sim sim rIC -rIs -rIs rIC rIC rIC @@ -130661,21 +130466,23 @@ rIC rIC rIC rIC -juI +rIC +rIC +qOp qOp -gkP +qOp +rIC +rIC +rIC +rIC +rIC rIC -oZZ -tdh -dHD -xsH -hLR rIC rIC rIC rIs mJH -ccU +mJH ndA mJH pmM