diff --git a/_maps/map_files/Fortress Nash/FortNash1.dmm b/_maps/map_files/Fortress Nash/FortNash1.dmm index 67c56177ebc..11c93f60ea6 100644 --- a/_maps/map_files/Fortress Nash/FortNash1.dmm +++ b/_maps/map_files/Fortress Nash/FortNash1.dmm @@ -40,7 +40,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -6221,7 +6221,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/carpet/black, /area/f13/building/abandoned) @@ -8959,7 +8959,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -9393,7 +9393,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Tigers" + randomizer_tag = "Pahrump Tigers" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -9617,7 +9617,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Tigers" + randomizer_tag = "Pahrump Tigers" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" @@ -11925,7 +11925,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -14137,7 +14137,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -15262,7 +15262,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "bir" = ( -/obj/machinery/light/sign/nash{ +/obj/machinery/light/sign/eastwood{ pixel_x = -14 }, /turf/open/indestructible/ground/outside/sidewalk, @@ -15673,7 +15673,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -15742,7 +15742,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/desert, /area/f13/building/abandoned) @@ -17623,7 +17623,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -19635,7 +19635,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -20851,7 +20851,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) @@ -22646,7 +22646,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -23497,7 +23497,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) @@ -24135,7 +24135,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/ruins{ dir = 8; @@ -24381,14 +24381,14 @@ "dBe" = ( /obj/machinery/button/door{ id = "deskcounter"; - name = "Nash East Shutters"; + name = "Eastwood East Shutters"; pixel_x = -6; pixel_y = 38; req_one_access_txt = null }, /obj/machinery/button/door{ - id = "nasheast"; - name = "Nash East Shutters"; + id = "eastwoodeast"; + name = "Eastwood East Shutters"; pixel_x = -6; pixel_y = 29; req_one_access_txt = null @@ -25976,7 +25976,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -26710,7 +26710,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalbottombordertop2" @@ -26759,7 +26759,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -26865,8 +26865,8 @@ /area/f13/wasteland) "ewZ" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Behind Red River Army Depot"; - name = "Nash - Behind Red River Army Depot" + id = "Eastwood - Behind Red River Army Depot"; + name = "Eastwood - Behind Red River Army Depot" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -27734,7 +27734,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain2" @@ -28461,7 +28461,7 @@ /area/f13/wasteland/city) "feq" = ( /obj/machinery/door/poddoor/shutters/preopen{ - id = "nasheast" + id = "eastwoodeast" }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) @@ -28748,7 +28748,7 @@ /area/f13/wasteland/city) "flj" = ( /obj/machinery/door/poddoor/shutters/preopen{ - id = "nasheast" + id = "eastwoodeast" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontaltopborderbottom0" @@ -29500,8 +29500,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/vertibird{ - id = "Nash - By The Mall"; - name = "Nash - By The Mall" + id = "Eastwood - By The Mall"; + name = "Eastwood - By The Mall" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" @@ -31001,8 +31001,8 @@ /area/f13/wasteland) "ged" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Middle of Texarkana"; - name = "Nash - Middle of Texarkana" + id = "Eastwood - Middle of Pahrump"; + name = "Eastwood - Middle of Pahrump" }, /turf/open/indestructible/ground/outside/road{ dir = 8; @@ -31830,7 +31830,7 @@ dir = 8; light_color = "#d8b1b1" }, -/obj/machinery/vending/medical/nash, +/obj/machinery/vending/medical/eastwood, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/building/hospital) "gwF" = ( @@ -31844,7 +31844,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt{ dir = 4; @@ -33472,8 +33472,8 @@ /area/f13/wasteland) "gZu" = ( /obj/effect/landmark/vertibird{ - id = "Nash - SE of the City of Nash"; - name = "Nash - SE of the City of Nash" + id = "Eastwood - SE of the City of Eastwood"; + name = "Eastwood - SE of the City of Eastwood" }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" @@ -34106,7 +34106,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/dirt{ dir = 1; @@ -35652,7 +35652,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain2" @@ -36468,7 +36468,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -39655,7 +39655,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite/rarecyan, /area/f13/building/abandoned) @@ -39870,8 +39870,8 @@ "juB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/vertibird{ - id = "Nash - Just East of Nash city"; - name = "Nash - Just East of Nash city" + id = "Eastwood - Just East of Eastwood city"; + name = "Eastwood - Just East of Eastwood city" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -40357,7 +40357,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13{ icon_state = "whitegreenrustychess" @@ -41828,7 +41828,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -42162,7 +42162,7 @@ /area/f13/wasteland) "ksw" = ( /obj/machinery/door/unpowered/securedoor{ - name = "First Bank of Nash"; + name = "First Bank of Eastwood"; req_one_access_txt = "52" }, /turf/open/floor/wood_fancy/wood_fancy_light, @@ -44358,7 +44358,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) @@ -44810,7 +44810,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/city) @@ -45422,7 +45422,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -46690,7 +46690,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" @@ -50155,8 +50155,8 @@ "nlx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/vertibird{ - id = "Nash - Robot Parking Lot"; - name = "Nash - Robot Parking Lot" + id = "Eastwood - Robot Parking Lot"; + name = "Eastwood - Robot Parking Lot" }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain1" @@ -51037,7 +51037,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = 1; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -52547,7 +52547,7 @@ "ofJ" = ( /obj/structure/ladder/unbreakable{ height = 2; - id = "Nashsewers" + id = "Eastwoodsewers" }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/building/abandoned) @@ -53621,7 +53621,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontaltopborderbottom2left" @@ -54113,7 +54113,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -55656,7 +55656,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/city) @@ -59376,7 +59376,7 @@ /turf/open/indestructible/ground/outside/ruins, /area/f13/building/abandoned) "qJQ" = ( -/obj/machinery/light/sign/nash{ +/obj/machinery/light/sign/eastwood{ pixel_x = -14 }, /turf/open/indestructible/ground/outside/sidewalk{ @@ -59498,8 +59498,8 @@ "qLZ" = ( /obj/machinery/computer/terminal{ doc_content_1 = "We're proud to deliver all the possible upcoming technological developments coming down our assembly lines here at the Vault-Tec Exhibit of Technology! Come on down today and experience the glory of tosmorrow, today!"; - doc_title_1 = "Welcome to our newest exhibit in the Texarkana metro area!"; - name = "Texarkana Display of Corporate Technology Terminal"; + doc_title_1 = "Welcome to our newest exhibit in the Pahrump metro area!"; + name = "Pahrump Display of Corporate Technology Terminal"; termtag = "Secret" }, /obj/structure/table, @@ -60803,7 +60803,7 @@ }, /area/f13/wasteland/city) "rlS" = ( -/obj/machinery/light/sign/oasis{ +/obj/machinery/light/sign/eastwood{ density = 0; pixel_x = -27 }, @@ -62293,8 +62293,8 @@ /area/f13/building/abandoned) "rQb" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Christus Saint Michaels Hospital"; - name = "Nash - Christus Saint Michaels Hospital" + id = "Eastwood - Christus Saint Michaels Hospital"; + name = "Eastwood - Christus Saint Michaels Hospital" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain2" @@ -67143,7 +67143,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/carpet/black, /area/f13/building/abandoned) @@ -68493,7 +68493,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -70226,7 +70226,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Tigers" + randomizer_tag = "Pahrump Tigers" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -70451,7 +70451,7 @@ /area/f13/building/abandoned) "uTE" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Middle of Nash town" + id = "Eastwood - Middle of Eastwood town" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" @@ -71359,7 +71359,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -71556,7 +71556,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -71768,8 +71768,8 @@ /area/f13/building/abandoned) "vva" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Mirelurk Park"; - name = "Nash - Mirelurk Park" + id = "Eastwood - Mirelurk Park"; + name = "Eastwood - Mirelurk Park" }, /turf/open/indestructible/ground/outside/dirt{ dir = 1; @@ -73175,8 +73175,8 @@ /area/f13/wasteland) "vWm" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Police Station"; - name = "Nash - Police Station" + id = "Eastwood - Police Station"; + name = "Eastwood - Police Station" }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/city) @@ -73531,7 +73531,7 @@ "wdG" = ( /obj/structure/flora/tree/oak_three{ pixel_y = 10; - name = "Nashling Oak" + name = "Eastwoodling Oak" }, /obj/effect/turf_decal/weather/dirt{ color = "#a98c5d" @@ -73945,7 +73945,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -75492,7 +75492,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13{ icon_state = "hydrofloor" @@ -76291,8 +76291,8 @@ icon_state = "tall_grass_3" }, /obj/effect/landmark/vertibird{ - id = "Nash - Museum"; - name = "Nash - Museum" + id = "Eastwood - Museum"; + name = "Eastwood - Museum" }, /turf/open/indestructible/ground/outside/road{ dir = 1; @@ -76879,7 +76879,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/sidewalk{ dir = 1; @@ -77536,7 +77536,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft0" @@ -77838,7 +77838,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain2" diff --git a/_maps/map_files/Fortress Nash/FortNashLower.dmm b/_maps/map_files/Fortress Nash/FortNashLower.dmm index 688ccba4588..8930d0e7da7 100644 --- a/_maps/map_files/Fortress Nash/FortNashLower.dmm +++ b/_maps/map_files/Fortress Nash/FortNashLower.dmm @@ -27445,7 +27445,7 @@ "uqE" = ( /obj/structure/ladder/unbreakable{ height = 1; - id = "Nashsewers" + id = "Eastwoodsewers" }, /turf/open/floor/f13{ icon_state = "neutralrustyfull" @@ -29818,7 +29818,7 @@ /area/f13/caves) "woc" = ( /mob/living/simple_animal/hostile/raider/ranged/biker{ - name = "Texarkana Timothy" + name = "Pahrump Timothy" }, /turf/open/floor/f13{ icon_state = "greenrustyfull" diff --git a/_maps/map_files/Fortress Nash/FortNashUpper1.dmm b/_maps/map_files/Fortress Nash/FortNashUpper1.dmm index 9591dafe0e1..ad58d9d664d 100644 --- a/_maps/map_files/Fortress Nash/FortNashUpper1.dmm +++ b/_maps/map_files/Fortress Nash/FortNashUpper1.dmm @@ -2645,7 +2645,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Tigers" + randomizer_tag = "Pahrump Tigers" }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_common, @@ -11049,7 +11049,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Tigers" + randomizer_tag = "Pahrump Tigers" }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_common, @@ -13176,7 +13176,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Tigers" + randomizer_tag = "Pahrump Tigers" }, /obj/machinery/light/small/broken{ dir = 1 diff --git a/_maps/map_files/Fortress Nash/FortNashUpper2.dmm b/_maps/map_files/Fortress Nash/FortNashUpper2.dmm index b5433ee135e..addd7648a5c 100644 --- a/_maps/map_files/Fortress Nash/FortNashUpper2.dmm +++ b/_maps/map_files/Fortress Nash/FortNashUpper2.dmm @@ -1281,8 +1281,8 @@ /area/f13/building) "CQ" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Christus Saint Michaels Hospital - Rooftop"; - name = "Nash - Christus Saint Michaels Hospital - Rooftop" + id = "Eastwood - Christus Saint Michaels Hospital - Rooftop"; + name = "Eastwood - Christus Saint Michaels Hospital - Rooftop" }, /turf/open/floor/plasteel/f13/vault_floor/dark{ icon_state = "darkdirty" diff --git a/_maps/map_files/Pahrump-AB/Dungeons.dmm b/_maps/map_files/Pahrump-AB/Dungeons.dmm index 2dd9b6b1ee2..76d53717169 100644 --- a/_maps/map_files/Pahrump-AB/Dungeons.dmm +++ b/_maps/map_files/Pahrump-AB/Dungeons.dmm @@ -42714,7 +42714,7 @@ }, /area/f13/brotherhood/offices1st) "vpe" = ( -/obj/machinery/light/sign/oasis{ +/obj/machinery/light/sign/eastwood{ density = 0; pixel_x = -27 }, diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm index ef073a2c30c..e1132e28a3c 100644 --- a/_maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm +++ b/_maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm @@ -25970,7 +25970,7 @@ "uqE" = ( /obj/structure/ladder/unbreakable{ height = 1; - id = "Nashsewers" + id = "Eastwoodsewers" }, /turf/open/floor/f13{ icon_state = "neutralrustyfull" @@ -28305,7 +28305,7 @@ /area/f13/tunnel) "woc" = ( /mob/living/simple_animal/hostile/raider/ranged/biker{ - name = "Texarkana Timothy" + name = "Pahrump Timothy" }, /turf/open/floor/f13{ icon_state = "greenrustyfull" diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm index 1d79f08afa0..b9a9c00b8ab 100644 --- a/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm +++ b/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm @@ -174,6 +174,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/wasteland/khans) +"akR" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "alJ" = ( /obj/structure/bed, /obj/item/bedsheet, @@ -701,6 +707,16 @@ /obj/structure/table, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) +"bvj" = ( +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowvertical" + }, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "bxB" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/f13nukacola, @@ -1526,6 +1542,14 @@ "dpc" = ( /turf/closed/wall/r_wall/rust, /area/f13/building/massfusion) +"dpn" = ( +/obj/structure/table/wood/club, +/obj/machinery/computer/terminal{ + dir = 4; + termtag = "Security" + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "dpP" = ( /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, @@ -2310,6 +2334,10 @@ /obj/structure/chair/f13foldupchair, /turf/open/transparent/openspace, /area/f13/wasteland) +"fyo" = ( +/obj/structure/closet/fridge/standard, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "fyP" = ( /obj/structure/lattice/catwalk, /obj/machinery/light/small, @@ -3385,6 +3413,10 @@ /obj/structure/railing/wood, /turf/open/floor/f13/wood, /area/f13/wasteland) +"isY" = ( +/obj/structure/railing, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "itg" = ( /obj/structure/chair/f13foldupchair{ dir = 8 @@ -3532,6 +3564,15 @@ /obj/item/storage/book/bible, /turf/open/floor/f13/wood, /area/f13/city) +"iMM" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "iNE" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -4959,6 +5000,12 @@ icon_state = "reddirtyfull" }, /area/f13/city) +"mnG" = ( +/obj/structure/bed, +/obj/item/bedsheet/patriot, +/obj/item/bedsheet/patriot, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "mnN" = ( /obj/structure/table, /obj/machinery/computer/terminal{ @@ -5148,6 +5195,12 @@ /obj/structure/table, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/city) +"mKW" = ( +/obj/structure/chair/f13foldupchair{ + dir = 8 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "mLV" = ( /obj/machinery/light{ dir = 1; @@ -6641,6 +6694,15 @@ icon_state = "darkrusty" }, /area/f13/building/massfusion) +"qFi" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "qFA" = ( /obj/structure/window/reinforced/fulltile, /obj/structure/grille, @@ -6648,6 +6710,12 @@ icon_state = "darkrustysolid" }, /area/f13/building/massfusion) +"qHi" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/closed/wall/r_wall, +/area/f13/city) "qHm" = ( /obj/item/kirbyplants{ icon_state = "plant-06" @@ -7508,6 +7576,11 @@ }, /turf/closed/wall/f13/wood, /area/f13/building) +"sOm" = ( +/obj/structure/table/wood/fancy, +/obj/item/flashlight/lamp, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "sOQ" = ( /obj/structure/curtain{ color = "#5c131b"; @@ -7809,6 +7882,10 @@ }, /turf/open/floor/carpet/green, /area/f13/city) +"tyU" = ( +/obj/structure/table/wood/club, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "tzD" = ( /obj/structure/rack, /obj/item/gun/energy/laser/complianceregulator, @@ -8592,6 +8669,15 @@ "vIH" = ( /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/hospital) +"vIT" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "vJy" = ( /obj/structure/chair/wood{ dir = 4 @@ -8783,6 +8869,9 @@ icon_state = "housewood1-broken" }, /area/f13/legion) +"wmS" = ( +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "wnK" = ( /obj/structure/window/fulltile/wood, /turf/open/floor/wood_fancy/wood_fancy_dark, @@ -8927,6 +9016,13 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building) +"wIP" = ( +/obj/machinery/light, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "wJQ" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/toxin{ @@ -9381,6 +9477,15 @@ icon_state = "darkrustysolid" }, /area/f13/radiation) +"xQG" = ( +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/structure/table/wood/fancy/monochrome, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "xSN" = ( /turf/closed/wall/f13/store{ desc = "A pre-War wall made of solid concrete."; @@ -41021,12 +41126,12 @@ oez oez oez oez -oez -oez -oez -oez -oez -pPv +sdE +bvj +bvj +sdE +iMM +qFi dYT dYT eZk @@ -41278,13 +41383,13 @@ oez oez oez oez -oez -oez -oez -oez -oez -oez -dYT +wIP +dpn +tyU +fyo +wmS +xQG +qHi uNh uNh uNh @@ -41535,12 +41640,12 @@ oez oez oez oez -oez -oez -oez -oez -oez -oez +bvj +mKW +wmS +wmS +wmS +xQG dYT iHJ wxo @@ -41792,12 +41897,12 @@ oez oez oez oez -oez -oez -oez -oez -oez -oez +bvj +wmS +wmS +wmS +akR +wmS dYT uNh itM @@ -42049,13 +42154,13 @@ oez oez oez oez -oez -oez -oez -oez -oez -oez -dYT +wIP +mnG +sOm +isY +kmu +wmS +qHi uNh nSB dYT @@ -42306,12 +42411,12 @@ oez oez oez oez -oez -oez -oez -oez -oez -oez +sdE +bvj +bvj +sdE +vIT +sdE dYT dYT dYT @@ -42569,7 +42674,7 @@ geI ttz oez oez -oez +blr oez oez oez diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm index fbce6b775f3..7d09d53db2d 100644 --- a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm +++ b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm @@ -20917,6 +20917,12 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +"czx" = ( +/obj/structure/table/wood/fancy/black, +/obj/structure/table/wood/fancy/black, +/obj/machinery/radio_station, +/turf/open/floor/carpet, +/area/f13/building) "czz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/f13/campfollower, @@ -24153,6 +24159,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building) +"ebK" = ( +/turf/open/floor/light/colour_cycle/dancefloor_b, +/area/f13/building) "ebN" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4" @@ -25060,8 +25069,8 @@ /area/f13/building) "ewZ" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Behind Red River Army Depot"; - name = "Nash - Behind Red River Army Depot" + id = "Eastwood - Behind Red River Army Depot"; + name = "Eastwood - Behind Red River Army Depot" }, /obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -25334,6 +25343,13 @@ icon_state = "floorrustysolid" }, /area/f13/building/mall) +"eBY" = ( +/obj/item/radio/intercom/retro/kebob, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "eBZ" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4"; @@ -26512,6 +26528,16 @@ icon_state = "outerborder" }, /area/f13/wasteland) +"fbd" = ( +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "storewindowtop" + }, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "fbf" = ( /obj/structure/fence/cut/medium{ dir = 4 @@ -27500,8 +27526,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/vertibird{ - id = "Nash - By The Mall"; - name = "Nash - By The Mall" + id = "Eastwood - By The Mall"; + name = "Eastwood - By The Mall" }, /turf/open/indestructible/ground/outside/road{ icon_state = "innershade" @@ -28744,8 +28770,8 @@ /area/f13/wasteland) "ged" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Middle of Texarkana"; - name = "Nash - Middle of Texarkana" + id = "Eastwood - Middle of Pahrump"; + name = "Eastwood - Middle of Pahrump" }, /turf/open/indestructible/ground/outside/road{ dir = 8; @@ -29394,6 +29420,15 @@ icon_state = "verticalleftborderleft0" }, /area/f13/building) +"gvi" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "gvl" = ( /obj/structure/table, /obj/item/phone, @@ -30814,8 +30849,8 @@ /area/f13/wasteland) "gZu" = ( /obj/effect/landmark/vertibird{ - id = "Nash - SE of the City of Nash"; - name = "Nash - SE of the City of Nash" + id = "Eastwood - SE of the City of Eastwood"; + name = "Eastwood - SE of the City of Eastwood" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" @@ -31904,6 +31939,16 @@ icon_state = "housewood3-broken" }, /area/f13/village) +"hEp" = ( +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "hEq" = ( /obj/structure/flora/tree/african_acacia, /turf/open/indestructible/ground/outside/dirt, @@ -33926,7 +33971,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/village) @@ -34180,6 +34225,13 @@ icon_state = "dirt" }, /area/f13/building/khanfort) +"iDA" = ( +/obj/machinery/light_switch, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "iEb" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -34407,6 +34459,15 @@ icon_state = "greenrustysolid" }, /area/f13/building/massfusion) +"iGU" = ( +/obj/structure/window/fulltile/house{ + icon_state = "storewindowright" + }, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "iHs" = ( /obj/structure/cross, /obj/effect/mob_spawn/human/corpse/raiderranged, @@ -38056,6 +38117,10 @@ /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/indestructible/ground/outside/dirt, /area/f13/building) +"kuR" = ( +/obj/structure/table/reinforced, +/turf/open/floor/carpet, +/area/f13/building) "kva" = ( /obj/item/trash/can, /mob/living/simple_animal/hostile/bloatfly, @@ -39071,6 +39136,10 @@ icon_state = "floorrusty" }, /area/f13/ncr) +"kSe" = ( +/obj/structure/stairs/south, +/turf/open/floor/carpet, +/area/f13/building) "kSi" = ( /obj/structure/table/booth, /obj/effect/decal/cleanable/dirt, @@ -42103,6 +42172,13 @@ /obj/item/ammo_box/magazine/zipgun, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"mfI" = ( +/obj/structure/chair/comfy/beige{ + dir = 1 + }, +/obj/effect/landmark/start/f13/radio_host, +/turf/open/floor/carpet, +/area/f13/building) "mfL" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -44113,6 +44189,20 @@ icon_state = "darkrusty" }, /area/f13/village) +"mYp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom{ + desc = "Is there anyone on the other end? Who's in there?"; + frequency = 1291; + name = "Mysterious Intercom"; + pixel_x = 26; + pixel_y = -3 + }, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "mYv" = ( /obj/effect/decal/waste{ icon_state = "goo10" @@ -44628,8 +44718,8 @@ "nlx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/vertibird{ - id = "Nash - Robot Parking Lot"; - name = "Nash - Robot Parking Lot" + id = "Eastwood - Robot Parking Lot"; + name = "Eastwood - Robot Parking Lot" }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain1" @@ -45924,6 +46014,9 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/brotherhood) +"nPu" = ( +/turf/open/floor/carpet, +/area/f13/building) "nPy" = ( /obj/machinery/door/poddoor/shutters/old{ id = "factorygate"; @@ -47166,10 +47259,29 @@ icon_state = "outerturn" }, /area/f13/city) +"osL" = ( +/obj/structure/simple_door/metal/store{ + name = "Radio Host"; + req_access = 274 + }, +/turf/open/floor/f13{ + icon_state = "yellowrustychess" + }, +/area/f13/city) "osS" = ( /obj/machinery/workbench, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/village) +"osV" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/record_disk, +/obj/item/record_disk, +/obj/item/record_disk, +/obj/item/record_disk, +/obj/item/record_disk, +/obj/item/record_disk, +/turf/open/floor/light/colour_cycle/dancefloor_b, +/area/f13/building) "osY" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -47573,6 +47685,9 @@ icon_state = "horizontaltopbordertop0" }, /area/f13/wasteland) +"oCs" = ( +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/f13/building) "oCA" = ( /obj/effect/decal/cleanable/oil/slippery, /turf/open/floor/f13{ @@ -50467,6 +50582,11 @@ /obj/structure/flora/grass/coyote/twelve, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"pNl" = ( +/obj/structure/table/reinforced, +/obj/item/pda/neko, +/turf/open/floor/carpet, +/area/f13/building) "pNn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil/streak{ @@ -51629,6 +51749,14 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/brotherhood) +"qrP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "qrV" = ( /obj/structure/table/wood, /obj/machinery/processor/chopping_block, @@ -51971,7 +52099,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Tigers" + randomizer_tag = "Pahrump Tigers" }, /turf/open/floor/f13/wood, /area/f13/village) @@ -54486,8 +54614,8 @@ /area/f13/building) "rQb" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Christus Saint Michaels Hospital"; - name = "Nash - Christus Saint Michaels Hospital" + id = "Eastwood - Christus Saint Michaels Hospital"; + name = "Eastwood - Christus Saint Michaels Hospital" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain2" @@ -58104,6 +58232,13 @@ /mob/living/simple_animal/hostile/handy, /turf/open/floor/f13/wood, /area/f13/building) +"tAN" = ( +/obj/machinery/light, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/building) "tAP" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_2"; @@ -58756,6 +58891,10 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"tNK" = ( +/obj/effect/landmark/start/f13/radio_host, +/turf/open/floor/carpet, +/area/f13/building) "tNN" = ( /obj/structure/chair/sofa/right{ dir = 8 @@ -59087,6 +59226,13 @@ /obj/structure/barricade/wooden, /turf/closed/wall/mineral/concrete, /area/f13/brotherhood) +"tVA" = ( +/obj/structure/simple_door/metal/store{ + name = "Radio Host"; + req_access = 274 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/building) "tVG" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -62609,6 +62755,19 @@ icon_state = "rubble" }, /area/f13/wasteland) +"vEO" = ( +/obj/structure/closet/locker, +/obj/item/megaphone, +/obj/item/flashlight/glowstick/blue, +/obj/item/flashlight/glowstick/cyan, +/obj/item/flashlight/glowstick/orange, +/obj/item/flashlight/glowstick/pink, +/obj/item/flashlight/glowstick/red, +/obj/item/flashlight/glowstick/yellow, +/obj/item/grenade/flashbang, +/obj/item/grenade/flashbang, +/turf/open/floor/carpet, +/area/f13/building) "vEX" = ( /obj/structure/simple_door/wood, /turf/open/floor/f13/wood, @@ -63294,8 +63453,8 @@ /area/f13/wasteland) "vWm" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Police Station"; - name = "Nash - Police Station" + id = "Eastwood - Police Station"; + name = "Eastwood - Police Station" }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) @@ -66090,8 +66249,8 @@ icon_state = "tall_grass_3" }, /obj/effect/landmark/vertibird{ - id = "Nash - Museum"; - name = "Nash - Museum" + id = "Eastwood - Museum"; + name = "Eastwood - Museum" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalbottombordertop0" @@ -68334,7 +68493,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite/rarecyan, /area/f13/building) @@ -99976,12 +100135,12 @@ mHp uNJ igF hEG -hXb -xJp -xJp -xJp -pRE -pRE +pVH +pVH +hEp +fbd +mYp +qrP aky hJW hJW @@ -100233,12 +100392,12 @@ cml uNJ igF hEG -anR -jnJ -jnJ -jnJ -jnJ -jnJ +iGU +pNl +tNK +nPu +czx +mfI oPk voM wjR @@ -100490,12 +100649,12 @@ uNJ uNJ igF hEG -anR -jnJ -jnJ -jnJ -jnJ -jnJ +iGU +kuR +nPu +nPu +osV +oCs kls aYj aYj @@ -100747,12 +100906,12 @@ uNJ uNJ igF hEG -anR -jnJ -jnJ -jnJ -jnJ -jnJ +tAN +kuR +nPu +nPu +oCs +ebK kls clv clv @@ -101004,12 +101163,12 @@ uNJ uNJ igF hEG -anR -jnJ -jnJ -jnJ -jnJ -jnJ +tVA +nPu +nPu +nPu +kSe +vEO kls kls tsQ @@ -101261,12 +101420,12 @@ uNJ uNJ igF hEG -ksO -hEh -hEh -hEh -hEh -hEh +pVH +iDA +gvi +fbd +eBY +pVH kls kls kls @@ -101780,7 +101939,7 @@ xLy xLy xLy xLy -dHo +osL xLy fuT xLy diff --git a/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm b/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm index e623cecd520..2c4bade2d6a 100644 --- a/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm +++ b/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm @@ -6267,7 +6267,7 @@ "dyv" = ( /obj/structure/ladder/unbreakable{ height = 1; - id = "oasis" + id = "eastwood" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -23593,7 +23593,7 @@ /area/f13/caves) "nWK" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /area/f13/building) "nWR" = ( /obj/structure/curtain{ @@ -25202,7 +25202,7 @@ pixel_y = -17 }, /obj/structure/rack, -/obj/item/clothing/suit/armor/medium/vest/oasis, +/obj/item/clothing/suit/armor/medium/vest/eastwood, /obj/item/clothing/head/helmet/blueshirt, /obj/item/clothing/under/rank/security/officer/blueshirt, /turf/open/floor/plasteel/f13/vault_floor/dark{ @@ -30141,8 +30141,8 @@ /area/f13/den) "rTg" = ( /obj/structure/flora/tree/jungle{ - desc = "Rumor has it that, as long as this tree stands firm, so too will the town of Oasis."; - name = "\improper Oasis Oak"; + desc = "Rumor has it that, as long as this tree stands firm, so too will the town of Eastwood."; + name = "\improper Eastwood Oak"; pixel_x = -33 }, /turf/open/indestructible/ground/outside/river, @@ -33830,7 +33830,7 @@ /turf/open/floor/plasteel/f13/vault_floor/red/whiteredfull, /area/f13/brotherhood/reactor) "upv" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /area/f13/building) "upG" = ( /obj/machinery/light/small{ diff --git a/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm b/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm index 063769187cb..8d29edd00ce 100644 --- a/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm +++ b/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm @@ -4583,7 +4583,7 @@ }, /area/f13/village) "bQb" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft0" }, @@ -4628,7 +4628,7 @@ }, /area/f13/building) "bQV" = ( -/obj/machinery/light/sign/oasis, +/obj/machinery/light/sign/eastwood, /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) @@ -8026,7 +8026,7 @@ "dqX" = ( /obj/structure/ladder/unbreakable{ height = 2; - id = "oasis" + id = "eastwood" }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" @@ -11549,7 +11549,7 @@ /turf/open/floor/f13/wood, /area/f13/village) "ePY" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/outside/dirt, /area/f13/building) "eQc" = ( @@ -18720,7 +18720,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "hJt" = ( -/obj/machinery/msgterminal/oasis/followers, +/obj/machinery/msgterminal/eastwood/followers, /turf/open/floor/f13{ icon_state = "floorrusty" }, @@ -19550,7 +19550,7 @@ "iaV" = ( /obj/structure/ladder/unbreakable{ height = 2; - id = "oasisdb" + id = "eastwooddb" }, /turf/open/indestructible/ground/outside/ruins, /area/f13/building) @@ -24786,7 +24786,7 @@ }, /area/f13/building) "kkS" = ( -/obj/machinery/light/sign/oasis_sign, +/obj/machinery/light/sign/eastwood_sign, /turf/open/indestructible/ground/outside/dirt, /area/f13/building) "kld" = ( @@ -27739,7 +27739,7 @@ /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) "lzW" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/outside/sidewalk{ dir = 4; icon_state = "outerborder" @@ -47160,7 +47160,7 @@ /turf/open/floor/f13/wood, /area/f13/building) "uel" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalleftborderright0" }, @@ -47342,7 +47342,7 @@ /turf/open/floor/f13/wood, /area/f13/building) "uhi" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" }, @@ -47385,7 +47385,7 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/building) "uhY" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalrightborderleft2" }, diff --git a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Lower.dmm b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Lower.dmm index 7c4703a96ba..d71333f0d9b 100644 --- a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Lower.dmm +++ b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Lower.dmm @@ -28247,7 +28247,7 @@ "uqE" = ( /obj/structure/ladder/unbreakable{ height = 1; - id = "Nashsewers" + id = "Eastwoodsewers" }, /turf/open/floor/f13{ icon_state = "neutralrustyfull" @@ -30606,7 +30606,7 @@ /area/f13/caves) "woc" = ( /mob/living/simple_animal/hostile/raider/ranged/biker{ - name = "Texarkana Timothy" + name = "Pahrump Timothy" }, /turf/open/floor/f13{ icon_state = "greenrustyfull" diff --git a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Upper-2.dmm b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Upper-2.dmm index c96b93569d1..d1792318029 100644 --- a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Upper-2.dmm +++ b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Upper-2.dmm @@ -1112,8 +1112,8 @@ /area/f13/building) "CQ" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Christus Saint Michaels Hospital - Rooftop"; - name = "Nash - Christus Saint Michaels Hospital - Rooftop" + id = "Eastwood - Christus Saint Michaels Hospital - Rooftop"; + name = "Eastwood - Christus Saint Michaels Hospital - Rooftop" }, /turf/open/floor/plasteel/f13/vault_floor/dark{ icon_state = "darkdirty" diff --git a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Upper.dmm b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Upper.dmm index 59ef68214c0..20db933f11f 100644 --- a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Upper.dmm +++ b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Upper.dmm @@ -2359,7 +2359,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Tigers" + randomizer_tag = "Pahrump Tigers" }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_common, @@ -10036,7 +10036,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Tigers" + randomizer_tag = "Pahrump Tigers" }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_common, @@ -11890,7 +11890,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Tigers" + randomizer_tag = "Pahrump Tigers" }, /obj/machinery/light/small/broken{ dir = 1 diff --git a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset.dmm b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset.dmm index 77a7c195727..dd8ccc3bfe0 100644 --- a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset.dmm +++ b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset.dmm @@ -1613,15 +1613,15 @@ /area/f13/building) "agc" = ( /obj/machinery/button/door{ - id = "nasheast"; - name = "Nash East Shutters"; + id = "eastwoodeast"; + name = "Eastwood East Shutters"; pixel_x = -6; pixel_y = 29; req_one_access_txt = null }, /obj/machinery/button/door{ id = "deskcounter"; - name = "Nash East Shutters"; + name = "Eastwood East Shutters"; pixel_x = -6; pixel_y = 38; req_one_access_txt = null @@ -6744,7 +6744,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/carpet/black, /area/f13/building/abandoned) @@ -6756,7 +6756,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain2" @@ -9647,7 +9647,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -12893,7 +12893,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13{ icon_state = "redrustyfull" @@ -15075,7 +15075,7 @@ "baB" = ( /obj/structure/ladder/unbreakable{ height = 2; - id = "Nashsewers" + id = "Eastwoodsewers" }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/building) @@ -15826,7 +15826,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) @@ -17162,7 +17162,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "bir" = ( -/obj/machinery/light/sign/nash{ +/obj/machinery/light/sign/eastwood{ pixel_x = -14 }, /turf/open/indestructible/ground/outside/sidewalk, @@ -19884,7 +19884,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -23131,7 +23131,7 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "csr" = ( -/obj/machinery/light/sign/oasis{ +/obj/machinery/light/sign/eastwood{ density = 0; pixel_x = -27 }, @@ -24828,7 +24828,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -24983,7 +24983,7 @@ "dam" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/shutters/preopen{ - id = "nasheast" + id = "eastwoodeast" }, /turf/open/indestructible/ground/outside/road, /area/f13/building) @@ -25530,7 +25530,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) @@ -26163,7 +26163,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/ruins{ dir = 8; @@ -26504,7 +26504,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain2left" @@ -27995,7 +27995,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -28674,7 +28674,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalbottombordertop2" @@ -28741,7 +28741,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -28856,8 +28856,8 @@ /area/f13/wasteland) "ewZ" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Behind Red River Army Depot"; - name = "Nash - Behind Red River Army Depot" + id = "Eastwood - Behind Red River Army Depot"; + name = "Eastwood - Behind Red River Army Depot" }, /obj/effect/decal/waste{ icon_state = "goo12" @@ -29599,7 +29599,7 @@ /turf/open/floor/f13/wood, /area/f13/ruins) "eMn" = ( -/obj/machinery/vending/medical/nash, +/obj/machinery/vending/medical/eastwood, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/building) "eMw" = ( @@ -31584,8 +31584,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/vertibird{ - id = "Nash - By The Mall"; - name = "Nash - By The Mall" + id = "Eastwood - By The Mall"; + name = "Eastwood - By The Mall" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" @@ -33221,8 +33221,8 @@ /area/f13/wasteland) "ged" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Middle of Texarkana"; - name = "Nash - Middle of Texarkana" + id = "Eastwood - Middle of Pahrump"; + name = "Eastwood - Middle of Pahrump" }, /turf/open/indestructible/ground/outside/road{ dir = 8; @@ -33845,7 +33845,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/plasteel/f13/vault_floor/neutral/side{ dir = 1 @@ -35601,8 +35601,8 @@ /area/f13/wasteland) "gZu" = ( /obj/effect/landmark/vertibird{ - id = "Nash - SE of the City of Nash"; - name = "Nash - SE of the City of Nash" + id = "Eastwood - SE of the City of Eastwood"; + name = "Eastwood - SE of the City of Eastwood" }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" @@ -36164,7 +36164,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain2right" @@ -37566,7 +37566,7 @@ /area/f13/ruins) "hNd" = ( /obj/machinery/door/unpowered/securedoor{ - name = "First Bank of Nash"; + name = "First Bank of Eastwood"; req_one_access_txt = "52" }, /turf/open/floor/wood_fancy/wood_fancy_light, @@ -37758,7 +37758,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain2" @@ -41775,7 +41775,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite/rarecyan, /area/f13/building/abandoned) @@ -41928,8 +41928,8 @@ "juB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/vertibird{ - id = "Nash - Just East of Nash city"; - name = "Nash - Just East of Nash city" + id = "Eastwood - Just East of Eastwood city"; + name = "Eastwood - Just East of Eastwood city" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -42390,7 +42390,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13{ icon_state = "whitegreenrustychess" @@ -42601,7 +42601,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/ruins) @@ -43372,7 +43372,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/ruins) @@ -43993,7 +43993,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -46443,7 +46443,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) @@ -46903,7 +46903,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/city) @@ -47609,7 +47609,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -48844,7 +48844,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" @@ -55978,7 +55978,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -56050,7 +56050,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" @@ -57177,7 +57177,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13{ icon_state = "whitegreenrustychess" @@ -57497,7 +57497,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/city) @@ -61171,8 +61171,8 @@ "qLZ" = ( /obj/machinery/computer/terminal{ doc_content_1 = "We're proud to deliver all the possible upcoming technological developments coming down our assembly lines here at the Vault-Tec Exhibit of Technology! Come on down today and experience the glory of tosmorrow, today!"; - doc_title_1 = "Welcome to our newest exhibit in the Texarkana metro area!"; - name = "Texarkana Display of Corporate Technology Terminal"; + doc_title_1 = "Welcome to our newest exhibit in the Pahrump metro area!"; + name = "Pahrump Display of Corporate Technology Terminal"; termtag = "Secret" }, /obj/structure/table, @@ -61652,7 +61652,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/sidewalk{ dir = 4; @@ -63631,8 +63631,8 @@ /area/f13/building/abandoned) "rQb" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Christus Saint Michaels Hospital"; - name = "Nash - Christus Saint Michaels Hospital" + id = "Eastwood - Christus Saint Michaels Hospital"; + name = "Eastwood - Christus Saint Michaels Hospital" }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain2" @@ -66933,8 +66933,8 @@ /area/f13/wasteland/city) "tea" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Robot Parking Lot"; - name = "Nash - Robot Parking Lot" + id = "Eastwood - Robot Parking Lot"; + name = "Eastwood - Robot Parking Lot" }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" @@ -67192,7 +67192,7 @@ "thT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/vertibird{ - id = "Nash - Middle of Nash town" + id = "Eastwood - Middle of Eastwood town" }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain3" @@ -67724,7 +67724,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain2" @@ -67735,7 +67735,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/wood_common, /area/f13/building/abandoned) @@ -68357,7 +68357,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/carpet/black, /area/f13/building/abandoned) @@ -68461,7 +68461,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned) @@ -68619,7 +68619,7 @@ /area/f13/ruins) "tKR" = ( /obj/machinery/door/unpowered/securedoor{ - name = "First Bank of Nash"; + name = "First Bank of Eastwood"; req_one_access_txt = "52" }, /obj/effect/decal/cleanable/dirt, @@ -69695,7 +69695,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13/wood, /area/f13/ruins) @@ -72438,7 +72438,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/carpet/black, /area/f13/building/abandoned) @@ -72480,7 +72480,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -72696,7 +72696,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -72791,7 +72791,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/floor/f13{ icon_state = "whitegreenrustychess" @@ -73159,7 +73159,7 @@ /area/f13/building/abandoned) "vzh" = ( /obj/machinery/door/poddoor/shutters/preopen{ - id = "nasheast" + id = "eastwoodeast" }, /turf/open/indestructible/ground/outside/road, /area/f13/building) @@ -74283,8 +74283,8 @@ /area/f13/building) "vWm" = ( /obj/effect/landmark/vertibird{ - id = "Nash - Police Station"; - name = "Nash - Police Station" + id = "Eastwood - Police Station"; + name = "Eastwood - Police Station" }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/city) @@ -74892,7 +74892,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "low level mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) @@ -77304,8 +77304,8 @@ icon_state = "tall_grass_3" }, /obj/effect/landmark/vertibird{ - id = "Nash - Museum"; - name = "Nash - Museum" + id = "Eastwood - Museum"; + name = "Eastwood - Museum" }, /turf/open/indestructible/ground/outside/road{ dir = 1; @@ -77964,7 +77964,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 3; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/sidewalk{ dir = 1; @@ -78649,7 +78649,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft0" diff --git a/_maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm b/_maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm index 629be417f47..b006606bfa0 100644 --- a/_maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm +++ b/_maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm @@ -39122,7 +39122,7 @@ doc_content_1 = "THoSE FucKInG IDIots iN NAhs, ifuCKN cAn'T STaNd THem. mAYOr CROwLY DemanDeD I PaY My fuCKIn BiLls tO ThE bAr BUT thAt SOn of a BItCH KNows That i HaVE to SAvE HtmE for kEEpinG my siSter ALiV. We decIdeD to LEav anD HeaDto rEDwAter, mAYbE SoMeOne Will HIRe Me as a gUard AnD i can AFForD hEr medicieNCEs."; doc_content_2 = "i talk to overbos and they say maybe i work as guard, but they trid to put a collar on becca while iw asn't looking. I killed four of them getting her out of town but i mad a friend in the bar, his name is Sam and he told me he bring frends. we goin to make redwater pay"; doc_content_3 = "sam bring many frends n we buy chems from the new guys out west, they friendly enough. becca not looking good and mango scared, going to go out to pick her flowers later, but for now me clean gun. already kill thre more redwater asholes"; - doc_content_4 = "becca didnt make it redwatr and nash will burn"; + doc_content_4 = "becca didnt make it redwatr and eastwood will burn"; doc_content_5 = "mango thinking about leaving, sister dead and hav no reasn 2 stay here. think go down to coast and take up fishing, revenge not worth it, becca not want more blood"; doc_title_1 = "mango mad"; doc_title_2 = "mango rly mad"; @@ -46737,7 +46737,7 @@ /obj/machinery/computer/terminal{ dir = 4; doc_content_1 = "Take me to Snurch. I'll worship like a snail in the shrine of your light. I'll tell you my snins. So you can snarpen your snife"; - doc_content_2 = "I hate redwater, that town was so nice when I was a kid, but then again I guess everything was nice when I was a kid. At least for a while the place was run by decent folk, but ever since that snake Johnny rolled into town and killed the sheriff things have been going down hill. Good folk left for Nash, but I'm going to stay here and work on my armor. One day I'll go up there and avenge my friends death."; + doc_content_2 = "I hate redwater, that town was so nice when I was a kid, but then again I guess everything was nice when I was a kid. At least for a while the place was run by decent folk, but ever since that snake Johnny rolled into town and killed the sheriff things have been going down hill. Good folk left for Eastwood, but I'm going to stay here and work on my armor. One day I'll go up there and avenge my friends death."; doc_content_3 = "armr a92-24 done 294hda bran no fu9aw think well. worry01 fe ra l help"; doc_title_1 = "Take me to snurch"; doc_title_2 = "Garys Memoirs"; @@ -47413,7 +47413,7 @@ /obj/machinery/computer/terminal{ dir = 4; doc_content_1 = "I got a phone call last night from a friend of mine in the Air Force, he said some very dark things about what he thinks is about to happen and how maybe I should return home to be with my family. I've decided he's off his rocker, probably spent too much time huffing jet fuel and drinking. Besides, the prisoners in here aren't going to watch themselves. "; - doc_content_2 = "I should have gone home. He was right. I watched as a guard looked into the light in the parking lot, a bomb went off in Texarkana. I got lucky, the building and our distance shaded me from the blast but I watched as his eyes boiled in their sockets. I shot him. I shot Jerry in the head to stop his screaming. The prisoners are rebelling again, most of the powers gone out. If we don't get help soon we're probably going to have to do something drastic. God help us all."; + doc_content_2 = "I should have gone home. He was right. I watched as a guard looked into the light in the parking lot, a bomb went off in Pahrump. I got lucky, the building and our distance shaded me from the blast but I watched as his eyes boiled in their sockets. I shot him. I shot Jerry in the head to stop his screaming. The prisoners are rebelling again, most of the powers gone out. If we don't get help soon we're probably going to have to do something drastic. God help us all."; doc_content_3 = "It's clear at this point that help isn't coming, and that we're all going to die out here if we stay put. We've ordered the guards to create an exit for the prisoners to funnel out of, I can't believe it but we're releasing them. We're releasing murders and madmen back into the world because I don't have the heart to just shoot them. For those that come after us I to am leaving this place, after the guards have made sure all the prisoners are gone we're going to wait a few days and then try and return to our homes. If we even have any to return to."; doc_content_4 = "hi i gues, me n mi pals fund thiz old comouter we thnk u smel lik shjt"; doc_content_5 = "nya bitches ~Mango Mathew an' pals"; diff --git a/_maps/map_files/Pahrump-Sunset-Lower.dmm b/_maps/map_files/Pahrump-Sunset-Lower.dmm index bf5da4e9e21..75f007459bf 100644 --- a/_maps/map_files/Pahrump-Sunset-Lower.dmm +++ b/_maps/map_files/Pahrump-Sunset-Lower.dmm @@ -13929,7 +13929,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/inside/mountain, /area/f13/tunnel) @@ -14656,7 +14656,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, @@ -17392,7 +17392,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/plating/tunnel, /area/f13/building/sewers) @@ -19405,7 +19405,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) @@ -21786,7 +21786,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /obj/effect/decal/cleanable/blood/old, /turf/open/indestructible/ground/inside/mountain, @@ -24407,7 +24407,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13{ icon_state = "greenrustyfull" @@ -28809,7 +28809,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/f13{ icon_state = "greenrustyfull" @@ -29866,7 +29866,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "mid level mobs"; - randomizer_tag = "Texarkana Residential District 1" + randomizer_tag = "Pahrump Residential District 1" }, /turf/open/indestructible/ground/inside/mountain, /area/f13/tunnel) @@ -30484,7 +30484,7 @@ icon_state = "gibbearcore" }, /mob/living/simple_animal/hostile/raider/ranged/biker{ - name = "Texarkana Timothy" + name = "Pahrump Timothy" }, /turf/open/indestructible/ground/inside/subway{ name = "cave" @@ -31951,7 +31951,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -32377,7 +32377,7 @@ /area/f13/building/hospital) "vOQ" = ( /mob/living/simple_animal/hostile/raider/ranged/biker{ - name = "Texarkana Timothy" + name = "Pahrump Timothy" }, /turf/open/water, /area/f13/building/sewers) @@ -33378,7 +33378,7 @@ /obj/structure/nest/randomized{ randomizer_difficulty = 1; randomizer_kind = "trash mobs"; - randomizer_tag = "Nash East Road" + randomizer_tag = "Eastwood East Road" }, /turf/open/floor/plating/tunnel, /area/f13/building/sewers) diff --git a/_maps/map_files/Temp Map Storage/Dungeons -outdated.dmm b/_maps/map_files/Temp Map Storage/Dungeons -outdated.dmm index 30ddf051050..71a84e09fac 100644 --- a/_maps/map_files/Temp Map Storage/Dungeons -outdated.dmm +++ b/_maps/map_files/Temp Map Storage/Dungeons -outdated.dmm @@ -15329,7 +15329,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/underground/cave) "plP" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) "plV" = ( diff --git a/_maps/map_files/Temp Map Storage/Pahrump-Sunset - Outdated.dmm b/_maps/map_files/Temp Map Storage/Pahrump-Sunset - Outdated.dmm index 07e3778c5b6..e1302524e4d 100644 --- a/_maps/map_files/Temp Map Storage/Pahrump-Sunset - Outdated.dmm +++ b/_maps/map_files/Temp Map Storage/Pahrump-Sunset - Outdated.dmm @@ -4654,7 +4654,7 @@ }, /area/f13/village) "bQb" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft0" }, @@ -4699,7 +4699,7 @@ }, /area/f13/building) "bQV" = ( -/obj/machinery/light/sign/oasis, +/obj/machinery/light/sign/eastwood, /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) @@ -8089,7 +8089,7 @@ "dqX" = ( /obj/structure/ladder/unbreakable{ height = 2; - id = "oasis" + id = "eastwood" }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" @@ -11682,7 +11682,7 @@ /turf/open/floor/f13/wood, /area/f13/village) "ePY" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/outside/dirt, /area/f13/building) "eQc" = ( @@ -18975,7 +18975,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "hJt" = ( -/obj/machinery/msgterminal/oasis/followers, +/obj/machinery/msgterminal/eastwood/followers, /turf/open/floor/f13{ icon_state = "floorrusty" }, @@ -19824,7 +19824,7 @@ "iaV" = ( /obj/structure/ladder/unbreakable{ height = 2; - id = "oasisdb" + id = "eastwooddb" }, /turf/open/indestructible/ground/outside/ruins, /area/f13/building) @@ -25226,7 +25226,7 @@ }, /area/f13/building) "kkS" = ( -/obj/machinery/light/sign/oasis_sign, +/obj/machinery/light/sign/eastwood_sign, /turf/open/indestructible/ground/outside/dirt, /area/f13/building) "kld" = ( @@ -28158,7 +28158,7 @@ /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) "lzW" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/outside/sidewalk{ dir = 4; icon_state = "outerborder" @@ -47862,7 +47862,7 @@ /turf/open/floor/f13/wood, /area/f13/building) "uel" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalleftborderright0" }, @@ -48058,7 +48058,7 @@ /turf/open/floor/f13/wood, /area/f13/building) "uhi" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" }, @@ -48101,7 +48101,7 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/building) "uhY" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalrightborderleft2" }, diff --git a/_maps/map_files/Temp Map Storage/Pahrump-Sunset-Lower - Outdated.dmm b/_maps/map_files/Temp Map Storage/Pahrump-Sunset-Lower - Outdated.dmm index b7757cbae31..5306ffb8e06 100644 --- a/_maps/map_files/Temp Map Storage/Pahrump-Sunset-Lower - Outdated.dmm +++ b/_maps/map_files/Temp Map Storage/Pahrump-Sunset-Lower - Outdated.dmm @@ -6266,7 +6266,7 @@ "dyv" = ( /obj/structure/ladder/unbreakable{ height = 1; - id = "oasis" + id = "eastwood" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -23632,7 +23632,7 @@ /area/f13/caves) "nWK" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /area/f13/building) "nWR" = ( /obj/structure/curtain{ @@ -25250,7 +25250,7 @@ pixel_y = -17 }, /obj/structure/rack, -/obj/item/clothing/suit/armor/medium/vest/oasis, +/obj/item/clothing/suit/armor/medium/vest/eastwood, /obj/item/clothing/head/helmet/blueshirt, /obj/item/clothing/under/rank/security/officer/blueshirt, /turf/open/floor/plasteel/f13/vault_floor/dark{ @@ -30207,8 +30207,8 @@ /area/f13/den) "rTg" = ( /obj/structure/flora/tree/jungle{ - desc = "Rumor has it that, as long as this tree stands firm, so too will the town of Oasis."; - name = "\improper Oasis Oak"; + desc = "Rumor has it that, as long as this tree stands firm, so too will the town of Eastwood."; + name = "\improper Eastwood Oak"; pixel_x = -33 }, /turf/open/indestructible/ground/outside/river, @@ -33904,7 +33904,7 @@ /turf/open/floor/plasteel/f13/vault_floor/red/whiteredfull, /area/f13/brotherhood/reactor) "upv" = ( -/obj/item/flag/oasis, +/obj/item/flag/eastwood, /area/f13/building) "upG" = ( /obj/machinery/light/small{ diff --git a/_maps/oldstuff/pahrump-garland.json b/_maps/oldstuff/pahrump-garland.json index 4ada617661b..1e92ccd0137 100644 --- a/_maps/oldstuff/pahrump-garland.json +++ b/_maps/oldstuff/pahrump-garland.json @@ -1,5 +1,5 @@ { - "map_name": "East Texarkana", + "map_name": "East Pahrump", "map_path": "map_files/Pahrump-AB", "map_file": [ "Dungeons.dmm", diff --git a/_maps/oldstuff/pahrump-redriver-garland.json b/_maps/oldstuff/pahrump-redriver-garland.json index 19b1d9455eb..6aafb1b3707 100644 --- a/_maps/oldstuff/pahrump-redriver-garland.json +++ b/_maps/oldstuff/pahrump-redriver-garland.json @@ -1,5 +1,5 @@ { - "map_name": "North East Texarkana", + "map_name": "North East Pahrump", "map_path": "map_files/Pahrump-AB", "map_file": [ "Dungeons.dmm", diff --git a/_maps/oldstuff/pahrump-redriver.json b/_maps/oldstuff/pahrump-redriver.json index fefe242dde8..d801555e048 100644 --- a/_maps/oldstuff/pahrump-redriver.json +++ b/_maps/oldstuff/pahrump-redriver.json @@ -1,5 +1,5 @@ { - "map_name": "North Texarkana", + "map_name": "North Pahrump", "map_path": "map_files/Pahrump-AB", "map_file": [ "Dungeons.dmm", diff --git a/_maps/oldstuff/pahrump-rocksprings-garland.json b/_maps/oldstuff/pahrump-rocksprings-garland.json index 02e30ca76ea..e52cd0b90d8 100644 --- a/_maps/oldstuff/pahrump-rocksprings-garland.json +++ b/_maps/oldstuff/pahrump-rocksprings-garland.json @@ -1,5 +1,5 @@ { - "map_name": "South East Texarkana", + "map_name": "South East Pahrump", "map_path": "map_files/Pahrump-AB", "map_file": [ "Dungeons.dmm", diff --git a/_maps/oldstuff/pahrump-rocksprings-redriver.json b/_maps/oldstuff/pahrump-rocksprings-redriver.json index 9d48fae50b8..4c43f3586d3 100644 --- a/_maps/oldstuff/pahrump-rocksprings-redriver.json +++ b/_maps/oldstuff/pahrump-rocksprings-redriver.json @@ -1,5 +1,5 @@ { - "map_name": "West Texarkana", + "map_name": "West Pahrump", "map_path": "map_files/Pahrump-AB", "map_file": [ "Dungeons.dmm", diff --git a/_maps/oldstuff/pahrump-rocksprings.json b/_maps/oldstuff/pahrump-rocksprings.json index 2bc916655c2..9175d095d7b 100644 --- a/_maps/oldstuff/pahrump-rocksprings.json +++ b/_maps/oldstuff/pahrump-rocksprings.json @@ -1,5 +1,5 @@ { - "map_name": "South Texarkana", + "map_name": "South Pahrump", "map_path": "map_files/Pahrump-AB", "map_file": [ "Dungeons.dmm", diff --git a/_maps/pahrump-everything.json b/_maps/pahrump-everything.json index 99f6cfa7b73..0f48933f0ea 100644 --- a/_maps/pahrump-everything.json +++ b/_maps/pahrump-everything.json @@ -1,5 +1,5 @@ { - "map_name": "Texarkana", + "map_name": "Pahrump", "map_path": "map_files/Pahrump-AB", "map_file": [ "Dungeons.dmm", diff --git a/_maps/pahrump-only.json b/_maps/pahrump-only.json index df7abf4f7a8..1c81c022d04 100644 --- a/_maps/pahrump-only.json +++ b/_maps/pahrump-only.json @@ -1,5 +1,5 @@ { - "map_name": "Central Texarkana", + "map_name": "Central Pahrump", "map_path": "map_files/Pahrump-AB", "map_file": [ "Dungeons.dmm", diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 9a255b01020..85433992bf8 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -100,7 +100,7 @@ also be like that but I can't be arsed to go back and change them all*/ #define ACCESS_COMMAND 130 //general command access #define ACCESS_TRIBE 131 //general tribe access #define ACCESS_NCROFFDUTY 132 //general NCR access -#define ACCESS_CLINIC 133 //Oasis clinic access +#define ACCESS_CLINIC 133 //Eastwood clinic access #define ACCESS_ENCLAVE 134 //enclave minibunker #define ACCESS_BIKER 135 //general not-khan cowbikers //The Syndicate @@ -142,3 +142,4 @@ also be like that but I can't be arsed to go back and change them all*/ #define ACCESS_TOWN_HOS 282 #define ACCESS_TOWN_CMO 287 #define ACCESS_TOWN_COMMAND 283 +#define ACCESS_TOWN_RADIO 284 diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index d6e456a9627..5260b0952af 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -4,7 +4,7 @@ #define FACTION_NCR "NCR" #define FACTION_LEGION "Legion" #define FACTION_BROTHERHOOD "BOS" -#define FACTION_OASIS "Town" +#define FACTION_EASTWOOD "Town" #define FACTION_ENCLAVE "Enclave" #define FACTION_WASTELAND "Wastelander" #define FACTION_RAIDERS "Raiders" @@ -119,7 +119,7 @@ #define F13OFFDUTYBOS (1<<11) #define F13ENVOY (1<<12) -#define DEP_OASIS (1<<6) +#define DEP_EASTWOOD (1<<6) #define F13SHERIFF (1<<0) #define F13DENDOC (1<<1) @@ -136,6 +136,7 @@ #define F13BANKER (1<<12) // IDK MAN BUT IT SEEMS IMPORTANT #define F13BARKEEP (1<<13) #define F13PILOT (1<<14) +#define F13RADIOHOST (1<<15) #define VAULT (1<<7) @@ -321,6 +322,7 @@ #define JOB_DISPLAY_ORDER_BANKER 89// IDK MAN BUT IT SEEMS IMPORTANT #define JOB_DISPLAY_ORDER_BARKEEP 90 #define JOB_DISPLAY_ORDER_PILOT 91 +#define JOB_DISPLAY_ORDER_RADIOHOST 91.9 #define JOB_DISPLAY_ORDER_OVERSEER 92 diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 310d0cea832..550ba24d954 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -76,7 +76,7 @@ #define EXP_TYPE_VAULT "Vault" #define EXP_TYPE_BROTHERHOOD "Southern BoS Outcasts" #define EXP_TYPE_NCR "Ncr" -#define EXP_TYPE_OASIS "Oasis" +#define EXP_TYPE_EASTWOOD "Eastwood" #define EXP_TYPE_LEGION "Legion" #define EXP_TYPE_WASTELAND "Wasteland" #define EXP_TYPE_ENCLAVE "Enclave" @@ -85,7 +85,7 @@ #define EXP_TYPE_SCRIBE "Scribe" #define EXP_TYPE_DECANUS "Decanus" #define EXP_TYPE_TRIBAL "Tribal" -#define EXP_TYPE_FOLLOWERS "Nash Clinic" +#define EXP_TYPE_FOLLOWERS "Followers" #define EXP_TYPE_OUTLAW "Outlaw" #define EXP_TYPE_KHAN "Great Khans" //Flags in the players table in the db diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm index 95bc79190c1..48e59c643af 100644 --- a/code/__DEFINES/radio.dm +++ b/code/__DEFINES/radio.dm @@ -69,7 +69,7 @@ #define RADIO_KEY_ENCLAVE "z" #define RADIO_TOKEN_ENCLAVE ":z" -#define RADIO_CHANNEL_TOWN "Nash" +#define RADIO_CHANNEL_TOWN "Eastwood" #define RADIO_KEY_TOWN "f" #define RADIO_TOKEN_TOWN ":f" diff --git a/code/__DEFINES/weather.dm b/code/__DEFINES/weather.dm index 9f0ad26cfde..9e68865cd38 100644 --- a/code/__DEFINES/weather.dm +++ b/code/__DEFINES/weather.dm @@ -1,39 +1,39 @@ /// Z levels that are more or less above ground and can see the sky /// For telling players about the weather -#define Z_LEVEL_NASH_UNDERGROUND 3 -#define Z_LEVEL_NASH_COMMON 4 -#define Z_LEVEL_NASH_LVL2 5 -#define Z_LEVEL_NASH_LVL3 6 +#define Z_LEVEL_EASTWOOD_UNDERGROUND 3 +#define Z_LEVEL_EASTWOOD_COMMON 4 +#define Z_LEVEL_EASTWOOD_LVL2 5 +#define Z_LEVEL_EASTWOOD_LVL3 6 #define Z_LEVEL_REDWATER 7 #define Z_LEVEL_REDLICK 8 #define Z_LEVEL_GARLAND 9 #define ABOVE_GROUND_Z_LEVELS list(\ - Z_LEVEL_NASH_COMMON,\ - Z_LEVEL_NASH_LVL2,\ - Z_LEVEL_NASH_LVL3,\ + Z_LEVEL_EASTWOOD_COMMON,\ + Z_LEVEL_EASTWOOD_LVL2,\ + Z_LEVEL_EASTWOOD_LVL3,\ Z_LEVEL_REDWATER,\ Z_LEVEL_REDLICK,\ Z_LEVEL_GARLAND) #define COMMON_Z_LEVELS list(\ - Z_LEVEL_NASH_UNDERGROUND,\ - Z_LEVEL_NASH_COMMON,\ - Z_LEVEL_NASH_LVL2,\ - Z_LEVEL_NASH_LVL3,\ + Z_LEVEL_EASTWOOD_UNDERGROUND,\ + Z_LEVEL_EASTWOOD_COMMON,\ + Z_LEVEL_EASTWOOD_LVL2,\ + Z_LEVEL_EASTWOOD_LVL3,\ Z_LEVEL_REDWATER,\ Z_LEVEL_REDLICK,\ Z_LEVEL_GARLAND) #define CORE_Z_LEVELS list(\ - Z_LEVEL_NASH_UNDERGROUND,\ - Z_LEVEL_NASH_COMMON,\ - Z_LEVEL_NASH_LVL2,\ - Z_LEVEL_NASH_LVL3) + Z_LEVEL_EASTWOOD_UNDERGROUND,\ + Z_LEVEL_EASTWOOD_COMMON,\ + Z_LEVEL_EASTWOOD_LVL2,\ + Z_LEVEL_EASTWOOD_LVL3) /* * * * * * * * * * * * * * THE Z LEVELS~ - * 3 = NASH UNDERGROUND - * 4 = NASH CENTRAL - * 5 = NASH LVL 2 - * 6 = NASH LVL 3 + * 3 = EASTWOOD UNDERGROUND + * 4 = EASTWOOD CENTRAL + * 5 = EASTWOOD LVL 2 + * 6 = EASTWOOD LVL 3 * 7 = REDWATER * 8 = REDLICK * * * * * * * * * * * * */ diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index cab9d5cdaca..02086cddb7e 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -209,7 +209,7 @@ if(length(CONFIG_GET(keyed_list/cross_server))) send_news_report() //fortuna addition. list of random names for the roundend news author - var/list/publisher = list("Oasis Publishing","Brotherhood News","Mojave Publishing","FEV News") + var/list/publisher = list("Eastwood Publishing","Brotherhood News","Mojave Publishing","FEV News") //tell the nice people on discord what went on before the salt cannon happens. // send2chat sending the new round ping off send2chat(" <@&922230570791108628> ", CONFIG_GET(string/discord_channel_serverstatus)) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 793fba43fe0..7670b372638 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -574,7 +574,7 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/send_news_report() var/news_message - var/news_source = "Nash Publishing" + var/news_source = "Eastwood Publishing" switch(news_report) if(NUKE_SYNDICATE_BASE) news_message = "In a daring raid, the heroic crew of [station_name()] detonated a nuclear device in the heart of a terrorist base." @@ -622,7 +622,7 @@ SUBSYSTEM_DEF(ticker) if(SSblackbox.first_death) var/list/ded = SSblackbox.first_death //fortuna addition. list of random names for the roundend news investigator - var/list/investigator = list("Nash Investigators","A band of couriers","Patrolling wasters","A few mysterious strangers") + var/list/investigator = list("Eastwood Investigators","A band of couriers","Patrolling wasters","A few mysterious strangers") if(ded.len) news_message += "[pick(investigator)] discovered the corpse of a person of interest in the area. Their name was: [ded["name"]], the [ded["role"]], who died in a nearby [ded["area"]].[ded["last_words"] ? " Their last words were: \"[ded["last_words"]]\"" : ""]" else diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index 3b29e8b33c6..eace9775c9b 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -728,7 +728,7 @@ /datum/crafting_recipe/gun/autoshock name = "Autoshock tesla pistol" - result = /obj/item/gun/energy/laser/auto/oasis + result = /obj/item/gun/energy/laser/auto/eastwood reqs = list(/obj/item/gun/energy/laser/auto = 1, /obj/item/stock_parts/capacitor/adv = 1, /obj/item/stack/crafting/electronicparts = 10, diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 16eb3bab135..978ac1824a3 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -95,7 +95,7 @@ var/list/command = list() var/list/bos = list() var/list/enclave = list() - var/list/oasis = list() + var/list/eastwood = list() var/list/leg = list() var/list/ncr = list() var/list/vault = list() @@ -133,8 +133,8 @@ if(rank in GLOB.enclave_positions) enclave[name] = rank department = 1 - if(rank in GLOB.oasis_positions) - oasis[name] = rank + if(rank in GLOB.eastwood_positions) + eastwood[name] = rank department = 1 if(rank in GLOB.legion_positions) leg[name] = rank @@ -142,9 +142,9 @@ if(rank in GLOB.ncr_positions) ncr[name] = rank department = 1 - if(rank in GLOB.followers_positions) +/* if(rank in GLOB.followers_positions) flw[name] = rank - department = 1 + department = 1*/ /* if(rank in GLOB.tribal_positions) tribe[name] = rank @@ -173,10 +173,10 @@ for(var/name in enclave) dat += "[name][enclave[name]]" even = !even - if(length(oasis)) - dat += "Nash" - for(var/name in oasis) - dat += "[name][oasis[name]]" + if(length(eastwood)) + dat += "Eastwood" + for(var/name in eastwood) + dat += "[name][eastwood[name]]" even = !even if(length(leg)) dat += "Caesar's Legion" @@ -189,7 +189,7 @@ dat += "[name][ncr[name]]" even = !even if(length(flw)) - dat += "Nash Clinic" + dat += "Eastwood Clinic" for(var/name in flw) dat += "[name][flw[name]]" even = !even diff --git a/code/datums/looping_sounds/ambient_sounds.dm b/code/datums/looping_sounds/ambient_sounds.dm index 777d142749f..22dec6e4f2d 100644 --- a/code/datums/looping_sounds/ambient_sounds.dm +++ b/code/datums/looping_sounds/ambient_sounds.dm @@ -388,7 +388,7 @@ //Generic Ambience End// -//Radio Texarkana// +//Radio Pahrump// /datum/looping_sound/ambient/djswampass chance = 10 @@ -438,5 +438,5 @@ SOUND_LOOP_ENTRY('sound/f13/anythinggoes.ogg', 97 SECONDS, 10), SOUND_LOOP_ENTRY('sound/f13/thats_life.ogg', 124 SECONDS, 10), ) -// Radio Texarkana End// +// Radio Pahrump End// diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm index c2f599edf50..212a917f26c 100644 --- a/code/datums/spawners_menu.dm +++ b/code/datums/spawners_menu.dm @@ -55,7 +55,7 @@ if(aminol.lazarused) this["important_info"] = "This creature is tamed, and is bound to follow the commands of who/what had tamed them!" else if(aminol.pop_required_to_jump_into < players_on) - this["important_info"] = "This creature's abilities are somewhat limited while Nash sleeps." + this["important_info"] = "This creature's abilities are somewhat limited while Eastwood sleeps." else this["important_info"] = aminol.desc_important else diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index 790e317d223..3b29bdbbe95 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -244,10 +244,10 @@ var/list/command = list() var/list/ncr = list() var/list/legion = list() - var/list/oasis = list() + var/list/eastwood = list() var/list/brotherhood = list() var/list/wastelanders = list() - var/list/followers = list() + //var/list/followers = list() var/list/misc = list() for(var/datum/data/record/R in GLOB.data_core.general) var/name = R.fields["name"] @@ -255,12 +255,12 @@ var/real_rank = rank // make_list_rank(R.fields["real_rank"]) if(real_rank in GLOB.ncr_positions) ncr[name] = rank - else if(real_rank in GLOB.followers_positions) - followers[name] = rank + /*else if(real_rank in GLOB.followers_positions) + followers[name] = rank*/ else if(real_rank in GLOB.legion_positions) legion[name] = rank - else if(real_rank in GLOB.oasis_positions) - oasis[name] = rank + else if(real_rank in GLOB.eastwood_positions) + eastwood[name] = rank else if(real_rank in GLOB.brotherhood_positions) brotherhood[name] = rank else if(real_rank in GLOB.command_positions) @@ -277,9 +277,9 @@ .["Command"] = command .["New California Republic"] = ncr .["Legion"] = legion - .["Nash Clinic"] = followers + //.["Eastwood Clinic"] = followers .["Brotherhood of Steel"] = brotherhood - .["Nash"] = oasis + .["Eastwood"] = eastwood .["Wastelanders"] = wastelanders .["Other"] = misc return json_encode(.) diff --git a/code/game/machinery/msgterminal.dm b/code/game/machinery/msgterminal.dm index 4376c12bb67..52ffe9a51ec 100644 --- a/code/game/machinery/msgterminal.dm +++ b/code/game/machinery/msgterminal.dm @@ -428,14 +428,14 @@ GLOBAL_LIST_EMPTY(allTerminals) terminal = "Terminal" terminalType = 2 */ -/obj/machinery/msgterminal/oasis - terminalid = "oasis" - terminal = "Oasis Terminal" +/obj/machinery/msgterminal/eastwood + terminalid = "eastwood" + terminal = "Eastwood Terminal" terminalType = 2 -/obj/machinery/msgterminal/oasis/followers +/obj/machinery/msgterminal/eastwood/followers terminalid = "follower" - terminal = "Oasis Followers Terminal" + terminal = "Eastwood Followers Terminal" terminalType = 2 /obj/machinery/msgterminal/brotherhood diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 32d5d6050cc..6b1e5fdaf4c 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -1829,9 +1829,9 @@ turret_flags = TURRET_ROBOT_OWNED_FLAGS | TURRET_DEFAULT_UTILITY faction = list("wastebot") -/// Nash's Friendliest Autogun +/// Eastwood's Friendliest Autogun /// needs ammo~ -/obj/machinery/porta_turret/f13/nash +/obj/machinery/porta_turret/f13/eastwood name = "portable .22LR sentry turret" icon = 'icons/obj/turrets.dmi' icon_state = "syndie_off" @@ -1875,14 +1875,14 @@ SP_DISTANT_RANGE(PISTOL_LIGHT_RANGE_DISTANT) ) -/obj/machinery/porta_turret/f13/nash/Initialize() +/obj/machinery/porta_turret/f13/eastwood/Initialize() . = ..() if(our_mag) var/obj/item/ammo_box/magazine/internal/newmag = our_mag our_mag = new newmag(src) chamber_new_round(FALSE) -/obj/machinery/porta_turret/f13/nash/Destroy() +/obj/machinery/porta_turret/f13/eastwood/Destroy() . = ..() if(istype(our_mag) && obj_integrity <= 0) for(var/obj/item/ammo_casing/casing_to_eject in our_mag.stored_ammo) @@ -1890,17 +1890,17 @@ QDEL_NULL(our_mag) QDEL_NULL(chambered) -/obj/machinery/porta_turret/f13/nash/examine(mob/user) +/obj/machinery/porta_turret/f13/eastwood/examine(mob/user) . = ..() if(istype(our_mag) && length(our_mag.caliber)) . += "It accepts [span_notice(english_list(our_mag.caliber))]" . += "It has [span_notice("[our_mag.ammo_count() + (!!chambered)]")] / [span_notice("[our_mag.max_ammo]")] round\s remaining." -/obj/machinery/porta_turret/f13/nash/proc/out_of_ammo_alert() +/obj/machinery/porta_turret/f13/eastwood/proc/out_of_ammo_alert() playsound(get_turf(src), 'sound/machines/triple_beep.ogg', 100, FALSE, 0, ignore_walls = TRUE) say("OUT OF: AMMO! NEED: [span_notice(english_list(our_mag.caliber))]!") -/obj/machinery/porta_turret/f13/nash/proc/eject_chambered_round(keep_it) +/obj/machinery/porta_turret/f13/eastwood/proc/eject_chambered_round(keep_it) if(!istype(chambered)) return FALSE if(keep_it && our_mag.give_round(chambered)) @@ -1910,7 +1910,7 @@ chambered = null return TRUE -/obj/machinery/porta_turret/f13/nash/proc/chamber_new_round(eject_current) +/obj/machinery/porta_turret/f13/eastwood/proc/chamber_new_round(eject_current) if(istype(chambered)) if(eject_current || !chambered.BB) eject_chambered_round() @@ -1920,7 +1920,7 @@ return TRUE return FALSE -/obj/machinery/porta_turret/f13/nash/attackby(obj/item/I, mob/user, params) +/obj/machinery/porta_turret/f13/eastwood/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/ammo_box)) if(istype(our_mag)) our_mag.attackby(I, user) @@ -1941,7 +1941,7 @@ return . = ..() -/obj/machinery/porta_turret/f13/nash/proc/dump_bag_in_turret(obj/item/storage/bag/casings/saq, mob/user) +/obj/machinery/porta_turret/f13/eastwood/proc/dump_bag_in_turret(obj/item/storage/bag/casings/saq, mob/user) if(!istype(saq)) return if(!istype(user)) @@ -1971,7 +1971,7 @@ else to_chat(user, span_warning("You couldn't fit anything into [src]!")) -/obj/machinery/porta_turret/f13/nash/proc/undeploy_turret(obj/item/m_tool, mob/user) +/obj/machinery/porta_turret/f13/eastwood/proc/undeploy_turret(obj/item/m_tool, mob/user) visible_message(span_notice("[user] starts packing up [src]!"), span_notice("You starts packing up [src]!")) if(!m_tool.use_tool(src, user, 3 SECONDS, 0, 100)) @@ -1986,7 +1986,7 @@ our_mag = null qdel(src) -/obj/machinery/porta_turret/f13/nash/proc/heal_turret(obj/item/weldertool, mob/user) +/obj/machinery/porta_turret/f13/eastwood/proc/heal_turret(obj/item/weldertool, mob/user) if(stat & BROKEN) user.show_message(span_alert("It's beyond repair!")) return @@ -2002,7 +2002,7 @@ span_green("You repaired [src]!")) /// modified to use our silly ammo system -/obj/machinery/porta_turret/f13/nash/shoot_at_target(atom/movable/target, turf/our_turf) +/obj/machinery/porta_turret/f13/eastwood/shoot_at_target(atom/movable/target, turf/our_turf) if(!target || !our_turf) return FALSE if(!chambered || (chambered && !chambered.BB)) @@ -2047,7 +2047,7 @@ return TRUE /// dumps loot all over the place -/obj/machinery/porta_turret/f13/nash/drop_loot(obj/item/I, mob/user) +/obj/machinery/porta_turret/f13/eastwood/drop_loot(obj/item/I, mob/user) new /obj/item/gun/ballistic/automatic/sportcarbine(get_turf(src)) ..() @@ -2070,7 +2070,7 @@ icon_state = "hivebot_fab_on" w_class = WEIGHT_CLASS_GIGANTIC /// type of turret to make - var/obj/machinery/porta_turret/f13/nash/turret_type = /obj/machinery/porta_turret/f13/nash + var/obj/machinery/porta_turret/f13/eastwood/turret_type = /obj/machinery/porta_turret/f13/eastwood /// magazine inside the gun, if it was packed up after deploying var/obj/item/ammo_box/magazine/stored_mag @@ -2094,7 +2094,7 @@ if(!do_after(user, 3 SECONDS, FALSE, user)) user.show_message(span_alert("You were interrupted!")) return - var/obj/machinery/porta_turret/f13/nash/turret_new = new turret_type(get_turf(src)) + var/obj/machinery/porta_turret/f13/eastwood/turret_new = new turret_type(get_turf(src)) if(istype(stored_mag)) QDEL_NULL(turret_new.our_mag) turret_new.our_mag = stored_mag diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 0637318b572..ab605916c15 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -558,7 +558,7 @@ /obj/structure/sign/poster/prewar/poster68 name = "General Store Policy" - desc = "By decree of the Oasis Town Hall, the general store has the right to refuse any and all refunds to customers for any reason." + desc = "By decree of the Eastwood Town Hall, the general store has the right to refuse any and all refunds to customers for any reason." icon_state = "poster68" /obj/structure/sign/poster/prewar/poster69 diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index d3cfa5a8b31..bfc57df6b73 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -741,7 +741,7 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer name = "Vault Dweller" icon_state = "Vault Dweller" -// Oasis +// Eastwood /obj/effect/landmark/start/f13/mayor name = "Mayor" @@ -769,6 +769,10 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer name = "Citizen" icon_state = "Settler" +/obj/effect/landmark/start/f13/radio_host + name = "Radio Host" + icon_state = "Radio-Host" + /obj/effect/landmark/start/f13/pilot name = "Vertibird Pilot" icon_state = "Scribe" @@ -777,7 +781,7 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer name = "Doctor" /obj/effect/landmark/start/f13/quartermaster - name = "Texarkana Quartermaster" + name = "Pahrump Quartermaster" icon_state = "Shopkeeper" /obj/effect/landmark/start/f13/shopkeeper @@ -910,7 +914,7 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer name = "Guardian" icon_state = "Tribal" -//Followers of the Apocalypse -- nah, nash medical stuff +//Followers of the Apocalypse -- nah, eastwood medical stuff /obj/effect/landmark/start/f13/followersadministrator name = "Senior Doctor" icon_state = "Chief Medical Officer" @@ -920,7 +924,7 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer icon_state = "Medical Doctor" /obj/effect/landmark/start/f13/followersguard - name = "Nash Paramedic" + name = "Eastwood Paramedic" icon_state = "Security Officer" /obj/effect/landmark/start/f13/followersvolunteer diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index fabd3c670fe..6936e4d1140 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -1192,7 +1192,7 @@ /obj/item/card/id/denid name = "Redwater Mark" - desc = "A shady card for shady people. it might let you in to some of the bleaker parts of Nash's underground. Best not be seen with one of these. better yet, just avoid having it" + desc = "A shady card for shady people. it might let you in to some of the bleaker parts of Eastwood's underground. Best not be seen with one of these. better yet, just avoid having it" assignment = "gang tattoo" access = list(ACCESS_DEN) @@ -1258,7 +1258,7 @@ /obj/item/card/id/silver/mayor name = "Mayor's mayoral permit" - desc = "A silver encrusted identification permit reserved for the Mayor of Oasis." + desc = "A silver encrusted identification permit reserved for the Mayor of Eastwood." icon_state = "silver" item_state = "silver_id" assignment = "mayoral permit" diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index cb9c2a258c7..dad3db92cba 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -178,44 +178,44 @@ channels = list(RADIO_CHANNEL_ENCLAVE = 1) /obj/item/encryptionkey/headset_town - name = "Nash radio encryption key" + name = "Eastwood Clinic radio encryption key" desc = "An encryption key for a radio headset.\ - \nTo access the Nash channel, use :f." + \nTo access the Town channel, use :f." icon_state = "cypherkey" channels = list(RADIO_CHANNEL_TOWN = 1) /obj/item/encryptionkey/headset_town/lawman - name = "Nash Sheriff radio encryption key" + name = "Eastwood Sheriff radio encryption key" desc = "An encryption key for a radio headset.\ - \nTo access the Nash channel, use :f.\ - \nTo access the Nash sheriff channel, use :l" + \nTo access the Eastwood channel, use :f.\ + \nTo access the Eastwood sheriff channel, use :l" icon_state = "cypherkey" channels = list(RADIO_CHANNEL_TOWN = 1, RADIO_CHANNEL_TOWN_PD = 1) /obj/item/encryptionkey/headset_town/commerce - name = "Nash commercial radio encryption key" + name = "Eastwood commercial radio encryption key" desc = "An encryption key for a radio headset.\ - \nTo access the Nash channel, use :f.\ - \nTo access the Nash commerce channel, use :j" + \nTo access the Eastwood channel, use :f.\ + \nTo access the Eastwood commerce channel, use :j" icon_state = "cypherkey" channels = list(RADIO_CHANNEL_TOWN = 1, RADIO_CHANNEL_TOWN_COMMERCE = 1) /obj/item/encryptionkey/headset_town/medical - name = "Nash medical radio encryption key" + name = "Eastwood medical radio encryption key" desc = "An encryption key for a radio headset.\ - \nTo access the Nash channel, use :f.\ - \nTo access the Nash medical channel, use :m" + \nTo access the Eastwood channel, use :f.\ + \nTo access the Eastwood medical channel, use :m" icon_state = "cypherkey" channels = list(RADIO_CHANNEL_TOWN = 1, RADIO_CHANNEL_MEDICAL = 1) /obj/item/encryptionkey/headset_town/mayor - name = "Nash mayor radio encryption key" + name = "Eastwood mayor radio encryption key" desc = "An encryption key for a radio headset.\ - \nTo access the Nash channel, use :f.\ - \nTo access the Nash mayor, use :y.\ - \nTo access the Nash sheriff, use :l.\ - \nTo access the Nash medical, use :m.\ - \nTo access the Nash commerce channel, use :j" + \nTo access the Eastwood channel, use :f.\ + \nTo access the Eastwood mayor, use :y.\ + \nTo access the Eastwood sheriff, use :l.\ + \nTo access the Eastwood medical, use :m.\ + \nTo access the Eastwood commerce channel, use :j" icon_state = "cypherkey" channels = list(RADIO_CHANNEL_TOWN = 1, RADIO_CHANNEL_TOWN_PD = 1, RADIO_CHANNEL_TOWN_COMMERCE = 1, RADIO_CHANNEL_TOWN_MAYOR = 1, RADIO_CHANNEL_MEDICAL = 1) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 2cc11cdc213..0a2564aafdb 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -408,45 +408,45 @@ GLOBAL_LIST_INIT(channel_tokens, list( keyslot = new /obj/item/encryptionkey/headset_biker /obj/item/radio/headset/headset_town - name = "Nash radio headset" - desc = "This is used by the town of Nash.\ - \nTo access the Nash channel, use :f." + name = "Eastwood radio headset" + desc = "This is used by the town of Eastwood.\ + \nTo access the Eastwood channel, use :f." icon_state = "mine_headset" keyslot = new /obj/item/encryptionkey/headset_town /obj/item/radio/headset/headset_town/lawman - name = "Nash sheriff radio headset" - desc = "This is used by Nash's local sheriff force. Protects ears from flashbangs.\ - \nTo access the Nash channel, use :f.\ - \nTo access the Nash sheriff channel, use :l." + name = "Eastwood sheriff radio headset" + desc = "This is used by Eastwood's local sheriff force. Protects ears from flashbangs.\ + \nTo access the Eastwood channel, use :f.\ + \nTo access the Eastwood sheriff channel, use :l." icon_state = "sec_headset_alt" item_state = "sec_headset_alt" bowman = TRUE keyslot = new /obj/item/encryptionkey/headset_town/lawman /obj/item/radio/headset/headset_town/commerce - name = "Nash commerce radio headset" - desc = "This is used by Nash's small business owners.\ - \nTo access the Nash channel, use :f.\ - \nTo access the Nash commerce channel, use :j." + name = "Eastwood commerce radio headset" + desc = "This is used by Eastwood's small business owners.\ + \nTo access the Eastwood channel, use :f.\ + \nTo access the Eastwood commerce channel, use :j." keyslot = new /obj/item/encryptionkey/headset_town/commerce /obj/item/radio/headset/headset_town/mayor - name = "Nash mayoral radio headset" - desc = "This is used by Nash's mayor (and secretary). Protects ears from flashbangs.\ - \nTo access the Nash channel, use :f.\ - \nTo access the Nash mayor channel, use :y.\ - \nTo access the Nash sheriff channel, use :l.\ - \nTo access the Nash medical channel, use :m.\ - \nTo access the Nash commerce channel, use :j." + name = "Eastwood mayoral radio headset" + desc = "This is used by Eastwood's mayor (and secretary). Protects ears from flashbangs.\ + \nTo access the Eastwood channel, use :f.\ + \nTo access the Eastwood mayor channel, use :y.\ + \nTo access the Eastwood sheriff channel, use :l.\ + \nTo access the Eastwood medical channel, use :m.\ + \nTo access the Eastwood commerce channel, use :j." bowman = TRUE command = TRUE keyslot = new /obj/item/encryptionkey/headset_town/mayor /obj/item/radio/headset/headset_town/medical - name = "Nash medical radio headset" - desc = "This is used by Nash's medical folk.\ - \nTo access the Nash channel, use :f.\ + name = "Eastwood medical radio headset" + desc = "This is used by Eastwood's medical folk.\ + \nTo access the Eastwood channel, use :f.\ \nTo access the medical channel, use :m" icon_state = "med_headset" keyslot = new /obj/item/encryptionkey/headset_town/medical diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index d09c55ec8bd..e8794d10e35 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -165,7 +165,7 @@ icon_state = initial(icon_state) /obj/item/radio/intercom/retro/kebob - name = "Oasis intercom" + name = "Eastwood intercom" freqlock = TRUE frequency = 1369 channels = list(RADIO_CHANNEL_TOWN = 1) diff --git a/code/game/objects/items/fallout13misc.dm b/code/game/objects/items/fallout13misc.dm index c37fa16d602..a0bd8c387b5 100644 --- a/code/game/objects/items/fallout13misc.dm +++ b/code/game/objects/items/fallout13misc.dm @@ -197,17 +197,17 @@ icon_state = "legionflag_snow" item_state = "legionflag_snow" -/obj/item/flag/oasis - name = "Oasis flag" - desc = "A flag depicting a stylised pink flower on a green background. It's the symbol of the town of Oasis." - icon_state = "oasisflag" - item_state = "oasisflag" - -/obj/item/flag/oasis/snow - name = "Oasis snow flag" - desc = "A flag depicting a stylised pink flower on a green background. It's the symbol of the town of Oasis." - icon_state = "oasisflag_snow" - item_state = "oasisflag_snow" +/obj/item/flag/eastwood + name = "Eastwood flag" + desc = "A flag depicting a stylised pink flower on a green background. It's the symbol of the town of Eastwood." + icon_state = "eastwoodflag" + item_state = "eastwoodflag" + +/obj/item/flag/eastwood/snow + name = "Eastwood snow flag" + desc = "A flag depicting a stylised pink flower on a green background. It's the symbol of the town of Eastwood." + icon_state = "eastwoodflag_snow" + item_state = "eastwoodflag_snow" /obj/item/flag/followers name = "Clinic flag" @@ -260,7 +260,7 @@ desc = "A banner depicting three rivers meeting at its center, overlaid with an ear of corn." icon_state = "cornflag" item_state = "cornflag" - faction = "Oasis" + faction = "Eastwood" /obj/item/flag/khan name = "Great Khans flag" @@ -275,7 +275,7 @@ if(do_after(user, 60, target = src)) var/obj/item/stack/sheet/leather/H = I if(H.use(1)) - var/list/choices = list("Bandit", "Outlaw", "BOS", "BOS Snow", "NCR", "NCR Snow", "Legion", "Legion Snow", "Oasis", "Oasis Snow", "Enclave", "Kebab") + var/list/choices = list("Bandit", "Outlaw", "BOS", "BOS Snow", "NCR", "NCR Snow", "Legion", "Legion Snow", "Eastwood", "Eastwood Snow", "Enclave", "Kebab") var/flag = input("Please choose which faction flag you wish to create.") in choices switch(flag) if("Bandit") @@ -326,18 +326,18 @@ icon_state = "legionflag_snow" item_state = "legionflag_snow" faction = FACTION_LEGION - if("Oasis") - name = "Oasis flag" + if("Eastwood") + name = "Eastwood flag" desc = "A banner depicting three rivers meeting at its center, overlaid with an ear of corn." - icon_state = "oasisflag" - item_state = "oasisflag" - faction = FACTION_OASIS - if("Oasis Snow") + icon_state = "eastwoodflag" + item_state = "eastwoodflag" + faction = FACTION_EASTWOOD + if("Eastwood Snow") name = "Ripley snow flag" desc = "A banner depicting three rivers meeting at its center, overlaid with an ear of corn." - icon_state = "oasisflag_snow" - item_state = "oasisflag_snow" - faction = FACTION_OASIS + icon_state = "eastwoodflag_snow" + item_state = "eastwoodflag_snow" + faction = FACTION_EASTWOOD if(FACTION_ENCLAVE) name = "Enclave Flag" desc = "A flag depiciting the good ole murica." diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index d7e83aa01d5..79c760a34ae 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -927,11 +927,11 @@ crafting_recipe_types = list(/datum/crafting_recipe/set_vrboard/den) /obj/item/book/granter/crafting_recipe/ODF - name = "Weapons of Texarkana and the Nash Defense Force" + name = "Weapons of Pahrump and the Eastwood Defense Force" desc = "a book detailing weapons used in the region and by the local town, it has lithiographed pictures of hand-drawn schematics for each weapon type" oneuse = TRUE crafting_recipe_types = list(/datum/crafting_recipe/policepistol, /datum/crafting_recipe/durathread_vest, /datum/crafting_recipe/policerifle, /datum/crafting_recipe/steelbib/heavy, /datum/crafting_recipe/armyhelmetheavy, /datum/crafting_recipe/huntingshotgun) - remarks = list("Looks like Nash hand-crafts replicas from a pre-war police armory", "Some of these weapons are more than 200 years old....", "Duct tape really can hold it together!", "So that is how you laminate armor sheets together", "Looks like you can beat metal into just the right shape to replace the bits") + remarks = list("Looks like Eastwood hand-crafts replicas from a pre-war police armory", "Some of these weapons are more than 200 years old....", "Duct tape really can hold it together!", "So that is how you laminate armor sheets together", "Looks like you can beat metal into just the right shape to replace the bits") /obj/item/book/granter/trait/tagger diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index d0f869a3758..07dd523f6a1 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1372,7 +1372,7 @@ obj/item/storage/box/stingbangs /obj/item/storage/box/citizenship_permits name = "box of citizenship permits" - desc = "A box containing spare citizenship permits for Nash. Use a mayor's ID on a citizenship permit to assign its owner." + desc = "A box containing spare citizenship permits for Eastwood. Use a mayor's ID on a citizenship permit to assign its owner." illustration = "id" /obj/item/storage/box/citizenship_permits/PopulateContents() diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index 36b4e08a6e7..4090b96c62a 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -73,7 +73,7 @@ new /obj/item/storage/box/funds(src) /obj/item/storage/box/funds - name = "Nash operating funds" + name = "Eastwood operating funds" desc = "A box filled with both local and foreign currency, to cover unexpected purchases" // Secretary spawns with all 3 types of money for negotatiating with any side. ~325 caps worth diff --git a/code/game/objects/items/validball.dm b/code/game/objects/items/validball.dm index d5cde5acffd..472a0901692 100644 --- a/code/game/objects/items/validball.dm +++ b/code/game/objects/items/validball.dm @@ -274,14 +274,14 @@ if(!isturf(hereturf)) return "??UNKNOWN??" switch(hereturf.z) - if(Z_LEVEL_NASH_UNDERGROUND) - return "Nash Wastes - Underground" - if(Z_LEVEL_NASH_COMMON) - return "Nash Wastes - Common" - if(Z_LEVEL_NASH_LVL2) - return "Nash Wastes - Second Story" - if(Z_LEVEL_NASH_LVL3) - return "Nash Wastes - Third Story" + if(Z_LEVEL_EASTWOOD_UNDERGROUND) + return "Eastwood Wastes - Underground" + if(Z_LEVEL_EASTWOOD_COMMON) + return "Eastwood Wastes - Common" + if(Z_LEVEL_EASTWOOD_LVL2) + return "Eastwood Wastes - Second Story" + if(Z_LEVEL_EASTWOOD_LVL3) + return "Eastwood Wastes - Third Story" if(Z_LEVEL_REDWATER) return "Southern Wastes - Common" if(Z_LEVEL_REDLICK) diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 3e087e3f9df..96ebf406b9d 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -73,7 +73,7 @@ M.old_y = 0 /* - * Wooden beds and old beds - Use wood for low tech like Oasis and Legion. Old for ruins. + * Wooden beds and old beds - Use wood for low tech like Eastwood and Legion. Old for ruins. */ /obj/structure/bed/wooden diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 4ab92748a28..866c65963e0 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -704,7 +704,7 @@ //BoS (Steel Blue) dat += "" - dat += "" + dat += "" for(var/jobPos in GLOB.brotherhood_positions) if(!jobPos) continue @@ -720,10 +720,10 @@ counter = 0 dat += "
Brotherhood Positions
Brotherhood Positions
" - //Oasis (Green) + //Eastwood (Green) dat += "" - dat += "" - for(var/jobPos in GLOB.oasis_positions) + dat += "" + for(var/jobPos in GLOB.eastwood_positions) if(!jobPos) continue if(jobban_isbanned(M, jobPos)) @@ -846,7 +846,7 @@ counter = 0 dat += "
Oasis Positions
Eastwood Positions
" - //Followers (Light Blue) +/* //Followers (Light Blue) dat += "" dat += "" for(var/jobPos in GLOB.followers_positions) @@ -863,7 +863,7 @@ dat += "" counter = 0 dat += "
Followers Positions
" - +*/ //Non-Human (Green) counter = 0 @@ -1040,8 +1040,8 @@ if(!jobPos) continue joblist += jobPos - if("oasisdept") - for(var/jobPos in GLOB.oasis_positions) + if("eastwooddept") + for(var/jobPos in GLOB.eastwood_positions) if(!jobPos) continue joblist += jobPos @@ -1075,11 +1075,11 @@ if(!jobPos) continue joblist += jobPos - if("followersdept") +/* if("followersdept") for(var/jobPos in GLOB.followers_positions) if(!jobPos) continue - joblist += jobPos + joblist += jobPos*/ if("nonhumandept") for(var/jobPos in GLOB.nonhuman_positions) if(!jobPos) diff --git a/code/modules/clothing/head/f13factionhead.dm b/code/modules/clothing/head/f13factionhead.dm index c5368c9c924..f750a3bb81e 100644 --- a/code/modules/clothing/head/f13factionhead.dm +++ b/code/modules/clothing/head/f13factionhead.dm @@ -822,7 +822,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot icon_state = "bos_beret" item_state = "bos_beret" -//Oasis/Town +//Eastwood/Town /obj/item/clothing/head/f13/town name = "town tricorn" @@ -850,7 +850,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot AddComponent(/datum/component/armor_plate) /obj/item/clothing/head/f13/town/officer - name = "Nash officer's cap" + name = "Eastwood officer's cap" desc = "A simple dark navy peaked cap, worn by police." icon = 'icons/fallout/clothing/hats.dmi' mob_overlay_icon = 'icons/fallout/onmob/clothes/head.dmi' diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 8525e52044e..a101ae197f8 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -452,7 +452,7 @@ /obj/item/clothing/head/helmet/armyhelmet/heavy name = "heavy steel helmet" - desc = "a steel helmet, inspired by several pre-war designs. This one has been modified by Nash citizens to provide more protection to the face and neck." + desc = "a steel helmet, inspired by several pre-war designs. This one has been modified by Eastwood citizens to provide more protection to the face and neck." icon_state = "armyhelmetheavy" item_state = "armyhelmetheavy" armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_BULLET_T3) diff --git a/code/modules/clothing/suits/arfsuits.dm b/code/modules/clothing/suits/arfsuits.dm index c6717e192ad..e8a8df16551 100644 --- a/code/modules/clothing/suits/arfsuits.dm +++ b/code/modules/clothing/suits/arfsuits.dm @@ -1845,14 +1845,14 @@ item_state = "vest_follower" /obj/item/clothing/suit/armor/medium/vest/town - name = "Nash flak vest" - desc = "A refurbished flak vest, repaired by the Nash Police Department. The ballistic nylon has a much tougher weave, but it still will not take acid or most high-powered rounds." + name = "Eastwood flak vest" + desc = "A refurbished flak vest, repaired by the Eastwood Police Department. The ballistic nylon has a much tougher weave, but it still will not take acid or most high-powered rounds." icon = 'icons/fallout/clothing/armored_light.dmi' mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi' icon_state = "vest_flak" item_state = "vest_flak" -/obj/item/clothing/suit/armor/medium/vest/oasis +/obj/item/clothing/suit/armor/medium/vest/eastwood name = "Vault-Sec vest" desc = "a lightweight ballistic vest that is commonly worn by Vault-Tec security personnel. This one still has the badge attached." icon_state = "blueshift" @@ -1994,9 +1994,9 @@ slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_LESS_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_DOWN_ENV_T1, ARMOR_MODIFIER_UP_DT_T1) -/obj/item/clothing/suit/armor/medium/vest/breastplate/oasis - name = "Nash steel breastplate" - desc = "a steel breastplate, inspired by a pre-war design. Looks like Nash citizens added an additional layer of metal on the front face." +/obj/item/clothing/suit/armor/medium/vest/breastplate/eastwood + name = "Eastwood steel breastplate" + desc = "a steel breastplate, inspired by a pre-war design. Looks like Eastwood citizens added an additional layer of metal on the front face." icon = 'icons/fallout/clothing/armored_medium.dmi' mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi' icon_state = "steel_bib" @@ -2004,7 +2004,7 @@ /obj/item/clothing/suit/armor/medium/vest/breastplate/town name = "steel breastplate" - desc = "A steel breastplate inspired by a pre-war design, this one was made locally in Nash. It uses a stronger steel alloy in it's construction, still heavy though" + desc = "A steel breastplate inspired by a pre-war design, this one was made locally in Eastwood. It uses a stronger steel alloy in it's construction, still heavy though" icon = 'icons/fallout/clothing/armored_medium.dmi' mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi' diff --git a/code/modules/clothing/suits/f13factionarmor.dm b/code/modules/clothing/suits/f13factionarmor.dm index d8e639678bf..087ffe9b169 100644 --- a/code/modules/clothing/suits/f13factionarmor.dm +++ b/code/modules/clothing/suits/f13factionarmor.dm @@ -701,7 +701,7 @@ icon_state = "brotherhood_armor_outcast" item_state = "brotherhood_armor_outcast" -//Oasis/Town +//Eastwood/Town /obj/item/clothing/suit/armor/light/duster/town name = "town trenchcoat" desc = "A non-descript black trenchcoat." @@ -747,7 +747,7 @@ armor = list("melee" = 45, "bullet" = 33, "laser" = 45, "energy" = 35, "bomb" = 30, "bio" = 40, "rad" = 40, "fire" = 50, "acid" = 10, "wound" = 50) slowdown = 0.08 //combat armor but less slowdown -/obj/item/clothing/suit/armor/medium/vest/oasis +/obj/item/clothing/suit/armor/medium/vest/eastwood name = "OPD vest" desc = "a lightweight ballistic vest that combines protection and comfort. This one has pockets sewn into the front and a badge pinned on it." pocket_storage_component_path = /datum/component/storage/concrete/pockets @@ -756,9 +756,9 @@ item_state = "blueshift" slowdown = 0.02 -/obj/item/clothing/suit/armor/medium/vest/breastplate/oasis +/obj/item/clothing/suit/armor/medium/vest/breastplate/eastwood name = "heavy steel breastplate" - desc = "a steel breastplate, inspired by a pre-war design. Looks like oasis citizens added an additional layer of metal on the front face." + desc = "a steel breastplate, inspired by a pre-war design. Looks like eastwood citizens added an additional layer of metal on the front face." icon_state = "steel_bib" item_state = "steel_bib" armor = list( "melee" = 30, "bullet" = 50, "laser" = 30, "energy" = 15, "bomb" = 20, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 45) diff --git a/code/modules/clothing/suits/light_armor.dm b/code/modules/clothing/suits/light_armor.dm index 7207217a7b0..ca462d27784 100644 --- a/code/modules/clothing/suits/light_armor.dm +++ b/code/modules/clothing/suits/light_armor.dm @@ -296,7 +296,7 @@ armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 30, "fire" = 0, "acid" = 0) //////////////// -// Oasis/Town// +// Eastwood/Town// ////////////// /obj/item/clothing/suit/armor/light/town @@ -312,8 +312,8 @@ armor = list("melee" = 25, "bullet" = 20, "laser" = 10, "energy" = 10, "bomb" = 15, "bio" = 10, "rad" = 0, "fire" = 20, "acid" = 5) /obj/item/clothing/suit/armor/light/town/vest - name = "Oasis flak vest" - desc = "A refurbished flak vest, repaired by the Oasis Police Department. The ballistic nylon has a much tougher weave, but it still will not take acid or most high-powered rounds." + name = "Eastwood flak vest" + desc = "A refurbished flak vest, repaired by the Eastwood Police Department. The ballistic nylon has a much tougher weave, but it still will not take acid or most high-powered rounds." icon_state = "vest_flak" item_state = "vest_flak" armor = list("melee" = 10, "bullet" = 30, "laser" = 10, "energy" = 0, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = -50) diff --git a/code/modules/clothing/suits/medium_armor.dm b/code/modules/clothing/suits/medium_armor.dm index 762f7a48f64..0e95c9fc0e2 100644 --- a/code/modules/clothing/suits/medium_armor.dm +++ b/code/modules/clothing/suits/medium_armor.dm @@ -356,7 +356,7 @@ armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 30, "bomb" = 30, "bio" = 15, "rad" = 25, "fire" = 30, "acid" = 15) //////////////// -// OASIS/TOWN // +// EASTWOOD/TOWN // //////////////// /obj/item/clothing/suit/armor/medium/lawcoat @@ -382,7 +382,7 @@ /obj/item/clothing/suit/armor/medium/vest/breastplate/town name = "steel breastplate" - desc = "A steel breastplate inspired by a pre-war design, this one was made locally in Oasis. It uses a stronger steel alloy in it's construction, still heavy though" + desc = "A steel breastplate inspired by a pre-war design, this one was made locally in Eastwood. It uses a stronger steel alloy in it's construction, still heavy though" armor = list("melee" = 30, "bullet" = 35, "laser" = 35, "energy" = 15, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = -10) slowdown = 0.11 diff --git a/code/modules/clothing/under/f13.dm b/code/modules/clothing/under/f13.dm index d6dc1f1470e..20b6d097906 100644 --- a/code/modules/clothing/under/f13.dm +++ b/code/modules/clothing/under/f13.dm @@ -1375,7 +1375,7 @@ /obj/item/clothing/under/f13/combat/militia name = "NDF fatigues" - desc = "An olive-green combat uniform, issued to members of the Nash Defense Force." + desc = "An olive-green combat uniform, issued to members of the Eastwood Defense Force." /obj/item/clothing/under/f13/enclave_officer name = "officer uniform" @@ -1399,9 +1399,9 @@ item_state = "lb_suit" item_color = "general" -/obj/item/clothing/under/f13/general/oasis +/obj/item/clothing/under/f13/general/eastwood name = "dictator's overcoat" - desc = "A grim looking overcoat - preferable standard for the ruler of Nash.
It's decorated with golden stars, each one adorned with a tree." + desc = "A grim looking overcoat - preferable standard for the ruler of Eastwood.
It's decorated with golden stars, each one adorned with a tree." /obj/item/clothing/under/f13/recon name = "recon armor" diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index e78044c28e0..56a9151e07c 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -383,7 +383,7 @@ to_chat(player, msg_dead) continue if(player.has_language(/datum/language/tribal) && !HAS_TRAIT(player, TRAIT_BLIND)) - if(!player.z == Z_LEVEL_NASH_UNDERGROUND) //Can be seen while indoors, just not sent. Still, can't see while underground. + if(!player.z == Z_LEVEL_EASTWOOD_UNDERGROUND) //Can be seen while indoors, just not sent. Still, can't see while underground. continue var/dirmessage = "somewhere in the distance" if(player.z == B.z) diff --git a/code/modules/jobs/job_types/oasis.dm b/code/modules/jobs/job_types/eastwood.dm similarity index 92% rename from code/modules/jobs/job_types/oasis.dm rename to code/modules/jobs/job_types/eastwood.dm index 519b30127e4..bfeabab4dac 100644 --- a/code/modules/jobs/job_types/oasis.dm +++ b/code/modules/jobs/job_types/eastwood.dm @@ -35,14 +35,14 @@ here's a tip, go search DEFINES/access.dm Mayor */ -/datum/job/oasis - exp_type = EXP_TYPE_OASIS - faction = FACTION_OASIS +/datum/job/eastwood + exp_type = EXP_TYPE_EASTWOOD + faction = FACTION_EASTWOOD -/datum/job/oasis/f13mayor // /obj/item/card/id/captains_spare for any elected mayors. - Blue +/datum/job/eastwood/f13mayor // /obj/item/card/id/captains_spare for any elected mayors. - Blue title = "Mayor" flag = F13MAYOR - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD total_positions = 1 spawn_positions = 1 supervisors = "Eastwood" @@ -57,10 +57,10 @@ Mayor minimal_access = list(ACCESS_BAR, ACCESS_CLONING, ACCESS_GATEWAY, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS, ACCESS_FOLLOWER, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_BAR, ACCESS_TOWN_MERCH, ACCESS_TOWN_PROSP, ACCESS_TOWN_PREACH, ACCESS_TOWN_SCIENCE, ACCESS_TOWN_DOC, ACCESS_TOWN_SEC, ACCESS_TOWN_HOS, ACCESS_TOWN_CMO, ACCESS_TOWN_COMMAND) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( - /datum/job/oasis + /datum/job/eastwood ), /datum/matchmaking_pref/rival = list( - /datum/job/oasis + /datum/job/eastwood ) ) @@ -88,7 +88,7 @@ Mayor /datum/outfit/job/den/f13mayor name = "Mayor" - jobtype = /datum/job/oasis/f13mayor + jobtype = /datum/job/eastwood/f13mayor id = /obj/item/card/id/silver/mayor ears = /obj/item/radio/headset/headset_town/mayor backpack = /obj/item/storage/backpack/satchel/explorer @@ -109,7 +109,7 @@ Mayor /datum/outfit/loadout/dictator name = "Mayor for Life" backpack_contents = list( - /obj/item/clothing/under/f13/general/oasis = 1, + /obj/item/clothing/under/f13/general/eastwood = 1, /obj/item/clothing/head/f13/army/general = 1, /obj/item/gun/ballistic/automatic/pistol/m1911/custom/jackal = 1, /obj/item/ammo_box/magazine/m45 = 2, @@ -154,10 +154,10 @@ Mayor /*--------------------------------------------------------------*/ -/datum/job/oasis/f13secretary +/datum/job/eastwood/f13secretary title = "Secretary" flag = F13SECRETARY - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD total_positions = 1 spawn_positions = 1 supervisors = "The Mayor" @@ -177,16 +177,16 @@ Mayor minimal_access = list(ACCESS_BAR, ACCESS_CLONING, ACCESS_GATEWAY, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS, ACCESS_FOLLOWER, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_BAR, ACCESS_TOWN_MERCH, ACCESS_TOWN_PROSP, ACCESS_TOWN_PREACH, ACCESS_TOWN_SCIENCE, ACCESS_TOWN_DOC, ACCESS_TOWN_SEC, ACCESS_TOWN_HOS, ACCESS_TOWN_CMO, ACCESS_TOWN_COMMAND) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( - /datum/job/oasis + /datum/job/eastwood ), /datum/matchmaking_pref/rival = list( - /datum/job/oasis + /datum/job/eastwood ) ) /datum/outfit/job/den/f13secretary name = "Secretary" - jobtype = /datum/job/oasis/f13secretary + jobtype = /datum/job/eastwood/f13secretary id = /obj/item/card/id/silver belt = /obj/item/kit_spawner/townie/mayor ears = /obj/item/radio/headset/headset_town/mayor @@ -250,10 +250,10 @@ Mayor /*--------------------------------------------------------------*/ -/datum/job/oasis/f13sheriff +/datum/job/eastwood/f13sheriff title = "Sheriff" flag = F13SHERIFF - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD head_announce = list("Security") total_positions = 1 spawn_positions = 1 @@ -274,16 +274,16 @@ Mayor minimal_access = list(ACCESS_BAR, ACCESS_CLONING, ACCESS_GATEWAY, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS, ACCESS_CLINIC, ACCESS_FOLLOWER, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_BAR, ACCESS_TOWN_MERCH, ACCESS_TOWN_PROSP, ACCESS_TOWN_PREACH, ACCESS_TOWN_SCIENCE, ACCESS_TOWN_DOC, ACCESS_TOWN_SEC, ACCESS_TOWN_HOS, ACCESS_TOWN_CMO, ACCESS_TOWN_COMMAND) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( - /datum/job/oasis + /datum/job/eastwood ), /datum/matchmaking_pref/rival = list( - /datum/job/oasis + /datum/job/eastwood ) ) /datum/outfit/job/den/f13sheriff name = "Sheriff" - jobtype = /datum/job/oasis/f13sheriff + jobtype = /datum/job/eastwood/f13sheriff id = /obj/item/card/id/dogtag/sheriff ears = /obj/item/radio/headset/headset_town/lawman backpack = /obj/item/storage/backpack/satchel/explorer @@ -343,17 +343,17 @@ Mayor /*--------------------------------------------------------------*/ -/datum/job/oasis/f13deputy +/datum/job/eastwood/f13deputy title = "Deputy" flag = F13DEPUTY - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD total_positions = 4 spawn_positions = 4 supervisors = "The Sheriff" description = "You are a loyal protector of Eastwood, keeping the settlement within firm control under the authority of the Mayor. The sheriff is your direct superior, and you should expect to take your day-to-day orders from them. Maintain your claim to authority by keeping the peace, managing disputes, and protecting the citizens from threats within and without. Never leave Eastwood undefended, and don't let its people die out." enforces = "You may be elected temporary Sheriff if one does not exist. This may make you the stand-in leader of Eastwood if a Mayor or Secretary does not exist." selection_color = "#dcba97" - exp_type = EXP_TYPE_OASIS + exp_type = EXP_TYPE_EASTWOOD exp_requirements = 0 loadout_options = list( @@ -368,16 +368,16 @@ Mayor minimal_access = list(ACCESS_BAR, ACCESS_GATEWAY, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_BAR, ACCESS_TOWN_PROSP, ACCESS_TOWN_PREACH, ACCESS_TOWN_SCIENCE, ACCESS_TOWN_DOC, ACCESS_TOWN_SEC) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( - /datum/job/oasis + /datum/job/eastwood ), /datum/matchmaking_pref/rival = list( - /datum/job/oasis + /datum/job/eastwood ) ) /datum/outfit/job/den/f13deputy name = "Deputy" - jobtype = /datum/job/oasis/f13deputy + jobtype = /datum/job/eastwood/f13deputy id = /obj/item/card/id/dogtag/deputy ears = /obj/item/radio/headset/headset_town/lawman backpack = /obj/item/storage/backpack/satchel/explorer @@ -459,10 +459,10 @@ Mayor /*--------------------------------------------------------------*/ -/datum/job/oasis/f13farmer +/datum/job/eastwood/f13farmer title = "Farmer" flag = F13FARMER - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD total_positions = 4 spawn_positions = 4 supervisors = "Eastwood laws" @@ -476,10 +476,10 @@ Mayor minimal_access = list(ACCESS_BAR, ACCESS_KITCHEN, ACCESS_TOWN, ACCESS_TOWN_CIV) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( - /datum/job/oasis, + /datum/job/eastwood, ), /datum/matchmaking_pref/rival = list( - /datum/job/oasis, + /datum/job/eastwood, ), ) @@ -490,7 +490,7 @@ Mayor /datum/outfit/job/den/f13farmer name = "Farmer" - jobtype = /datum/job/oasis/f13farmer + jobtype = /datum/job/eastwood/f13farmer id = /obj/item/card/id/dogtag/town @@ -541,10 +541,10 @@ Mayor /*--------------------------------------------------------------*/ -/datum/job/oasis/f13prospector +/datum/job/eastwood/f13prospector title = "Prospector" flag = F13PROSPECTOR - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD total_positions = 4 spawn_positions = 4 supervisors = "The Mayor" @@ -554,14 +554,14 @@ Mayor outfit = /datum/outfit/job/den/f13prospector - access = list(ACCESS_BAR, ACCESS_MINING, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_PROSP) - minimal_access = list(ACCESS_BAR, ACCESS_MINING, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_PROSP) + access = list(ACCESS_BAR, ACCESS_MINING, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_PROSP, ACCESS_TOWN_MERCH) + minimal_access = list(ACCESS_BAR, ACCESS_MINING, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_PROSP, ACCESS_TOWN_MERCH) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( - /datum/job/oasis, + /datum/job/eastwood, ), /datum/matchmaking_pref/rival = list( - /datum/job/oasis, + /datum/job/eastwood, ), ) @@ -571,7 +571,7 @@ Mayor /datum/outfit/job/den/f13prospector name = "Prospector" - jobtype = /datum/job/oasis/f13prospector + jobtype = /datum/job/eastwood/f13prospector id = /obj/item/card/id/dogtag/town backpack = /obj/item/storage/backpack/satchel/explorer @@ -629,10 +629,10 @@ Mayor ) /*--------------------------------------------------------------*/ -/datum/job/oasis/f13dendoc +/datum/job/eastwood/f13dendoc title = "Doctor" flag = F13DENDOC - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD total_positions = 3 spawn_positions = 3 supervisors = "The Mayor" @@ -651,16 +651,16 @@ Mayor minimal_access = list(ACCESS_BAR, ACCESS_CLINIC, ACCESS_CLONING, ACCESS_FOLLOWER, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_DOC, ACCESS_TOWN_SCIENCE) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( - /datum/job/oasis + /datum/job/eastwood ), /datum/matchmaking_pref/rival = list( - /datum/job/oasis + /datum/job/eastwood ) ) /datum/outfit/job/den/f13dendoc name = "Doctor" - jobtype = /datum/job/oasis/f13dendoc + jobtype = /datum/job/eastwood/f13dendoc chemwhiz = TRUE ears = /obj/item/radio/headset/headset_town/medical uniform = /obj/item/clothing/under/f13/medic @@ -736,10 +736,10 @@ Mayor ) /*--------------------------------------------------------------*/ -/datum/job/oasis/f13barkeep +/datum/job/eastwood/f13barkeep title = "Barkeep" flag = F13BARKEEP - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD total_positions = 2 spawn_positions = 2 supervisors = "the free market and Eastwood's Laws" @@ -759,17 +759,17 @@ Mayor minimal_access = list(ACCESS_BAR, ACCESS_KITCHEN, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_BAR) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( - /datum/job/oasis + /datum/job/eastwood ), /datum/matchmaking_pref/rival = list( - /datum/job/oasis + /datum/job/eastwood ) ) /datum/outfit/job/den/f13barkeep name = "Barkeep" - jobtype = /datum/job/oasis/f13barkeep + jobtype = /datum/job/eastwood/f13barkeep uniform = /obj/item/clothing/under/f13/bartenderalt id = /obj/item/card/id/dogtag/town ears = /obj/item/radio/headset/headset_town/commerce @@ -821,10 +821,10 @@ Mayor shoes = /obj/item/clothing/shoes/f13/military/ncr /*--------------------------------------------------------------*/ -/datum/job/oasis/f13settler +/datum/job/eastwood/f13settler title = "Citizen" flag = F13SETTLER - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD total_positions = -1 spawn_positions =-1 supervisors = "Eastwood's laws" @@ -848,17 +848,17 @@ Mayor minimal_access = list(ACCESS_BAR, ACCESS_TOWN, ACCESS_TOWN_CIV) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( - /datum/job/oasis + /datum/job/eastwood ), /datum/matchmaking_pref/rival = list( - /datum/job/oasis + /datum/job/eastwood ) ) /datum/outfit/job/den/f13settler name = "Citizen" - jobtype = /datum/job/oasis/f13settler + jobtype = /datum/job/eastwood/f13settler belt = /obj/item/kit_spawner/townie //suit_store = /obj/item/kit_spawner/tools //suit store not workin for some reason id = /obj/item/card/id/dogtag/town @@ -1040,29 +1040,80 @@ Mayor ///obj/item/gun/ballistic/revolver/m29/snub = 1 )*/ +/*--------------------------------------------------------------*/ + +/datum/job/eastwood/f13radio_host + title = "Radio Host" + flag = F13RADIOHOST + department_flag = DEP_EASTWOOD + total_positions = 2 + spawn_positions = 2 + supervisors = "Eastwood laws" + description = "You are the Radio Host of Eastwood. You are expected to risk neck and reputation to get the latest scoop in the region. and since news alone don't pay the bills you can stream music to the masses to keep them entretained." + enforces = "Although very independant and vocal you are still under control of local governance - try to keep a good relationship with them but don't risk your journalist integrity to please the boss." + selection_color = "#dcba97" + + outfit = /datum/outfit/job/den/f13radio_host + + access = list(ACCESS_BAR, ACCESS_KITCHEN, ACCESS_TOWN, ACCESS_TOWN_CIV) + minimal_access = list(ACCESS_BAR, ACCESS_KITCHEN, ACCESS_TOWN, ACCESS_TOWN_CIV) + matchmaking_allowed = list( + /datum/matchmaking_pref/friend = list( + /datum/job/eastwood + ), + /datum/matchmaking_pref/rival = list( + /datum/job/eastwood + ), + ) +/datum/outfit/job/den/f13radio_host + name = "Radio Host" + jobtype = /datum/job/eastwood/f13radio_host + id = /obj/item/card/id/dogtag/town + backpack = /obj/item/storage/backpack/satchel/explorer + satchel = /obj/item/storage/backpack/satchel/explorer + r_pocket = /obj/item/flashlight/flare + belt = /obj/item/pda/detective + backpack_contents = list( + /obj/item/camera, \ + /obj/item/camera_film=1, + /obj/item/taperecorder=1, \ + /obj/item/gun/ballistic/automatic/pistol/n99, \ + /obj/item/ammo_box/magazine/m10mm/adv/simple=2) + shoes = /obj/item/clothing/shoes/workboots + +/datum/outfit/job/den/f13settler/pre_equip(mob/living/carbon/human/H) + ..() + uniform = pick( + /obj/item/clothing/under/f13/settler, \ + /obj/item/clothing/under/f13/brahminm, \ + /obj/item/clothing/under/f13/machinist, \ + /obj/item/clothing/under/f13/lumberjack, \ + /obj/item/clothing/under/f13/roving) + +/*--------------------------------------------------------------*/ /*---------------------------------------------------------------- -- Detective -- ----------------------------------------------------------------*/ -/datum/job/oasis/f13detective +/datum/job/eastwood/f13detective title = "Detective" flag = F13DETECTIVE total_positions = 1 spawn_positions = 1 supervisors = "paying clients and Eastwood's laws" selection_color = "#dcba97" - outfit = /datum/outfit/job/oasis/f13detective + outfit = /datum/outfit/job/eastwood/f13detective access = list(ACCESS_BAR, ACCESS_FORENSICS_LOCKERS, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_SEC) minimal_access = list(ACCESS_BAR, ACCESS_FORENSICS_LOCKERS, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_SEC) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( /datum/job/wasteland/f13wastelander, - /datum/job/oasis/f13detective + /datum/job/eastwood/f13detective ), /datum/matchmaking_pref/rival = list( /datum/job/wasteland/f13wastelander, - /datum/job/oasis/f13detective + /datum/job/eastwood/f13detective ), /datum/matchmaking_pref/mentor = list( /datum/job/wasteland/f13wastelander @@ -1070,9 +1121,9 @@ Mayor ) -/datum/outfit/job/oasis/f13detective +/datum/outfit/job/eastwood/f13detective name = "Detective" - jobtype = /datum/job/oasis/f13detective + jobtype = /datum/job/eastwood/f13detective belt = /obj/item/kit_spawner/lawman suit = /obj/item/clothing/suit/det_suit/grey uniform = /obj/item/clothing/under/f13/detectivealt @@ -1097,10 +1148,10 @@ Mayor /*--------------------------------------------------------------*/ -/datum/job/oasis/f13banker +/datum/job/eastwood/f13banker title = "Banker" flag = F13BANKER - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD total_positions = 0 spawn_positions = 0 supervisors = "The Mayor" @@ -1120,7 +1171,7 @@ Mayor /datum/outfit/job/den/f13banker name = "Banker" - jobtype = /datum/job/oasis/f13banker + jobtype = /datum/job/eastwood/f13banker belt = /obj/item/kit_spawner/lawman uniform = /obj/item/clothing/under/lawyer/blacksuit @@ -1177,10 +1228,10 @@ Mayor /*--------------------------------------------------------------*/ //The Quartermaster -/datum/job/oasis/f13quartermaster +/datum/job/eastwood/f13quartermaster title = "Quartermaster" flag = F13QUARTERMASTER - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD total_positions = 1 spawn_positions = 1 supervisors = "the free market and Eastwood's laws" @@ -1199,16 +1250,16 @@ Mayor minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_MERCH) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( - /datum/job/oasis + /datum/job/eastwood ), /datum/matchmaking_pref/rival = list( - /datum/job/oasis + /datum/job/eastwood ) ) /datum/outfit/job/den/f13quartermaster name = "Quartermaster" - jobtype = /datum/job/oasis/f13quartermaster + jobtype = /datum/job/eastwood/f13quartermaster id = /obj/item/card/id/dogtag/town ears = /obj/item/radio/headset/headset_town/commerce belt = /obj/item/kit_spawner/townie @@ -1273,10 +1324,10 @@ Mayor return //The Trade Workers -/datum/job/oasis/f13shopkeeper +/datum/job/eastwood/f13shopkeeper title = "Trade Worker" flag = F13SHOPKEEPER - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD total_positions = 4 spawn_positions = 4 supervisors = "the free market and Eastwood's laws" @@ -1296,16 +1347,16 @@ Mayor minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_MERCH) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( - /datum/job/oasis + /datum/job/eastwood ), /datum/matchmaking_pref/rival = list( - /datum/job/oasis + /datum/job/eastwood ) ) /datum/outfit/job/den/f13shopkeeper name = "Shopkeeper" - jobtype = /datum/job/oasis/f13shopkeeper + jobtype = /datum/job/eastwood/f13shopkeeper id = /obj/item/card/id/dogtag/town ears = /obj/item/radio/headset/headset_town/commerce belt = /obj/item/kit_spawner/townie @@ -1378,10 +1429,10 @@ Mayor //pilot job, bare basics rn, but we can add as needed -/datum/job/oasis/f13pilot +/datum/job/eastwood/f13pilot title = "Vertibird Pilot" flag = F13PILOT - department_flag = DEP_OASIS + department_flag = DEP_EASTWOOD total_positions = 0 spawn_positions = 0 supervisors = "Eastwood's laws" @@ -1394,17 +1445,17 @@ Mayor minimal_access = list(ACCESS_BAR, ACCESS_EVA) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( - /datum/job/oasis + /datum/job/eastwood ), /datum/matchmaking_pref/rival = list( - /datum/job/oasis + /datum/job/eastwood ) ) /datum/outfit/job/den/f13pilot name = "Vertibird Pilot" - jobtype = /datum/job/oasis/f13pilot + jobtype = /datum/job/eastwood/f13pilot belt = /obj/item/kit_spawner/townie id = /obj/item/card/id/dogtag/town uniform = /obj/item/clothing/under/f13/settler diff --git a/code/modules/jobs/job_types/followers.dm b/code/modules/jobs/job_types/followers.dm index 68e34a4a28f..56d7abecafd 100644 --- a/code/modules/jobs/job_types/followers.dm +++ b/code/modules/jobs/job_types/followers.dm @@ -1,4 +1,4 @@ -/datum/job/followers //do NOT use this for anything, it's just to store faction datums +/*/datum/job/followers //do NOT use this for anything, it's just to store faction datums department_flag = FOLLOWERS selection_color = "#ffeeaa" exp_type = EXP_TYPE_FOLLOWERS @@ -485,3 +485,4 @@ Follower Volunteer /obj/item/stock_parts/cell/ammo/ec = 1, ) */ +*/ diff --git a/code/modules/jobs/job_types/legion.dm b/code/modules/jobs/job_types/legion.dm index f4344e484be..14844cafb75 100644 --- a/code/modules/jobs/job_types/legion.dm +++ b/code/modules/jobs/job_types/legion.dm @@ -20,7 +20,7 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al forbids = "The Legion forbids: Using drugs such as stimpacks and alcohol. Ghouls joining. Women fighting (self defense and suicide allowed). Slaves carrying weapons. Using robots and advanced machines. Killing Legion members in secret, only if according to law and in public is it acceptable." enforces = "The Legion demands: Obeying orders of superiors. A roman style name. Wearing the uniform, unless acting as a NON-COMBAT infiltrator. Expect death as punishment for failing to obey." - objectivesList = list("Focus on the tribals, win them over or intimidate them.", "Focus on Oasis, display dominance.", "Send out patrols and establish checkpoints to curb use of digusting drugs and degenerate behaviour.", "Flagstaff requests more worker: acquire slaves, train them if possible, send them east for breaking if not.", "Make sure no other faction gains dominance over Oasis, if they remain neutral it can be used to the Legions advantage.") + objectivesList = list("Focus on the tribals, win them over or intimidate them.", "Focus on Eastwood, display dominance.", "Send out patrols and establish checkpoints to curb use of digusting drugs and degenerate behaviour.", "Flagstaff requests more worker: acquire slaves, train them if possible, send them east for breaking if not.", "Make sure no other faction gains dominance over Eastwood, if they remain neutral it can be used to the Legions advantage.") exp_type = EXP_TYPE_LEGION diff --git a/code/modules/jobs/job_types/tribals.dm b/code/modules/jobs/job_types/tribals.dm index 6d8dcf461f5..e84da97a81c 100644 --- a/code/modules/jobs/job_types/tribals.dm +++ b/code/modules/jobs/job_types/tribals.dm @@ -14,7 +14,7 @@ "The Village rests, defend it and prosper this week. Peace is rare, but at least we can build defenses and take solitude in our isolation.", "The swamp calls the hunters forth, seek out the thing that shines and return it to the shamans to appease the spirits. If no shaman can be found then hide the item from the out-peoples.", "Something awful happened a bit back and it calls for blood, harass the outlaws of Redwater for their predations of wandering tribesman. Remember to fortify the southern tunnel to their lands. We should try to take at least one of them prisoner, and see how they like the collar on their own necks.", - "The people of tribe of Nash insulted us in recent weeks, harass the people of Nash for their highbrow attitude. Remember to Fortify the northern entrance to the village, and try to take them down a peg for their witty insolence.", + "The people of tribe of Eastwood insulted us in recent weeks, harass the people of Eastwood for their highbrow attitude. Remember to Fortify the northern entrance to the village, and try to take them down a peg for their witty insolence.", "This week is one of rememberance. Think of the times when our tribe came forth from The Cave of Crying. Of the friends and loved ones lost. Remember peace, and cry for what is lost.", "This week is one of rememberance. Think of the times when our tribe has failed at our duties and work together as the family we are to try and solve internal issues. Tomorrow can be better, if only we try today.") diff --git a/code/modules/jobs/job_types/wasteland.dm b/code/modules/jobs/job_types/wasteland.dm index 9e47685e029..10e2bd8a91d 100644 --- a/code/modules/jobs/job_types/wasteland.dm +++ b/code/modules/jobs/job_types/wasteland.dm @@ -928,7 +928,7 @@ Raider faction = FACTION_WASTELAND total_positions = -1 spawn_positions = -1 - description = "The most broad and open role, you have arrived in the region for purposes known only to you. If you're new, the settlement of Nash to the Midwest may prove a valuable first stop. Try to make a living for yourself - or simply survive - and craft your own unique story." + description = "The most broad and open role, you have arrived in the region for purposes known only to you. If you're new, the settlement of Eastwood to the Midwest may prove a valuable first stop. Try to make a living for yourself - or simply survive - and craft your own unique story." supervisors = "fate" selection_color = "#dddddd" @@ -1626,9 +1626,9 @@ Raider minimal_access = list(ACCESS_DEN) matchmaking_allowed = list( /datum/matchmaking_pref/rival = list( - /datum/job/oasis/f13mayor, - /datum/job/oasis/f13sheriff, - /datum/job/oasis/f13detective, + /datum/job/eastwood/f13mayor, + /datum/job/eastwood/f13sheriff, + /datum/job/eastwood/f13detective, ), /datum/matchmaking_pref/patron = list( /datum/job/wasteland/f13wastelander, diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index c9dcda14abb..8be0c693140 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -101,8 +101,8 @@ GLOBAL_LIST_INIT(brotherhood_positions, list( "Scribe", "Initiate", )) -//Eastwood/Oasis -GLOBAL_LIST_INIT(oasis_positions, list( +//Eastwood/Eastwood +GLOBAL_LIST_INIT(eastwood_positions, list( "Mayor", "Secretary", "Sheriff", @@ -117,6 +117,7 @@ GLOBAL_LIST_INIT(oasis_positions, list( "Barkeep", "Citizen", "Vertibird Pilot", + "Radio Host" )) GLOBAL_LIST_INIT(legion_command_positions, list( @@ -270,7 +271,7 @@ GLOBAL_LIST_INIT(position_categories, list( EXP_TYPE_WASTELAND = list("jobs" = wasteland_positions, "color" = "#5a5a5a"), EXP_TYPE_ENCLAVE = list("jobs" = enclave_positions, "color" = "#323232"), EXP_TYPE_KHAN = list("jobs" = khan_positions, "color" = "#006666"), - "Eastwood" = list("jobs" = oasis_positions, "color" = "#d7b088"), + "Eastwood" = list("jobs" = eastwood_positions, "color" = "#d7b088"), EXP_TYPE_SILICON = list("jobs" = silicon_positions, "color" = "#4a4a4a"), EXP_TYPE_TRIBAL = list("jobs" = tribal_positions, "color" = "#006666"), //EXP_TYPE_BIKER = list("jobs" = biker_positions, "color" = "#eb872f"), @@ -290,17 +291,17 @@ GLOBAL_LIST_INIT(exp_jobsmap, list( EXP_TYPE_SILICON = list("titles" = list("AI","Cyborg")), EXP_TYPE_SERVICE = list("titles" = civilian_positions), - EXP_TYPE_FALLOUT = list("titles" = brotherhood_positions | oasis_positions | legion_positions | ncr_positions | vault_positions | wasteland_positions | tribal_positions | followers_positions | enclave_positions), + EXP_TYPE_FALLOUT = list("titles" = brotherhood_positions | eastwood_positions | legion_positions | ncr_positions | vault_positions | wasteland_positions | tribal_positions | followers_positions | enclave_positions), EXP_TYPE_OUTLAW = list("titles" = list("Outlaw","Den Mob Boss","Den Mob Enforcer","Den Doctor",)), EXP_TYPE_BROTHERHOOD = list("titles" = brotherhood_positions), - EXP_TYPE_OASIS = list("titles" = oasis_positions ), + EXP_TYPE_EASTWOOD = list("titles" = eastwood_positions ), EXP_TYPE_LEGION = list("titles" = legion_positions), EXP_TYPE_NCR = list("titles" = ncr_positions), EXP_TYPE_VAULT = list("titles" = vault_positions), EXP_TYPE_WASTELAND = list("titles" = wasteland_positions), EXP_TYPE_KHAN = list("titles" = khan_positions), - EXP_TYPE_FOLLOWERS = list("titles" = followers_positions), + //EXP_TYPE_FOLLOWERS = list("titles" = followers_positions), EXP_TYPE_ENCLAVE = list("titles" = enclave_positions), //EXP_TYPE_TRIBAL = list("titles" = tribal_positions), //EXP_TYPE_BIKER = list("titles" = biker_positions), diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index fc4d0b14b8d..a0223635763 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -5,8 +5,8 @@ var/list/templates -/obj/effect/landmark/dungeon_mark/oasis - name = "oasis bunker" +/obj/effect/landmark/dungeon_mark/eastwood + name = "eastwood bunker" /obj/effect/landmark/dungeon_mark/northclaws name = "north claws bunker" diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index 7dd2045856c..528c5e726b0 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -89,8 +89,8 @@ new /obj/item/stack/f13Cash/random/med(src) -// Oasis reserves. Spawns with the Mayor. -/obj/item/storage/bag/money/small/oasis/PopulateContents() +// Eastwood reserves. Spawns with the Mayor. +/obj/item/storage/bag/money/small/eastwood/PopulateContents() // exactly 1000 caps, and about 200 in foreign reserves new /obj/item/stack/f13Cash/caps/onezerozerozero(src) diff --git a/code/modules/mob/living/carbon/human/species_types/supermutant.dm b/code/modules/mob/living/carbon/human/species_types/supermutant.dm index af887885fdc..4fe7ecf746e 100644 --- a/code/modules/mob/living/carbon/human/species_types/supermutant.dm +++ b/code/modules/mob/living/carbon/human/species_types/supermutant.dm @@ -29,7 +29,7 @@ return 0 if(rank in GLOB.vault_positions) return 0 - if(rank in GLOB.oasis_positions) + if(rank in GLOB.eastwood_positions) return 0 if(rank in GLOB.ncr_positions) return 0 @@ -41,8 +41,8 @@ return 0 if(rank in GLOB.enclave_positions) return 0 - if(rank in GLOB.followers_positions) - return 0 +/* if(rank in GLOB.followers_positions) + return 0*/ /* if(rank in GLOB.tribal_positions) return 0 diff --git a/code/modules/mob/living/simple_animal/hostile/f13/raider.dm b/code/modules/mob/living/simple_animal/hostile/f13/raider.dm index 2cac8e0aea3..c0c1562a45f 100644 --- a/code/modules/mob/living/simple_animal/hostile/f13/raider.dm +++ b/code/modules/mob/living/simple_animal/hostile/f13/raider.dm @@ -773,11 +773,11 @@ vision_range = 8 //will see the player at max view range, and communicate that they've been seen but won't aggro unless they get closer. ranged_cooldown_time = 2 SECONDS auto_fire_delay = GUN_AUTOFIRE_DELAY_FAST - projectiletype = /obj/item/projectile/energy/teslacannon/oasis + projectiletype = /obj/item/projectile/energy/teslacannon/eastwood projectilesound = 'sound/weapons/resonator_fire.ogg' sound_after_shooting = 'sound/f13weapons/rcwfire.ogg' extra_projectiles = 2 - loot = list(/obj/item/gun/energy/laser/auto/oasis, /obj/item/stack/f13Cash/random/high) + loot = list(/obj/item/gun/energy/laser/auto/eastwood, /obj/item/stack/f13Cash/random/high) loot_drop_amount = 8 footstep_type = FOOTSTEP_MOB_SHOE projectile_sound_properties = list( diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index fd3c0455e8c..8dd9125eba4 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -240,14 +240,14 @@ GLOBAL_LIST_EMPTY(playmob_cooldowns) return if(lazarused) to_chat(user, span_userdanger("[name] has been lazarus injected or tamed by beastmaster! There are special rules for playing as this creature!")) - to_chat(user, span_alert("You will be bound to serving a certain person, and very likely will be required to be friendly to Nash and its citizens! Just something to keep in mind!")) + to_chat(user, span_alert("You will be bound to serving a certain person, and very likely will be required to be friendly to Eastwood and its citizens! Just something to keep in mind!")) var/mob/the_master if(isweakref(lazarused_by)) the_master = lazarused_by.resolve() if(the_master) to_chat(user, span_alert("Your master will be [the_master.real_name]! Follow their commands at all costs! (within reason of course)")) else - to_chat(user, span_alert("Your master will be Nash and its citizens, protect them at all costs!")) + to_chat(user, span_alert("Your master will be Eastwood and its citizens, protect them at all costs!")) var/ghost_role = alert("Hop into [name]? (This is a ghost role, still in development!)","Play as a mob!","Yes, spawn me in!","No, I wanna be a ghost!") if(ghost_role == "No, I wanna be a ghost!" || !loc) return @@ -283,7 +283,7 @@ GLOBAL_LIST_EMPTY(playmob_cooldowns) AddAbility(unmake_a_nest) if(lazarused) to_chat(src, span_userdanger("[name] has been lazarus injected or tamed by beastmaster! There are special rules for playing as this creature!")) - to_chat(src, span_alert("You will be bound to serving a certain person, and very likely will be required to be friendly to Nash and its citizens! Just something to keep in mind!")) + to_chat(src, span_alert("You will be bound to serving a certain person, and very likely will be required to be friendly to Eastwood and its citizens! Just something to keep in mind!")) var/mob/the_master if(isweakref(lazarused_by)) the_master = lazarused_by.resolve() @@ -293,10 +293,10 @@ GLOBAL_LIST_EMPTY(playmob_cooldowns) if(mind) mind.store_memory("You have been lazarus injected or tamed by [the_master.real_name], and you're bound to follow their commands! (within reason)") else - to_chat(src, span_alert("Your master is be Nash and its citizens, protect them at all costs!")) + to_chat(src, span_alert("Your master is be Eastwood and its citizens, protect them at all costs!")) if(mind) - mind.store_memory("You have been lazarus injected or tamed, and are bound to serve the town of Nash and protect its people.") - log_game("[key_name(src)] has been informed that they ([name]) are lazarus injected/tamed, and will serve Nash.") + mind.store_memory("You have been lazarus injected or tamed, and are bound to serve the town of Eastwood and protect its people.") + log_game("[key_name(src)] has been informed that they ([name]) are lazarus injected/tamed, and will serve Eastwood.") /mob/living/simple_animal/proc/cleared_to_enter(mob/user) if(!can_ghost_into) diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index f4667cc2f07..f0fbb602742 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -368,7 +368,7 @@ also: most hitscan weapons have more charge than their normal projectile counter e_cost = 40 //37.5 shots /obj/item/ammo_casing/energy/laser/autolaser/shock - projectile_type = /obj/item/projectile/energy/teslacannon/oasis + projectile_type = /obj/item/projectile/energy/teslacannon/eastwood fire_sound = 'sound/weapons/taser.ogg' e_cost = 25 //60 shots diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index d9294085af5..7e3da0d8d3b 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -1436,7 +1436,7 @@ /obj/item/gun/ballistic/automatic/marksman/policerifle name = "Police Rifle" - desc = "A pre-war Rifle that has been constantly repaired and rebuilt by the Nash Police Department. Held together by duct tape and prayers, it somehow still shoots." + desc = "A pre-war Rifle that has been constantly repaired and rebuilt by the Eastwood Police Department. Held together by duct tape and prayers, it somehow still shoots." icon = 'icons/fallout/objects/guns/ballistic.dmi' lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi' @@ -2009,7 +2009,7 @@ /obj/item/gun/ballistic/automatic/assault_carbine/policerifle name = "Police Assault Rifle" - desc = "A pre-war Rifle that has been constantly repaired and rebuilt by the Nash Police Department. Held together by duct tape and prayers, it somehow still shoots." + desc = "A pre-war Rifle that has been constantly repaired and rebuilt by the Eastwood Police Department. Held together by duct tape and prayers, it somehow still shoots." icon = 'icons/fallout/objects/guns/ballistic.dmi' lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi' diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index a31899f277a..05f64c6318b 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -483,8 +483,8 @@ /datum/firemode/semi_auto/faster ) -// OASIS autolaser -/obj/item/gun/energy/laser/auto/oasis +// EASTWOOD autolaser +/obj/item/gun/energy/laser/auto/eastwood name = "autoshock tesla pistol" desc = " An upgraded version of the Compact RCW. Boasts a higher cell efficiency at the cost of the burstfire and armor melting power." ammo_type = list(/obj/item/ammo_casing/energy/laser/autolaser/shock) //8dmg + 10 Stamina, flagged as "energy" so very few armors can reduce it below 5-6 dmg, has a very high bare wound bonus, so anyone with no armor on will be crippled diff --git a/code/modules/projectiles/projectile/energy/tesla.dm b/code/modules/projectiles/projectile/energy/tesla.dm index 812aa5cc27c..255cd6676e5 100644 --- a/code/modules/projectiles/projectile/energy/tesla.dm +++ b/code/modules/projectiles/projectile/energy/tesla.dm @@ -51,14 +51,14 @@ impact_light_range = 3.75 impact_light_color_override = LIGHT_COLOR_BLUE -/obj/item/projectile/energy/teslacannon/oasis +/obj/item/projectile/energy/teslacannon/eastwood name = "shock beam" damage = 12 //high damage but low ap flag = "energy" wound_bonus = -5 bare_wound_bonus = 35 -/obj/item/projectile/energy/teslacannon/oasis/on_hit(atom/target, blocked = FALSE) +/obj/item/projectile/energy/teslacannon/eastwood/on_hit(atom/target, blocked = FALSE) . = ..() if(!ismob(target) || blocked >= 100) //Fully blocked by mob or collided with dense object - burst into sparks! do_sparks(1, TRUE, src) diff --git a/code/modules/shuttle/f13.dm b/code/modules/shuttle/f13.dm index 45de5db4291..79c54c9daa9 100644 --- a/code/modules/shuttle/f13.dm +++ b/code/modules/shuttle/f13.dm @@ -96,7 +96,7 @@ /obj/machinery/computer/shuttle/vault113elevator name = "vault 113 elevator controls" - desc = "Controls the elevator between the Vault and Oasis." + desc = "Controls the elevator between the Vault and Eastwood." icon_screen = "shuttle" icon_keyboard = "tech_key" light_color = LIGHT_COLOR_CYAN diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 27913068ba7..c3c20c85aee 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -232,8 +232,8 @@ if(initial(beep.requires_tech)) surgeries += beep -/obj/item/disk/surgery/oasis - name = "Nash surgery disk" +/obj/item/disk/surgery/eastwood + name = "Eastwood surgery disk" surgeries = list( /datum/surgery/advanced/lobotomy, /datum/surgery/advanced/reconstruction) diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm index df757db0a15..141801ee3e7 100644 --- a/code/modules/vending/medical.dm +++ b/code/modules/vending/medical.dm @@ -103,7 +103,7 @@ density = 0 pixel_x = 30 -/obj/machinery/vending/medical/nash +/obj/machinery/vending/medical/eastwood products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/healthanalyzer = 6, diff --git a/fallout/areas/area.dm b/fallout/areas/area.dm index 07d06fbf182..b744e156f31 100644 --- a/fallout/areas/area.dm +++ b/fallout/areas/area.dm @@ -646,12 +646,12 @@ name = "South-Western Tunnel" icon_state = "tunnelsw" -/area/f13/tunnel/southeastoasis - name = "Oasis Eastern Sewers" +/area/f13/tunnel/southeasteastwood + name = "Eastwood Eastern Sewers" icon_state = "tunnelse" -/area/f13/tunnel/southwestoasis - name = "Oasis Western Sewers" +/area/f13/tunnel/southwesteastwood + name = "Eastwood Western Sewers" icon_state = "tunnelsw" /area/f13/tunnel/sub diff --git a/fallout/code/modules/client/loadout/suit.dm b/fallout/code/modules/client/loadout/suit.dm index 578959ecf24..6f5bdc1fc07 100644 --- a/fallout/code/modules/client/loadout/suit.dm +++ b/fallout/code/modules/client/loadout/suit.dm @@ -177,7 +177,7 @@ path = /obj/item/clothing/suit/armor/medium/vest/blueshirt subcategory = LOADOUT_SUBCATEGORY_SUIT_ARMOR cost = 4 - restricted_desc = "Nash" + restricted_desc = "Eastwood" restricted_roles = list("Mayor", "Secretary", "Sheriff", @@ -189,6 +189,7 @@ "Prospector", "Detective", "Barkeep", + "Radio Host" ) /datum/gear/suit/samurai //added by TK420634 ~ 5/29/2022 "Samurai Wasteland WeebShit Edition (tm) diff --git a/fallout/code/modules/client/loadout/uniform.dm b/fallout/code/modules/client/loadout/uniform.dm index 2ea2f9471ea..13b3f2ae2b3 100644 --- a/fallout/code/modules/client/loadout/uniform.dm +++ b/fallout/code/modules/client/loadout/uniform.dm @@ -586,7 +586,7 @@ path = /obj/item/clothing/under/rank/security/officer/blueshirt cost = 1 subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SUITS - restricted_desc = "Nash" + restricted_desc = "Eastwood" restricted_roles = list("Mayor", "Secretary", "Chief of Police", @@ -598,6 +598,7 @@ "Prospector", "Detective", "Barkeep", + "Radio Host" ) diff --git a/fallout/code/objects.dm b/fallout/code/objects.dm index ed425075399..8f4cdc594a5 100644 --- a/fallout/code/objects.dm +++ b/fallout/code/objects.dm @@ -1,7 +1,7 @@ -/obj/machinery/light/sign/nash - name = "nash sign" - icon_state = "nash_on" - base_state = "nash_on" +/obj/machinery/light/sign/eastwood + name = "eastwood sign" + icon_state = "eastwood_on" + base_state = "eastwood_on" icon = 'fallout/icons/objects/sign.dmi' density = 0 desc = "So awful..." diff --git a/fallout/icons/objects/sign.dmi b/fallout/icons/objects/sign.dmi index 820f9d3d689..9df3279f124 100644 Binary files a/fallout/icons/objects/sign.dmi and b/fallout/icons/objects/sign.dmi differ diff --git a/fallout/machinery/light_sources/bar.dm b/fallout/machinery/light_sources/bar.dm index d9e94ba14d9..c70d34d866d 100644 --- a/fallout/machinery/light_sources/bar.dm +++ b/fallout/machinery/light_sources/bar.dm @@ -65,21 +65,21 @@ desc = "So awful..." light_color = LIGHT_COLOR_YELLOW -/obj/machinery/light/sign/oasis - name = "Oasis sign" - icon_state = "Oasis" - base_state = "Oasis" +/obj/machinery/light/sign/eastwood + name = "Eastwood sign" + icon_state = "Eastwood" + base_state = "Eastwood" icon = 'icons/fallout/objects/structures/kebabtown.dmi' density = 1 - desc = "A sign marking the Oasis Motel. It's remarkably fancy." + desc = "A sign marking the Eastwood Motel. It's remarkably fancy." light_color = LIGHT_COLOR_YELLOW -/obj/machinery/light/sign/oasis_sign - name = "Oasis" - icon_state = "oasis_sign" - base_state = "oasis_sign" +/obj/machinery/light/sign/eastwood_sign + name = "Eastwood" + icon_state = "eastwood_sign" + base_state = "eastwood_sign" icon = 'icons/fallout/objects/structures/kebabtown.dmi' - desc = "A sign marking the Oasis Motel. It's remarkably fancy.." + desc = "A sign marking the Eastwood Motel. It's remarkably fancy.." light_color = LIGHT_COLOR_YELLOW /obj/machinery/light/sign/chiken_ranch diff --git a/fallout/obj/manual/basic_advice.dm b/fallout/obj/manual/basic_advice.dm index 0fb358a9b57..9ba4f0860ed 100644 --- a/fallout/obj/manual/basic_advice.dm +++ b/fallout/obj/manual/basic_advice.dm @@ -166,7 +166,7 @@
  • Healing Powder: Made with one broc flower and one Xander on the crafting menu, this handy powder can be made on the go and heals you just as much as a stimpack, if slower.
  • Sutures and Bandages: If you are bleeding, it is best to stop it, and quickly! Suture the wound closed, bandage over the sewed up wound and let it heal.
  • Punga can help purge radiation, but it can also be addicting if you eat more than a few in one sitting.
  • -
  • Nash is on the western side of the middle Z (everyone spawns on this Z), and its main entrance is on the southern wall!
  • +
  • Eastwood is on the western side of the middle Z (everyone spawns on this Z), and its main entrance is on the southern wall!
  • While you have tons of slots and can make loads of characters it can sometimes be hard to get started. It takes time and being seen fairly often before people realize you're actually for real about hanging around. Maybe consider sticking to one character for a while!
  • @@ -176,10 +176,10 @@

    1. The blue matrix tiles you can just walk right through to another map. The green ones are to leave the region (basically Cryo).
    2. -
    3. There are three map areas. Stacked north to south you have 'Red River', 'Texarkana', and 'Redwater'. The town of Nash is in the Texarkana Z, where you spawned!
    4. -
    5. Remember to close Nash's gate, unless you WANT the wildlife to get in!
    6. +
    7. There are three map areas. Stacked north to south you have 'Red River', 'Pahrump', and 'Redwater'. The town of Eastwood is in the Pahrump Z, where you spawned!
    8. +
    9. Remember to close Eastwood's gate, unless you WANT the wildlife to get in!
    10. The town can be sealed, if you can find all the ways in.
    11. -
    12. Nash has MULTIPLE watch towers you can use to spot monsters working their way in, and if you use binoculars that high up you can see even further!
    13. +
    14. Eastwood has MULTIPLE watch towers you can use to spot monsters working their way in, and if you use binoculars that high up you can see even further!
    15. It's not always faster to pull your pistol, but it is if its a cowboy single action army.
    16. Green puddles of goop are generally not your friend. Unless you think radiation is a joke.
    diff --git a/hailmary.dme b/hailmary.dme index d0a39029b25..70bab8a3920 100644 --- a/hailmary.dme +++ b/hailmary.dme @@ -2363,13 +2363,13 @@ #include "code\modules\jobs\loadout_ingame.dm" #include "code\modules\jobs\job_types\_job.dm" #include "code\modules\jobs\job_types\bos.dm" +#include "code\modules\jobs\job_types\eastwood.dm" #include "code\modules\jobs\job_types\enclave.dm" #include "code\modules\jobs\job_types\followers.dm" #include "code\modules\jobs\job_types\hells_nomads.dm" #include "code\modules\jobs\job_types\legion.dm" #include "code\modules\jobs\job_types\mutants.dm" #include "code\modules\jobs\job_types\ncr.dm" -#include "code\modules\jobs\job_types\oasis.dm" #include "code\modules\jobs\job_types\silicon.dm" #include "code\modules\jobs\job_types\tribals.dm" #include "code\modules\jobs\job_types\vault.dm" diff --git a/icons/fallout/clothing/hats.dmi b/icons/fallout/clothing/hats.dmi index 5bf87513f19..f61dbf7a04e 100644 Binary files a/icons/fallout/clothing/hats.dmi and b/icons/fallout/clothing/hats.dmi differ diff --git a/icons/fallout/objects/structures/kebabtown.dmi b/icons/fallout/objects/structures/kebabtown.dmi index 9fe1fc886c4..0b766ba6b5c 100644 Binary files a/icons/fallout/objects/structures/kebabtown.dmi and b/icons/fallout/objects/structures/kebabtown.dmi differ diff --git a/icons/mob/landmarks.dmi b/icons/mob/landmarks.dmi index dcbcea4a00a..f0446f1a244 100644 Binary files a/icons/mob/landmarks.dmi and b/icons/mob/landmarks.dmi differ diff --git a/icons/obj/flags.dmi b/icons/obj/flags.dmi index 65ad16678a5..91d63bf6d27 100644 Binary files a/icons/obj/flags.dmi and b/icons/obj/flags.dmi differ diff --git a/modular_BD2/legio_invicta/icons/icons_legion.dmi b/modular_BD2/legio_invicta/icons/icons_legion.dmi index 59f66301062..70c4d108c27 100644 Binary files a/modular_BD2/legio_invicta/icons/icons_legion.dmi and b/modular_BD2/legio_invicta/icons/icons_legion.dmi differ diff --git a/strings/abductee_objectives.txt b/strings/abductee_objectives.txt index 04f4ba97011..3ddcf66c21c 100644 --- a/strings/abductee_objectives.txt +++ b/strings/abductee_objectives.txt @@ -12,7 +12,7 @@ All the pets around here suck. You need to make them cooler. Replace them with e You're throwing a huge rager. Make it as awesome as possible so the whole town comes... OR ELSE! The clown is not funny. You can do better! Steal his audience and make the crew laugh! You burn with passion for music. Share your vision. If anyone hates it, beat them on the head with your instrument! -Go have a good conversation with the nuclear warhead/legion centurion/Oasis Tree. Bonus points if it responds. +Go have a good conversation with the nuclear warhead/legion centurion/Eastwood Tree. Bonus points if it responds. Expand the town. If you stop building, your heart stops beating. So much lies undiscovered. Look deeper into the machinations of the universe. Climb the corporate ladder all the way to the top! @@ -36,4 +36,4 @@ Your body must be improved. Ingest as many drugs as you can. You are hungry. Eat as much food as you can find. You see you see what they cannot you see the open door you seeE you SEeEe you SEe yOU seEee SHOW THEM ALL Convince the town that you are a paraplegic. -Start a collection of corpses. Don't kill people to get these corpses. \ No newline at end of file +Start a collection of corpses. Don't kill people to get these corpses. diff --git a/strings/dreamstrings.txt b/strings/dreamstrings.txt index fc422a2b5da..994a3ea46a9 100644 --- a/strings/dreamstrings.txt +++ b/strings/dreamstrings.txt @@ -18,7 +18,7 @@ %A% %ADJECTIVE% gun the sun RobCo -oasis +eastwood %A% %ADJECTIVE% planet the followers hospital the %ADJECTIVE% bridge @@ -36,4 +36,4 @@ the %ADJECTIVE% jail %ADJECTIVE% riches water %ADJECTIVE% flames -some %ADJECTIVE% melons \ No newline at end of file +some %ADJECTIVE% melons diff --git a/strings/hallucination.json b/strings/hallucination.json index 75851cfc55e..211e1ad045b 100644 --- a/strings/hallucination.json +++ b/strings/hallucination.json @@ -152,7 +152,7 @@ "location": [ "area near that @pick(sublocation)", - "Oasis bar", + "Eastwood bar", "the NCR armory", "that weird bunker", "uptown", @@ -165,7 +165,7 @@ ], "sublocation": [ - "Oasis farm", + "Eastwood farm", "NCR's greenhouse", "NCR gate", "RobCo entrance", diff --git a/strings/phobia.json b/strings/phobia.json index 89b281faec9..1b9dd08c2b0 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -153,7 +153,7 @@ "Vault overseer", "Kid", "Vault security", - "Oasis guard", + "Eastwood guard", "Mayor", "Detective" ], diff --git a/testing.dmm b/testing.dmm index a0c6b6f2fff..b4f60fd21bd 100644 --- a/testing.dmm +++ b/testing.dmm @@ -350,7 +350,7 @@ "jq" = (/obj/structure/barricade/wooden,/obj/structure/decoration/rag{icon_state = "skin"},/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalleftborderleft0"},/area/space) "jr" = (/obj/structure/rack,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaloutermain2"},/area/space) "js" = (/obj/structure/closet{name = "implants locker"},/obj/item/organ/cyberimp/chest/nutriment,/obj/item/organ/cyberimp/chest/nutriment,/obj/item/organ/cyberimp/chest/nutriment,/obj/item/organ/cyberimp/chest/nutriment/plus,/obj/item/organ/cyberimp/eyes/hud/medical,/obj/item/organ/cyberimp/eyes/hud/medical,/obj/item/organ/cyberimp/eyes/hud/medical,/obj/item/organ/cyberimp/eyes/hud/medical,/turf/open/floor/f13{icon_state = "bluerustysolid"},/area/space) -"jt" = (/obj/structure/closet,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/tank/internals/anesthetic,/obj/item/tank/internals/anesthetic,/obj/item/tank/internals/anesthetic,/obj/item/disk/surgery/oasis,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) +"jt" = (/obj/structure/closet,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/tank/internals/anesthetic,/obj/item/tank/internals/anesthetic,/obj/item/tank/internals/anesthetic,/obj/item/disk/surgery/eastwood,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "ju" = (/turf/open/indestructible/ground/outside/desert{icon_state = "wasteland32"},/area/space) "jv" = (/obj/structure/barricade/wooden,/turf/open/indestructible/ground/outside/sidewalk{dir = 8; icon_state = "outerpavement"},/area/space) "jw" = (/obj/structure/table,/obj/item/paper_bin,/obj/item/pen,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) @@ -639,7 +639,7 @@ "rl" = (/obj/structure/rack,/turf/open/floor/plating/f13,/area/space) "rm" = (/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalrightborderrightbottom"},/area/space) "ro" = (/obj/machinery/door/airlock/medical{name = "Clinic"; req_one_access_txt = "124"},/turf/open/floor/f13{icon_state = "bluerustysolid"},/area/space) -"rr" = (/obj/item/flag/oasis,/turf/open/floor/f13/wood,/area/space) +"rr" = (/obj/item/flag/eastwood,/turf/open/floor/f13/wood,/area/space) "rs" = (/turf/open/indestructible/ground/outside/sidewalk{icon_state = "outerpavementcorner"},/area/space) "rt" = (/obj/effect/landmark/latejoin,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontalbottomborderbottom0"},/area/space) "rz" = (/mob/living/simple_animal/cow/brahmin,/turf/open/floor/f13{icon_state = "floorrustysolid"},/area/space) @@ -701,7 +701,7 @@ "ta" = (/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalrightborderright2"},/area/space) "tb" = (/obj/structure/sink/well{pixel_x = -15},/turf/open/indestructible/ground/outside/dirt,/area/space) "td" = (/obj/effect/decal/cleanable/dirt,/mob/living/simple_animal/hostile/eyebot{faction = list("neutral"); name = "PE-A"},/turf/open/floor/f13{icon_state = "darkdirtysolid"},/area/space) -"te" = (/obj/machinery/light/sign/oasis_sign{layer = 5},/obj/structure/wreck/trash/five_tires{pixel_x = 3; pixel_y = -13},/obj/structure/flora/grass/wasteland{pixel_x = -3},/obj/structure/flora/grass/wasteland{icon_state = "tall_grass_2"; pixel_x = -4; pixel_y = 13},/obj/structure/flora/grass/wasteland{icon_state = "tall_grass_8"; layer = 2; pixel_x = -8; pixel_y = 7},/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaloutermainleft"},/area/space) +"te" = (/obj/machinery/light/sign/eastwood_sign{layer = 5},/obj/structure/wreck/trash/five_tires{pixel_x = 3; pixel_y = -13},/obj/structure/flora/grass/wasteland{pixel_x = -3},/obj/structure/flora/grass/wasteland{icon_state = "tall_grass_2"; pixel_x = -4; pixel_y = 13},/obj/structure/flora/grass/wasteland{icon_state = "tall_grass_8"; layer = 2; pixel_x = -8; pixel_y = 7},/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaloutermainleft"},/area/space) "th" = (/obj/machinery/light/sign,/obj/structure/barricade/wooden,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaltopbordertop3"},/area/space) "ti" = (/obj/item/gun/ballistic/shotgun/trench{anchored = 1; pixel_y = 5},/obj/item/gun/ballistic/shotgun/hunting{anchored = 1; pixel_y = -3},/obj/structure/noticeboard{layer = 2.5; pixel_y = 3},/obj/effect/decal/cleanable/dirt,/turf/closed/wall/f13/wood/interior,/area/space) "tj" = (/obj/structure/barricade/wooden,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) @@ -873,7 +873,7 @@ "xy" = (/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/hobo,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/hobo,/obj/effect/decal/cleanable/dirt,/obj/item/stack/crafting/goodparts/five,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "xz" = (/turf/open/indestructible/ground/outside/dirt{dir = 5; icon_state = "dirt"},/area/space) "xB" = (/obj/machinery/light/small{dir = 8},/turf/open/indestructible/ground/outside/dirt,/area/space) -"xC" = (/obj/machinery/light,/obj/item/flag/oasis,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalleftborderleft2top"},/area/space) +"xC" = (/obj/machinery/light,/obj/item/flag/eastwood,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalleftborderleft2top"},/area/space) "xD" = (/obj/structure/table/wood/poker,/obj/item/toy/cards/deck{pixel_y = 9},/turf/open/floor/carpet,/area/space) "xE" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/open/floor/plasteel/f13/vault_floor/plating,/area/space) "xF" = (/obj/effect/landmark/start/f13/sheriff,/obj/effect/decal/cleanable/dirt,/turf/open/floor/f13/wood,/area/space) @@ -896,7 +896,7 @@ "yf" = (/obj/structure/destructible/tribal_torch/lit,/turf/open/indestructible/ground/outside/sidewalk{dir = 1; icon_state = "horizontaloutermain1"},/area/space) "yh" = (/obj/structure/sign/poster/contraband/pinup_pink{pixel_y = 32},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "yi" = (/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaloutermain1"},/area/space) -"yj" = (/obj/machinery/light/sign/oasis,/turf/open/indestructible/ground/outside/sidewalk{dir = 1; icon_state = "outerborder"},/area/space) +"yj" = (/obj/machinery/light/sign/eastwood,/turf/open/indestructible/ground/outside/sidewalk{dir = 1; icon_state = "outerborder"},/area/space) "yk" = (/obj/structure/rack,/obj/item/clothing/suit/armor/light/duster/battlecoat,/obj/item/circuitboard/machine/autolathe/ammo,/obj/item/circuitboard/machine/autolathe/ammo,/obj/item/circuitboard/machine/autolathe/ammo,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "ym" = (/obj/structure/ladder/unbreakable{height = 2; id = "shopladder"},/turf/open/floor/f13/wood,/area/space) "yo" = (/obj/structure/table/wood,/obj/item/storage/box/handcuffs,/obj/item/storage/box/handcuffs,/obj/machinery/light/small{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/open/floor/f13/wood,/area/space) @@ -907,7 +907,7 @@ "yw" = (/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticaloutermain2top"},/area/space) "yy" = (/obj/structure/tires{pixel_x = -8; pixel_y = 15},/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaloutermain2left"},/area/space) "yz" = (/obj/structure/destructible/tribal_torch/wall/lit{dir = 1},/turf/closed/wall/f13/wood,/area/space) -"yA" = (/obj/item/flag/oasis,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalrightborderright1"},/area/space) +"yA" = (/obj/item/flag/eastwood,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalrightborderright1"},/area/space) "yB" = (/obj/effect/decal/cleanable/generic,/obj/structure/simple_door/metal/fence{dir = 8},/obj/effect/decal/cleanable/oil{icon_state = "floor5"},/turf/open/indestructible/ground/outside/sidewalk{dir = 8; icon_state = "outerpavement"},/area/space) "yD" = (/obj/structure/table,/turf/open/floor/f13{icon_state = "floorrusty"},/area/space) "yE" = (/obj/structure/fence{dir = 4},/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontalbottomborderbottom2right"},/area/space) @@ -1073,7 +1073,7 @@ "CS" = (/obj/structure/barricade/bars,/obj/machinery/door/poddoor/shutters/preopen{id = "bottomcellghoul"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "CT" = (/obj/machinery/light/small,/turf/open/indestructible/ground/inside/mountain,/area/space) "CW" = (/obj/effect/decal/cleanable/dirt,/obj/structure/chair/booth{icon_state = "booth_east_north"},/turf/open/indestructible/ground/inside/mountain,/area/space) -"CX" = (/obj/machinery/camera{dir = 8; name = "farm"; network = list("oasis")},/turf/open/indestructible/ground/outside/dirt,/area/space) +"CX" = (/obj/machinery/camera{dir = 8; name = "farm"; network = list("eastwood")},/turf/open/indestructible/ground/outside/dirt,/area/space) "Da" = (/mob/living/simple_animal/hostile/wolf,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "Db" = (/obj/structure/barricade/wooden,/obj/machinery/light/fo13colored/Pink{dir = 1; name = "light tube"},/turf/open/floor/f13/wood,/area/space) "Dc" = (/obj/structure/decoration/sign{desc = "It's a portrait of a person you don't know anything about."; icon_state = "painting_president"; name = "portrait"; pixel_y = -32},/obj/effect/decal/cleanable/dirt,/turf/open/floor/f13{icon_state = "floorrusty"},/area/space) @@ -1090,7 +1090,7 @@ "Do" = (/obj/structure/cargocrate,/turf/open/indestructible/ground/outside/desert,/area/space) "Dq" = (/obj/machinery/button/door{id = "countershutters"; name = "counter shutters"; pixel_x = 6; pixel_y = 30},/obj/machinery/button/door{id = "storeshutters"; name = "store shutters"; pixel_x = -6; pixel_y = 30},/obj/structure/noticeboard{layer = 2.5; pixel_y = 32},/obj/structure/rack,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,/obj/machinery/light{dir = 1},/turf/open/floor/f13/wood,/area/space) "Ds" = (/obj/structure/chair/bench,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) -"Dt" = (/obj/item/flag/oasis,/turf/open/indestructible/ground/outside/sidewalk,/area/space) +"Dt" = (/obj/item/flag/eastwood,/turf/open/indestructible/ground/outside/sidewalk,/area/space) "Du" = (/obj/structure/ladder/unbreakable{height = 2; id = "clinicoutsideladder"; layer = 2},/obj/structure/flora/tree/wasteland{pixel_x = -9; pixel_y = -6},/turf/open/indestructible/ground/outside/desert{icon_state = "wasteland32"},/area/space) "Dw" = (/obj/effect/decal/waste{icon_state = "goo10"},/obj/machinery/shower{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/open/indestructible/ground/inside/mountain,/area/space) "Dy" = (/obj/structure/simple_door/bunker,/turf/open/floor/f13{icon_state = "floorrusty"},/area/space) @@ -1122,7 +1122,7 @@ "Ef" = (/obj/structure/chair/bench,/turf/open/floor/f13/wood,/area/space) "Eg" = (/turf/open/floor/wood_common/f13,/area/space) "Eh" = (/obj/structure/destructible/tribal_torch,/turf/open/indestructible/ground/outside/sidewalk{dir = 1; icon_state = "horizontaloutermain1"},/area/space) -"Ej" = (/obj/structure/closet/crate/bin,/obj/effect/decal/cleanable/dirt,/obj/item/flag/oasis{density = 0; pixel_x = 1; pixel_y = 28},/turf/open/floor/f13/wood,/area/space) +"Ej" = (/obj/structure/closet/crate/bin,/obj/effect/decal/cleanable/dirt,/obj/item/flag/eastwood{density = 0; pixel_x = 1; pixel_y = 28},/turf/open/floor/f13/wood,/area/space) "El" = (/obj/machinery/light/small{dir = 4},/turf/open/indestructible/ground/outside/wood,/area/space) "Em" = (/obj/structure/chair/bench,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaltopbordertop2left"},/area/space) "Eo" = (/obj/machinery/light/fo13colored/Pink{dir = 4; name = "light tube"},/obj/structure/wreck/trash/five_tires{layer = 3},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) @@ -1191,7 +1191,7 @@ "FZ" = (/obj/structure/simple_door/metal/barred,/turf/open/indestructible/ground/inside/mountain,/area/space) "Ga" = (/turf/open/indestructible/ground/outside/sidewalk{dir = 8; icon_state = "outermaincornerouter"},/area/space) "Gb" = (/obj/effect/spawner/lootdrop/f13/crafting,/obj/effect/spawner/lootdrop/f13/crafting,/obj/effect/spawner/lootdrop/f13/crafting,/obj/effect/spawner/lootdrop/f13/crafting,/obj/item/stack/sheet/hay/fifty,/obj/effect/decal/cleanable/dirt,/obj/structure/rack,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) -"Gc" = (/obj/machinery/door/airlock/vault{autoclose = "TRUE"; layer = 2; name = "Oasis Storage"; req_one_access_txt = "25"},/obj/machinery/door/poddoor/ert{id = "oasisstorage"; layer = 5; name = "Oasis Storage"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) +"Gc" = (/obj/machinery/door/airlock/vault{autoclose = "TRUE"; layer = 2; name = "Eastwood Storage"; req_one_access_txt = "25"},/obj/machinery/door/poddoor/ert{id = "eastwoodstorage"; layer = 5; name = "Eastwood Storage"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "Gd" = (/obj/structure/chair/booth{icon_state = "booth_east_south"},/turf/open/floor/f13/wood,/area/space) "Ge" = (/turf/open/indestructible/ground/outside/road{icon_state = "hole"},/area/space) "Gf" = (/obj/structure/car/rubbish2,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalleftborderleft0"},/area/space) @@ -1223,8 +1223,8 @@ "GT" = (/obj/structure/table/wood,/obj/structure/wreck/trash/one_tire{pixel_x = -7; pixel_y = 8},/turf/open/indestructible/ground/outside/road{icon_state = "horizontalinnermain2"},/area/space) "GU" = (/obj/machinery/light{dir = 4; light_color = "#c1caff"},/turf/open/floor/f13{icon_state = "floorrusty"},/area/space) "GW" = (/obj/effect/decal/cleanable/dirt,/obj/structure/flora/grass/wasteland{pixel_x = 9; pixel_y = 14},/turf/open/floor/f13/wood,/area/space) -"GY" = (/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Oasis Housing"; req_one_access_txt = "25"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) -"Ha" = (/obj/item/flag/oasis,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaloutermain0"},/area/space) +"GY" = (/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Eastwood Housing"; req_one_access_txt = "25"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) +"Ha" = (/obj/item/flag/eastwood,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaloutermain0"},/area/space) "Hb" = (/obj/structure/closet/crate/wicker,/turf/open/indestructible/ground/outside/dirt,/area/space) "Hc" = (/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticaloutermain2bottom"},/area/space) "Hd" = (/obj/structure/window/fulltile/wood{layer = 3},/obj/machinery/door/poddoor/shutters/preopen{id = "bargambling"},/turf/open/floor/f13/wood,/area/space) @@ -1287,7 +1287,7 @@ "IP" = (/obj/structure/chair/comfy/black{dir = 8},/turf/open/floor/carpet/black,/area/space) "IQ" = (/obj/structure/rack,/obj/item/storage/box/disks_plantgene,/turf/open/floor/f13{icon_state = "bluerustysolid"},/area/space) "IT" = (/obj/effect/decal/cleanable/dirt,/obj/structure/sign/poster/contraband/tools{pixel_x = 32},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) -"IU" = (/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Oasis Housing"; req_one_access_txt = "25"},/turf/open/indestructible/ground/inside/mountain,/area/space) +"IU" = (/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Eastwood Housing"; req_one_access_txt = "25"},/turf/open/indestructible/ground/inside/mountain,/area/space) "IV" = (/obj/effect/decal/cleanable/generic,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/indestructible/ground/outside/dirt,/area/space) "IW" = (/obj/item/reagent_containers/food/drinks/bottle/brown/greenwine{anchored = 1; pixel_x = -36},/obj/item/reagent_containers/food/drinks/bottle/brown/greenwine{anchored = 1; pixel_x = -28},/obj/structure/noticeboard{layer = 2.5; pixel_x = -32},/turf/open/floor/carpet,/area/space) "IX" = (/obj/structure/table/wood/settler,/turf/open/indestructible/ground/outside/sidewalk,/area/space) @@ -1306,7 +1306,7 @@ "Jq" = (/turf/open/floor/wood_common/f13/stage_br,/area/space) "Jt" = (/obj/structure/simple_door/bunker,/turf/open/floor/f13{icon_state = "purplefull"},/area/space) "Ju" = (/obj/structure/table/wood,/turf/open/floor/wood_common/f13/stage_tr,/area/space) -"Jv" = (/obj/effect/decal/cleanable/oil,/obj/item/flag/oasis{density = 0; pixel_y = 24},/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaloutermain1"},/area/space) +"Jv" = (/obj/effect/decal/cleanable/oil,/obj/item/flag/eastwood{density = 0; pixel_y = 24},/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaloutermain1"},/area/space) "Jw" = (/obj/structure/campfire/barrel,/turf/open/indestructible/ground/inside/dirt,/area/space) "Jx" = (/obj/structure/wreck/trash/machinepiletwo{layer = 3},/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaltopbordertop2right"},/area/space) "Jz" = (/obj/structure/flora/grass/wasteland{pixel_x = -3},/obj/structure/flora/grass/wasteland{icon_state = "tall_grass_4"},/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaloutermainleft"},/area/space) @@ -1325,7 +1325,7 @@ "JS" = (/obj/structure/table/wood,/obj/machinery/light/small,/turf/open/floor/plasteel/f13/vault_floor/misc/bar,/area/space) "JT" = (/obj/machinery/smartfridge/bottlerack,/turf/open/floor/f13/wood,/area/space) "JU" = (/obj/structure/bed/roller,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) -"JV" = (/obj/machinery/button/door{id = "oasisstorage"; name = "Oasis Storage Button"; pixel_x = 32; req_one_access_txt = "62"},/turf/open/indestructible/ground/inside/mountain,/area/space) +"JV" = (/obj/machinery/button/door{id = "eastwoodstorage"; name = "Eastwood Storage Button"; pixel_x = 32; req_one_access_txt = "62"},/turf/open/indestructible/ground/inside/mountain,/area/space) "JW" = (/obj/structure/closet,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticaloutermain2bottom"},/area/space) "JX" = (/obj/effect/decal/cleanable/dirt,/obj/structure/rack,/obj/effect/spawner/lootdrop/f13/foodspawner,/obj/effect/spawner/lootdrop/f13/foodspawner,/obj/effect/spawner/lootdrop/f13/foodspawner,/obj/effect/spawner/lootdrop/f13/foodspawner,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "JY" = (/obj/effect/decal/cleanable/dirt,/obj/structure/barricade/wooden,/turf/open/indestructible/ground/outside/sidewalk,/area/space) @@ -1453,7 +1453,7 @@ "NA" = (/obj/effect/decal/waste{icon_state = "goo10"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/f13/wood,/area/space) "NC" = (/obj/effect/decal/cleanable/dirt,/obj/structure/barricade/wooden,/turf/open/floor/f13{icon_state = "darkdirtysolid"},/area/space) "ND" = (/obj/machinery/door/unpowered/securedoor{autoclose = 1; req_one_access_txt = "48"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) -"NE" = (/obj/effect/decal/cleanable/generic,/obj/item/flag/oasis,/turf/open/indestructible/ground/inside/mountain,/area/space) +"NE" = (/obj/effect/decal/cleanable/generic,/obj/item/flag/eastwood,/turf/open/indestructible/ground/inside/mountain,/area/space) "NG" = (/obj/structure/flora/grass/wasteland,/obj/structure/flora/grass/wasteland,/obj/structure/flora/grass/wasteland,/obj/structure/flora/grass/wasteland,/turf/open/indestructible/ground/outside/dirt,/area/space) "NH" = (/obj/machinery/door/airlock/medical{name = "Clinic"; req_one_access_txt = "133"},/obj/machinery/door/poddoor/shutters{id = "clinicfrontdoor"; name = "clinic shutters"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "NI" = (/obj/structure/campfire,/turf/open/indestructible/ground/inside/dirt,/area/space) @@ -1545,7 +1545,7 @@ "Qe" = (/obj/structure/bed,/turf/open/floor/plasteel/f13/vault_floor/green/white/whitegreenchess,/area/space) "Qf" = (/obj/machinery/light{dir = 1; light_color = "#706891"},/turf/open/floor/f13{icon_state = "yellowdirtyfull"},/area/space) "Qh" = (/obj/structure/table,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/turf/open/floor/plasteel/f13/vault_floor/green/white/whitegreenchess,/area/space) -"Qi" = (/obj/structure/flora/tree/jungle{desc = "Rumor has it that, as long as this tree stands firm, so too will the town of Oasis."; name = "\improper Oasis Oak"},/obj/structure/flora/grass/wasteland{icon_state = "tall_grass_8"; pixel_x = -8; pixel_y = 7},/turf/open/floor/grass,/area/space) +"Qi" = (/obj/structure/flora/tree/jungle{desc = "Rumor has it that, as long as this tree stands firm, so too will the town of Eastwood."; name = "\improper Eastwood Oak"},/obj/structure/flora/grass/wasteland{icon_state = "tall_grass_8"; pixel_x = -8; pixel_y = 7},/turf/open/floor/grass,/area/space) "Ql" = (/obj/machinery/door/unpowered/securedoor{autoclose = 1; req_one_access_txt = "25"},/turf/open/floor/f13/wood,/area/space) "Qm" = (/obj/machinery/vending/wardrobe/science_wardrobe,/turf/open/floor/f13{icon_state = "floorrusty"},/area/space) "Qn" = (/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaltopbordertop2right"},/area/space) @@ -1559,7 +1559,7 @@ "Qy" = (/obj/structure/barricade/wooden,/turf/open/indestructible/ground/outside/dirt{icon_state = "dirtcorner"},/area/space) "Qz" = (/obj/structure/flora/ausbushes/brflowers,/obj/structure/flora/grass/wasteland{icon_state = "tall_grass_2"; layer = 6; pixel_x = -6; pixel_y = 13},/obj/structure/barricade/wooden,/turf/open/floor/grass,/area/space) "QA" = (/obj/machinery/biogenerator,/turf/open/indestructible/ground/outside/dirt,/area/space) -"QB" = (/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Oasis"; req_one_access_txt = "25"},/turf/open/indestructible/ground/inside/mountain,/area/space) +"QB" = (/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Eastwood"; req_one_access_txt = "25"},/turf/open/indestructible/ground/inside/mountain,/area/space) "QD" = (/turf/open/indestructible/ground/outside/dirt{dir = 1; icon_state = "dirt"},/area/space) "QE" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/booth,/obj/item/flashlight/lamp,/turf/open/indestructible/ground/inside/mountain,/area/space) "QF" = (/obj/effect/landmark/start/f13/followersdoctor,/obj/structure/chair/stool/f13stool,/turf/open/floor/f13{icon_state = "floorrusty"},/area/space) @@ -1573,7 +1573,7 @@ "QO" = (/obj/machinery/light/small{dir = 8},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "QP" = (/obj/machinery/light{dir = 8},/obj/structure/table,/obj/machinery/reagentgrinder{pixel_y = 10},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "QQ" = (/obj/structure/window/fulltile/house{dir = 2; icon_state = "storewindowtop"},/turf/open/floor/f13{icon_state = "floorrustysolid"},/area/space) -"QU" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Oasis"; req_one_access_txt = "25"},/turf/open/indestructible/ground/inside/mountain,/area/space) +"QU" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Eastwood"; req_one_access_txt = "25"},/turf/open/indestructible/ground/inside/mountain,/area/space) "QV" = (/obj/effect/decal/cleanable/dirt,/mob/living/simple_animal/hostile/ghoul/glowing,/turf/open/floor/f13/wood,/area/space) "QW" = (/obj/machinery/door/airlock/medical{name = "Clinic"; req_one_access_txt = "124"},/turf/open/floor/f13{icon_state = "floorrusty"},/area/space) "QX" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/stack/f13Cash/random/med,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,/obj/machinery/light/fo13colored/Aqua{bulb_colour = "#800080"; dir = 4; light_color = "#800080"; name = "light fixture"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) @@ -1582,7 +1582,7 @@ "Rc" = (/obj/structure/decoration/vent,/turf/closed/wall/f13/supermart,/area/space) "Re" = (/obj/structure/ladder/unbreakable{height = 1; id = "followerlabladder"},/turf/open/floor/f13{icon_state = "bluerustysolid"},/area/space) "Rh" = (/turf/open/floor/wood_common/f13/stage_t,/area/space) -"Ri" = (/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Oasis Housing"; req_one_access_txt = "25"},/turf/open/floor/f13/wood,/area/space) +"Ri" = (/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Eastwood Housing"; req_one_access_txt = "25"},/turf/open/floor/f13/wood,/area/space) "Rj" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/button/door{id = "bankvault"; name = "bank vault button"; pixel_y = -32; req_one_access_txt = "62"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "Rk" = (/obj/structure/table/wood,/obj/item/chair/wood,/obj/item/chair/wood,/turf/open/floor/f13/wood,/area/space) "Rm" = (/obj/structure/chair/stool/f13stool,/obj/effect/landmark/start/f13/followersvolunteer,/turf/open/floor/f13{icon_state = "floorrusty"},/area/space) @@ -1618,13 +1618,13 @@ "Sh" = (/obj/machinery/light{dir = 8},/turf/open/floor/f13{icon_state = "purplefull"},/area/space) "Si" = (/obj/effect/decal/cleanable/dirt,/obj/structure/barricade/wooden{layer = 2.5},/obj/machinery/light/fo13colored/Red{desc = "A lighting fixture."; dir = 1; light_color = "#008000"; name = "light tube"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "Sj" = (/obj/structure/window/fulltile/wood{layer = 3},/obj/machinery/door/poddoor/shutters{id = "barwindowshutters"; layer = 4},/turf/open/indestructible/ground/outside/sidewalk,/area/space) -"Sk" = (/obj/item/flag/oasis{density = 0; pixel_y = 24},/turf/open/indestructible/ground/outside/dirt,/area/space) +"Sk" = (/obj/item/flag/eastwood{density = 0; pixel_y = 24},/turf/open/indestructible/ground/outside/dirt,/area/space) "Sl" = (/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontalbottomborderbottom2"},/area/space) "Sm" = (/obj/machinery/light,/turf/open/floor/f13/wood,/area/space) "So" = (/obj/structure/fence/wooden{dir = 1},/turf/open/indestructible/ground/outside/desert,/area/space) "Sq" = (/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalrightborderright3"},/area/space) "Ss" = (/obj/structure/decoration/warning,/turf/closed/wall/rust,/area/space) -"St" = (/obj/machinery/light,/obj/item/flag/oasis,/obj/structure/flora/grass/wasteland{icon_state = "tall_grass_4"; layer = 6},/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalrightborderrightbottom"},/area/space) +"St" = (/obj/machinery/light,/obj/item/flag/eastwood,/obj/structure/flora/grass/wasteland{icon_state = "tall_grass_4"; layer = 6},/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalrightborderrightbottom"},/area/space) "Su" = (/obj/machinery/light/small,/turf/open/indestructible/ground/outside/wood,/area/space) "Sv" = (/obj/structure/fireplace,/turf/open/floor/wood_common/f13/stage_t,/area/space) "Sw" = (/obj/structure/table/wood,/obj/structure/wreck/trash/halftire{pixel_y = -21},/obj/effect/spawner/lootdrop/f13/resourcespawner,/turf/open/indestructible/ground/outside/road{icon_state = "horizontalinnermain0"},/area/space) @@ -1727,7 +1727,7 @@ "Vm" = (/turf/open/indestructible/ground/outside/road{icon_state = "verticalleftborderright0"},/area/space) "Vn" = (/obj/structure/chair/office/dark,/turf/open/floor/f13{icon_state = "bluedirtychess2"},/area/space) "Vo" = (/obj/effect/decal/cleanable/generic,/obj/effect/spawner/lootdrop/trash,/turf/open/indestructible/ground/outside/sidewalk,/area/space) -"Vp" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Oasis"; req_one_access_txt = "25"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) +"Vp" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Eastwood"; req_one_access_txt = "25"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "Vq" = (/obj/effect/decal/cleanable/generic,/obj/effect/decal/cleanable/dirt,/turf/open/indestructible/ground/outside/sidewalk{dir = 1; icon_state = "horizontaloutermain1"},/area/space) "Vs" = (/obj/machinery/trading_machine/armor,/turf/open/floor/f13/wood,/area/space) "Vt" = (/obj/structure/chair/f13chair2{dir = 8},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) @@ -1768,7 +1768,7 @@ "Wq" = (/turf/open/indestructible/ground/outside/road{icon_state = "horizontalbottombordertop2right"},/area/space) "Wr" = (/turf/open/indestructible/ground/outside/wood,/area/space) "Wt" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/f13{icon_state = "floordirtysolid"},/area/space) -"Wu" = (/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Oasis"; req_one_access_txt = "25"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) +"Wu" = (/obj/machinery/door/unpowered/securedoor{autoclose = 1; name = "Eastwood"; req_one_access_txt = "25"},/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "Wv" = (/obj/effect/decal/cleanable/dirt,/obj/structure/chair/comfy,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontaloutermain2"},/area/space) "Ww" = (/obj/structure/barricade/wooden,/obj/effect/decal/cleanable/dirt,/turf/open/floor/grass,/area/space) "Wy" = (/obj/structure/decoration/rag{icon_state = "skin"},/turf/closed/wall/f13/wood,/area/space) @@ -1867,7 +1867,7 @@ "YW" = (/obj/effect/decal/cleanable/oil,/obj/effect/decal/fakelattice{density = 0; pixel_x = 17},/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalrightborderright1"},/area/space) "YX" = (/obj/structure/fence/corner/wooden,/turf/open/indestructible/ground/outside/dirt,/area/space) "YY" = (/obj/structure/curtain,/turf/open/floor/f13{icon_state = "floordirtysolid"},/area/space) -"YZ" = (/obj/machinery/light/sign/oasis_sign,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontalbottomborderbottom2left"},/area/space) +"YZ" = (/obj/machinery/light/sign/eastwood_sign,/turf/open/indestructible/ground/outside/sidewalk{icon_state = "horizontalbottomborderbottom2left"},/area/space) "Za" = (/obj/effect/decal/cleanable/dirt,/obj/structure/simple_door/metal/barred,/turf/open/floor/f13/wood,/area/space) "Zb" = (/obj/structure/rack,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid,/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid,/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,/area/space) "Zc" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/f13/wood,/area/space)