From 6b9513a9358ce8f908b85f7cb2417efe2109f9c4 Mon Sep 17 00:00:00 2001 From: DeltaDav <121488347+DeltaDav@users.noreply.github.com> Date: Tue, 20 Jan 2026 05:24:45 +0100 Subject: [PATCH] Core --- .../map_files/Pahrump-AB/Pahrump-AB-Lower.dmm | 3421 +++---- .../map_files/Pahrump-AB/Pahrump-AB-Upper.dmm | 5433 ++++++----- _maps/map_files/Pahrump-AB/Pahrump-AB.dmm | 7960 ++++++++++------- _maps/map_files/Pahrump-AB/job_changes.dm | 1 + _maps/map_files/Tipton/job_changes.dm | 1 + code/__DEFINES/jobs.dm | 30 + code/game/objects/effects/landmarks.dm | 46 + code/modules/jobs/job_types/eastwood.dm | 80 +- code/modules/jobs/job_types/holiday.dm | 1383 +++ hailmary.dme | 1 + 10 files changed, 11106 insertions(+), 7250 deletions(-) create mode 100644 code/modules/jobs/job_types/holiday.dm diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm index 5c00c6b451b..028e7e0c45d 100644 --- a/_maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm +++ b/_maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm @@ -474,11 +474,18 @@ }, /area/f13/bunker) "att" = ( -/obj/structure/chair/sofa/corp/right{ +/obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/carpet/royalblack, -/area/f13/ncr) +/obj/structure/closet/cabinet/anchored, +/turf/open/floor/f13/wood, +/area/f13/city) +"atw" = ( +/obj/structure/chair/wood/wings{ + dir = 4 + }, +/turf/open/floor/carpet/red, +/area/f13/caves) "atA" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/inside/subway, @@ -515,6 +522,11 @@ }, /turf/open/floor/f13/wood, /area/f13/building) +"auQ" = ( +/turf/open/indestructible/ground/inside/subway{ + name = "cave" + }, +/area/f13/den) "avE" = ( /obj/structure/wreck/trash/engine{ pixel_x = 9 @@ -748,6 +760,17 @@ /obj/structure/nest/raider, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/bunker) +"aFF" = ( +/obj/effect/turf_decal/vg_decals/numbers/eight{ + pixel_x = 6 + }, +/obj/effect/turf_decal/vg_decals/numbers/four{ + pixel_x = -6 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "aGd" = ( /turf/open/floor/f13/wood, /area/f13/caves) @@ -756,7 +779,7 @@ /turf/open/floor/plating/tunnel, /area/f13/tunnel) "aGi" = ( -/obj/structure/closet/crate/wicker, +/obj/structure/dresser, /turf/open/floor/f13/wood, /area/f13/city) "aGu" = ( @@ -801,9 +824,9 @@ /turf/open/indestructible/ground/inside/subway, /area/f13/tunnel) "aHM" = ( -/obj/effect/landmark/start/f13/ncrheavytrooper, +/obj/structure/shelf_wood, /turf/open/floor/f13/wood, -/area/f13/ncr) +/area/f13/city) "aHW" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/deathclaw, @@ -818,9 +841,11 @@ /turf/closed/indestructible/f13vaultrusted, /area/f13/bunker) "aJb" = ( -/obj/structure/stairs/west, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/effect/landmark/start/f13/ncrranger, +/turf/open/floor/f13/wood, +/area/f13/city) "aJt" = ( /obj/machinery/autolathe, /obj/effect/decal/cleanable/dirt, @@ -857,13 +882,12 @@ /turf/open/floor/plasteel/f13/vault_floor/yellow/whiteyellowfull, /area/f13/caves) "aKO" = ( -/obj/structure/simple_door/room{ - name = "restroom" - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/structure/chair/f13chair1{ + dir = 4 }, -/area/f13/ncr) +/obj/effect/landmark/start/f13/ncrveteranranger, +/turf/open/floor/f13/wood, +/area/f13/city) "aKU" = ( /obj/effect/decal/waste{ icon_state = "goo12" @@ -971,13 +995,7 @@ }, /area/f13/caves) "aPz" = ( -/obj/structure/bodycontainer/morgue{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/f13/wood, +/turf/open/indestructible/ground/outside/ruins, /area/f13/city) "aPG" = ( /obj/machinery/grill{ @@ -1079,18 +1097,14 @@ /area/f13/building) "aWk" = ( /obj/structure/table/wood, -/obj/item/bodybag, -/obj/item/bodybag, -/obj/item/bodybag, -/obj/item/bodybag, +/obj/structure/bedsheetbin, /turf/open/floor/f13/wood, /area/f13/city) "aWD" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/candle_box, -/obj/item/storage/fancy/candle_box, -/obj/item/lighter, -/turf/open/floor/f13/wood, +/obj/structure/chair/sofa/corp/corner{ + dir = 8 + }, +/turf/open/floor/carpet/royalblack, /area/f13/city) "aWU" = ( /obj/effect/turf_decal/stripes/line{ @@ -1219,10 +1233,13 @@ /turf/open/floor/plating/tunnel, /area/f13/tunnel) "beQ" = ( -/obj/item/clothing/under/f13/ncr_formal_uniform, -/obj/item/clothing/under/f13/ncr_female_officer, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/chair/sofa/corp/right{ + dir = 1; + layer = 2.5 + }, +/obj/machinery/light/small, +/turf/open/floor/carpet/royalblack, +/area/f13/city) "bgb" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /obj/effect/decal/cleanable/dirt{ @@ -1360,10 +1377,11 @@ /turf/open/water, /area/f13/radiation) "bki" = ( -/obj/structure/closet/crate/coffin, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/structure/closet/cabinet, +/obj/item/clothing/head/f13/ncr/ncr_flapcap, +/obj/item/clothing/head/beret/ncr_dresscap, +/obj/item/clothing/under/f13/ncr/ncr_dress, +/obj/item/clothing/suit/armor/ncrarmor/ncr_dressjack, /turf/open/floor/f13/wood, /area/f13/city) "bkl" = ( @@ -1386,6 +1404,10 @@ /obj/machinery/suit_storage_unit/radsuit, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/enclave) +"blb" = ( +/obj/effect/spawner/structure/window/plastitanium, +/turf/open/floor/plating/rust, +/area/f13/caves) "bli" = ( /obj/item/clothing/suit/space/fragile, /obj/item/clothing/head/helmet/space/fragile, @@ -1426,11 +1448,6 @@ /obj/structure/flora/junglebush/large, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"bne" = ( -/obj/structure/table, -/obj/item/clothing/head/f13/ncr/steelpot_bandolier, -/turf/open/floor/carpet/orange, -/area/f13/ncr) "bnp" = ( /obj/effect/decal/cleanable/dirt, /obj/item/paper/crumpled, @@ -1448,7 +1465,7 @@ /turf/open/floor/plating/tunnel, /area/f13/caves) "bnB" = ( -/obj/structure/bodycontainer/crematorium, +/obj/structure/table, /turf/open/floor/f13/wood, /area/f13/city) "bnH" = ( @@ -1723,8 +1740,10 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/cmo, /area/f13/caves) "bzD" = ( +/obj/structure/shelf_wood, +/obj/item/reagent_containers/food/drinks/bottle/instacocoa, /turf/open/floor/f13/wood, -/area/f13/ncr) +/area/f13/city) "bzP" = ( /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, /turf/open/indestructible/ground/inside/mountain, @@ -2301,6 +2320,18 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, /turf/open/floor/plating/tunnel, /area/f13/tunnel) +"bIr" = ( +/obj/item/clothing/under/f13/vault, +/obj/item/clothing/under/f13/vault, +/obj/item/clothing/under/f13/vault, +/obj/item/clothing/under/f13/vault, +/obj/item/clothing/under/f13/vault, +/obj/item/clothing/under/f13/vault, +/obj/item/clothing/neck/apron/chef, +/obj/item/clothing/neck/apron/chef, +/obj/structure/closet/locker/oldstyle, +/turf/open/floor/plating/rust, +/area/f13/caves) "bIs" = ( /obj/structure/rack, /obj/item/stack/sheet/cardboard/fifty, @@ -4003,10 +4034,11 @@ /turf/open/indestructible/ground/inside/subway, /area/f13/tunnel) "bON" = ( -/turf/open/floor/f13{ - icon_state = "rampdowntop" +/obj/machinery/light/small{ + dir = 1 }, -/area/f13/ncr) +/turf/open/floor/f13/wood, +/area/f13/city) "bOT" = ( /obj/structure/simple_door/room, /turf/open/floor/f13/wood, @@ -4015,20 +4047,21 @@ /mob/living/simple_animal/hostile/deathclaw, /turf/open/indestructible/ground/inside/mountain, /area/f13/tunnel) -"bOV" = ( -/obj/structure/simple_door/room{ - name = "Veteran Ranger Office" - }, -/turf/open/floor/f13/wood, -/area/f13/ncr) "bPa" = ( /obj/structure/barricade/wooden/strong, /turf/closed/mineral/random/low_chance, /area/f13/caves) "bPc" = ( -/obj/structure/table, -/turf/open/floor/carpet/orange, -/area/f13/ncr) +/obj/structure/table/wood, +/obj/item/bodybag, +/obj/item/bodybag, +/obj/item/bodybag, +/obj/item/bodybag, +/obj/item/bodybag, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" + }, +/area/f13/caves) "bPk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5708,10 +5741,13 @@ }, /area/f13/bunker) "clD" = ( -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" }, -/area/f13/ncr) +/area/f13/caves) "cmy" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/decal/cleanable/blood/drip, @@ -5881,6 +5917,13 @@ icon_state = "reddirtyfull" }, /area/f13/clinic) +"cqn" = ( +/obj/structure/car/junk/panel, +/obj/machinery/light/small/broken{ + dir = 1 + }, +/turf/open/floor/carpet/royalblue, +/area/f13/caves) "cqx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/broken{ @@ -5893,16 +5936,13 @@ /turf/open/water, /area/f13/radiation) "crR" = ( -/obj/machinery/light/small, -/obj/structure/rack/large/shelf_rust, -/obj/item/storage/survivalkit/empty, -/obj/item/storage/survivalkit/empty, -/obj/item/storage/survivalkit/empty, -/obj/item/storage/survivalkit/empty, -/obj/item/storage/survivalkit/empty, -/obj/item/storage/survivalkit/empty, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/bodycontainer/crematorium/creamatorium{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" + }, +/area/f13/caves) "crT" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/inside/subway{ @@ -5921,9 +5961,29 @@ }, /area/f13/building/museum) "ctk" = ( -/obj/machinery/vending/cola/starkist, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/structure/bed/old, +/obj/structure/bed/old{ + pixel_y = 17 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = 14; + layer = 3.1; + density = 0 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14; + density = 0 + }, +/obj/effect/landmark/start/f13/ncrcorporal, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "ctw" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -5958,6 +6018,12 @@ }, /turf/open/floor/plasteel/f13/vault_floor/yellow/yellowchess/yellowchess2, /area/f13/building/museum) +"cub" = ( +/obj/structure/closet/locker/oldstyle, +/obj/effect/spawner/lootdrop/f13/foodspawner/prewar, +/obj/effect/spawner/lootdrop/f13/foodspawner/prewar, +/turf/open/floor/plating/rust, +/area/f13/caves) "cuv" = ( /obj/structure/simple_door/room, /obj/effect/decal/cleanable/dirt, @@ -6130,6 +6196,14 @@ icon_state = "darkrusty" }, /area/f13/bunker) +"cyF" = ( +/obj/structure/railing/tg{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "cyN" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, @@ -6269,9 +6343,11 @@ /turf/open/floor/plating/rust, /area/f13/radiation) "cHj" = ( -/obj/effect/landmark/start/f13/ncrranger, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/simple_door/bunker, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" + }, +/area/f13/caves) "cHs" = ( /obj/structure/wreck/trash/five_tires, /turf/open/floor/f13{ @@ -6331,6 +6407,9 @@ icon_state = "bluerustysolid" }, /area/f13/bunker) +"cKI" = ( +/turf/open/indestructible/ground/outside/roof/stairs/north, +/area/f13/caves) "cKQ" = ( /obj/structure/bed/mattress{ icon_state = "mattress1" @@ -6537,7 +6616,7 @@ /turf/open/indestructible/ground/inside/subway, /area/f13/sewer) "cTz" = ( -/obj/machinery/workbench, +/obj/machinery/workbench/advanced, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "metal plating" }, @@ -7007,14 +7086,11 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/white, /area/f13/caves) "dqZ" = ( -/obj/structure/chair/f13foldupchair{ - dir = 8 - }, -/obj/effect/landmark/start/f13/mobboss, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "metal plating" +/obj/machinery/light/small/broken{ + dir = 1 }, -/area/f13/den) +/turf/open/floor/plating/rust, +/area/f13/caves) "drC" = ( /obj/structure/fluff/rails{ dir = 1 @@ -7215,6 +7291,10 @@ icon_state = "darkrustysolid" }, /area/f13/building/massfusion) +"dEh" = ( +/obj/structure/debris/v4, +/turf/open/indestructible/ground/outside/roof/stairs/north, +/area/f13/caves) "dEs" = ( /mob/living/simple_animal/hostile/ghoul/scorched/ranged, /turf/open/indestructible/ground/inside/mountain, @@ -7370,11 +7450,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"dIl" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/turf/open/floor/f13/wood, -/area/f13/ncr) "dIJ" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -7449,11 +7524,11 @@ /turf/open/floor/f13/wood, /area/f13/tunnel) "dLW" = ( -/obj/structure/chair/sofa/corp{ - dir = 1 +/obj/structure/simple_door/metal, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" }, -/turf/open/floor/carpet/royalblack, -/area/f13/ncr) +/area/f13/den) "dMD" = ( /obj/structure/handrail/g_central{ pixel_y = -16 @@ -7530,9 +7605,16 @@ /turf/open/indestructible/ground/inside/subway, /area/f13/bunker) "dSo" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/structure/closet/crate/footlocker{ + anchored = 1; + density = 0 + }, +/obj/item/clothing/under/f13/ranger/trail, +/obj/item/clothing/under/f13/ranger/patrol, +/obj/item/clothing/under/f13/ranger/modif_ranger, +/obj/item/clothing/under/f13/ranger/blue, +/turf/open/floor/f13/wood, +/area/f13/city) "dSq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit, @@ -7707,14 +7789,6 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/radiation) -"dWQ" = ( -/obj/structure/closet/crate/wicker, -/obj/item/clothing/under/burial, -/obj/item/clothing/under/burial, -/obj/item/clothing/under/burial, -/obj/item/clothing/under/burial, -/turf/open/floor/f13/wood, -/area/f13/city) "dXv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -7768,6 +7842,11 @@ icon_state = "tunnelchess2" }, /area/f13/tunnel) +"dZt" = ( +/obj/item/chair/wood/wings, +/mob/living/simple_animal/hostile/handy/robobrain, +/turf/open/floor/plating/rust, +/area/f13/caves) "dZX" = ( /obj/structure/table/wood/settler, /obj/effect/spawner/lootdrop/f13/foodspawner, @@ -7831,7 +7910,8 @@ /turf/open/indestructible/ground/inside/subway, /area/f13/sewer) "ede" = ( -/obj/structure/table/wood, +/obj/structure/bed, +/obj/item/bedsheet/brown, /turf/open/floor/f13/wood, /area/f13/city) "edw" = ( @@ -7866,9 +7946,9 @@ /turf/open/water, /area/f13/tunnel) "eek" = ( -/obj/structure/bodycontainer/morgue{ - dir = 8 - }, +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/effect/landmark/start/f13/ncrheavytrooper, /turf/open/floor/f13/wood, /area/f13/city) "eff" = ( @@ -7936,10 +8016,6 @@ /obj/structure/reagent_dispensers/barrel/explosive, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"eju" = ( -/obj/effect/landmark/start/f13/ncrcolonel, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) "ejI" = ( /turf/open/indestructible/ground/inside/subway{ name = "stone floor" @@ -8388,22 +8464,19 @@ icon_state = "tunnelrusty" }, /area/f13/tunnel) +"eBh" = ( +/turf/open/floor/carpet/red, +/area/f13/caves) "eBp" = ( /mob/living/simple_animal/hostile/radroach, /turf/open/floor/f13/wood, /area/f13/tunnel) "eBS" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/obj/structure/mirror{ - pixel_x = 32 - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/machinery/light/small{ + dir = 4 }, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "eCp" = ( /obj/structure/simple_door/bunker, /obj/structure/timeddoor, @@ -9011,11 +9084,29 @@ /turf/open/indestructible/ground/outside/ruins, /area/f13/caves) "fdB" = ( -/obj/structure/rack/large/shelf_rust, -/obj/item/storage/box/ration/menu_four, -/obj/item/storage/box/ration/menu_four, +/obj/structure/bed/old, +/obj/structure/bed/old{ + pixel_y = 17 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = 14; + layer = 3.1; + density = 0 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14; + density = 0 + }, +/obj/effect/landmark/start/f13/ncrconscript, +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/f13/wood, -/area/f13/ncr) +/area/f13/city) "fdG" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/decal/cleanable/chem_pile, @@ -9264,6 +9355,12 @@ /obj/structure/nest/supermutant, /turf/open/indestructible/ground/outside/ruins, /area/f13/caves) +"fuq" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "fuG" = ( /obj/machinery/door_timer{ id = "vaultc2"; @@ -9484,6 +9581,9 @@ /obj/structure/sign/directions/engineering, /turf/closed/wall/r_wall/rust, /area/f13/bunker) +"fFM" = ( +/turf/open/indestructible/ground/outside/roof/stairs/east, +/area/f13/caves) "fFU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -9755,6 +9855,15 @@ /obj/structure/closet/cabinet/anchored, /turf/open/indestructible/ground/inside/mountain, /area/f13/bunker) +"fVD" = ( +/obj/structure/closet/locker/oldstyle, +/obj/machinery/light/small/broken{ + dir = 4 + }, +/obj/item/gun/ballistic/automatic/pistol/n99, +/obj/item/gun/ballistic/automatic/pistol/n99, +/turf/open/floor/plating/rust, +/area/f13/caves) "fWd" = ( /obj/item/paper, /obj/item/paper/crumpled, @@ -10091,6 +10200,11 @@ icon_state = "greenrustyfull" }, /area/f13/den) +"glN" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/light/small/broken, +/turf/open/floor/plating/rust, +/area/f13/caves) "glY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -10394,15 +10508,6 @@ }, /turf/open/floor/plasteel/freezer, /area/f13/bunker) -"gzS" = ( -/obj/structure/stairs/east{ - color = "#A47449"; - dir = 1 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "metal plating" - }, -/area/f13/den) "gzT" = ( /obj/structure/closet/anchored, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -10710,11 +10815,29 @@ /turf/open/floor/f13/wood, /area/f13/tunnel) "gMh" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/structure/bed/old, +/obj/structure/bed/old{ + pixel_y = 17 }, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = 14; + layer = 3.1; + density = 0 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14; + density = 0 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) +"gMG" = ( +/obj/item/chair/wood/wings, +/turf/open/floor/plating/rust, +/area/f13/caves) "gNj" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13{ @@ -10807,8 +10930,11 @@ }, /area/f13/bunker) "gRk" = ( -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/structure/shelf_wood, +/obj/item/reagent_containers/food/drinks/bottle/grappa, +/obj/item/reagent_containers/food/drinks/bottle/gin, +/turf/open/floor/f13/wood, +/area/f13/city) "gRt" = ( /obj/effect/decal/waste{ icon_state = "goo5" @@ -10962,13 +11088,18 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/cmo, /area/f13/caves) "gZX" = ( -/obj/structure/table/wood, -/obj/structure/railing{ - color = "#A47449"; - dir = 5 +/obj/structure/closet/crate/footlocker{ + anchored = 1; + density = 0 }, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/item/clothing/under/f13/ncr/ncr_dress, +/obj/item/clothing/under/f13/ncr/conscript, +/obj/item/clothing/under/f13/ncr, +/obj/item/clothing/suit/armor/ncrarmor/ncr_dressjack, +/obj/item/clothing/head/f13/ncr/ncr_flapcap, +/obj/item/clothing/head/f13/ncr/ncr_cap, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "hab" = ( /obj/structure/lattice/catwalk, /obj/structure/lattice/catwalk, @@ -11199,14 +11330,13 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/bunker) "hkc" = ( -/obj/machinery/shower{ - dir = 1; - pixel_y = -2 - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/structure/table, +/obj/machinery/computer/terminal{ + dir = 8; + termtag = "Public" }, -/area/f13/ncr) +/turf/open/floor/f13/wood, +/area/f13/city) "hkf" = ( /obj/structure/chair/sofa/right{ dir = 8 @@ -11506,6 +11636,12 @@ icon_state = "darkrustysolid" }, /area/f13/building/massfusion) +"hwG" = ( +/obj/machinery/light/small/broken{ + dir = 8 + }, +/turf/open/floor/plating/rust, +/area/f13/caves) "hwO" = ( /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/indestructible/ground/inside/mountain, @@ -11828,6 +11964,18 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/mineral/random/high_chance, /area/f13/caves) +"hOr" = ( +/mob/living/simple_animal/hostile/handy/robobrain{ + peaceful = 1 + }, +/obj/structure/window/reinforced/spawner/west, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "hOV" = ( /obj/structure/closet/crate/freezer/blood/anchored, /turf/open/floor/plasteel/f13{ @@ -11893,6 +12041,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, /area/f13/tunnel) +"hSm" = ( +/obj/machinery/light/small/broken{ + dir = 8 + }, +/turf/open/floor/carpet/royalblue, +/area/f13/caves) "hSt" = ( /obj/structure/chair/bench, /obj/effect/decal/cleanable/dirt, @@ -13001,6 +13155,11 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall, /area/f13/enclave) +"iUj" = ( +/obj/structure/closet/locker/oldstyle, +/obj/item/gun/ballistic/automatic/pistol/n99/executive/worn, +/turf/open/floor/plating/rust, +/area/f13/caves) "iUK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{ @@ -13103,6 +13262,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/tunnel, /area/f13/caves) +"iYS" = ( +/obj/structure/closet/locker/oldstyle, +/obj/effect/spawner/lootdrop/f13/foodspawner/prewar, +/obj/effect/spawner/lootdrop/f13/foodspawner/prewar, +/obj/machinery/light/small/broken{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/f13/caves) "iYT" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -13119,6 +13287,15 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/river, /area/f13/caves) +"iZp" = ( +/obj/machinery/light/small{ + dir = 8; + light_color = "#d8b1b1" + }, +/turf/open/indestructible/ground/inside/subway{ + name = "cave" + }, +/area/f13/caves) "iZw" = ( /obj/structure/barricade/wooden/strong, /turf/closed/indestructible/vaultdoor, @@ -13330,6 +13507,13 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/caves) +"jmd" = ( +/obj/structure/junk/micro, +/obj/machinery/light/small/broken{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/f13/caves) "jmm" = ( /obj/machinery/vending/wardrobe/medi_wardrobe, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, @@ -13492,18 +13676,11 @@ /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/museum) "jtP" = ( -/obj/structure/closet/crate/footlocker{ - anchored = 1; - density = 0 - }, -/obj/item/clothing/under/f13/ncr/ncr_dress, -/obj/item/clothing/under/f13/ncr/conscript, -/obj/item/clothing/under/f13/ncr, -/obj/item/clothing/suit/armor/ncrarmor/ncr_dressjack, -/obj/item/clothing/head/f13/ncr/ncr_flapcap, -/obj/item/clothing/head/f13/ncr/ncr_cap, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/effect/landmark/start/f13/ncrranger, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "jtZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/darkpurple/side{ @@ -13590,6 +13767,11 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/inside/subway, /area/f13/caves) +"jzw" = ( +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" + }, +/area/f13/caves) "jzA" = ( /obj/structure/target_stake, /obj/item/target, @@ -13734,6 +13916,13 @@ /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, /turf/open/indestructible/ground/inside/mountain, /area/f13/radiation) +"jEa" = ( +/obj/structure/window/reinforced/spawner/west, +/mob/living/simple_animal/hostile/handy/robobrain, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "jFh" = ( /obj/effect/decal/cleanable/blood/tracks, /obj/structure/barricade/wooden, @@ -13755,6 +13944,10 @@ /mob/living/simple_animal/hostile/radroach, /turf/open/floor/plasteel/dark, /area/f13/building/museum) +"jGf" = ( +/obj/structure/debris/v3, +/turf/open/indestructible/ground/outside/roof/stairs/north, +/area/f13/caves) "jGk" = ( /obj/structure/chair/f13chair1{ dir = 4 @@ -13775,6 +13968,10 @@ icon_state = "tealwhrusty_chess2" }, /area/f13/enclave) +"jGK" = ( +/obj/structure/table/wood/fancy, +/turf/open/floor/plating/rust, +/area/f13/caves) "jHb" = ( /turf/open/floor/plasteel/white, /area/f13/wasteland) @@ -14225,13 +14422,16 @@ /turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/caves) "kdB" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/structure/closet/crate/footlocker{ + anchored = 1; + density = 0 }, -/area/f13/ncr) +/obj/item/clothing/under/f13/ranger/trail, +/obj/item/clothing/under/f13/ranger/patrol, +/obj/item/clothing/under/f13/ranger/modif_ranger, +/obj/item/clothing/under/f13/ranger/blue, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "kdI" = ( /turf/open/floor/plasteel/f13/vault_floor/yellow{ icon_state = "yellowrustyfull" @@ -14449,6 +14649,11 @@ }, /turf/open/floor/plasteel/f13/vault_floor/dark, /area/f13/building/hospital) +"koj" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/light/small, +/turf/open/floor/plating/rust, +/area/f13/caves) "kpn" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/melee/tier5, @@ -14813,20 +15018,6 @@ icon_state = "greenrustyfull" }, /area/f13/tunnel) -"kFC" = ( -/obj/machinery/shower{ - pixel_y = 17 - }, -/obj/structure/sink{ - desc = "Looks like there's a water leak coming from this toilet, yuck."; - icon_state = "water"; - name = "leaky toilet water" - }, -/obj/item/soap/homemade, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ncr) "kFT" = ( /obj/effect/decal/remains{ icon_state = "remains" @@ -15137,6 +15328,13 @@ }, /turf/open/indestructible/ground/inside/subway, /area/f13/sewer) +"kUO" = ( +/obj/structure/wreck/trash/machinepile, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/f13/caves) "kVl" = ( /obj/machinery/autolathe, /turf/open/floor/f13{ @@ -15264,12 +15462,9 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "lcq" = ( -/obj/effect/landmark/start/f13/ncrtrooper, -/obj/effect/landmark/start/f13/ncrcorporal, -/obj/effect/landmark/start/f13/ncrsergeant, -/obj/effect/landmark/start/f13/ncrcombatengineer, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/dresser, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "lcD" = ( /obj/structure/barricade/tentclothedge{ dir = 4 @@ -15329,16 +15524,8 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/bunker) "lfa" = ( -/obj/machinery/button/door{ - id = "sewershopshutters"; - name = "shop shutters"; - pixel_x = -29 - }, -/obj/structure/table, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "metal plating" - }, -/area/f13/den) +/turf/open/floor/carpet/royalblue, +/area/f13/caves) "lfc" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -15407,6 +15594,12 @@ /obj/structure/decoration/rag, /turf/open/indestructible/ground/inside/subway, /area/f13/caves) +"lio" = ( +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/turf/open/floor/carpet/red, +/area/f13/caves) "liG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/destructible/tribal_torch/lit, @@ -15427,13 +15620,11 @@ }, /area/f13/tunnel) "ljU" = ( -/obj/structure/table, -/obj/machinery/computer/terminal{ - dir = 4; - termtag = "Security" +/obj/machinery/light/fo13colored/Red, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" }, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/area/f13/caves) "lkc" = ( /obj/machinery/door/airlock/maintenance/abandoned, /turf/open/floor/plasteel/f13/vault_floor/floor, @@ -15455,10 +15646,26 @@ /turf/open/indestructible/ground/inside/subway, /area/f13/radiation) "lkE" = ( -/obj/structure/table, -/obj/item/clothing/head/f13/ncr/steelpot_gambler, -/turf/open/floor/carpet/orange, -/area/f13/ncr) +/obj/structure/bed/old, +/obj/structure/bed/old{ + pixel_y = 17 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = 14; + layer = 3.1; + density = 0 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14; + density = 0 + }, +/obj/effect/landmark/start/f13/ncrcombatmedic, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "lkI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/broken, @@ -15558,6 +15765,17 @@ /obj/machinery/light/broken, /turf/open/floor/plasteel/darkpurple/side, /area/f13/building/museum) +"lqR" = ( +/obj/effect/turf_decal/vg_decals/numbers/four{ + pixel_x = -6 + }, +/obj/effect/turf_decal/vg_decals/numbers/eight{ + pixel_x = 6 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "lrb" = ( /mob/living/simple_animal/hostile/deathclaw, /obj/effect/decal/cleanable/dirt, @@ -15592,6 +15810,12 @@ icon_state = "darkrustysolid" }, /area/f13/radiation) +"ltw" = ( +/obj/structure/chair/wood/wings{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/f13/caves) "ltD" = ( /obj/structure/window/reinforced/spawner, /obj/structure/rack, @@ -17309,17 +17533,6 @@ /obj/item/clothing/glasses/regular, /turf/open/indestructible/ground/inside/mountain, /area/f13/tunnel) -"mVz" = ( -/obj/structure/closet/crate/footlocker{ - anchored = 1; - density = 0 - }, -/obj/item/clothing/under/f13/ranger/trail, -/obj/item/clothing/under/f13/ranger/patrol, -/obj/item/clothing/under/f13/ranger/modif_ranger, -/obj/item/clothing/under/f13/ranger/blue, -/turf/open/floor/f13/wood, -/area/f13/ncr) "mVE" = ( /turf/open/floor/f13/wood, /area/f13/tunnel) @@ -17624,6 +17837,12 @@ icon_state = "redrustyfull" }, /area/f13/tunnel) +"njX" = ( +/obj/structure/rack/shelf_metal, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/plating/rust, +/area/f13/caves) "nkt" = ( /obj/structure/campfire/barrel, /obj/structure/spider/stickyweb, @@ -17718,6 +17937,10 @@ icon_state = "greendirtyfull" }, /area/f13/caves) +"npz" = ( +/obj/structure/wreck/trash/machinepile, +/turf/open/floor/plating/rust, +/area/f13/caves) "npA" = ( /obj/structure/spider/cocoon, /obj/item/reagent_containers/hypospray/medipen/stimpak{ @@ -17890,11 +18113,28 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/building) "nyJ" = ( -/obj/structure/simple_door/room{ - name = "First Sergeant Office" +/obj/structure/bed/old, +/obj/structure/bed/old{ + pixel_y = 17 }, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = 14; + layer = 3.1; + density = 0 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14; + density = 0 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "nyY" = ( /obj/item/trash/f13/tin{ dir = 4; @@ -17949,6 +18189,13 @@ /mob/living/simple_animal/hostile/centaur, /turf/open/indestructible/ground/inside/subway, /area/f13/caves) +"nAo" = ( +/obj/structure/car/junk/panel, +/obj/structure/wreck/trash/machinepiletwo, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "nAQ" = ( /obj/structure/window/reinforced/spawner/east, /obj/item/reagent_containers/food/snacks/deadmouse, @@ -17985,9 +18232,11 @@ /turf/open/indestructible/ground/inside/subway, /area/f13/caves) "nCi" = ( -/obj/structure/chair/folding, -/turf/open/floor/carpet/orange, -/area/f13/ncr) +/obj/structure/shelf_wood, +/obj/structure/shelf_wood, +/obj/item/reagent_containers/food/drinks/bottle/hooch, +/turf/open/floor/f13/wood, +/area/f13/city) "nCn" = ( /obj/item/trash/can, /turf/open/water, @@ -18018,8 +18267,11 @@ }, /area/f13/building/massfusion) "nDW" = ( -/turf/closed/indestructible/f13/matrix, -/area/f13/ncr) +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/effect/landmark/start/f13/ncrsergeant, +/turf/open/floor/f13/wood, +/area/f13/city) "nEt" = ( /obj/structure/barricade/tentclothedge, /obj/structure/decoration/rag, @@ -18118,6 +18370,11 @@ name = "cave" }, /area/f13/caves) +"nJK" = ( +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#e4e4e4" + }, +/area/f13/caves) "nJL" = ( /obj/effect/decal/cleanable/blood/gibs/down{ icon_state = "gibup1" @@ -18141,11 +18398,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/subway, /area/f13/caves) -"nKz" = ( -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ncr) "nKJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -18260,9 +18512,29 @@ }, /area/f13/den) "nOS" = ( -/obj/machinery/light/small, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/structure/bed/old, +/obj/structure/bed/old{ + pixel_y = 17 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = 14; + layer = 3.1; + density = 0 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14; + density = 0 + }, +/obj/effect/landmark/start/f13/ncrtrooper, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "nOW" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/tunnel, @@ -18291,10 +18563,26 @@ /turf/closed/wall/r_wall/rust, /area/f13/tunnel) "nPP" = ( -/turf/open/floor/f13/wood{ - icon_state = "housewood3-broken" +/obj/structure/bed/old, +/obj/structure/bed/old{ + pixel_y = 17 }, -/area/f13/ncr) +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = 14; + layer = 3.1; + density = 0 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14; + density = 0 + }, +/obj/effect/landmark/start/f13/ncrcombatengineer, +/turf/open/floor/f13/wood, +/area/f13/city) "nQg" = ( /obj/structure/table, /obj/item/reagent_containers/food/snacks/meat/slab/human, @@ -18651,7 +18939,14 @@ "oie" = ( /obj/structure/table/glass, /turf/open/floor/carpet/royalblack, -/area/f13/ncr) +/area/f13/city) +"oik" = ( +/obj/structure/wreck/trash/machinepiletwo, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/carpet/royalblue, +/area/f13/caves) "oio" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -19007,10 +19302,6 @@ /obj/effect/spawner/lootdrop/f13/foodspawner, /turf/open/indestructible/ground/inside/mountain, /area/f13/bunker) -"oBe" = ( -/obj/structure/simple_door/room, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) "oBy" = ( /obj/structure/table, /obj/item/folder/white, @@ -19112,12 +19403,10 @@ /area/f13/caves) "oGV" = ( /obj/structure/table/wood, -/obj/structure/railing{ - color = "#A47449"; - dir = 9 +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" }, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/area/f13/caves) "oGZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/autolathe, @@ -19198,6 +19487,14 @@ /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/indestructible/ground/inside/mountain, /area/f13/bunker) +"oKe" = ( +/obj/structure/table/wood/fancy, +/obj/item/paper{ + icon_state = "scrap_bloodied"; + info = "WE ARE ON STRIKE ! WE REQUEST PAYMENT!!!!" + }, +/turf/open/floor/plating/rust, +/area/f13/caves) "oKm" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/mineral/plastitanium, @@ -19390,12 +19687,6 @@ }, /turf/open/floor/f13/wood, /area/f13/tunnel) -"oTq" = ( -/obj/structure/rack/shelf_metal, -/obj/item/storage/box/ration/menu_eleven, -/obj/item/storage/box/ration/menu_eleven, -/turf/open/floor/f13/wood, -/area/f13/ncr) "oUq" = ( /obj/item/reagent_containers/food/snacks/deadmouse, /obj/effect/decal/cleanable/dirt{ @@ -19469,12 +19760,6 @@ /obj/machinery/defibrillator_mount, /turf/closed/wall/r_wall/rust, /area/f13/bunker) -"oWz" = ( -/obj/structure/curtain, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ncr) "oXb" = ( /obj/structure/barricade/sandbags, /obj/effect/decal/cleanable/dirt, @@ -20041,6 +20326,9 @@ icon_state = "darkrustysolid" }, /area/f13/tunnel) +"pxF" = ( +/turf/open/indestructible/ground/outside/roof/stairs/west, +/area/f13/caves) "pxS" = ( /obj/structure/handrail/g_central{ dir = 4; @@ -20383,6 +20671,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/subway, /area/f13/caves) +"pNr" = ( +/obj/structure/railing/tg{ + dir = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "pNE" = ( /obj/structure/window/fulltile/ruins, /obj/structure/barricade/wooden/planks, @@ -20623,9 +20919,11 @@ }, /area/f13/caves) "qba" = ( -/obj/structure/simple_door/room, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/effect/landmark/start/f13/ncrsergeant, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "qbc" = ( /obj/structure/junk/small/tv{ desc = "A wall mounted television, sadly it's broken."; @@ -20639,12 +20937,6 @@ icon_state = "greendirtyfull" }, /area/f13/caves) -"qbj" = ( -/obj/structure/table/glass, -/obj/item/storage/box/cups, -/obj/item/storage/box/cups, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) "qbt" = ( /obj/structure/sign/warning/radiation/rad_area, /turf/closed/wall/rust, @@ -20672,14 +20964,6 @@ /obj/structure/closet/cabinet/anchored, /turf/open/indestructible/ground/inside/mountain, /area/f13/bunker) -"qdZ" = ( -/obj/machinery/shower{ - pixel_y = 17 - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ncr) "qeh" = ( /mob/living/simple_animal/hostile/eyebot, /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, @@ -20729,9 +21013,18 @@ /turf/open/floor/f13/wood, /area/f13/den) "qeX" = ( -/obj/machinery/vending/coffee, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/structure/closet/crate/footlocker{ + anchored = 1; + density = 0 + }, +/obj/item/clothing/under/f13/ncr/ncr_dress, +/obj/item/clothing/under/f13/ncr/conscript, +/obj/item/clothing/under/f13/ncr, +/obj/item/clothing/suit/armor/ncrarmor/ncr_dressjack, +/obj/item/clothing/head/f13/ncr/ncr_flapcap, +/obj/item/clothing/head/f13/ncr/ncr_cap, +/turf/open/floor/f13/wood, +/area/f13/city) "qfa" = ( /obj/structure/wreck/trash/three_barrels, /obj/effect/decal/cleanable/dirt{ @@ -20924,6 +21217,10 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/building) +"qnn" = ( +/obj/structure/car/junk/panel, +/turf/open/floor/carpet/royalblue, +/area/f13/caves) "qnL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/broken{ @@ -21051,6 +21348,12 @@ icon_state = "darkdirtysolid" }, /area/f13/tunnel) +"qry" = ( +/obj/structure/wreck/trash/machinepiletwo, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "qrI" = ( /obj/machinery/porta_turret/syndicate/vehicle_turret{ desc = "An improvised ballistic turret - it looks exceptionally shoddy, yet stil functional. Safe to assume it's a repaired security system from whatever this place once was"; @@ -21367,11 +21670,10 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "qFM" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/structure/bed, +/obj/item/bedsheet, /turf/open/floor/f13/wood, -/area/f13/ncr) +/area/f13/city) "qFR" = ( /turf/closed/wall/f13/wood, /area/f13/building) @@ -21590,6 +21892,10 @@ icon_state = "redrustyfull" }, /area/f13/caves) +"qQU" = ( +/obj/structure/simple_door/bunker, +/turf/open/floor/plating/rust, +/area/f13/caves) "qRk" = ( /obj/item/reagent_containers/food/snacks/deadmouse, /turf/open/floor/plasteel/f13/vault_floor/floor, @@ -21606,47 +21912,11 @@ /turf/open/floor/plasteel/f13/vault_floor/yellow/whiteyellowfull, /area/f13/bunker) "qSe" = ( -/obj/structure/rack/shelf_metal, -/obj/item/clothing/under/f13/ncr, -/obj/item/clothing/under/f13/ncr, -/obj/item/clothing/under/f13/ncr, -/obj/item/clothing/under/f13/ncr, -/obj/item/clothing/under/f13/ncr, -/obj/item/clothing/under/f13/ncr/conscript, -/obj/item/clothing/under/f13/ncr/conscript, -/obj/item/clothing/under/f13/ncr/conscript, -/obj/item/clothing/under/f13/ncr/conscript, -/obj/item/clothing/under/f13/ncr/conscript, -/obj/item/clothing/under/f13/ncr/ncr_dress, -/obj/item/clothing/under/f13/ncr/ncr_dress, -/obj/item/clothing/under/f13/ncr/ncr_dress, -/obj/item/clothing/under/f13/ncr/ncr_dress, -/obj/item/clothing/under/f13/ncr/ncr_dress, -/obj/item/clothing/under/f13/ncr/ncr_dress, -/obj/item/clothing/under/f13/ncr/ncr_officer, -/obj/item/clothing/under/f13/ncr/ncr_officer, -/obj/item/clothing/under/f13/ncr/ncr_officer, -/obj/item/clothing/under/f13/ncr/ncr_officer, -/obj/item/clothing/under/f13/ncr/ncr_officer, -/obj/item/clothing/under/f13/ncr/ncr_officer, -/obj/item/clothing/under/f13/ncr/ncr_officer, -/obj/item/clothing/under/f13/ncr/ncr_shorts, -/obj/item/clothing/under/f13/ncr/ncr_shorts, -/obj/item/clothing/under/f13/ncr/ncr_shorts, -/obj/item/clothing/under/f13/ncr/ncr_shorts, -/obj/item/clothing/under/f13/ncr/ncr_shorts, -/obj/item/clothing/under/f13/ncr/ncr_shorts, -/obj/item/clothing/under/f13/ncr/ncr_shorts, -/obj/item/clothing/under/f13/ncr/pants, -/obj/item/clothing/under/f13/ncr/pants, -/obj/item/clothing/under/f13/ncr/pants, -/obj/item/clothing/under/f13/ncr/pants, -/obj/item/clothing/under/f13/ncr/pants, -/obj/item/clothing/under/f13/ncr/pants, -/obj/item/clothing/under/f13/ncr/pants, -/obj/item/clothing/under/f13/ncr/pants, +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/effect/landmark/start/f13/ncrdrillsergeant, /turf/open/floor/f13/wood, -/area/f13/ncr) +/area/f13/city) "qSB" = ( /obj/structure/curtain{ color = "#845f58" @@ -21759,13 +22029,6 @@ /obj/structure/spider/stickyweb, /turf/open/floor/plasteel/f13/vault_floor/red, /area/f13/caves) -"qYb" = ( -/obj/structure/chair/f13chair1{ - dir = 8 - }, -/obj/effect/landmark/start/f13/ncrfirstsergeant, -/turf/open/floor/f13/wood, -/area/f13/ncr) "qYF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/bin, @@ -21826,9 +22089,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/dark, /area/f13/building/hospital) -"rbF" = ( -/turf/open/floor/carpet/orange, -/area/f13/ncr) "rbI" = ( /obj/structure/spider/stickyweb, /turf/open/indestructible/ground/inside/mountain, @@ -22340,11 +22600,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/subway, /area/f13/caves) -"rHD" = ( -/obj/item/storage/box/ration/menu_nine, -/obj/item/storage/box/ration/menu_nine, -/turf/open/floor/f13/wood, -/area/f13/ncr) "rIc" = ( /obj/structure/table/wood/settler, /obj/item/book/granter/crafting_recipe/gunsmith_one, @@ -22381,12 +22636,6 @@ /obj/structure/simple_door/interior, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"rJB" = ( -/turf/closed/wall/f13/store{ - desc = "A pre-War wall made of solid concrete."; - name = "concrete wall" - }, -/area/f13/ncr) "rJI" = ( /obj/structure/bed/old, /turf/open/floor/plasteel/f13/vault_floor/red/whiteredfull{ @@ -22730,13 +22979,13 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/bunker) "saV" = ( -/obj/structure/table/wood, -/obj/structure/railing{ - color = "#A47449"; +/obj/structure/bodycontainer/morgue{ dir = 1 }, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" + }, +/area/f13/caves) "sbb" = ( /obj/structure/decoration/vent/rusty, /turf/open/floor/f13{ @@ -22850,13 +23099,24 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/building/museum) "siE" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/structure/bed/old, +/obj/structure/bed/old{ + pixel_y = 17 }, -/obj/machinery/button/crematorium{ - id = 700; - pixel_y = 32 +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = 14; + layer = 3.1; + density = 0 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14; + density = 0 }, +/obj/effect/landmark/start/f13/ncrtrooper, /turf/open/floor/f13/wood, /area/f13/city) "sjg" = ( @@ -22971,6 +23231,9 @@ icon_state = "yellowdirtyfull" }, /area/f13/tunnel) +"spa" = ( +/turf/open/floor/plating/rust, +/area/f13/caves) "spC" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/supermutant/meleemutant, @@ -23155,9 +23418,11 @@ /turf/open/floor/plasteel/f13/vault_floor/yellow/yellowchess/yellowchess2, /area/f13/caves) "swP" = ( -/obj/structure/table/wood, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/structure/chair/sofa/corp{ + dir = 1 + }, +/turf/open/floor/carpet/royalblack, +/area/f13/city) "sxA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -23199,13 +23464,6 @@ }, /turf/open/floor/plating/rust, /area/f13/radiation) -"sze" = ( -/obj/structure/table/glass, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) "szl" = ( /obj/structure/ladder/unbreakable{ height = 1; @@ -23359,6 +23617,31 @@ /obj/structure/timeddoor, /turf/closed/wall/r_wall/rust, /area/f13/bunker) +"sGr" = ( +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 8; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 5; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = -11; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = -7; + density = 0 + }, +/turf/open/indestructible/ground/inside/subway{ + name = "cave" + }, +/area/f13/caves) "sGv" = ( /obj/structure/spider/cocoon, /turf/open/floor/plasteel/f13/vault_floor/plating, @@ -23477,6 +23760,9 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/radiation) +"sMt" = ( +/turf/open/floor/wood/f13/maple, +/area/f13/caves) "sMv" = ( /obj/effect/decal/cleanable/generic, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -23496,6 +23782,16 @@ icon_state = "greenrustyfull" }, /area/f13/den) +"sNc" = ( +/obj/structure/wreck/trash/machinepile, +/obj/machinery/light/small{ + dir = 8; + light_color = "#d8b1b1" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "sNR" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -23647,6 +23943,11 @@ icon_state = "darkdirtysolid" }, /area/f13/tunnel) +"sTn" = ( +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "sTt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -23679,6 +23980,10 @@ "sUF" = ( /turf/closed/indestructible/rock, /area/f13/radiation) +"sVN" = ( +/obj/structure/table/wood/fancy, +/turf/open/floor/carpet/red, +/area/f13/caves) "sWm" = ( /turf/open/floor/plasteel/f13/vault_floor/red{ icon_state = "redrustyfull" @@ -23984,6 +24289,10 @@ icon_state = "tunnelchess" }, /area/f13/tunnel) +"tgz" = ( +/obj/structure/simple_door/bunker, +/turf/open/floor/carpet/royalblue, +/area/f13/caves) "tha" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, @@ -24171,12 +24480,6 @@ name = "metal plating" }, /area/f13/city) -"tpF" = ( -/obj/structure/chair/sofa/corp/corner{ - dir = 8 - }, -/turf/open/floor/carpet/royalblack, -/area/f13/ncr) "tpI" = ( /obj/effect/spawner/lootdrop/f13/resourcespawner, /obj/structure/closet/crate/large, @@ -24756,9 +25059,11 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "tRD" = ( -/obj/structure/table, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/stairs/north, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" + }, +/area/f13/caves) "tRE" = ( /obj/structure/lattice/catwalk, /obj/machinery/light/small{ @@ -24997,10 +25302,12 @@ /turf/open/floor/plating/rust, /area/f13/radiation) "ucK" = ( -/turf/open/floor/plasteel/stairs{ +/obj/machinery/light/small{ dir = 4 }, -/area/f13/ncr) +/obj/structure/table, +/turf/open/floor/f13/wood, +/area/f13/city) "ucL" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -25103,14 +25410,6 @@ }, /turf/open/indestructible/ground/inside/subway, /area/f13/caves) -"uiP" = ( -/obj/structure/table, -/obj/machinery/computer/terminal{ - dir = 8; - termtag = "Public" - }, -/turf/open/floor/f13/wood, -/area/f13/ncr) "ujm" = ( /obj/structure/table, /obj/machinery/cell_charger{ @@ -25289,11 +25588,8 @@ }, /area/f13/tunnel) "uub" = ( -/obj/structure/rack/shelf_metal, -/obj/item/storage/box/ration/menu_three, -/obj/item/storage/box/ration/menu_three, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/turf/closed/wall/f13/wood, +/area/f13/city) "uuf" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -25328,6 +25624,11 @@ icon_state = "reddirtyfull" }, /area/f13/tunnel) +"uuL" = ( +/obj/structure/debris/v3, +/obj/structure/debris/v4, +/turf/open/indestructible/ground/outside/roof/stairs/north, +/area/f13/caves) "uuN" = ( /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "metal plating" @@ -25412,12 +25713,9 @@ }, /area/f13/enclave) "uxw" = ( -/obj/structure/chair/f13chair1{ - dir = 4 - }, -/obj/effect/landmark/start/f13/ncrveteranranger, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/simple_door/room, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "uyq" = ( /obj/item/reagent_containers/glass/bucket{ desc = "It smells awful."; @@ -25477,12 +25775,6 @@ icon_state = "darkrustysolid" }, /area/f13/bunker) -"uAE" = ( -/obj/machinery/light/floor, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ncr) "uBh" = ( /obj/machinery/light/small{ dir = 1 @@ -25634,11 +25926,6 @@ name = "metal plating" }, /area/f13/city) -"uFO" = ( -/obj/structure/table/wood, -/obj/structure/bedsheetbin, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) "uGl" = ( /obj/structure/simple_door/metal/barred, /obj/structure/barricade/wooden/planks, @@ -25666,6 +25953,15 @@ "uHK" = ( /turf/closed/mineral/random/low_chance, /area/f13/building/museum) +"uId" = ( +/obj/structure/vaultdoor{ + icon_state = "open"; + name = "demo vault door" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" + }, +/area/f13/caves) "uIr" = ( /obj/structure/table, /obj/item/weldingtool/experimental{ @@ -25784,13 +26080,25 @@ }, /area/f13/den) "uMO" = ( -/obj/effect/landmark/start/f13/ncrtrooper, -/obj/effect/landmark/start/f13/ncrtrooper, -/obj/effect/landmark/start/f13/ncrcorporal, -/obj/effect/landmark/start/f13/ncrsergeant, -/obj/effect/landmark/start/f13/ncrcombatengineer, +/obj/structure/closet/cabinet/anchored, +/obj/item/clothing/head/f13/ncr/ncr_cap, +/obj/item/clothing/head/f13/ncr/ncr_cap, +/obj/item/clothing/under/f13/ncr/conscript, +/obj/item/clothing/under/f13/ncr/conscript, +/obj/item/clothing/under/f13/ncr/ncr_dress, +/obj/item/clothing/under/f13/ncr/ncr_dress, +/obj/item/clothing/under/f13/ncr/ncr_shorts, +/obj/item/clothing/under/f13/ncr/ncr_shorts, +/obj/item/clothing/under/f13/ncr/pants, +/obj/item/clothing/under/f13/ncr/pants, +/obj/item/clothing/under/f13/ncr/sniper, +/obj/item/clothing/under/f13/ncr/sniper, +/obj/item/clothing/head/f13/ncr/ncr_flapcap, +/obj/item/clothing/head/f13/ncr/ncr_flapcap, +/obj/item/clothing/head/f13/ncr/ncr_slouch, +/obj/item/clothing/head/f13/ncr/ncr_slouch, /turf/open/floor/f13/wood, -/area/f13/ncr) +/area/f13/city) "uNI" = ( /obj/structure/rack, /obj/item/stack/sheet/cloth/ten, @@ -25998,11 +26306,11 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "vaz" = ( -/obj/machinery/light/small{ +/obj/structure/chair/sofa/corp/right{ dir = 8 }, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/turf/open/floor/carpet/royalblack, +/area/f13/city) "vaR" = ( /obj/structure/simple_door/wood, /obj/structure/barricade/wooden/planks, @@ -26529,11 +26837,9 @@ }, /area/f13/enclave) "vur" = ( -/obj/structure/rack/shelf_metal, -/obj/item/storage/box/ration/menu_five, -/obj/item/storage/box/ration/menu_five, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/table, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "vvw" = ( /obj/structure/table, /obj/item/book/granter/trait/pa_wear, @@ -26882,13 +27188,10 @@ /obj/item/clothing/under/f13/rag, /turf/open/indestructible/ground/inside/mountain, /area/f13/bunker) -"vMn" = ( -/obj/structure/chair/sofa/corp/right{ - dir = 1 - }, -/obj/machinery/light/small, -/turf/open/floor/carpet/royalblack, -/area/f13/ncr) +"vMg" = ( +/obj/item/chair/wood/wings, +/turf/open/floor/carpet/red, +/area/f13/caves) "vNn" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -26959,6 +27262,12 @@ /obj/effect/landmark/start/f13/usscientist, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/enclave) +"vPz" = ( +/obj/structure/wreck/trash/machinepile, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "vQn" = ( /mob/living/simple_animal/hostile/giantantqueen, /turf/open/indestructible/ground/inside/mountain, @@ -27086,13 +27395,13 @@ }, /area/f13/caves) "vWu" = ( -/obj/structure/rack/shelf_metal, -/obj/item/storage/box/ration/menu_eight, -/obj/item/storage/box/ration/menu_eight, -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" +/obj/machinery/light/fo13colored/Red{ + dir = 1 }, -/area/f13/ncr) +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" + }, +/area/f13/caves) "vWC" = ( /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier5, /turf/open/indestructible/ground/inside/mountain, @@ -27388,6 +27697,14 @@ /obj/item/stack/ore/blackpowder/two, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"wkd" = ( +/obj/structure/railing/tg{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + icon_state = "floorrustysolid" + }, +/area/f13/caves) "wlx" = ( /obj/structure/closet/crate/wicker, /obj/item/fishingrod, @@ -27895,7 +28212,6 @@ /obj/structure/chair/f13foldupchair{ dir = 4 }, -/obj/effect/landmark/start/f13/enforcer, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "metal plating" }, @@ -28484,11 +28800,6 @@ /obj/effect/spawner/lootdrop/f13/weapon/melee/random, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/bunker) -"xos" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/bottle/hooch, -/turf/open/floor/carpet/royalblack, -/area/f13/ncr) "xpg" = ( /obj/effect/turf_decal/weather/dirt{ dir = 6 @@ -28564,6 +28875,10 @@ }, /turf/open/floor/plasteel/f13/vault_floor/red, /area/f13/caves) +"xsF" = ( +/obj/structure/wreck/trash/machinepile, +/turf/open/floor/carpet/royalblue, +/area/f13/caves) "xsT" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/waste{ @@ -28613,12 +28928,6 @@ "xwF" = ( /turf/closed/mineral/random/low_chance/underground, /area/f13/caves) -"xwL" = ( -/obj/structure/table, -/obj/item/clothing/under/f13/ncr/torn, -/obj/item/clothing/head/f13/ncr/ncr_campaign, -/turf/open/floor/f13/wood, -/area/f13/ncr) "xxp" = ( /obj/structure/chair/wood, /turf/open/floor/f13/wood, @@ -28702,11 +29011,12 @@ /turf/open/floor/plating/tunnel, /area/f13/caves) "xAo" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/button/crematorium, +/obj/structure/table, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "metal plating" }, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/area/f13/caves) "xAD" = ( /obj/structure/lattice/catwalk, /turf/closed/mineral/random/low_chance, @@ -29179,6 +29489,10 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"xUe" = ( +/obj/structure/debris/v4, +/turf/closed/wall/rust, +/area/f13/tunnel) "xUg" = ( /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/bluespace, @@ -29340,6 +29654,10 @@ /obj/structure/wreck/trash/four_barrels, /turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/caves) +"xYV" = ( +/mob/living/simple_animal/hostile/handy/robobrain, +/turf/open/floor/plating/rust, +/area/f13/caves) "xZu" = ( /obj/machinery/door/poddoor/shutters/old{ id = "factorybasement"; @@ -29560,6 +29878,13 @@ icon_state = "greenrustyfull" }, /area/f13/den) +"ykT" = ( +/obj/structure/car/junk/panel, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/carpet/royalblue, +/area/f13/caves) "ylq" = ( /obj/structure/window/reinforced{ dir = 1 @@ -38087,13 +38412,13 @@ aaa "} (34,1,1) = {" aaa +aak +aak +aak aae +aak aae -aae -aae -aae -aae -aae +aak aae aae aae @@ -38345,22 +38670,22 @@ aaa (35,1,1) = {" aaa aae +aak aae aae aae aae aae +aak aae aae aae aae +aak aae aae -aae -aae -aae -aae -aae +aak +aak aae aae aae @@ -38601,22 +38926,22 @@ aaa "} (36,1,1) = {" aaa -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB +aae +aak +aae +aak +aak +aak +aae aae aae +aak +aak +aak aae +aak aae +aak aae aae aae @@ -38858,24 +39183,24 @@ aaa "} (37,1,1) = {" aaa -rJB -dIl -vaz -dIl -bzD -dIl -vaz -dIl -saV -uFO -swP -rJB +aak +aak +aae +aak +aae +aae +aak +aak +aak aae +aak aae aae aae aae aae +aak +aae aae aae aae @@ -39115,21 +39440,21 @@ aaa "} (38,1,1) = {" aaa -rJB -mVz -cHj -mVz -cHj -mVz -cHj -mVz -gZX -gRk -nOS -rJB +aae +aak +aae +aak +aae +aak +aak +aak aae aae +aak aae +aak +aak +aak aae aae aae @@ -39372,27 +39697,27 @@ aaa "} (39,1,1) = {" aaa -nDW -bzD -bzD -bzD -bzD -bzD -bzD -bzD -bON -gRk -gRk -rJB aae aae aae aae aae +aak +aak +aak +aak +aak +aak aae aak aae aae +aak +aak +aak +aak +aae +aae aae aae aae @@ -39629,26 +39954,26 @@ aaa "} (40,1,1) = {" aaa -nDW -bzD -bzD -bzD -bzD -bzD -bzD -bzD -bON -gRk -gRk -rJB -rJB -rJB -rJB -rJB -rJB +aak +aak +aak +aae +aae +aae +aae +aae +aae +aae +aak aae aak aae +aak +aak +aak +aak +aak +aae aae aaa aae @@ -39886,27 +40211,27 @@ aaa "} (41,1,1) = {" aaa -rJB -mVz -cHj -mVz -cHj -mVz -cHj -mVz -oGV -gRk -nOS -rJB -uxw -bzD -vaz -dIl -rJB +aak +aae +aae +aae +aak +aae +aak aae aak aae aae +aae +aae +aae +aak +aak +aak +aak +aak +aae +aae aaa aae aae @@ -40143,23 +40468,23 @@ aaa "} (42,1,1) = {" aaa -rJB -dIl -qFM -dIl -bzD -dIl -qFM -dIl -saV -gRk -gRk -rJB -uiP -tRD -bzD -mVz -rJB +aae +aae +aak +aak +aae +aae +aak +aae +aak +aak +aak +aak +aae +aae +aae +aae +aae aae aak aae @@ -40400,25 +40725,25 @@ aaa "} (43,1,1) = {" aaa -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -oBe -rJB -rJB -bzD -bzD -bzD -bzD -rJB aae aae +aak +aae +aak +aae +aae +aak +aak +aak +aae +aae +aae +aak +aae +aak +aae +aak +aae aae aae aae @@ -40657,25 +40982,25 @@ aaa "} (44,1,1) = {" aaa -rJB -kFC -nKz -hkc -rJB -aJb -aJb -rJB -eju -gRk -gRk -rJB -xAo -bzD -xos -vMn -rJB aae aae +aak +aae +aak +aak +aak +aae +aae +aae +aae +aak +aak +aae +aae +aak +aae +aak +aae aae aae aae @@ -40914,28 +41239,28 @@ aaa "} (45,1,1) = {" aaa -rJB -qdZ -uAE -hkc -rJB -ucK -ucK -rJB -ctk -gRk -gRk -bOV -bzD -bzD -oie -dLW -rJB +aak aae aae aae aae aae +aak +aak +aae +aae +aae +aak +aae +aak +aae +aae +aak +aak +aae +aae +aae +aae aae aae aae @@ -41171,27 +41496,27 @@ aaa "} (46,1,1) = {" aaa -rJB -qdZ -nKz -hkc -rJB -gRk -gRk -rJB -qeX -gRk -gRk -rJB -bzD -bzD -att -tpF -rJB aae aae aae aae +aak +aak +aae +aak +aak +aae +aae +aak +aae +aak +aak +aak +aae +aak +aae +aae +aae aae aae aae @@ -41428,27 +41753,27 @@ aaa "} (47,1,1) = {" aaa -rJB -oWz -oWz -oWz -rJB -gMh -gRk -rJB -rJB -gRk -nOS -rJB -rJB -rJB -rJB -rJB -rJB aae aae aak aak +aak +aae +aak +aae +aak +aae +aae +aae +aae +aae +aae +aak +aak +aak +aae +aak +aak aae aae aae @@ -41685,23 +42010,13 @@ aaa "} (48,1,1) = {" aaa -rJB -nKz -nKz -nKz -rJB -gRk -gRk -gRk -gRk -gRk -gRk -rJB -aHM -aHM -nCi -bPc -rJB +aak +aak +aae +aak +aae +aae +aae aae aae aak @@ -41709,6 +42024,16 @@ aae aae aae aak +aak +aae +aak +aak +aae +aak +aae +aae +aae +aak aae aak aaa @@ -41942,28 +42267,28 @@ aaa "} (49,1,1) = {" aaa -rJB -kdB -nKz -nKz -aKO -gRk -gRk -gRk -gRk -gRk -gRk -nyJ -bzD -bzD -rbF -bne -rJB +aak +aae +aae +aak +aae +aak +aak +aak +aae +aae +aae aae aae aak aae aae +aae +aak +aae +aak +aae +aae aak aae aae @@ -42199,23 +42524,23 @@ aaa "} (50,1,1) = {" aaa -rJB -eBS -eBS -eBS -rJB -qbj -sze -dSo -rJB -gRk -gRk -rJB -xAo -bzD -nCi -lkE -rJB +aak +aak +aak +aak +aae +aak +aae +aae +aak +aak +aak +aak +aae +aae +aae +aae +aak aae aae aak @@ -42456,23 +42781,23 @@ aaa "} (51,1,1) = {" aaa -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -oBe -rJB -rJB -bzD -bzD -bzD -crR -rJB +aae +aae +aae +aak +aae +aak +aae +aak +aak +aak +aak +aak +aak +aae +aak +aae +aak aae aae aae @@ -42713,28 +43038,28 @@ aaa "} (52,1,1) = {" aaa -rJB -dIl -vaz -dIl -bzD -dIl -vaz -dIl -saV -gRk -gRk -rJB -ljU -xwL -bzD -beQ -rJB +aae +aak +aae aae aae aae aae aak +aak +aak +aae +aak +aae +aae +aae +aae +aae +aak +aae +aae +aae +aak aae aae aae @@ -42970,23 +43295,23 @@ aaa "} (53,1,1) = {" aaa -rJB -jtP -lcq -jtP -uMO -jtP -lcq -jtP -gZX -gRk -nOS -rJB -qYb -qFM -bzD -qSe -rJB +aak +aak +aak +aak +aak +aae +aae +aae +aae +aae +aae +aak +aae +aak +aak +aak +aae aae aae aae @@ -43227,24 +43552,24 @@ aaa "} (54,1,1) = {" aaa -nDW -bzD -bzD -bzD -bzD -bzD -bzD -bzD -bON -gRk -gRk -rJB -rJB -rJB -qba -rJB -rJB +aak +aak +aak +aae +aae +aae +aak +aae +aak aae +aak +aak +aae +aak +aae +aae +aak +aak aae aae aae @@ -43484,24 +43809,24 @@ aaa "} (55,1,1) = {" aaa -nDW -bzD -bzD -bzD -bzD -bzD -bzD -bzD -bON -gRk -gRk -rJB -uub -clD -bzD -oTq -rJB +aak +aae +aae aae +aak +aak +aae +aae +aak +aae +aae +aak +aae +aak +aae +aak +aak +aak aae aae aae @@ -43741,25 +44066,25 @@ aaa "} (56,1,1) = {" aaa -rJB -jtP -lcq -jtP -lcq -jtP -lcq -jtP -oGV -gRk -nOS -rJB -fdB -bzD -bzD -vWu -rJB +aak +aae aae aae +aak +aae +aak +aae +aae +aak +aae +aae +aae +aae +aae +aak +aak +aak +aae aae aae aae @@ -43998,23 +44323,23 @@ aaa "} (57,1,1) = {" aaa -rJB -dIl -qFM -dIl -bzD -dIl -qFM -dIl -saV -uFO -swP -rJB -rHD -qFM -nPP -vur -rJB +aak +aak +aae +aae +aak +aae +aak +aak +aak +aae +aak +aak +aak +aae +aae +aae +aae aae aae aae @@ -44255,23 +44580,23 @@ aaa "} (58,1,1) = {" aaa -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB -rJB +aak +aak +aak +aae +aae +aae +aae +aae +aak +aak +aak +aae +aae +aae +aak +aae +aak aae aae aae @@ -44518,17 +44843,17 @@ aae aae aae aae -aae +aak aak aae +aak aae aae aak aak -aak -aae aae aae +aak aae aae aae @@ -44775,6 +45100,7 @@ aae aae aae aae +aak aae aae aae @@ -44784,9 +45110,8 @@ aak aae aak aae -aak -aae aae +aak aae aae aae @@ -45032,17 +45357,17 @@ aae aak aae aae -aae -aae -aae -aae +aak +aak +aak aak aae aae +aak aae -aae -aae -aae +aak +aak +aak aae aae aae @@ -45289,15 +45614,16 @@ aae aae aae aae +aak +aak +aak +aak +aak aae aae aae aae -aak aae -aae -aak -aak aak aak aae @@ -45309,7 +45635,6 @@ aae aae aae aae -aae aak aae aae @@ -45546,9 +45871,8 @@ aae aae aae aae -aae -aae -aae +aak +aak aae aae aae @@ -45559,6 +45883,7 @@ aak aak aae aak +aak aae aae aak @@ -45811,10 +46136,10 @@ aae aae aae aae -aae -aak aak aae +aae +aae aak aae aak @@ -50299,11 +50624,11 @@ iCR iCR iCR iCR -aae -aae -aae -aae -aae +uub +uub +uub +uub +uub aak aak aak @@ -50552,15 +50877,15 @@ xhE dQp awC iCR -wZK -dQp +uMO +att aWk iCR -aae -aae -aae -aae -aae +aKO +wZK +wZK +qFM +uub aae aae aae @@ -50811,13 +51136,13 @@ wZK bOT wZK wZK -aWD +wZK iCR -aae -aak -aae -aae -aae +hkc +bnB +wZK +dSo +uub aae aae aak @@ -51068,13 +51393,13 @@ xgj xgj wZK wZK -dWQ +wZK iCR -aae -aae -aae -aak -aae +wZK +wZK +wZK +wZK +uub aae aae aak @@ -51321,17 +51646,17 @@ bOr bCt bki wZK +aHM +xgj wZK -bOT wZK wZK -ede iCR -aae -aae -aae -aak -aae +bON +oie +beQ +nCi +uub aak aak aak @@ -51576,19 +51901,19 @@ gGV gGV bOr bCt -bnB wZK wZK -xgj wZK +bOT wZK +aPz wZK iCR -aae -aak -aae -aae -aae +wZK +oie +swP +bzD +uub aae aae aae @@ -51834,18 +52159,18 @@ gGV bOr bCt ede -siE +wZK aGi xgj -eek +wZK aPz -eek -iCR -aae -aae -aae -aak -aak +wZK +bOT +wZK +vaz +aWD +gRk +uub aak aae aae @@ -52090,19 +52415,19 @@ ajF gGV bOr bCt -iCR -iCR -iCR -iCR -iCR -iCR -iCR -iCR -aae -aae -aae -aae -aae +xgj +uub +uub +uub +wZK +aPz +uub +uub +uub +uub +uub +uub +uub aae aae aak @@ -52347,19 +52672,19 @@ bJq bJq boU oYr -aae -aae -aak -aae -aae -aae -aak -aak -aae -aae -aae -aak -aak +bki +wZK +aHM +uub +wZK +wZK +iCR +aJb +wZK +jtP +aPz +jtP +uub aae aak aak @@ -52604,19 +52929,19 @@ bJq bJq vFL bCt -aae -aae -aae -aae -aak -aae -aae -aak -aak -aak -aak -aae -aae +wZK +wZK +aPz +bOT +aPz +wZK +iCR +dSo +wZK +kdB +aPz +kdB +uub aak aak aae @@ -52861,19 +53186,19 @@ bJq bJq bJq bCt -aae -aae -aae -aae -aae -aak -aae -aae -aae -aae -aae -aae -aak +qba +wZK +lcq +uub +aPz +aPz +uxw +aPz +eBS +aPz +eBS +aPz +uub aak aak aae @@ -53118,19 +53443,19 @@ bJq bJq bJq bCt -aae -aak -aae -aae -aae -aae -aae -aae -aae -aae -aak -aak -aae +uub +uub +uub +uub +wZK +aPz +uub +uub +uub +uub +uub +uub +uub aae aae aae @@ -53375,22 +53700,22 @@ bJq bJq bJq bsC +bki +aPz +aHM +uub +wZK +wZK +iCR +bki +aPz +aHM +uub aae aae aae aae aae -aak -aak -aae -aae -aae -aak -aak -aae -aae -aae -aae aae aae bsC @@ -53632,20 +53957,20 @@ bOm bOm bsC bsC +wZK +aPz +wZK +bOT +wZK +aPz +uxw +wZK +aPz +wZK +uub aae aae aae -aak -aae -aae -aae -aae -aak -aae -aak -aak -aae -aae aae aae aae @@ -53889,23 +54214,23 @@ bJq bJq bKb bsC +nDW +aPz +lcq +uub +aPz +aPz +uub +eek +aPz +lcq +uub aae aak aak aae aae aae -aak -aae -aae -aae -aak -aak -aak -aak -aae -aae -aae aae bsC bJq @@ -54146,21 +54471,21 @@ bJq bJq bKb bsC -aae -aae -aae -aae -aak -aae -aak -aae -aae -aae -aae -aae -aak -aae -aae +uub +uub +xgj +xgj +aPz +aPz +iCR +uub +uub +xgj +xgj +xgj +xgj +xgj +uub aae aae aae @@ -54403,21 +54728,21 @@ bJq bJq bQs bsC -aae -aae -aae -aae -aak -aae -aae -aak -aae -aae -aae -aae -aae -aak -aae +bki +wZK +aHM +uub +wZK +aPz +uub +nPP +qeX +ctk +gZX +gMh +gZX +nyJ +uub aae aae aae @@ -54660,21 +54985,21 @@ bJq bJq tNM bsC -aae -aae -aae -aae -aae -aae -aae -aak -aae -aae -aae -aae -aak -aae -aae +aPz +aPz +aPz +bOT +wZK +aPz +uxw +aPz +aPz +aPz +aPz +aPz +aPz +aPz +uub aae aae aae @@ -54917,21 +55242,21 @@ bJq bJq bQs bsC -aae -aae -aak -aak -aae -aae -aae -aak -aak -aae -aae -aae -aae -aak -aak +qSe +aPz +aGi +uub +vur +ucK +uub +aPz +aPz +wZK +wZK +wZK +wZK +wZK +uub aak aae aae @@ -55174,21 +55499,21 @@ bJq bJq bQs bsC -aae -aae -aak -aae -aae -aae -aak -aae -aae -aak -aae -aak -aak -aak -aae +iCR +uub +uub +iCR +iCR +iCR +uub +lkE +gZX +fdB +qeX +siE +qeX +nOS +uub aae aae aae @@ -55213,15 +55538,15 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +bCG +bCG +bCG +bCG +bCG +bCG +bCG +bCG bsC dHk fBV @@ -55437,15 +55762,15 @@ aae aae aak aak -aae -aae -aae -aae -aak -aae -aae -aae -aae +aar +iCR +uub +uub +uub +uub +uub +uub +uub aak aae aae @@ -55470,15 +55795,15 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +nAo +vPz +qry +sNc +qry +vPz +qry +bCG bsC dHk bJq @@ -55727,15 +56052,15 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +qnn +lfa +lfa +lfa +spa +lfa +sTn +bCG bsC knd bJq @@ -55984,15 +56309,15 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +cqn +wkd +wkd +lfa +sTn +lfa +fuq +bCG bsC dHk bJq @@ -56235,21 +56560,21 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +bCG +bCG +bCG +bCG +bCG +bCG +pxF +sGr +sGr +pxF +pNr +lfa +spa +bCG bsC dHk dHk @@ -56485,32 +56810,32 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -bsC +mPz +mPz +jzw +mPz +mPz +mPz +jzw +iZp +mPz +jzw +jzw +jzw +jzw +uId +nJK +nJK +nJK +nJK +pNr +lfa +sTn +bCG bsC bsC bsC +xUe bsC bsC bsC @@ -56741,33 +57066,33 @@ bsC aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +mPz +mPz +mPz +mPz +mPz +mPz +mPz +mPz +mPz +mPz +sTn +aFF +sTn +sTn +sTn +lqR +sTn +sTn +nJK +pNr +lfa +sTn +bCG +spa +spa +dEh +jGf aae aae aae @@ -56997,35 +57322,35 @@ dHk bsC aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +mPz +jzw +mPz +mPz +mPz +mPz +mPz +jzw +mPz +jzw +mPz +mPz +jzw +jzw +jzw +jzw +nJK +nJK +nJK +nJK +pNr +spa +sTn +bCG +spa +spa +cKI +cKI +uuL aae aae aae @@ -57254,39 +57579,39 @@ dHk bsC aae aae +mPz +mPz +mPz +jzw +mPz aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +bCG +bCG +bCG +bCG +bCG +bCG +fFM +sGr +sGr +fFM +pNr +spa +sTn +bCG +dqZ +spa +bCG +bCG +bCG +bCG +bCG +bCG +bCG bsC dHk bJq @@ -57510,6 +57835,11 @@ bJq dHk bsC aae +mPz +mPz +mPz +mPz +mPz aae aae aae @@ -57521,29 +57851,24 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +ykT +cyF +cyF +lfa +sTn +lfa +fuq +bCG +spa +spa +blb +ltw +dZt +hwG +atw +spa +bCG bsC dHk bJq @@ -57767,6 +58092,10 @@ bJq dHk bsC aae +mPz +mPz +mPz +mPz aae aae aae @@ -57779,28 +58108,24 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +qnn +lfa +lfa +spa +sTn +lfa +spa +bCG +spa +lfa +blb +sVN +jGK +sMt +sVN +koj +bCG bsC dHk bJq @@ -58024,6 +58349,9 @@ bJq dHk bsC aae +mPz +mPz +jzw aae aae aae @@ -58037,27 +58365,24 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +nAo +vPz +spa +spa +oik +xsF +qry +bCG +spa +lfa +blb +lio +eBh +sMt +eBh +gMG +bCG bsC dHk bJq @@ -58281,6 +58606,9 @@ bJq dHk bsC aae +jzw +mPz +mPz aae aae aae @@ -58294,27 +58622,24 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +bCG +bCG +tgz +tgz +bCG +bCG +bCG +bCG +dqZ +lfa +blb +spa +spa +spa +gMG +spa +bCG bsC dHk bJq @@ -58538,6 +58863,8 @@ bKb bKb bsC aae +mPz +mPz aae aae aae @@ -58554,24 +58881,22 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +spa +lfa +hSm +lfa +spa +hSm +spa +spa +spa +sMt +spa +spa +oKe +glN +bCG bsC dHk bJq @@ -58795,6 +59120,9 @@ bsC bHE bsC bCt +jzw +jzw +mPz aae aae aae @@ -58810,25 +59138,22 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +lfa +spa +spa +spa +lfa +lfa +lfa +lfa +blb +spa +spa +sMt +spa +vMg +bCG bsC dHk bJq @@ -59052,6 +59377,9 @@ bHw ceQ lNI bCt +mPz +mPz +mPz aae aae aae @@ -59067,25 +59395,22 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +hOr +bCG +hOr +bCG +jEa +bCG +jEa +bCG +bCG +bCG +spa +spa +xYV +ltw +bCG bsC dHk bJq @@ -59309,6 +59634,10 @@ ceQ ceQ ceQ bsC +bOr +bOr +jzw +aaA aae aae aae @@ -59323,26 +59652,22 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +qQU +bCG +qQU +bCG +qQU +bCG +qQU +bCG +bCG +bCG +dqZ +sMt +sVN +glN +bCG bsC dHk bJq @@ -59566,6 +59891,10 @@ ceQ ceQ bLy bsC +bOr +mPz +jzw +aaA aae aae aae @@ -59580,26 +59909,22 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +spa +hwG +spa +hwG +spa +hwG +spa +hwG +bCG +bCG +spa +spa +lio +vMg +bCG bsC dHk bJq @@ -59823,26 +60148,10 @@ bCt bCt pDq bCt +uJr +uJr +auQ xWV -xWV -jak -xWV -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae aae aae aae @@ -59857,6 +60166,22 @@ aae aae aae aae +bCG +spa +spa +spa +spa +spa +spa +spa +spa +spa +spa +sMt +sMt +spa +sMt +bCG bsC dHk bJq @@ -60098,22 +60423,22 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +bIr +kUO +npz +jmd +cub +iYS +iUj +fVD +bCG +bCG +njX +njX +njX +njX +bCG bsC wrx bOm @@ -60355,22 +60680,22 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +bCG +bCG +bCG +bCG +bCG +bCG +bCG +bCG +bCG +bCG +bCG +bCG +bCG +bCG +bCG +bCG bsC bJq bJq @@ -61094,7 +61419,7 @@ xWV ggp ggp xWV -dCJ +dLW xWV xWV xWV @@ -61350,7 +61675,7 @@ bPN xWV gCR vpg -lfa +mce duv xWV mce @@ -62123,7 +62448,7 @@ xWV xWV xWV xWV -bxo +xWV riC jxv xWV @@ -62379,8 +62704,8 @@ mdI bPN vyF xWV -gzS riC +bxo riC jIh xWV @@ -63410,7 +63735,7 @@ xWV uMN riC riC -dqZ +vpg xWV fCT riC @@ -63706,12 +64031,12 @@ aae aae aak aak -aak -aae -aae -aak -aae -aae +aar +tRD +jzw +jzw +bPc +aar aae bsC aah @@ -63963,12 +64288,12 @@ aae aae aae aae -aae -aae -aae -aak -aae -aae +aar +aar +jzw +jzw +oGV +aar aae bsC aah @@ -64220,12 +64545,12 @@ aae aae aae aae -aae -aae -aak -aae -aae -aae +aar +clD +jzw +jzw +oGV +aar aae bsC aah @@ -64477,12 +64802,12 @@ aak aak aak aae -aae -aak -aae -aae -aae -aae +aar +aar +vWu +ljU +aar +aar aae bsC aah @@ -64734,12 +65059,12 @@ aak aae aae aae -aae -aak -aae -aae -aae -aae +aar +clD +jzw +jzw +saV +aar aae bsC aah @@ -64991,12 +65316,12 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae +aar +aar +vWu +ljU +aar +aar aae bsC aah @@ -65248,12 +65573,12 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae +aar +clD +jzw +jzw +saV +aar aae bsC aah @@ -65505,12 +65830,12 @@ aae aae aae aae -aae -aae -aae -aae -aae -aae +bOn +bOn +cHj +bOn +bOn +aar aae bsC bGZ @@ -65762,11 +66087,11 @@ aae aae aae aae -aae -aae -aae -aae -aae +bOn +jzw +jzw +jzw +bOn aae aae bsC @@ -66019,11 +66344,11 @@ aae aae aae aae -aae -aae -aae -aae -aae +bOn +vWu +jzw +ljU +bOn aae aae bsC @@ -66276,11 +66601,11 @@ aae aae aae aae -aae -aae -aae -aae -aae +bOn +xAo +crR +jzw +bOn aae aae bsC diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm index dc976b4aed8..2d933872a18 100644 --- a/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm +++ b/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm @@ -69,14 +69,7 @@ }, /area/f13/building/massfusion) "acL" = ( -/obj/structure/table, -/obj/structure/closet/crate/large, -/obj/item/stack/ore/blackpowder/twenty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/five, -/obj/item/stack/sheet/hay/twenty, /obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/cloth/five, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ color = "#e4e4e4" }, @@ -104,15 +97,6 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/hospital) "adz" = ( -/obj/structure/closet/crate/secure/weapon, -/obj/item/ammo_box/magazine/m556/rifle, -/obj/item/ammo_box/magazine/m556/rifle, -/obj/item/ammo_box/magazine/m556/rifle, -/obj/item/ammo_box/magazine/m556/rifle, -/obj/item/ammo_box/magazine/m556/rifle, -/obj/item/ammo_box/magazine/m556/rifle, -/obj/item/ammo_box/magazine/m556/rifle, -/obj/item/ammo_box/magazine/m556/rifle, /obj/item/ammo_box/magazine/m556/rifle, /obj/effect/turf_decal/stripes/white/box, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, @@ -162,6 +146,10 @@ icon_state = "housewood3-broken" }, /area/f13/radiation) +"afi" = ( +/obj/structure/table/wood, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "afG" = ( /turf/open/floor/plating/tunnel, /area/f13/radiation) @@ -334,6 +322,13 @@ icon_state = "darkrusty" }, /area/f13/building/massfusion) +"auu" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ncr) "auH" = ( /obj/structure/curtain{ color = "#845f58" @@ -362,11 +357,8 @@ }, /area/f13/building/massfusion) "avO" = ( -/obj/structure/table, -/turf/open/floor/f13{ - icon_state = "darkdirtysolid" - }, -/area/f13/ncr) +/turf/closed/wall/f13/wood/house/broken, +/area/f13/city) "awU" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ @@ -425,15 +417,19 @@ /turf/open/floor/f13/wood, /area/f13/wasteland) "aDd" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, -/obj/effect/landmark/start/f13/ncrcaptain, -/turf/open/floor/wood_fancy, +/obj/structure/chair/folding{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "aFh" = ( /obj/structure/railing, /turf/closed/wall/r_wall, /area/f13/brotherhood/dorms) +"aFp" = ( +/turf/open/transparent/openspace, +/area/f13/building/powered) "aGE" = ( /obj/structure/window/fulltile/house{ dir = 2; @@ -441,7 +437,11 @@ }, /obj/structure/barricade/wooden/planks/pregame, /turf/closed/wall/f13/wood/house, -/area/f13/building) +/area/f13/building/powered) +"aGQ" = ( +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "aGW" = ( /obj/machinery/telecomms/relay/preset/telecomms, /turf/open/indestructible, @@ -490,6 +490,10 @@ /obj/item/melee/chainofcommand, /turf/open/floor/wood_common/wood_common_light, /area/f13/city) +"aLq" = ( +/obj/structure/fluff/hedge, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "aNm" = ( /obj/structure/chair/f13foldupchair, /turf/open/floor/plasteel/f13/vault_floor/dark, @@ -515,6 +519,37 @@ /obj/structure/table, /turf/open/floor/f13/wood, /area/f13/radiation) +"aPU" = ( +/obj/structure/fluff/railing{ + dir = 1 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = -11; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = -7; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 1; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 8; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 5; + density = 0 + }, +/turf/open/floor/plating/f13/outside/roof/wood/old, +/area/f13/wasteland) "aQp" = ( /obj/structure/chair/sofa/corp, /turf/open/floor/plasteel/f13/vault_floor/dark, @@ -635,6 +670,9 @@ icon_state = "rubblepillar" }, /area/f13/wasteland) +"aXU" = ( +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "aXX" = ( /obj/structure/obstacle/barbedwire/end{ dir = 8 @@ -648,6 +686,24 @@ }, /turf/open/floor/plating/rust, /area/f13/wasteland) +"aYk" = ( +/obj/structure/table/wood, +/obj/item/card/id/dogtag/town/ncr, +/obj/item/card/id/dogtag/town/ncr, +/obj/item/card/id/dogtag/town/ncr, +/obj/item/card/id/dogtag/town/ncr, +/obj/item/card/id/dogtag/town/ncr, +/obj/item/card/id/dogtag/town/ncr, +/obj/item/card/id/dogtag/town/ncr, +/obj/item/card/id/dogtag/ncrtrooper, +/obj/item/card/id/dogtag/ncrtrooper, +/obj/item/card/id/dogtag/ncrtrooper, +/obj/item/card/id/dogtag/ncrtrooper, +/obj/item/card/id/dogtag/ncrsergeant, +/obj/item/card/id/dogtag/ncrsergeant, +/obj/item/card/id/dogtag/ncrsergeant, +/turf/open/floor/f13/wood, +/area/f13/city) "aYm" = ( /obj/structure/bed/old, /obj/machinery/light/small{ @@ -721,6 +777,12 @@ }, /turf/closed/wall/rust, /area/f13/ncr) +"bdm" = ( +/obj/structure/fluff/railing{ + dir = 4 + }, +/turf/open/floor/plating/f13/outside/roof/wood/old, +/area/f13/wasteland) "bdJ" = ( /obj/structure/fluff/railing, /obj/structure/fluff/railing, @@ -728,7 +790,7 @@ /area/f13/wasteland) "bem" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "beC" = ( /obj/effect/overlay/junk/oldpipes, @@ -817,6 +879,10 @@ }, /turf/open/floor/f13/wood, /area/f13/wasteland) +"bhI" = ( +/obj/structure/window/fulltile/house, +/turf/closed/wall/f13/wood/house, +/area/f13/building/powered) "bim" = ( /obj/structure/railing/corner{ dir = 8 @@ -920,12 +986,10 @@ }, /area/f13/ncr) "boy" = ( -/obj/machinery/autolathe, -/obj/structure/sign/poster/official/twelve_gauge{ - pixel_x = -32 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/folding, +/turf/open/floor/f13/wood, +/area/f13/city) "boN" = ( /obj/structure/sign/poster/prewar/poster61, /turf/closed/wall/r_wall, @@ -940,11 +1004,11 @@ }, /area/f13/building) "bpp" = ( -/obj/structure/sign/poster/contraband/rip_badger{ - pixel_y = 32 +/obj/structure/fluff/railing{ + dir = 8 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) +/turf/open/floor/plating/f13/outside/roof/wood, +/area/f13/wasteland) "bpX" = ( /obj/structure/rack/shelf_metal, /obj/effect/spawner/lootdrop/f13/advcrafting, @@ -990,9 +1054,7 @@ /turf/open/floor/wood_common, /area/f13/city) "bty" = ( -/obj/structure/railing{ - dir = 4 - }, +/obj/machinery/door/unpowered/secure_NCR, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/wasteland) "buW" = ( @@ -1011,6 +1073,16 @@ /obj/structure/table, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) +"bwC" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/head/f13/ncr/ncr_flapcap, +/obj/item/clothing/under/f13/ncr/ncr_dress, +/obj/item/clothing/suit/armor/ncrarmor/ncr_dressjack, +/obj/item/clothing/under/f13/ncr/ncr_officer, +/obj/item/clothing/head/beret/ncr_codresscap, +/obj/item/clothing/head/beret/ncr, +/turf/open/floor/f13/wood, +/area/f13/city) "bxT" = ( /obj/structure/decoration/rag{ icon_state = "skin" @@ -1181,6 +1253,12 @@ "bFG" = ( /turf/open/floor/carpet/vault, /area/f13/city) +"bGk" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating/f13/outside/roof/wood/old, +/area/f13/wasteland) "bGG" = ( /turf/open/floor/carpet/arcade, /area/f13/city) @@ -1203,18 +1281,8 @@ }, /area/f13/building/massfusion) "bJV" = ( -/obj/structure/closet/crate/footlocker{ - anchored = 1; - density = 0 - }, -/obj/item/clothing/under/f13/ncr/ncr_dress, -/obj/item/clothing/under/f13/ncr/conscript, -/obj/item/clothing/under/f13/ncr, -/obj/item/clothing/suit/armor/ncrarmor/ncr_dressjack, -/obj/item/clothing/head/f13/ncr/ncr_flapcap, -/obj/item/clothing/head/f13/ncr/ncr_cap, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/ruins, +/area/f13/caves) "bJX" = ( /obj/machinery/microwave/stove, /turf/open/floor/f13{ @@ -1431,19 +1499,25 @@ }, /area/f13/wasteland) "bYH" = ( -/obj/structure/closet/crate/footlocker{ - anchored = 1; - density = 0 - }, /obj/item/clothing/under/f13/ncr/ncr_dress, /obj/item/clothing/under/f13/ncr/conscript, /obj/item/clothing/under/f13/ncr, /obj/item/clothing/suit/armor/ncrarmor/ncr_dressjack, /obj/item/clothing/head/f13/ncr/ncr_flapcap, /obj/item/clothing/head/f13/ncr/ncr_cap, -/obj/structure/railing, +/obj/item/clothing/accessory/ncr/CPL, +/obj/item/clothing/accessory/ncr/FSGT, +/obj/item/clothing/accessory/ncr/LT2, +/obj/item/clothing/accessory/ncr/MCPL, +/obj/item/clothing/accessory/ncr/REC, +/obj/item/clothing/accessory/ncr/SGT, +/obj/item/clothing/accessory/ncr/SPC, +/obj/item/clothing/accessory/ncr/SSGT, +/obj/item/clothing/accessory/ncr/TPR, +/obj/structure/closet/cabinet, +/obj/item/pda, /turf/open/floor/f13/wood, -/area/f13/ncr) +/area/f13/city) "bZG" = ( /obj/structure/chair/f13chair1{ dir = 8 @@ -1601,6 +1675,12 @@ icon_state = "darkrusty" }, /area/f13/building/massfusion) +"cmr" = ( +/obj/structure/window/fulltile/store{ + icon_state = "storewindowleft" + }, +/turf/open/floor/f13/wood, +/area/f13/city) "cng" = ( /obj/structure/noticeboard/captain{ desc = "The second Evidence Board shows a small amount of what looks to be crime scenes with corpses all connected to eachother."; @@ -1936,6 +2016,10 @@ icon_state = "whitedirtysolid" }, /area/f13/building/hospital) +"cJT" = ( +/obj/structure/bed/old, +/turf/open/floor/wood_wide, +/area/f13/city) "cJW" = ( /obj/machinery/light/small{ dir = 8 @@ -2007,6 +2091,17 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland/ncr) +"cRw" = ( +/obj/structure/railing/tg, +/obj/structure/closet/crate/footchest{ + anchored = 1; + can_be_unanchored = 1; + dir = 8 + }, +/turf/open/floor/f13/wood{ + icon_state = "housebase" + }, +/area/f13/city) "cSz" = ( /obj/structure/rack/shelf_metal, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, @@ -2022,14 +2117,14 @@ }, /area/f13/radiation) "cTy" = ( -/obj/structure/table, -/obj/machinery/computer/terminal{ - dir = 1; - pixel_y = 4 +/obj/structure/filingcabinet, +/obj/structure/filingcabinet{ + pixel_x = 10 }, -/turf/open/floor/f13{ - icon_state = "darkdirtysolid" +/obj/structure/filingcabinet{ + pixel_x = -10 }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "cTA" = ( /obj/machinery/light/small, @@ -2082,6 +2177,10 @@ /obj/structure/rack/shelf_wood, /turf/open/floor/f13/wood, /area/f13/radiation) +"cXj" = ( +/obj/structure/window/fulltile/wood, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "cXp" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowbrokenvertical" @@ -2118,7 +2217,7 @@ dir = 4 }, /turf/open/floor/wood_wide, -/area/f13/city) +/area/f13/wasteland) "cYT" = ( /obj/structure/table, /obj/item/paper/pamphlet{ @@ -2179,6 +2278,15 @@ /obj/effect/turf_decal/shadow/floor, /turf/open/floor/wood_fancy, /area/f13/legion) +"dbg" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/city) "dbF" = ( /obj/structure/lattice/catwalk, /turf/open/transparent/openspace, @@ -2369,6 +2477,11 @@ "dnE" = ( /turf/closed/wall/f13/tentwall, /area/f13/radiation) +"dnO" = ( +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/building/powered) "dnQ" = ( /obj/structure/flora/chomp/potplant1, /turf/open/floor/carpet/black, @@ -2396,11 +2509,11 @@ /turf/closed/wall/r_wall/rust, /area/f13/building/massfusion) "dpn" = ( -/obj/structure/table/wood/club, /obj/machinery/computer/terminal{ dir = 4; termtag = "Security" }, +/obj/structure/table, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/city) "dpP" = ( @@ -2449,6 +2562,12 @@ "dtb" = ( /turf/open/floor/f13/wood, /area/f13/wasteland) +"dvw" = ( +/obj/structure/railing/tg, +/turf/open/floor/f13/wood{ + icon_state = "housebase" + }, +/area/f13/city) "dwf" = ( /obj/structure/filingcabinet{ density = 0; @@ -2464,6 +2583,11 @@ icon_state = "neutralrustyfull" }, /area/f13/wasteland) +"dwh" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/turf/open/floor/wood_mosaic/wood_mosaic_dark, +/area/f13/city) "dwj" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -2478,7 +2602,7 @@ /area/f13/brotherhood/operations) "dwO" = ( /obj/structure/chair/folding, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "dAm" = ( /obj/structure/bed/wooden, @@ -2538,6 +2662,12 @@ /obj/machinery/light/floor, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/brotherhood/leisure) +"dFo" = ( +/obj/structure/fluff/railing{ + dir = 4 + }, +/turf/open/floor/plating/f13/outside/roof/wood, +/area/f13/wasteland) "dFB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/nest/protectron{ @@ -2603,6 +2733,15 @@ /obj/structure/railing/corner, /turf/open/transparent/openspace, /area/f13/wasteland) +"dLH" = ( +/obj/structure/window/fulltile/store{ + icon_state = "storewindowright" + }, +/obj/machinery/computer/card/ncr{ + dir = 4 + }, +/turf/open/floor/f13/wood, +/area/f13/wasteland) "dMj" = ( /obj/machinery/light{ dir = 8 @@ -2615,17 +2754,14 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) "dOh" = ( -/obj/structure/closet/locker/oldstyle{ - anchored = 1 +/obj/structure/reagent_dispensers/fueltank/vehicle_gas_station{ + icon_state = "vat"; + tank_volume = 1500; + name = "Gas Tank"; + color = "#FF0000" }, -/obj/item/clothing/head/f13/ncr/steelpot_med, -/obj/item/clothing/head/f13/ncr/steelpot_med, -/obj/item/storage/box/masks, -/obj/item/storage/box/gloves, -/obj/item/clothing/head/f13/ncr/steelpot_med, -/obj/item/clothing/head/f13/ncr/steelpot_med, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/turf/open/floor/plasteel/f13/vault_floor/floor, +/area/f13/wasteland) "dOw" = ( /obj/item/trash/candy, /obj/structure/lattice/catwalk, @@ -2684,6 +2820,18 @@ "dSy" = ( /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/brotherhood/dorms) +"dSJ" = ( +/obj/structure/barricade/tentclothedge{ + dir = 4 + }, +/turf/open/floor/wood_common, +/area/f13/city) +"dSN" = ( +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ncr) "dTc" = ( /turf/closed/wall/r_wall, /area/f13/ncr) @@ -2739,15 +2887,13 @@ /turf/open/floor/f13/wood, /area/f13/city) "dVT" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/suit/armor/ncrarmor/ncr_codressjack, -/obj/item/clothing/under/f13/ncr_formal_uniform, -/obj/item/clothing/under/f13/ncr_female_officer, -/obj/item/clothing/head/beret/ncr_codresscap, -/obj/item/clothing/under/f13/ncr/ncr_shorts, -/obj/item/clothing/shoes/f13/military/ncr_officer_boots, -/turf/open/floor/wood_fancy, -/area/f13/ncr) +/obj/structure/bed, +/obj/item/bedsheet/brown, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) +"dWu" = ( +/turf/closed/wall/f13/wood/house, +/area/f13/building/powered) "dWS" = ( /obj/structure/simple_door/metal/store, /obj/structure/barricade/wooden/planks/pregame, @@ -2805,7 +2951,7 @@ /turf/open/floor/plasteel/f13/vault_floor/red, /area/f13/brotherhood) "dZG" = ( -/obj/structure/table/wood/club, +/obj/structure/table/round, /obj/machinery/light/small{ dir = 1 }, @@ -2933,6 +3079,37 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +"ejx" = ( +/obj/structure/fluff/railing{ + dir = 1 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = -11; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = -7; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 1; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 5; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 8; + density = 0 + }, +/turf/open/floor/plating/f13/outside/roof/wood, +/area/f13/wasteland) "ejB" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall, @@ -2989,6 +3166,13 @@ icon_state = "floorrusty" }, /area/f13/wasteland) +"epY" = ( +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowbrokenvertical" + }, +/turf/closed/wall/f13/wood/house, +/area/f13/building/powered) "eqg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -3212,6 +3396,11 @@ }, /turf/open/floor/f13/wood, /area/f13/radiation) +"eIK" = ( +/turf/open/floor/f13/wood{ + icon_state = "housewood3-broken" + }, +/area/f13/building/powered) "eIR" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/dark, @@ -3486,9 +3675,8 @@ }, /area/f13/building/massfusion) "eZk" = ( -/obj/machinery/door/unpowered/secure_steeldoor{ - req_access_txt = "281"; - name = "security checkpoint" +/obj/machinery/door/unpowered/secure_NCR{ + req_access_txt = "281,121" }, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) @@ -3526,6 +3714,13 @@ icon_state = "floorrusty" }, /area/f13/wasteland) +"fcX" = ( +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowbroken" + }, +/turf/closed/wall/f13/wood/house, +/area/f13/building/powered) "fcZ" = ( /obj/item/storage/belt/utility{ pixel_y = 6 @@ -3597,6 +3792,12 @@ icon_state = "floorrusty" }, /area/f13/wasteland) +"ffz" = ( +/obj/structure/barricade/tentleatheredge{ + dir = 8 + }, +/turf/closed/wall/f13/wood/house, +/area/f13/city) "ffL" = ( /obj/machinery/seed_extractor, /turf/open/floor/wood_common, @@ -3646,6 +3847,12 @@ /obj/structure/railing, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/city) +"fil" = ( +/obj/structure/window/fulltile/store{ + icon_state = "storewindowvertical" + }, +/turf/open/floor/f13/wood, +/area/f13/city) "fiT" = ( /turf/closed/wall/f13/supermart, /area/f13/bunker) @@ -3677,6 +3884,11 @@ }, /turf/open/transparent/openspace, /area/f13/radiation) +"fmk" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/light/small, +/turf/open/floor/plasteel/f13/vault_floor/floor, +/area/f13/city) "fmJ" = ( /obj/machinery/workbench, /obj/machinery/light{ @@ -3755,6 +3967,18 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) +"ftB" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/head/f13/ncr/ncr_flapcap, +/obj/item/clothing/under/f13/ncr/ncr_dress, +/obj/item/clothing/suit/armor/ncrarmor/ncr_dressjack, +/obj/item/clothing/under/f13/ncr/ncr_officer, +/obj/item/clothing/head/beret/ncr_codresscap, +/obj/item/clothing/under/suit/white, +/obj/item/clothing/under/suit/burgundy, +/obj/item/clothing/under/suit/checkered, +/turf/open/floor/f13/wood, +/area/f13/city) "ftV" = ( /obj/structure/chair/comfy/purple{ dir = 1 @@ -3845,9 +4069,6 @@ dir = 8 }, /obj/item/kirbyplants/random, -/obj/structure/sign/poster/contraband/revolver{ - pixel_y = 32 - }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) "fEI" = ( @@ -3865,6 +4086,11 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +"fFF" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/light/small, +/turf/open/transparent/openspace, +/area/f13/city) "fFJ" = ( /obj/structure/chair/office/dark, /turf/open/floor/f13/wood{ @@ -3907,6 +4133,11 @@ "fKy" = ( /turf/open/floor/plating/f13/outside/roof/metal/corrugated/green, /area/f13/wasteland) +"fLy" = ( +/turf/open/floor/f13/wood{ + icon_state = "housewood1-broken" + }, +/area/f13/building/powered) "fNW" = ( /obj/structure/flora/grass/coyote/fourteen, /turf/open/indestructible/ground/inside/mountain, @@ -4160,13 +4391,9 @@ /turf/open/floor/f13/wood, /area/f13/wasteland) "gkO" = ( -/obj/structure/toilet{ - pixel_y = 7 - }, -/turf/open/floor/plasteel/f13{ - icon_state = "whitebluechess" - }, -/area/f13/ncr) +/obj/structure/rug/big/rug_fancy, +/turf/open/floor/f13/wood, +/area/f13/city) "gkT" = ( /turf/closed/wall/rust, /area/f13/ncr) @@ -4354,6 +4581,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +"gyo" = ( +/obj/structure/dresser, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "gzv" = ( /obj/structure/railing{ dir = 8 @@ -4472,6 +4703,10 @@ "gIm" = ( /turf/open/floor/wood_fancy, /area/f13/legion) +"gIw" = ( +/obj/item/storage/money_stack/ncr, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "gIz" = ( /obj/machinery/vending/snack, /turf/open/floor/f13{ @@ -4564,6 +4799,12 @@ /obj/effect/turf_decal/stripes/white/box, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) +"gOl" = ( +/obj/structure/window/fulltile/house{ + icon_state = "housewindowbroken" + }, +/turf/closed/wall/f13/wood/house, +/area/f13/building/powered) "gPM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -4635,6 +4876,12 @@ /obj/structure/wreck/trash/two_barrels, /turf/open/floor/f13/wood, /area/f13/wasteland) +"gVt" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/city) "gXb" = ( /obj/structure/railing/handrail/legion/underlayer{ dir = 1 @@ -4775,6 +5022,13 @@ }, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/wasteland) +"hgf" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/lattice, +/turf/open/transparent/openspace, +/area/f13/wasteland/ncr) "hgr" = ( /obj/item/storage/toolbox/electrical{ pixel_y = 6 @@ -4791,6 +5045,11 @@ name = "concrete wall" }, /area/f13/city) +"hhu" = ( +/obj/structure/lattice, +/obj/structure/lattice, +/turf/open/transparent/openspace, +/area/f13/ncr) "hhF" = ( /obj/structure/railing{ color = null; @@ -4821,7 +5080,16 @@ /obj/structure/railing{ dir = 8 }, -/turf/open/transparent/openspace, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/city) +"hkf" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/plating/f13/outside/roof/wood, /area/f13/wasteland) "hlz" = ( /obj/structure/closet/cabinet, @@ -4843,7 +5111,7 @@ /obj/structure/railing/corner{ dir = 4 }, -/turf/open/transparent/openspace, +/turf/open/floor/plating/f13/outside/roof/wood, /area/f13/wasteland) "hnb" = ( /obj/effect/decal/cleanable/dirt{ @@ -4865,6 +5133,12 @@ name = "concrete wall" }, /area/f13/ncr) +"hnz" = ( +/obj/structure/chair/sofa/left{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "hqx" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 1; @@ -4876,15 +5150,11 @@ /area/f13/radiation) "hqA" = ( /obj/structure/table, -/obj/machinery/computer/terminal{ - dir = 8; - termtag = "Business" - }, /obj/machinery/light{ dir = 4; light_color = "#c1caff" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "hrg" = ( /obj/structure/decoration/rag, @@ -4921,9 +5191,9 @@ /turf/open/floor/f13/wood, /area/f13/brotherhood/operations) "huB" = ( -/obj/structure/junk/arcade, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/structure/bed, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "huF" = ( /mob/living/simple_animal/hostile/raider/junker, /turf/open/floor/plasteel/f13{ @@ -5044,6 +5314,12 @@ "hDb" = ( /turf/open/floor/carpet/red, /area/f13/legion) +"hDi" = ( +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy" + }, +/turf/open/floor/plasteel/f13/vault_floor/dark, +/area/f13/wasteland/ncr) "hEP" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -5227,7 +5503,7 @@ desc = "A pre-War wall made of solid concrete."; name = "concrete wall" }, -/area/f13/city) +/area/f13/wasteland) "hUO" = ( /obj/machinery/light/small{ dir = 8; @@ -5256,6 +5532,10 @@ sunlight_state = 1 }, /area/f13/radiation) +"hXO" = ( +/obj/effect/mob_spawn/human/corpse/charredskeleton, +/turf/open/floor/wood_common, +/area/f13/city) "hYA" = ( /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/city) @@ -5301,10 +5581,8 @@ /area/f13/city) "idL" = ( /obj/machinery/autolathe/ammo/unlocked, -/obj/item/book/granter/crafting_recipe/gunsmith_one, -/obj/item/book/granter/crafting_recipe/gunsmith_three, -/obj/item/book/granter/crafting_recipe/gunsmith_two, /obj/item/stack/ore/blackpowder/twenty, +/obj/item/book/granter/crafting_recipe/gunsmith_four, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) "iel" = ( @@ -5344,6 +5622,10 @@ icon_state = "greendirtyfull" }, /area/f13/wasteland) +"ifD" = ( +/obj/structure/dresser, +/turf/open/floor/f13/wood, +/area/f13/city) "iga" = ( /obj/structure/rack/shelf_metal, /obj/effect/turf_decal/stripes/white/box, @@ -5568,10 +5850,9 @@ /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) "iuT" = ( -/obj/structure/table, -/obj/item/pda/heads/cmo, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) +/obj/structure/lattice, +/turf/open/transparent/openspace, +/area/f13/wasteland/ncr) "ivq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -5664,8 +5945,7 @@ /area/f13/legion) "iAB" = ( /obj/structure/rack/shelf_metal, -/obj/item/radio/headset/headset_town/commerce, -/obj/item/radio/headset/headset_town/commerce, +/obj/item/pda/heads/cmo, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/city) "iBQ" = ( @@ -5673,9 +5953,7 @@ dir = 8; pixel_x = -12 }, -/turf/open/floor/plasteel/f13{ - icon_state = "whitebluechess" - }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "iCa" = ( /obj/structure/kitchenspike, @@ -5728,6 +6006,9 @@ icon_state = "neutralrustyfull" }, /area/f13/wasteland) +"iET" = ( +/turf/closed/wall/rust, +/area/f13/wasteland) "iEW" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 1; @@ -5857,6 +6138,9 @@ sunlight_state = 1 }, /area/f13/building/hospital) +"iQE" = ( +/turf/open/floor/plating/rust, +/area/f13/city) "iQO" = ( /obj/structure/table/wood/poker, /obj/item/storage/box/dice{ @@ -5885,6 +6169,10 @@ /obj/machinery/light/small, /turf/open/transparent/openspace, /area/f13/wasteland) +"iSw" = ( +/obj/structure/window/fulltile/house, +/turf/open/floor/plating/f13/outside/roof/wood/old, +/area/f13/city) "iSG" = ( /obj/structure/table, /obj/effect/spawner/bundle/f13/greasegun, @@ -5954,6 +6242,12 @@ /obj/structure/dresser, /turf/open/floor/f13/wood, /area/f13/building) +"iXR" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/effect/landmark/start/f13/ncrcaptain, +/turf/open/floor/f13/wood, +/area/f13/city) "iYk" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/dark, @@ -5998,6 +6292,11 @@ /obj/machinery/photocopier, /turf/open/floor/carpet/red, /area/f13/city) +"jdy" = ( +/obj/structure/shelf_wood, +/obj/item/pda, +/turf/open/floor/f13/wood, +/area/f13/city) "jdQ" = ( /obj/structure/window/reinforced/fulltile, /obj/structure/barricade/bars, @@ -6091,7 +6390,6 @@ "jiS" = ( /obj/structure/bed, /obj/item/bedsheet/brown, -/obj/effect/landmark/start/f13/ncrlieutenant, /turf/open/floor/wood_fancy, /area/f13/ncr) "jiT" = ( @@ -6099,6 +6397,12 @@ /obj/structure/simple_door/repaired, /turf/open/floor/f13/wood, /area/f13/radiation) +"jiU" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/closed/wall/f13/wood/house, +/area/f13/city) "jjC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ @@ -6130,7 +6434,7 @@ /obj/structure/chair/folding{ dir = 4 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "jnz" = ( /obj/structure/chair/wood{ @@ -6151,6 +6455,12 @@ /obj/machinery/sheetifier, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) +"joO" = ( +/obj/structure/guncase, +/obj/item/gun/energy/laser/complianceregulator, +/obj/item/gun/energy/laser/complianceregulator, +/turf/open/floor/f13/wood, +/area/f13/city) "jpj" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -6259,11 +6569,11 @@ /turf/open/transparent/openspace, /area/f13/wasteland) "jxp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/stack/medical/bruise_pack/one, -/obj/item/stack/medical/ointment, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/obj/structure/fence/handrail{ + density = 0; + pixel_y = 16 + }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "jxw" = ( /turf/closed/wall/f13/supermart, @@ -6307,7 +6617,10 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/cmo, /area/f13/ncr) "jzy" = ( -/turf/closed/wall/f13/tentwall, +/obj/structure/barricade/tentclothedge{ + dir = 8 + }, +/turf/open/floor/plating/f13/outside/roof/wood, /area/f13/city) "jAm" = ( /obj/structure/railing{ @@ -6321,11 +6634,9 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/wasteland) "jAE" = ( -/obj/structure/chair/folding{ - dir = 4 - }, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/effect/landmark/start/f13/ncrcolonel, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "jCY" = ( /obj/structure/table, /obj/item/toy/cards/deck, @@ -6337,6 +6648,11 @@ /obj/effect/turf_decal/shadow/floor, /turf/open/floor/wood_fancy, /area/f13/legion) +"jDN" = ( +/obj/structure/table, +/obj/structure/table/wood, +/turf/open/floor/f13/wood, +/area/f13/city) "jDW" = ( /obj/structure/decoration/rag, /obj/structure/decoration/rag{ @@ -6396,9 +6712,13 @@ /turf/open/floor/f13/wood, /area/f13/radiation) "jJY" = ( -/obj/mecha/working/normalvehicle/vertibird/ncr/loaded, -/turf/open/floor/f13, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland/ncr) +"jKW" = ( +/obj/structure/displaycase/trophy, +/obj/item/reagent_containers/food/drinks/trophy/gold_cup, +/turf/open/floor/f13/wood, +/area/f13/city) "jLE" = ( /obj/machinery/autolathe/ammo/unlocked_basic, /turf/open/floor/f13{ @@ -6540,13 +6860,9 @@ /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) "jST" = ( -/obj/structure/dresser, -/obj/item/kirbyplants{ - icon_state = "plant-17"; - pixel_y = 22 - }, -/turf/open/floor/wood_fancy, -/area/f13/ncr) +/obj/structure/chair/comfy/brown, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "jUd" = ( /turf/open/floor/f13{ icon_state = "darkrusty" @@ -6619,6 +6935,12 @@ }, /turf/open/transparent/openspace, /area/f13/legion) +"jZy" = ( +/obj/machinery/msgterminal/ncr{ + dir = 1 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "jZB" = ( /obj/structure/window/fulltile/ruins{ icon_state = "ruinswindowbroken" @@ -6831,6 +7153,12 @@ icon_state = "hydrofloor" }, /area/f13/building) +"knF" = ( +/obj/structure/window/fulltile/store{ + icon_state = "storewindowtop" + }, +/turf/open/floor/f13/wood, +/area/f13/city) "kpG" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -6949,6 +7277,9 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"kxc" = ( +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "kxx" = ( /obj/structure/window/fulltile/store{ icon_state = "storewindowbottom" @@ -7004,8 +7335,17 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) +"kDt" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/f13/city) "kDw" = ( /obj/structure/chair/sofa/corp/corner{ dir = 4 @@ -7030,11 +7370,16 @@ /turf/open/floor/wood_fancy, /area/f13/legion) "kFz" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/structure/filingcabinet/chestdrawer, +/obj/item/megaphone, /turf/open/floor/f13/wood, +/area/f13/city) +"kFL" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "kFS" = ( /obj/structure/table/wood/poker, @@ -7616,6 +7961,12 @@ icon_state = "floorrusty" }, /area/f13/wasteland) +"lsS" = ( +/obj/structure/bed/old, +/turf/open/floor/f13/wood{ + icon_state = "housewood3-broken" + }, +/area/f13/city) "lta" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, @@ -7862,7 +8213,7 @@ /obj/structure/railing/corner{ dir = 1 }, -/turf/open/transparent/openspace, +/turf/open/floor/plating/f13/outside/roof/wood, /area/f13/wasteland) "lSw" = ( /turf/closed/indestructible/rock{ @@ -7893,15 +8244,11 @@ /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) "lTP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/machinery/computer/terminal{ - dir = 4; - doc_content_1 = "I'd like to report a crime happening at your house, Officer Mack. Your house is about to burn for the crimes you committed against the People's Republic of China! I hope your sleeping family wakes up in time.. GLORY TO CHINA."; - doc_title_1 = "Crime Report." +/obj/machinery/light/small{ + dir = 8 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "lUm" = ( /obj/structure/table, /obj/structure/bedsheetbin/towel, @@ -7933,6 +8280,10 @@ icon_state = "housewood2-broken" }, /area/f13/brotherhood/leisure) +"lYb" = ( +/obj/structure/rug/big/rug_fancy, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ncr) "lYF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/gibs/down{ @@ -8075,6 +8426,12 @@ icon_state = "bluedirtychess2" }, /area/f13/building) +"mhP" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/closed/wall/f13/wood/house, +/area/f13/city) "mhV" = ( /obj/structure/rack/shelf_metal{ dir = 4 @@ -8088,6 +8445,14 @@ /obj/machinery/autolathe, /turf/open/floor/f13/wood, /area/f13/building) +"miw" = ( +/obj/structure/table/wood, +/obj/item/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/obj/item/pda, +/turf/open/floor/f13/wood, +/area/f13/city) "miU" = ( /obj/structure/rack, /turf/open/floor/f13{ @@ -8310,6 +8675,12 @@ icon_state = "whitedirtysolid" }, /area/f13/building/hospital) +"mwF" = ( +/obj/structure/window/fulltile/store{ + icon_state = "storewindowright" + }, +/turf/open/floor/f13/wood, +/area/f13/city) "mwU" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -8406,6 +8777,14 @@ icon_state = "floorrusty" }, /area/f13/wasteland) +"mGl" = ( +/obj/machinery/button/door{ + id = "ncrgate2"; + name = "air gate button" + }, +/obj/structure/table, +/turf/open/floor/plasteel/f13/vault_floor/floor, +/area/f13/wasteland) "mGE" = ( /obj/structure/lattice/catwalk, /obj/structure/ladder/unbreakable{ @@ -8424,15 +8803,29 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/city) +"mHQ" = ( +/obj/structure/window/fulltile/house{ + icon_state = "housewindowvertical" + }, +/turf/open/floor/plating/f13/outside/roof/wood/old, +/area/f13/city) "mIV" = ( -/obj/structure/table, /obj/machinery/light, -/obj/machinery/button/door{ - id = "ncrgate2"; - name = "air gate button" - }, /turf/open/floor/engine, /area/f13/ncr) +"mJd" = ( +/obj/structure/filingcabinet, +/obj/structure/filingcabinet{ + pixel_x = 10 + }, +/obj/structure/filingcabinet{ + pixel_x = -10 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "mJq" = ( /obj/machinery/light{ dir = 4 @@ -8501,9 +8894,10 @@ /turf/open/floor/f13/wood, /area/f13/building) "mRl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/obj/structure/barricade/bars, +/turf/open/floor/f13{ + icon_state = "darkdirtysolid" + }, /area/f13/ncr) "mRG" = ( /obj/structure/railing/handrail/legion/underlayer{ @@ -8623,6 +9017,10 @@ /obj/structure/chair/wood, /turf/open/floor/f13/wood, /area/f13/building) +"mXq" = ( +/obj/structure/table/wood, +/turf/open/floor/f13/wood, +/area/f13/city) "mXr" = ( /obj/structure/table, /obj/item/restraints/legcuffs/bola{ @@ -8720,6 +9118,11 @@ /obj/item/clothing/head/cowboyhat/black, /turf/open/floor/wood_wide, /area/f13/city) +"ncx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ncr) "ncX" = ( /obj/structure/wreck/trash/machinepiletwo, /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid{ @@ -8791,6 +9194,10 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/brotherhood/rnd) +"nic" = ( +/obj/structure/window/fulltile/wood, +/turf/open/floor/wood_common, +/area/f13/city) "njD" = ( /obj/structure/chair/f13chair2{ dir = 8 @@ -8816,16 +9223,12 @@ /turf/closed/wall, /area/f13/city) "nkH" = ( -/obj/structure/sign/poster/ncr/irradiated_food{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1; - light_color = "#e8eaff" +/obj/structure/railing/tg{ + dir = 4 }, -/obj/structure/rack/shelf_metal, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) +/obj/structure/fluff/hedge, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "nkX" = ( /obj/structure/barricade/wooden, /turf/open/floor/wood_common, @@ -9099,6 +9502,7 @@ "nBi" = ( /obj/structure/bed, /obj/item/bedsheet/chameleon, +/obj/effect/landmark/start/f13/ncrmedofficer, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/city) "nBq" = ( @@ -9136,6 +9540,13 @@ "nCS" = ( /turf/open/indestructible/ground/outside/dirt, /area/f13/building) +"nDC" = ( +/obj/structure/table/wood, +/obj/machinery/computer/terminal{ + pixel_y = 5 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "nDE" = ( /turf/open/floor/carpet/green, /area/f13/city) @@ -9163,11 +9574,9 @@ /turf/open/floor/plasteel/f13/vault_floor/dark, /area/f13/wasteland) "nGC" = ( -/obj/structure/chair/folding{ - dir = 1 - }, +/obj/structure/window/fulltile/store, /turf/open/floor/f13/wood, -/area/f13/ncr) +/area/f13/wasteland) "nHD" = ( /obj/item/kirbyplants/random, /turf/open/floor/f13{ @@ -9252,6 +9661,12 @@ }, /turf/open/floor/f13/wood, /area/f13/radiation) +"nLD" = ( +/obj/structure/window/fulltile/house{ + icon_state = "housewindowbrokenvertical" + }, +/turf/closed/wall/f13/wood/house, +/area/f13/building/powered) "nLV" = ( /obj/structure/railing{ dir = 8 @@ -9474,12 +9889,14 @@ }, /area/f13/wasteland) "nZe" = ( -/obj/machinery/door/poddoor/gate/preopen{ - id = "ncrgate2"; - name = "outpost gate" +/obj/structure/barricade/bars, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "ncrarmory"; + layer = 11; + name = "NCR Armory shutters" }, -/turf/open/transparent/openspace, -/area/f13/wasteland/ncr) +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ncr) "nZH" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -9679,6 +10096,12 @@ icon_state = "darkrusty" }, /area/f13/building/massfusion) +"onS" = ( +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, +/obj/structure/rack/shelf_metal, +/turf/open/floor/f13/wood, +/area/f13/city) "onW" = ( /obj/structure/fence/wooden{ dir = 4; @@ -9754,9 +10177,10 @@ /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland) "otf" = ( -/obj/mecha/working/normalvehicle/vertibird/loaded, -/turf/open/floor/plasteel/airless/white, -/area/f13/wasteland) +/turf/open/floor/f13/wood{ + icon_state = "housebase" + }, +/area/f13/building/powered) "otL" = ( /obj/machinery/light/small, /turf/open/floor/f13/wood{ @@ -9822,18 +10246,8 @@ }, /area/f13/brotherhood/operations) "oBn" = ( -/obj/structure/rack/shelf_metal, /obj/effect/turf_decal/stripes/white/box, -/obj/item/radio/headset/headset_ncr, -/obj/item/radio/headset/headset_ncr, -/obj/item/radio/headset/headset_ncr, -/obj/item/radio/headset/headset_ncr, -/obj/item/radio/headset/headset_ncr, -/obj/item/radio/headset/headset_ncr, -/obj/item/radio/headset/headset_ncr, -/obj/item/radio/headset/headset_ncr, -/obj/item/radio/headset/headset_ncr, -/obj/item/radio/headset/headset_ncr, +/obj/structure/rack/shelf_metal, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) "oDl" = ( @@ -10041,6 +10455,10 @@ /obj/structure/barricade/wooden, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +"oVG" = ( +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/f13/wood, +/area/f13/city) "oVR" = ( /obj/structure/closet/cardboard, /obj/effect/decal/cleanable/dirt, @@ -10092,20 +10510,21 @@ /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) "oXG" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/suit/armor/ncrarmor/ncr_codressjack, -/obj/item/clothing/head/beret/ncr_codresscap, -/obj/item/clothing/under/f13/ncr/ncr_shorts, -/obj/item/clothing/under/f13/ncr/ncr_dress, -/obj/item/clothing/shoes/f13/military/ncr_officer_boots, -/turf/open/floor/wood_fancy, -/area/f13/ncr) +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrmp, +/turf/open/floor/f13/wood, +/area/f13/city) "oYD" = ( /obj/machinery/light/small{ dir = 8 }, /turf/open/floor/plasteel/whiteblue, /area/f13/city) +"oYS" = ( +/obj/structure/table/wood, +/obj/item/storage/box/handcuffs, +/turf/open/floor/f13/wood, +/area/f13/city) "oYZ" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -10211,6 +10630,10 @@ icon_state = "darkrusty" }, /area/f13/wasteland) +"ped" = ( +/obj/structure/fluff/hedge, +/turf/open/floor/f13/wood, +/area/f13/city) "peq" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8; @@ -10226,9 +10649,8 @@ /area/f13/legion) "peF" = ( /obj/structure/lattice/catwalk, -/obj/item/kirbyplants/random, -/turf/open/floor/plating/rust, -/area/f13/wasteland) +/turf/open/floor/plasteel/f13/vault_floor/floor, +/area/f13/city) "peZ" = ( /obj/structure/table/glass, /obj/item/binoculars, @@ -10345,6 +10767,12 @@ icon_state = "greendirtyfull" }, /area/f13/wasteland) +"poG" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/effect/landmark/start/f13/ncrlieutenant, +/turf/open/floor/f13/wood, +/area/f13/city) "poV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/cabinet/anchored, @@ -10357,11 +10785,9 @@ }, /area/f13/building) "pqG" = ( -/obj/structure/simple_door/room{ - name = "Captain Room" - }, -/turf/open/floor/wood_fancy, -/area/f13/ncr) +/obj/structure/lattice, +/turf/open/transparent/openspace, +/area/f13/wasteland) "psz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool{ @@ -10436,6 +10862,12 @@ }, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) +"pxl" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/turf/open/floor/f13/wood, +/area/f13/city) "pyS" = ( /obj/structure/sign/poster/official/foam_force_ad, /turf/closed/wall/f13/wood/house, @@ -10639,14 +11071,11 @@ }, /area/f13/wasteland) "pLl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 1; - pixel_x = 16 +/obj/structure/chair/folding{ + dir = 1 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) +/turf/open/floor/f13/wood, +/area/f13/city) "pLt" = ( /obj/structure/chair{ dir = 4 @@ -10662,7 +11091,7 @@ desc = "It opens and closes. This one looks heavily fortified"; id_tag = "MedbayFoyer"; name = "Clinic Director"; - req_access_txt = "281" + req_access_txt = "121" }, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/city) @@ -10673,6 +11102,15 @@ icon_state = "neutralrustyfull" }, /area/f13/wasteland) +"pOs" = ( +/obj/machinery/light{ + dir = 4 + }, +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy" + }, +/turf/open/floor/plasteel/f13/vault_floor/dark, +/area/f13/ncr) "pPv" = ( /obj/structure/railing/corner{ dir = 8 @@ -10815,6 +11253,10 @@ icon_state = "floorrusty" }, /area/f13/wasteland) +"qeU" = ( +/obj/structure/rug/big/rug_red, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "qfL" = ( /obj/structure/toilet{ pixel_y = 7 @@ -10870,14 +11312,33 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/cmo, /area/f13/ncr) +"qiG" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/plating/f13/outside/roof/wood/old, +/area/f13/wasteland) "qiW" = ( /turf/closed/wall/f13/tunnel, /area/f13/tunnel/southwest) +"qjo" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/plating/f13/outside/roof/wood, +/area/f13/wasteland) "qjp" = ( /obj/machinery/light/small, /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) +"qkh" = ( +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowvertical" + }, +/turf/closed/wall/f13/wood/house, +/area/f13/building/powered) "qkB" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -10946,7 +11407,7 @@ "qnZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/folding, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "qoB" = ( /obj/structure/table/reinforced, @@ -10980,6 +11441,16 @@ icon_state = "floorrusty" }, /area/f13/wasteland) +"qqg" = ( +/obj/structure/filingcabinet, +/obj/structure/filingcabinet{ + pixel_x = 10 + }, +/obj/structure/filingcabinet{ + pixel_x = -10 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "qqF" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/floor/wood_common, @@ -10996,6 +11467,8 @@ "qqU" = ( /obj/structure/closet/cabinet, /obj/item/reagent_containers/food/drinks/trophy/bronze_cup, +/obj/item/radio/headset/headset_town/mayor, +/obj/item/pda, /turf/open/floor/carpet/royalblack, /area/f13/city) "qsA" = ( @@ -11004,6 +11477,14 @@ }, /turf/open/transparent/openspace, /area/f13/radiation) +"qsL" = ( +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowvertical" + }, +/obj/structure/barricade/wooden/planks/pregame, +/turf/closed/wall/f13/wood/house, +/area/f13/building/powered) "qtF" = ( /obj/structure/railing{ dir = 4 @@ -11028,7 +11509,7 @@ /obj/structure/sign/departments/medbay{ pixel_x = 32 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/transparent/openspace, /area/f13/ncr) "qya" = ( /obj/structure/railing{ @@ -11189,6 +11670,10 @@ dir = 4 }, /area/f13/brotherhood) +"qKN" = ( +/obj/structure/lattice/catwalk, +/turf/open/transparent/openspace, +/area/f13/city) "qLd" = ( /turf/open/floor/f13/wood{ icon_state = "housewood2-broken" @@ -11216,6 +11701,11 @@ /obj/structure/filingcabinet, /turf/open/floor/carpet/royalblack, /area/f13/city) +"qNR" = ( +/obj/structure/shelf_wood, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/high, +/turf/open/floor/wood_fancy, +/area/f13/ncr) "qOm" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/royalblack, @@ -11395,16 +11885,16 @@ }, /turf/open/floor/plasteel/f13/vault_floor/red/side, /area/f13/brotherhood) -"rey" = ( -/obj/machinery/light{ - dir = 1; - light_color = "#e8eaff" - }, -/obj/structure/table, -/obj/machinery/computer/terminal{ - termtag = "Business" +"rei" = ( +/obj/machinery/light/small{ + dir = 8 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/obj/structure/chair/comfy/brown, +/turf/open/floor/wood_wide, +/area/f13/city) +"rey" = ( +/obj/structure/lattice, +/turf/open/transparent/openspace, /area/f13/ncr) "rgD" = ( /turf/open/floor/carpet, @@ -11436,6 +11926,10 @@ /obj/item/taperecorder, /turf/open/floor/wood_fancy, /area/f13/legion) +"rjq" = ( +/obj/structure/window/fulltile/store, +/turf/open/floor/f13/wood, +/area/f13/city) "rjs" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -11527,9 +12021,12 @@ /turf/open/floor/wood_common, /area/f13/wasteland) "rpR" = ( -/obj/structure/rug/big/rug_yellow, -/turf/open/floor/wood_fancy, -/area/f13/ncr) +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "ruinswindow" + }, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "rqa" = ( /obj/machinery/microwave/stove, /turf/open/floor/wood_fancy/wood_fancy_dark, @@ -11580,6 +12077,15 @@ "rwk" = ( /turf/closed/mineral/random/high_chance, /area/f13/caves) +"rxG" = ( +/obj/structure/chair/folding{ + dir = 1 + }, +/obj/structure/chair/folding{ + dir = 1 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "ryj" = ( /obj/structure/simple_door/metal/store{ name = "Chief's Office" @@ -11595,6 +12101,12 @@ icon_state = "greenrustychess" }, /area/f13/building/massfusion) +"rzA" = ( +/obj/structure/chair/folding{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "rzS" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -11651,6 +12163,12 @@ /obj/effect/landmark/start/f13/shopkeeper, /turf/open/floor/carpet/red, /area/f13/city) +"rBL" = ( +/obj/structure/bed/old, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/city) "rBR" = ( /obj/structure/barricade/bars, /obj/structure/window/reinforced/fulltile, @@ -11693,10 +12211,25 @@ /obj/item/pen/fountain, /turf/open/floor/carpet/green, /area/f13/city) +"rFW" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/barricade/tentclothedge{ + dir = 4 + }, +/turf/open/floor/wood_common, +/area/f13/city) "rGk" = ( /obj/machinery/jukebox/constructed, /turf/open/floor/f13/wood, /area/f13/brotherhood/leisure) +"rGv" = ( +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "rGU" = ( /obj/structure/window/fulltile/house{ icon_state = "storewindowhorizontal" @@ -11802,6 +12335,21 @@ }, /turf/open/floor/plating/rust, /area/f13/wasteland) +"rOk" = ( +/obj/structure/table, +/obj/machinery/computer/terminal{ + dir = 1; + termtag = "Secret" + }, +/obj/machinery/computer/terminal{ + dir = 1; + termtag = "Secret" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "rOr" = ( /obj/structure/filingcabinet, /obj/effect/decal/cleanable/dirt{ @@ -11837,10 +12385,9 @@ }, /area/f13/radiation) "rRp" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/window/fulltile/wood, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/city) "rRr" = ( /obj/structure/bookcase, /obj/item/book/manual/wiki/surgery, @@ -11876,6 +12423,12 @@ }, /turf/open/floor/f13/wood, /area/f13/city) +"rTm" = ( +/obj/structure/window/fulltile/store{ + icon_state = "storewindowleft" + }, +/turf/open/floor/f13/wood, +/area/f13/wasteland) "rUG" = ( /obj/structure/bed, /turf/open/floor/wood_wide, @@ -11935,13 +12488,16 @@ /obj/item/stack/medical/gauze, /obj/item/stack/medical/gauze, /obj/item/stack/medical/gauze/adv, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "rYQ" = ( /obj/structure/closet/cabinet, +/obj/item/radio/headset/headset_town/lawman, +/obj/item/radio/headset/headset_town/lawman, +/obj/item/radio/headset/headset_town/lawman, +/obj/item/radio/headset/headset_town/lawman, +/obj/item/radio/headset/headset_town/lawman, +/obj/item/pda, /turf/open/floor/carpet/red, /area/f13/city) "rZx" = ( @@ -11951,12 +12507,20 @@ /turf/open/floor/f13/wood, /area/f13/wasteland) "rZU" = ( -/obj/structure/sign/poster/prewar/poster60, -/turf/closed/wall/f13/store{ - desc = "A pre-War wall made of solid concrete."; - name = "concrete wall" - }, -/area/f13/ncr) +/obj/item/clothing/accessory/medal/silver/valor, +/obj/item/clothing/accessory/medal/silver/valor, +/obj/item/clothing/accessory/medal/silver/valor, +/obj/item/clothing/accessory/medal/silver/valor, +/obj/item/clothing/accessory/medal/gold/captain, +/obj/item/clothing/accessory/medal/gold/captain, +/obj/item/clothing/accessory/medal/gold/heroism, +/obj/item/clothing/accessory/medal/gold/heroism, +/obj/item/clothing/accessory/medal/bronze_heart, +/obj/item/clothing/accessory/medal/bronze_heart, +/obj/item/clothing/accessory/medal/bronze_heart, +/obj/structure/closet/secure_closet/personal/cabinet, +/turf/open/floor/f13/wood, +/area/f13/city) "sbB" = ( /obj/structure/table, /obj/item/reagent_containers/food/snacks/grown/poppy/lily{ @@ -12063,6 +12627,12 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/hospital) +"sht" = ( +/obj/structure/chair/sofa/luxury/left{ + dir = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "shL" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/f13/vault_floor/plating, @@ -12189,6 +12759,13 @@ /obj/structure/rug/big/rug_fancy, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) +"sqk" = ( +/obj/structure/table/wood, +/obj/machinery/computer/terminal{ + pixel_x = 5 + }, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "srw" = ( /obj/structure/rack, /obj/item/reagent_containers/glass/bucket/wood, @@ -12270,6 +12847,10 @@ /obj/structure/decoration/legion/chains, /turf/closed/wall/rust, /area/f13/legion) +"suc" = ( +/obj/structure/simple_door/room, +/turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, +/area/f13/city) "suj" = ( /obj/structure/rug/big/rug_fancy, /turf/open/floor/wood_fancy, @@ -12438,6 +13019,14 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/floor/f13/wood, /area/f13/caves) +"sFI" = ( +/obj/structure/guncase, +/obj/item/gun/ballistic/shotgun/police, +/obj/item/gun/ballistic/shotgun/police, +/obj/item/gun/ballistic/automatic/service, +/obj/item/gun/ballistic/automatic/service, +/turf/open/floor/f13/wood, +/area/f13/city) "sGc" = ( /turf/open/transparent/openspace, /area/f13/ncr) @@ -12450,6 +13039,10 @@ "sGU" = ( /turf/open/floor/plasteel/f13/vault_floor/dark, /area/f13/wasteland) +"sGY" = ( +/obj/structure/window/fulltile/wood, +/turf/open/floor/wood_mosaic/wood_mosaic_dark, +/area/f13/city) "sHx" = ( /obj/machinery/light{ dir = 4; @@ -12598,9 +13191,11 @@ }, /area/f13/building) "sPe" = ( -/obj/effect/landmark/start/f13/ncrlogisticsofficer, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/effect/landmark/start/f13/banker, +/turf/open/floor/f13/wood, +/area/f13/city) "sPB" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -12755,6 +13350,10 @@ icon_state = "greenrustychess" }, /area/f13/building/massfusion) +"sXF" = ( +/obj/structure/barricade/tentclothedge, +/turf/open/floor/f13/wood, +/area/f13/city) "sYM" = ( /obj/structure/chair/wood, /obj/structure/destructible/tribal_torch/wall/lit{ @@ -12872,23 +13471,37 @@ /turf/open/transparent/openspace, /area/f13/wasteland) "tfg" = ( -/obj/structure/rack/shelf_metal, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) +/obj/item/clothing/accessory/ncr/TPR, +/obj/item/clothing/accessory/ncr/TPR, +/obj/item/clothing/accessory/ncr/TPR, +/obj/item/clothing/accessory/ncr/TPR, +/obj/item/clothing/accessory/ncr/SPC, +/obj/item/clothing/accessory/ncr/SPC, +/obj/item/clothing/accessory/ncr/SPC, +/obj/item/clothing/accessory/ncr/SGT, +/obj/item/clothing/accessory/ncr/SGT, +/obj/item/clothing/accessory/ncr/REC, +/obj/item/clothing/accessory/ncr/REC, +/obj/item/clothing/accessory/ncr/REC, +/obj/item/clothing/accessory/ncr/REC, +/obj/item/clothing/accessory/ncr/MCPL, +/obj/item/clothing/accessory/ncr/MCPL, +/obj/item/clothing/accessory/ncr/MCPL, +/obj/item/clothing/accessory/ncr/SSGT, +/obj/item/clothing/accessory/ncr/SSGT, +/obj/item/clothing/accessory/ncr/FSGT, +/obj/item/clothing/accessory/ncr/CPL, +/obj/item/clothing/accessory/ncr/CPL, +/obj/item/clothing/accessory/ncr/CPL, +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/accessory/ncr/CPT, +/obj/item/clothing/accessory/ncr/LT1, +/obj/item/clothing/accessory/ncr/LT2, +/obj/item/clothing/accessory/ncr/LT2, +/obj/item/clothing/accessory/ncr/FSGT, +/obj/item/clothing/accessory/ncr/FSGT, +/turf/open/floor/f13/wood, +/area/f13/city) "tfy" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -12927,6 +13540,12 @@ sunlight_state = 1 }, /area/f13/radiation) +"tiL" = ( +/obj/structure/chair/folding{ + dir = 4 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "tiP" = ( /turf/open/floor/wood_fancy, /area/f13/ncr) @@ -12987,26 +13606,7 @@ /turf/open/floor/wood_fancy, /area/f13/legion) "tlO" = ( -/obj/structure/closet/crate/footlocker{ - anchored = 1; - density = 0 - }, -/obj/item/clothing/under/f13/ncr/ncr_dress, -/obj/item/clothing/under/f13/ncr/conscript, -/obj/item/clothing/under/f13/ncr, -/obj/item/clothing/suit/armor/ncrarmor/ncr_dressjack, -/obj/item/clothing/head/f13/ncr/ncr_flapcap, -/obj/item/clothing/head/f13/ncr/ncr_cap, -/obj/item/clothing/accessory/ncr/CPL, -/obj/item/clothing/accessory/ncr/FSGT, -/obj/item/clothing/accessory/ncr/LT2, -/obj/item/clothing/accessory/ncr/MCPL, -/obj/item/clothing/accessory/ncr/REC, -/obj/item/clothing/accessory/ncr/SGT, -/obj/item/clothing/accessory/ncr/SPC, -/obj/item/clothing/accessory/ncr/SSGT, -/obj/item/clothing/accessory/ncr/TPR, -/turf/open/floor/f13/wood, +/turf/open/indestructible/ground/outside/desert, /area/f13/ncr) "tmv" = ( /obj/structure/railing{ @@ -13085,6 +13685,11 @@ /obj/item/flashlight/lamp, /turf/open/floor/wood_fancy, /area/f13/legion) +"trf" = ( +/obj/structure/table/wood, +/obj/machinery/computer/card/ncr, +/turf/open/floor/f13/wood, +/area/f13/city) "trU" = ( /obj/structure/chair/booth{ icon_state = "booth_east_north" @@ -13178,9 +13783,8 @@ /turf/open/floor/carpet/green, /area/f13/city) "tyU" = ( -/obj/structure/table/wood/club, -/turf/open/floor/wood_fancy/wood_fancy_dark, -/area/f13/city) +/turf/open/floor/f13/wood, +/area/f13/building/powered) "tyV" = ( /obj/structure/chair/booth{ icon_state = "booth_west_north" @@ -13197,6 +13801,8 @@ /obj/structure/rack, /obj/item/gun/energy/laser/complianceregulator, /obj/item/gun/energy/laser/complianceregulator, +/obj/item/gun/energy/laser/complianceregulator, +/obj/item/gun/energy/laser/complianceregulator, /turf/open/floor/f13{ dir = 10; icon_state = "redmark" @@ -13209,9 +13815,25 @@ dir = 1 }, /area/f13/brotherhood) +"tAi" = ( +/obj/machinery/light/small{ + dir = 4; + light_color = "red" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "tAz" = ( -/obj/structure/railing, -/turf/closed/wall/f13/tentwall, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 8; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 5; + density = 0 + }, +/turf/open/transparent/openspace, /area/f13/city) "tAK" = ( /obj/structure/closet/crate/bin{ @@ -13221,6 +13843,16 @@ icon_state = "housewood2" }, /area/f13/building) +"tBe" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/wood_mosaic/wood_mosaic_dark, +/area/f13/city) +"tBt" = ( +/obj/structure/rug/big/rug_blue_shag, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "tBz" = ( /obj/structure/table/wood, /turf/open/floor/f13/wood, @@ -13232,9 +13864,12 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/wasteland) "tBZ" = ( -/obj/structure/simple_door/room, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) +/obj/structure/railing{ + layer = 4.1 + }, +/obj/structure/lattice, +/turf/open/transparent/openspace, +/area/f13/wasteland/ncr) "tCw" = ( /obj/structure/railing{ dir = 5 @@ -13284,6 +13919,8 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/item/radio/headset/headset_town/commerce, +/obj/item/radio/headset/headset_town/commerce, /turf/open/floor/carpet/red, /area/f13/city) "tHr" = ( @@ -13310,9 +13947,9 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/brotherhood/dorms) "tJR" = ( -/obj/machinery/door/unpowered/secure_NCR, -/turf/open/indestructible/ground/outside/roof, -/area/f13/wasteland/ncr) +/obj/structure/chair/office/dark, +/turf/open/floor/f13/wood, +/area/f13/city) "tKy" = ( /obj/structure/table, /obj/machinery/light/small{ @@ -13354,6 +13991,44 @@ icon_state = "housewood2-broken" }, /area/f13/radiation) +"tNu" = ( +/obj/structure/fluff/railing{ + dir = 1 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = -11; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = -7; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 1; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 5; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 8; + density = 0 + }, +/turf/open/floor/plating/f13/outside/roof/wood/old, +/area/f13/wasteland) +"tNZ" = ( +/obj/structure/table/wood, +/obj/machinery/radioterminal/ncr{ + dir = 1 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "tPa" = ( /obj/structure/fluff/railing{ dir = 4 @@ -13625,6 +14300,10 @@ /obj/machinery/camera, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/brotherhood) +"unY" = ( +/obj/structure/closet/cabinet, +/turf/open/floor/wood_mosaic/wood_mosaic_dark, +/area/f13/city) "uoa" = ( /obj/item/trash/candy{ pixel_x = 7; @@ -13693,6 +14372,11 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/brotherhood) +"uqX" = ( +/obj/structure/shelf_wood, +/obj/effect/spawner/lootdrop/f13/weapon/western, +/turf/open/floor/wood_fancy, +/area/f13/ncr) "uro" = ( /obj/structure/table/wood, /obj/item/lock_construct, @@ -13730,6 +14414,13 @@ /mob/living/simple_animal/hostile/ghoul, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) +"utd" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -3 + }, +/turf/closed/wall/f13/wood/house, +/area/f13/city) "uts" = ( /obj/structure/sign/legion/veteran, /turf/closed/wall/rust, @@ -13818,8 +14509,10 @@ /turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/brotherhood/rnd) "uCb" = ( -/obj/effect/landmark/start/f13/ncrmp, -/turf/open/floor/f13/wood, +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy" + }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "uCd" = ( /obj/structure/window/fulltile/house{ @@ -13835,9 +14528,7 @@ }, /area/f13/wasteland) "uEc" = ( -/turf/open/floor/plasteel/f13{ - icon_state = "whitebluechess" - }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "uEj" = ( /obj/vehicle/ridden/wheelchair{ @@ -13857,18 +14548,9 @@ }, /area/f13/building) "uFd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/machinery/computer/terminal{ - dir = 8; - termtag = "Business" - }, -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) +/obj/structure/lattice, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland) "uFT" = ( /obj/structure/decoration/rag, /obj/structure/fence/wooden{ @@ -13939,6 +14621,12 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/brotherhood/leisure) +"uLb" = ( +/obj/structure/railing/tg{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "uMb" = ( /obj/structure/railing/corner, /turf/open/transparent/openspace{ @@ -13957,6 +14645,10 @@ "uNh" = ( /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) +"uNu" = ( +/obj/structure/bed/old, +/turf/open/floor/f13/wood, +/area/f13/city) "uNA" = ( /obj/structure/sink{ pixel_y = 20 @@ -14072,6 +14764,10 @@ }, /turf/open/floor/f13/wood, /area/f13/city) +"uTp" = ( +/obj/structure/closet/cabinet, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/city) "uTv" = ( /obj/structure/simple_door/house, /obj/effect/decal/cleanable/blood/tracks, @@ -14127,12 +14823,25 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/brotherhood) +"uZE" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating/f13/outside/roof/wood, +/area/f13/wasteland) "uZG" = ( /obj/structure/railing{ dir = 5 }, /turf/open/transparent/openspace, /area/f13/ncr) +"uZR" = ( +/obj/structure/railing/tg, +/obj/structure/bed/old, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/city) "vas" = ( /obj/structure/destructible/tribal_torch/wall/lit, /obj/item/kirbyplants/random, @@ -14165,6 +14874,20 @@ /obj/item/weldingtool/crude, /turf/open/floor/wood_common, /area/f13/wasteland) +"vbz" = ( +/obj/structure/window/fulltile/wood, +/turf/open/floor/f13/wood{ + icon_state = "housewood4-broken" + }, +/area/f13/city) +"vbE" = ( +/obj/structure/rack/shelf_metal, +/obj/item/ammo_box/a556/rubber, +/obj/item/ammo_box/a556/rubber, +/obj/item/ammo_box/shotgun/bean, +/obj/item/ammo_box/shotgun/bean, +/turf/open/floor/f13/wood, +/area/f13/city) "vbL" = ( /obj/structure/barricade/bars, /obj/structure/window/reinforced/fulltile, @@ -14232,12 +14955,17 @@ "vje" = ( /turf/closed/wall/f13/tunnel, /area/f13/tunnel/northwest) +"vmu" = ( +/obj/structure/chair/sofa/luxury/right, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "vmF" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowbrokenvertical" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) +/turf/open/floor/plating/f13/outside/roof/wood/old, +/area/f13/city) "vmV" = ( /obj/structure/table, /turf/open/floor/f13{ @@ -14254,8 +14982,11 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/wasteland) "voK" = ( -/turf/open/indestructible/ground/outside/roof, -/area/f13/ncr) +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "vpi" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8; @@ -14323,9 +15054,6 @@ /area/f13/city) "vvI" = ( /obj/item/reagent_containers/jerrycan, -/obj/item/reagent_containers/jerrycan, -/obj/item/reagent_containers/jerrycan, -/obj/item/reagent_containers/jerrycan, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/wasteland) "vvS" = ( @@ -14349,6 +15077,17 @@ }, /turf/open/floor/carpet/green, /area/f13/city) +"vxV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/kirbyplants{ + icon_state = "plant-05" + }, +/obj/structure/table/wood, +/turf/open/floor/f13/wood, +/area/f13/city) "vyA" = ( /obj/structure/bed/pod, /obj/item/bedsheet/patriot, @@ -14394,6 +15133,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/wasteland) +"vCV" = ( +/obj/structure/curtain/stage, +/turf/open/floor/f13/wood, +/area/f13/city) "vDj" = ( /obj/structure/chair/office{ dir = 8 @@ -14510,13 +15253,10 @@ /turf/closed/mineral/random/low_chance, /area/f13/caves) "vLn" = ( -/obj/structure/table, -/obj/machinery/computer/terminal{ - dir = 8; - termtag = "Secret" - }, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/bed, +/obj/item/bedsheet/brown, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/city) "vLw" = ( /turf/closed/wall, /area/f13/city) @@ -14660,6 +15400,10 @@ /obj/structure/barricade/wooden/planks/pregame, /turf/open/floor/f13/wood, /area/f13/radiation) +"vYq" = ( +/obj/structure/table, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ncr) "vYs" = ( /obj/structure/chair/f13chair1{ dir = 8 @@ -14745,6 +15489,23 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +"weX" = ( +/obj/structure/window/fulltile/store{ + icon_state = "storewindowbottom" + }, +/turf/open/floor/f13/wood, +/area/f13/city) +"wgh" = ( +/obj/structure/rug/big/rug_fancy, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) +"wgt" = ( +/obj/structure/window/fulltile/house{ + icon_state = "housewindowbroken" + }, +/obj/structure/barricade/wooden/planks, +/turf/open/floor/wood_worn, +/area/f13/city) "whe" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -14800,6 +15561,21 @@ }, /turf/open/floor/carpet, /area/f13/brotherhood/leisure) +"wkr" = ( +/obj/structure/window/fulltile/house{ + icon_state = "housewindowbroken" + }, +/obj/structure/barricade/wooden/planks, +/turf/open/floor/f13/wood, +/area/f13/city) +"wkF" = ( +/obj/structure/table/wood, +/obj/machinery/computer/terminal{ + dir = 1; + termtag = "Secret" + }, +/turf/open/floor/f13/wood, +/area/f13/city) "wkJ" = ( /obj/structure/wreck/trash/machinepile, /turf/open/floor/f13/wood, @@ -14842,6 +15618,15 @@ }, /turf/open/floor/f13/wood, /area/f13/city) +"wpn" = ( +/obj/structure/window/fulltile/house, +/obj/structure/barricade/wooden/planks/pregame, +/turf/closed/wall/f13/wood/house, +/area/f13/building/powered) +"wpo" = ( +/obj/structure/chair/sofa/luxury/left, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "wqp" = ( /obj/structure/railing/handrail/legion/overlayer, /turf/open/floor/wood_fancy, @@ -14867,6 +15652,12 @@ /obj/structure/curtain, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) +"wst" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "wsA" = ( /obj/structure/railing{ dir = 8 @@ -14875,7 +15666,7 @@ dir = 4 }, /turf/open/floor/wood_wide, -/area/f13/city) +/area/f13/wasteland) "wtb" = ( /obj/structure/chair/sofa/left{ dir = 4 @@ -14897,11 +15688,15 @@ /turf/closed/wall/f13/wood/house, /area/f13/building) "wtL" = ( -/obj/effect/landmark/start/f13/ncrcombatmedic, -/obj/structure/bed, -/obj/item/bedsheet, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/terminal{ + dir = 4; + doc_content_1 = "I'd like to report a crime happening at your house, Officer Mack. Your house is about to burn for the crimes you committed against the People's Republic of China! I hope your sleeping family wakes up in time.. GLORY TO CHINA."; + doc_title_1 = "Crime Report." + }, +/obj/structure/table/wood, /turf/open/floor/f13/wood, -/area/f13/ncr) +/area/f13/city) "wuZ" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/dirt, @@ -14924,7 +15719,7 @@ "wvQ" = ( /obj/structure/lattice/catwalk, /turf/open/floor/plating/rust, -/area/f13/wasteland) +/area/f13/city) "wvW" = ( /turf/open/floor/carpet/red, /area/f13/city) @@ -15017,9 +15812,18 @@ /obj/structure/barricade/wooden, /turf/open/floor/f13/wood, /area/f13/building) +"wBX" = ( +/obj/mecha/combat/combatvehicle/vertibird/ncr, +/obj/mecha/combat/combatvehicle/vertibird/ncr, +/turf/open/floor/plasteel/airless/white, +/area/f13/wasteland) "wBZ" = ( /turf/open/floor/plating/rust, /area/f13/wasteland) +"wCx" = ( +/obj/structure/table/booth, +/turf/open/floor/f13/wood, +/area/f13/city) "wCN" = ( /obj/item/bodypart/l_arm, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -15240,11 +16044,11 @@ }, /area/f13/city) "wUC" = ( -/obj/machinery/door/unpowered/secure_NCR, -/turf/open/floor/f13{ - icon_state = "darkdirtysolid" +/obj/structure/chair/office{ + dir = 8 }, -/area/f13/ncr) +/turf/open/floor/f13/wood, +/area/f13/city) "wWL" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -15304,6 +16108,13 @@ dir = 4 }, /area/f13/building/hospital) +"xaJ" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/obj/item/pda, +/turf/open/floor/f13/wood, +/area/f13/city) "xaY" = ( /obj/effect/overlay/junk/toilet{ dir = 8 @@ -15312,6 +16123,11 @@ icon_state = "hydrofloor" }, /area/f13/building) +"xbb" = ( +/obj/structure/curtain/stage, +/obj/structure/rug/carpet3, +/turf/open/floor/f13/wood, +/area/f13/city) "xbE" = ( /turf/open/floor/f13/wood{ icon_state = "housewood3-broken" @@ -15372,12 +16188,16 @@ icon_state = "greenrustychess" }, /area/f13/building/massfusion) -"xiI" = ( -/obj/structure/window/reinforced/fulltile, -/obj/structure/grille, -/obj/structure/barricade/bars, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +"xiv" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy" + }, +/turf/open/floor/plasteel/f13/vault_floor/dark, /area/f13/ncr) +"xiI" = ( +/turf/open/floor/wood_mosaic/wood_mosaic_dark, +/area/f13/city) "xiK" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/destructible/tribal_torch/wall/lit{ @@ -15533,6 +16353,9 @@ icon_state = "reddirtyfull" }, /area/f13/city) +"xvq" = ( +/turf/open/floor/plating/f13/outside/roof/wood/old, +/area/f13/city) "xvZ" = ( /obj/structure/table, /obj/item/reagent_containers/hypospray/medipen/medx, @@ -15613,6 +16436,17 @@ }, /turf/open/floor/plasteel/f13/vault_floor/purple, /area/f13/building/hospital) +"xBc" = ( +/obj/structure/table/wood, +/obj/item/lock_construct, +/obj/item/key, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) +"xBw" = ( +/turf/open/floor/f13/wood{ + icon_state = "housewood4-broken" + }, +/area/f13/building/powered) "xBy" = ( /obj/structure/closet/locker/oldstyle{ anchored = 1 @@ -15742,20 +16576,19 @@ /turf/open/floor/f13/wood, /area/f13/city) "xKB" = ( -/obj/structure/table, -/obj/item/megaphone, +/obj/structure/simple_door/room, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) +/area/f13/city) "xLX" = ( /obj/structure/fluff/railing/corner, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/brotherhood/rnd) "xLZ" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, -/obj/effect/landmark/start/f13/ncrrep, -/turf/open/floor/wood_fancy, -/area/f13/ncr) +/obj/structure/chair/sofa/right{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "xMc" = ( /obj/structure/simple_door/interior, /obj/effect/decal/cleanable/dirt, @@ -15778,6 +16611,13 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +"xMo" = ( +/obj/effect/landmark/start/f13/ncrfirstsergeant, +/obj/structure/chair/folding{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "xMZ" = ( /obj/structure/closet, /obj/item/clothing/under/f13/mechanic, @@ -15796,6 +16636,12 @@ dir = 1 }, /area/f13/building/hospital) +"xNl" = ( +/obj/machinery/door/poddoor/shutters{ + id = "ncrgate2" + }, +/turf/open/floor/plasteel/f13/vault_floor/floor, +/area/f13/wasteland) "xPc" = ( /obj/structure/table, /obj/structure/bedsheetbin, @@ -15870,16 +16716,15 @@ }, /area/f13/city) "xWs" = ( -/obj/structure/table, -/obj/machinery/light, -/obj/machinery/button/door{ - id = "ncrgate2"; - name = "air gate button" - }, -/turf/open/floor/f13{ - icon_state = "darkdirtysolid" +/turf/open/floor/plasteel/stairs/old, +/area/f13/wasteland) +"xWy" = ( +/obj/machinery/light/small{ + dir = 4 }, -/area/f13/ncr) +/obj/structure/closet/crate/footchest, +/turf/open/floor/f13/wood, +/area/f13/city) "xWX" = ( /obj/structure/window/fulltile/house{ dir = 2; @@ -15939,12 +16784,39 @@ }, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/city) +"yck" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/head/f13/ncr/ncr_flapcap, +/obj/item/clothing/under/f13/ncr/ncr_dress, +/obj/item/clothing/suit/armor/ncrarmor/ncr_dressjack, +/obj/item/clothing/under/f13/ncr/ncr_officer, +/obj/structure/rug/carpet3{ + layer = 2 + }, +/obj/item/clothing/head/beret/ncr_codresscap, +/obj/item/clothing/head/beret/ncr/ncr_recon, +/obj/item/clothing/head/beret/ncr, +/obj/item/stack/f13Cash/caps/twozerozero, +/turf/open/floor/f13/wood, +/area/f13/city) +"ygn" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "ygG" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13{ icon_state = "darkrusty" }, /area/f13/building/massfusion) +"yib" = ( +/obj/structure/lattice/catwalk, +/obj/structure/chair/f13foldupchair{ + dir = 1 + }, +/turf/open/transparent/openspace, +/area/f13/city) "yic" = ( /obj/structure/rack/shelf_metal, /obj/item/mop, @@ -15971,6 +16843,18 @@ icon_state = "greendirtyfull" }, /area/f13/wasteland) +"yis" = ( +/obj/structure/chair/sofa/luxury/right{ + dir = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) +"yiG" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/transparent/openspace, +/area/f13/city) "yiL" = ( /obj/structure/barricade/bars, /obj/structure/window/fulltile/store{ @@ -15982,7 +16866,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/f13/wood, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "yku" = ( /obj/structure/guncase, @@ -16024,8 +16908,9 @@ /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) "ymf" = ( -/turf/closed/wall/r_wall, -/area/f13/wasteland) +/obj/structure/barricade/tentleatheredge, +/turf/closed/wall/f13/wood/house, +/area/f13/city) (1,1,1) = {" laB @@ -16586,11 +17471,11 @@ cqK cqK cqK plo -lTP -mRl +aAo ujK +bem +aAo aAo -lTP dMj fay uQS @@ -16844,9 +17729,9 @@ gPM ujK wjd vDj -spT -cqK -wjd +lYb +uEc +vYq fPe spT orP @@ -17100,12 +17985,12 @@ sGc xuu cqK qnZ -cqK -cqK -cqK +uEc +uEc +sGc dwO -gPM -cqK +ncx +uEc orP orP orP @@ -17354,15 +18239,15 @@ vLb kur sGc lwT -xuu -cqK -ujK -cqK -cqK -cqK -cqK -cqK -cqK +jxp +uEc +bem +sGc +sGc +sGc +sGc +sGc +uEc fag ffV orP @@ -17611,24 +18496,24 @@ vLb kur sGc lwT -xuu -cqK +jxp +uEc qxN -cqK -cqK -cqK -cqK -cqK +sGc +sGc +sGc +sGc +sGc +sGc +bem ujK cqK -cqK -cqK gPM xKa mvq cqK -cqK -cqK +uEc +uEc vVF sGc sGc @@ -17868,25 +18753,25 @@ rLB dTc kur kur -kur +uEc kur ejB -xiI -xiI -tBZ -noP -pLl -cqK -cqK -ujK +sGc +sGc +sGc +sGc +sGc +sGc +bem +ncx cqK cqK ujK ujK ujK cqK -ujK -vVF +bem +kFL sGc mph ePI @@ -18125,17 +19010,17 @@ rLB dTc dTc gkT -gkO +uEc iBQ ejB -dDq -dDq -dDq -noP -ujK -cqK -jmZ -cqK +sGc +sGc +sGc +sGc +sGc +sGc +aDd +uEc cqK jmZ cqK @@ -18143,9 +19028,9 @@ cqK cqK noP noP -noP -noP -noP +uEc +uEc +uEc gkT xSN oez @@ -18295,23 +19180,10 @@ rwk vLb rwk vLb -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk vLb vLb vLb vLb -rwk vLb vLb vLb @@ -18320,7 +19192,20 @@ vLb vLb vLb vLb -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -18386,23 +19271,23 @@ etP uEc bqz bem -dDq -jxp -noP -cqK -mYO +sGc +sGc +uEc +uEc +cTy hqA -xKB +wjd mYO -uFd +bem nNy cqK cqK oiW eHj +uEc eHj -eHj -eHj +uEc noP xSN oez @@ -18552,12 +19437,10 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb @@ -18568,7 +19451,6 @@ vLb vLb vLb vLb -rwk vLb vLb vLb @@ -18577,7 +19459,10 @@ vLb vLb vLb vLb -rwk +vLb +vLb +vLb +vLb vLb vLb rwk @@ -18643,23 +19528,23 @@ noP gkT kur kDj -dDq +uEc rXQ -noP +uEc bqZ gkT kur nHK nHK -kur +uEc nHK nHK tSo noP -uCb -tlO -uCb +eHj tlO +uEc +uEc noP xSN oez @@ -18809,12 +19694,10 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb @@ -18825,7 +19708,6 @@ vLb vLb vLb vLb -rwk vLb vLb vLb @@ -18834,7 +19716,10 @@ vLb vLb vLb vLb -rwk +vLb +vLb +vLb +vLb vLb vLb rwk @@ -18906,17 +19791,17 @@ noP cqK dTc pEr -hHO -hHO -pEr -hHO +jJY +jJY +jJY +jJY hHO hHO noP eHj -rRp +uEc yjB -rRp +uEc noP xSN oez @@ -19066,13 +19951,10 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk -rwk vLb vLb vLb @@ -19082,16 +19964,19 @@ vLb vLb vLb vLb -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -19323,14 +20208,11 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb -rwk vLb vLb vLb @@ -19339,7 +20221,6 @@ vLb vLb vLb vLb -rwk vLb vLb vLb @@ -19348,7 +20229,11 @@ vLb vLb vLb vLb -rwk +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -19580,15 +20465,12 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb vLb -rwk vLb vLb vLb @@ -19596,7 +20478,6 @@ vLb vLb vLb vLb -rwk vLb vLb vLb @@ -19605,7 +20486,11 @@ vLb vLb vLb vLb -rwk +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -19664,7 +20549,7 @@ dTc oBn iga adz -dTc +uEc dTc dTc dTc @@ -19837,23 +20722,13 @@ rwk vLb rwk vLb -rwk -rwk -rwk -rwk -rwk -rwk vLb vLb vLb -rwk -rwk -rwk vLb vLb vLb vLb -rwk vLb vLb vLb @@ -19862,7 +20737,17 @@ vLb vLb vLb vLb -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -19921,7 +20806,7 @@ pvV cqK ujK cqK -dTc +uEc sGc cqK dTc @@ -20176,9 +21061,9 @@ rLB dTc ira ujK -ujK -ujK -dTc +auu +bem +uEc fDV ujK dTc @@ -20433,9 +21318,9 @@ rLB dTc gOj cqK -vmF cqK -pGc +cqK +uEc ujK cqK rBR @@ -20660,9 +21545,9 @@ vLb vLb hHO ojh -ojh -ojh -ojh +uEc +uEc +uEc noP noP noP @@ -20690,10 +21575,10 @@ rLB dTc dTc pGc -dTc -dTc -dTc -xsR +uEc +uEc +uEc +uCb ujK rBR iqu @@ -20865,32 +21750,32 @@ rwk vLb rwk vLb -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk vLb vLb vLb vLb -rwk -rwk -rwk -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -20916,12 +21801,12 @@ vLb vLb vLb hHO -ojh -noP -noP -noP -noP -ojh +uEc +uEc +uEc +uEc +uEc +uEc ojh ojh ojh @@ -20948,7 +21833,7 @@ dTc tnq cqK idL -boy +cqK lKV cqK acL @@ -21122,32 +22007,32 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk vLb vLb -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -21173,13 +22058,13 @@ vLb vLb vLb hHO -ojh -noP -noP -noP -noP -ojh -hHO +eTu +eTu +eTu +eTu +eTu +eTu +jJY hHO hHO hHO @@ -21203,10 +22088,10 @@ hHO rLB dTc djs -cqK -ujK -cqK -cqK +uEc +bem +uEc +uEc cqK cqK rBR @@ -21379,32 +22264,32 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk vLb vLb -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -21430,12 +22315,12 @@ vLb vLb vLb hHO -ojh -noP -noP -noP -noP -ojh +eTu +eTu +pqG +pqG +eTu +eTu hHO rLB rLB @@ -21461,8 +22346,8 @@ rLB dTc cqK cqK -cqK -cqK +uEc +uEc ujK cqK jol @@ -21636,32 +22521,32 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk vLb vLb -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -21687,12 +22572,12 @@ vLb vLb vLb hHO -ojh -noP -noP -noP -ojh -ojh +eTu +eTu +pqG +oez +pqG +eTu hHO rLB rLB @@ -21716,8 +22601,8 @@ rLB rLB rLB dTc -tfg -sPe +cqK +cqK cqK cqK cqK @@ -21893,7 +22778,6 @@ rwk vLb rwk vLb -rwk vLb vLb vLb @@ -21904,21 +22788,22 @@ vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk vLb vLb -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -21944,13 +22829,13 @@ vLb vLb hHO hHO -ojh -noP -noP -noP -ojh -hHO -hHO +eTu +eTu +oez +oez +oez +pqG +jJY rLB rLB rLB @@ -21975,10 +22860,10 @@ rLB dTc dTc lPf -lPf -tSo -lPf -lPf +nZe +cqK +nZe +nZe dTc dTc rLB @@ -22161,21 +23046,21 @@ vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk vLb vLb -rwk -rwk -rwk -rwk -rwk -rwk -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -22201,13 +23086,13 @@ vLb vLb hHO ojh -ojh -noP -noP -noP -ojh -hHO -kur +eTu +oez +oez +oez +oez +pqG +uEc gkT kur gkT @@ -22458,13 +23343,13 @@ vLb vLb hHO ojh -noP -noP -noP -noP -ojh -hHO -kur +eTu +pqG +oez +oez +oez +pqG +uEc pvJ sGc sGc @@ -22715,13 +23600,13 @@ vLb vLb hHO ojh -noP -noP -noP -noP -ojh -voK -kur +eTu +pqG +oez +oez +oez +pqG +hhu cqK sGc sGc @@ -22972,13 +23857,13 @@ vLb vLb hHO gkT -noP -noP -noP -gkT -gkT -gkT -gkT +eTu +pqG +oez +oez +oez +pqG +rey xsR cqK kTS @@ -23018,7 +23903,7 @@ rLB rLB rLB rLB -nZe +rLB rLB rLB rLB @@ -23229,16 +24114,16 @@ vLb vLb hHO gkT -wtL -bYH -wtL -bYH -wtL -bJV -kur -bpp +eTu +pqG +oez +oez +oez +pqG +rey cqK cqK +dSN sjM dDq jzp @@ -23435,18 +24320,18 @@ rwk vLb rwk vLb -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb vLb @@ -23486,13 +24371,13 @@ vLb vLb hHO gkT -eHj -eHj -eHj -eHj -eHj -eHj -gkT +eTu +pqG +oez +oez +oez +oez +rey cqK cqK cqK @@ -23532,7 +24417,7 @@ qtF qtF qtF qtF -qtF +rLB qtF qtF qtF @@ -23692,18 +24577,18 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb +vLb vLb vLb vLb @@ -23743,18 +24628,18 @@ vLb vLb hHO gkT -jAE -eHj -eHj -jAE -eHj -eHj -tSo -cqK +eTu +oez +oez +oez +oez +oez +rey cqK cqK cqK cqK +dSN lqF kur kur @@ -23775,7 +24660,7 @@ ssV ssV cBM cBM -jJY +hIu cBM cBM ssV @@ -23949,18 +24834,18 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb +vLb vLb vLb vLb @@ -24000,13 +24885,13 @@ vLb vLb hHO gkT -kFz -nGC -eHj -vLn -kFz -dOh -gkT +eTu +oez +oez +oez +oez +oez +rey cqK cqK cqK @@ -24045,9 +24930,9 @@ cAO hHO dTc jdQ -wUC +lbC ixY -wUC +lbC jdQ dTc hHO @@ -24206,18 +25091,18 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb +vLb vLb vLb vLb @@ -24257,13 +25142,13 @@ vLb vLb hHO gkT -gkT -gkT -gkT -gkT -gkT -gkT -gkT +eTu +eTu +oez +oez +oez +oez +sGc kUW iDv tSo @@ -24305,7 +25190,7 @@ mdq lbC qQT qQT -xWs +ipi jdQ hHO tEW @@ -24463,18 +25348,18 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb +vLb vLb vLb vLb @@ -24514,18 +25399,18 @@ vLb vLb hHO hHO -hHO -hHO -hHO -hHO -hHO -kst -nkH +eTu +eTu +oez +oez +oez +oez +sGc ixi dDq dDq kur -oXG +tiP kWe rOR wse @@ -24562,8 +25447,8 @@ lbC sGc lbC bov -cTy -jdQ +lbC +mRl hHO tEW oez @@ -24720,18 +25605,18 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb +vLb vLb vLb vLb @@ -24770,14 +25655,14 @@ laB vLb vLb vLb -vLb -rLB -rLB -rLB -rLB -rLB -kst -iuT +bJV +eTu +eTu +oez +oez +oez +oez +sGc dcQ dcQ dDq @@ -24819,8 +25704,8 @@ lbC lbC lbC qQT -avO -jdQ +lbC +mRl hHO tEW oez @@ -24977,18 +25862,18 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb +vLb vLb vLb vLb @@ -25027,13 +25912,13 @@ laB vLb vLb vLb -vLb -rLB -rLB -rLB -rLB -rLB -kst +bJV +eTu +eTu +pqG +oez +oez +oez rey sye dDq @@ -25234,32 +26119,32 @@ rwk vLb rwk vLb -rwk -rwk vLb vLb -rwk -rwk -rwk vLb vLb vLb -rwk -rwk vLb vLb vLb vLb -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -25283,15 +26168,15 @@ laB laB vLb vLb -vLb -rLB -rLB -rLB -rLB -rLB -rLB -kst -kur +bJV +jJY +eTu +eTu +pqG +oez +oez +oez +rey kUW kUW kur @@ -25331,7 +26216,7 @@ hHO dTc dZy dZy -wUC +lbC dZy dZy dTc @@ -25493,21 +26378,15 @@ rwk vLb vLb vLb -rwk -rwk vLb vLb vLb -rwk -rwk -rwk vLb vLb vLb vLb vLb vLb -rwk vLb vLb vLb @@ -25516,7 +26395,13 @@ vLb vLb vLb vLb -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -25540,14 +26425,14 @@ laB laB vLb vLb -rLB -rLB -rLB -rLB -rLB -rLB -rLB -rLB +jJY +jJY +eTu +uFd +pqG +oez +oez +oez rLB rLB rLB @@ -25586,7 +26471,7 @@ rLB cAO hHO hHO -tJR +hHO hHO hHO hHO @@ -25764,7 +26649,6 @@ vLb vLb vLb vLb -rwk vLb vLb vLb @@ -25773,7 +26657,8 @@ vLb vLb vLb vLb -rwk +vLb +vLb vLb vLb rwk @@ -25797,14 +26682,14 @@ laB laB vLb vLb -rLB -rLB -rLB -rLB -rLB -rLB -rLB -rLB +jJY +jJY +eTu +pqG +oez +oez +oez +oez rLB rLB rLB @@ -26021,16 +26906,16 @@ vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb -rwk +vLb +vLb +vLb vLb vLb rwk @@ -26054,14 +26939,14 @@ laB laB vLb vLb -rLB -rLB -rLB -rLB -rLB -rLB -rLB -rLB +jJY +jJY +eTu +oez +oez +oez +oez +oez rLB rLB rLB @@ -26278,16 +27163,16 @@ vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb -rwk +vLb +vLb +vLb vLb vLb rwk @@ -26311,14 +27196,14 @@ laB laB vLb vLb -rLB -rLB -rLB -rLB -rLB -rLB -rLB -rLB +jJY +jJY +eTu +oez +oez +oez +oez +oez rLB rLB rLB @@ -26535,16 +27420,16 @@ vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb -rwk +vLb +vLb +vLb vLb vLb rwk @@ -26568,15 +27453,15 @@ laB laB vLb vLb -rLB -rLB -rLB -rLB -rLB -hHO -hHO -hHO -hHO +jJY +jJY +oez +oez +oez +oez +oez +oez +iuT hHO rLB cVc @@ -26792,16 +27677,16 @@ vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk -rwk -rwk -rwk -rwk +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -26825,17 +27710,17 @@ laB laB vLb vLb -rLB -rLB -rLB -rLB -rLB -hHO -hHO -hHO +jJY +jJY +pqG +oez +oez +oez +oez +pqG hHO hHO -rLB +iuT cAO sRA aQp @@ -27033,18 +27918,18 @@ rwk vLb rwk vLb -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb vLb @@ -27082,25 +27967,25 @@ laB laB vLb vLb -rLB -rLB -rLB -hHO -hHO -hHO -hHO -hHO -hHO +jJY +jJY +pqG +oez +oez +oez +oez +pqG hHO -rLB -cAO +jJY +jJY +tBZ rGU pAr kEe kEe kEe ooN -eIR +xiv ooN mUM aNm @@ -27290,18 +28175,18 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk +vLb +vLb +vLb vLb vLb vLb @@ -27339,18 +28224,18 @@ laB laB vLb vLb -vLb -rLB -hHO -hHO -hHO -hHO -hHO -hHO -hHO +bJV +jJY +pqG +oez +oez +oez +oez +pqG +jJY hHO -rLB -ggY +jJY +hgf ixY qHm ooN @@ -27547,18 +28432,18 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk +vLb +vLb +vLb vLb vLb vLb @@ -27597,14 +28482,14 @@ laB vLb vLb vLb -rLB -hHO -hHO -hHO -hHO -hHO -hHO -hHO +jJY +pqG +oez +oez +oez +pqG +eTu +jJY ixY ixY ixY @@ -27804,32 +28689,32 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -27854,14 +28739,14 @@ laB vLb vLb vLb -vLb -hHO -hHO -ixY -ixY -ixY -rZU -ixY +bJV +pqG +oez +oez +oez +pqG +eTu +uEc ixY ixY cbO @@ -27875,7 +28760,7 @@ eIR ooN ixY wbR -rsw +hDi rsw iqu rLB @@ -28061,27 +28946,27 @@ rwk vLb rwk vLb -rwk vLb vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb -rwk +vLb +vLb +vLb +vLb +vLb vLb vLb vLb @@ -28111,19 +28996,19 @@ laB vLb vLb vLb -vLb -hHO -hHO -ixY -huB -eIR -eIR -fUw +bJV +pqG +oez +oez +oez +pqG +eTu +uEc ooN ooN ooN eIR -fUw +pOs ooN eIR ooN @@ -28318,7 +29203,6 @@ rwk vLb rwk vLb -rwk vLb vLb vLb @@ -28329,16 +29213,17 @@ vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk vLb vLb vLb -rwk +vLb +vLb +vLb +vLb vLb vLb vLb @@ -28368,14 +29253,14 @@ laB vLb vLb vLb -vLb -hHO -hHO -ixY -ixY +bJV +oez +oez +oez +oez pqG -ixY -ixY +eTu +uEc ixY eUx ixY @@ -28591,11 +29476,11 @@ vLb vLb vLb vLb -rwk vLb vLb vLb -rwk +vLb +vLb vLb vLb vLb @@ -28626,20 +29511,20 @@ vLb vLb vLb vLb -vLb -vLb -ixY -dVT +oez +oez +oez +oez +pqG +eTu +uEc tiP -rOR -ixY -oXG tiP -rOR +qNR ixY -oXG tiP -rOR +tiP +uqX ixY ixY aTt @@ -28848,11 +29733,11 @@ vLb vLb vLb vLb -rwk vLb vLb vLb -rwk +vLb +vLb vLb vLb vLb @@ -28883,13 +29768,13 @@ vLb vLb vLb vLb -vLb -vLb -ixY -uOS -tiP -rpR -ixY +oez +oez +oez +oez +pqG +eTu +uCb uOS tiP kWe @@ -29105,16 +29990,16 @@ vLb vLb vLb vLb -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -29140,18 +30025,18 @@ vLb vLb vLb vLb -vLb -vLb -ixY -aDd -tiP -jST -ixY +oez +oez +oez +pqG +eTu +eTu +uEc jiS tiP jbS ixY -xLZ +jiS tiP jbS ixY @@ -29346,18 +30231,18 @@ rwk vLb rwk vLb -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb vLb @@ -29397,12 +30282,12 @@ vLb vLb vLb vLb -vLb -vLb -ixY -ixY -ixY -ixY +oez +oez +pqG +eTu +eTu +eTu ixY ixY ixY @@ -29614,7 +30499,7 @@ vLb vLb vLb vLb -rwk +vLb vLb vLb vLb @@ -29871,12 +30756,12 @@ vLb vLb vLb vLb -rwk vLb vLb vLb vLb -rwk +vLb +vLb vLb vLb vLb @@ -30128,13 +31013,13 @@ vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb vLb vLb vLb @@ -30385,14 +31270,14 @@ vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb vLb -rwk +vLb +vLb vLb vLb vLb @@ -30642,7 +31527,6 @@ vLb vLb vLb vLb -rwk vLb vLb vLb @@ -30650,13 +31534,14 @@ vLb vLb vLb vLb -rwk -rwk -rwk -rwk -rwk -rwk -rwk +vLb +vLb +vLb +vLb +vLb +vLb +vLb +vLb vLb vLb rwk @@ -30899,14 +31784,14 @@ vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb vLb -rwk +vLb +vLb vLb vLb vLb @@ -31156,13 +32041,13 @@ vLb vLb vLb vLb -rwk vLb vLb vLb vLb vLb -rwk +vLb +vLb vLb vLb vLb @@ -31418,7 +32303,7 @@ vLb vLb vLb vLb -rwk +vLb vLb vLb vLb @@ -36467,14 +37352,14 @@ qzT qzT qzT qzT -qzT -qzT -qzT -qzT -qzT -qzT -qzT -qzT +oez +oez +oez +oez +oez +oez +oez +oez qzT qzT qzT @@ -36502,22 +37387,22 @@ qzT qzT qzT jzl +svW +svW +svW oez oez oez oez -oez -oez -oez -hMq -hMq -hMq -hMq -hMq -oez -oez -oez -oez +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs oez oez oez @@ -36715,19 +37600,19 @@ oez oez oez lvE -oez -oez -oez -oez -oez -oez -oez -oez -oez -oez -oez -oez -oez +anv +anv +anv +anv +anv +anv +anv +anv +anv +anv +anv +anv +anv oez oez oez @@ -36758,23 +37643,23 @@ uiY woS jrJ uiY -lvE -oez -oez -oez -oez -oez -oez -oez -hMq -hMq -hMq -hMq -hMq +uiY +uiY +uiY +uiY oez oez oez oez +lcs +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -36972,19 +37857,19 @@ oez oez oez lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez -oez -oez -oez -oez +cmr +ftB +paR +jdy +anv +qqg +paR +mJd +paR +qqg +uTi +jZy +cmr oez oez oez @@ -37015,23 +37900,23 @@ uro wQR xIo uiY -lvE -oez -oez -oez -oez -oez -oez -oez -hMq -hMq -hMq -hMq -hMq +nSB +lTP +ygn +rpR oez oez oez oez +lcs +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -37229,19 +38114,19 @@ oez oez oez lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez -oez -oez -oez -oez +rjq +paR +paR +ifD +anv +paR +paR +paR +paR +paR +paR +tNZ +rjq oez oez oez @@ -37272,23 +38157,23 @@ nfh paR jVv uiY -lvE -oez -oez -oez -oez -oez -oez -oez -hMq -hMq -hMq -hMq -hMq +hYA +kxc +kxc +rpR oez oez oez oez +lcs +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -37486,19 +38371,19 @@ oez oez oez lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez -oez -oez -oez -oez +mwF +sPe +rSI +paR +oVG +paR +paR +pxl +rxG +paR +paR +mXq +rjq oez oez oez @@ -37529,23 +38414,23 @@ tXn paR paR uiY -lvE -oez -oez -oez +jST +sqk +rGv +ymf oez oez oez oez -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq +lcs +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -37743,19 +38628,19 @@ oez oez oez lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez -oez -oez -oez -oez +anv +anv +anv +anv +anv +anv +tJR +rOk +pLl +paR +paR +aYk +mwF oez oez oez @@ -37786,23 +38671,23 @@ uiY xnm paR uiY -lvE -oez -oez -oez +uiY +uiY +uiY +uiY oez oez oez oez -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq +lcs +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -38000,23 +38885,23 @@ oez oez oez lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez -oez -oez -oez -oez -oez -oez -oez -pZk +cmr +bwC +tJR +wkF +pLl +anv +anv +anv +anv +anv +oVG +anv +anv +geI +geI +geI +geI geI geI kvJ @@ -38043,23 +38928,23 @@ uGj uiY xKz uiY -lvE -oez -oez -oez +uiY +uiY +uiY +uiY oez oez oez oez -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq +lcs +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -38257,23 +39142,23 @@ oez oez oez lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez -oez -oez -oez -oez -oez -oez -oez -tAz +rjq +paR +paR +xaJ +paR +anv +ped +xMo +rzA +gIw +hYA +aLq +anv +uKh +uKh +uKh +uKh uKh pJt kvJ @@ -38300,23 +39185,23 @@ uNA xCY xKz uiY -lvE +nSB +tBe +dwh +sGY oez oez oez oez -oez -oez -oez -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq +lcs +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -38514,23 +39399,23 @@ oez oez oez lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez -oez -oez -oez -oez -oez -oez -jzy -tAz +mwF +poG +rSI +paR +paR +oVG +paR +paR +paR +paR +paR +paR +oVG +uKh +uKh +uKh +uKh uKh uKh iQr @@ -38557,23 +39442,23 @@ uSd uiY xKz uiY -lvE -oez -oez -oez +hYA +xiI +xiI +utd oez oez oez oez -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq +lcs +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -38770,24 +39655,24 @@ oez oez oez oez -lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez -oez -oez -oez -oez -oez -oez -oez -fbK +gKe +anv +anv +anv +anv +anv +anv +paR +hYA +hYA +uLb +uLb +nkH +anv +uKh +uKh +uKh +uKh uKh fyP kvJ @@ -38814,23 +39699,23 @@ uiY uiY xMc uiY -lvE -oez -oez -oez +afi +xiI +unY +sGY oez oez oez oez -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq +lcs +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -39027,24 +39912,24 @@ oez oez oez oez -lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez -oez -oez -oez -oez -oez -oez -oez -fbK +gKe +jKW +qqg +mJd +tfg +rZU +anv +paR +jAE +hYA +nSB +nSB +nSB +cmr +pYi +pYi +pYi +aTK uKh uKh kvJ @@ -39071,23 +39956,23 @@ paR uTi xKz uiY -lvE -oez -oez -oez +uiY +uiY +uiY +uiY oez oez oez oez -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq +lcs +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -39284,20 +40169,20 @@ oez oez oez oez -lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez -oez -oez -oez -oez +rTm +paR +paR +paR +paR +paR +oVG +paR +hYA +hYA +nSB +nSB +nSB +rjq oez oez oez @@ -39328,23 +40213,23 @@ paR jVv xKz uiY -lvE -oez -oez -oez +uiY +avO +avO +avO oez oez oez oez -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq +lcs +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -39541,20 +40426,20 @@ oez oez oez oez -lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez -oez -oez -oez -oez +nGC +paR +tiL +tiL +paR +anv +anv +anv +anv +anv +nSB +nSB +nSB +mwF oez oez oez @@ -39572,8 +40457,8 @@ vLw kvJ dYT kvJ -oez -oez +svW +svW uiY uiY uiY @@ -39585,23 +40470,23 @@ uiY uiY xMc uiY -lvE +nSB +dfW +xsd +avO oez oez oez oez -oez -oez -oez -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq -hMq +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs oez oez oez @@ -39798,20 +40683,20 @@ oez oez oez oez -lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez -oez -oez -oez -oez +dLH +trf +mXq +miw +paR +xbb +yck +anv +anv +anv +knF +fil +weX +anv oez oez oez @@ -39827,10 +40712,10 @@ nsa vLw oOo dYT -oez -oez -oez -oez +svW +svW +svW +svW uiY uWR uiY @@ -39842,10 +40727,10 @@ uWR uiY xKz uiY -lvE -oez -oez -oez +hYA +aXU +hXO +avO oez oez oez @@ -40055,16 +40940,16 @@ oez oez oez oez -lvE -oez -uiY -uiY -uiY -uiY -uiY -uiY -uiY -oez +gKe +nDC +wst +rSI +paR +vCV +iXR +anv +anv +anv oez oez oez @@ -40084,10 +40969,10 @@ hYA hYA hYA kvJ -oez -oez -oez -oez +svW +svW +svW +svW uiY cuY xCY @@ -40099,10 +40984,10 @@ dVz xCY xKz uiY -lvE -oez -oez -oez +aXU +aXU +aXU +cXj oez oez oez @@ -40312,16 +41197,16 @@ oez oez oez oez -lvE -oez -oez -oez -oez -oez -oez -oez -oez -oez +gKe +anv +anv +anv +anv +anv +anv +anv +anv +anv oez oez oez @@ -40341,10 +41226,10 @@ lta nsL tWL kvJ -oez -oez -oez -oez +svW +svW +svW +svW uiY vvS uiY @@ -40356,10 +41241,10 @@ vub uiY jVv uiY -lvE -oez -oez -oez +avO +avO +uiY +uiY oez oez oez @@ -40598,10 +41483,10 @@ lta nsL tWL dYT -oez -oez -oez -oez +svW +svW +svW +svW uiY uiY xev @@ -40613,10 +41498,10 @@ uiY snL paR uiY -lvE -oez -oez -oez +uiY +uiY +uiY +uiY oez oez oez @@ -40855,10 +41740,10 @@ rjs lta bOA kvJ -oez -oez -oez -oez +svW +svW +svW +svW uiY tXn kiv @@ -40870,10 +41755,10 @@ tXn paR paR uiY -lvE -oez -oez -oez +nSB +gVt +vLn +rRp oez oez oez @@ -41084,10 +41969,10 @@ oez oez oez lvE -oez -oez -oez -oez +svW +svW +svW +svW oez oez oez @@ -41112,10 +41997,10 @@ nsL nIQ lta dYT -oez -oez -oez -oez +svW +svW +svW +svW uiY xED eOU @@ -41127,10 +42012,10 @@ uxG paR sou uiY -lvE -oez -oez -oez +hYA +oGu +oGu +rRp oez oez oez @@ -41341,10 +42226,10 @@ oez oez oez lvE -oez -oez -oez -oez +svW +svW +svW +svW oez oez oez @@ -41369,10 +42254,10 @@ tWL tWL hYA dYT -oez -oez -oez -oez +svW +svW +svW +svW uiY uro sHQ @@ -41384,10 +42269,10 @@ uro chU uci uiY -lvE -oez -oez -oez +afi +uTp +uTp +rRp oez oez oez @@ -41598,10 +42483,10 @@ oez oez oez lvE -oez -oez -oez -oez +svW +svW +svW +svW oez oez oez @@ -41626,10 +42511,10 @@ kvJ kvJ iQr kvJ -geI -geI -ttz -oez +bGk +bGk +qiG +svW uiY uiY kxV @@ -41641,10 +42526,10 @@ uiY jrJ jrJ uiY -lvE -oez -oez -oez +uiY +ffz +ffz +uiY oez oez oez @@ -41848,17 +42733,17 @@ vIr dtb axq oez -oez -oez -oez -oez -oez -oez -lvE -oez -oez -oez -oez +ahs +geI +geI +geI +geI +geI +uiY +uiY +uiY +uiY +svW oez oez oez @@ -42104,18 +42989,18 @@ dtb dtb dtb oez -oez ahs -geI -geI -geI -geI -geI -ymf -oez -oez -oez -oez +aIE +orG +orG +orG +orG +orG +dYT +oXG +paR +uiY +svW oez oez oez @@ -42165,22 +43050,22 @@ oez oez oez oez -oez -oez -orG -orG -orG -orG -oez -orG -orG -orG -orG -orG -oez -oez -oez -oez +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs +lcs oez oez oez @@ -42361,18 +43246,18 @@ qLd dtb wTd oez -ahs -aIE +ioD +orG vvI +dOh rOF rOF rOF -rOF -ymf -oez -oez -oez -oez +dYT +bYH +paR +uiY +svW oez oez oez @@ -42422,22 +43307,22 @@ oez oez oez oez -oez -oez -orG -orG -orG -orG -oez -orG -orG -orG -orG -orG -orG -orG -orG -orG +lcs +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -42619,22 +43504,22 @@ dtb vIr oez ioD +xNl rOF rOF rOF rOF rOF -rOF -ymf -oez -oez -oez -oez -oez -oez -oez -oez -oez +dYT +uiY +oVG +uiY +bKG +bKG +bKG +bKG +bKG +uiY oez oez oez @@ -42679,22 +43564,22 @@ oez oez oez oez -oez -oez -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG +lcs +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -42876,22 +43761,22 @@ dtb dtb oez ioD -rOF -rOF -rOF -rOF -rOF -rOF -ymf -oez -oez -oez -oez -oez -oez -oez -oez -oez +xNl +gao +gao +gao +gao +gao +dYT +onS +paR +vxV +wtL +kFz +vxV +wtL +kFz +hTr oez oez oez @@ -42936,22 +43821,22 @@ oez oez oez oez -oez -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG +lcs +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -43133,25 +44018,22 @@ xbE dtb oez ioD +xNl rOF rOF gao -gao -gao rOF -ymf -uiY -bKG -bKG -bKG -bKG -bKG -bKG -bKG -uiY -oez -oez -oez +rOF +dYT +vbE +paR +oYS +wUC +gkO +jDN +wUC +gkO +hTr oez oez oez @@ -43164,6 +44046,9 @@ oez oez oez oez +xvq +xvq +xvq anv anv anv @@ -43192,23 +44077,23 @@ oez oez oez oez -oez -oez -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG +pZk +dFo +bdm +bdm +bdm +bdm +bdm +bdm +qiG +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -43390,21 +44275,21 @@ dtb dtb oez ioD +xNl rOF rOF -rOF -otf +wBX rOF rOF -ymf -aVv -nSB -nSB -nSB -nSB -nSB -nSB -nSB +dYT +joO +paR +boy +paR +paR +boy +paR +paR hTr oez oez @@ -43449,23 +44334,23 @@ oez oez oez oez -oez -oez -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG +ioD +tae +tae +tae +tae +tae +tae +tae +aPU +spS +spS +spS +spS +svW +svW +svW +lcs oez oez oez @@ -43647,21 +44532,21 @@ dtb vIr oez ioD -rOF -rOF +xNl gao gao gao -rOF -ymf -aVv -nSB -nSB -nSB -nSB -nSB -nSB -nSB +gao +gao +dYT +sFI +paR +paR +paR +paR +paR +paR +paR aVv oez oez @@ -43706,23 +44591,23 @@ oez oez oez oez -oez -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG +ioD +tae +gao +gao +gao +gao +gao +tae +xWs +spS +spS +spS +spS +svW +svW +svW +lcs oez oez oez @@ -43904,20 +44789,20 @@ axq oez oez bdJ +xNl rOF rOF rOF rOF rOF -rOF -ymf -aVv -nSB -nSB -nSB -nSB -nSB -nSB +dYT +uiY +oVG +uiY +uiY +oVG +uiY +paR nSB aVv oez @@ -43963,23 +44848,23 @@ oez oez oez oez -oez -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -oez -oez +ioD +tae +tae +tae +gao +tae +tae +tae +tNu +spS +spS +spS +spS +svW +svW +svW +lcs oez oez oez @@ -44161,21 +45046,21 @@ oez oez oez ioD +orG +mGl rOF rOF rOF rOF -rOF -rOF -ymf -aVv -nSB -nSB -nSB -nSB -nSB -nSB -nSB +dYT +oXG +paR +uiY +oXG +paR +uiY +paR +paR aVv oez oez @@ -44220,23 +45105,23 @@ oez oez oez oez +ioD +tae +tae +tae +gao +tae +tae +tae +tNu +spS oez -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -oez -oez +spS +spS +svW +svW +svW +lcs oez oez oez @@ -44419,20 +45304,20 @@ oez oez aQK aTK -rOF -rOF -rOF -rOF +orG +orG +orG +orG bty -ymf +dYT +bYH +paR uiY -bKG -bKG -bKG -bKG -bKG -bKG -bKG +bYH +paR +uiY +uiY +oVG uiY oez oez @@ -44477,23 +45362,23 @@ oez oez oez oez -oez -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -orG -oez -oez +ioD +tae +gao +gao +gao +gao +gao +tae +tNu +spS +spS +spS +spS +svW +svW +svW +lcs oez oez oez @@ -44680,7 +45565,7 @@ pYi pYi aTK peF -fyP +fmk dYT dYT dYT @@ -44688,9 +45573,9 @@ dYT dYT dYT dYT -oez -oez -oez +oXG +paR +uiY oez oez oez @@ -44734,23 +45619,23 @@ oez oez oez oez -oez -orG -orG -orG -orG -orG -orG -orG -orG -oez -orG -orG -orG -orG -orG -oez -oez +ioD +tae +tae +tae +tae +tae +tae +tae +ejx +svW +svW +svW +svW +svW +svW +svW +lcs oez oez oez @@ -44936,8 +45821,8 @@ oez oez oez fbK -uKh -qRB +qKN +yib dYT uNh nSB @@ -44945,9 +45830,9 @@ nSB fvq ftv dYT -oez -oez -oez +bYH +paR +uiY oez oez oez @@ -44991,23 +45876,23 @@ oez oez oez oez -oez -orG -orG -orG -orG -orG -orG -orG -orG -oez -orG -orG -orG -orG -orG -oez -oez +pPv +bpp +bpp +bpp +bpp +bpp +bpp +bpp +hkf +lcs +lcs +lcs +svW +svW +svW +svW +lcs oez oez oez @@ -45193,8 +46078,8 @@ oez oez oez fbK -uKh -qRB +qKN +yib dYT iHJ nLV @@ -45202,9 +46087,9 @@ sLn lHU qLX dYT -oez -oez -oez +uiY +uiY +uiY oez oez oez @@ -45258,13 +46143,13 @@ oez oez oez oez -orG -orG -orG -orG -orG -oez -oez +lcs +lcs +lcs +lcs +lcs +lcs +lcs oez oez oez @@ -45450,8 +46335,8 @@ oez oez oez fbK -uKh -uKh +qKN +qKN eZk uNh uNh @@ -45475,7 +46360,7 @@ oez anv iqB iqB -pMu +suc iqB iqB qni @@ -45707,8 +46592,8 @@ oez oez oez fbK -uKh -uKh +qKN +qKN dYT jkw uNh @@ -45749,7 +46634,7 @@ anv hUC cIu jAs -bgI +iET jAs cIu cIu @@ -45965,7 +46850,7 @@ oez oez fbK wvQ -fyP +fFF dYT dYT dYT @@ -46006,7 +46891,7 @@ anv cIu uKh uKh -bgI +iET uKh uKh uKh @@ -46263,7 +47148,7 @@ ivU uKh uKh qRB -bgI +iET fxJ uKh uKh @@ -46520,7 +47405,7 @@ fbK uKh uKh fyP -bgI +iET aZh uKh uKh @@ -46777,7 +47662,7 @@ fbK uKh uKh qRB -bgI +iET fxJ uKh uKh @@ -47034,7 +47919,7 @@ fbK uKh uKh uKh -bgI +iET uKh uKh uKh @@ -47291,7 +48176,7 @@ fbK uKh uKh uKh -bgI +iET uKh oXd uKh @@ -47798,7 +48683,7 @@ oez oez wIP dpn -tyU +vTD fyo oGu xQG @@ -48032,14 +48917,14 @@ woa oOp woa woa +lFB +lFB woa woa woa woa woa -woa -woa -oez +lcs oez oez oez @@ -48067,16 +48952,16 @@ uNh qLX dYT wqF -rOF -rOF -rOF -rOF -rOF -rOF -rOF -rOF -rOF -rOF +svW +anv +anv +mHQ +anv +vmF +vmF +vmF +vmF +anv oez oez oez @@ -48296,7 +49181,7 @@ vwd nDE kLa woa -oez +lcs oez oez wBZ @@ -48324,16 +49209,16 @@ uNh qjp dYT wqF -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +anv +huB +hYA +anv +vmu +aGQ +yis +hYA +iSw oez oez oez @@ -48553,7 +49438,7 @@ rEw nDE nDE woa -oez +lcs oez oez wBZ @@ -48581,16 +49466,16 @@ dXM stm dYT wqF -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +anv +gyo +wgh +anv +wpo +aGQ +sht +hYA +iSw oez oez oez @@ -48810,7 +49695,7 @@ nDE nDE nDE woa -oez +lcs oez oez wBZ @@ -48838,16 +49723,16 @@ dYT dYT lmv wqF -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +anv +voK +hYA +xKB +hYA +tAi +hYA +hYA +iSw oez oez oez @@ -49067,7 +49952,7 @@ byl tyG dAm woa -oez +lcs oez oez wBZ @@ -49095,16 +49980,16 @@ oez oez oez wqF -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +anv +anv +anv +anv +anv +anv +anv +xKB +anv oez oez oez @@ -49324,7 +50209,7 @@ woa woa woa woa -ttz +qjo oez oez wBZ @@ -49352,16 +50237,16 @@ oez oez oez wqF -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +anv +xBc +hnz +xLZ +anv +hYA +hYA +hYA +iSw oez oez oez @@ -49581,7 +50466,7 @@ bGG trU kOc kYu -tEW +uZE oez oez wBZ @@ -49609,16 +50494,16 @@ anv wqF wqF wqF -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +anv +voK +hYA +tBt +xKB +hYA +qeU +hYA +iSw oez oez oez @@ -49838,7 +50723,7 @@ bGG cuu oMg lyN -tEW +uZE oez oez wBZ @@ -49866,16 +50751,16 @@ anv xMf oez oez -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +anv +dVT +hYA +hYA +anv +hYA +hYA +hYA +iSw oez oez oez @@ -50095,7 +50980,7 @@ bGG kGs uoR kYu -tEW +uZE oez oez wBZ @@ -50123,16 +51008,16 @@ anv lvE oez oez -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +anv +anv +anv +anv +anv +voK +hYA +hYA +iSw oez oez oez @@ -50380,16 +51265,16 @@ anv lvE oez oez -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +xvq +xvq +xvq +xvq +anv +hYA +nSB +hYA +iSw oez oez oez @@ -50609,7 +51494,7 @@ kfN trU kOc lyN -tEW +uZE oez oez wBZ @@ -50637,16 +51522,16 @@ anv lvE oez oez -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +xvq +xvq +xvq +xvq +anv +anv +anv +anv +anv oez oez oez @@ -50866,7 +51751,7 @@ kfN kFS kWw kYu -tEW +uZE oez oez wBZ @@ -50894,16 +51779,16 @@ anv jed oez oez -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW oez oez oez @@ -51123,7 +52008,7 @@ bGG kGs uoR kYu -tEW +uZE oez oez wBZ @@ -51151,16 +52036,16 @@ sTN iiB oez oez -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW oez oez oez @@ -51408,16 +52293,16 @@ anv rNT oez oez -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW oez oez oez @@ -51637,7 +52522,7 @@ fJi fJi gLw fJi -tEW +uZE oez oez wBZ @@ -51665,16 +52550,16 @@ wUx iiB oez oez -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW oez oez oez @@ -51894,7 +52779,7 @@ xsd xsd xsd xsd -tEW +uZE oez oez oez @@ -51922,16 +52807,16 @@ wUx iiB oez oez -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW oez oez oez @@ -52151,7 +53036,7 @@ fJi fJi fJi fJi -tEW +uZE oez oez oez @@ -52179,16 +53064,16 @@ anv mks oez oez -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW oez oez oez @@ -52404,13 +53289,13 @@ xsd xsd fQF hjV -pYi -pYi -pYi -pYi -cHi -oez -oez +kDt +rFW +rFW +mhP +jiU +dSJ +uiY oez oez oez @@ -52430,22 +53315,22 @@ ccT xVl nSB wxo -anv +gKe xMf qzT qaJ oez oez -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW oez oez oez @@ -52660,14 +53545,14 @@ xsd xsd xsd vMz -tEW -oez -oez -oez -oez -oez -oez -oez +dbg +viw +nSB +paR +jVv +rei +wCx +vbz oez oez oez @@ -52687,22 +53572,22 @@ anv anv anv anv -anv +gKe lvE oez oez oez oez -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -gKe -rOF +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW oez oez oez @@ -52917,14 +53802,14 @@ ffL srw xsd qqF -tEW -oez -oez -oez -oez -oez -oez -oez +dbg +xsd +sou +paR +paR +kiv +paR +sXF oez oez oez @@ -52936,7 +53821,7 @@ wBZ wBZ wBZ wBZ -wBZ +iQE cNu qzT qzT @@ -52950,16 +53835,16 @@ oez oez oez oez -rOF -rOF -rOF -rOF -rOF -rOF -rOF -rOF -rOF -rOF +svW +svW +svW +svW +svW +svW +svW +svW +svW +svW oez oez oez @@ -53174,14 +54059,14 @@ aXB aXB aXB elx -cHi -oez -oez -oez -oez -oez -oez -oez +jiU +lsS +xWy +cJT +jxM +kRY +kiv +nic oez oez oez @@ -53193,7 +54078,7 @@ wBZ wBZ wBZ wBZ -wBZ +iQE lvE oez oez @@ -53431,14 +54316,14 @@ geI ttz oez lvE -oez -oez -oez -oez -oez -oez -oez -oez +uiY +uiY +uiY +uiY +uiY +uiY +uiY +uiY oez oez oez @@ -53676,26 +54561,26 @@ oez oez oez pZk -hMq -hMq -bcZ -gCC -xVd -hMq -eLn -gCC -nwX -hMq -hMq +dWu +dWu +bhI +nLD +epY +dWu +qsL +nLD +qkh +dWu +dWu lvE -oez -oez -oez -oez -oez -oez -oez -oez +uiY +paR +yiG +cRw +tAz +nSB +nSB +wgt oez oez oez @@ -53933,26 +54818,26 @@ oez oez oez fbK -hMq -qzj -qzj -qzj -qzj -qzj -qzj -qzj -qzj -ojS -hMq +dWu +tyU +tyU +tyU +tyU +tyU +tyU +tyU +tyU +dnO +dWu lvE -oez -oez -oez -oez -oez -oez -oez -oez +anv +paR +paR +dvw +tAz +nSB +nSB +wkr oez oez oez @@ -54190,26 +55075,26 @@ oez oez oez fbK -bcZ -fae -xIB -qzj -qzj -qzj -qzj -qzj -qzj -qzj -bcZ +bhI +eIK +otf +tyU +tyU +tyU +tyU +tyU +tyU +tyU +bhI lvE -oez -oez -oez -oez -oez -oez -oez -oez +anv +rBL +uNu +uZR +tAz +nSB +nSB +wkr oez oez oez @@ -54226,12 +55111,12 @@ oez oez oez oez -oez -oez -oez -oez -oez -oez +kmu +kmu +kmu +kmu +kmu +kmu oez oez oez @@ -54447,31 +55332,31 @@ oez oez oez fbK -bcZ -qzj -qzj -qzj -qzj -gZj -qzj -qzj -qzj -qzj -gEl +bhI +tyU +tyU +tyU +tyU +fLy +tyU +tyU +tyU +tyU +fcX lvE +anv +jzy +jzy +jzy +uiY +uiY +uiY +uiY oez -oez -oez -oez -oez -oez -oez -oez -oez -oez -oez -oez -oez +lcs +lcs +lcs +lcs wBZ wBZ wBZ @@ -54483,12 +55368,12 @@ oez oez oez oez -oez +kmu sdE sdE sdE sdE -oez +kmu oez oez oez @@ -54704,17 +55589,17 @@ oez oez oez fbK -bcZ -qzj -qzj -qzj -qzj -qzj -qzj -xIB -qzj -qzj -wtE +bhI +tyU +tyU +tyU +tyU +tyU +tyU +otf +tyU +tyU +wpn lvE oez oez @@ -54725,10 +55610,10 @@ oez oez oez oez -oez -oez -oez -oez +lcs +lcs +lcs +lcs wBZ wBZ wBZ @@ -54740,12 +55625,12 @@ oez oez oez oez -oez +kmu sdE sdE sdE sdE -oez +kmu oez oez oez @@ -54961,17 +55846,17 @@ oez oez oez fbK -msZ -qzj -teM -qzj -qzj -qzj -qzj -qzj -qzj -qzj -bcZ +gOl +tyU +xBw +tyU +tyU +tyU +tyU +tyU +tyU +tyU +bhI lvE oez oez @@ -54982,10 +55867,10 @@ oez oez oez oez -oez -oez -oez -oez +lcs +lcs +lcs +lcs wBZ wBZ wBZ @@ -54997,12 +55882,12 @@ oez oez oez oez -oez +kmu sdE sdE sdE sdE -oez +kmu oez oez oez @@ -55218,17 +56103,17 @@ oez oez oez fbK -msZ -qzj -qzj -xIB -qzj -ojS -qzj -qzj -qzj -qzj -msZ +gOl +tyU +tyU +otf +tyU +dnO +tyU +tyU +tyU +tyU +gOl lvE oez oez @@ -55239,10 +56124,10 @@ oez oez oez oez -oez -oez -oez -oez +lcs +lcs +lcs +lcs oez oez oez @@ -55254,12 +56139,12 @@ oez oez oez oez -oez +kmu sdE sdE sdE sdE -oez +kmu oez oez oez @@ -55475,17 +56360,17 @@ oez oez oez pPv -hMq -qzj -qzj -qzj -qzj -qzj -qzj -qzj -qzj -qzj -wtE +dWu +tyU +tyU +tyU +tyU +tyU +tyU +tyU +tyU +tyU +wpn gEt qzT qzT @@ -55511,12 +56396,12 @@ oez oez oez oez -oez +kmu sdE sdE sdE sdE -oez +kmu oez oez oez @@ -55732,26 +56617,25 @@ oez oez oez oez -hMq -hMq +dWu +dWu aGE -gCC -hMq -hMq -qzj -qzj -fae -qzj -hMq -oez -oez -oez -oez -oez -oez -oez -oez -oez +nLD +dWu +dWu +tyU +tyU +eIK +tyU +dWu +aFp +aFp +aFp +aFp +aFp +aFp +aFp +aFp oez oez oez @@ -55769,11 +56653,12 @@ oez oez oez oez +kmu sdE sdE sdE sdE -oez +kmu oez oez oez diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm index ffb7c4cfc3f..9be4e299709 100644 --- a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm +++ b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm @@ -289,7 +289,9 @@ }, /area/f13/brotherhood/armory) "abk" = ( -/obj/machinery/smartfridge/bottlerack/gardentool, +/obj/structure/toilet{ + dir = 4 + }, /turf/open/floor/plasteel/f13/vault_floor/misc, /area/f13/city) "abl" = ( @@ -821,6 +823,18 @@ icon_state = "innershade" }, /area/f13/wasteland) +"adL" = ( +/obj/structure/sign/poster/ncr/democracy{ + pixel_x = 29 + }, +/obj/structure/sign/poster/ncr/keep_to_myself{ + pixel_x = 32; + pixel_y = -15 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "adP" = ( /obj/structure/table/reinforced, /obj/structure/table/reinforced, @@ -869,9 +883,9 @@ }, /area/f13/building/powered) "adW" = ( -/obj/structure/reagent_dispensers/watertank/high, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/ncr) +/obj/structure/barricade/tentleatheredge, +/turf/closed/wall/f13/wood/house/shack, +/area/f13/city) "aeb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/trash/pistachios, @@ -1247,7 +1261,7 @@ pixel_y = 5; termtag = "Security" }, -/turf/open/floor/plasteel/vault, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "afQ" = ( /obj/item/stack/spacecash/c1000, @@ -1418,11 +1432,8 @@ }, /area/f13/wasteland) "agM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "outermaincornerinner" - }, +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "agN" = ( /turf/open/indestructible/ground/outside/sidewalk{ @@ -1612,8 +1623,19 @@ /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, /area/f13/building/powered) "ahP" = ( -/obj/machinery/vending/hydronutrients, -/turf/open/floor/plasteel/f13/vault_floor/misc, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "police"; + name = "shutters button"; + pixel_y = 1; + pixel_x = 24 + }, +/obj/structure/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) "ahQ" = ( /turf/open/indestructible/ground/outside/road{ @@ -1782,7 +1804,7 @@ dir = 4 }, /obj/structure/decoration/rag, -/turf/open/indestructible/ground/outside/desert, +/turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "aiu" = ( /obj/effect/decal/cleanable/dirt, @@ -1851,8 +1873,11 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "aiG" = ( -/obj/machinery/biogenerator, -/turf/open/floor/plasteel/f13/vault_floor/misc, +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -3 + }, +/turf/closed/wall/f13/wood/house, /area/f13/city) "aiJ" = ( /obj/effect/decal/remains/human, @@ -2014,7 +2039,7 @@ /obj/structure/decoration/rag{ icon_state = "skin" }, -/turf/open/indestructible/ground/outside/desert, +/turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "ajm" = ( /obj/structure/closet, @@ -2097,10 +2122,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 4 }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 5; - icon_state = "dirt" - }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "ajE" = ( /obj/structure/flora/ausbushes/palebush, @@ -2189,12 +2211,10 @@ }, /area/f13/building) "ajT" = ( -/obj/structure/filingcabinet, -/obj/structure/filingcabinet{ - pixel_x = 16 - }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/simple_door/metal, +/obj/structure/simple_door/tentflap_leather, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "ajU" = ( /obj/structure/flora/ausbushes/fernybush, /turf/open/indestructible/ground/outside/dirt, @@ -2229,32 +2249,37 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) "ajZ" = ( -/obj/structure/filingcabinet, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/wood_fancy, +/area/f13/city) "aka" = ( -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - dir = 1; - pixel_y = 25 +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_3" }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/effect/decal/cleanable/dirt, +/obj/structure/fence/wooden{ + dir = 4; + icon_state = "post_wood" }, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "akb" = ( -/obj/structure/toilet, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/structure/car/rubbish2{ + icon_state = "car_rubish3" }, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 2; + icon_state = "outerpavementdirt" + }, +/area/f13/wasteland) "akc" = ( -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/structure/car/rubbish2{ + icon_state = "car_rubish3" }, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontaltopborderbottom0" + }, +/area/f13/wasteland) "akd" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outermaincornerouter" @@ -2500,13 +2525,9 @@ /turf/open/floor/f13/wood, /area/f13/building/powered) "akW" = ( -/obj/structure/flora/tree/cactus, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 8; - icon_state = "outermaincornerinner" - }, -/area/f13/wasteland) +/obj/machinery/photocopier, +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "akY" = ( /obj/structure/chair/booth{ icon_state = "booth_west_north" @@ -2515,11 +2536,8 @@ /turf/open/floor/f13/wood, /area/f13/building) "akZ" = ( -/obj/structure/filingcabinet, -/obj/structure/filingcabinet{ - pixel_x = -16 - }, -/turf/open/floor/plasteel/vault, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "ala" = ( /obj/structure/filingcabinet, @@ -2535,13 +2553,12 @@ }, /area/f13/building/powered) "ald" = ( -/obj/structure/simple_door/room{ - name = "restroom" - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/machinery/light/small{ + dir = 1 }, -/area/f13/ncr) +/obj/structure/chair/folding, +/turf/open/floor/f13/wood, +/area/f13/city) "ale" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, @@ -2653,18 +2670,11 @@ /turf/closed/wall/f13/store, /area/f13/building/museum) "alz" = ( -/obj/machinery/button/door{ - id = "ncrcaptainshutters"; - name = "window shutters"; - pixel_x = -29 - }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/floor, +/area/f13/city) "alC" = ( -/obj/item/storage/secure/safe{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/vault, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "alF" = ( /obj/effect/decal/marking{ @@ -2689,11 +2699,11 @@ }, /area/f13/wasteland) "alK" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, -/obj/effect/landmark/start/f13/ncrheavytrooper, -/turf/open/floor/wood_fancy, -/area/f13/ncr) +/obj/structure/debris/v3, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" + }, +/area/f13/wasteland) "alL" = ( /obj/item/trash/cheesie, /turf/open/floor/f13/wood, @@ -2743,13 +2753,10 @@ }, /area/f13/wasteland) "alZ" = ( -/obj/structure/window/fulltile/house{ - dir = 2; - icon_state = "storewindowtop" - }, -/obj/structure/curtain, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) +/obj/item/lock_construct, +/obj/item/key, +/turf/open/floor/wood_fancy, +/area/f13/city) "amb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -2759,14 +2766,9 @@ }, /area/f13/wasteland) "amd" = ( -/obj/structure/fence/corner{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 10; - icon_state = "outerpavement" - }, -/area/f13/wasteland) +/obj/structure/table, +/turf/open/floor/plasteel/f13/vault_floor/floor, +/area/f13/city) "amf" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -2774,14 +2776,9 @@ }, /area/f13/wasteland) "amg" = ( -/obj/structure/curtain, -/obj/machinery/shower{ - pixel_y = 20 - }, -/turf/open/floor/plasteel/f13{ - icon_state = "whitebluechess" - }, -/area/f13/ncr) +/obj/structure/flora/roadplant, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "amh" = ( /obj/machinery/light/small/broken{ dir = 8 @@ -2850,25 +2847,26 @@ }, /area/f13/building/powered) "amv" = ( -/obj/structure/decoration/vent, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 +/obj/structure/table/wood, +/obj/structure/fence/wooden{ + dir = 1; + icon_state = "post_wood"; + pixel_x = 15 }, -/turf/open/floor/plasteel/f13{ - icon_state = "whitebluechess" +/obj/structure/barricade/bars, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontaltopborderbottom0" }, -/area/f13/ncr) +/area/f13/wasteland) "amy" = ( -/obj/structure/decoration/vent, -/turf/open/floor/plasteel/f13{ - icon_state = "whitebluechess" - }, -/area/f13/ncr) +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "amz" = ( -/obj/structure/simple_door/room, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "amA" = ( /obj/structure/tires/two, /turf/open/indestructible/ground/outside/road{ @@ -2973,33 +2971,24 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "amV" = ( -/obj/machinery/shower{ - dir = 1 - }, -/obj/structure/curtain, -/turf/open/floor/plasteel/f13{ - icon_state = "whitebluechess" +/turf/open/indestructible/ground/outside/ruins{ + dir = 2; + icon_state = "rubble" }, /area/f13/ncr) "amX" = ( -/obj/structure/curtain, -/obj/machinery/shower{ - dir = 1 - }, -/turf/open/floor/plasteel/f13{ - icon_state = "whitebluechess" - }, -/area/f13/ncr) +/obj/structure/table/wood/crate, +/turf/open/floor/f13/wood, +/area/f13/city) "anb" = ( /obj/item/kirbyplants/random, /turf/open/floor/plasteel/vault, /area/f13/ncr) "anc" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/comfy/bathtub, +/turf/open/floor/carpet/royalblack, +/area/f13/building) "and" = ( /obj/structure/curtain, /obj/effect/turf_decal/stripes/white/line, @@ -3023,22 +3012,25 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "anm" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/sink{ + pixel_y = 15 }, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) -"ann" = ( -/obj/item/storage/secure/safe{ +/obj/structure/mirror{ pixel_y = 32 }, -/obj/machinery/button/door{ - id = "ncradvisorshutters"; - name = "window shutters"; - pixel_x = 28 +/turf/open/floor/f13{ + icon_state = "whitegreenrustychess" }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/area/f13/building) +"ann" = ( +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy"; + name = "Unarmed mr. gutsy" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) "ano" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" @@ -3069,26 +3061,42 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "anu" = ( -/obj/machinery/light{ - dir = 1; - light_color = "#706891" +/obj/machinery/light/small{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/closet/crate/bin/trashbin, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "anv" = ( -/obj/machinery/light{ - dir = 8 +/obj/structure/table/reinforced, +/obj/item/clothing/accessory/armband/hydro{ + name = "green armband" }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/item/clothing/accessory/armband/hydro{ + name = "green armband" + }, +/obj/item/clothing/accessory/armband/hydro{ + name = "green armband" + }, +/obj/item/clothing/accessory/armband/hydro{ + name = "green armband" + }, +/obj/item/clothing/accessory/armband/hydro{ + name = "green armband" + }, +/turf/open/floor/wood_fancy, +/area/f13/city) "anw" = ( -/obj/structure/table, -/obj/item/pda, -/obj/item/megaphone, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/filingcabinet, +/obj/item/stack/f13Cash/caps/threefivezero, +/obj/item/card/id/dogtag/town/ncr, +/obj/item/card/id/dogtag/town/ncr, +/obj/item/card/id/dogtag/town/ncr, +/obj/item/card/id/dogtag/town/ncr, +/turf/open/floor/f13/wood, +/area/f13/building) "any" = ( /obj/structure/nest/supermutant/melee, /turf/open/indestructible/ground/outside/dirt, @@ -3155,10 +3163,10 @@ }, /area/f13/building) "anL" = ( -/obj/structure/chair/comfy, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/sink/well, +/obj/structure/sink/well, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "anM" = ( /obj/machinery/light{ dir = 1 @@ -3172,7 +3180,7 @@ /obj/item/storage/secure/safe{ pixel_x = -26 }, -/turf/open/floor/plasteel/vault, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "anQ" = ( /turf/open/indestructible/ground/outside/sidewalk{ @@ -3254,11 +3262,13 @@ }, /area/f13/building/massfusion) "aog" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/kirbyplants, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/car/rubbish2{ + pixel_y = -12 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) "aoh" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 @@ -3279,12 +3289,7 @@ /area/f13/building) "aol" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/computer/card/ncr{ - dir = 1 - }, -/turf/open/floor/f13{ - icon_state = "floordirtysolid" - }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "aon" = ( /turf/closed/wall/rust, @@ -3331,24 +3336,19 @@ /turf/open/floor/plasteel/f13/vault_floor/red/white, /area/f13/building/mall) "aox" = ( -/obj/structure/window/fulltile/house{ - dir = 2; - icon_state = "storewindowtop" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "ncrcaptainshutters"; - name = "privacy shutters" +/mob/living/simple_animal/cow/brahmin{ + name = "NCR brahmin"; + desc = "This is a branded brahmin or brahma are mutated cattle with two heads and looking udderly ridiculous.
Known for their milk, just don't tip them over." }, -/obj/structure/barricade/bars, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "aoz" = ( -/obj/machinery/light/small, -/obj/structure/fence, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain2" +/obj/machinery/light, +/obj/structure/chair/folding{ + dir = 1 }, -/area/f13/wasteland) +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ncr) "aoC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/dark{ @@ -3466,15 +3466,14 @@ /obj/structure/chair/folding{ dir = 1 }, -/turf/open/floor/f13{ - icon_state = "floordirtysolid" - }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "apo" = ( -/obj/structure/fence/corner{ - dir = 5 +/obj/structure/barricade/bars, +/obj/structure/table/wood, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" }, -/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "app" = ( /turf/open/indestructible/ground/outside/road{ @@ -3489,8 +3488,7 @@ }, /area/f13/wasteland) "apw" = ( -/obj/structure/sink/puddle, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/hydroponics/soil/crafted, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "apA" = ( @@ -3615,13 +3613,9 @@ }, /area/f13/wasteland) "aql" = ( -/obj/structure/girder, -/obj/structure/barricade/bars, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 7; - icon_state = "outerpavement" - }, -/area/f13/wasteland) +/obj/structure/chair/stool/retro, +/turf/open/floor/f13/wood, +/area/f13/building) "aqo" = ( /obj/structure/rack, /obj/item/mining_scanner, @@ -3630,11 +3624,11 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "aqp" = ( -/obj/structure/fence{ - dir = 4 +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 2; + icon_state = "outerpavementdirt" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "aqq" = ( /mob/living/simple_animal/hostile/ghoul, @@ -3809,13 +3803,11 @@ }, /area/f13/wasteland) "aqX" = ( -/obj/structure/decoration/hatch{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalleftborderleft1" - }, -/area/f13/wasteland) +/obj/structure/closet/cabinet/anchored, +/obj/item/storage/book/bible/booze, +/obj/item/storage/book/bible, +/turf/open/floor/f13/wood, +/area/f13/building) "aqY" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/dark, @@ -3842,11 +3834,9 @@ /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) "are" = ( -/obj/structure/chair/folding{ - dir = 4 - }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/mob/living/simple_animal/hostile/handy/robobrain, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland) "arf" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/sidewalk{ @@ -3975,11 +3965,12 @@ /turf/open/floor/f13/wood, /area/f13/building/museum) "arI" = ( -/obj/structure/chair/office{ - dir = 8 +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_3" }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "arJ" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /obj/effect/decal/cleanable/dirt, @@ -4037,13 +4028,9 @@ /turf/closed/wall/f13/store, /area/f13/building/powered) "arW" = ( -/obj/structure/fence{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain0" - }, -/area/f13/ncr) +/obj/machinery/vending/hydronutrients, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "arX" = ( /obj/machinery/light{ dir = 1 @@ -4172,11 +4159,11 @@ }, /area/f13/caves) "asv" = ( -/obj/structure/table, -/obj/item/toner, -/obj/item/toner, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/flora/roadplant{ + icon_state = "dirt_7d" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "asz" = ( /obj/machinery/light/small{ brightness = 3; @@ -4289,7 +4276,7 @@ dir = 2; icon_state = "storewindowtop" }, -/turf/open/floor/plasteel/f13/vault_floor/dark, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "asW" = ( /turf/open/indestructible/ground/outside/dirt{ @@ -4618,10 +4605,12 @@ /turf/open/floor/f13/wood, /area/f13/building) "aub" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/f13/junkspawners, +/obj/machinery/light/small, +/obj/machinery/autolathe, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/glass/fifty, /turf/open/floor/f13/wood, -/area/f13/building) +/area/f13/city) "auc" = ( /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded" @@ -4882,13 +4871,10 @@ /turf/closed/wall/mineral/concrete, /area/f13/building/massfusion) "avc" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 12 - }, /obj/machinery/light/small{ dir = 4 }, +/obj/structure/bed/old, /turf/open/floor/plasteel/f13/vault_floor/misc, /area/f13/city) "avd" = ( @@ -5034,10 +5020,11 @@ }, /area/f13/wasteland) "avy" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/ruins{ + dir = 2; + icon_state = "rubble" + }, +/area/f13/wasteland) "avA" = ( /obj/structure/rack, /obj/item/clothing/under/f13/spring, @@ -5478,10 +5465,11 @@ }, /area/f13/building/massfusion) "awZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, -/area/f13/ncr) +/obj/structure/chair/folding{ + dir = 1 + }, +/turf/open/floor/carpet/green, +/area/f13/city) "axa" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, @@ -5731,7 +5719,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "ayc" = ( /obj/structure/barricade/sandbags, @@ -5815,6 +5803,7 @@ name = "Eastwood North Gate Outer"; network = list("Eastwood") }, +/obj/item/flag/ncr, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft0" }, @@ -6089,12 +6078,11 @@ }, /area/f13/ncr) "azy" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen/fountain, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/flora/roadplant{ + icon_state = "dirt_5d" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "azz" = ( /obj/structure/reagent_dispensers/barrel/explosive, /turf/open/indestructible/ground/outside/sidewalk{ @@ -7723,9 +7711,12 @@ }, /area/f13/wasteland) "aEE" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/black, -/area/f13/building) +/obj/structure/simple_door/repaired, +/obj/structure/simple_door/tentflap_leather, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) "aEG" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/f13/weapon/melee/random, @@ -8413,8 +8404,7 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/building/mall) "aGP" = ( -/obj/structure/campfire, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/vending/hydroseeds, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "aGR" = ( @@ -8524,7 +8514,7 @@ /obj/item/storage/bag/plants, /obj/item/storage/bag/plants, /obj/item/melee/onehanded/knife/switchblade, -/turf/open/indestructible/ground/outside/sidewalk, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "aHo" = ( /obj/item/seeds/poppy/broc, @@ -8683,6 +8673,13 @@ icon_state = "yellowrustysolid" }, /area/f13/building/massfusion) +"aHW" = ( +/obj/structure/barricade/sandbags, +/obj/structure/table/wood, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontaltopborderbottom0" + }, +/area/f13/wasteland) "aIa" = ( /obj/effect/decal/marking{ icon_state = "doubleverticalcorroded" @@ -8935,6 +8932,11 @@ }, /turf/open/water, /area/f13/caves) +"aIQ" = ( +/obj/structure/barricade/tentleatheredge, +/obj/structure/barricade/tentleatheredge, +/turf/closed/wall/f13/wood/house/shack, +/area/f13/city) "aIR" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/sidewalk{ @@ -9034,6 +9036,10 @@ /area/f13/wasteland) "aJj" = ( /obj/effect/turf_decal/gravel_edge, +/obj/structure/fence{ + dir = 4; + layer = 3.1 + }, /turf/open/floor/grass, /area/f13/wasteland) "aJk" = ( @@ -9164,13 +9170,11 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "aJR" = ( -/obj/structure/table, -/obj/machinery/computer/terminal{ - dir = 1; - termtag = "Business" - }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/table/wood, +/obj/item/lock_construct, +/obj/item/key, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "aJS" = ( /obj/item/shard, /turf/open/indestructible/ground/outside/ruins{ @@ -9353,11 +9357,10 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/side, /area/f13/building/hospital) "aKB" = ( -/obj/structure/debris/v4, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalrightborderleft0" - }, -/area/f13/wasteland) +/obj/structure/table/wood, +/obj/item/card/id/dogtag/ncrambassador, +/turf/open/floor/f13/wood, +/area/f13/building) "aKF" = ( /obj/structure/simple_door/metal/dirtystore, /turf/open/floor/plasteel/f13{ @@ -9419,16 +9422,8 @@ /turf/open/floor/f13, /area/f13/building) "aKU" = ( -/obj/structure/window/fulltile/house{ - icon_state = "storewindowbottom" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "ncrcaptainshutters"; - name = "privacy shutters" - }, -/obj/structure/barricade/bars, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/ruins, +/area/f13/caves) "aKV" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermaintop" @@ -9579,12 +9574,12 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "aLq" = ( -/obj/structure/table, -/obj/item/flashlight/lamp, -/obj/item/pen/fourcolor, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/rack/shelf_metal, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 2; + icon_state = "outerpavementdirt" + }, +/area/f13/wasteland) "aLr" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/sidewalk{ @@ -9617,10 +9612,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "aLw" = ( -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/structure/table, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) +/obj/machinery/smartfridge/bottlerack/gardentool, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/building) "aLy" = ( /obj/structure/closet, /obj/item/reagent_containers/glass/rag/towel, @@ -10743,7 +10737,10 @@ }, /area/f13/building/powered) "aOL" = ( -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/turf/open/indestructible/ground/outside/ruins{ + dir = 9; + icon_state = "rubble" + }, /area/f13/ncr) "aON" = ( /obj/structure/flora/grass/wasteland{ @@ -11033,14 +11030,10 @@ /turf/open/floor/f13, /area/f13/building) "aPK" = ( -/obj/effect/decal/remains{ - icon_state = "remains" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) "aPL" = ( @@ -11358,11 +11351,14 @@ /area/f13/wasteland) "aRd" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/barrel/four, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verylittleshadowright" +/obj/structure/sacrificealtar{ + density = 1; + icon_state = "sacrificealtar-red"; + name = "altar"; + pixel_y = 7 }, -/area/f13/wasteland) +/turf/open/floor/carpet/royalblack, +/area/f13/building) "aRe" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6"; @@ -11447,7 +11443,7 @@ }, /area/f13/wasteland) "aRw" = ( -/obj/structure/simple_door/metal, +/obj/machinery/door/unpowered/secure_NCR, /turf/open/floor/f13{ icon_state = "darkrusty" }, @@ -11782,8 +11778,8 @@ /turf/open/floor/f13/wood, /area/f13/building) "aSS" = ( -/mob/living/simple_animal/cow/brahmin, -/turf/open/indestructible/ground/inside/dirt, +/obj/structure/chair/booth, +/turf/open/floor/f13/wood, /area/f13/city) "aST" = ( /obj/structure/closet, @@ -11920,8 +11916,7 @@ }, /area/f13/building/firestation) "aTs" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/hydroponics/constructable, +/obj/structure/barricade/bars, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/city) "aTt" = ( @@ -12109,7 +12104,13 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "aUa" = ( -/obj/structure/musician/piano, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/f13/ncr_c_ration, +/obj/effect/spawner/lootdrop/f13/ncr_c_ration, /turf/open/floor/f13/wood, /area/f13/city) "aUb" = ( @@ -12121,12 +12122,9 @@ }, /area/f13/building/powered) "aUc" = ( -/obj/structure/chair/bench{ - dir = 4; - pixel_x = -6 - }, -/turf/open/floor/f13/wood, -/area/f13/city) +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/f13/wood/house/broken, +/area/f13/wasteland) "aUe" = ( /obj/item/paper_bin, /obj/item/pen, @@ -12254,15 +12252,20 @@ /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/city) "aUH" = ( -/obj/effect/decal/cleanable/blood/gibs/human/lizard/torso, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/table/wood/crate{ + pixel_x = 1 + }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "aUI" = ( -/obj/effect/overlay/barbed, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalleftborderright0" +/obj/structure/chair/wood{ + dir = 1 }, -/area/f13/wasteland) +/turf/open/floor/f13/wood, +/area/f13/city) "aUN" = ( /obj/item/clothing/suit/armor/medium/combat/rusted, /obj/item/clothing/head/helmet/f13/hoodedmask, @@ -12297,12 +12300,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "aUV" = ( -/obj/structure/chair/stool{ - dir = 4; - icon_state = "bench_center" +/turf/open/floor/f13/wood{ + icon_state = "housewood3-broken" }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/area/f13/city) "aUW" = ( /obj/structure/flora/grass/coyote/three, /turf/open/indestructible/ground/inside/dirt, @@ -12801,22 +12802,16 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "aXn" = ( -/obj/item/clothing/accessory/medal/silver/valor, -/obj/item/clothing/accessory/medal/silver/valor, -/obj/item/clothing/accessory/medal/silver/valor, -/obj/item/clothing/accessory/medal/silver/valor, -/obj/item/clothing/accessory/medal/gold/captain, -/obj/item/clothing/accessory/medal/gold/captain, -/obj/item/clothing/accessory/medal/gold/heroism, -/obj/item/clothing/accessory/medal/gold/heroism, -/obj/item/clothing/accessory/medal/bronze_heart, -/obj/item/clothing/accessory/medal/bronze_heart, -/obj/item/clothing/accessory/medal/bronze_heart, -/obj/structure/closet/locker/oldstyle{ - anchored = 1 +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded" }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/car/rubbish2{ + icon_state = "car_rubish3" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontaltopborderbottom0" + }, +/area/f13/wasteland) "aXo" = ( /obj/structure/rack, /obj/item/clothing/suit/beekeeper_suit, @@ -13218,7 +13213,7 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "aZG" = ( -/obj/effect/landmark/start/f13/farmer, +/obj/structure/closet/locker/oldstyle, /turf/open/floor/plasteel/f13/vault_floor/misc, /area/f13/city) "aZH" = ( @@ -13646,13 +13641,22 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "bcu" = ( -/obj/structure/table/wood, -/obj/item/storage/book/bible, -/obj/item/export/bottle/wine{ - pixel_x = -13; - pixel_y = 7 +/obj/machinery/computer/security/bos{ + circuit = /obj/item/circuitboard/computer/security; + dir = 1; + name = "Eastwood police department camera terminal"; + network = list("Eastwood"); + pixel_x = 8; + pixel_y = 4 }, -/turf/open/floor/f13/wood, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -8 + }, +/obj/item/pen/fourcolor{ + pixel_x = -7 + }, +/turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) "bcv" = ( /turf/open/floor/plasteel/stairs/left, @@ -13758,8 +13762,7 @@ /turf/open/floor/f13/wood, /area/f13/building) "bcX" = ( -/obj/structure/simple_door/room, -/obj/structure/barricade/wooden/planks/pregame, +/obj/machinery/biogenerator, /turf/open/floor/f13/wood, /area/f13/building) "bcZ" = ( @@ -13767,14 +13770,12 @@ /turf/open/floor/f13/wood, /area/f13/city) "bda" = ( -/obj/structure/sign/departments/holy, -/turf/closed/wall/f13/wood/house, +/turf/open/floor/wood_fancy, /area/f13/city) "bdb" = ( -/obj/effect/overlay/barbed, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain0" - }, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "bdd" = ( /obj/item/kirbyplants/random, @@ -13886,10 +13887,10 @@ }, /area/f13/wasteland) "bdI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/overlay/barbed, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalrightborderleft0" +/obj/structure/barricade/sandbags, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerpavementdirt" }, /area/f13/wasteland) "bdJ" = ( @@ -13923,11 +13924,13 @@ /turf/open/floor/f13/wood, /area/f13/building) "bdR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/car/rubbish1, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/footprints{ + icon_state = "blood2"; + dir = 1 + }, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalrightborderright0" + icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) "bdS" = ( @@ -14019,18 +14022,12 @@ /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, /area/f13/building/powered) "bei" = ( -/obj/effect/spawner/lootdrop/f13/junkspawners, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontaltopborderbottom2left" - }, -/area/f13/wasteland) +/turf/closed/wall/f13/wood/house/broken, +/area/f13/city) "bej" = ( -/obj/structure/car/rubbish2, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontaltopborderbottom2right" - }, -/area/f13/wasteland) +/obj/structure/rug/big/rug_fancy, +/turf/open/floor/f13/wood, +/area/f13/city) "bek" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -14169,6 +14166,7 @@ icon_state = "flag_arkansas"; pixel_y = 35 }, +/obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontaltopborderbottom0" }, @@ -14359,12 +14357,10 @@ }, /area/f13/building) "bfi" = ( -/obj/structure/car/rubbish3, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 1; - icon_state = "outerpavementdirt" +/turf/open/floor/f13{ + icon_state = "floordirty" }, -/area/f13/wasteland) +/area/f13/building) "bfj" = ( /obj/structure/chair/sofa/right{ dir = 4 @@ -14434,15 +14430,11 @@ }, /area/f13/caves) "bfs" = ( -/obj/effect/decal/remains{ - icon_state = "remains" - }, -/obj/structure/chair/wood{ - dir = 1 +/obj/machinery/light/small{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building) +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "bft" = ( /obj/structure/window/fulltile/house{ dir = 2; @@ -14551,17 +14543,8 @@ }, /area/f13/wasteland) "bfU" = ( -/obj/structure/sink{ - pixel_y = 15 - }, -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/effect/spawner/lootdrop/f13/junkspawners, -/turf/open/floor/f13{ - icon_state = "whitegreenrustychess" - }, -/area/f13/building) +/turf/closed/wall/f13/wood/house/broken, +/area/f13/wasteland) "bfX" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/dirt, @@ -14687,10 +14670,12 @@ }, /area/f13/building) "bgB" = ( -/obj/structure/chair/folding{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy"; + name = "Unarmed mr. gutsy" }, -/turf/open/floor/plasteel/f13/vault_floor/dark, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "bgC" = ( /obj/effect/turf_decal/weather/dirt{ @@ -14831,11 +14816,13 @@ }, /area/f13/wasteland) "bhI" = ( -/obj/machinery/light{ - dir = 1 +/obj/effect/overlay/barbed, +/turf/open/indestructible/ground/outside/gravel{ + color = "#B7ABAB"; + footstep = "dirt"; + name = "rocky dirt" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) +/area/f13/wasteland) "bhJ" = ( /obj/structure/chair/office/dark, /turf/open/floor/f13, @@ -15456,11 +15443,9 @@ }, /area/f13/wasteland) "bld" = ( -/obj/structure/wreck/bus/rusted, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalbottombordertop2" - }, -/area/f13/wasteland) +/obj/structure/simple_door/interior, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/building) "blf" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain2" @@ -15478,7 +15463,7 @@ "bll" = ( /obj/structure/filingcabinet/chestdrawer, /obj/item/pen/fourcolor, -/turf/open/floor/plasteel/vault, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "bln" = ( /obj/effect/decal/cleanable/dirt, @@ -15954,9 +15939,12 @@ /turf/open/floor/f13/wood, /area/f13/building/museum) "box" = ( -/obj/machinery/door/unpowered/secure_NCR, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/obj/structure/barricade/bars, +/obj/structure/barricade/bars, /turf/open/indestructible/ground/outside/road{ - icon_state = "verticalrightborderleft0" + icon_state = "horizontaltopborderbottom0" }, /area/f13/wasteland) "boC" = ( @@ -15997,9 +15985,9 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) "boP" = ( -/obj/machinery/photocopier, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/window/fulltile/wood, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "bpb" = ( /obj/structure/barricade/tentclothcorner{ dir = 1 @@ -16113,22 +16101,12 @@ }, /area/f13/wasteland) "bqo" = ( -/obj/machinery/button/door{ - id = "ncrgate"; - name = "gate button"; - pixel_x = -24; - pixel_y = -6 - }, -/obj/machinery/button/door{ - id = "ncrwatchtower"; - name = "tower shutters button"; - pixel_x = -24; - pixel_y = 6 - }, -/turf/open/floor/f13{ - icon_state = "darkdirtysolid" +/obj/structure/debris/v4, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 2; + icon_state = "outerpavementdirt" }, -/area/f13/ncr) +/area/f13/wasteland) "bqq" = ( /obj/structure/rack, /obj/item/clothing/mask/ncr_facewrap, @@ -16257,6 +16235,11 @@ /obj/structure/tires/half, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"bru" = ( +/obj/machinery/hydroponics/soil/crafted, +/mob/living/simple_animal/cow/brahmin, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "brv" = ( /obj/machinery/light/small{ dir = 1 @@ -16301,11 +16284,9 @@ }, /area/f13/building) "brL" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13{ - icon_state = "floordirty" - }, -/area/f13/building) +/obj/structure/window/fulltile/wood, +/turf/open/floor/f13/wood, +/area/f13/city) "brP" = ( /mob/living/simple_animal/cow/brahmin, /turf/open/indestructible/ground/outside/savannah/topcenter, @@ -16528,7 +16509,7 @@ }, /obj/item/pen/fountain, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, +/turf/open/floor/carpet/red, /area/f13/building) "buq" = ( /obj/item/twohanded/required/kirbyplants{ @@ -16555,24 +16536,21 @@ /obj/structure/sign/poster/official/fruit_bowl{ pixel_x = -32 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building) "buL" = ( /obj/structure/chair/comfy/brown{ dir = 4 }, -/turf/open/floor/f13/wood, +/obj/effect/landmark/start/f13/ncrrep, +/turf/open/floor/carpet/red, /area/f13/building) "buM" = ( /obj/structure/table/wood, /obj/item/storage/fancy/cigarettes/cigars, /obj/item/lighter, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, +/turf/open/floor/carpet/red, /area/f13/building) "buN" = ( /obj/structure/simple_door/room{ @@ -16584,7 +16562,6 @@ /obj/structure/sign/poster/prewar/poster66{ pixel_x = 32 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building) "buP" = ( @@ -16644,11 +16621,10 @@ }, /area/f13/wasteland) "bvW" = ( -/obj/structure/table/wood, -/obj/item/candle/infinite, -/obj/item/storage/fancy/candle_box{ - pixel_x = -10 +/obj/machinery/reagentgrinder{ + pixel_y = 6 }, +/obj/structure/table/wood, /turf/open/floor/f13/wood, /area/f13/city) "bwd" = ( @@ -16675,9 +16651,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/black, +/turf/open/floor/carpet/green, /area/f13/building) "bwr" = ( /obj/structure/bed, @@ -16709,12 +16683,11 @@ }, /area/f13/wasteland) "bwL" = ( -/obj/structure/chair/wood{ - dir = 8 - }, +/obj/structure/flora/ausbushes/sparsegrass, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building) +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "bwM" = ( /obj/machinery/button/door{ id = "ncrarmory"; @@ -16765,11 +16738,8 @@ }, /area/f13/wasteland) "bxp" = ( -/obj/item/flag/ncr, /obj/structure/tires/five, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalleftborderleft1" - }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "bxq" = ( /obj/effect/turf_decal/stripes/asteroid/line{ @@ -16783,8 +16753,7 @@ "bxt" = ( /obj/structure/bed, /obj/item/bedsheet/brown, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/black, +/turf/open/floor/carpet/green, /area/f13/building) "bxu" = ( /obj/effect/turf_decal/shadow, @@ -16794,16 +16763,11 @@ }, /area/f13/legion) "bxA" = ( -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/folding{ - dir = 1 +/obj/structure/flora/roadplant{ + icon_state = "dirt_9d" }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "bxC" = ( /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/outside/sidewalk{ @@ -16919,9 +16883,11 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "byM" = ( -/obj/machinery/door/unpowered/secure_NCR, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/structure/stairs/north{ + color = "#A47449" + }, +/turf/open/floor/f13/wood, +/area/f13/building) "bzf" = ( /obj/structure/sink{ dir = 8; @@ -16982,12 +16948,9 @@ }, /area/f13/ncr) "bzy" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/blue, -/area/f13/building) +/obj/structure/table/wood, +/turf/open/floor/carpet/red, +/area/f13/city) "bzF" = ( /obj/structure/table/wood, /obj/item/flashlight, @@ -17078,18 +17041,10 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) "bAp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/item/pen, -/obj/item/pen, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ncr) +/obj/structure/chair/comfy/bathtub, +/obj/effect/overlay/junk/curtain, +/turf/open/floor/f13/wood, +/area/f13/city) "bAr" = ( /obj/item/storage/trash_stack{ icon_state = "trash_3" @@ -17138,9 +17093,13 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "bAT" = ( -/obj/effect/decal/cleanable/insectguts, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/item/lock_construct, +/obj/item/key, +/obj/item/key, +/obj/item/key, +/obj/structure/table/wood, +/turf/open/floor/carpet/red, +/area/f13/city) "bAV" = ( /obj/machinery/vending/snack, /obj/machinery/light{ @@ -17329,7 +17288,12 @@ /turf/open/floor/f13/wood, /area/f13/building/powered) "bFr" = ( -/obj/machinery/vending/hydroseeds, +/obj/item/clothing/suit/armor/outfit/jacket/ncrcfjacket, +/obj/item/clothing/suit/armor/outfit/jacket/ncrcfjacket, +/obj/item/clothing/suit/armor/outfit/jacket/ncrcfjacket, +/obj/item/clothing/suit/armor/outfit/jacket/ncrcfjacket, +/obj/structure/closet/locker/oldstyle, +/obj/item/storage/box/handcuffs, /turf/open/floor/plasteel/f13/vault_floor/misc, /area/f13/city) "bFs" = ( @@ -17444,13 +17408,10 @@ /area/f13/radiation) "bGP" = ( /obj/machinery/light{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain2" + dir = 8 }, -/area/f13/wasteland) +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ncr) "bGT" = ( /obj/effect/decal/cleanable/blood/drip, /obj/structure/wreck/trash/machinepile, @@ -17491,9 +17452,17 @@ /area/f13/legion) "bHJ" = ( /obj/structure/chair/comfy/brown, +/turf/open/floor/carpet/green, +/area/f13/building) +"bID" = ( +/obj/structure/railing{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/black, +/obj/structure/chair/pew/left{ + dir = 4 + }, +/turf/open/floor/carpet/red, /area/f13/building) "bIH" = ( /obj/effect/decal/cleanable/dirt, @@ -17508,10 +17477,10 @@ }, /area/f13/legion) "bIW" = ( -/obj/structure/fence{ - dir = 4 +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_6" }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "bIZ" = ( @@ -17544,12 +17513,14 @@ }, /area/f13/building) "bJy" = ( -/obj/machinery/light{ - dir = 4 +/obj/effect/turf_decal/weather/dirt{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/rock/jungle, +/obj/structure/flora/junglebush/large, +/turf/open/indestructible/ground/outside/water, +/area/f13/building) "bJC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -17803,6 +17774,12 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) +"bMT" = ( +/obj/structure/window/fulltile/store{ + icon_state = "storewindowright" + }, +/turf/closed/wall/r_wall, +/area/f13/city) "bNa" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -17905,9 +17882,7 @@ "bOm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/filingcabinet, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "bOo" = ( /obj/structure/flora/wasteplant/wild_prickly, @@ -17961,7 +17936,7 @@ /area/f13/wasteland) "bQo" = ( /obj/structure/dresser, -/turf/open/floor/carpet/black, +/turf/open/floor/carpet/green, /area/f13/building) "bQx" = ( /obj/effect/decal/cleanable/dirt, @@ -18019,15 +17994,9 @@ /turf/closed/mineral/random/low_chance, /area/f13/caves) "bRo" = ( -/obj/structure/fence{ - dir = 4; - max_integrity = 500; - name = "reinforced fence" - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain0" - }, -/area/f13/wasteland) +/obj/structure/stairs/east, +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "bRq" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_3" @@ -18218,17 +18187,9 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "bVK" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt, -/obj/structure/flora/rock/jungle, -/obj/structure/flora/junglebush/large, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland) +/obj/structure/barricade/bars, +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "bVX" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -18293,6 +18254,13 @@ icon_state = "dirt" }, /area/f13/wasteland) +"bXj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/miningcar, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "bXl" = ( /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ color = "#e4e4e4" @@ -18310,6 +18278,13 @@ /obj/structure/tires, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"bXw" = ( +/obj/structure/fence/door{ + dir = 4; + pixel_x = 14 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/city) "bXM" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -18433,11 +18408,11 @@ }, /area/f13/radiation) "cao" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/barricade/sandbags, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom0" +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/tree/jungle{ + color = "#d9b51c" }, +/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "cav" = ( /obj/structure/closet/crate/bin/trashbin, @@ -18456,13 +18431,10 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/chair/comfy/shuttle{ - desc = "A comfortable, secure seat. It has a futuristic vouge feel."; - dir = 4; - name = "prewar lounge chair" +/obj/structure/chair/pew/left{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/red/whiteredfull, +/turf/open/floor/carpet/red, /area/f13/building) "caC" = ( /obj/item/reagent_containers/pill/patch/jet, @@ -18555,6 +18527,12 @@ /obj/item/clothing/ears/earmuffs, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"ccq" = ( +/obj/structure/chair/booth{ + dir = 4 + }, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "ccB" = ( /obj/structure/flora/ausbushes/palebush, /turf/open/floor/grass, @@ -18789,6 +18767,7 @@ icon_state = "bench" }, /obj/effect/landmark/start/f13/settler, +/obj/effect/overlay/barbed, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "cht" = ( @@ -19329,6 +19308,12 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"cmx" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "cmA" = ( /obj/structure/bed/mattress/pregame, /obj/effect/decal/cleanable/oil, @@ -19362,12 +19347,14 @@ /turf/open/floor/wood_fancy, /area/f13/legion) "cmL" = ( -/obj/structure/fence, -/obj/effect/overlay/barbed, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain1" - }, -/area/f13/wasteland) +/obj/structure/table/reinforced, +/obj/item/clothing/accessory/armband, +/obj/item/clothing/accessory/armband, +/obj/item/clothing/accessory/armband, +/obj/item/clothing/accessory/armband, +/obj/item/clothing/accessory/armband, +/turf/open/floor/wood_fancy, +/area/f13/city) "cmP" = ( /obj/item/stack/ore/iron, /turf/open/indestructible/ground/inside/mountain, @@ -19447,11 +19434,12 @@ }, /area/f13/wasteland) "cnm" = ( -/obj/machinery/door/unpowered/secure_NCR, -/turf/open/floor/f13{ - icon_state = "darkdirtysolid" +/obj/structure/chair/bench, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 2; + icon_state = "outerpavementdirt" }, -/area/f13/ncr) +/area/f13/wasteland) "cno" = ( /obj/structure/sink{ dir = 4; @@ -19750,8 +19738,7 @@ /obj/structure/chair/comfy/brown{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/black, +/turf/open/floor/carpet/green, /area/f13/building) "cpG" = ( /obj/item/clothing/shoes/f13/rag, @@ -19856,6 +19843,7 @@ /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, +/obj/item/mecha_parts/mecha_equipment/trunk, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/city) "cqF" = ( @@ -20324,9 +20312,12 @@ }, /area/f13/wasteland) "cvl" = ( -/obj/effect/landmark/start/f13/preacher, -/turf/open/floor/f13/wood, -/area/f13/city) +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) "cvp" = ( /turf/closed/wall/f13/tentwall, /area/f13/building/powered) @@ -20511,17 +20502,15 @@ /turf/open/floor/f13/wood, /area/f13/building) "cxJ" = ( -/obj/structure/fence{ - dir = 4 - }, -/obj/structure/decoration/rag, -/obj/structure/decoration/rag{ - icon_state = "skin" +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_3" }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 4; - icon_state = "dirtcorner" +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/cow/brahmin{ + name = "NCR brahmin"; + desc = "This is a branded brahmin or brahma are mutated cattle with two heads and looking udderly ridiculous.
Known for their milk, just don't tip them over." }, +/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "cxN" = ( /obj/effect/decal/cleanable/dirt, @@ -20539,8 +20528,11 @@ /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) "cyj" = ( -/turf/open/transparent/openspace, -/area/f13/ncr) +/obj/structure/campfire/barrel, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontaltopborderbottom0" + }, +/area/f13/wasteland) "cym" = ( /obj/structure/car/rubbish2, /turf/open/indestructible/ground/outside/road, @@ -21059,13 +21051,11 @@ /turf/open/floor/f13/wood, /area/f13/building/hospital) "cLv" = ( -/mob/living/simple_animal/cow/brahmin, -/obj/effect/turf_decal/shadow, -/turf/open/indestructible/ground/inside/dirt/stamped/outside/sand{ - dir = 1; - icon_state = "desertsmooth2" +/obj/structure/stairs/east{ + color = "#A47449" }, -/area/f13/wasteland) +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "cLw" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/bottle/f13nukacola, @@ -21109,14 +21099,16 @@ /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/city) "cMG" = ( -/obj/structure/sacrificealtar{ - density = 1; - icon_state = "sacrificealtar-red"; - name = "altar"; - pixel_y = 7 - }, +/obj/structure/table/wood, +/obj/machinery/processor/chopping_block, /turf/open/floor/f13/wood, /area/f13/city) +"cMR" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland) "cMS" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/dirt, @@ -21196,9 +21188,7 @@ pixel_x = 3; pixel_y = -32 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/black, +/turf/open/floor/carpet/green, /area/f13/building) "cOO" = ( /obj/effect/decal/cleanable/dirt, @@ -21217,8 +21207,7 @@ }, /area/f13/building/massfusion) "cOT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fence{ +/obj/structure/fence/cut/large{ dir = 4 }, /turf/open/indestructible/ground/outside/sidewalk, @@ -21245,9 +21234,12 @@ /turf/open/floor/f13, /area/f13/building) "cPA" = ( -/obj/mecha/working/normalvehicle/ncrtruck/mp/loaded, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalleftborderright0" +/obj/machinery/camera/autoname{ + name = "Eastwood South Gate"; + network = list("Eastwood") + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) "cPB" = ( @@ -21354,13 +21346,14 @@ }, /area/f13/building) "cRu" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_6" +/obj/machinery/light, +/obj/structure/car/rubbish_lights{ + pixel_y = -7; + pixel_x = -21 }, -/obj/structure/chair/stool{ - icon_state = "bench" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, -/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "cRE" = ( /obj/effect/turf_decal/weather/dirt{ @@ -21400,6 +21393,18 @@ color = " A6635D" }, /area/f13/caves) +"cSd" = ( +/obj/structure/sign/poster/ncr/democracy{ + pixel_x = 29 + }, +/obj/structure/sign/poster/ncr/keep_to_myself{ + pixel_x = 32; + pixel_y = -15 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2" + }, +/area/f13/wasteland) "cSo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/simple_door/metal/store, @@ -21426,6 +21431,10 @@ }, /turf/open/indestructible/ground/outside/gravel, /area/f13/legion) +"cTy" = ( +/obj/structure/table/reinforced, +/turf/open/floor/wood_fancy, +/area/f13/city) "cTz" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -21507,14 +21516,25 @@ /turf/open/floor/plasteel/f13/vault_floor/dark, /area/f13/ncr) "cVt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/barrel/dangerous, -/obj/effect/decal/waste{ - icon_state = "goo12" +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15 + }, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15; + pixel_y = 18 + }, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15; + pixel_y = 18 }, /turf/open/indestructible/ground/outside/road{ - icon_state = "verticalrightborderleft0" + icon_state = "horizontalbottombordertopright" }, /area/f13/wasteland) "cVJ" = ( @@ -21578,15 +21598,12 @@ }, /area/f13/wasteland) "cWW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/pinup_ride{ - pixel_y = 32 - }, -/obj/structure/table/wood, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/campfire/stove{ + density = 0; + pixel_y = 16 }, -/area/f13/ncr) +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "cXd" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/road, @@ -21596,15 +21613,11 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/legion) "cXB" = ( -/obj/structure/fence, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 4; - icon_state = "dirt" +/obj/structure/stairs/east{ + color = "#A47449" }, -/area/f13/wasteland) +/turf/open/floor/f13/wood, +/area/f13/city) "cXY" = ( /obj/structure/flora/grass/coyote/twentyfive, /turf/open/indestructible/ground/outside/desert, @@ -21645,6 +21658,22 @@ /mob/living/simple_animal/hostile/raider/ranged/boss, /turf/open/floor/f13/wood, /area/f13/building/hospital) +"cZL" = ( +/obj/structure/barricade/sandbags, +/obj/structure/obstacle/barbedwire{ + dir = 4 + }, +/obj/structure/fence{ + dir = 4 + }, +/obj/structure/fence{ + dir = 1; + pixel_x = -15 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalleftborderright2top" + }, +/area/f13/wasteland) "dak" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt{ @@ -21673,8 +21702,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, +/turf/open/floor/carpet/red, /area/f13/building) "daI" = ( /obj/structure/flora/tree/cactus, @@ -21883,9 +21911,14 @@ /turf/open/floor/f13/wood, /area/f13/building) "deB" = ( -/obj/effect/decal/cleanable/blood/gibs/human/body, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/structure/window/fulltile/store{ + icon_state = "storewindowright" + }, +/obj/machinery/door/poddoor/shutters{ + layer = 3.3 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "deG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/obstacle/barbedwire/end, @@ -22049,13 +22082,10 @@ /turf/open/floor/f13/wood, /area/f13/building) "dii" = ( -/obj/structure/girder, -/obj/structure/barricade/bars, -/obj/structure/barricade/wooden/planks/pregame, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 7; - icon_state = "outerpavement" +/obj/structure/obstacle/barbedwire{ + dir = 4 }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "dim" = ( /obj/structure/barricade/wooden, @@ -22156,6 +22186,8 @@ /area/f13/wasteland) "dkx" = ( /obj/structure/flora/grass/coyote/two, +/obj/item/target, +/obj/effect/turf_decal/stripes/line, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontaltopborderbottom0" }, @@ -22376,9 +22408,15 @@ }, /area/f13/building) "doR" = ( -/obj/structure/chair/wood{ - dir = 8 - }, +/obj/structure/closet/cabinet/anchored, +/obj/item/clothing/head/f13/ncr/standard/conscript, +/obj/item/clothing/head/f13/ncr/standard/conscript, +/obj/item/clothing/suit/armor/medium/vest/ncr, +/obj/item/melee/onehanded/club/ncrflag, +/obj/item/melee/onehanded/club/ncrflag, +/obj/item/clothing/suit/armor/ncrarmor/conscript, +/obj/item/clothing/suit/armor/ncrarmor/conscript, +/obj/item/clothing/suit/armor/ncrarmor/conscript, /turf/open/floor/f13/wood, /area/f13/city) "doU" = ( @@ -22389,8 +22427,11 @@ }, /area/f13/wasteland) "doX" = ( -/obj/effect/landmark/start/f13/secretary, -/turf/open/floor/f13/wood, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/turf/open/floor/carpet/royalblack, /area/f13/city) "dpf" = ( /obj/effect/decal/cleanable/dirt, @@ -22453,6 +22494,10 @@ icon_state = "horizontalbottomborderbottom2right" }, /area/f13/city) +"dqk" = ( +/obj/structure/wreck/trash/four_barrels, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "dqn" = ( /obj/machinery/light, /obj/effect/decal/cleanable/dirt/dust, @@ -22744,10 +22789,10 @@ }, /area/f13/city) "dwX" = ( -/obj/structure/closet/crate/bin/trashbin, -/obj/effect/decal/cleanable/cobweb, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/turf/open/floor/plasteel/f13/vault_floor/blue/side{ + dir = 8 + }, +/area/f13/building) "dxf" = ( /obj/structure/debris/v3, /obj/effect/decal/cleanable/glass, @@ -23076,12 +23121,19 @@ /turf/open/floor/f13/wood, /area/f13/building/powered) "dDO" = ( -/obj/structure/fence, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 1; - icon_state = "outerpavementdirt" +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = 14 }, -/area/f13/wasteland) +/obj/structure/fence{ + dir = 4; + layer = 3.1 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermainbottom" + }, +/area/f13/city) "dEk" = ( /obj/machinery/light/lamp_post{ dir = 8 @@ -23117,6 +23169,18 @@ icon_state = "darkrusty" }, /area/f13/building/massfusion) +"dEY" = ( +/obj/structure/barricade/sandbags, +/obj/structure/obstacle/barbedwire{ + dir = 4 + }, +/obj/structure/fence{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright3" + }, +/area/f13/wasteland) "dFh" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/dirt{ @@ -23151,14 +23215,12 @@ }, /area/f13/building/mall) "dFN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/white/line, -/obj/structure/wreck/trash/engine{ - pixel_x = 1; - pixel_y = 4 +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerpavementdirt" }, -/turf/open/indestructible/ground/outside/road, -/area/f13/wasteland) +/area/f13/city) "dFR" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt{ @@ -23397,10 +23459,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/table/reinforced, -/obj/item/mecha_parts/mecha_equipment/trunk, -/obj/item/mecha_parts/mecha_equipment/trunk, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "dJV" = ( /obj/effect/turf_decal/weather/dirt{ @@ -23460,6 +23519,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building) +"dLL" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plasteel/f13/vault_floor/dark, +/area/f13/ncr) "dLM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/roller, @@ -23546,6 +23609,12 @@ icon_state = "horizontaltopborderbottom2left" }, /area/f13/wasteland) +"dOm" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerpavementdirt" + }, +/area/f13/city) "dOs" = ( /obj/effect/landmark/start/f13/orator, /turf/open/indestructible/ground/outside/gravel/edge{ @@ -23623,6 +23692,10 @@ /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/desert, /area/f13/building) +"dPO" = ( +/obj/structure/table/wood/junk, +/turf/open/floor/f13/wood, +/area/f13/city) "dPQ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -23776,11 +23849,7 @@ }, /area/f13/wasteland) "dSy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/black, +/turf/open/floor/carpet/green, /area/f13/building) "dSA" = ( /obj/structure/flora/grass/wasteland{ @@ -23793,21 +23862,15 @@ /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) "dSP" = ( -/obj/effect/landmark/start/f13/ncrconscript, -/turf/open/indestructible/ground/outside/road, +/obj/structure/fence/corner{ + dir = 1 + }, +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "dSW" = ( -/obj/structure/closet, -/obj/item/clothing/accessory/armband/black, -/obj/item/clothing/accessory/armband/black, -/obj/item/clothing/head/f13/ncr/steelpot_mp, -/obj/item/clothing/head/f13/ncr/steelpot_mp, -/obj/item/clothing/head/f13/ncr/steelpot_mp, -/obj/item/clothing/head/f13/ncr/steelpot_mp, -/turf/open/floor/f13{ - icon_state = "darkdirtysolid" - }, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "dSX" = ( /obj/structure/flora/stump, /obj/effect/decal/cleanable/dirt, @@ -23902,6 +23965,10 @@ icon_state = "horizontaloutermain0" }, /area/f13/wasteland) +"dUo" = ( +/obj/structure/wreck/trash/two_barrels, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "dUr" = ( /obj/structure/flora/ausbushes/palebush, /turf/open/indestructible/ground/outside/dirt, @@ -24000,6 +24067,14 @@ "dXc" = ( /turf/closed/wall, /area/f13/city) +"dXf" = ( +/obj/structure/barricade/tentclothedge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/city) "dXg" = ( /obj/structure/table/wood, /obj/machinery/cell_charger, @@ -24291,13 +24366,34 @@ icon_state = "greenrustychess" }, /area/f13/building/massfusion) +"edD" = ( +/obj/structure/table/wood/crate{ + pixel_x = 1; + pixel_y = 18; + layer = 2.9 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "edG" = ( /obj/structure/railing{ dir = 8; layer = 4.1 }, +/obj/item/gun/ballistic/automatic/service, +/obj/item/gun/ballistic/automatic/service, +/obj/item/gun/ballistic/automatic/service, +/obj/structure/guncase{ + anchored = 1 + }, /turf/open/floor/f13/wood, /area/f13/city) +"edI" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerpavementdirt" + }, +/area/f13/wasteland) "edL" = ( /obj/effect/decal/remains/human, /turf/open/indestructible/ground/inside/mountain, @@ -24329,9 +24425,11 @@ }, /area/f13/wasteland) "eee" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/car/rubbish4, -/turf/open/indestructible/ground/outside/road, +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerpavementdirt" + }, /area/f13/wasteland) "eex" = ( /obj/machinery/light/lamp_post/quadra, @@ -24941,6 +25039,10 @@ name = "rocky dirt" }, /area/f13/wasteland) +"erx" = ( +/obj/effect/spawner/lootdrop/f13/weapon/gun/energy/midhigh, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland) "ese" = ( /turf/open/floor/plasteel/f13{ icon_state = "darkrusty" @@ -25116,10 +25218,12 @@ }, /area/f13/caves) "evn" = ( -/obj/machinery/iv_drip, -/obj/machinery/iv_drip, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) +/obj/machinery/light/small, +/obj/machinery/workbench/forge, +/obj/item/gun/ballistic/automatic/pistol/ninemil, +/obj/item/gun/ballistic/automatic/pistol/ninemil, +/turf/open/floor/f13/wood, +/area/f13/city) "evq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -25366,9 +25470,7 @@ "ezA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/chair/folding{ - dir = 1 - }, +/obj/effect/decal/cleanable/glass, /turf/open/floor/plasteel/vault, /area/f13/ncr) "ezK" = ( @@ -25548,9 +25650,10 @@ /turf/open/floor/f13/wood, /area/f13/building/powered) "eCB" = ( -/obj/structure/bonfire, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/turf/open/floor/carpet/royalblack, +/area/f13/building) "eDz" = ( /obj/structure/tires/five, /turf/open/indestructible/ground/outside/sidewalk{ @@ -25667,11 +25770,11 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "eFV" = ( -/obj/machinery/door/unpowered/secure_NCR, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/barricade/tentleatheredge{ + dir = 8 }, -/area/f13/ncr) +/turf/closed/wall/f13/wood/house, +/area/f13/city) "eFX" = ( /obj/structure/simple_door/house, /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, @@ -25800,14 +25903,17 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "eIH" = ( -/obj/effect/decal/waste{ - icon_state = "goo12" +/obj/structure/table/wood, +/obj/structure/fence/wooden{ + dir = 1; + icon_state = "post_wood"; + pixel_x = -15 }, -/turf/closed/wall/f13/store{ - desc = "A pre-War wall made of solid concrete."; - name = "concrete wall" +/obj/structure/barricade/bars, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontaltopborderbottom0" }, -/area/f13/ncr) +/area/f13/wasteland) "eIK" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola{ @@ -25849,7 +25955,12 @@ }, /area/f13/wasteland) "eJO" = ( -/turf/closed/wall/f13/tentwall, +/obj/structure/fence{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop2" + }, /area/f13/wasteland) "eJS" = ( /obj/structure/fence{ @@ -25891,23 +26002,15 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "eKD" = ( -/obj/item/clothing/under/f13/ncrcf{ - name = "NCR Correctional Facility Uniform" - }, -/obj/item/clothing/under/f13/ncrcf{ - name = "NCR Correctional Facility Uniform" - }, -/obj/item/clothing/under/f13/ncrcf{ - name = "NCR Correctional Facility Uniform" +/obj/structure/fence/wooden{ + dir = 1; + icon_state = "post_wood" }, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/shoes/sneakers/black, -/obj/structure/rack, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/turf_decal/gravel_edge{ + dir = 4 }, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/dirt, +/area/f13/city) "eKF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -25932,8 +26035,11 @@ /turf/open/floor/f13/wood, /area/f13/radiation) "eKZ" = ( -/obj/structure/bonfire/dense, -/obj/item/stack/rods/ten, +/obj/structure/table/wood/crate{ + pixel_x = -7; + pixel_y = 18; + layer = 2.9 + }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "eLj" = ( @@ -26051,10 +26157,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "eNa" = ( -/obj/structure/barricade/sandbags, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalleftborderright2" +/obj/structure/chair/stool{ + icon_state = "bench" }, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "eNm" = ( /obj/structure/sign/poster/contraband/pinup_vixen{ @@ -26630,10 +26736,19 @@ /area/f13/wasteland) "eXN" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/tank, -/obj/effect/turf_decal/gravel_edge, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop0" +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15 + }, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15; + pixel_y = 18 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopright" }, /area/f13/wasteland) "eXO" = ( @@ -26686,14 +26801,12 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/city) "eYp" = ( -/obj/effect/turf_decal/gravel_edge{ - dir = 5 +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy"; + name = "Unarmed mr. gutsy" }, -/obj/effect/landmark/start/f13/farmer, -/turf/open/indestructible/ground/outside/gravel{ - color = "#B7ABAB"; - footstep = "dirt"; - name = "rocky dirt" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain1" }, /area/f13/wasteland) "eYv" = ( @@ -26861,13 +26974,8 @@ /turf/open/floor/wood_common, /area/f13/building/powered) "fbu" = ( -/obj/structure/window/reinforced/fulltile, -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "ncradvisorshutters"; - name = "privacy shutters" - }, -/turf/open/floor/plasteel/f13/vault_floor/dark, +/obj/item/chair/folding, +/turf/open/floor/plasteel/vault, /area/f13/ncr) "fbA" = ( /obj/machinery/ammobench, @@ -26906,8 +27014,8 @@ /turf/open/floor/f13/wood, /area/f13/building/powered) "fbU" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/blue, +/obj/structure/musician/piano, +/turf/open/floor/f13/wood, /area/f13/building) "fck" = ( /obj/effect/decal/cleanable/dirt, @@ -26976,11 +27084,13 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "fdy" = ( -/obj/structure/table, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy"; + name = "Unarmed mr. gutsy" }, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) "fdE" = ( /obj/structure/barricade/wooden, /turf/closed/wall/f13/wood, @@ -26994,11 +27104,12 @@ /turf/open/floor/f13/wood, /area/f13/building) "fdT" = ( -/obj/mecha/working/normalvehicle/buggy/ranger/loaded, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain1" +/obj/structure/sign/departments/holy, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" }, -/area/f13/wasteland) +/area/f13/building) "fdY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/wooden, @@ -27008,9 +27119,16 @@ }, /area/f13/wasteland) "fef" = ( -/obj/structure/car/rubbish4, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontaltopborderbottom2" +/obj/structure/wreck/trash/four_barrels, +/obj/structure/wreck/trash/three_barrels{ + pixel_y = 17 + }, +/obj/structure/wreck/trash/three_barrels{ + pixel_y = 17 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerpavementdirt" }, /area/f13/wasteland) "fei" = ( @@ -27072,11 +27190,19 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "fgh" = ( -/obj/machinery/photocopier, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/turf_decal/weather/dirt, +/obj/effect/landmark/start/f13/settler, +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench" }, -/area/f13/ncr) +/obj/effect/overlay/barbed, +/turf/open/indestructible/ground/outside/gravel{ + color = "#B7ABAB"; + footstep = "dirt"; + name = "rocky dirt" + }, +/area/f13/wasteland) "fgQ" = ( /obj/structure/barricade/tentclothedge{ dir = 8 @@ -27147,9 +27273,7 @@ /turf/open/floor/f13/wood, /area/f13/building) "fhI" = ( -/obj/item/trash/popcorn, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralsolid, +/turf/open/floor/carpet/red, /area/f13/building) "fhJ" = ( /obj/structure/ore_box, @@ -27184,12 +27308,9 @@ /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/city) "fiy" = ( -/obj/structure/simple_door/room{ - name = "Archive Room"; - req_one_access_txt = "121" - }, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/structure/barricade/wooden, +/turf/closed/wall/f13/wood/house, +/area/f13/wasteland) "fiF" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4" @@ -27251,6 +27372,14 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) +"fkF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/tentclothcorner{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/city) "fkI" = ( /obj/structure/dresser, /obj/effect/decal/cleanable/dirt, @@ -27263,6 +27392,25 @@ }, /turf/open/floor/wood_fancy, /area/f13/legion) +"fkP" = ( +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15 + }, +/obj/structure/railing{ + color = "#A47449" + }, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15; + pixel_y = 18 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopright" + }, +/area/f13/wasteland) "fkV" = ( /obj/item/storage/bag/plants, /turf/open/indestructible/ground/outside/dirt, @@ -27316,8 +27464,14 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "fmg" = ( -/obj/item/trash/energybar, -/turf/open/indestructible/ground/outside/sidewalk, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/structure/wreck/trash/four_barrels, +/obj/structure/wreck/trash/three_barrels{ + pixel_y = 17 + }, +/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "fmG" = ( /obj/structure/flora/tree/cactus, @@ -27490,6 +27644,10 @@ /area/f13/wasteland) "fpJ" = ( /obj/structure/flora/junglebush/large, +/obj/structure/fence{ + dir = 4; + layer = 3.1 + }, /turf/open/floor/grass, /area/f13/wasteland) "fpL" = ( @@ -27777,11 +27935,10 @@ }, /area/f13/city) "fvg" = ( -/obj/machinery/smartfridge/bottlerack/grownbin, /obj/structure/fireaxecabinet{ pixel_y = -30 }, -/turf/open/floor/plasteel/f13/vault_floor/misc, +/turf/closed/wall/f13/wood/house, /area/f13/city) "fvm" = ( /obj/effect/decal/cleanable/dirt, @@ -27790,6 +27947,14 @@ /mob/living/simple_animal/hostile/mirelurk, /turf/open/floor/f13/wood, /area/f13/building/powered) +"fvt" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/city) "fvE" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -27829,10 +27994,14 @@ }, /area/f13/wasteland) "fwK" = ( -/obj/structure/debris/v4, -/obj/structure/car/rubbish2, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain0" +/obj/structure/fence{ + dir = 4; + layer = 3.1 + }, +/turf/open/indestructible/ground/outside/gravel{ + color = "#B7ABAB"; + footstep = "dirt"; + name = "rocky dirt" }, /area/f13/wasteland) "fwM" = ( @@ -28040,6 +28209,10 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"fAe" = ( +/obj/structure/rug/big/rug_blue_shag, +/turf/open/floor/f13/wood, +/area/f13/city) "fAi" = ( /obj/structure/mirelurkegg, /turf/open/indestructible/ground/outside/water, @@ -28162,10 +28335,11 @@ }, /area/f13/radiation) "fDe" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/mob/living/simple_animal/chicken, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/structure/window/fulltile/house{ + icon_state = "storewindowbottom" + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ncr) "fDk" = ( /obj/effect/decal/cleanable/oil, /obj/effect/decal/cleanable/dirt, @@ -28196,7 +28370,7 @@ /obj/item/flashlight/lamp/green{ pixel_x = -5 }, -/turf/open/floor/carpet/black, +/turf/open/floor/carpet/green, /area/f13/building) "fDF" = ( /obj/effect/decal/cleanable/dirt, @@ -28430,6 +28604,13 @@ icon_state = "outerpavementcorner" }, /area/f13/wasteland) +"fIL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalleftborderright2bottom" + }, +/area/f13/wasteland) "fIP" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/sidewalk{ @@ -28573,7 +28754,6 @@ /turf/open/floor/f13/wood, /area/f13/building/powered) "fKD" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/blue/side{ dir = 10 }, @@ -28709,6 +28889,17 @@ icon_state = "yellowrustychess" }, /area/f13/building/massfusion) +"fOw" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/wasteland) "fOB" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, @@ -28730,6 +28921,13 @@ icon_state = "verticaloutermain1" }, /area/f13/wasteland) +"fOJ" = ( +/obj/structure/fence/wooden{ + dir = 1; + icon_state = "post_wood" + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "fOO" = ( /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3, /turf/open/indestructible/ground/outside/dirt{ @@ -28747,6 +28945,18 @@ icon_state = "dirt" }, /area/f13/legion) +"fPb" = ( +/obj/structure/rack, +/obj/item/radio/headset/headset_town, +/obj/item/radio/headset/headset_town, +/obj/item/radio/headset/headset_town, +/obj/item/radio/headset/headset_town, +/obj/item/radio/headset/headset_town, +/turf/open/floor/f13{ + dir = 10; + icon_state = "redmark" + }, +/area/f13/city) "fPc" = ( /obj/structure/showcase/cyborg/old, /turf/open/floor/f13{ @@ -28881,6 +29091,11 @@ icon_state = "wasteland33" }, /area/f13/radiation) +"fSu" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/closet/crate/grave, +/turf/open/floor/grass, +/area/f13/wasteland) "fSy" = ( /obj/machinery/light{ dir = 1; @@ -28974,10 +29189,9 @@ }, /area/f13/wasteland) "fVc" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/mob/living/simple_animal/hostile/bloatfly, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/structure/simple_door/repaired, +/turf/open/floor/f13/wood, +/area/f13/city) "fVj" = ( /obj/structure/kitchenspike, /obj/effect/decal/cleanable/blood, @@ -29458,12 +29672,17 @@ }, /area/f13/wasteland) "ggO" = ( -/obj/item/clothing/head/papersack, -/obj/item/clothing/suit/toggle/labcoat, +/obj/structure/reagent_dispensers/fueltank/vehicle_gas_station{ + icon_state = "vat"; + tank_volume = 1500; + name = "Gas Tank"; + color = "#FF0000" + }, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom0" + dir = 5; + icon_state = "outerpavementdirt" }, -/area/f13/wasteland) +/area/f13/city) "ggR" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -29473,6 +29692,15 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"ghn" = ( +/obj/item/key, +/obj/item/lock_construct, +/obj/structure/bed/mattress{ + icon_state = "mattress2"; + pixel_y = -3 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "ght" = ( /obj/effect/turf_decal/shadow, /turf/open/indestructible/ground/inside/dirt/stamped/outside/sand{ @@ -29550,6 +29778,26 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +"gjw" = ( +/obj/effect/overlay/junk/oldpipes{ + dir = 4; + pixel_y = 15 + }, +/obj/effect/overlay/junk/oldpipes{ + dir = 10; + layer = 2; + pixel_y = 15; + pixel_x = 14 + }, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "innermaincornerouter - W" + }, +/area/f13/wasteland) "gjz" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -29602,7 +29850,7 @@ /area/f13/building/museum) "gkK" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralsolid, +/turf/open/floor/carpet/red, /area/f13/building) "gkS" = ( /obj/machinery/light/small{ @@ -29622,7 +29870,7 @@ /turf/open/floor/carpet, /area/f13/building/mall) "gla" = ( -/obj/effect/decal/cleanable/dirt, +/obj/machinery/hydroponics/soil/pot, /turf/open/floor/plasteel/f13/vault_floor/blue/side{ dir = 1 }, @@ -29634,6 +29882,24 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +"glq" = ( +/obj/structure/chair/bench{ + pixel_x = 1 + }, +/obj/item/reagent_containers/food/drinks/bottle/sunset{ + layer = 3.1; + pixel_y = 2; + pixel_x = -12 + }, +/obj/item/reagent_containers/food/drinks/bottle/sunset{ + layer = 3.1; + pixel_x = -4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0"; + layer = 3 + }, +/area/f13/wasteland) "glR" = ( /obj/structure/wreck/trash/machinepile, /turf/open/floor/f13/wood, @@ -29665,9 +29931,10 @@ }, /area/f13/building/powered) "gmK" = ( -/obj/item/reagent_containers/food/drinks/bottle/rotgut, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/folding, +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "gmT" = ( /obj/structure/timeddoor, /turf/closed/wall/f13/store, @@ -29677,7 +29944,9 @@ /turf/closed/indestructible/rock, /area/f13/caves) "gnd" = ( -/obj/structure/barricade/sandbags, +/obj/structure/fence{ + dir = 4 + }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalbottombordertop1" }, @@ -29695,15 +29964,10 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/brotherhood) "gnm" = ( -/obj/effect/turf_decal/gravel_edge{ - dir = 9 - }, -/turf/open/indestructible/ground/outside/gravel{ - color = "#B7ABAB"; - footstep = "dirt"; - name = "rocky dirt" +/turf/open/floor/f13/wood{ + icon_state = "housewood4-broken" }, -/area/f13/wasteland) +/area/f13/city) "gns" = ( /obj/effect/decal/cleanable/oil/streak{ pixel_x = -10 @@ -29971,6 +30235,18 @@ icon_state = "darkrusty" }, /area/f13/building/powered) +"gsM" = ( +/obj/structure/barricade/tentclothedge, +/obj/structure/campfire/stove{ + pixel_y = 47; + pixel_x = -17; + density = 0 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "horizontaloutermain1" + }, +/area/f13/city) "gtg" = ( /obj/structure/flora/grass/coyote/twentyone, /turf/open/indestructible/ground/outside/desert/sonora{ @@ -29987,6 +30263,26 @@ icon_state = "horizontaltopborderbottom0" }, /area/f13/wasteland) +"gtn" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 1 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 8; + density = 0 + }, +/obj/structure/fence/wooden{ + dir = 4; + pixel_y = 5; + density = 0 + }, +/obj/item/clothing/head/cone, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopleft" + }, +/area/f13/wasteland) "gtp" = ( /obj/structure/rack, /obj/item/storage/box/rxglasses, @@ -30362,15 +30658,9 @@ /turf/open/floor/plasteel/f13/vault_floor/neutral/white, /area/f13/building/mall) "gAk" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/mecha/working/normalvehicle/buggy/legion/loaded, -/turf/open/indestructible/ground/outside/dirt{ - dir = 8; - icon_state = "dirt" - }, -/area/f13/wasteland) +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/f13/wood, +/area/f13/building) "gAn" = ( /mob/living/simple_animal/hostile/mirelurk/baby, /turf/open/indestructible/ground/inside/mountain, @@ -30650,7 +30940,6 @@ /obj/structure/chair/office{ dir = 4 }, -/obj/effect/landmark/start/f13/ncrlogisticsofficer, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) "gEN" = ( @@ -30705,6 +30994,10 @@ icon_state = "darkdirty" }, /area/f13/ncr) +"gFW" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "gGe" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -30928,10 +31221,7 @@ /area/f13/wasteland) "gKm" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 4; - icon_state = "outerbordercorner" - }, +/turf/closed/wall/f13/wood/house/shack, /area/f13/wasteland) "gKt" = ( /obj/structure/window/reinforced/fulltile, @@ -30968,6 +31258,12 @@ icon_state = "verticalrightborderrighttop" }, /area/f13/wasteland) +"gKE" = ( +/obj/structure/newchalkboard{ + pixel_y = 29 + }, +/turf/open/floor/carpet/green, +/area/f13/city) "gKS" = ( /obj/structure/obstacle/barbedwire/end{ dir = 4 @@ -31203,13 +31499,10 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "gOf" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/item/instrument/guitar, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/plasteel/f13/vault_floor/blue, +/area/f13/building) "gOl" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/road{ @@ -31374,10 +31667,8 @@ }, /area/f13/wasteland) "gSm" = ( -/obj/structure/grille/indestructable, -/obj/structure/window/reinforced/fulltile/indestructable, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/blue, +/turf/open/floor/carpet/royalblack, /area/f13/building) "gSw" = ( /obj/structure/sink{ @@ -31447,6 +31738,11 @@ /obj/structure/table/wood, /turf/open/floor/f13/wood, /area/f13/brotherhood) +"gUe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "gUg" = ( /obj/machinery/door/poddoor/shutters/old{ id = "factorygate"; @@ -31524,6 +31820,13 @@ icon_state = "floorrustysolid" }, /area/f13/building/museum) +"gVp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/tentclothedge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/city) "gVr" = ( /obj/structure/reagent_dispensers/compostbin, /obj/effect/decal/cleanable/dirt, @@ -31622,6 +31925,14 @@ icon_state = "desertsmooth8" }, /area/f13/legion) +"gXi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopleft" + }, +/area/f13/wasteland) "gXm" = ( /obj/structure/ladder/unbreakable{ height = 2; @@ -31724,9 +32035,14 @@ }, /area/f13/wasteland) "gZe" = ( -/obj/structure/table, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) +/obj/structure/barricade/tentleatheredge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 2; + icon_state = "outerpavementdirt" + }, +/area/f13/wasteland) "gZf" = ( /obj/machinery/light/small{ dir = 8; @@ -31913,9 +32229,7 @@ /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" }, -/obj/machinery/grill{ - pixel_y = 4 - }, +/obj/structure/chair/bench, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "hcj" = ( @@ -31966,7 +32280,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "hdn" = ( -/obj/structure/debris/v3, +/obj/structure/car, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontaltopborderbottom2" }, @@ -32173,17 +32487,16 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/radiation) "hjs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/gravel_edge, +/obj/structure/wreck/trash/one_tire, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop2right" + icon_state = "horizontaloutermainright" }, /area/f13/wasteland) "hkg" = ( -/obj/structure/table/wood, -/obj/structure/gallow, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/structure/chair/comfy/bathtub, +/obj/structure/curtain/stage, +/turf/open/floor/f13/wood, +/area/f13/city) "hkk" = ( /obj/structure/rack/shelf_metal, /obj/effect/spawner/lootdrop/f13/crafting, @@ -32507,6 +32820,13 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"hsv" = ( +/obj/structure/wreck/trash/four_barrels, +/obj/structure/wreck/trash/three_barrels{ + pixel_y = 17 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/wasteland) "hsM" = ( /obj/structure/flora/stump, /turf/open/indestructible/ground/outside/dirt{ @@ -32603,7 +32923,6 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "huD" = ( -/obj/structure/closet/crate/grave, /obj/effect/turf_decal/weather/dirt{ dir = 8 }, @@ -32646,6 +32965,13 @@ color = "#A47449"; dir = 4 }, +/obj/structure/barricade/sandbags, +/obj/structure/fence{ + dir = 4 + }, +/obj/structure/obstacle/barbedwire{ + dir = 4 + }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" }, @@ -32692,7 +33018,7 @@ /obj/structure/chair/folding{ dir = 8 }, -/turf/open/floor/plasteel/vault, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "hwP" = ( /obj/structure/flora/wasteplant/wild_datura, @@ -33149,7 +33475,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "hHo" = ( /obj/structure/flora/grass/wasteland{ @@ -33235,8 +33561,8 @@ }, /area/f13/wasteland) "hJP" = ( -/obj/structure/simple_door/room, -/turf/open/floor/wood_fancy/wood_fancy_dark, +/obj/structure/barricade/tentclothedge, +/turf/open/indestructible/ground/outside/sidewalk, /area/f13/city) "hJQ" = ( /obj/effect/decal/cleanable/dirt, @@ -33562,11 +33888,8 @@ /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/powered) "hRj" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_6" - }, -/turf/open/indestructible/ground/outside/dirt, +/obj/structure/barricade/wooden, +/turf/closed/wall/f13/wood/house/broken, /area/f13/wasteland) "hRn" = ( /turf/open/indestructible/ground/outside/ruins{ @@ -33669,9 +33992,11 @@ /turf/closed/wall/rust, /area/f13/building) "hTg" = ( -/obj/item/storage/trash_stack, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/structure/chair/folding{ + dir = 1 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "hTq" = ( /obj/structure/reagent_dispensers/barrel/old, /obj/item/flag/bos, @@ -33903,9 +34228,7 @@ /obj/structure/table, /obj/item/paper_bin, /obj/item/pen/fourcolor, -/turf/open/floor/f13{ - icon_state = "floordirtysolid" - }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "hYt" = ( /obj/structure/chair/office/dark{ @@ -33948,6 +34271,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/powered) +"iai" = ( +/obj/structure/sign/poster/prewar/rxcola1{ + pixel_x = 29 + }, +/obj/structure/sign/poster/ncr/loaded{ + pixel_x = 29; + pixel_y = -13 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2" + }, +/area/f13/wasteland) "ian" = ( /mob/living/simple_animal/hostile/fireant, /turf/open/indestructible/ground/inside/dirt, @@ -34134,7 +34469,7 @@ id = "Town" }, /turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain0" + icon_state = "horizontalbottombordertopleft" }, /area/f13/wasteland) "iej" = ( @@ -34178,8 +34513,11 @@ }, /area/f13/wasteland) "ieK" = ( -/obj/structure/car/rubbish1, -/turf/open/indestructible/ground/outside/sidewalk, +/obj/structure/chair/stool{ + dir = 1; + icon_state = "bench" + }, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "ieN" = ( /obj/machinery/smartfridge/drying_rack, @@ -34676,6 +35014,14 @@ icon_state = "rubble" }, /area/f13/wasteland) +"ipf" = ( +/obj/effect/turf_decal/trimline/white/line, +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -3 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/city) "ipi" = ( /obj/machinery/door/poddoor/shutters{ id = "hospitalgarage1"; @@ -34731,11 +35077,11 @@ }, /area/f13/wasteland) "iqA" = ( -/obj/structure/debris/v3, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalbottombordertop2" +/obj/structure/chair/office, +/turf/open/floor/f13/wood{ + icon_state = "housewood3-broken" }, -/area/f13/wasteland) +/area/f13/city) "iqD" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -34770,6 +35116,11 @@ /obj/item/mecha_parts/mecha_equipment/trunk, /obj/item/mecha_parts/mecha_equipment/trunk, /obj/item/mecha_parts/mecha_equipment/trunk, +/obj/item/mecha_parts/mecha_equipment/seat, +/obj/item/mecha_parts/mecha_equipment/seat, +/obj/item/mecha_parts/mecha_equipment/seat, +/obj/item/mecha_parts/mecha_equipment/seat, +/obj/item/mecha_parts/mecha_equipment/seat, /turf/open/floor/f13{ icon_state = "floorrusty" }, @@ -34829,12 +35180,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/caves) "iso" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/barricade/sandbags, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalrightborderleft0" - }, +/turf/open/indestructible/ground/outside/road/damagedhor/severe, /area/f13/wasteland) "isu" = ( /obj/structure/window/reinforced{ @@ -34894,10 +35240,9 @@ /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/building/powered) "ite" = ( -/obj/item/reagent_containers/food/snacks/popcorn, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralsolid, -/area/f13/building) +/obj/structure/chair/stool, +/turf/open/floor/f13/wood, +/area/f13/city) "itg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/bars{ @@ -35116,6 +35461,15 @@ }, /turf/open/floor/plasteel/f13/stone, /area/f13/building/hospital) +"iwN" = ( +/obj/structure/window/fulltile/house{ + icon_state = "housewindowbroken" + }, +/obj/structure/curtain{ + color = "#363636" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/city) "iwV" = ( /obj/item/candle/tribal_torch{ lit = 1 @@ -35358,7 +35712,6 @@ /area/f13/wasteland) "iAR" = ( /obj/structure/flora/ausbushes/sparsegrass, -/mob/living/simple_animal/cow/brahmin, /obj/effect/turf_decal/shadow, /turf/open/indestructible/ground/inside/dirt/stamped/outside/sand{ dir = 1; @@ -35642,6 +35995,9 @@ icon_state = "housewood2" }, /area/f13/wasteland) +"iFo" = ( +/turf/closed/wall/f13/tentwall, +/area/f13/city) "iFp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -35705,6 +36061,9 @@ /area/f13/city) "iGk" = ( /obj/structure/destructible/tribal_torch/lit, +/obj/structure/sign/stop{ + pixel_x = -13 + }, /turf/open/indestructible/ground/outside/sidewalk{ dir = 6; icon_state = "outerpavementdirt" @@ -35915,12 +36274,31 @@ /turf/open/floor/plasteel/f13/vault_floor/dark, /area/f13/building/hospital) "iLd" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_2"; - pixel_x = 9; - pixel_y = 4 +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/rock/jungle, +/obj/structure/flora/junglebush/large, +/turf/open/indestructible/ground/outside/water, +/area/f13/building) +"iLj" = ( +/obj/structure/chair/folding{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/floor, +/area/f13/city) +"iLn" = ( +/obj/structure/sign/stop{ + pixel_x = -13 + }, +/obj/effect/turf_decal, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop0" }, -/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "iLo" = ( /obj/effect/turf_decal/weather/dirt, @@ -35975,14 +36353,9 @@ /turf/open/floor/f13/wood, /area/f13/building) "iMa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/machinery/computer/terminal{ - dir = 4; - termtag = "Security" - }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "iMh" = ( /obj/effect/decal/marking{ icon_state = "doublehorizontalcorroded" @@ -36000,17 +36373,27 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) -"iME" = ( -/obj/structure/window/fulltile/house{ - dir = 2; - icon_state = "housewindowbrokenvertical" +"iMt" = ( +/obj/structure/car/junk/generator/alt, +/obj/effect/overlay/junk/oldpipes{ + dir = 4; + pixel_y = 15 }, -/obj/structure/curtain{ - color = "#845f58" +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermaintop" }, -/obj/structure/barricade/wooden/planks/pregame, -/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/city) +"iME" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/junk/small/bed, +/obj/structure/car/rubbish11{ + pixel_y = 7; + pixel_x = -8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) "iMM" = ( /obj/structure/chair/comfy/plywood{ dir = 8 @@ -36080,8 +36463,10 @@ /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/mall) "iNW" = ( -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/hobo, -/turf/open/indestructible/ground/outside/sidewalk, +/obj/structure/closet/crate/miningcar, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" + }, /area/f13/wasteland) "iOf" = ( /obj/structure/flora/grass/wasteland{ @@ -36157,6 +36542,22 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"iPv" = ( +/obj/structure/window/fulltile/house{ + icon_state = "housewindowbroken" + }, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/curtain{ + color = "#363636" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/city) +"iPy" = ( +/obj/structure/chair/booth{ + dir = 4 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "iPC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/dirt/stamped/outside/sand{ @@ -36344,10 +36745,12 @@ }, /area/f13/building) "iUj" = ( -/obj/structure/barricade/sandbags, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/structure/campfire/stove{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "iUu" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_3" @@ -36373,9 +36776,9 @@ }, /area/f13/building/hospital) "iUF" = ( -/obj/structure/flora/grass/coyote/twentyfour, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/structure/closet/crate/wicker, +/turf/open/floor/f13/wood, +/area/f13/city) "iUJ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -36409,10 +36812,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "iVh" = ( -/obj/structure/table/wood, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/machinery/processor/chopping_block, +/obj/structure/table/round, +/turf/open/floor/f13/wood, +/area/f13/city) "iVj" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -36517,13 +36920,12 @@ /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/building/powered) "iWw" = ( -/obj/structure/obstacle/barbedwire, -/obj/structure/obstacle/barbedwire/end{ - dir = 1; - pixel_x = 5 +/obj/effect/turf_decal{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" }, -/obj/structure/fence, -/turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "iWE" = ( /obj/structure/bed/mattress/pregame, @@ -36667,9 +37069,10 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "iZh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/wood, -/turf/open/indestructible/ground/outside/dirt, +/obj/item/clothing/head/cone, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop0" + }, /area/f13/wasteland) "iZj" = ( /obj/structure/barricade/wooden, @@ -36764,15 +37167,11 @@ /turf/open/floor/f13/wood, /area/f13/building/museum) "jaG" = ( -/obj/effect/turf_decal/gravel_edge{ - dir = 6 - }, -/turf/open/indestructible/ground/outside/gravel{ - color = "#B7ABAB"; - footstep = "dirt"; - name = "rocky dirt" +/obj/structure/chair/f13foldupchair{ + dir = 1 }, -/area/f13/wasteland) +/turf/open/floor/f13/wood, +/area/f13/city) "jaV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -36858,11 +37257,9 @@ /turf/open/floor/f13/wood, /area/f13/building/powered) "jdt" = ( -/obj/structure/debris/v4, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain0" - }, -/area/f13/wasteland) +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/plasteel/f13/vault_floor/floor, +/area/f13/city) "jdL" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/f13/tentwall, @@ -36938,11 +37335,13 @@ /turf/open/indestructible/ground/outside/river, /area/f13/wasteland) "jfF" = ( -/obj/machinery/msgterminal/ncr{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/handy/robobrain, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/area/f13/wasteland) "jfW" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop0" @@ -37049,6 +37448,20 @@ /obj/structure/spacevine, /turf/closed/wall/f13/wood, /area/f13/wasteland) +"jhX" = ( +/obj/machinery/pipedispenser, +/obj/item/clothing/head/hardhat{ + pixel_y = 13 + }, +/obj/machinery/camera/autoname{ + name = "Eastwood South Gate"; + network = list("Eastwood"); + dir = 10 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2" + }, +/area/f13/wasteland) "jif" = ( /obj/machinery/power/terminal{ dir = 8; @@ -37160,7 +37573,7 @@ /obj/structure/chair/folding{ dir = 8 }, -/turf/open/floor/plasteel/vault, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "jjO" = ( /obj/effect/decal/cleanable/blood/gibs/down{ @@ -37215,6 +37628,15 @@ dir = 8 }, /obj/effect/turf_decal/gravel_edge, +/obj/structure/wreck/trash/one_tire{ + pixel_y = -6; + pixel_x = 9 + }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14 + }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop0" }, @@ -37296,21 +37718,9 @@ /turf/open/floor/f13/wood, /area/f13/building/powered) "jmr" = ( -/obj/structure/closet/locker/oldstyle{ - anchored = 1 - }, -/obj/item/card/id/dogtag/town/ncr, -/obj/item/card/id/dogtag/town/ncr, -/obj/item/card/id/dogtag/town/ncr, -/obj/item/card/id/dogtag/town/ncr, -/obj/item/card/id/dogtag/ncrtrooper, -/obj/item/card/id/dogtag/ncrtrooper, -/obj/item/card/id/dogtag/ncrtrooper, -/obj/item/card/id/dogtag/ncrtrooper, -/obj/item/card/id/dogtag/ncrsergeant, -/obj/item/card/id/dogtag/ncrsergeant, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/rack/shelf_metal, +/turf/open/floor/f13/wood, +/area/f13/city) "jmD" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /obj/effect/decal/cleanable/dirt, @@ -37393,12 +37803,11 @@ }, /area/f13/legion) "joA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/tires/five, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom0" +/obj/structure/chair/wood{ + dir = 1 }, -/area/f13/wasteland) +/turf/open/floor/carpet/red, +/area/f13/city) "joK" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/sidewalk{ @@ -37417,18 +37826,14 @@ }, /area/f13/wasteland) "jpc" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/sunset, -/obj/item/reagent_containers/food/drinks/bottle/sunset{ - pixel_x = 7; - pixel_y = 8 - }, -/obj/item/reagent_containers/food/drinks/bottle/sunset{ - pixel_x = 6; - pixel_y = -7 +/obj/structure/fence/wooden{ + dir = 1; + density = 0; + pixel_y = -9; + pixel_x = 15 }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/turf/open/floor/f13/wood, +/area/f13/city) "jpe" = ( /obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/dirt/dust, @@ -37442,6 +37847,13 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"jpy" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 9; + icon_state = "outerpavementdirt" + }, +/area/f13/wasteland) "jpH" = ( /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, /turf/open/floor/wood_common, @@ -37559,6 +37971,7 @@ /area/f13/wasteland) "jsw" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/hydroponics/soil/pot, /turf/open/floor/plasteel/f13/vault_floor/blue/side{ icon_state = "bluedirty" }, @@ -37599,8 +38012,11 @@ }, /area/f13/city) "jts" = ( -/obj/structure/flora/ausbushes/grassybush, -/mob/living/simple_animal/chicken, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/fence/wooden{ + dir = 4; + icon_state = "post_wood" + }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "jtJ" = ( @@ -37735,6 +38151,10 @@ /obj/structure/fluff/paper/stack, /turf/open/floor/f13/wood, /area/f13/building) +"jxs" = ( +/obj/structure/chair/folding, +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "jxt" = ( /obj/effect/turf_decal/gravel_edge{ dir = 4 @@ -37779,15 +38199,12 @@ /turf/open/indestructible/ground/inside/dirt/stamped/outside, /area/f13/wasteland) "jyb" = ( -/obj/structure/window/fulltile/house{ - dir = 2; - icon_state = "housewindowvertical" - }, -/obj/structure/curtain{ - color = "#845f58" +/obj/effect/decal/cleanable/dirt, +/obj/item/pickaxe, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain2" }, -/turf/open/floor/wood_fancy/wood_fancy_dark, -/area/f13/city) +/area/f13/wasteland) "jyh" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -38052,7 +38469,6 @@ "jDH" = ( /obj/structure/bed, /obj/item/bedsheet/brown, -/obj/effect/landmark/start/f13/ncrsergeant, /turf/open/floor/wood_fancy, /area/f13/ncr) "jDQ" = ( @@ -38087,6 +38503,12 @@ "jEQ" = ( /turf/closed/indestructible/opshuttle, /area/f13/wasteland) +"jES" = ( +/obj/item/clothing/head/cone, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "jFf" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -38158,6 +38580,31 @@ }, /turf/open/floor/carpet/green, /area/f13/city) +"jFX" = ( +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15 + }, +/obj/item/clothing/head/cone{ + pixel_x = -14 + }, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15; + pixel_y = 18 + }, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15; + pixel_y = 18 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopright" + }, +/area/f13/wasteland) "jFZ" = ( /obj/structure/window/reinforced/tinted, /obj/effect/overlay/junk/shower{ @@ -38183,6 +38630,11 @@ color = " A6635D" }, /area/f13/wasteland) +"jGI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/wood, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "jGJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil/slippery, @@ -38200,7 +38652,7 @@ name = "Lieutenant's Office" }, /turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/area/f13/wasteland) "jHl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil/streak{ @@ -38216,6 +38668,15 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +"jHv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/stairs/south, +/obj/structure/railing{ + color = "#A47449"; + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/green, +/area/f13/building) "jHI" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -38488,7 +38949,7 @@ "jNW" = ( /obj/machinery/door/airlock/shuttle{ name = "medical guard"; - req_access_txt = "280" + req_access_txt = "280,121" }, /turf/open/floor/plasteel/f13/vault_floor/blue/bluechess, /area/f13/city) @@ -38499,10 +38960,10 @@ }, /area/f13/legion) "jOo" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/item/pen/fourcolor, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault, +/turf/open/indestructible/ground/outside/ruins{ + dir = 1; + icon_state = "rubble" + }, /area/f13/ncr) "jOq" = ( /obj/structure/table/reinforced, @@ -38658,10 +39119,10 @@ /turf/closed/wall/f13/tentwall, /area/f13/legion) "jSf" = ( -/obj/structure/table/rolling, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/green, -/area/f13/building) +/obj/structure/table/round, +/obj/machinery/processor/chopping_block, +/turf/open/floor/f13/wood, +/area/f13/city) "jSp" = ( /obj/structure/table/wood, /turf/open/indestructible/ground/inside/dirt/stamped, @@ -38776,6 +39237,12 @@ icon_state = "housewood3-broken" }, /area/f13/building/powered) +"jUt" = ( +/obj/structure/barricade/tentclothedge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/city) "jUA" = ( /obj/structure/flora/grass/coyote/one, /turf/open/indestructible/ground/outside/desert{ @@ -38930,6 +39397,10 @@ icon_state = "floorrusty" }, /area/f13/building) +"jYQ" = ( +/obj/structure/chair/wood, +/turf/open/floor/f13/wood, +/area/f13/city) "jZg" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowbroken" @@ -39354,11 +39825,14 @@ }, /area/f13/radiation) "kjU" = ( -/obj/structure/sign/poster/official/cohiba_robusto_ad{ - pixel_y = 32 +/obj/structure/barricade/tentleathercorner{ + dir = 4 }, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/road{ + dir = 8; + icon_state = "horizontaltopborderbottom2right" + }, +/area/f13/wasteland) "kka" = ( /obj/structure/flora/tallgrass8, /obj/effect/turf_decal/weather/dirt{ @@ -39425,13 +39899,13 @@ }, /area/f13/building/mall) "kmf" = ( -/obj/structure/simple_door/room{ - name = "Captain's Office"; - req_one_access_txt = "121" +/obj/machinery/light/small{ + dir = 8; + light_color = "#d8b1b1" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/structure/closet/locker/oldstyle, +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "kmk" = ( /obj/structure/tires/two, /obj/effect/turf_decal/weather/dirt{ @@ -39440,9 +39914,23 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "kml" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/plasteel/f13/vault_floor/misc, -/area/f13/city) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15 + }, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15; + pixel_y = 18 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopright" + }, +/area/f13/wasteland) "kmo" = ( /obj/structure/chair/stool{ dir = 8; @@ -39515,9 +40003,15 @@ }, /area/f13/building) "knB" = ( -/obj/effect/decal/cleanable/greenglow, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/structure/fence{ + dir = 4; + layer = 3.1 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermainbottom" + }, +/area/f13/city) "knJ" = ( /turf/open/indestructible/ground/outside/gravel{ icon_state = "gravel2" @@ -40105,12 +40599,11 @@ /turf/open/floor/f13/wood, /area/f13/building) "kBp" = ( -/obj/structure/railing{ - dir = 10 +/obj/structure/simple_door/interior, +/obj/structure/curtain{ + color = "#5c131b" }, -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/blue, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/building) "kBr" = ( /obj/structure/flora/grass/wasteland{ @@ -40125,6 +40618,13 @@ name = "rocky dirt" }, /area/f13/caves) +"kBE" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/building) "kBI" = ( /obj/item/storage/trash_stack, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -40155,11 +40655,14 @@ }, /area/f13/wasteland) "kCd" = ( -/obj/item/twohanded/spear/scrapspear, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" +/obj/structure/barricade/tentleatheredge{ + dir = 8 }, -/area/f13/wasteland) +/obj/effect/turf_decal/gravel_edge{ + dir = 4 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "kCl" = ( /obj/structure/flora/grass/coyote/twentyone, /turf/open/indestructible/ground/outside/desert, @@ -40295,14 +40798,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "kFb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/remains/human, -/obj/effect/decal/waste{ - icon_state = "goo12" - }, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 8; - icon_state = "outerpavementdirt" +/obj/machinery/grill, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" }, /area/f13/wasteland) "kFs" = ( @@ -40380,12 +40878,14 @@ }, /area/f13/building) "kGp" = ( -/obj/machinery/light{ +/obj/structure/chair/folding{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/wood_fancy, +/area/f13/city) "kGq" = ( /obj/effect/spawner/lootdrop/f13/traitbooks/low, /turf/open/floor/plasteel/f13{ @@ -40449,14 +40949,14 @@ /turf/closed/indestructible/f13/matrix, /area/f13/ncr) "kID" = ( -/obj/effect/decal/marking{ - icon_state = "dottedverticalcorroded" - }, -/obj/mecha/combat/combatvehicle/buggy/rangerarmed/loaded, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalbottombordertop0" - }, -/area/f13/wasteland) +/obj/machinery/autolathe/ammo/unlocked, +/obj/item/stack/ore/blackpowder/twenty, +/obj/item/book/granter/crafting_recipe/gunsmith_two, +/obj/item/book/granter/crafting_recipe/gunsmith_three, +/obj/item/book/granter/crafting_recipe/gunsmith_one, +/obj/item/stack/sheet/metal/fifty, +/turf/open/floor/f13/wood, +/area/f13/city) "kIJ" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/sidewalk{ @@ -40512,7 +41012,7 @@ "kJe" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/dirt, +/turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "kJj" = ( /obj/structure/wreck/trash/two_barrels, @@ -40582,6 +41082,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/museum) +"kJS" = ( +/obj/structure/simple_door/interior, +/turf/open/floor/plasteel/f13/vault_floor/green, +/area/f13/building) "kKf" = ( /obj/machinery/defibrillator_mount/loaded{ pixel_y = -27 @@ -40728,12 +41232,13 @@ /turf/open/floor/wood_common, /area/f13/building/powered) "kMH" = ( -/obj/machinery/door/poddoor/gate/preopen{ - id = "ncrgate"; - name = "outpost gate" +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy"; + name = "Unarmed mr. gutsy" }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalleftborderright2" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" }, /area/f13/wasteland) "kMM" = ( @@ -40857,10 +41362,7 @@ /turf/open/floor/f13/wood, /area/f13/caves) "kOo" = ( -/obj/structure/chair/stool{ - dir = 1; - icon_state = "bench" - }, +/obj/structure/chair/bench, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "kOr" = ( @@ -41057,12 +41559,12 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "kSd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/unpowered/secure_NCR, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/machinery/light/small{ + dir = 1 }, -/area/f13/ncr) +/obj/structure/chair/wood, +/turf/open/floor/f13/wood, +/area/f13/city) "kSi" = ( /obj/structure/table/booth, /obj/effect/decal/cleanable/dirt, @@ -41228,11 +41730,22 @@ icon_state = "verticalleftborderright0" }, /area/f13/wasteland) +"kWk" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 10; + icon_state = "outerpavementdirt" + }, +/area/f13/wasteland) "kWq" = ( /obj/structure/destructible/tribal_torch/lit, /obj/effect/turf_decal/shadow/floor, /turf/open/indestructible/ground/inside/mountain, /area/f13/legion) +"kWv" = ( +/obj/structure/wreck/trash/machinepiletwo, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/city) "kWy" = ( /obj/structure/fence{ dir = 4 @@ -41365,11 +41878,14 @@ /area/f13/brotherhood/medical) "kZr" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/structure/barricade/sandbags, +/obj/structure/obstacle/barbedwire, +/obj/structure/fence{ + dir = 1; + pixel_x = -15 + }, /turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain0" + icon_state = "verticalleftborderright2" }, /area/f13/wasteland) "kZE" = ( @@ -41406,12 +41922,11 @@ /turf/closed/wall/f13/wood/house, /area/f13/radiation) "kZN" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 +/obj/structure/chair/bench{ + pixel_x = 1 }, -/obj/structure/flora/ausbushes/leafybush, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland) +/turf/open/floor/f13/wood, +/area/f13/city) "kZO" = ( /obj/structure/chair/stool/retro/tan, /turf/open/indestructible/ground/outside/sidewalk, @@ -41461,12 +41976,11 @@ }, /area/f13/radiation) "laV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontaltopborderbottom0" +/obj/structure/railing{ + dir = 8 }, -/area/f13/city) +/turf/open/floor/f13/wood, +/area/f13/building) "laW" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -41544,7 +42058,7 @@ }, /obj/machinery/door/airlock/shuttle{ name = "medical pavillion"; - req_access_txt = "280" + req_access_txt = "280,121" }, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/city) @@ -41631,6 +42145,14 @@ color = "#e4e4e4" }, /area/f13/legion) +"lfp" = ( +/obj/structure/sign/poster/prewar/rxcola1{ + pixel_x = 29 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" + }, +/area/f13/wasteland) "lfs" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -41674,9 +42196,8 @@ }, /area/f13/building/powered) "lgg" = ( -/obj/machinery/door/unpowered/secure_steeldoor{ - req_access_txt = "281"; - name = "security checkpoint" +/obj/machinery/door/unpowered/secure_NCR{ + req_access_txt = "281,121" }, /turf/open/floor/f13{ icon_state = "reddirtyfull" @@ -42058,6 +42579,10 @@ /obj/effect/turf_decal/gravel_edge{ dir = 10 }, +/obj/structure/fence{ + dir = 4; + layer = 3.1 + }, /turf/open/floor/grass, /area/f13/wasteland) "lpa" = ( @@ -42116,19 +42641,10 @@ /turf/open/floor/plasteel/f13/vault_floor/red/white, /area/f13/building/mall) "lqb" = ( -/obj/structure/window/reinforced/fulltile, -/obj/structure/barricade/bars{ - max_integrity = 800; - name = "strong metal bars"; - obj_integrity = 800 - }, -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "ncrarmory"; - layer = 11; - name = "NCR Armory shutters" +/turf/open/indestructible/ground/outside/ruins{ + dir = 10; + icon_state = "rubble" }, -/turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ncr) "lqh" = ( /obj/structure/barricade/wooden, @@ -42454,6 +42970,14 @@ /mob/living/simple_animal/hostile/retaliate/goat/bighorn, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"lzl" = ( +/obj/structure/railing{ + color = "#A47449" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopleft" + }, +/area/f13/wasteland) "lzr" = ( /obj/machinery/hydroponics/soil, /obj/effect/decal/cleanable/dirt, @@ -42502,9 +43026,7 @@ dir = 1; light_color = "#e8eaff" }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, +/turf/open/indestructible/ground/outside/desert, /area/f13/ncr) "lAA" = ( /obj/effect/decal/cleanable/dirt, @@ -42609,13 +43131,12 @@ }, /area/f13/city) "lCt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/car/rubbish1, -/turf/open/indestructible/ground/outside/road{ - dir = 8; - icon_state = "horizontaltopborderbottom2left" +/obj/effect/decal/cleanable/blood, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" }, -/area/f13/wasteland) +/area/f13/city) "lCw" = ( /obj/structure/table/wood/poker, /obj/item/flashlight/lamp/green, @@ -42668,10 +43189,15 @@ /obj/machinery/light/lamp_post/doubles/bent{ dir = 8 }, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14 + }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, -/area/f13/wasteland) +/area/f13/city) "lDF" = ( /obj/effect/turf_decal/gravel_edge{ dir = 8 @@ -42702,14 +43228,7 @@ /area/f13/wasteland) "lEo" = ( /obj/structure/fence, -/obj/structure/fence{ - dir = 4; - max_integrity = 500; - name = "reinforced fence" - }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain1" - }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "lEr" = ( /obj/structure/car/rubbish1, @@ -42916,8 +43435,10 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "lHO" = ( -/obj/machinery/light/small, -/turf/open/indestructible/ground/outside/sidewalk, +/obj/structure/bonfire, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, /area/f13/wasteland) "lHR" = ( /obj/effect/decal/cleanable/dirt, @@ -43075,6 +43596,9 @@ /area/f13/legion) "lLo" = ( /obj/effect/decal/cleanable/oil, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" }, @@ -43108,11 +43632,16 @@ }, /area/f13/bunker) "lLS" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "87" +/obj/machinery/camera/autoname{ + dir = 5; + name = "EPD Hospital Outer East"; + network = list("Eastwood") }, -/turf/open/floor/wood_fancy/wood_fancy_dark, -/area/f13/city) +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "lLX" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_2"; @@ -43137,6 +43666,12 @@ }, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +"lMb" = ( +/obj/mecha/working/normalvehicle/corvega/police{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/city) "lMm" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -43165,15 +43700,11 @@ /turf/open/floor/f13/wood, /area/f13/building/powered) "lNa" = ( -/obj/structure/fence{ - dir = 4; - max_integrity = 500; - name = "reinforced fence" - }, -/obj/structure/decoration/rag, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalleftborderleft1" +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy"; + name = "Unarmed mr. gutsy" }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "lNb" = ( /obj/structure/flora/tree/joshua, @@ -43257,6 +43788,10 @@ /area/f13/building/mall) "lPd" = ( /obj/structure/rack, +/obj/item/card/id/dogtag/town, +/obj/item/card/id/dogtag/town, +/obj/item/card/id/dogtag/town, +/obj/item/card/id/dogtag/town, /turf/open/floor/f13{ dir = 10; icon_state = "redmark" @@ -43280,13 +43815,7 @@ /turf/open/floor/f13/wood, /area/f13/building/mall) "lPn" = ( -/obj/machinery/light/small{ - dir = 4; - light_color = "red" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, +/turf/open/indestructible/ground/outside/desert, /area/f13/ncr) "lPq" = ( /obj/structure/car/rubbish4, @@ -43543,17 +44072,18 @@ /turf/closed/wall/mineral/concrete, /area/f13/brotherhood) "lTF" = ( -/obj/effect/decal/waste{ - icon_state = "goo12" - }, -/turf/closed/wall/r_wall, -/area/f13/ncr) +/obj/structure/simple_door/metal, +/turf/open/floor/wood_fancy, +/area/f13/city) "lTL" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault, +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy"; + name = "Unarmed mr. gutsy" + }, +/turf/open/floor/f13{ + icon_state = "darkdirtysolid" + }, /area/f13/ncr) "lTS" = ( /obj/structure/flora/grass/wasteland{ @@ -43810,6 +44340,13 @@ /obj/structure/chair/wood, /turf/open/floor/f13/wood, /area/f13/building/museum) +"lYo" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -3 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/city) "lYv" = ( /obj/structure/camera_assembly{ dir = 10 @@ -43859,6 +44396,15 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"lZi" = ( +/obj/structure/junk/machinery, +/obj/structure/junk/small/tv{ + pixel_y = 13 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) "lZp" = ( /turf/open/floor/plasteel/stairs{ barefootstep = "woodbarefoot"; @@ -44036,6 +44582,13 @@ /obj/structure/displaycase, /turf/open/floor/f13/wood, /area/f13/building/museum) +"mdU" = ( +/obj/structure/wreck/trash/four_barrels, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerpavementdirt" + }, +/area/f13/wasteland) "meb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -44100,15 +44653,13 @@ }, /area/f13/wasteland) "meM" = ( -/obj/structure/table, -/obj/machinery/computer/terminal{ - dir = 8; - termtag = "Secret" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 2; + icon_state = "outerpavementdirt" }, -/area/f13/ncr) +/area/f13/wasteland) "meQ" = ( /obj/structure/chair/wood{ dir = 8 @@ -44171,10 +44722,9 @@ }, /area/f13/building/mall) "mfG" = ( -/obj/structure/table/wood/junk, -/obj/item/ammo_box/magazine/zipgun, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/effect/landmark/start/f13/preacher, +/turf/open/floor/carpet/royalblack, +/area/f13/building) "mfL" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -44231,6 +44781,12 @@ name = "rocky dirt" }, /area/f13/wasteland) +"mhk" = ( +/obj/structure/window/fulltile/store{ + icon_state = "storewindowtop" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "mhm" = ( /obj/machinery/vending/cigarette, /turf/open/floor/plasteel/f13/vault_floor/white, @@ -44803,9 +45359,9 @@ "mqz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/barricade/sandbags, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom0" +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop0" }, /area/f13/wasteland) "mrf" = ( @@ -44955,9 +45511,10 @@ }, /area/f13/wasteland) "mtG" = ( -/obj/effect/decal/cleanable/robot_debris/gib, +/obj/effect/decal/cleanable/blood/drip, +/obj/item/melee/onehanded/club, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop0" + icon_state = "verticalrightborderright1" }, /area/f13/wasteland) "mtL" = ( @@ -45020,6 +45577,12 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/powered) +"mvt" = ( +/turf/open/floor/plasteel/f13/vault_floor/blue/side{ + dir = 4; + icon_state = "bluedirty" + }, +/area/f13/building) "mvF" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/indestructible/ground/outside/sidewalk{ @@ -45083,10 +45646,7 @@ /area/f13/city) "mwx" = ( /obj/structure/flora/grass/jungle/b, -/obj/structure/chair/stool{ - dir = 4; - icon_state = "bench" - }, +/obj/structure/chair/bench, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "mwD" = ( @@ -45162,9 +45722,8 @@ /turf/closed/wall/f13/wood/house, /area/f13/building) "myf" = ( -/obj/structure/simple_door/metal/store, -/turf/open/floor/plasteel/f13/vault_floor/blue, -/area/f13/building) +/turf/open/indestructible/ground/outside/road/damagedvert/heavy, +/area/f13/wasteland) "myy" = ( /obj/machinery/shower{ pixel_y = 17 @@ -45266,15 +45825,20 @@ /obj/structure/debris/v3, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"mAY" = ( +/obj/structure/table, +/turf/open/floor/wood_fancy, +/area/f13/city) "mBa" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_6" +/obj/effect/turf_decal/weather/dirt{ + dir = 8 }, -/obj/structure/chair/stool{ - dir = 1; - icon_state = "bench_center" +/obj/structure/flora/rock/pile/largejungle, +/turf/open/indestructible/ground/outside/gravel{ + color = "#B7ABAB"; + footstep = "dirt"; + name = "rocky dirt" }, -/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "mBq" = ( /obj/structure/chair/f13chair2{ @@ -45311,6 +45875,7 @@ "mBJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light, +/obj/structure/junk/small/bed2, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, @@ -45320,12 +45885,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/ncr) "mCc" = ( -/obj/structure/chair/stool{ - dir = 8; - icon_state = "bench" +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/area/f13/city) "mCs" = ( /obj/structure/fluff/beach_umbrella/science, /obj/structure/chair/comfy/plywood{ @@ -45603,9 +46166,14 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "mHT" = ( -/obj/machinery/light, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/mecha/working/normalvehicle/buggy/ranger{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerpavementdirt" + }, +/area/f13/wasteland) "mIh" = ( /obj/structure/barricade/wooden, /obj/structure/decoration/rag{ @@ -45747,12 +46315,11 @@ /area/f13/wasteland) "mLF" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/black, -/area/f13/building) +/obj/structure/car/rubbish2{ + icon_state = "car_rubish3" + }, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) "mLT" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -45810,7 +46377,7 @@ "mMz" = ( /obj/effect/landmark/observer_start, /turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain1" + icon_state = "verticalinnermain2" }, /area/f13/wasteland) "mME" = ( @@ -45879,8 +46446,7 @@ }, /area/f13/building/massfusion) "mOZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/head/cone, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalleftborderright2" }, @@ -45967,12 +46533,20 @@ /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/mall) "mQx" = ( -/obj/item/flag/ncr, -/obj/structure/tires/two, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalrightborderright1" +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/machinery/door/poddoor/shutters/old/preopen{ + id = "police5"; + name = "shutters" }, -/area/f13/wasteland) +/obj/structure/barricade/bars{ + max_integrity = 800; + name = "strong metal bars"; + obj_integrity = 800 + }, +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/plasteel/f13/vault_floor/floor, +/area/f13/city) "mQC" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4" @@ -46453,6 +47027,7 @@ dir = 4; icon_state = "bench" }, +/obj/effect/overlay/barbed, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "nai" = ( @@ -46488,13 +47063,9 @@ }, /area/f13/wasteland) "nbk" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/roaddirt{ - icon_state = "horizontaltopborderbottomleft" - }, -/area/f13/wasteland) +/obj/structure/simple_door/room, +/turf/open/floor/f13/wood, +/area/f13/city) "nbl" = ( /obj/structure/table, /turf/open/floor/f13/wood, @@ -46676,10 +47247,7 @@ }, /area/f13/building/mall) "ndX" = ( -/obj/machinery/light/lamp_post/doubles/bent, -/obj/effect/turf_decal/gravel_edge{ - dir = 10 - }, +/obj/effect/turf_decal/gravel_edge, /turf/open/indestructible/ground/outside/sidewalk{ dir = 8; icon_state = "outerbordercorner" @@ -46769,10 +47337,12 @@ }, /area/f13/wasteland) "ngf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start/f13/ncrrearechelon, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain1" +/obj/structure/flora/roadplant{ + icon_state = "dirt_7d" + }, +/turf/open/indestructible/ground/outside/ruins{ + dir = 2; + icon_state = "rubble" }, /area/f13/wasteland) "ngi" = ( @@ -46783,7 +47353,10 @@ /area/f13/building/museum) "ngD" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, +/turf/open/indestructible/ground/outside/ruins{ + dir = 5; + icon_state = "rubble" + }, /area/f13/ncr) "ngE" = ( /obj/item/ammo_casing/c9mm, @@ -46843,16 +47416,9 @@ /turf/open/floor/f13, /area/f13/building) "nhI" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/structure/flora/rock/jungle, -/obj/structure/flora/ausbushes/ppflowers, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland) +/obj/structure/rug/big/rug_red, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "nhM" = ( /obj/effect/decal/cleanable/oil/streak, /turf/open/indestructible/ground/outside/road{ @@ -47276,11 +47842,8 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "nqk" = ( -/obj/machinery/light{ - pixel_x = 16 - }, /turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/area/f13/wasteland) "nqI" = ( /obj/effect/decal/waste{ icon_state = "goo12" @@ -47530,14 +48093,15 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "nvQ" = ( -/obj/structure/chair/comfy/brown{ +/obj/effect/turf_decal/weather/dirt{ dir = 1 }, -/obj/machinery/light, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building) +/obj/structure/fence/wooden{ + dir = 4; + icon_state = "post_wood" + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "nwk" = ( /obj/structure/flora/grass/jungle, /obj/effect/turf_decal/gravel_edge{ @@ -47626,9 +48190,11 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "nxy" = ( -/obj/structure/junk/drawer, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/structure/chair/folding{ + dir = 8 + }, +/turf/open/floor/wood_fancy, +/area/f13/city) "nxL" = ( /obj/structure/simple_door/metal/fence{ dir = 8 @@ -47700,10 +48266,14 @@ /turf/open/floor/f13/wood, /area/f13/brotherhood) "nzi" = ( -/obj/structure/closet/crate/bin/trashbin, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/misc, -/area/f13/city) +/obj/structure/table/reinforced, +/obj/structure/barricade/bars, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "ncrwatchtower"; + name = "watchtower shutters" + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ncr) "nzt" = ( /obj/structure/bed/roller, /obj/structure/cable{ @@ -47758,6 +48328,18 @@ }, /turf/open/floor/f13/wood, /area/f13/building/powered) +"nAi" = ( +/obj/structure/sign/poster/ncr/democracy{ + pixel_x = 29 + }, +/obj/structure/sign/poster/ncr/keep_to_myself{ + pixel_x = 32; + pixel_y = -15 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" + }, +/area/f13/wasteland) "nAj" = ( /obj/item/seeds/feracactus, /turf/open/indestructible/ground/outside/dirt, @@ -47819,6 +48401,13 @@ icon_state = "dirt" }, /area/f13/wasteland) +"nCi" = ( +/obj/structure/fence{ + dir = 4; + layer = 3.1 + }, +/turf/open/floor/grass, +/area/f13/wasteland) "nCn" = ( /obj/structure/fence{ dir = 4 @@ -48049,15 +48638,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "nHV" = ( -/obj/structure/table/wood/junk, -/obj/structure/junk/small/tv{ - desc = "Advertisements would've played on this tv before the bombs dropped."; - icon = 'icons/fallout/objects/decorations.dmi'; - icon_state = "television"; - name = "pre-war advertising television" - }, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/structure/table/wood, +/turf/open/floor/carpet/green, +/area/f13/city) "nHY" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_3" @@ -48074,13 +48657,12 @@ }, /area/f13/wasteland) "nIt" = ( -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" +/obj/structure/barricade/sandbags, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 5; + icon_state = "outerpavementdirt" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/area/f13/wasteland) "nIG" = ( /obj/structure/filingcabinet/security, /turf/open/floor/plasteel/f13/vault_floor/floor, @@ -48126,12 +48708,8 @@ /turf/closed/mineral/random/high_chance, /area/f13/caves) "nJH" = ( -/obj/structure/rack, -/obj/item/mecha_parts/mecha_equipment/trunk, -/turf/open/floor/f13{ - dir = 10; - icon_state = "redmark" - }, +/obj/structure/reagent_dispensers/rainwater_tank, +/turf/open/floor/f13/wood, /area/f13/city) "nJI" = ( /obj/effect/decal/cleanable/dirt, @@ -48175,6 +48753,15 @@ icon_state = "bluedirtychess2" }, /area/f13/building) +"nKp" = ( +/obj/structure/fence{ + dir = 4; + layer = 3.1 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermainbottom" + }, +/area/f13/city) "nKq" = ( /obj/structure/flora/grass/jungle, /turf/open/indestructible/ground/outside/water, @@ -48238,7 +48825,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/landmark/start/f13/detective, +/obj/structure/table, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) "nLS" = ( @@ -48356,6 +48943,15 @@ icon_state = "verticalleftborderright0" }, /area/f13/wasteland) +"nPM" = ( +/obj/structure/sign/yield, +/obj/effect/turf_decal{ + dir = 10 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "nQb" = ( /obj/structure/simple_door/metal/fence/wooden, /turf/open/indestructible/ground/outside/graveldirt, @@ -48426,9 +49022,12 @@ }, /area/f13/wasteland) "nRe" = ( -/obj/item/trash/candy, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/structure/curtain{ + color = "#5c131b" + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "nRf" = ( /turf/closed/wall/r_wall, /area/f13/brotherhood/medical) @@ -48843,6 +49442,15 @@ icon_state = "bluedirtychess2" }, /area/f13/building) +"nZE" = ( +/obj/effect/overlay/junk/oldpipes{ + dir = 4; + pixel_y = 15 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermaintop" + }, +/area/f13/wasteland) "nZO" = ( /obj/effect/decal/cleanable/oil/streak{ pixel_x = -10 @@ -48864,6 +49472,27 @@ }, /turf/open/water, /area/f13/caves) +"nZY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15 + }, +/obj/structure/sign/stop{ + pixel_x = -13 + }, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15; + pixel_y = 18 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopright" + }, +/area/f13/wasteland) "oak" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -49298,10 +49927,16 @@ /turf/open/floor/f13/wood, /area/f13/building/powered) "oiV" = ( -/obj/machinery/vending/sovietsoda, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/green, -/area/f13/building) +/obj/machinery/light/lamp_post/doubles/bent{ + dir = 8 + }, +/obj/structure/sign/poster/ncr/democracy{ + pixel_x = 29 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" + }, +/area/f13/wasteland) "oiW" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/f13/armor/random, @@ -49358,13 +49993,14 @@ }, /area/f13/wasteland) "ojV" = ( -/obj/structure/chair/office/dark{ - dir = 4 +/obj/mecha/working/normalvehicle/ncrtruck{ + dir = 8 }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerpavementdirt" }, -/area/f13/ncr) +/area/f13/wasteland) "okd" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/road{ @@ -49388,6 +50024,12 @@ icon_state = "whitedirtysolid" }, /area/f13/brotherhood/chemistry) +"oky" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 4 + }, +/area/f13/wasteland) "okB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/shadow/floor, @@ -49521,10 +50163,9 @@ }, /area/f13/wasteland) "ooc" = ( -/obj/structure/closet/crate/bin/trashbin, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building) +/obj/structure/barricade/tentleatheredge, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "ooe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -49569,10 +50210,11 @@ }, /area/f13/ncr) "opm" = ( -/obj/structure/table, -/obj/item/storage/lockbox, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/chair/booth{ + dir = 8 + }, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/city) "opv" = ( /obj/structure/simple_door/house, /obj/effect/decal/cleanable/dirt{ @@ -49587,9 +50229,8 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "opE" = ( -/obj/structure/junk/small/bed2, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/turf/open/floor/carpet/royalblack, +/area/f13/building) "opH" = ( /obj/structure/simple_door/metal/fence{ door_type = "fence_wood"; @@ -49674,6 +50315,15 @@ /obj/effect/landmark/start/f13/immune, /turf/open/indestructible/ground/outside/gravel, /area/f13/wasteland) +"oqW" = ( +/obj/item/clothing/head/cone, +/obj/structure/sign/stop{ + pixel_x = -13 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermainbottom" + }, +/area/f13/wasteland) "ora" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/gravel{ @@ -49701,11 +50351,11 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "orG" = ( -/obj/mecha/working/normalvehicle/buggy/loaded, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalleftborderright0" +/obj/structure/window/fulltile/store{ + icon_state = "storewindowright" }, -/area/f13/wasteland) +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "orI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -49920,13 +50570,7 @@ /area/f13/wasteland) "ovV" = ( /obj/structure/table, -/obj/machinery/computer/terminal{ - dir = 1; - termtag = "Secret" - }, -/turf/open/floor/f13{ - icon_state = "floordirtysolid" - }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "owf" = ( /obj/effect/decal/cleanable/dirt, @@ -49954,6 +50598,10 @@ /obj/effect/turf_decal/gravel_edge{ dir = 4 }, +/obj/structure/fence{ + dir = 4; + layer = 3.1 + }, /turf/open/floor/grass, /area/f13/wasteland) "oww" = ( @@ -50025,9 +50673,9 @@ /area/f13/brotherhood/armory) "oxy" = ( /obj/structure/chair/office/dark{ - dir = 4 + dir = 8 }, -/obj/effect/landmark/start/f13/detective, +/obj/effect/landmark/start/f13/secretary, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) "oxC" = ( @@ -50048,6 +50696,13 @@ }, /turf/open/floor/plating/f13/inside, /area/f13/brotherhood/medical) +"oya" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "oym" = ( /obj/structure/rack, /obj/item/clothing/under/suit/charcoal, @@ -50099,9 +50754,12 @@ /turf/open/water, /area/f13/city) "ozv" = ( -/obj/structure/barricade/wooden, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/ncr) +/obj/effect/decal/cleanable/dirt, +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop1" + }, +/area/f13/wasteland) "ozw" = ( /obj/structure/chair/wood{ dir = 1 @@ -50175,8 +50833,10 @@ }, /area/f13/radiation) "oAg" = ( -/obj/effect/spawner/lootdrop/f13/bomb/tier1, -/turf/open/indestructible/ground/outside/sidewalk, +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, /area/f13/wasteland) "oAk" = ( /obj/structure/barricade/tentleatheredge{ @@ -50200,6 +50860,11 @@ /area/f13/ncr) "oAJ" = ( /obj/structure/flora/ausbushes/ywflowers, +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14 + }, /turf/open/floor/grass, /area/f13/wasteland) "oAK" = ( @@ -50314,14 +50979,11 @@ /turf/open/floor/wood_common, /area/f13/building/powered) "oCW" = ( -/obj/structure/railing{ - color = null; - dir = 9 +/obj/structure/window/fulltile/store{ + icon_state = "storewindowleft" }, -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/blue, -/area/f13/building) +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "oDk" = ( /obj/structure/sign/departments/security, /turf/closed/wall/r_wall, @@ -50361,6 +51023,10 @@ }, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/powered) +"oEl" = ( +/obj/machinery/smartfridge/bottlerack/grownbin, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/building) "oEG" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -50723,12 +51389,11 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "oMx" = ( -/obj/item/trash/popcorn, -/obj/effect/turf_decal/gravel_edge{ - dir = 4 +/obj/structure/stairs/north{ + color = "#A47449" }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/turf/open/floor/f13/wood, +/area/f13/city) "oMz" = ( /obj/structure/simple_door/house, /turf/open/floor/plasteel/f13/vault_floor/blue/white/side, @@ -50784,6 +51449,14 @@ }, /turf/closed/wall/f13/wood, /area/f13/caves) +"oMU" = ( +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14 + }, +/turf/open/floor/grass, +/area/f13/wasteland) "oMW" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -50955,6 +51628,16 @@ name = "metal plating" }, /area/f13/building/powered) +"oPQ" = ( +/obj/structure/car/junk/generator, +/obj/effect/overlay/junk/oldpipes{ + dir = 4; + pixel_y = 15 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermaintop" + }, +/area/f13/city) "oPR" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4; @@ -51161,18 +51844,8 @@ }, /area/f13/wasteland) "oUJ" = ( -/obj/structure/reagent_dispensers/cooking_oil{ - desc = "A huge metal vat filled with.. - just don't eat it.."; - name = "septic tank" - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/outside/water/running{ - color = " A6635D"; - name = "sewage water" - }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault, /area/f13/wasteland) "oUS" = ( /obj/item/storage/trash_stack, @@ -51300,9 +51973,8 @@ }, /area/f13/wasteland) "oXV" = ( -/obj/structure/chair/pew{ - dir = 8 - }, +/obj/structure/table/wood/crate, +/obj/item/reagent_containers/food/snacks/salad/eggbowl, /turf/open/floor/f13/wood, /area/f13/city) "oXX" = ( @@ -51525,10 +52197,7 @@ }, /area/f13/wasteland) "pbl" = ( -/obj/effect/overlay/barbed, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalrightborderright1" - }, +/turf/open/floor/plasteel/vault, /area/f13/wasteland) "pbq" = ( /turf/closed/indestructible/opshuttle, @@ -51813,6 +52482,20 @@ name = "concrete wall" }, /area/f13/ncr) +"piL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/sandbags, +/obj/structure/obstacle/barbedwire{ + dir = 4 + }, +/obj/structure/fence{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalrightborderleft0" + }, +/area/f13/wasteland) "piY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/gravel_edge{ @@ -51835,9 +52518,11 @@ }, /area/f13/wasteland) "pjF" = ( -/obj/structure/simple_door/tent, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" + icon_state = "horizontalinnermain1" }, /area/f13/wasteland) "pjH" = ( @@ -51914,9 +52599,8 @@ "pkp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/gravel_edge, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop2" +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopleft" }, /area/f13/wasteland) "pkE" = ( @@ -52108,12 +52792,13 @@ /turf/open/floor/f13/wood, /area/f13/building/mall) "ppe" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 +/obj/machinery/hydroponics/soil/crafted, +/mob/living/simple_animal/chicken{ + desc = "This motherclucker always orders people around during feeding time."; + name = "Corporal Clucker" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building) +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "pps" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/flora/grass/jungle, @@ -52518,11 +53203,10 @@ /turf/open/water, /area/f13/caves) "pvl" = ( -/obj/effect/overlay/barbed, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalleftborderleft1" +/turf/open/indestructible/ground/outside/ruins{ + icon_state = "rubbleplate" }, -/area/f13/wasteland) +/area/f13/ncr) "pvt" = ( /obj/structure/flora/grass/coyote/one, /obj/effect/turf_decal/gravel_edge{ @@ -52544,15 +53228,11 @@ }, /area/f13/legion) "pwb" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, /obj/machinery/button/door{ id = "police"; name = "shutters button"; pixel_y = -25 }, -/obj/effect/landmark/start/f13/detective, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) "pwc" = ( @@ -52738,19 +53418,16 @@ /turf/open/indestructible/ground/outside/water, /area/f13/building/powered) "pyW" = ( -/obj/structure/debris/v4, +/obj/machinery/door/poddoor/gate{ + id = "EastwoodSouthwestGate" + }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalleftborderright0" }, /area/f13/wasteland) "pyY" = ( -/obj/structure/chair/folding{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/red/line, /turf/open/floor/plasteel/f13/vault_floor/misc, /area/f13/city) "pzb" = ( @@ -52941,11 +53618,20 @@ }, /area/f13/building/hospital) "pBw" = ( -/obj/effect/decal/cleanable/oil, -/obj/structure/bed/mattress{ - icon_state = "mattress4" +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15 + }, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15; + pixel_y = 18 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopright" }, -/turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "pBx" = ( /obj/effect/decal/cleanable/dirt, @@ -53025,6 +53711,14 @@ /obj/item/key, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/city) +"pDy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/pickaxe, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalrightborderleft2" + }, +/area/f13/wasteland) "pDQ" = ( /obj/structure/flora/grass/coyote/three, /turf/open/indestructible/ground/outside/dirt{ @@ -53295,13 +53989,10 @@ }, /area/f13/ncr) "pIp" = ( -/obj/structure/chair/stool, -/obj/machinery/light/small{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/green, -/area/f13/building) +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "pIv" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -53488,6 +54179,12 @@ "pNM" = ( /turf/closed/wall/f13/wood/house, /area/f13/brotherhood) +"pNO" = ( +/obj/structure/closet/crate/wicker, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2" + }, +/area/f13/wasteland) "pOm" = ( /obj/machinery/light/small{ dir = 1; @@ -53937,12 +54634,15 @@ }, /area/f13/building/museum) "pYw" = ( -/obj/structure/flora/ausbushes/fullgrass{ - pixel_x = -6 +/obj/structure/filingcabinet/security{ + pixel_x = -10 }, -/mob/living/simple_animal/cow/brahmin/horse, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/structure/filingcabinet/security, +/obj/structure/filingcabinet/security{ + pixel_x = 11 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "pYA" = ( /obj/machinery/hydroponics/soil/pot, /obj/structure/flora/wasteplant/wild_xander{ @@ -54065,11 +54765,11 @@ }, /area/f13/city) "qbe" = ( -/obj/structure/car/rubbish4{ - pixel_y = -15 - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalleftborderright0" +/obj/structure/closet/crate/trashcart, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/mob_spawn/human/corpse, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) "qbp" = ( @@ -54391,6 +55091,15 @@ icon_state = "outerpavementdirt" }, /area/f13/wasteland) +"qim" = ( +/obj/item/target, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "qiy" = ( /obj/structure/tires/five, /turf/open/indestructible/ground/outside/sidewalk{ @@ -54506,6 +55215,12 @@ /obj/structure/bed/old, /turf/open/floor/plasteel/neutral, /area/f13/building/hospital) +"qlh" = ( +/obj/item/clothing/head/cone, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2bottom" + }, +/area/f13/wasteland) "qlm" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, @@ -54521,6 +55236,16 @@ icon_state = "horizontalinnermain2" }, /area/f13/wasteland) +"qlI" = ( +/obj/structure/sign/poster/ncr/keep_to_myself{ + pixel_y = 29 + }, +/turf/open/indestructible/ground/outside/gravel{ + color = "#B7ABAB"; + footstep = "dirt"; + name = "rocky dirt" + }, +/area/f13/wasteland) "qlO" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowbrokenvertical" @@ -54704,12 +55429,26 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/green, +/obj/structure/chair/wood, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/building) "qqf" = ( /obj/structure/shelf_wood, /turf/open/floor/wood_fancy, /area/f13/ncr) +"qqg" = ( +/obj/structure/chair/stool{ + dir = 8; + icon_state = "bench" + }, +/obj/effect/landmark/start/f13/settler, +/obj/effect/overlay/barbed, +/turf/open/indestructible/ground/outside/gravel{ + color = "#B7ABAB"; + footstep = "dirt"; + name = "rocky dirt" + }, +/area/f13/wasteland) "qql" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4"; @@ -54907,10 +55646,9 @@ /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/hospital) "quk" = ( -/obj/machinery/vending/cola/red, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/green, -/area/f13/building) +/obj/structure/chair/wood, +/turf/open/floor/carpet/red, +/area/f13/city) "quu" = ( /obj/effect/overlay/junk/toilet{ pixel_y = 12 @@ -54992,14 +55730,11 @@ }, /area/f13/brotherhood/armory) "qwF" = ( -/obj/item/reagent_containers/glass/bucket{ - desc = "It smells awful."; - name = "waste bucket" - }, -/obj/item/soap/homemade, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalbottombordertop0" +/obj/structure/wreck/trash/three_barrels{ + pixel_y = 17 }, +/obj/structure/wreck/trash/four_barrels, +/turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "qwT" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -55039,10 +55774,14 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/brotherhood/offices1st) "qxy" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/mob/living/simple_animal/cow/brahmin, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/mecha/working/normalvehicle/ncrtruck/mp{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerpavementdirt" + }, +/area/f13/city) "qxI" = ( /obj/structure/rack/shelf_metal, /obj/effect/spawner/lootdrop/f13/advcrafting, @@ -55259,6 +55998,17 @@ /obj/structure/simple_door/metal/fence/wooden, /turf/open/indestructible/ground/outside/dirt, /area/f13/radiation) +"qEm" = ( +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14 + }, +/obj/structure/closet/crate/wooden, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/ammo/mfc, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/city) "qEH" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowvertical" @@ -55434,6 +56184,12 @@ pixel_x = 8; pixel_y = 4 }, +/obj/machinery/button/door{ + id = "EastwoodSouthwestGate"; + name = "eastwood gate south west"; + pixel_x = -9; + bound_width = sss + }, /turf/open/floor/f13{ icon_state = "reddirtyfull" }, @@ -55641,9 +56397,12 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "qNo" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/plasteel/f13/vault_floor/misc, -/area/f13/city) +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerpavementcornerdirt" + }, +/area/f13/wasteland) "qNs" = ( /obj/machinery/light/small{ dir = 8 @@ -56043,10 +56802,17 @@ }, /area/f13/brotherhood) "qVz" = ( -/obj/structure/chair/folding{ - dir = 8 +/obj/structure/table, +/obj/machinery/door/poddoor/shutters/old/preopen{ + id = "police5"; + name = "shutters" }, -/turf/open/floor/plasteel/f13/vault_floor/misc, +/obj/structure/barricade/bars{ + max_integrity = 800; + name = "strong metal bars"; + obj_integrity = 800 + }, +/turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) "qVE" = ( /obj/structure/lattice/catwalk, @@ -56076,9 +56842,9 @@ }, /area/f13/building) "qWd" = ( -/obj/structure/car/rubbish3, +/obj/item/clothing/head/cone, /turf/open/indestructible/ground/outside/road{ - icon_state = "horizontaltopborderbottom2" + icon_state = "verticalinnermainbottom" }, /area/f13/wasteland) "qWl" = ( @@ -56276,14 +57042,11 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "qZW" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 +/obj/structure/chair/booth{ + dir = 8 }, -/obj/effect/turf_decal/weather/dirt, -/obj/structure/flora/rock/jungle, -/obj/structure/flora/junglebush/large, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland) +/turf/open/floor/f13/wood, +/area/f13/city) "rac" = ( /obj/structure/fence{ dir = 4 @@ -56297,9 +57060,8 @@ }, /area/f13/radiation) "rad" = ( -/obj/mecha/working/normalvehicle/corvega/police/loaded, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/city) +/turf/closed/wall/f13/wood/house/shack, +/area/f13/wasteland) "ral" = ( /obj/structure/window/fulltile/house, /obj/structure/decoration/rag, @@ -56330,8 +57092,15 @@ /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, /area/f13/building/powered) "rbn" = ( -/obj/effect/decal/cleanable/generic, -/turf/open/indestructible/ground/outside/sidewalk, +/obj/structure/sign/poster/ncr/democracy{ + pixel_x = 29 + }, +/obj/item/reagent_containers/glass/bucket/plastic{ + pixel_x = 11 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" + }, /area/f13/wasteland) "rbt" = ( /obj/structure/barricade/wooden, @@ -56518,9 +57287,17 @@ /turf/closed/wall/r_wall, /area/f13/ncr) "reV" = ( -/obj/item/reagent_containers/pill/patch/jet, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/structure/chair/folding{ + dir = 8 + }, +/obj/structure/chair/folding{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/wood_fancy, +/area/f13/city) "reY" = ( /turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/wasteland) @@ -56645,13 +57422,14 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/radiation) "riR" = ( -/obj/structure/fence/corner{ - dir = 4 +/obj/structure/simple_door/tentflap_cloth{ + icon_state = "tentflap_clothclosing" }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain2" +/obj/structure/simple_door/interior{ + layer = 2.5 }, -/area/f13/wasteland) +/turf/open/floor/f13/wood, +/area/f13/city) "riV" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -56708,6 +57486,12 @@ "rkk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/sandbags, +/obj/structure/fence{ + dir = 4 + }, +/obj/structure/obstacle/barbedwire{ + dir = 4 + }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalrightborderleft2" }, @@ -56750,13 +57534,30 @@ }, /area/f13/wasteland) "rlg" = ( +/obj/structure/railing{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/pew/right{ + dir = 4 + }, +/turf/open/floor/carpet/red, +/area/f13/building) +"rlp" = ( +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = 14; + layer = 3.1 + }, +/obj/effect/overlay/junk/oldpipes{ + dir = 4; + pixel_y = 15 + }, /turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain2top" + icon_state = "verticalinnermaintop" }, -/area/f13/wasteland) +/area/f13/city) "rlq" = ( /obj/structure/chair/sofa/right, /turf/open/indestructible/ground/outside/dirt, @@ -57148,6 +57949,11 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"rwQ" = ( +/obj/machinery/light/small, +/obj/structure/wreck/trash/machinepiletwo, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/city) "rwS" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "verylittleshadowright" @@ -57212,10 +58018,10 @@ /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, /area/f13/building/mall) "ryF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/car/rubbish3, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop0" +/obj/structure/barricade/sandbags, +/turf/open/indestructible/ground/outside/road{ + dir = 8; + icon_state = "horizontalinnermain2right" }, /area/f13/wasteland) "ryM" = ( @@ -57243,9 +58049,12 @@ /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/powered) "rzz" = ( -/obj/machinery/door/unpowered/secure_NCR, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalleftborderright0" +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy"; + name = "Unarmed mr. gutsy" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop3" }, /area/f13/wasteland) "rzG" = ( @@ -57487,14 +58296,8 @@ /turf/open/floor/f13/wood, /area/f13/building/mall) "rFq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/road{ - dir = 8; - icon_state = "horizontaltopborderbottom2left" - }, -/area/f13/wasteland) +/turf/closed/wall/f13/wood/house/shack, +/area/f13/city) "rFs" = ( /obj/structure/window/fulltile/store{ icon_state = "storewindowleft" @@ -57609,6 +58412,12 @@ }, /turf/open/floor/f13/wood, /area/f13/building/mall) +"rIj" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalleftborderright2" + }, +/area/f13/wasteland) "rIk" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -57842,7 +58651,7 @@ "rMA" = ( /obj/machinery/door/airlock/shuttle{ name = "medical guard"; - req_access_txt = "280" + req_access_txt = "280,121" }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/city) @@ -57859,6 +58668,11 @@ /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"rNe" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/red, +/area/f13/building) "rNh" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -57887,6 +58701,17 @@ /obj/effect/decal/remains/human, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"rNF" = ( +/obj/effect/turf_decal/gravel_edge{ + dir = 10 + }, +/obj/effect/overlay/barbed, +/turf/open/indestructible/ground/outside/gravel{ + color = "#B7ABAB"; + footstep = "dirt"; + name = "rocky dirt" + }, +/area/f13/wasteland) "rOb" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/road{ @@ -57917,6 +58742,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/building) +"rOz" = ( +/obj/structure/flora/roadplant{ + icon_state = "dirt_9d" + }, +/turf/open/indestructible/ground/outside/ruins{ + dir = 2; + icon_state = "rubble" + }, +/area/f13/ncr) "rOC" = ( /obj/item/reagent_containers/blood, /obj/machinery/light, @@ -58030,6 +58864,12 @@ /obj/structure/window/reinforced/tinted, /turf/open/floor/plasteel/f13/vault_floor/red, /area/f13/building/powered) +"rQy" = ( +/obj/structure/window/fulltile/store{ + icon_state = "storewindowleft" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/city) "rQA" = ( /obj/machinery/light/small{ dir = 1 @@ -58216,9 +59056,8 @@ }, /area/f13/building) "rVh" = ( -/obj/structure/flora/ausbushes/fullgrass, -/mob/living/simple_animal/cow/brahmin, -/turf/open/indestructible/ground/outside/dirt, +/obj/structure/barricade/sandbags, +/turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "rVu" = ( /obj/effect/decal/cleanable/dirt{ @@ -58305,14 +59144,11 @@ /turf/open/floor/plasteel/f13/vault_floor/green, /area/f13/brotherhood/leisure) "rWq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 +/obj/machinery/light{ + dir = 4 }, -/obj/effect/turf_decal/weather/dirt, -/obj/structure/flora/rock/jungle, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland) +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ncr) "rWr" = ( /obj/structure/flora/brushwoodalt, /obj/effect/turf_decal/gravel_edge{ @@ -58328,6 +59164,14 @@ /obj/structure/sign/legion/storeroom, /turf/closed/wall/f13/wood/house, /area/f13/legion) +"rWQ" = ( +/obj/structure/sign/poster/ncr/democracy{ + pixel_x = 29 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2" + }, +/area/f13/wasteland) "rWS" = ( /obj/structure/fence{ dir = 4 @@ -58679,18 +59523,12 @@ }, /area/f13/building/museum) "seu" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/effect/turf_decal/gravel_edge{ +/obj/structure/railing{ + color = "#A47449"; dir = 4 }, -/turf/open/indestructible/ground/outside/gravel{ - color = "#B7ABAB"; - footstep = "dirt"; - name = "rocky dirt" - }, -/area/f13/wasteland) +/turf/open/transparent/openspace, +/area/f13/building) "seX" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/grass, @@ -58763,16 +59601,14 @@ }, /area/f13/wasteland) "sgN" = ( -/obj/structure/fence{ - dir = 4; - max_integrity = 500; - name = "reinforced fence" - }, -/obj/structure/decoration/rag, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalrightborderright1" +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowbrokenvertical" }, -/area/f13/wasteland) +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/curtain/stage, +/turf/open/floor/f13/wood, +/area/f13/building) "sgQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, @@ -58814,11 +59650,13 @@ /turf/closed/wall/r_wall, /area/f13/brotherhood/medical) "shX" = ( -/obj/structure/chair/folding{ - dir = 1 - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/structure/table/wood/crate, +/obj/item/lock_construct, +/obj/item/key, +/obj/item/key, +/obj/item/key, +/turf/open/floor/f13/wood, +/area/f13/city) "shZ" = ( /obj/structure/janitorialcart, /obj/item/mop, @@ -58866,10 +59704,10 @@ }, /area/f13/wasteland) "siH" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, -/obj/effect/landmark/start/f13/ncrdrillsergeant, -/turf/open/floor/wood_fancy, +/obj/structure/flora/roadplant{ + icon_state = "dirt_9d" + }, +/turf/open/indestructible/ground/outside/desert, /area/f13/ncr) "siL" = ( /turf/open/indestructible/ground/outside/road{ @@ -59037,14 +59875,9 @@ /turf/open/floor/f13/wood, /area/f13/building) "smn" = ( -/obj/structure/table, -/obj/structure/bedsheetbin, -/obj/item/reagent_containers/glass/rag/towel, -/obj/item/reagent_containers/glass/rag/towel, -/obj/item/reagent_containers/glass/rag/towel, -/obj/item/reagent_containers/glass/rag/towel, -/turf/open/floor/plasteel/f13/vault_floor/dark, -/area/f13/ncr) +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/f13/wood/house, +/area/f13/wasteland) "smt" = ( /obj/structure/flora/tree/tall{ density = 0; @@ -59107,8 +59940,12 @@ "snb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/closed/wall/r_wall, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) +"snd" = ( +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/f13/wood, +/area/f13/city) "snJ" = ( /obj/machinery/light/small{ dir = 8; @@ -59429,12 +60266,11 @@ }, /area/f13/wasteland) "stx" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 +/obj/structure/fence/wooden{ + dir = 4; + icon_state = "post_wood" }, -/obj/structure/flora/rock/jungle, -/obj/structure/flora/junglebush/b, -/turf/open/indestructible/ground/outside/water, +/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "stC" = ( /obj/machinery/light/small{ @@ -59473,9 +60309,8 @@ }, /area/f13/ncr) "suS" = ( -/obj/structure/girder, -/obj/structure/barricade/bars, -/turf/open/indestructible/ground/outside/desert, +/obj/machinery/seed_extractor, +/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "svj" = ( /obj/structure/bed/mattress{ @@ -59503,13 +60338,34 @@ /turf/open/floor/f13/wood, /area/f13/caves) "swu" = ( -/obj/machinery/light/small{ - dir = 4 +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy"; + name = "Unarmed mr. gutsy" }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain1" }, -/area/f13/ncr) +/area/f13/wasteland) +"swB" = ( +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15 + }, +/obj/item/clothing/head/cone{ + pixel_x = -14 + }, +/obj/structure/sign/yield, +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15; + pixel_y = 18 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopright" + }, +/area/f13/wasteland) "swY" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13{ @@ -59584,10 +60440,7 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "szv" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/cracker_pack{ - pixel_x = 8 - }, +/obj/machinery/smartfridge, /turf/open/floor/f13/wood, /area/f13/city) "sAd" = ( @@ -59673,6 +60526,14 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"sBk" = ( +/obj/structure/car/rubbish_lights{ + pixel_y = -7 + }, +/turf/open/floor/f13{ + icon_state = "floorrusty" + }, +/area/f13/city) "sBr" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -59770,6 +60631,12 @@ /obj/machinery/microwave/stove, /turf/open/floor/f13/wood, /area/f13/city) +"sDt" = ( +/obj/structure/flora/roadplant{ + icon_state = "dirt_7d" + }, +/turf/open/indestructible/ground/outside/road, +/area/f13/city) "sDv" = ( /obj/effect/decal/marking{ icon_state = "doubleverticaltop" @@ -59933,6 +60800,14 @@ icon_state = "whitegreenrustychess" }, /area/f13/building) +"sGx" = ( +/obj/structure/wreck/trash/machinepiletwo, +/turf/open/indestructible/ground/outside/gravel{ + color = "#B7ABAB"; + footstep = "dirt"; + name = "rocky dirt" + }, +/area/f13/wasteland) "sGY" = ( /obj/structure/chair/stool, /turf/open/indestructible/ground/outside/dirt, @@ -60092,6 +60967,16 @@ icon_state = "verticalrightborderright2bottom" }, /area/f13/wasteland) +"sMV" = ( +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop0" + }, +/area/f13/city) "sNh" = ( /obj/structure/simple_door/house, /turf/open/floor/plasteel/f13/vault_floor/blue/side{ @@ -60503,7 +61388,7 @@ /turf/open/floor/f13/wood, /area/f13/building/mall) "sVY" = ( -/obj/item/trash/chips, +/obj/effect/turf_decal/stripes/line, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontaltopborderbottom0" }, @@ -60959,11 +61844,11 @@ /turf/closed/wall/f13/tentwall, /area/f13/legion) "tgk" = ( -/obj/machinery/light, -/obj/machinery/radioterminal/ncr{ - dir = 1 +/obj/effect/decal/cleanable/glass, +/turf/closed/wall/f13/store{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" }, -/turf/open/floor/plasteel/vault, /area/f13/ncr) "tgq" = ( /obj/effect/decal/cleanable/dirt, @@ -61025,15 +61910,15 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/building/mall) "thb" = ( -/obj/structure/sign/poster/official/soft_cap_pop_art{ - pixel_y = 32 +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/sandbags, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" }, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/area/f13/wasteland) "thh" = ( -/obj/machinery/door/unpowered/secure_steeldoor{ - req_access_txt = "281"; - name = "security checkpoint" +/obj/machinery/door/unpowered/secure_NCR{ + req_access_txt = "281,121" }, /turf/open/floor/f13{ icon_state = "redmark" @@ -61077,12 +61962,10 @@ }, /area/f13/building/museum) "til" = ( -/obj/mecha/working/normalvehicle/ambulance{ - dir = 4 - }, +/obj/structure/table/wood/junk, /turf/open/indestructible/ground/outside/sidewalk{ - dir = 1; - icon_state = "outerpavementdirt" + dir = 8; + icon_state = "horizontaloutermainleft" }, /area/f13/wasteland) "tir" = ( @@ -61133,6 +62016,14 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"tjL" = ( +/obj/structure/sign/poster/ncr/keep_to_myself{ + pixel_x = 32 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2" + }, +/area/f13/wasteland) "tjV" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/plasteel/f13/vault_floor/dark, @@ -61147,7 +62038,7 @@ "tkg" = ( /obj/machinery/door/airlock/shuttle{ name = "medical pavillion"; - req_access_txt = "280" + req_access_txt = "280,121" }, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralsolid, /area/f13/city) @@ -61259,9 +62150,12 @@ }, /area/f13/wasteland) "tnD" = ( -/obj/structure/chair/office, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/decoration/clock{ + pixel_y = 30 + }, +/obj/machinery/seed_extractor, +/turf/open/floor/f13/wood, +/area/f13/building) "tnG" = ( /obj/structure/table, /obj/machinery/chem_dispenser, @@ -61311,11 +62205,10 @@ }, /area/f13/city) "toq" = ( -/obj/structure/flora/grass/wasteland, -/mob/living/simple_animal/chicken{ - desc = "This motherclucker always orders people around during feeding time."; - name = "Corporal Clucker" +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_2" }, +/obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "toy" = ( @@ -61558,9 +62451,9 @@ }, /area/f13/wasteland) "tsb" = ( -/obj/structure/simple_door/metal/store, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/ncr) +/obj/structure/chair/comfy/bathtub, +/turf/open/floor/f13/wood, +/area/f13/city) "tsh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -61630,6 +62523,14 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"ttN" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop3" + }, +/area/f13/wasteland) "ttU" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -61642,6 +62543,12 @@ icon_state = "floorrusty" }, /area/f13/building/firestation) +"tuc" = ( +/obj/structure/debris/v3, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) "tue" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -61770,8 +62677,18 @@ }, /area/f13/wasteland) "txv" = ( -/obj/effect/decal/cleanable/glass, -/turf/open/indestructible/ground/outside/sidewalk, +/obj/effect/turf_decal/gravel_edge, +/obj/structure/gallow{ + pixel_y = 16; + pixel_x = 1 + }, +/obj/structure/table/wood/crate{ + pixel_x = -7 + }, +/obj/structure/table/wood/crate{ + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "txy" = ( /obj/effect/decal/cleanable/dirt, @@ -61893,7 +62810,6 @@ /area/f13/city) "tzu" = ( /obj/structure/flora/branch, -/obj/mecha/combat/combatvehicle/buggy/legionarmed/loaded, /turf/open/indestructible/ground/outside/dirt{ dir = 8; icon_state = "dirtcorner" @@ -61939,16 +62855,10 @@ }, /area/f13/wasteland) "tAq" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "ncrarmory"; - layer = 11; - name = "NCR Armory shutters" - }, -/obj/structure/simple_door/glass{ - name = "NCR wooden door"; - req_access_txt = "121" +/turf/open/indestructible/ground/outside/ruins{ + dir = 6; + icon_state = "rubble" }, -/turf/open/floor/plasteel/f13/vault_floor/dark, /area/f13/ncr) "tAz" = ( /obj/structure/closet/crate, @@ -61965,12 +62875,9 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "tAD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/handy, -/turf/open/floor/f13/wood, -/area/f13/building) +/mob/living/simple_animal/hostile/handy/robobrain, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "tAJ" = ( /obj/effect/turf_decal/gravel_edge/corner, /turf/open/indestructible/ground/outside/dirt, @@ -62145,7 +63052,6 @@ "tDh" = ( /obj/structure/chair/wood, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building) "tDi" = ( @@ -62227,8 +63133,9 @@ /turf/open/floor/f13/wood, /area/f13/building/powered) "tEu" = ( -/turf/open/floor/carpet/black, -/area/f13/building) +/obj/structure/mecha_wreckage/vertibird, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland) "tEx" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/dirt{ @@ -62318,9 +63225,7 @@ /area/f13/wasteland) "tFZ" = ( /obj/machinery/light, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ncr) "tGh" = ( /obj/effect/decal/cleanable/dirt, @@ -62506,11 +63411,9 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "tJL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/f13/wood, -/area/f13/building) +/mob/living/simple_animal/cow/brahmin/sgtsillyhorn, +/turf/open/indestructible/ground/inside/dirt, +/area/f13/city) "tJO" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_3" @@ -62539,7 +63442,7 @@ "tKy" = ( /obj/machinery/door/airlock/shuttle{ name = "medical pavillion"; - req_access_txt = "280" + req_access_txt = "280,121" }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/side, /area/f13/city) @@ -62835,6 +63738,12 @@ icon_state = "floorrusty" }, /area/f13/building/mall) +"tQv" = ( +/obj/structure/car/rubbish2{ + icon_state = "car_rubish3" + }, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) "tQO" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "verticalrightborderleft1" @@ -63020,6 +63929,20 @@ /obj/item/reagent_containers/glass/bucket/wood, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"tUA" = ( +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2_flesh" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" + }, +/area/f13/wasteland) "tUB" = ( /obj/structure/flora/rock/jungle, /turf/open/water, @@ -63174,6 +64097,14 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +"tWY" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/cow/brahmin{ + name = "NCR brahmin"; + desc = "This is a branded brahmin or brahma are mutated cattle with two heads and looking udderly ridiculous.
Known for their milk, just don't tip them over." + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "tXf" = ( /obj/structure/flora/wasteplant/wild_broc, /turf/open/indestructible/ground/outside/dirt{ @@ -63250,6 +64181,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) +"tZz" = ( +/obj/structure/table/wood/crate, +/obj/item/reagent_containers/food/drinks/bottle/sunset{ + pixel_y = 17 + }, +/obj/item/reagent_containers/food/drinks/bottle/sunset{ + pixel_y = 14; + pixel_x = 6 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottomleft" + }, +/area/f13/wasteland) "tZM" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/effect/turf_decal/gravel_edge, @@ -63414,6 +64358,19 @@ icon_state = "whitedirtysolid" }, /area/f13/brotherhood/medical) +"udA" = ( +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14 + }, +/obj/structure/fence{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/city) "ueb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -63424,9 +64381,7 @@ }, /area/f13/wasteland) "uef" = ( -/obj/structure/chair/pew/right{ - dir = 8 - }, +/obj/machinery/workbench/advanced, /turf/open/floor/f13/wood, /area/f13/city) "uep" = ( @@ -63647,6 +64602,15 @@ icon_state = "yellowrustychess" }, /area/f13/city) +"uiH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/rock/jungle, +/turf/open/indestructible/ground/outside/water, +/area/f13/building) "uiP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/showcase/horrific_experiment, @@ -63932,6 +64896,15 @@ icon_state = "dirt" }, /area/f13/wasteland) +"upa" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/chair/pew/right{ + dir = 4 + }, +/turf/open/floor/carpet/red, +/area/f13/building) "upb" = ( /obj/structure/chair/wood{ dir = 8 @@ -64137,10 +65110,13 @@ }, /area/f13/building/mall) "uut" = ( -/obj/structure/table/wood, -/obj/effect/decal/cleanable/blood, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/structure/campfire/stove{ + pixel_x = -12 + }, +/turf/open/floor/f13/wood{ + icon_state = "housewood4-broken" + }, +/area/f13/city) "uuA" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -64303,6 +65279,11 @@ }, /obj/structure/flora/grass/jungle, /obj/structure/fence/corner/wooden, +/obj/structure/gallow{ + pixel_y = 7; + pixel_x = 14; + layer = 3 + }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "uxG" = ( @@ -64330,6 +65311,7 @@ /area/f13/ncr) "uza" = ( /obj/structure/wreck/trash/two_tire, +/obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/sidewalk{ dir = 9; icon_state = "outerpavementdirt" @@ -64583,6 +65565,18 @@ icon_state = "dirt" }, /area/f13/wasteland) +"uDw" = ( +/obj/structure/sign/poster/contraband/bountyhunters{ + pixel_x = 31 + }, +/obj/structure/sign/poster/ncr/loaded{ + pixel_x = 29; + pixel_y = -13 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" + }, +/area/f13/wasteland) "uDA" = ( /obj/structure/cable/white{ color = "#A47449"; @@ -64980,7 +65974,7 @@ /obj/structure/simple_door/metal/store{ name = "Eastwood Police Department" }, -/turf/open/floor/plasteel/f13/vault_floor/floor, +/turf/open/floor/plasteel/f13/vault_floor/misc, /area/f13/city) "uKL" = ( /obj/effect/decal/remains{ @@ -65177,15 +66171,18 @@ /turf/open/floor/carpet, /area/f13/building/mall) "uPl" = ( -/obj/effect/turf_decal/gravel_edge{ - dir = 10 - }, +/obj/structure/barricade/tentclothcorner, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/city) "uPo" = ( -/obj/item/trash/f13/borscht, +/obj/structure/barricade/sandbags, +/obj/structure/fence{ + dir = 1; + pixel_x = 15 + }, +/obj/structure/obstacle/barbedwire, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop0" + icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) "uPA" = ( @@ -65485,13 +66482,12 @@ }, /area/f13/brotherhood) "uVt" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/sandbags, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" }, -/area/f13/ncr) +/area/f13/wasteland) "uVy" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -65634,7 +66630,8 @@ }, /area/f13/wasteland) "uXY" = ( -/obj/machinery/hydroponics/constructable, +/obj/structure/barricade/bars, +/obj/structure/table/wood/junk, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/city) "uYi" = ( @@ -65795,6 +66792,10 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/building/powered) +"vcf" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/dark, +/area/f13/wasteland) "vcq" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -66097,9 +67098,7 @@ }, /area/f13/wasteland) "viQ" = ( -/obj/structure/chair/pew/left{ - dir = 8 - }, +/obj/structure/chair/office, /turf/open/floor/f13/wood, /area/f13/city) "vjb" = ( @@ -66148,10 +67147,15 @@ }, /area/f13/wasteland) "vjQ" = ( -/obj/item/kitchen/knife, -/obj/structure/fence, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = 14 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/city) "vkh" = ( /obj/machinery/autolathe, /turf/open/floor/f13/wood, @@ -66257,6 +67261,9 @@ icon_state = "verticaloutermain2top" }, /area/f13/wasteland) +"vlX" = ( +/turf/open/floor/plasteel/f13/vault_floor/green, +/area/f13/building) "vmf" = ( /obj/structure/flora/grass/jungle, /turf/open/indestructible/ground/outside/dirt{ @@ -66291,6 +67298,14 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"vmP" = ( +/obj/structure/table/wood/crate{ + pixel_x = -15; + pixel_y = 18; + layer = 2.9 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "vmQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -66359,14 +67374,16 @@ }, /area/f13/building) "vof" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/breadslice/plain, +/obj/item/reagent_containers/food/snacks/breadslice/plain, +/obj/item/reagent_containers/food/drinks/bottle/wine{ + pixel_y = 18; + pixel_x = 4 }, -/obj/structure/flora/rock/jungle, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland) +/turf/open/floor/carpet/royalblack, +/area/f13/building) "voh" = ( /obj/structure/decoration/rag{ icon_state = "skin" @@ -66562,6 +67579,7 @@ /area/f13/brotherhood/chemistry) "vsb" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/hydroponics/soil/pot, /turf/open/floor/plasteel/f13/vault_floor/blue/side{ dir = 6 }, @@ -66765,7 +67783,7 @@ }, /area/f13/wasteland) "vxj" = ( -/obj/machinery/seed_extractor, +/obj/structure/bed/old, /turf/open/floor/plasteel/f13/vault_floor/misc, /area/f13/city) "vxo" = ( @@ -66920,13 +67938,11 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/building/museum) "vAp" = ( -/obj/structure/table/optable, -/obj/machinery/defibrillator_mount/loaded{ - pixel_x = -28; - pixel_y = 4 +/obj/structure/barricade/tentleathercorner, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontaltopborderbottom0" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) +/area/f13/wasteland) "vAN" = ( /obj/structure/chair/wood{ dir = 8 @@ -67256,12 +68272,11 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "vJV" = ( -/obj/machinery/vending/cola/starkist, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/blue/side{ - dir = 1 +/obj/item/clothing/head/cone, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontaltopborderbottom0" }, -/area/f13/building) +/area/f13/wasteland) "vKc" = ( /obj/machinery/light/lampost, /obj/effect/decal/cleanable/dirt, @@ -67276,9 +68291,11 @@ /area/f13/wasteland) "vKF" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/black, -/area/f13/building) +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop1" + }, +/area/f13/wasteland) "vKS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -67477,13 +68494,11 @@ }, /area/f13/wasteland) "vOL" = ( -/obj/effect/turf_decal/gravel_edge{ - dir = 8 - }, +/obj/structure/simple_door/room, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" }, -/area/f13/wasteland) +/area/f13/city) "vOQ" = ( /obj/structure/flora/ausbushes/grassybush, /turf/open/indestructible/ground/outside/dirt{ @@ -67654,10 +68669,14 @@ /turf/closed/wall/r_wall, /area/f13/brotherhood/armory) "vSc" = ( -/obj/effect/decal/cleanable/ash, -/obj/effect/decal/cleanable/generic, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/structure/window/fulltile/store{ + icon_state = "storewindowleft" + }, +/obj/machinery/door/poddoor/shutters{ + layer = 3.3 + }, +/turf/open/floor/f13/wood, +/area/f13/city) "vSk" = ( /obj/structure/fireplace{ pixel_x = 0 @@ -68141,7 +69160,7 @@ "wdE" = ( /obj/machinery/door/airlock/shuttle{ name = "medical pavillion"; - req_access_txt = "280" + req_access_txt = "280,121" }, /turf/open/floor/plating/f13/inside, /area/f13/city) @@ -68317,6 +69336,17 @@ icon_state = "desertsmooth4" }, /area/f13/wasteland) +"wgy" = ( +/mob/living/simple_animal/cow/brahmin{ + name = "NCR brahmin"; + desc = "This is a branded brahmin or brahma are mutated cattle with two heads and looking udderly ridiculous.
Known for their milk, just don't tip them over." + }, +/mob/living/simple_animal/cow/brahmin{ + name = "NCR brahmin"; + desc = "This is a branded brahmin or brahma are mutated cattle with two heads and looking udderly ridiculous.
Known for their milk, just don't tip them over." + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "wgB" = ( /obj/structure/simple_door/dirtyglass, /turf/open/floor/f13{ @@ -68771,6 +69801,9 @@ /area/f13/city) "wpU" = ( /obj/effect/decal/cleanable/oil, +/obj/structure/fence{ + dir = 4 + }, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalbottombordertop0" }, @@ -68820,14 +69853,12 @@ }, /area/f13/building) "wrN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/folding{ - dir = 1 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerpavementcornerdirt" }, -/area/f13/ncr) +/area/f13/wasteland) "wrQ" = ( /obj/structure/flora/grass/coyote/seventeen, /turf/open/indestructible/ground/outside/desert/sonora/rough{ @@ -68842,6 +69873,19 @@ icon_state = "bluerusty" }, /area/f13/building/hospital) +"wsf" = ( +/obj/effect/overlay/junk/oldpipes{ + dir = 1; + layer = 2; + pixel_x = 15 + }, +/obj/item/clothing/head/cone{ + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopright" + }, +/area/f13/wasteland) "wsg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -68923,6 +69967,18 @@ name = "rocky dirt" }, /area/f13/wasteland) +"wuo" = ( +/obj/structure/fence{ + max_integrity = 500; + name = "reinforced fence"; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/gravel{ + color = "#B7ABAB"; + footstep = "dirt"; + name = "rocky dirt" + }, +/area/f13/wasteland) "wuz" = ( /obj/machinery/light/small{ pixel_x = -5 @@ -68933,20 +69989,11 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "wuS" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_3" - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/turf/open/indestructible/ground/outside/water/running{ - color = " A6635D"; - name = "sewage water" +/obj/structure/stairs/east{ + color = "#A47449" }, -/area/f13/wasteland) +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/city) "wvM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt{ @@ -68975,13 +70022,12 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "wwx" = ( -/obj/structure/sign/poster/contraband/pinup_couch{ - pixel_x = -32 - }, -/turf/open/floor/plasteel/f13/vault_floor/dark{ - icon_state = "darkdirty" +/obj/structure/campfire/stove{ + density = 0; + pixel_y = 16 }, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/ruins, +/area/f13/city) "wwB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/f13chair2{ @@ -69006,9 +70052,11 @@ }, /area/f13/wasteland) "wwW" = ( -/obj/structure/junk/cabinet, -/obj/item/clothing/mask/cigarette/rollie, -/turf/open/indestructible/ground/outside/sidewalk, +/obj/structure/wreck/trash/two_barrels, +/obj/item/clothing/head/cone, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, /area/f13/wasteland) "wwY" = ( /obj/effect/decal/cleanable/dirt{ @@ -69041,16 +70089,23 @@ color = " A6635D" }, /area/f13/wasteland) +"wxA" = ( +/obj/structure/window/fulltile/store{ + icon_state = "storewindowvertical" + }, +/obj/structure/window/fulltile/store{ + icon_state = "storewindowtop" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc, +/area/f13/city) "wxJ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/hospital) "wxS" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/wreck/trash/bus_door, -/obj/structure/tires/five, -/obj/effect/decal/waste{ - icon_state = "goo12" +/obj/structure/wreck/bus/rusted{ + layer = 3.5 }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) @@ -69080,6 +70135,7 @@ pixel_x = 3; pixel_y = 7 }, +/obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "wyC" = ( @@ -69304,18 +70360,13 @@ }, /area/f13/building) "wCK" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, /obj/structure/flora/grass/wasteland{ layer = 4.2; pixel_x = -3 }, -/turf/open/indestructible/ground/outside/water, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontaltopborderbottom2" + }, /area/f13/wasteland) "wCO" = ( /obj/structure/flora/grass/wasteland{ @@ -69561,6 +70612,12 @@ icon_state = "desertsmooth7" }, /area/f13/wasteland) +"wGP" = ( +/obj/structure/junk/locker, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) "wGS" = ( /obj/structure/fence/wooden{ dir = 4; @@ -69794,6 +70851,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"wMy" = ( +/obj/effect/turf_decal/gravel_edge, +/obj/structure/reagent_dispensers/barrel/dangerous{ + pixel_y = -18; + pixel_x = 3; + density = 0 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "wMN" = ( /obj/structure/rack, /obj/machinery/light/broken, @@ -69964,10 +71030,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, +/turf/open/floor/carpet/red, /area/f13/building) "wPS" = ( /obj/effect/decal/cleanable/dirt, @@ -70020,17 +71083,20 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"wQx" = ( +/obj/machinery/biogenerator, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "wQF" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/grass/jungle, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) "wQN" = ( -/obj/structure/debris/v4, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontaltopborderbottom2" - }, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/plasteel/f13/vault_floor/floor, +/area/f13/city) "wRd" = ( /obj/structure/rack, /obj/item/reagent_containers/glass/bucket/wood, @@ -70200,12 +71266,15 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/building) "wVi" = ( -/obj/structure/window/fulltile/house{ - icon_state = "storewindowbottom" +/obj/structure/flora/tree/jungle{ + color = "#d9b51c" }, -/obj/structure/curtain, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) +/obj/effect/overlay/barbed{ + dir = 4 + }, +/obj/effect/overlay/barbed, +/turf/open/floor/grass, +/area/f13/wasteland) "wVw" = ( /obj/structure/table/reinforced, /obj/structure/barricade/bars, @@ -70334,11 +71403,15 @@ /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralsolid, /area/f13/city) "wXO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/black, -/area/f13/building) +/obj/effect/overlay/barbed{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/gravel{ + color = "#B7ABAB"; + footstep = "dirt"; + name = "rocky dirt" + }, +/area/f13/wasteland) "wXT" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -70387,10 +71460,12 @@ }, /area/f13/city) "wZx" = ( -/obj/structure/tires/five, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 10; - icon_state = "outerpavementdirt" +/obj/structure/fence/door{ + dir = 4; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontaltopborderbottom0" }, /area/f13/wasteland) "wZT" = ( @@ -70777,6 +71852,13 @@ icon_state = "outerpavementdirt" }, /area/f13/wasteland) +"xgb" = ( +/obj/structure/barricade/sandbags, +/obj/structure/table/wood, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "xgk" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/dirt{ @@ -70935,6 +72017,10 @@ icon_state = "darkrustysolid" }, /area/f13/building/massfusion) +"xjE" = ( +/mob/living/simple_animal/cow/brahmin/horse, +/turf/open/indestructible/ground/inside/dirt, +/area/f13/city) "xjF" = ( /turf/closed/indestructible/rock, /area/f13/radiation) @@ -71058,11 +72144,10 @@ }, /area/f13/building) "xnZ" = ( -/obj/effect/decal/cleanable/glass, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontaltopborderbottom0" +/turf/open/floor/f13/wood{ + icon_state = "housewood1-broken" }, -/area/f13/wasteland) +/area/f13/city) "xod" = ( /turf/open/indestructible/ground/outside/dirt/dark, /area/f13/radiation) @@ -71129,11 +72214,12 @@ /turf/open/floor/f13, /area/f13/building) "xoZ" = ( -/obj/mecha/working/normalvehicle/ncrtruck/loaded, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain1" +/mob/living/simple_animal/hostile/handy{ + icon_state = "gutsy"; + name = "Unarmed mr. gutsy" }, -/area/f13/wasteland) +/turf/open/floor/plasteel/vault, +/area/f13/ncr) "xpy" = ( /obj/structure/closet/cabinet, /obj/item/clothing/head/helmet/gladiator, @@ -71217,6 +72303,15 @@ /obj/machinery/autolathe, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/city) +"xre" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/fence{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "innermaincornerinner - S" + }, +/area/f13/city) "xrr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ @@ -71942,6 +73037,14 @@ /obj/structure/flora/grass/coyote/one, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"xFs" = ( +/obj/structure/chair/bench{ + pixel_x = 1 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalrightborderleft0" + }, +/area/f13/wasteland) "xFv" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -72106,6 +73209,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building) +"xJK" = ( +/obj/structure/barricade/tentleatheredge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 2; + icon_state = "outerpavementdirt" + }, +/area/f13/wasteland) "xJQ" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, @@ -72231,6 +73343,15 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +"xLY" = ( +/obj/structure/table/wood, +/obj/structure/barricade/bars, +/obj/structure/curtain{ + color = "#5c131b" + }, +/obj/item/candle/infinite, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "xLZ" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -72324,33 +73445,20 @@ /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) "xOC" = ( -/obj/structure/closet/locker/oldstyle{ - anchored = 1 - }, -/obj/item/clothing/accessory/ncr/TPR, -/obj/item/clothing/accessory/ncr/TPR, -/obj/item/clothing/accessory/ncr/TPR, -/obj/item/clothing/accessory/ncr/TPR, -/obj/item/clothing/accessory/ncr/SPC, -/obj/item/clothing/accessory/ncr/SPC, -/obj/item/clothing/accessory/ncr/SPC, -/obj/item/clothing/accessory/ncr/SGT, -/obj/item/clothing/accessory/ncr/SGT, -/obj/item/clothing/accessory/ncr/REC, -/obj/item/clothing/accessory/ncr/REC, -/obj/item/clothing/accessory/ncr/REC, -/obj/item/clothing/accessory/ncr/REC, -/obj/item/clothing/accessory/ncr/MCPL, -/obj/item/clothing/accessory/ncr/MCPL, -/obj/item/clothing/accessory/ncr/MCPL, -/obj/item/clothing/accessory/ncr/SSGT, -/obj/item/clothing/accessory/ncr/SSGT, -/obj/item/clothing/accessory/ncr/FSGT, -/obj/item/clothing/accessory/ncr/CPL, -/obj/item/clothing/accessory/ncr/CPL, -/obj/item/clothing/accessory/ncr/CPL, -/turf/open/floor/plasteel/vault, -/area/f13/ncr) +/obj/structure/closet/cabinet/anchored, +/obj/item/clothing/suit/hooded/chaplain_hoodie, +/obj/item/clothing/suit/hooded/chaplain_hoodie/leader, +/obj/item/clothing/suit/hooded/chaplain_hoodie, +/obj/item/clothing/suit/hooded/chaplain_hoodie, +/obj/item/clothing/suit/hooded/chaplain_hoodie, +/obj/item/clothing/suit/hooded/chaplain_hoodie, +/obj/item/clothing/suit/hooded/chaplain_hoodie, +/obj/item/clothing/suit/chaplain/studentuni, +/obj/item/clothing/suit/chaplain/pharaoh, +/obj/item/clothing/suit/chaplain/nun, +/obj/item/clothing/suit/chaplain/holidaypriest, +/turf/open/floor/f13/wood, +/area/f13/building) "xOD" = ( /turf/open/indestructible/ground/outside/dirt{ icon_state = "dirt" @@ -72397,6 +73505,12 @@ /obj/structure/barricade/wooden, /turf/open/floor/f13/wood, /area/f13/wasteland) +"xPO" = ( +/obj/item/clothing/head/cone, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopleft" + }, +/area/f13/wasteland) "xPR" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/gravel{ @@ -72483,14 +73597,15 @@ /obj/structure/curtain, /turf/open/floor/plasteel/f13/vault_floor/green, /area/f13/brotherhood/leisure) -"xRX" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/roaddirt{ - icon_state = "horizontaltopborderbottomright" +"xRK" = ( +/obj/machinery/power/smes/magical, +/turf/open/indestructible/ground/outside/road{ + icon_state = "innermaincornerinner - E" }, -/area/f13/wasteland) +/area/f13/city) +"xRX" = ( +/turf/open/floor/carpet/green, +/area/f13/city) "xSg" = ( /obj/machinery/light/small{ dir = 1; @@ -72830,12 +73945,21 @@ icon_state = "outershade" }, /area/f13/wasteland) +"xZX" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/city) "yaf" = ( /obj/machinery/camera/autoname{ invuln = null; name = "Eastwood South Gate Outer"; network = list("Eastwood") }, +/obj/item/flag/ncr, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright1" }, @@ -72896,6 +74020,10 @@ icon_state = "greenrustychess" }, /area/f13/building/massfusion) +"ybr" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "ybs" = ( /obj/structure/table, /obj/structure/barricade/bars{ @@ -72988,10 +74116,11 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "ydh" = ( -/obj/effect/turf_decal/gravel_edge{ - dir = 8 +/obj/effect/turf_decal/weather/dirt{ + dir = 4 }, -/turf/open/indestructible/ground/outside/sidewalk, +/obj/structure/car/rubbish4, +/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "ydm" = ( /obj/structure/flora/grass/coyote/fourteen, @@ -73042,6 +74171,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"yeA" = ( +/obj/structure/railing/corner{ + color = "#A47449"; + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottomright" + }, +/area/f13/wasteland) "yeD" = ( /obj/structure/window/fulltile/house, /obj/structure/barricade/wooden/planks/pregame, @@ -73270,6 +74408,12 @@ /obj/structure/barricade/wooden/strong, /turf/closed/wall/f13/wood, /area/f13/caves) +"yjw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertopleft" + }, +/area/f13/wasteland) "yjy" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6"; @@ -73300,6 +74444,12 @@ /area/f13/building/powered) "yjW" = ( /obj/structure/barricade/sandbags, +/obj/structure/fence{ + dir = 4 + }, +/obj/structure/obstacle/barbedwire{ + dir = 4 + }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain2" }, @@ -73956,10 +75106,10 @@ xGe opk obz cjh +alC +alC +alC cjh -cmi -cjh -fgh pxI rVR cmi @@ -74213,10 +75363,10 @@ uIX cmi aoo bOm -ojV -fdy -cjh -wrN +lPn +lPn +alC +apn uDh kOP dPt @@ -74470,10 +75620,10 @@ gnf cjh aon lAt -uVt -meM +lPn +lPn cjh -glU +aoz kGV fWM cmi @@ -74727,9 +75877,9 @@ cmi tFZ aoo cjh -cmi -cmi -cmi +aol +aol +aol cmi jcW uDh @@ -74980,13 +76130,13 @@ aae aoo cjh cjh +alC +alC cjh cjh -obz -cjh -ieS -ieS -bsj +snb +snb +aol cmi qRw uHe @@ -75236,23 +76386,23 @@ gBs aOk kGV cjh +alC +aol +aol +alC +cjh +lTL +aol +snb cjh cmi cmi -obz -cjh -bsj -bsj -ieS cjh -kSd -cmi cjh -eFV -cmi -bsj -bsj cmi +bgB +aol +aol kGV ffF cjh @@ -75495,7 +76645,7 @@ kGV kGV aon byt -dSW +cld aoo gKC cld @@ -75507,10 +76657,10 @@ cjh cjh kgQ cjh -cld -cld -eKD -kGV +alC +alC +lPn +alC kaL cjh cld @@ -75763,12 +76913,12 @@ kGV mSw mSw kGV -cjh -cjh +alC +alC lPn -eKD -kGV -cWW +lPn +alC +cOO cOO pqI cld @@ -76021,11 +77171,11 @@ pxI pxI pxI pxI -tsb -pxI -pxI -kGV -hPL +alC +alC +alC +alC +aol pxI hPL nJO @@ -76279,9 +77429,9 @@ fRM ibi uUa bNs -adW +alC aHn -arW +alC rVC ftY sQm @@ -76492,12 +77642,12 @@ xLa anb rhA bll -xLa -jmr +alC +alC anO rbV rbV -jfF +rbV xLa djQ djQ @@ -76536,8 +77686,8 @@ vqg bNs bNs bNs -bNs -bNs +alC +alC nDB bNs bNs @@ -76748,25 +77898,25 @@ aae xLa rbV hHn -rbV -xLa -anu +alC +alC +aol hYq apn anr -tgk +rbV xLa bfu xLa +tgk +tgk +dLL +alC xLa xLa -bju -kVx -xLa -xLa -xLa -bju -kVx +akZ +akZ +hmu xLa xLa aOk @@ -76794,7 +77944,7 @@ bzX ean aBO vsg -mBw +wnX kLl ovj ovj @@ -77002,28 +78152,28 @@ aae aae aae aae -xLa -anc +alC +alC afL -axe -xLa -tnD +pvl +alC +alC aol uJk -anr +alC rbV apI lZB jIJ xLa rSg -rSg -rSg -aNa +akZ +akZ +bGP saK lZB -aoC -lZB +aol +alC blq xLa xLa @@ -77259,12 +78409,12 @@ aae aae aae aae -xLa -abE +alC +aol hwO jjK -xLa -thb +alC +alC ovV uJk jHI @@ -77279,7 +78429,7 @@ abE abE tzb rbV -qSH +apn abE lZB bmb @@ -77288,8 +78438,8 @@ xLC kGV boK akD -akt -akD +aol +alC akt fjO kGV @@ -77297,7 +78447,7 @@ kGV vsg aQZ tyE -cPA +iZS iZS iZS vJC @@ -77519,9 +78669,9 @@ aae xLa rbV rbV -rbV -xLa -rbV +alC +alC +alC rbV abE abE @@ -77534,9 +78684,9 @@ noN rbV axe rbV -qSH +rbV abE -qSH +fbu abE qSH hmu @@ -77545,7 +78695,7 @@ xLC pxI akh akD -akD +alC akD akt akD @@ -77784,7 +78934,7 @@ xLa tHb tHb xLa -apT +lZB aoC xLa arX @@ -77795,13 +78945,13 @@ rbV rbV nqN rbV -qSH +rbV bmn xLa xLC pxI bpT -akt +aol dJS vjj akt @@ -77811,7 +78961,7 @@ pxI vsg shs tws -uNJ +tQv fiV mGE eEC @@ -78029,8 +79179,8 @@ aae aae xLa anb -abE -abE +oUJ +oUJ jGR hmu hmu @@ -78047,19 +79197,19 @@ cVk aoC abE apm -rbV -tzb -rbV -tzb +fbu abE -qSH +xoZ +abE +abE +fbu lZB xLa xLC pxI aLC akt -kGV +alC kGV qvX qvX @@ -78068,7 +79218,7 @@ pxI oHM bLM pCf -dSP +uNJ uNJ mGE sUH @@ -78286,15 +79436,15 @@ aae aae xLa abE -rbV -rbV -xLa +pbl +pbl +cnJ hmu aoC aqY hmu aqY -bJy +hmu aqY aoC aqY @@ -78302,10 +79452,10 @@ hmu lZB cVk lZB -rbV -abE +alC +aol +aol abE -tzb abE ezA nqN @@ -78315,15 +79465,15 @@ xLa xLC kGV kGV -byM -kGV +alC +alC nzy bxh -aOL -bxh -kGV -oHM -txf +alC +alC +alC +wnX +rzz rFj uNJ uNJ @@ -78541,13 +79691,13 @@ aaa aae aae aae -xLa -lTL -are -are -fbu -aqY -mHT +alC +alC +aHe +liO +wnX +alC +hmu xLa bju kVx @@ -78559,12 +79709,12 @@ oeB xLa xLa mwJ -mwJ -bgB -aOD -lZB -lZB -lZB +jjK +jjK +rWq +akZ +alC +alC hmu blZ xLa @@ -78572,15 +79722,15 @@ xLa dWk kGV uET -aqY -byM +alC +alC bbj axa -awZ +snb aOL lqb -xYE -eoi +wnX +wnX rFj uNJ ciH @@ -78798,12 +79948,12 @@ aaa aae aae aae -xLa -abE -iMa +alC +wnX +aJT avy -fbu -aoC +wnX +alC hmu ajV mBP @@ -78817,12 +79967,12 @@ xLa xLa xLa asV -kVx +fDe xLa -cVk +alC xLa -bju -kVx +alC +alC xLa xLa rnk @@ -78830,14 +79980,14 @@ rnk kGV lRg hmu -lTF -axa -ngD -axa +alC +aol +aol +aol ngD tAq -xYE -trw +wnX +wnX bXM fiV uNJ @@ -78845,7 +79995,7 @@ clp igF pjX biB -aqp +aiN ean vsg nXv @@ -79055,12 +80205,12 @@ aaa aae aae aae -xLa -ann -arI -jOo -xLa -aqY +alC +wnX +aJT +avy +tEu +alC lZB qMr kIc @@ -79091,10 +80241,10 @@ kGV iAZ kdN aya -bAp -uDh -dcy -aQZ +alC +aol +eoN +wnX mHp uNJ uNJ @@ -79312,13 +80462,13 @@ aaa aae aae xLa -xLa -xLa -prQ -xLa -eIH -aqY -hmu +alC +wnX +aJT +ngf +wnX +erx +nqk xLa ajE aop @@ -79348,9 +80498,9 @@ kGV hPL idT idT -uDh +aol snb -bGP +eoN shs mHp mGE @@ -79569,12 +80719,12 @@ aaa aae aae xLa -ajT -rbV -anv -anb -xLa -aoC +alC +aHe +xLC +avy +wnX +are nqk xLa xLa @@ -79598,7 +80748,7 @@ iZS asa alF hEG -hmz +eYp nNu lpo lpo @@ -79826,13 +80976,13 @@ aaa aae aae xLa -ajZ -jHI -jHI -abE -fiy -lZB -aqY +alC +aJT +amg +avy +wnX +wnX +vcf xLa xLa pWq @@ -79875,7 +81025,7 @@ vGN xYE pxI bwe -cmL +lEo lEo fsH joK @@ -80083,14 +81233,14 @@ aaa aae aae xLa -akZ -abE +alC +aJT asv -boP -xLa -hmu -aqY -xLa +xLC +avy +wnX +eoN +alC xLa pWq akD @@ -80108,7 +81258,7 @@ bMM ppw bMM fiV -bMM +ann apQ bnK pKY @@ -80130,11 +81280,11 @@ uNJ igF ftl gRH -aoo +alC bxp -pvl +wnX lNa -aqX +wnX bxC eEW eEW @@ -80340,15 +81490,15 @@ aaa aae aae xLa -xLa -prQ -xLa -xLa -xLa -kjU -aoC -xLa -xLa +alC +aJT +xLC +xLC +avy +wnX +wnX +alC +alC xLa xLa akD @@ -80364,7 +81514,7 @@ uNJ bMM qmG bwV -ngf +evq evq uNJ uNJ @@ -80386,13 +81536,13 @@ uNJ uNJ uNJ fcB -gMb -kMH -jYk -aUI -rzz -iZS -iZS +eoN +wnX +aHe +liO +wnX +wnX +wnX gMb gMb gMb @@ -80597,16 +81747,16 @@ aaa aae aae xLa -alz -kGp -rbV -rbV -xLa -hmu -nIt -xLa -vAp -evn +alC +aJT +asv +azy +avy +wnX +wnX +alC +alC +gPj and bav akD @@ -80642,14 +81792,14 @@ bMM sXv rCE hDy -ppw -bMM -qmG -sXv -bdb -bRo -imF -imF +eoN +wnX +wnX +aFj +aKq +liO +eoN +eoN imF hDy qmG @@ -80854,15 +82004,15 @@ aaa aae aae xLa -rbV -anw -avy -rbV -xLa -kmf -prQ -xLa -bhI +alC +aJT +xLC +amg +xLC +liO +wnX +alC +alC gPj and pgg @@ -80872,15 +82022,15 @@ akB kLl aqU aQZ -mHp -fdT +akc +bMM oXi jIk gPZ khV mHp evq -fiV +mLF uNJ cNs cNs @@ -80899,14 +82049,14 @@ gSH bkE cNs cHs -cHs -cNs -gSH -cHs -bdI -box -cHs -cHs +eoN +wnX +wnX +eoN +aFj +hsP +eoN +eoN iLw gSH rCE @@ -81112,15 +82262,15 @@ aae aae xLa alC -abE +aFj azy -rbV -rbV -rbV -opm -xLa -aLw -gZe +xLC +xLC +avy +wnX +alC +alC +gPj and bav akD @@ -81138,7 +82288,7 @@ hnE mHp bMM fiV -kID +bnK jIk tnZ tnZ @@ -81146,7 +82296,7 @@ hvO qhx hvO bjH -bjH +kMH gRk gRk gRk @@ -81156,13 +82306,13 @@ qhx qhx hvO hvO -hvO -hvO -aoo -mQx -pbl -sgN -qhx +wnX +wnX +alC +cly +wnX +wnX +wnX qhx qhx qhx @@ -81369,14 +82519,14 @@ aae aae xLa alC -anL -aJR -qSH -abE -abE -aXn -xLa -xLa +wnX +aJT +xLC +asv +hsP +alC +alC +alC xLa bWv akD @@ -81411,12 +82561,12 @@ aZC lpo lpo lpo +swu xYE -xYE -kGV -pId -kGV +alC pId +alC +nzi pId reU cmm @@ -81625,16 +82775,16 @@ aaa aae aae xLa -rbV -aog -aLq +alC +wnX +aJT bxA -abE -abE -xOC -xLa -vAp -evn +avy +wnX +wnX +alC +alC +gPj and bav akt @@ -81643,7 +82793,7 @@ xLa xLa xEi aQZ -atY +aXn bMM bMM bXQ @@ -81672,7 +82822,7 @@ vsg bmq kGV suv -bqo +cld clc cQb bve @@ -81882,15 +83032,15 @@ aaa aae aae xLa -xLa -aox -aKU -xLa -aox -aKU -xLa -xLa -bhI +alC +wnX +aJT +xLC +avy +wnX +wnX +alC +alC gPj and bbv @@ -81901,7 +83051,7 @@ bpc ean koC fHV -xoZ +bMM bMM bMM qmG @@ -82139,16 +83289,16 @@ aaa aae aae aae -aae -aoR -xLC -hEu +aKU +wnX +aJT xLC -esY -ean -xLa -aLw -gZe +avy +wnX +wnX +alC +alC +gPj and bav akD @@ -82184,7 +83334,7 @@ eBH bas dcy xYE -cnm +cld cld cld cld @@ -82396,16 +83546,16 @@ aaa aae aae aae -aae -hHj -iLd -xLC -odm -bas -esK -xLa -alZ -wVi +aKU +wnX +aJT +tAD +avy +wnX +wnX +alC +alC +akD xLa apB ajY @@ -82415,7 +83565,7 @@ xLa aon aqy rFj -fiV +fdy uNJ bMM fiV @@ -82653,16 +83803,16 @@ aaa aae aae aae -xLC -amU -xMD +wnX +aHe xLC xLC -bas -nXv -riR -joK -aoz +avy +wnX +wnX +wnX +wnX +oHM xLa xLa xLa @@ -82909,17 +84059,17 @@ aaa aaa aae aae -amU -alW -apo +cMR +wnX +aJT xLC xLC -hHj -esY -esK -agM -mtr -biB +avy +wnX +wnX +dzB +tJl +oHM aum aum jEK @@ -83167,16 +84317,16 @@ aaa aae aae ait -hHj -jpT -rnk -rnk -rnk -gfu -esK -akW +wnX +aJT +xLC +azy +avy +wnX +wnX +agN ahc -jEK +esK esK ean ean @@ -83424,14 +84574,14 @@ aaa aae aae ajl +wnX +aJT xLC -esY -ean -ean -ean -ean -aum -pee +xLC +avy +wnX +wnX +jfF gyL biB biB @@ -83681,15 +84831,15 @@ aaa aae aae ait -iLd -aql -ean -aum -ean -ugy -sKy -mfT -amd +wnX +aJT +amg +xLC +asv +liO +wnX +wnX +wnX cdO cdO xLa @@ -83938,15 +85088,15 @@ aaa aae aae ait -hHj -dii -ean -aum -xLa -xLa -xLa -prQ -xLa +wnX +aJT +bxA +xLC +xLC +avy +wnX +alC +alC sKy tMN xLa @@ -83983,7 +85133,7 @@ cbw aOk cFK aOk -xLa +alC xLa eoG odm @@ -84194,16 +85344,16 @@ aaa aaa aae aae -cxJ +ajl +wnX +aJT xLC -aon -aum -ean -xLa -amg -amv -amV -xLa +asv +xLC +avy +wnX +alC +alC aOk aZx xLa @@ -84240,9 +85390,9 @@ ccl aOk aOk kJe -xLa -xLa -eoG +alC +alC +dii sWF xLC gCF @@ -84452,15 +85602,15 @@ aaa aae aae ajD -cXB -suS -cyj -cyj -xLa -amg -amy -amX -xLa +wnX +aFj +xLC +xLC +xLC +xLC +liO +alC +alC aOk aOk xLa @@ -84495,12 +85645,12 @@ aVg imQ cfD kFs -kFs -iUj -xLa -xLa -eoG -xLC +rVh +eoN +alC +alC +wnX +wnX xLC xLC xLC @@ -84708,16 +85858,16 @@ aaa aaa aae aae -aae -wuS -ozv -cyj -cyj -xLa +aKU +wnX +wnX +aFj +xLC +xLC amg -amy -amV -xLa +avy +alC +alC aOk aBM xLa @@ -84748,16 +85898,16 @@ rer bqU bAu aOk -toq +bmJ hkV cfD aOk aOk -aOk -xLa -xLa -eoG -xLC +wnX +alC +alC +wnX +wnX gea xLC xLC @@ -84965,16 +86115,16 @@ aaa aaa aae aae -aae -oUJ -xLa -xLa -xLa -xLa -xLa -amz -xLa -xLa +aKU +wnX +alC +alC +aJT +xLC +xLC +avy +alC +alC xLa xLa xLa @@ -85005,16 +86155,16 @@ bAu bAu bAu aOk -rVh +lQa imr cfD aOk aOk -aOk -xLa -xLa -eoG -xLC +wnX +alC +alC +wnX +wnX odm hEu sEB @@ -85223,15 +86373,15 @@ aaa aae aae aae -aae -xLa -aka -akc -ald -hmu -aqY -smn -wwx +aKU +alC +alC +aJT +xLC +xLC +avy +alC +alC aoC azx prQ @@ -85261,17 +86411,17 @@ bPp faR aOk aUU -pYw +pWr frx izV xfd aOk aOk ckT -xLa -xLa -eoG -xLC +alC +alC +wnX +wnX xLC xLC rNj @@ -85480,15 +86630,15 @@ aaa aae aae aae -aae -xLa -akb -swu -xLa -aqY -hmu -anm -aqY +aKU +alC +alC +aJT +xLC +azy +avy +alC +alC aqY lZB aOD @@ -85517,7 +86667,7 @@ aOk aGR faR aOk -fDe +hkV cIY qdU rth @@ -85737,15 +86887,15 @@ aaa aae aae aae -aae -xLa -xLa -xLa -xLa -llo -xLa -xLa -xLa +aKU +alC +alC +jOo +lPn +lPn +amV +alC +alC llo xLa xLa @@ -85994,15 +87144,15 @@ aaa aae aae aae -aae -aae -aae -xLa -agm -djQ -qqf -xLa -agm +aKU +aKU +aKU +jOo +lPn +lPn +amV +alC +alC djQ agm xLa @@ -86031,7 +87181,7 @@ aOk aGR faR aOk -qxy +hkV xLa xLa xLa @@ -86251,15 +87401,15 @@ aaa aae aae aae -aae -aae -aae -xLa -aNt -djQ -djQ -xLa -aNt +aKU +aKU +aKU +jOo +lPn +lPn +rOz +alC +alC djQ djQ xLa @@ -86287,7 +87437,7 @@ bgD lRa cjE faR -jts +bjb bna xLa xLa @@ -86508,19 +87658,19 @@ aaa aae aae aae -aae -aae -aae -xLa +aKU +aKU +aKU +jOo siH -djQ -xtp +lPn +lPn xLa jDH xtp jDH xLa -alK +jDH djQ xtp xLa @@ -86765,13 +87915,13 @@ aaa aae aae aae -aae -aae -aae -xLa -xLa -xLa -xLa +aKU +aKU +aKU +jOo +lPn +lPn +lPn xLa xLa xLa @@ -87022,13 +88172,13 @@ aaa aae aae aae +aKU +aKU +aKU aae aae -aae -aae -aae -aae -aae +aaB +aaB aae aae aae @@ -87280,12 +88430,12 @@ aae aae aae aae +aKU +aKU aae aae -aae -aae -aae -aaa +aaB +aaB aaa aae aae @@ -87537,14 +88687,14 @@ aae aae aae aae -aae -aae +aKU +aKU aae aaa +aaB +aaB aaa aae -aae -aae aaa aaa aae @@ -87794,13 +88944,13 @@ aae aae aae aae -aae -aaa -aae -aae +aKU +aKU aae aae aaa +aaB +aaB aaa aae aae @@ -88057,8 +89207,8 @@ aae aaa aaa aaa -aae -aae +aaB +aaB aae aae aae @@ -88313,9 +89463,9 @@ aae aaa aae aae -aae -aae -aae +aaa +aaB +aaB aae wkV iPF @@ -88570,8 +89720,8 @@ aaa aae aae aae -aae -aae +aaa +aJN aGR aGR aGR @@ -93070,10 +94220,10 @@ cNs cNs gSH iEI -aRd +uNV wxS -eee -cVt +fiV +uio cHs cHs cNs @@ -93327,11 +94477,11 @@ tnZ tnZ sZm upi -lCt +fHV wVA -bld +ayn jIk -bdR +hax tnZ gRk tnZ @@ -93581,13 +94731,13 @@ jIA xJp pRE pRE -kFb -wZx -ryF +pRE +tRd +iLL hdn tRk xTE -joA +vGN hXb bFH pRE @@ -93606,34 +94756,34 @@ xJp xJp xJp xJp -xJp -xJp -xJp -xJp -xJp -xJp -xJp -xJp -tRd -aQZ +hEN +hEN +hEN +hEN +mtL +mtL +mtL +hEN +hEN +aRr beD -kDp -sUH -hEG +oya +mqz +hEN uza -xJp -xJp -xJp -xJp -xJp -xJp -xJp -xJp -xJp -xJp -xJp -xJp -tRd +hEN +hEN +mtL +mtL +mtL +mtL +mtL +mtL +mtL +fiy +hEN +hEN +kWk koC rFj tRk @@ -93840,12 +94990,10 @@ aiO aiO aiO aiO -aQZ -wQN -bdA -iqA -aiO aiO +rFj +bdA +aGo aiO aiO aiO @@ -93871,26 +95019,28 @@ aiO aiO aiO aiO -tpP -aQZ -bZT -pBa -oXi -vGN -anR +aky +aky +iht +iht +iht +tgJ +vKF +aPK +hEN abP gCs gCs bdD abP -atJ -gFm -atJ -atJ -iSC -aOk +bfX +bfX +bfX +bfX +dSP aXa -tpP +bfX +aqp eoi ojS oXJ @@ -94093,16 +95243,16 @@ iht iht iht iht -dwX -nRe -gmK -knB +xLy +xLy +xLy +xLy aQZ -fef +rFj tRk -xTE +eJO vxc -anR +eee aky kls aky @@ -94127,11 +95277,11 @@ iht iht iht iht -aiO -tpP -aQZ -bkq -wVA +amy +bfs +nhI +ajT +tRk tRW hEG anR @@ -94140,14 +95290,14 @@ aco pgO bdQ bcE -etg -qyV -cFK -aOk -hyv -etg -hkV -tpP +arW +apw +apw +ppe +apw +bru +bfU +bfU txf mHp aer @@ -94345,19 +95495,19 @@ iht vSP jeh jeh -cvl +jeh jeh gFA dVU iht -ean -oAg -hTg -ean -aQZ -qWd -tRk -ayn +gKE +xRX +awZ +vSc +tuc +rFj +bdA +eJO hEG anR qAT @@ -94384,10 +95534,10 @@ krM rFS bds iht -aiO -tpP -aQZ -ojS +cLv +amy +ccq +iht tRk tRW hEG @@ -94397,14 +95547,14 @@ xyU xyU bdt bcW -aOk -bhm -qyV -cFK -hyv -hkV -etg -tpP +suS +apw +apw +apw +ppe +apw +arI +aqp trw pCf nvn @@ -94600,7 +95750,7 @@ aOk aiO iht szv -bcu +sDr bvW cMG jeh @@ -94608,16 +95758,16 @@ dHk ecb iht nHV -ean -ean -opE +xRX +awZ +deB aQZ -kPz -rZe -aeC -ggO +aPs +ryF +ttN +hEG anR -aky +rQy slb uep xxz @@ -94641,10 +95791,10 @@ hKI jeh jeh iht -aiO -tpP -aQZ -mHp +iht +cWW +aJR +boP aer eec hEG @@ -94654,14 +95804,14 @@ bfq xyU xyU abP -aOk -etg -etg -cFK -bIW -cFK -qyV -tpP +wQx +apw +apw +apw +apw +apw +aUc +aqp aQZ rFj mGE @@ -94857,20 +96007,20 @@ xFZ aiO iht aUa -bcw -bcw -bcw -bcw +doX +doX +doX +doX bcw edG iht -mfG -ean -rbn -pBw +kGp +bda +nxy +xLy aQZ dkx -tzr +qim gnd hEG anR @@ -94895,14 +96045,14 @@ xhd jeh iht yco -doX +jeh tQn iht -aiO -tpP -aQZ -mHp -kDp +hkg +amy +opm +aiG +nvn ahQ hEG anR @@ -94911,14 +96061,14 @@ aqQ aqQ bcF biV -etg -etg -etg -aOk -hyv +aGP apw -bSt -tpP +apw +ppe +apw +apw +bfU +aqp aQZ rFj mGE @@ -95113,25 +96263,25 @@ xFZ xFZ aiO iht -aUc +jeh bcw bcw bcw bcw bcw -jeh +jmr iht -iNW -kZO -aum -ean -mtG -mHp +nxy +bkO +nxy +vSc +aQZ +sVY lLo wpU hEG anR -aky +orG fHU vuk cqo @@ -95155,27 +96305,27 @@ iht enu jeh iht -aiO -tpP -aQZ -mHp +iht +iht +iht +iht wDX tRW hEG ayX abP -aqL -xyU +tnD +bcX xyU avL -aOk -aOk -aOk -aOk -hyv -aOk -bjb -tpP +apw +apw +apw +apw +apw +anL +bfU +bfU koC rFj wVA @@ -95370,24 +96520,24 @@ aOk qev aiO iht -hKI -jeh -jeh +ald +amX +aUI jeh jeh jeh -nuJ +aub iht nxy -eCB -aum -aum +bkO +nxy +deB aQZ -xnZ -eJO -eJO +sVY +pjF eJO -anR +hEG +mHT aky ope aCu @@ -95412,27 +96562,27 @@ blz iht tQn iht -aiO -tpP -aQZ -mHp -blK +jeh +dWE +bej +riR +srN aeC hEG anR -bcW +aAz uQs -sYZ +xyU xyU abP abP abP -apO -apO -abP +aLw +oEl +aaT etg -bjb -tpP +hRj +aqp eoi bwD cWJ @@ -95627,23 +96777,23 @@ nWp iXx aiO iht -viQ +aSS oXV -uef +kZN bcw -viQ -oXV +jeh +jeh uef iht -wwW -kZO -ean -ean -uPo +nxy +bkO +nxy +xLy +aQZ sVY +pjF eJO -qwF -eJO +hEG anR aky qST @@ -95669,27 +96819,27 @@ bcB woE tQn iht -aiO -tpP -aQZ -mHp -rlf +cXB +jeh +iPy +rFq +aer buC hEG anR bcE -aub +pgO sgU xyU -bcX +bcF wOq abP -bfU -aZv +apO +apO abP -aOk +bfX hRj -tpP +aqp bjV mHp bAA @@ -95890,24 +97040,24 @@ jeh bcw jeh jeh -jeh +kID iht reV -ean -bAT +bkO +nxy vSc aQZ -mHp +sVY pjF -igF eJO +hEG anR -kls +rQy nhy clv pka -ope -rBr +ybs +vuk vuk pDv slb @@ -95926,27 +97076,27 @@ yav iht tQn iht -aiO -tpP -aQZ -mHp -aPK +iht +iUj +krM +brL +nvn ahQ hEG anR -bcW -aub -bfs +aAz +pgO +auM xyU -bcX +bcF bfR abP -ahj -aZZ -biV -aOk -bjb -tpP +anm +aZv +abP +bfX +bfU +aqp trw rzV kDp @@ -96142,27 +97292,27 @@ odm aiO iht viQ -oXV -uef +amX +hTg bcw -viQ -oXV -uef -iht -reV -deB -ean +jeh +jeh +jeh +ajZ +bda +bkO +nxy deB aQZ -mHp -eJO -eJO +aHW +xgb eJO -anR -aky -nJH -clv +hEG +ojV +orG +fPb clv +hRC ybs vuk vuk @@ -96183,11 +97333,11 @@ iht iht woE iht -aiO -tpP -iLL +hkg +jeh +qZW rFq -kxH +nvn igF hEG anR @@ -96201,9 +97351,9 @@ abP bcF abP biV -aOk -etg -tpP +bfX +arI +aqp koC tEJ wVA @@ -96398,30 +97548,30 @@ xLC sYy aiO iht -hKI -jeh -jeh +kSd +amX +aUI bcw jeh jeh -nuJ +evn iht -txv -ean -ieK -ean +qdB +bda +bda +xLy aQZ mHp -kCd +nvn igF hEG anR -kls +aky lPd -clv -hRC -ybs -vuk +oeE +psq +ope +rBr sxN wfq slb @@ -96440,17 +97590,17 @@ jeh dWE jeh iht -aiO -tpP -aQZ -gFs -una +iht +iht +iht +iht +nvn eEC hEG anR abP xyU -kVQ +xyU awh abP bfS @@ -96458,9 +97608,9 @@ aNS xyU auW abP -cFK -etg -tpP +aQd +bfU +meM eoi gFs cWJ @@ -96655,29 +97805,29 @@ xix xLC aiO iht -viQ -oXV -uef +jeh +jeh +jeh bcw -viQ -oXV -uef +jeh +jeh +jeh iht -bct -vjQ -iWw -bct +qdB +bda +bda +snd iCZ mHp mGE ayn hEG -dDO +anR aky -lPd -oeE -psq ope +dXc +ope +dXc rCa vuk pDv @@ -96697,27 +97847,27 @@ jeh jeh jeh iht -aiO -tpP -aQZ -mHp -una +dSW +dvS +alZ +lTF +nvn igF hEG anR avL -kVQ xyU -sYZ +xyU +xyU bcF xyU xyU xyU xyU biV -aRX -aOk -tpP +bwL +bfU +meM txf mHp bsh @@ -96912,7 +98062,7 @@ aAk nHC aiO iht -jeh +nJH jeh jeh nnD @@ -96920,21 +98070,21 @@ jeh jeh jeh iht -ean -ean -fmg -ean -aQZ +cTy +cmL +anv +xLy +iCZ mHp -nvn +mGE ayn hEG -anR +qxy aky +nIG +oiz +pvg ope -dXc -ope -dXc ope trR aky @@ -96954,14 +98104,14 @@ iht iht coS iht -aiO -tpP -aQZ +wuS +dSW +dSW bei -cfT +pBa eEC hEG -bfi +anR abP pgO gZI @@ -96972,9 +98122,9 @@ xyU xyU bbS abP -cFK -nHY -tpP +aQd +aUc +aqp vPN pCf kDp @@ -97169,7 +98319,7 @@ xLC xLC aiO iht -jeh +nJH jeh jeh iht @@ -97177,22 +98327,22 @@ byF iht byF iht -ydh -ydh -ydh -ydh -aQZ +xLy +xLy +xLy +xLy +iCZ mHp -kDp -igF +mGE +ayn hEG -anR -aky -nIG -oiz -pvg +dOm +rQy +iLj +iLj +woQ ope -pzM +pYw pzM pzM aky @@ -97211,13 +98361,13 @@ iht dWE jeh iht -aiO -tpP -aQZ -rFj -iEL +bei +wwx +mAY +ooc +tRk diJ -gtr +hEG anR biV moN @@ -97229,9 +98379,9 @@ gCs gCs abP abP -aOk -cFK -tpP +fOJ +smn +aqp aQZ bkq pWU @@ -97430,23 +98580,23 @@ bcZ jeh jeh iht -doR +tsb dMW doR iht +ydh +fmg iqD -iqD -iqD -huu -okr -tws -nvn -igF +hsv +iCZ +mHp +mGE +ayn hEG -anR +dFN aky nLQ -woQ +amd woQ trR pzM @@ -97468,11 +98618,11 @@ iht jeh jeh iht -aiO -tpP -aQZ -rFj -lau +bAp +bda +dSW +ooc +tRk buC aVX anR @@ -97482,13 +98632,13 @@ hkV aOk aOk aOk -hkV +jts bjb aOk biO etg -cFK -tpP +aUc +bfU koC bkq aer @@ -97684,8 +98834,8 @@ xLC aiO iht iht -bda -woE +snd +snd iht iht iht @@ -97693,15 +98843,15 @@ iht iht sqb sqb -sqb +sGx eka -okr -tws -nvn -igF +iCZ +mHp +mGE +ayn hEG -ksO -kls +ggO +bMT eAO oxy pwb @@ -97725,27 +98875,27 @@ iht iht coS iht -aiO -tpP -aQZ -bej -fSR +iht +iht +iht +iht +tRk ayn hEG wPS aOk -aQC aOk aOk -etg -etg aOk +etg +cte +stx aOk bjb +cxJ nHY -nHY -hkV -tpP +bdb +aqp eoi bXM nvn @@ -97940,36 +99090,36 @@ xLC xLC aiO sqb -sqb bdC huu +huu aAV -sqb -sqb +bhI +fwK eLw fXJ -cIY +oMU oAJ -sqb -eka +wuo +fOw jkL -mHp -nvn -igF +wZx +udA +sMV lDy -ean +qEm aky ope rMr rMr ope -dXc +akW pzM ueV kls xvB jkB -jkB +lMb rtz iht iht @@ -97982,27 +99132,27 @@ jeh jeh jeh iht -aiO -tpP -iLL -mHp -xCH +jeh +dWE +fAe +fVc +rZe eEC vGN leC -cFK +aOk aOk cFK -aGP -bZY -nHY -nHY cFK +bZY nHY -mAk +aka +tWY aOk aOk -tpP +wgy +bfU +aqp txf mHp pWU @@ -98197,12 +99347,12 @@ aZN nHC aiO sqb -sqb gJC huu huu -aAV -sqb +huu +rNF +fwK cIY gnZ shU @@ -98211,21 +99361,21 @@ sqb aXG okr mHp -kDp -ahQ -hEG -lHO -pCx -kml -pzM +xre +xRK +iyl +jkB +aky +jxs +amz +amz +rTU pzM -qNo -ope pzM ueV aTC jkB -rad +jkB jkB rtz iht @@ -98239,27 +99389,27 @@ jeh jeh nuJ iht -aiO -tpP -aQZ -pCf -ubQ +cXB +jeh +iPy +aIQ +nvn eEC xcu wPS aOk hkV -cFK etg aOk iAq iAq -jLf -jLf -iAq +stx +aOk +aOk +aox hkV -biO -tpP +bfU +aqp trw bxX cNs @@ -98455,7 +99605,7 @@ xLC aiO xaI uPA -uPA +eKD bBd huu nae @@ -98468,18 +99618,18 @@ cIY bcD xsv mHp -mGE -ayn -hEG -ean -uKF -ueV -ueV -ueV -ueV -rTU -ueV +nKp +oPQ +iyl +kWv +oCW +gmK ueV +pyY +mQx +jdt +wQN +alz aky xCv jkB @@ -98496,27 +99646,27 @@ jeh jeh jeh iht -aiO -tpP -aQZ -rFj +iht +iUj +krM +brL pBa sUH bHn anR mAk cFK -sXF etg vmM -nhI -tnz -plO plO ewm -uba +nvQ aOk -tpP +aOk +aOk +aOk +bfU +aqp lcr tnZ tnZ @@ -98710,11 +99860,11 @@ xLC xLC xLC aiO -apZ +xjE xTG aEZ aTl -eYp +grq chk loX eVr @@ -98725,18 +99875,18 @@ lPB kmo okr mHp -bqu -ahQ -hEG -ean -aky -nzi +knB +iMt +iyl +rwQ +pCx +pIp ueV pyY qVz -ope -pzM -pzM +ahP +bcu +woQ aky xTI jkB @@ -98753,34 +99903,34 @@ jeh gsh arl iht -aiO -tpP -aQZ -rFj -wVA +hkg +jeh +qZW +adW +tRk tRW vGN anR aOk cFK -aOk byG gIy -lVH -tQU -lVH tQU lWI -uba -hkV -wNP -xJp -xJp -xJp -xJp -xJp -xJp -xJp +nvQ +aox +aOk +aox +aox +bfU +wrN +mtL +mtL +mtL +mtL +mtL +mtL +mtL xJp xJp xJp @@ -98973,7 +100123,7 @@ aHc aTl gJC huu -huu +agM hzS hzS hzS @@ -98982,18 +100132,18 @@ huu huu okr mHp -aer -igF -hEG -ean +dDO +rlp +vjQ +bXw kls -aky +wxA uKF -aky +mhk oDk aky aky -kls +trR aky iht oYO @@ -99010,34 +100160,34 @@ woE iht iht iht -aiO -htQ -aQZ -rFj -lau +iht +eFV +eFV +iht +tRk buC hEG anR hkV cFK -clo byG yhC lVH -bCd -ndc -lVH -lWI -uba -mAk -etg -hkV +uUy +nvQ aOk -hkV -etg aOk aOk aOk +bfU +bfU +bfU +bfU +bfX +arI +bfX +bfX +bfX aOk aOk etg @@ -99224,13 +100374,13 @@ kwk xLC fqr aiO -aSS -aSS apZ +apZ +tJL bLf sqb grq -huu +agM hzS hzS hzS @@ -99239,14 +100389,14 @@ huu huu okr mHp -nvn -igF +oqW +nZE pKY skm skm skm skm -cws +anu skm skm skm @@ -99265,10 +100415,10 @@ skm cws skm skm -skm -skm +bdR +qbe aiO -skm +cPA ojt bwD lau @@ -99277,15 +100427,15 @@ hEG anR etg etg -xlF www iLK -kZN -stx -vof -lVH uUy -uba +owT +stx +aOk +aox +aOk +aOk aOk aOk aOk @@ -99293,8 +100443,8 @@ etg aOk pJn biO -hkV -aOk +bfX +bfX aOk aOk etg @@ -99483,10 +100633,10 @@ coL aiO aTE aTE -aTE +apZ bNH sqb -bcD +fgh owr eVC gCh @@ -99496,8 +100646,8 @@ mov gEN okr mHp -nvn -uNJ +cRP +nZE uas iZS fcB @@ -99518,14 +100668,14 @@ uas iZS fcB bkX -uas +fIL iZS -fcB +rIj bkX uas iZS pyW -xmZ +iZS iZS gul bAA @@ -99534,24 +100684,24 @@ hEG anR aOk lHR -bSt aOk acl acl acl acl -qZW +bJy +aOk acl -gCs +sgN acl -gCs +sgN acl mAk aOk aOk etg -etg -aOk +bfX +bfX tPB aOk mAk @@ -99743,8 +100893,8 @@ aUW apZ bLf sqb -drp -cIY +qqg +nCi lbx ccR gqP @@ -99753,36 +100903,36 @@ gGi mSg xsv mHp -nvn -uNJ -sXv -sXv -imF -sXv -imF -sXv -imF -sXv -imF -sXv -imF -sXv -imF -loW -hDy -tTS -sXv -sXv -ppw +qWd +gjw +wsf +cVt +eXN +pBw +eXN +pBw +eXN +pBw +eXN +pBw +eXN +swB +eXN +eXN +jFX +kml +pBw +pBw +eXN +nZY +swB +fkP +jyb tTS +glq sXv sXv -ppw -tTS -sXv sXv -jdt -fwK sXv uNJ kxH @@ -99791,24 +100941,24 @@ hEG wPS cFK hkV -aOk xQl acl bnc brJ acl -rWq -abu -ala +uiH +aOk +acl +anw buI -kVQ +aKB acl acl -gCs -gCs +sgN +sgN acl -aOk -aOk +bfX +bfX aOk jPH aOk @@ -100000,9 +101150,9 @@ cbS wPr aTl sqb -sqb -sqb -fEd +bhI +wXO +wVi gEn iGz lWI @@ -100010,36 +101160,36 @@ seX ilI xsv mHp -nvn -uNJ -cNs -cNs -iFp -cNs -ltt -cNs -uio -cNs -ltt -cNs -ltt -cNs -ltt -cNs -cNs -blj -cNs -cNs -ltt -blj -cNs -cNs -ltt +iWw +nPM +gtn +nhA +yjw +nhA +pkp +nhA +pkp +nhA +pkp +nhA +pkp +xPO +pkp +nhA +xPO +nhA +nhA +nhA +gXi +nhA +xPO +lzl +pDy blj +xFs cNs cNs cNs -aKB cNs uNV aTw @@ -100049,23 +101199,23 @@ anR khp hkV aOk -aOk acl bnd -brL +bfi acl -bVK -abu -kVQ +iLd +aOk +acl +fhI buL -xUm -meb -wXO +xyU +acl +dSy bHJ fDD -gCs -aOk -aOk +acl +bfX +bfX aOk aOk etg @@ -100258,7 +101408,7 @@ beJ aTl sqb sqb -sqb +bhI fpJ cIY iVX @@ -100268,35 +101418,35 @@ drp kyR mHp nvn -igF +iLn lHx qhx hvO qhx hvO -qhx -hvO -qhx -hvO -qhx -hvO -qhx -eXM -tnZ -hvO -hvO -hvO +tjL +uDw +iai +lfp +rWQ +nAi +cSd +oiV +adL +rbn +tUA +mtG qhx hvO hvO hvO qhx eXM -hvO -hvO -qhx +iNW +iNW +jhX aiO -hvO +alK khV tws lau @@ -100304,25 +101454,25 @@ aeC hEG anR aOk -fVc -xQl +hkV +aOk acl acl -tJL bcF acl acl -abu +bcF +acl bup buM -pMN +xyU gwF -vKF -wXO +dSy +dSy cpD -gCs -aOk -biO +acl +bfX +bIW uVD aOk rCm @@ -100525,12 +101675,11 @@ dJu aQZ pCf kDp -ahQ -hEG -hXb -xJp -xJp -xLy +oIo +yeA +hjs +oky +pNO xLy xLy xLy @@ -100543,18 +101692,19 @@ xLy xLy xLy xLy +lCt xLy xLy xLy xLy xLy xLy -xJp -xJp -xJp +fef +mdU +mdU aiO tRd -aQZ +aog tws bAA aer @@ -100565,21 +101715,21 @@ hkV aOk acl biF +xyU bnz -nQt -ooc buk -abu -bwL +xyU +acl +fhI wPN -kVQ -meb +xyU +acl bwh dSy cOH acl -aOk -etg +bfX +arI aOk aOk bjb @@ -100768,10 +101918,10 @@ aQD aiO abk gHu -pzM -pzM +vxj +bVK aZG -gHu +kmf pzM bFr iht @@ -100782,9 +101932,9 @@ sYE bFF rFj kxH -ahQ -hEG -anR +cRP +eNa +ieK xLy xLy xLy @@ -100810,7 +101960,7 @@ xLy xLy xLy aiO -tpP +akb aQZ tws nvn @@ -100822,21 +101972,21 @@ aOk aOk acl blu -wXO -mLF -aEE -ppe -abu +dSy +dSy +dSy +xyU +acl buq -xUm -kVQ -meb +xyU +xyU +acl bxt bQo -aEE +dSy acl -aOk -aOk +bfX +bfX khp aOk bjb @@ -101023,12 +102173,12 @@ igF hEG aQE aiO -ahP +pzM +uYu uYu -uXY -aTs aTs -uXY +uYu +uYu uYu pzM pLB @@ -101037,11 +102187,11 @@ cIY mub oML nIX -xRX +rFj aTw -ayn -hEG -anR +cRP +xLC +xLC xLy vLd nXC @@ -101079,21 +102229,21 @@ aOk acl acl blv -wXO -wXO -wXO -nvQ +dSy +dSy +dSy +xyU +acl acl -abu buN -abu +acl abu abu acl acl acl -aOk -hkV +bfX +bdb etg aOk aOk @@ -101280,14 +102430,14 @@ igF hEG vsg aiO -aiG +pzM +uYu uYu -uXY -uXY -uXY uXY uYu -pzM +uYu +uYu +bRo pLB hvo cIY @@ -101296,9 +102446,9 @@ uxE msu wCK lau -aeC -hEG -anR +cRP +lHO +kFb xLy kuF oMm @@ -101324,33 +102474,33 @@ xOw sUx xLy aiO -tpP +bqo aQZ -mHp +cyj nvn igF hEG anR -aOk +mAk oTk acl -xUm +fhI +xyU +dSy +dSy +dSy xyU -vKF -vKF -aEE -tAD dmJ -kVQ -kVQ -xUm -kVQ +xyU +xyU +xyU +xyU aUz acl mAk -aOk -etg -etg +bfX +arI +arI hkV aOk biO @@ -101540,22 +102690,22 @@ aiO vxj avc pzM -pzM +iMa pzM sIy pzM fvg iht -aUt +mBa aUt hbI aVp bQQ -nbk +rFj bAA -ahQ -hEG -anR +cRP +xLC +pdm xLy acN xwm @@ -101592,22 +102742,22 @@ aOk hIj acl daE -pMN -aEE -tEu -vKF -pMN +xyU +dSy +dSy +dSy +xyU acl -mqy +byM buO -xUm -xUm +xyU +xyU bzF acl -biO -aOk -aOk -aOk +bIW +bfX +bfX +bfX aOk sXF aOk @@ -101810,9 +102960,9 @@ ilL trw rFj kDp -ahQ -hEG -anR +cRP +eNa +ieK xLy bUK oMm @@ -101847,22 +102997,22 @@ hEG anR huu huu -bcF -xUm -kVQ -aEE -vKF -wXO -kVQ -abu -abu -abu +gAk +fhI +xyU +dSy +dSy +dSy +xyU +acl +acl +acl acl bcF abu acl -aOk -hkV +bfX +bdb etg aOk etg @@ -102059,16 +103209,16 @@ aky aky sqb fBC -cRu -aUV -kOo +biO aOk -ilL +kOo +kOo +cnm aQZ kPz kxH -ahQ -hEG +gVP +tZz til qba xLy @@ -102095,31 +103245,31 @@ fcZ lpa xLy aiO -tpP -aQZ -ojS +xJK +aEE +kjU tRk buC hEG anR aOk -aOk +gFW acl -oZC +rNe bmh tDh lor sgU mPK acl -mAk +aOk acl buP kVQ xUm acl -aOk -bna +bfX +toq aOk aOk aOk @@ -102316,17 +103466,17 @@ skI aky uZt qaj -uba -aOk -aOk +aUH +edD +kOo mwx -tpP +cnm aQZ mHp aTw ayn hEG -ksO +ybr xLy ntA ntA @@ -102352,9 +103502,9 @@ xOw sUx xLy aiO -tpP -rJz -mHp +aLq +aQZ +eIH aer oXi hEG @@ -102364,9 +103514,9 @@ xQl acl acl acl -gCs -gCs -gCs +sgN +sgN +sgN meb acl aOk @@ -102375,8 +103525,8 @@ bvp mqu jLv meb -aOk -aOk +bfX +bfX aOk aOk etg @@ -102573,10 +103723,10 @@ clv thh huu huu -xUL +txv eKZ aOk -mBa +biO tpP aQZ mHp @@ -102609,9 +103759,9 @@ jaa jXG xLy aiO -tpP +aLq aQZ -tws +box kDp oXi hEG @@ -102628,11 +103778,11 @@ aOk aOk etg acl -gCs -gCs -gCs +sgN +sgN +sgN abu -aOk +bfX wys aOk etg @@ -102830,14 +103980,14 @@ ijL aky grq huu -xUL -aOk -aOk -mCc -tpP +wMy +vmP +kOo +kOo +cnm aQZ mHp -bAA +nvn ahQ hEG ean @@ -102866,13 +104016,13 @@ xLy xLy xLy aiO -tpP +aLq aQZ -mHp +amv aTw -okd -cao -anR +ayn +vGN +bdI hkV hkV aOk @@ -102883,14 +104033,14 @@ hkV xhR hkV hkV -hkV -aOk -aOk +cao aOk aOk aOk -etg aOk +mAk +arI +bfX etg lnr ieO @@ -103085,19 +104235,19 @@ voM voM voM aky -sqb +qlI mha -gOf -jpc -bqi +uba +aOk +kOo hce -tpP +cnm aQZ -mHp +vJV nvn -igF +iZh hEG -hXb +jpy xLy qnC xLJ @@ -103123,13 +104273,13 @@ aiO aiO aiO aiO -tpP -aQZ -mHp +gZe +apo +vAp srN mbM -iwj -anR +hEG +bdI hkV fyE aOk @@ -103146,8 +104296,8 @@ aOk hkV etg aOk -hkV -biO +bdb +bIW www yjs dBr @@ -103350,9 +104500,9 @@ fjb fjb iGk aQZ -mHp -nvn -igF +ayI +kkU +kkU hEG ksO qba @@ -103376,7 +104526,7 @@ fjb fjb fjb aiO -fjb +edI fjb lyo fjb @@ -103385,26 +104535,26 @@ aQZ mHp aer ayn -mqz -ksO -fjb -fjb -fjb -fjb -fjb -fjb -fjb -fjb -fjb -fjb -fjb -fjb -fjb +aPP +nIt fjb fjb -vqc -aOk -aOk +jzV +jzV +jzV +bfU +bfU +bfU +jzV +bfU +bfU +bfU +bfU +bfU +jzV +qNo +bfX +bfX rlc mFm lVH @@ -103605,26 +104755,24 @@ skm skm nIQ bqR -bqR +bXj ojt -mHp -nvn -igF +aau +xLC +xLC ooY skm skm skm -skm -skm -skm -skm -skm nWR skm +jES skm skm +lLS skm skm +cmx skm skm skm @@ -103632,6 +104780,8 @@ skm skm skm skm +uPo +uPo aiO skm skm @@ -103643,25 +104793,25 @@ mHp nvn aer gNg +thb bqR -bqR -skm -skm -skm -skm -skm skm -skm -skm -skm -skm -skm -skm -skm -sLk -anR -aOk -aOk +fvU +bfU +bfU +bfU +fvU +bfU +fvU +fvU +bfU +fvU +fvU +fvU +cvl +tTZ +bfX +bfX rlc aft sVC @@ -103856,20 +105006,20 @@ gua jYk iZS iZS -iZS -aJi -bkX +fcB +fcB +fcB mOZ qLd -bkX -fcB -jYk -cml -uNJ -uNJ +ldJ +xLC +iON +cdJ +xLC +xLC +nge iZS iZS -fcB iZS iZS iZS @@ -103884,7 +105034,7 @@ meL fcB fcB fcB -eNa +fcB jYk meL fcB @@ -104113,23 +105263,23 @@ ppw qmG oBf imF -imF +cZL kZr -rlg +srN bwV srN -qmG -oBf -bMM -bMM +gVP +nhA +nhA +nhA ied -sXv -bMM -bMM +nhA +kDZ +qmG mMz -sXv -bMM -sXv +qmG +myf +myf bMM qmG qmG @@ -104370,22 +105520,22 @@ orI cNs cHs uio -uio +piL iso -cNs -afy gSH +iso +iso gSH blj tQO -tQO -cNs -cNs -cNs -tQO +myf +myf +myf +myf tQO tQO -cNs +myf +myf cNs cNs gSH @@ -104622,19 +105772,18 @@ gSH hxz uzn rIb -tnZ +oAg aiO tnZ pPz pbb +dEY qhx -bFI qhx -dOK -bFI +qlh +pQQ qhx tnZ -rIb tnZ tnZ tnZ @@ -104645,6 +105794,7 @@ tnZ tnZ tnZ tnZ +wwW tnZ cqb mHp @@ -104671,11 +105821,11 @@ qhx bjH gyw eIp -hvO -bjH tSW +uVt tSW -tnZ +ycL +njQ cqb nRY kxH @@ -104932,8 +106082,8 @@ azf rOs azf xHg -aum -dOB +gUe +ozv eXG kDp nvn @@ -105155,9 +106305,9 @@ ean ean aQZ mWz -orG +iZS uih -qbe +iZS uih iZS uih @@ -105404,10 +106554,10 @@ xvy lBP fjb qlR -ean -ean -ean -ean +qwF +dUo +dqk +rnd ean jUd lKc @@ -105415,7 +106565,7 @@ mWT pjP pcI uNJ -dFN +ujy uNJ ujy uNJ @@ -105439,14 +106589,14 @@ aiO pVH pVH pVH -pVH +fdT nfW nfW +fdT pVH pVH pVH -pVH -oSe +gKm dOB tws nvn @@ -105661,14 +106811,14 @@ xvy xvy xvy xvy -iME -iME -jyb -jyb +xvy +xvy +xvy +xvy xvy huu -pkp -nRY +okr +mHp qHy qHy qHy @@ -105697,13 +106847,13 @@ pVH fDs sop xNx -nbs +dwX nbs qJH sop wdv pVH -mgn +rad bFF hlD nvn @@ -105912,8 +107062,8 @@ vFF aUG xvy vOs -xvy -xvy +vOs +vOs xvy xvy tWQ @@ -105924,8 +107074,8 @@ jFV aZw xvy huu -hjs -laV +okr +pAp aEu qHy qHy @@ -105953,14 +107103,14 @@ aiO pVH gla dIN +dwX nbs -nbs -nbs +dwX nbs fKD jsw pVH -mgn +rad koC myY nvn @@ -106167,11 +107317,11 @@ xvy kSp vOs vOs -hJP +aXc +vOs vOs -lLS vOs -icV +xvy xvy lZp xvy @@ -106181,8 +107331,8 @@ jpO jpO cyA huu -umm -laV +okr +pAp wNx tqq qhP @@ -106208,16 +107358,16 @@ kls kls aiO pVH -vJV +gla uNT cyJ -cyJ +mvt cyJ cyJ xnn jsw pVH -mgn +rad eoi tws wVA @@ -106438,15 +107588,15 @@ phB lcg fpO huu -eXN -wHJ +okr +pAp lAA osG uLb rnX blf lAA -uNJ +qmG uNJ igF hEG @@ -106463,18 +107613,18 @@ ean mHq mHq mHq -aiO -pVH +ean +bld uNT +mvt +mvt cyJ -cyJ -cyJ -cyJ -cyJ -cyJ +mvt +mvt +mvt vsb pVH -mgn +bfU eoi tws wVA @@ -106703,10 +107853,10 @@ bdP blf blf lAA -uNJ +qmG uNJ igF -vPF +cRu xLy xLy xLy @@ -106720,18 +107870,18 @@ xLy vpC rWI ean -aiO -pVH -pVH -myf +ean pVH -vTP -bzy -vTP +abP +abP +egq +abP vTP vTP +gOf +gOf pVH -mgn +bfU trw tws wVA @@ -106963,7 +108113,7 @@ lAA uNJ uNJ igF -hEG +wGP gNG rud psl @@ -106976,19 +108126,19 @@ mCJ xLy xLy aiO -aiO -aiO +ean +ean pVH -jSf +xtI +xtI mig -pVH +abP gvp -pIp mig kQP tLI pVH -drC +bfU bFF mHp kDp @@ -107220,7 +108370,7 @@ wNx uNJ uNJ igF -hEG +lZi mfY uix rud @@ -107237,15 +108387,15 @@ ean ean pVH qpX +nRe mig -pVH -pVH -pVH +abP +abP egq +abP +abP pVH -pVH -pVH -drC +bfU bFF mHp nvn @@ -107477,7 +108627,7 @@ qHy uNJ uNJ igF -vGN +iME gNG uix rud @@ -107493,16 +108643,16 @@ aiO ean ean pVH -mig -mig +xLY +xtI mig mig upf -mig -mig -oiV +vlX +seu +abP pVH -drC +rad dOB tws kDp @@ -107750,16 +108900,16 @@ aiO ean ean pVH +jGI +nRe mig mig mig mig -mig -mig -mig -quk +jHv +xtI pVH -drC +rad dOB tws nvn @@ -107986,7 +109136,7 @@ qHy qHy qHy qHy -qHy +sDt qHy uNJ uNJ @@ -108007,16 +109157,16 @@ aiO ean ean pVH +kBp +abP pVH +kJS +kJS pVH +abP +abP pVH -egq -egq -pVH -pVH -pVH -pVH -drC +rad ctc bfT kDp @@ -108247,7 +109397,7 @@ qHy wNx uNJ uNJ -igF +qmG hEG xLy gar @@ -108264,16 +109414,16 @@ aiO ean ean pVH -mig -mig -upf -mig -mig -upf -mig -mig +xyU +xyU +ajt +xyU +xyU +kBE +kVQ +kVQ pVH -drC +aiO bFF mHp nvn @@ -108503,8 +109653,8 @@ rnX qHy qHy uNJ -uNJ -igF +hDy +qmG hEG xLy xLy @@ -108522,15 +109672,15 @@ ean ean pVH aeE +upa +bID +rlg caB -caB -caB -caB -caB +rlg caB aeE pVH -drC +aUc eoi mHp nvn @@ -108760,8 +109910,8 @@ blf qHy qHy uNJ -uNJ -nvn +hDy +srN vPF xLy rFD @@ -108779,15 +109929,15 @@ ean ean pVH nHj +fhI +fhI gkK +fhI +fhI gkK -gkK -gkK -gkK -ite fHj pVH -gdZ +bfU eoi aQK wLX @@ -109009,7 +110159,7 @@ jpO cyA huu okr -kuc +mHp rwS qHy qHy @@ -109021,7 +110171,7 @@ cNs dXl ohD xLy -pfM +sBk pfM pfM pfM @@ -109036,15 +110186,15 @@ ean ean pVH aeE +upa caB +rlg caB -caB -caB -caB +rlg caB aeE pVH -hEG +aiO eoi mHp nvn @@ -109293,15 +110443,15 @@ ean ean pVH aeE -gkK +fhI fhI gkK -gkK -gkK -gkK +fhI +fhI +fhI aeE pVH -mgn +aiO trw mHp kDp @@ -109516,10 +110666,10 @@ uCT vUB xvy xvy -iME -iME -jyb -jyb +xvy +xvy +xvy +xvy xvy huu huu @@ -109549,16 +110699,16 @@ aiO ean ean pVH -nHj -caB -caB -caB -caB -caB -caB -fHj +mqy +laV +laV +laV +laV +laV +laV +aUz pVH -mgn +bfU aQZ tws kDp @@ -109772,14 +110922,14 @@ stp stp stp xvy -huu -huu -huu -huu -huu -huu -huu -huu +xLy +xLy +iht +iht +iht +kCd +kCd +iht okr mHp uNJ @@ -109802,20 +110952,20 @@ xLy aiO aiO aiO -aiO +bfU ean ean pVH -fbU -gkK -gkK -gkK -gkK -gkK -gkK +xOC +xyU +vof +aRd +eCB +anc +xyU fbU pVH -mgn +aiO bFF tws kDp @@ -110029,14 +111179,14 @@ fNE hqX jqp xvy -cUM -oNJ +xLy +iht oMx -oNJ -oNJ -oNJ -ilm -huu +xnZ +iqA +dPO +ite +iwN bLn mHp uNJ @@ -110057,22 +111207,22 @@ xLy xLy xLy aiO -ean -ean -ean +aiO +aiO +bfU ean ean pVH -fbU -oCW -gSm -gSm -gSm +aqX +xyU +opE +mfG +opE gSm -kBp -fbU +xyU +aql pVH -oSe +aUc aqa tws kDp @@ -110288,12 +111438,12 @@ xvy xvy hkg uut -aOk -shX -aOk +jeh +jeh +jYQ shX -tdW -huu +jaG +iht qnZ mHp uNJ @@ -110314,11 +111464,11 @@ aiO aiO aiO aiO -ean -ean -ean -ean -ean +aiO +aiO +bfU +bfU +bfU pVH pVH pVH @@ -110327,9 +111477,9 @@ pVH pVH pVH pVH -myf pVH -drC +pVH +bfU aqa mHp kDp @@ -110543,14 +111693,14 @@ aiO aiO aiO aiO -bqi +iht iVh iUF -shX -aOk -shX -aOk -ilm +jeh +jeh +jeh +xnZ +nbk okr mHp uNJ @@ -110573,20 +111723,20 @@ skm skm skm skm -skm -skm -skm -sLk -ean -ean -ean -ean -ean -ean -ean -ean -ean -ean +fvU +fvU +bfU +bfU +bfU +bfU +bfU +aiO +bfU +bfU +aiO +bfU +rad +bfU dOB mHp kDp @@ -110800,14 +111950,14 @@ aOk aOk etg aiO -hkg -bqi -aUH -shX -aOk -shX -aOk -tdW +iht +iht +iht +iht +iht +iht +iht +iht okr mHp uNJ @@ -111057,14 +112207,14 @@ ixn aaQ aaQ aiO -bqi -iZh -xFZ -shX -oTk -shX -aOk -uaY +iht +iht +oMx +mCc +quk +bzy +joA +iPv okr mHp uNJ @@ -111315,13 +112465,13 @@ aUb aaQ aiO hkg -bqi -aOk -shX -aOk -shX -tdW -huu +jeh +gnm +aUV +quk +bAT +joA +xLy okr mHp uNJ @@ -111571,14 +112721,14 @@ fXl hyY aaQ aiO -oDn -gBs -gBs -gBs -gBs -gBs -uaY -huu +iht +sDr +jSf +jeh +jeh +jeh +gnm +nbk okr bxX cNs @@ -111828,19 +112978,19 @@ aaQ aaQ aaQ aiO -jaG -mha -mha -seu -mha -grq -huu -huu +iht +iht +iht +iht +xLy +xLy +xLy +iFo ndX +fvt vOL -vOL -vOL -tnZ +dXf +xZX xLy vfy pfM @@ -112090,14 +113240,14 @@ kXU jDq dPQ lwn -gJC -huu -huu -huu huu huu huu iSu +lYo +jpc +jeh +hJP xLy vin uNl @@ -112347,14 +113497,14 @@ bNY kcv hXB mkT -gJC -huu -huu -huu huu huu huu iSu +ipf +iUF +ghn +gsM eUV eUV xLy @@ -112603,18 +113753,18 @@ fEd jgp jFf ksA -acP -gnm -huu -huu -huu +fSu huu huu huu +iSu +fkF +gVp +jUt uPl -ean -ean -ean +aiO +aiO +aiO aiO aiO aiO @@ -125289,7 +126439,7 @@ izz ccj tzu gqe -gAk +gqe iXx dJF dJF @@ -125554,7 +126704,7 @@ hxZ nmJ nmJ fME -cLv +eXj eXj bsP aae diff --git a/_maps/map_files/Pahrump-AB/job_changes.dm b/_maps/map_files/Pahrump-AB/job_changes.dm index 88f2c17dde9..f7d40039727 100644 --- a/_maps/map_files/Pahrump-AB/job_changes.dm +++ b/_maps/map_files/Pahrump-AB/job_changes.dm @@ -26,3 +26,4 @@ MAP_REMOVE_JOB(f13baltimorepilot) MAP_REMOVE_JOB(f13minutemen) MAP_REMOVE_JOB(enclave) MAP_REMOVE_JOB(khan) +MAP_REMOVE_JOB(holiday) diff --git a/_maps/map_files/Tipton/job_changes.dm b/_maps/map_files/Tipton/job_changes.dm index 2455ba40715..1017d1dcb4f 100644 --- a/_maps/map_files/Tipton/job_changes.dm +++ b/_maps/map_files/Tipton/job_changes.dm @@ -27,3 +27,4 @@ MAP_REMOVE_JOB(f13minutemen) MAP_REMOVE_JOB(enclave) MAP_REMOVE_JOB(smutant_boss) MAP_REMOVE_JOB(smutant) +MAP_REMOVE_JOB(eastwood) diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index e40bee0b996..d32a880115c 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -234,6 +234,22 @@ #define F13BALTIMOREPILOT (1<<12) #define F13BALTIMORERADIOHOST (1<<13) +#define DEP_HOLIDAY (1<<6) + +#define F13HOLIDAYSHERIFF (1<<0) +#define F13HOLIDAYDENDOC (1<<1) +#define F13HOLIDAYSETTLER (1<<2) +#define F13HOLIDAYFARMER (1<<3) +#define F13HOLIDAYPROSPECTOR (1<<4) +#define F13HOLIDAYDEPUTY (1<<5) +#define F13HOLIDAYMAYOR (1<<6) +#define F13HOLIDAYSECRETARY (1<<7) +#define F13HOLIDAYPREACHER (1<<8) +#define F13HOLIDAYSHOPKEEPER (1<<9) +#define F13HOLIDAYQUARTERMASTER (1<<10) +#define F13HOLIDAYBARKEEP (1<<11) +#define F13HOLIDAYRADIOHOST (1<<12) + #define JOB_AVAILABLE 0 #define JOB_UNAVAILABLE_GENERIC 1 #define JOB_UNAVAILABLE_BANNED 2 @@ -429,4 +445,18 @@ #define JOB_DISPLAY_ORDER_F13MINUTEMEN 154 +#define JOB_DISPLAY_ORDER_F13HOLIDAYSHERIFF 155 +#define JOB_DISPLAY_ORDER_F13HOLIDAYDENDOC 156 +#define JOB_DISPLAY_ORDER_F13HOLIDAYSETTLER 157 +#define JOB_DISPLAY_ORDER_F13HOLIDAYFARMER 158 +#define JOB_DISPLAY_ORDER_F13HOLIDAYPROSPECTOR 159 +#define JOB_DISPLAY_ORDER_F13HOLIDAYDEPUTY 160 +#define JOB_DISPLAY_ORDER_F13HOLIDAYMAYOR 161 +#define JOB_DISPLAY_ORDER_F13HOLIDAYSECRETARY 162 +#define JOB_DISPLAY_ORDER_F13HOLIDAYPREACHER 163 +#define JOB_DISPLAY_ORDER_F13HOLIDAYSHOPKEEPER 164 +#define JOB_DISPLAY_ORDER_F13HOLIDAYQUARTERMASTER 165 +#define JOB_DISPLAY_ORDER_F13HOLIDAYBARKEEP 166 +#define JOB_DISPLAY_ORDER_F13HOLIDAYRADIOHOST 167 + GLOBAL_LIST_INIT(faction_list, list(FACTION_NCR, FACTION_LEGION, FACTION_BROTHERHOOD, FACTION_EASTWOOD, FACTION_ENCLAVE, FACTION_WASTELAND, FACTION_RAIDERS, FACTION_SMUTANT, FACTION_ATLANTIC, FACTION_LOCUST)) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 0dfdfce0313..3081225391c 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -1032,3 +1032,49 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer icon_state = "Banker" +// Holiday + +/obj/effect/landmark/start/f13/f13holidayf13holidaymayor + name = "Mayor" + icon_state = "Banker" + +/obj/effect/landmark/start/f13/f13holidaysecretary + name = "Secretary" + icon_state = "Lawyer" + +/obj/effect/landmark/start/f13/f13holidaysheriff + name = "Sheriff" + icon_state = "Chief of Police" + +/obj/effect/landmark/start/f13/f13holidaydeputy + name = "Deputy" + icon_state = "Officer" + +/obj/effect/landmark/start/f13/f13holidayfarmer + name = "Farmer" + +/obj/effect/landmark/start/f13/f13holidayprospector + name = "Prospector" + +/obj/effect/landmark/start/f13/f13holidaysettler + name = "Citizen" + icon_state = "Settler" + +/obj/effect/landmark/start/f13/f13holidayradio_host + name = "Radio Host" + icon_state = "Radio-Host" + +/obj/effect/landmark/start/f13/f13holidaydendoc + name = "Doctor" + +/obj/effect/landmark/start/f13/f13holidayquartermaster + name = "Quartermaster" + icon_state = "Shopkeeper" + +/obj/effect/landmark/start/f13/f13holidayshopkeeper + name = "Shopkeeper" + icon_state = "Shopkeeper" + +/obj/effect/landmark/start/f13/f13holidaybarkeep + name = "Barkeep" + icon_state = "Barkeep" diff --git a/code/modules/jobs/job_types/eastwood.dm b/code/modules/jobs/job_types/eastwood.dm index 9a7493c8d33..dc6878377da 100644 --- a/code/modules/jobs/job_types/eastwood.dm +++ b/code/modules/jobs/job_types/eastwood.dm @@ -46,8 +46,10 @@ Mayor total_positions = 1 spawn_positions = 1 supervisors = "Eastwood" - description = "You are the civil leader of the Town of Eastwood. You were chosen by the people to represent and lead them from your manor. Your town is in a terse situation with the slaver town to the south, Redwater. While not at war, you will have to work to keep your people safe from their predations. The Tribals to the south east are also a nuisance but it's best not to provoke them needlessly. Do what's best for the town, and it's people. All while lining your pockets occasionally, of course." - enforces = "The Secretary is your stand-in replacement, and under this the Sheriff." + description = "You are the civil leader of the Town of Eastwood, but with the NCR being in control of taxes, and armed forces.\ + You were chosen by the people to represent and lead them, and defend their interess. You co-write the laws with the NCR Officials.\ + You are in a pickle, since the town is under the NCR, and you must cooperate (or not) with them." + enforces = "The Civilian gouvernement is made of yourself on top of the ladder, with NCR officers. Under you is the secretary, and under them is the Sheriff. The priest is often viewed as the forth head of town." selection_color = "#d7b088" exp_requirements = 600 @@ -71,7 +73,8 @@ Mayor /datum/outfit/loadout/highroller, /datum/outfit/loadout/clinicdirector, /datum/outfit/loadout/richman, - /datum/outfit/loadout/eastchief + /datum/outfit/loadout/eastchief, + /datum/outfit/loadout/ncrally, ) @@ -187,6 +190,17 @@ Mayor /obj/item/twohanded/sledgehammer/warmace = 1, /obj/item/storage/box/medicine/poultice5 = 1 ) + +/datum/outfit/loadout/ncrally + name = "NCR Ally" + backpack_contents = list( + /obj/item/clothing/under/f13/ncr_formal_uniform = 1, + /obj/item/clothing/under/f13/ncr_female_officer = 1, + /obj/item/gun/ballistic/automatic/pistol/deagle = 1, + /obj/item/ammo_box/magazine/m44 = 2, + /obj/item/clothing/shoes/laceup = 1, + /obj/item/clothing/mask/cigarette/pipe/cobpipe = 1 + ) /*--------------------------------------------------------------*/ /datum/job/eastwood/f13secretary @@ -196,8 +210,11 @@ Mayor total_positions = 1 spawn_positions = 1 supervisors = "The Mayor" - description = "The settlement of Eastwood is a busy place, and the Mayor often can't handle everything by themselves. You are here to help them with anything and everything they require, and make sure the more trivial problems do not concern them. You handle clerical work, hear complaints, and set meetings within the manor. An efficient and smooth running town means a happy Mayor - just remember that if things go wrong, you're a convenient scapegoat." - enforces = "You are the stand-in leader of Eastwood if a Mayor does not exist." + description = "Even under NCR, The settlement of Eastwood is a busy place, and the Mayor often can't handle everything by themselves.\ + You are here to help them with anything and everything they require, and make sure the more trivial problems do not concern them.\ + You handle clerical work, hear complaints, and set meetings within the manor.\ + An efficient and smooth running town means a happy Mayor - just remember that if things go wrong, you're a convenient scapegoat." + enforces = "You are the stand-in leader of Eastwood if a Mayor does not exist. Then the Sheriff is third. Note that the priest may be fourth, and do not forget the NCR Officials." selection_color = "#d7b088" exp_requirements = 0 @@ -292,8 +309,11 @@ Mayor head_announce = list("Security") total_positions = 1 spawn_positions = 1 - supervisors = "The Mayor" - description = "You are the civil enforcer of Eastwood, keeping the settlement within firm control under the authority of the Mayor. With your loyal patrolmen, you 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. If this town falls, new conquerors don't tend to look kindly upon the old law." + supervisors = "The Mayor." + description = "You are the civil enforcer of Eastwood, keeping the settlement within firm control under the authority of the Mayor.\ + With your loyal patrolmen, you maintain your claim to authority by keeping the peace, managing disputes, and protecting the citizens from threats within and without.\ + While you can't exactly arrest NCR soldiers, that being the job of the NCR MP, you are here to warn them of any misbehavior.\ + Never leave Eastwood undefended, and don't let its people die out. Protect the Mayor too." enforces = "You are the stand-in leader of Eastwood if a Mayor or Secretary does not exist." selection_color = "#d7b088" exp_requirements = 400 @@ -384,8 +404,12 @@ Mayor 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." + description = "Those NCR soldiers doesn't scare you, because your cause is just.\ + You are here 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.\ + While you can't arrest the NCR Soldiers, with a bit of luck the MPs will do their work. Protect the mayor at all cost." + 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, Secretary or even priest does not exist." selection_color = "#dcba97" exp_type = EXP_TYPE_EASTWOOD exp_requirements = 0 @@ -494,8 +518,10 @@ Mayor total_positions = 4 spawn_positions = 4 supervisors = "Eastwood laws" - description = "You are a farmer living in Eastwood. Treat your town with respect and make sure to follow the laws in place, as your premium status may be revoked if you are considered a danger to the populace." - enforces = "Farming is a public service, and you are under control of local governance - and you are expected to produce food." + description = "Being a farmer in Eastwood is now a bit harder, since the NCR are putting their hands everywhere.\ + While working for Eastwood, the NCR might ask you to make them food for them.\ + Treat your town with respect and make sure to follow the laws in place, as your premium status may be revoked if you are considered a danger to the populace." + enforces = "Farming is a public service, and you are under control of local governance : The Mayorial office and/or NCR Officials - and you are expected to produce food." selection_color = "#dcba97" outfit = /datum/outfit/job/den/f13farmer @@ -576,7 +602,10 @@ Mayor total_positions = 4 spawn_positions = 4 supervisors = "The Mayor" - description = "Prospecting is a complicated business. Some call it scrounging or looting, but there is more to it than sifting through rubble - few can boast the valuable skills of mining and scavenging the ruins of fallen empires. The settlement of Eastwood understands the value of this, and you've found purpose within their mines. Sell the materials you find to the highest bidder - the local store may be particularly interested in metals." + description = "Prospecting is a complicated business.\ + Some call it scrounging or looting, but there is more to it than sifting through rubble - few can boast the valuable skills of mining and scavenging the ruins of fallen empires.\ + The settlement of Eastwood, and NCR understands the value of this, and you've found purpose within the city.\ + Sell the materials you find to the highest bidder - the local store may be particularly interested in metals, but the NCR migth also be a good buyer." enforces = "Mining is a public service, and you are under control of local governance - but by default you are expected to work with private businesses and individual clients." selection_color = "#dcba97" @@ -662,9 +691,11 @@ Mayor department_flag = DEP_EASTWOOD total_positions = 3 spawn_positions = 3 - supervisors = "The Mayor" - description = "Handy with a scalpel and scanner, your expertise in the practice of medicine makes you an indispensible asset to the settlement of Eastwood. Just remember that you're not a Follower - medicine doesn't come for free, and you aren't here out of the kindness of your heart. Make sure to turn a profit on your services, or the Mayor might reconsider your position, if you're bad enough the sherrif might even kick you out!" - enforces = "Medicine is a public service, and you are under control of local governance - but remember public doesn't equate to free." + supervisors = "The Mayor, The NCR Medical Officer" + description = "Handy with a scalpel and scanner, your expertise in the practice of medicine makes you an indispensible asset to the settlement of Eastwood.\ + Just remember that you're not a Follower - medicine doesn't come for free, and you aren't here out of the kindness of your heart.\ + Make sure to turn a profit on your services, or the Mayor might reconsider your position, and if you're bad enough the NCR chief medical officer will order for your arrest !" + enforces = "Medicine is a public service, and you are under control of local governance, and the NCR chief medical officer - but remember public doesn't equate to free." selection_color = "#dcba97" loadout_options = list( @@ -770,7 +801,7 @@ Mayor total_positions = 2 spawn_positions = 2 supervisors = "the free market and Eastwood's Laws" - description = "As a proprietor of the bar, you are responsible for ensuring both citizens and travellers in Eastwood can get some food, drink and rest. Speak to the farmers for fresh produce!" + description = "As a proprietor of the bar, you are responsible for ensuring both NCR soldiers, citizens and travellers in Eastwood can get some food, drink and rest. Speak to the farmers for fresh produce!" enforces = " The bar is a private business and you can decide who is welcome there. However, you are still subject to the overarching laws of Eastwood." selection_color = "#dcba97" @@ -855,7 +886,7 @@ Mayor total_positions = -1 spawn_positions =-1 supervisors = "Eastwood's laws" - description = "You are a citizen living in Eastwood. Treat your town with respect and make sure to follow the laws in place, as your premium status may be revoked if you are considered a danger to the populace. One of the local businesses may have work if you require funds." + description = "You are a citizen living in Eastwood. Now under the NCR, you are also technically a NCR citizen. Treat your town with respect and make sure to follow the laws in place, as your premium status may be revoked if you are considered a danger to the populace. One of the local businesses may have work if you require funds." selection_color = "#dcba97" outfit = /datum/outfit/job/den/f13settler @@ -1178,13 +1209,16 @@ Mayor /*--------------------------------------------------------------*/ /datum/job/eastwood/f13banker - title = "Banker" + title = "NCR Tax Collector" flag = F13BANKER - department_flag = DEP_EASTWOOD - total_positions = 0 - spawn_positions = 0 - supervisors = "The Mayor" - description = "No matter the nature of society, fortune and profit are there to be made! It is up to you to make deals, distribute caps and earn interest - an easy first venture might be safekeeping possessions in the strongboxes of your vault within the First Bank of Eastwood. Ensure you make a profit and retain enough capital for your day-to-day operations. You are under the governance of Eastwood, but perhaps deal-making will take you into other alliances." + faction = FACTION_NCR + access = list(ACCESS_NCR) + minimal_access = list(ACCESS_NCR) + total_positions = 1 + spawn_positions = 1 + supervisors = "No one, NCR laws" + description = "You were send by the NCR to deal with the economical and political side of the settlement of Eastwood.\ + You have a say over the tax rate and the laws, and must work with the mayor (or not) over taxe rate. This is a dangerous job, so make sure to be guarded. You can also serve as a banker." enforces = "Your bank is a private business and you are not under direct control of local governance, but are subject to their laws." selection_color = "#dcba97" outfit = /datum/outfit/job/den/f13banker diff --git a/code/modules/jobs/job_types/holiday.dm b/code/modules/jobs/job_types/holiday.dm new file mode 100644 index 00000000000..a15a9483665 --- /dev/null +++ b/code/modules/jobs/job_types/holiday.dm @@ -0,0 +1,1383 @@ +/* +Town access doors +Sheriff/Deputy, Gatehouse etc: 62 ACCESS_GATEWAY +General access: 25 ACCESS_BAR +Clinic surgery/storage: 68 ACCESS_CLONING +Shopkeeper: 34 ACCESS_CARGO_BOT +Barkeep : 28 ACCESS_KITCHEN - you jebronis made default bar for no reason bruh +Prospector : 48 ACCESS_MINING +Detective : 4 ACCESS_FORENSICS_LOCKERS +here's a tip, go search DEFINES/access.dm +*/ + +// Headsets for everyone!! +/datum/outfit/job/denholiday + name = "Holiday Default Template" + ears = /obj/item/radio/headset/headset_town + id = /obj/item/card/id/dogtag/town + uniform = /obj/item/clothing/under/f13/settler + shoes = /obj/item/clothing/shoes/jackboots + backpack = /obj/item/storage/backpack/satchel/explorer + r_pocket = /obj/item/flashlight/flare + backpack_contents = list( + /obj/item/storage/pill_bottle/chem_tin/radx, + /obj/item/storage/wallet/stash/low = 1, + /obj/item/melee/onehanded/knife/hunting = 1 + ) + +/datum/outfit/job/denholiday/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bloodleaf) + +/* +Mayor +*/ + +/datum/job/holiday + exp_type = EXP_TYPE_EASTWOOD + faction = FACTION_EASTWOOD + +/datum/job/holiday/f13mayor // /obj/item/card/id/captains_spare for any elected mayors. - Blue + title = "Mayor" + flag = F13HOLIDAYMAYOR + department_flag = DEP_HOLIDAY + total_positions = 1 + spawn_positions = 1 + supervisors = "Holiday" + description = "You are the civil leader of the Town of Holiday. You were chosen by the people to represent and lead them from your manor. Your town is in a terse situation with the slaver town to the south, Redwater. While not at war, you will have to work to keep your people safe from their predations. The Tribals to the south east are also a nuisance but it's best not to provoke them needlessly. Do what's best for the town, and it's people. All while lining your pockets occasionally, of course." + enforces = "The Secretary is your stand-in replacement, and under this the Sheriff." + selection_color = "#d7b088" + + exp_requirements = 600 + + outfit = /datum/outfit/job/denholiday/f13mayor + access = list(ACCESS_BAR, ACCESS_CLONING, ACCESS_GATEWAY, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, 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) + 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/holiday + ), + /datum/matchmaking_pref/rival = list( + /datum/job/holiday + ) + ) + + loadout_options = list( + /datum/outfit/loadout/mayoral, + /datum/outfit/loadout/dictator, + /datum/outfit/loadout/firstcitizen, + /datum/outfit/loadout/highroller, + /datum/outfit/loadout/clinicdirector, + /datum/outfit/loadout/richman, + /datum/outfit/loadout/eastchief + ) + + +/datum/outfit/job/denholiday/f13mayor/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/pico_manip) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/super_matter_bin) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/phasic_scanning) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/super_capacitor) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/ultra_micro_laser) + ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src) + ADD_TRAIT(H, TRAIT_GENERIC, src) + +/datum/outfit/job/denholiday/f13mayor + name = "Mayor" + jobtype = /datum/job/holiday/f13mayor + id = /obj/item/card/id/silver/mayor + ears = /obj/item/radio/headset/headset_town/mayor + backpack = /obj/item/storage/backpack/satchel/explorer + satchel = /obj/item/storage/backpack/satchel/explorer + l_pocket = /obj/item/storage/wallet/stash/high + r_pocket = /obj/item/flashlight/seclite + shoes = /obj/item/clothing/shoes/f13/tan + uniform = /obj/item/clothing/under/f13/gentlesuit + head = /obj/item/clothing/head/f13/town/big + backpack_contents = list( + /obj/item/storage/pill_bottle/chem_tin/radx, + /obj/item/storage/box/citizenship_permits = 1, + /obj/item/pen/fountain/captain = 1 + ) + + + +/datum/outfit/loadout/dictator + name = "Mayor for Life" + backpack_contents = list( + /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, + /obj/item/clothing/shoes/jackboots = 1, + /obj/item/clothing/mask/cigarette/pipe/cobpipe = 1 + ) + +/datum/outfit/loadout/mayoral + name = "Frontier Leader" + backpack_contents = list( + /obj/item/clothing/suit/armor/medium/duster/town/mayor = 1, + /obj/item/clothing/head/f13/town/mayor = 1, + /obj/item/gun/ballistic/revolver/m29/peacekeeper = 1, + /obj/item/ammo_box/m44 = 2, + /obj/item/clothing/shoes/f13/cowboy = 1, + /obj/item/clothing/mask/cigarette/cigar = 1 + ) + +/datum/outfit/loadout/firstcitizen + name = "First Citizen" + backpack_contents = list( + /obj/item/clothing/under/f13/vault = 1, + /obj/item/clothing/shoes/jackboots = 1, + /obj/item/clothing/suit/armor/light/duster/battlecoat/vault/overseer = 1, + /obj/item/reagent_containers/food/drinks/flask/vault113 = 1, + /obj/item/gun/ballistic/automatic/pistol/beretta/automatic = 1, + /obj/item/ammo_box/magazine/m9mm/doublestack = 1 + ) + +/datum/outfit/loadout/highroller + name = "High Roller" + backpack_contents = list( + /obj/item/clothing/glasses/orange = 1, + /obj/item/clothing/suit/armor/outfit/vest = 1, + /obj/item/clothing/under/f13/sleazeball = 1, + /obj/item/clothing/shoes/laceup = 1, + /obj/item/toy/cards/deck/unum = 1, + /obj/item/gun/ballistic/automatic/pistol/mk23 = 1, + /obj/item/ammo_box/magazine/m45/socom = 2 + ) + +/datum/outfit/loadout/clinicdirector + name = "Doctor In Chief" + backpack_contents = list( + /obj/item/clothing/suit/armor/medium/duster/follower = 1, + /obj/item/book/granter/trait/midsurgery = 1, + /obj/item/storage/belt/medical/surgery_belt_adv = 1, + /obj/item/storage/box/medicine/stimpaks/stimpaks5 = 1, + /obj/item/clipboard = 1, + /obj/item/pen = 1, + /obj/item/gun/energy/laser/wattz/magneto = 1, + /obj/item/stock_parts/cell/ammo/ec = 2 + ) + +/datum/outfit/loadout/richman + name = "Nightstalker Of Holiday" + backpack_contents = list( + /obj/item/clothing/suit/armor/medium/duster/armoredcoat = 1, + /obj/item/stack/f13Cash/caps/twozerozero = 1, + /obj/item/gun/ballistic/automatic/pistol/m1911/custom/jackal = 1, + /obj/item/ammo_box/magazine/m45 = 2, + /obj/item/pda = 1, + /obj/item/book/granter/crafting_recipe/blueprint/greasegun = 1, + /obj/item/book/granter/crafting_recipe/blueprint/leveraction = 1 + ) + +/datum/outfit/loadout/eastchief + name = "Cheif of the East" + backpack_contents = list( + /obj/item/clothing/suit/hooded/cloak/hhunter = 1, + /obj/item/clothing/under/f13/exile/tribal = 1, + /obj/item/twohanded/sledgehammer/warmace = 1, + /obj/item/storage/box/medicine/poultice5 = 1 + ) +/*--------------------------------------------------------------*/ + +/datum/job/holiday/f13secretary + title = "Secretary" + flag = F13HOLIDAYSECRETARY + department_flag = DEP_HOLIDAY + total_positions = 1 + spawn_positions = 1 + supervisors = "The Mayor" + description = "The settlement of Holiday is a busy place, and the Mayor often can't handle everything by themselves. You are here to help them with anything and everything they require, and make sure the more trivial problems do not concern them. You handle clerical work, hear complaints, and set meetings within the manor. An efficient and smooth running town means a happy Mayor - just remember that if things go wrong, you're a convenient scapegoat." + enforces = "You are the stand-in leader of Holiday if a Mayor does not exist." + selection_color = "#d7b088" + exp_requirements = 0 + + outfit = /datum/outfit/job/denholiday/f13secretary + + loadout_options = list( + /datum/outfit/loadout/pr, + /datum/outfit/loadout/pw + ) + + access = list(ACCESS_BAR, ACCESS_CLONING, ACCESS_GATEWAY, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, 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) + 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/holiday + ), + /datum/matchmaking_pref/rival = list( + /datum/job/holiday + ) + ) + +/datum/outfit/job/denholiday/f13secretary + name = "Secretary" + jobtype = /datum/job/holiday/f13secretary + id = /obj/item/card/id/silver + belt = /obj/item/kit_spawner/townie/mayor + ears = /obj/item/radio/headset/headset_town/mayor + glasses = /obj/item/clothing/glasses/regular/hipster + gloves = /obj/item/clothing/gloves/color/white + backpack = /obj/item/storage/backpack/satchel/leather + satchel = /obj/item/storage/backpack/satchel/leather + r_hand = /obj/item/storage/briefcase/secretary + l_pocket = /obj/item/storage/wallet/stash/mid + r_pocket = /obj/item/flashlight/seclite + shoes = /obj/item/clothing/shoes/f13/fancy + uniform = /obj/item/clothing/under/suit/black + backpack_contents = list( + /obj/item/storage/pill_bottle/chem_tin/radx, + /obj/item/ammo_box/magazine/m9mm = 1, + /obj/item/melee/onehanded/knife/switchblade = 1, + /obj/item/pda = 1 + ) + +/datum/outfit/loadout/pr + name = "Public Relations" + backpack_contents = list( + /obj/item/megaphone = 1, + /obj/item/reagent_containers/food/snacks/store/cake/birthday = 1, + /obj/item/clothing/accessory/medal/ribbon = 1, + /obj/item/clothing/gloves/color/latex/nitrile = 1, + /obj/item/camera = 1, + /obj/item/storage/crayons = 1, + /obj/item/choice_beacon/box/carpet = 1 + ) + +/datum/outfit/loadout/pw + name = "Public Works" + backpack_contents = list( + /obj/item/clothing/head/hardhat = 1, + /obj/item/clothing/suit/hazardvest = 1, + /obj/item/stack/sheet/metal/twenty = 2, + /obj/item/stack/sheet/glass/ten = 2, + /obj/item/stack/sheet/mineral/concrete/ten = 2 + ) + +/datum/outfit/job/denholiday/f13secretary/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/policepistol) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/policerifle) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/steelbib/heavy) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/armyhelmetheavy) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/pico_manip) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/super_matter_bin) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/phasic_scanning) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/super_capacitor) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/ultra_micro_laser) + ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src) + ADD_TRAIT(H, TRAIT_GENERIC, src) + ADD_TRAIT(H, TRAIT_SELF_AWARE, src) + + +/*--------------------------------------------------------------*/ + +/datum/job/holiday/f13sheriff + title = "Sheriff" + flag = F13HOLIDAYSHERIFF + department_flag = DEP_HOLIDAY + head_announce = list("Security") + total_positions = 1 + spawn_positions = 1 + supervisors = "The Mayor" + description = "You are the civil enforcer of Holiday, keeping the settlement within firm control under the authority of the Mayor. With your loyal patrolmen, you maintain your claim to authority by keeping the peace, managing disputes, and protecting the citizens from threats within and without. Never leave Holiday undefended, and don't let its people die out. If this town falls, new conquerors don't tend to look kindly upon the old law." + enforces = "You are the stand-in leader of Holiday if a Mayor or Secretary does not exist." + selection_color = "#d7b088" + exp_requirements = 400 + + outfit = /datum/outfit/job/denholiday/f13sheriff + + loadout_options = list( + /datum/outfit/loadout/thelaw, + /datum/outfit/loadout/thechief + ) + + access = list(ACCESS_BAR, ACCESS_CLONING, ACCESS_GATEWAY, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, 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) + 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/holiday + ), + /datum/matchmaking_pref/rival = list( + /datum/job/holiday + ) + ) + +/datum/outfit/job/denholiday/f13sheriff + name = "Sheriff" + jobtype = /datum/job/holiday/f13sheriff + id = /obj/item/card/id/dogtag/sheriff + ears = /obj/item/radio/headset/headset_town/lawman + backpack = /obj/item/storage/backpack/satchel/explorer + satchel = /obj/item/storage/backpack/satchel/explorer + uniform = /obj/item/clothing/under/f13/sheriff + shoes = /obj/item/clothing/shoes/f13/cowboy + glasses = /obj/item/clothing/glasses/sunglasses + l_pocket = /obj/item/storage/wallet/stash/high + backpack_contents = list( + /obj/item/storage/pill_bottle/chem_tin/radx, + /obj/item/storage/box/deputy_badges = 1, + /obj/item/restraints/handcuffs = 1, + /obj/item/melee/classic_baton = 1, + /obj/item/melee/onehanded/knife/bowie = 1, + /obj/item/grenade/flashbang = 1, + /obj/item/storage/belt/army = 1 + ) + +/datum/outfit/loadout/thelaw + name = "The Law Man" + suit = /obj/item/clothing/suit/armor/medium/duster/town/sheriff + head = /obj/item/clothing/head/f13/town/sheriff + uniform = /obj/item/clothing/under/f13/police/formal + neck = /obj/item/storage/belt/shoulderholster + r_hand = /obj/item/gun/ballistic/rifle/repeater/brush + shoes = /obj/item/clothing/shoes/f13/military/plated + backpack_contents = list( + /obj/item/ammo_box/tube/c4570 = 3, + /obj/item/gun_upgrade/scope/watchman = 1 + ) + +/datum/outfit/loadout/thechief + name = "The Chief" + uniform = /obj/item/clothing/under/f13/police/chief + suit = /obj/item/clothing/suit/armor/medium/duster/town/chief + head = /obj/item/clothing/head/f13/town/chief + neck = /obj/item/storage/belt/shoulderholster/ranger45 + shoes = /obj/item/clothing/shoes/combat + r_hand = /obj/item/gun/ballistic/shotgun/automatic/combat/citykiller + backpack_contents = list(/obj/item/ammo_box/shotgun/slug = 1, + /obj/item/ammo_box/shotgun/buck = 2 + ) + + +/datum/outfit/job/denholiday/f13sheriff/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/policepistol) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/policerifle) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/steelbib/heavy) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/armyhelmetheavy) + ADD_TRAIT(H, TRAIT_LIFEGIVER, src) + ADD_TRAIT(H, TRAIT_SELF_AWARE, src) + + +/*--------------------------------------------------------------*/ + +/datum/job/holiday/f13deputy + title = "Deputy" + flag = F13HOLIDAYDEPUTY + department_flag = DEP_HOLIDAY + total_positions = 4 + spawn_positions = 4 + supervisors = "The Sheriff" + description = "You are a loyal protector of Holiday, 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 Holiday 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 Holiday if a Mayor or Secretary does not exist." + selection_color = "#dcba97" + exp_type = EXP_TYPE_EASTWOOD + exp_requirements = 0 + + loadout_options = list( + /datum/outfit/loadout/frontierjustice, + /datum/outfit/loadout/police, + /datum/outfit/loadout/swat, + /datum/outfit/loadout/energy, + ) + + outfit = /datum/outfit/job/denholiday/f13deputy + 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) + 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/holiday + ), + /datum/matchmaking_pref/rival = list( + /datum/job/holiday + ) + ) + +/datum/outfit/job/denholiday/f13deputy + name = "Deputy" + jobtype = /datum/job/holiday/f13deputy + id = /obj/item/card/id/dogtag/deputy + ears = /obj/item/radio/headset/headset_town/lawman + backpack = /obj/item/storage/backpack/satchel/explorer + satchel = /obj/item/storage/backpack/satchel/explorer + suit_store = /obj/item/storage/belt/legholster + l_pocket = /obj/item/storage/wallet/stash/mid + r_pocket = /obj/item/flashlight/flare + shoes = /obj/item/clothing/shoes/f13/explorer + uniform = /obj/item/clothing/under/f13/cowboyb + backpack_contents = list( + /obj/item/storage/pill_bottle/chem_tin/radx, + /obj/item/restraints/handcuffs = 1, + /obj/item/melee/onehanded/knife/bowie = 1, + /obj/item/grenade/flashbang = 1, + /obj/item/flashlight/seclite = 1, + /obj/item/storage/belt/army/assault = 1 + ) + +/datum/outfit/loadout/frontierjustice + name = "Frontier Justice" + suit = /obj/item/clothing/suit/armor/medium/duster/town/deputy + head = /obj/item/clothing/head/f13/town/deputy + neck = /obj/item/storage/belt/shoulderholster + r_hand = /obj/item/gun/ballistic/rifle/repeater/trail + backpack_contents = list( + /obj/item/ammo_box/tube/m44 = 2, + /obj/item/ammo_box/m44 = 2, + /obj/item/gun/ballistic/revolver/m29 = 1, + ) + +/datum/outfit/loadout/police + name = "Holiday PD" + uniform = /obj/item/clothing/under/f13/police/officer + suit = /obj/item/clothing/suit/armor/heavy/vest/bulletproof + head = /obj/item/clothing/head/f13/town/officer + belt = /obj/item/storage/belt/legholster + r_hand = /obj/item/gun/ballistic/shotgun/police + shoes = /obj/item/clothing/shoes/jackboots + backpack_contents = list( + /obj/item/ammo_box/shotgun/bean = 1, + /obj/item/ammo_box/shotgun/buck = 1, + /obj/item/ammo_box/a357 = 3, + /obj/item/flashlight/seclite = 1, + /obj/item/gun/ballistic/revolver/police = 1 + ) + +/datum/outfit/loadout/swat + name = "S.W.A.T. Officer" + uniform = /obj/item/clothing/under/f13/police/swat + suit = /obj/item/clothing/suit/armor/heavy/vest/bulletproof + head = /obj/item/clothing/head/helmet/alt + mask = /obj/item/clothing/mask/balaclava + gloves = /obj/item/clothing/gloves/f13/military + suit_store = /obj/item/gun/ballistic/automatic/assault_carbine/policerifle + backpack_contents = list( + /obj/item/ammo_box/magazine/m45/socom=2, + /obj/item/gun/ballistic/automatic/pistol/mk23=1, + /obj/item/ammo_box/magazine/m5mm=1, + /obj/item/flashlight/seclite = 1 + ) + +/datum/outfit/loadout/energy + name = "High Tech Officer" + uniform = /obj/item/clothing/under/f13/police/officer + suit = /obj/item/clothing/suit/armor/heavy/metal/polished + gloves = /obj/item/clothing/gloves/f13/military + suit_store = /obj/item/gun/energy/laser/aer9 + backpack_contents = list( + /obj/item/stock_parts/cell/ammo/mfc = 1 + ) + + + +/*--------------------------------------------------------------*/ + +/datum/job/holiday/f13farmer + title = "Farmer" + flag = F13HOLIDAYFARMER + department_flag = DEP_HOLIDAY + total_positions = 4 + spawn_positions = 4 + supervisors = "Holiday laws" + description = "You are a farmer living in Holiday. Treat your town with respect and make sure to follow the laws in place, as your premium status may be revoked if you are considered a danger to the populace." + enforces = "Farming is a public service, and you are under control of local governance - and you are expected to produce food." + selection_color = "#dcba97" + + outfit = /datum/outfit/job/denholiday/f13farmer + + 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/holiday, + ), + /datum/matchmaking_pref/rival = list( + /datum/job/holiday, + ), + ) + + loadout_options = list( + /datum/outfit/loadout/abiotic, + /datum/outfit/loadout/pomologist, + /datum/outfit/loadout/zany,) + +/datum/outfit/job/denholiday/f13farmer + name = "Farmer" + jobtype = /datum/job/holiday/f13farmer + + 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/storage/bag/plants + backpack_contents = list( + /obj/item/cultivator=1, \ + /obj/item/hatchet=1, + /obj/item/shovel/spade=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/denholiday/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) + +/datum/outfit/loadout/abiotic + name = "Abiotic" + backpack_contents = list( + /obj/item/seeds/bamboo = 1, + /obj/item/seeds/glowshroom = 1, + /obj/item/seeds/tower = 1, + ) + +/datum/outfit/loadout/pomologist + name = "Pomologist" + backpack_contents = list( + /obj/item/seeds/grape/green = 1, + /obj/item/seeds/apple/gold = 1, + /obj/item/seeds/cherry/blue = 1, + ) + +/datum/outfit/loadout/zany + name = "Zany" + backpack_contents = list( + /obj/item/clothing/mask/cigarette/pipe = 1, + /obj/item/seeds/cannabis = 1, + /obj/item/seeds/tea/catnip = 1, + ) + +/*--------------------------------------------------------------*/ + +/datum/job/holiday/f13prospector + title = "Prospector" + flag = F13HOLIDAYPROSPECTOR + department_flag = DEP_HOLIDAY + total_positions = 4 + spawn_positions = 4 + supervisors = "The Mayor" + description = "Prospecting is a complicated business. Some call it scrounging or looting, but there is more to it than sifting through rubble - few can boast the valuable skills of mining and scavenging the ruins of fallen empires. The settlement of Holiday understands the value of this, and you've found purpose within their mines. Sell the materials you find to the highest bidder - the local store may be particularly interested in metals." + enforces = "Mining is a public service, and you are under control of local governance - but by default you are expected to work with private businesses and individual clients." + selection_color = "#dcba97" + + outfit = /datum/outfit/job/denholiday/f13prospector + + 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/holiday, + ), + /datum/matchmaking_pref/rival = list( + /datum/job/holiday, + ), + ) + + loadout_options = list( + /datum/outfit/loadout/engineer, + /datum/outfit/loadout/miner,) + +/datum/outfit/job/denholiday/f13prospector + name = "Prospector" + jobtype = /datum/job/holiday/f13prospector + + 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/lantern + belt = /obj/item/storage/bag/ore + shoes = /obj/item/clothing/shoes/jackboots + backpack_contents = list( + /obj/item/mining_scanner, + /obj/item/melee/onehanded/knife/hunting, + /obj/item/gun/ballistic/automatic/pistol/n99, + /obj/item/ammo_box/magazine/m10mm/adv/simple = 2 + ) + +/datum/outfit/job/denholiday/f13settler/pre_equip(mob/living/carbon/human/H) + ..() + uniform = pick( + /obj/item/clothing/under/f13/machinist, \ + /obj/item/clothing/under/f13/roving, \ + /obj/item/clothing/under/f13/cowboyt) + +/datum/outfit/job/denholiday/f13prospector/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest) + ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src) + ADD_TRAIT(H, TRAIT_GENERIC, src) + +/datum/outfit/loadout/engineer + name = "Engineer" + suit = /obj/item/clothing/suit/apron/overalls + glasses = /obj/item/clothing/glasses/welding + uniform = /obj/item/clothing/under/misc/overalls + belt = /obj/item/storage/belt/utility/full + shoes = /obj/item/clothing/shoes/workboots + backpack_contents = list( + /obj/item/pickaxe/mini = 1, + /obj/item/shovel/spade = 1, + ) + +/datum/outfit/loadout/miner + name = "Miner" + suit = /obj/item/clothing/suit/armor/light/leather/rig + uniform = /obj/item/clothing/under/f13/lumberjack + head = /obj/item/clothing/head/hardhat + belt = /obj/item/storage/belt/utility/mining/alt + shoes = /obj/item/clothing/shoes/f13/miner + backpack_contents = list( + /obj/item/t_scanner/adv_mining_scanner = 1, + /obj/item/pickaxe/silver = 1, + /obj/item/shovel = 1, + ) +/*--------------------------------------------------------------*/ + +/datum/job/holiday/f13dendoc + title = "Doctor" + flag = F13HOLIDAYDENDOC + department_flag = DEP_HOLIDAY + total_positions = 3 + spawn_positions = 3 + supervisors = "The Mayor" + description = "Handy with a scalpel and scanner, your expertise in the practice of medicine makes you an indispensible asset to the settlement of Holiday. Just remember that you're not a Follower - medicine doesn't come for free, and you aren't here out of the kindness of your heart. Make sure to turn a profit on your services, or the Mayor might reconsider your position, if you're bad enough the sherrif might even kick you out!" + enforces = "Medicine is a public service, and you are under control of local governance - but remember public doesn't equate to free." + selection_color = "#dcba97" + + loadout_options = list( + /datum/outfit/loadout/rescueranger, + /datum/outfit/loadout/stitcher, + /datum/outfit/loadout/mixer, + /datum/outfit/loadout/holidaydoc) + + outfit = /datum/outfit/job/denholiday/f13dendoc + access = list(ACCESS_BAR, ACCESS_CLINIC, ACCESS_CLONING, ACCESS_FOLLOWER, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_DOC, ACCESS_TOWN_SCIENCE) + 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/holiday + ), + /datum/matchmaking_pref/rival = list( + /datum/job/holiday + ) + ) + +/datum/outfit/job/denholiday/f13dendoc + name = "Doctor" + jobtype = /datum/job/holiday/f13dendoc + chemwhiz = TRUE + ears = /obj/item/radio/headset/headset_town/medical + uniform = /obj/item/clothing/under/f13/medic + neck = /obj/item/clothing/neck/stethoscope + suit = /obj/item/clothing/suit/toggle/labcoat + backpack = /obj/item/storage/backpack/medic + satchel = /obj/item/storage/backpack/satchel/med + shoes = /obj/item/clothing/shoes/sneakers/white + id = /obj/item/card/id/dendoctor + l_pocket = /obj/item/storage/wallet/stash/mid + r_pocket = /obj/item/flashlight/flare + backpack_contents = list( + /obj/item/storage/pill_bottle/chem_tin/radx, + /obj/item/reagent_containers/hypospray/medipen/stimpak=2, + /obj/item/storage/firstaid/regular, + /obj/item/clothing/accessory/armband/medblue + ) +/datum/outfit/job/denholiday/f13dendoc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + H.mind.teach_crafting_recipe(GLOB.chemwhiz_recipes) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/pico_manip) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/super_matter_bin) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/phasic_scanning) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/super_capacitor) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/ultra_micro_laser) + ADD_TRAIT(H, TRAIT_CHEMWHIZ, src) + ADD_TRAIT(H, TRAIT_GENERIC, src) + ADD_TRAIT(H, TRAIT_SURGERY_HIGH, src) + +/datum/outfit/loadout/rescueranger + name = "Search and Rescue" + backpack_contents = list(/obj/item/clothing/head/f13/police/sergeant = 1, + /obj/item/gun/ballistic/shotgun/automatic/combat/auto5 = 1, + /obj/item/ammo_box/shotgun/buck = 1, + /obj/item/clothing/suit/toggle/labcoat/paramedic = 1, + /obj/item/folder/white = 1, + /obj/item/flashlight/pen/paramedic = 1 + ) + +/datum/outfit/loadout/stitcher + name = "Stitcher" + backpack_contents = list(/obj/item/clothing/head/hardhat/white = 1, + /obj/item/grenade/flashbang = 1, + /obj/item/clothing/glasses/welding = 1, + /obj/item/storage/belt/medical/primitive = 1, + /obj/item/storage/medical/ancientfirstaid = 1, + /obj/item/circuitboard/machine/limbgrower = 1, + /obj/item/healthanalyzer/advanced = 1, + /obj/item/storage/belt/legholster/police = 1 + ) + +/datum/outfit/loadout/mixer + name = "Mixer" + backpack_contents = list(/obj/item/clothing/head/beret/chem = 1, + /obj/item/melee/classic_baton/police = 1, + /obj/item/pen/sleepy = 1, + /obj/item/reagent_containers/glass/beaker/plastic = 1, + /obj/item/reagent_containers/glass/beaker/meta = 1, + /obj/item/reagent_containers/hypospray = 1, + /obj/item/circuitboard/machine/bloodbankgen = 1 + ) + +/datum/outfit/loadout/holidaydoc + name = "Holiday Doc" + backpack_contents = list(/obj/item/vending_refill/medical = 1, + /obj/item/pda/medical = 1, + /obj/item/clothing/suit/hooded/surgical = 1, + /obj/item/storage/medical/ancientfirstaid = 1, + /obj/item/ammo_box/m44 = 1, + /obj/item/gun/ballistic/revolver/m29/snub = 1 + ) +/*--------------------------------------------------------------*/ + +/datum/job/holiday/f13barkeep + title = "Barkeep" + flag = F13HOLIDAYBARKEEP + department_flag = DEP_HOLIDAY + total_positions = 2 + spawn_positions = 2 + supervisors = "the free market and Holiday's Laws" + description = "As a proprietor of the bar, you are responsible for ensuring both citizens and travellers in Holiday can get some food, drink and rest. Speak to the farmers for fresh produce!" + enforces = " The bar is a private business and you can decide who is welcome there. However, you are still subject to the overarching laws of Holiday." + selection_color = "#dcba97" + + outfit = /datum/outfit/job/denholiday/f13barkeep + + loadout_options = list( + /datum/outfit/loadout/rugged, + /datum/outfit/loadout/frontier, + /datum/outfit/loadout/richmantender, + /datum/outfit/loadout/diner) + + access = list(ACCESS_BAR, ACCESS_KITCHEN, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_BAR) + 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/holiday + ), + /datum/matchmaking_pref/rival = list( + /datum/job/holiday + ) + ) + + +/datum/outfit/job/denholiday/f13barkeep + name = "Barkeep" + jobtype = /datum/job/holiday/f13barkeep + uniform = /obj/item/clothing/under/f13/bartenderalt + id = /obj/item/card/id/dogtag/town + ears = /obj/item/radio/headset/headset_town/commerce + belt = /obj/item/kit_spawner/townie/barkeep + shoes = /obj/item/clothing/shoes/workboots/mining + backpack = /obj/item/storage/backpack/satchel/leather + backpack_contents = list( + /obj/item/storage/pill_bottle/chem_tin/radx, + /obj/item/storage/wallet/stash/mid = 1, + // /obj/item/ammo_box/shotgun/bean = 2, + /obj/item/book/manual/nuka_recipes = 1, + /obj/item/stack/f13Cash/caps/onezerozero = 1, + /obj/item/reagent_containers/food/drinks/bottle/rotgut = 1 + ) + +/datum/outfit/loadout/rugged + name = "Rugged" + head = /obj/item/clothing/head/helmet/f13/brahmincowboyhat + uniform = /obj/item/clothing/under/f13/cowboyb + suit = /obj/item/clothing/suit/armor/outfit/vest/cowboy + gloves = /obj/item/clothing/gloves/color/brown + shoes = /obj/item/clothing/shoes/f13/brownie + +/datum/outfit/loadout/frontier + name = "Frontier" + head = /obj/item/clothing/head/bowler + mask = /obj/item/clothing/mask/fakemoustache + uniform = /obj/item/clothing/under/f13/westender + suit = /obj/item/clothing/suit/armor/outfit/vest/bartender + gloves = /obj/item/clothing/gloves/fingerless + shoes = /obj/item/clothing/shoes/f13/fancy + +/datum/outfit/loadout/richmantender + name = "Fancy" + head = /obj/item/clothing/head/fedora + glasses = /obj/item/clothing/glasses/sunglasses + uniform = /obj/item/clothing/under/rank/bartender + suit = /obj/item/clothing/suit/toggle/lawyer/black + gloves = /obj/item/clothing/gloves/fingerless + shoes = /obj/item/clothing/shoes/f13/fancy + neck = /obj/item/clothing/neck/tie/black + +/datum/outfit/loadout/diner + name = "Diner" + glasses = /obj/item/clothing/glasses/orange + uniform = /obj/item/clothing/under/f13/brahminf + neck = /obj/item/clothing/neck/apron/chef + gloves = /obj/item/clothing/gloves/color/white + shoes = /obj/item/clothing/shoes/f13/military/ncr + +/*--------------------------------------------------------------*/ +/datum/job/holiday/f13settler + title = "Citizen" + flag = F13HOLIDAYSETTLER + department_flag = DEP_HOLIDAY + total_positions = -1 + spawn_positions =-1 + supervisors = "Holiday's laws" + description = "You are a citizen living in Holiday. Treat your town with respect and make sure to follow the laws in place, as your premium status may be revoked if you are considered a danger to the populace. One of the local businesses may have work if you require funds." + selection_color = "#dcba97" + + outfit = /datum/outfit/job/denholiday/f13settler + + + loadout_options = list( + /datum/outfit/loadout/provisioner, + /datum/outfit/loadout/groundskeeper, + /datum/outfit/loadout/artisan, + /datum/outfit/loadout/outdoorsman, + /datum/outfit/loadout/militia, + /datum/outfit/loadout/singer, + /datum/outfit/loadout/farmer, + /datum/outfit/loadout/prospector, + /datum/outfit/loadout/remnant + ) + access = list(ACCESS_BAR, ACCESS_TOWN, ACCESS_TOWN_CIV) + minimal_access = list(ACCESS_BAR, ACCESS_TOWN, ACCESS_TOWN_CIV) + matchmaking_allowed = list( + /datum/matchmaking_pref/friend = list( + /datum/job/holiday + ), + /datum/matchmaking_pref/rival = list( + /datum/job/holiday + ) + ) + + +/datum/outfit/job/denholiday/f13settler + name = "Citizen" + jobtype = /datum/job/holiday/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 + uniform = /obj/item/clothing/under/f13/settler + shoes = /obj/item/clothing/shoes/jackboots + backpack = /obj/item/storage/backpack/satchel/explorer + r_pocket = /obj/item/flashlight/flare + backpack_contents = list( + /obj/item/storage/pill_bottle/chem_tin/radx, + /obj/item/storage/wallet/stash/low = 1, + /obj/item/kit_spawner/tools, + ///obj/item/melee/onehanded/knife/hunting = 1 //you already got a knife + ) + +/datum/outfit/job/denholiday/f13settler/pre_equip(mob/living/carbon/human/H) + . = ..() + /*people generally find their own hats + head = pick(/obj/item/clothing/head/f13/ranger_hat/tan, + /obj/item/clothing/head/soft/mime, + /obj/item/clothing/head/soft/black, + /obj/item/clothing/head/soft/grey, + /obj/item/clothing/head/f13/gambler, + /obj/item/clothing/head/f13/cowboy, + /obj/item/clothing/head/f13/ranger_hat/banded, + /obj/item/clothing/head/cowboyhat/white, + /obj/item/clothing/head/beret/headband, + /obj/item/clothing/head/cowboyhat/pink, + /obj/item/clothing/head/f13/police/trooper, + /obj/item/clothing/head/fedora/curator, + /obj/item/clothing/head/fedora/det_hat, + /obj/item/clothing/head/bowler) + */ //they do need a uniform tho + uniform = pick( + /obj/item/clothing/under/f13/gentlesuit, + /obj/item/clothing/under/f13/formal, + /obj/item/clothing/under/f13/spring, + /obj/item/clothing/under/f13/relaxedwear, + /obj/item/clothing/under/f13/machinist, + /obj/item/clothing/under/f13/brahminf, + /obj/item/clothing/under/f13/cowboyb, + /obj/item/clothing/under/f13/cowboyg, + /obj/item/clothing/under/f13/cowboyt) + + +/datum/outfit/loadout/provisioner + name = "Provisioner" + neck = /obj/item/clothing/neck/scarf/cptpatriot + suit = /obj/item/clothing/suit/jacket/miljacket + neck = /obj/item/clothing/ears/headphones + gloves = /obj/item/pda + shoes = /obj/item/clothing/shoes/f13/explorer + uniform = /obj/item/clothing/under/f13/merca + gloves = /obj/item/clothing/gloves/f13/leather + shoes = /obj/item/clothing/shoes/f13/explorer + backpack_contents = list(/obj/item/reagent_containers/food/drinks/flask = 1, + /obj/item/storage/medical/ancientfirstaid = 1, + /obj/item/reagent_containers/food/drinks/flask/survival = 1, + ) + +/datum/outfit/loadout/groundskeeper + name = "Groundskeeper" + head = /obj/item/clothing/head/soft/grey + belt = /obj/item/storage/belt/utility/waster + suit = /obj/item/clothing/under/f13/mechanic + gloves = /obj/item/clothing/gloves/color/black + shoes = /obj/item/clothing/shoes/sneakers/noslip + neck = /obj/item/storage/belt/shoulderholster/ + backpack_contents = list(/obj/item/storage/bag/trash = 1, + /obj/item/reagent_containers/spray/cleaner = 1, + /obj/item/mop = 1, + /obj/item/reagent_containers/glass/bucket/plastic = 1, + /obj/item/broom = 1, + /obj/item/stack/sheet/metal/fifty = 1, + /obj/item/lightreplacer = 1, + /obj/item/reagent_containers/spray/cleaner = 1 + ) + +/datum/outfit/loadout/artisan + name = "Artisan" + uniform = /obj/item/clothing/under/f13/cowboyg + belt = /obj/item/storage/belt/utility/mining/alt + gloves = /obj/item/clothing/gloves/f13/blacksmith + shoes = /obj/item/clothing/shoes/f13/military/leather + neck = /obj/item/storage/belt/shoulderholster + backpack_contents = list(/obj/item/twohanded/sledgehammer/simple = 1, + /obj/item/book/granter/crafting_recipe/ODF = 1, + /obj/item/clothing/glasses/welding = 1, + /obj/item/storage/belt/utility/mining/alt = 1, + /obj/item/melee/smith/hammer/premade = 1, + /obj/item/stack/sheet/mineral/titanium = 15, + /obj/item/pickaxe/mini = 1, + /obj/item/mining_scanner = 1 + ) + +/datum/outfit/loadout/outdoorsman + name = "Outdoorsman" + head = /obj/item/clothing/head/helmet/f13/marlowhat + suit = /obj/item/clothing/suit/armor/light/leather/tanvest + belt = /obj/item/melee/onehanded/knife/bowie + uniform = /obj/item/clothing/under/f13/cowboyt + gloves = /obj/item/clothing/gloves/botanic_leather + shoes = /obj/item/clothing/shoes/f13/peltboots + backpack_contents = list( + /obj/item/gun/ballistic/rifle/hunting = 1, + /obj/item/ammo_box/a308 = 2, + /obj/item/gun_upgrade/scope/watchman = 1, + /obj/item/fishingrod = 1, + /obj/item/binoculars = 1, + /obj/item/crafting/campfirekit = 1, + /obj/item/storage/fancy/rollingpapers/makeshift = 1 + ) + +/datum/outfit/loadout/militia + name = "Militia" + head = /obj/item/clothing/head/helmet/armyhelmet + suit = /obj/item/clothing/suit/armor/medium/vest/breastplate + uniform = /obj/item/clothing/under/f13/combat/militia + gloves = /obj/item/clothing/gloves/f13/leather + shoes = /obj/item/clothing/shoes/f13/military + belt = /obj/item/storage/belt/bandolier + backpack_contents = list( + /obj/item/gun/ballistic/automatic/combat/worn = 1, + /obj/item/ammo_box/magazine/tommygunm45/stick = 2, + /obj/item/shovel/trench =1, + /obj/item/binoculars = 1, + ) + +/datum/outfit/loadout/singer + name = "Singer" + shoes = /obj/item/clothing/shoes/laceup + backpack_contents = list(/obj/item/clothing/under/f13/classdress = 1, + /obj/item/clothing/under/suit/black_really = 1, + /obj/item/clothing/gloves/evening = 1, + /obj/item/clothing/gloves/color/white = 1, + /obj/item/melee/classic_baton/militarypolice = 1, + /obj/item/grenade/smokebomb = 2, + /obj/item/clothing/accessory/pocketprotector/full = 1, + /obj/item/choice_beacon/music = 1, + ) + +/datum/outfit/loadout/farmer + name = "Farmer" + backpack_contents = list(/obj/item/clothing/head/helmet/f13/brahmincowboyhat = 1, + /obj/item/clothing/under/f13/rustic = 1, + /obj/item/clothing/suit/armor/light/duster/battlecoat = 1, + /obj/item/clothing/gloves/botanic_leather = 1, + /obj/item/twohanded/fireaxe= 1, + /obj/item/storage/belt/utility/gardener = 1, + /obj/item/shovel/spade = 1, + /obj/item/cultivator = 1, + /obj/item/reagent_containers/glass/bucket/plastic = 1, + /obj/item/storage/bag/plants/portaseeder= 1, + /obj/item/seeds/bamboo = 1, + /obj/item/seeds/apple/gold = 1, + /obj/item/seeds/cannabis = 1 + ) + +/datum/outfit/loadout/prospector + name = "Prospector" + backpack_contents = list(/obj/item/clothing/head/hardhat = 1, + /obj/item/clothing/under/overalls = 1, + /obj/item/clothing/suit/armor/light/leather/rig = 1, + /obj/item/clothing/gloves/patrol = 1, + /obj/item/clothing/shoes/workboots = 1, + /obj/item/storage/belt/utility/waster = 1, + /obj/item/shovel/spade = 1, + /obj/item/pickaxe/silver = 1, + /obj/item/clothing/glasses/welding = 1, + /obj/item/t_scanner/adv_mining_scanner = 1, + /obj/item/ammo_box/m44 = 2, + /obj/item/gun/ballistic/revolver/m29/snub = 1 + ) + +/datum/outfit/loadout/remnant + name = "Enclave Remnant" + backpack_contents = list( + /obj/item/clothing/head/f13/enclave/peacekeeper = 1, + /obj/item/card/id/dogtag/enclave/trooper = 1, + /obj/item/stock_parts/cell/ammo/ec = 3, + /obj/item/gun/energy/laser/pistol/worn = 1, + ) + +/*--------------------------------------------------------------*/ + +/datum/job/holiday/f13radio_host + title = "Radio Host" + flag = F13HOLIDAYRADIOHOST + department_flag = DEP_HOLIDAY + total_positions = 2 + spawn_positions = 2 + supervisors = "Holiday laws" + description = "You are the Radio Host of Holiday. 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/denholiday/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/holiday + ), + /datum/matchmaking_pref/rival = list( + /datum/job/holiday + ), + ) +/datum/outfit/job/denholiday/f13radio_host + name = "Radio Host" + jobtype = /datum/job/holiday/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/denholiday/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/holiday/f13detective + title = "Detective" + flag = F13DETECTIVE + total_positions = 1 + spawn_positions = 1 + supervisors = "paying clients and Holiday's laws" + selection_color = "#dcba97" + outfit = /datum/outfit/job/holiday/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/holiday/f13detective + ), + /datum/matchmaking_pref/rival = list( + /datum/job/wasteland/f13wastelander, + /datum/job/holiday/f13detective + ), + /datum/matchmaking_pref/mentor = list( + /datum/job/wasteland/f13wastelander + ) + ) + + +/datum/outfit/job/holiday/f13detective + name = "Detective" + jobtype = /datum/job/holiday/f13detective + belt = /obj/item/kit_spawner/lawman + suit = /obj/item/clothing/suit/det_suit/grey + uniform = /obj/item/clothing/under/f13/detectivealt + head = /obj/item/clothing/head/f13/det_hat_alt + ears = /obj/item/radio/headset/headset_town/lawman + shoes = /obj/item/clothing/shoes/laceup + id = /obj/item/card/id/silver + l_pocket = /obj/item/storage/wallet/stash/mid + r_pocket = /obj/item/flashlight/flare + backpack = /obj/item/storage/backpack/satchel/explorer + satchel = /obj/item/storage/backpack/satchel/explorer + suit_store = /obj/item/gun/ballistic/revolver/colt357 + backpack_contents = list( + /obj/item/storage/pill_bottle/chem_tin/radx, + /obj/item/pda/detective=1, + /obj/item/camera/detective=1, + /obj/item/toy/crayon/white=1, + /obj/item/detective_scanner=1, + /obj/item/storage/box/gloves=1, + /obj/item/storage/box/evidence=1) + ///obj/item/ammo_box/a357=2) + +/*--------------------------------------------------------------*/ + + +/*--------------------------------------------------------------*/ + +//The Quartermaster +/datum/job/holiday/f13quartermaster + title = "Quartermaster" + flag = F13HOLIDAYQUARTERMASTER + department_flag = DEP_HOLIDAY + total_positions = 1 + spawn_positions = 1 + supervisors = "the free market and Holiday's laws" + description = "You are the team leader for your various workers in the shop. Guide them as you see fit towards a profitable future." + enforces = "The Holiday store is part of your workplace, but it is not your workplace alone. You should try to work with your team in order to turn a profit." + selection_color = "#dcba97" + exp_requirements = 0 + + loadout_options = list( + /datum/outfit/loadout/laser_master, + /datum/outfit/loadout/ballistic_master + ) + + outfit = /datum/outfit/job/denholiday/f13quartermaster + access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_MERCH) + 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/holiday + ), + /datum/matchmaking_pref/rival = list( + /datum/job/holiday + ) + ) + +/datum/outfit/job/denholiday/f13quartermaster + name = "Quartermaster" + jobtype = /datum/job/holiday/f13quartermaster + id = /obj/item/card/id/dogtag/town + ears = /obj/item/radio/headset/headset_town/commerce + belt = /obj/item/kit_spawner/townie + uniform = /obj/item/clothing/under/f13/roving + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + gloves = /obj/item/clothing/gloves/fingerless + l_pocket = /obj/item/storage/wallet/stash/high + r_pocket = /obj/item/flashlight/glowstick + shoes = /obj/item/clothing/shoes/f13/explorer + backpack_contents = list( + /obj/item/storage/pill_bottle/chem_tin/radx, + /obj/item/pda/quartermaster, + /obj/item/stack/f13Cash/caps/twofivezero) + +/datum/outfit/loadout/laser_master + name = "Laser Master" + backpack_contents = list( + /obj/item/book/granter/crafting_recipe/blueprint/plasmarifle = 1 + ) + +/datum/outfit/loadout/ballistic_master + name = "Ballistic Master" + backpack_contents = list( + /obj/item/book/granter/crafting_recipe/blueprint/armalite = 1 + ) + +/datum/outfit/job/denholiday/f13quartermaster/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/policepistol) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/policerifle) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/steelbib/heavy) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/armyhelmetheavy) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest) + ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src) + ADD_TRAIT(H, TRAIT_GENERIC, src) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/trail_carbine) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/lever_action) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/a180) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/huntingrifle) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/varmintrifle) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/huntingshotgun) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/thatgun) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/uzi) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/smg10mm) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/frag_shrapnel) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/concussion) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/explosive/shrapnelmine) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/pico_manip) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/super_matter_bin) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/phasic_scanning) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/super_capacitor) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/ultra_micro_laser) + +/datum/outfit/job/denholiday/f13quartermaster/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + +//The Trade Workers +/datum/job/holiday/f13shopkeeper + title = "Trade Worker" + flag = F13HOLIDAYSHOPKEEPER + department_flag = DEP_HOLIDAY + total_positions = 4 + spawn_positions = 4 + supervisors = "the free market and Holiday's laws" + description = "You are one of the many workers who live in the city of Holiday. Working with the town council you have rented out a space in the shop for you to make your living." + enforces = "The Holiday store is part of your workplace, but it is not your workplace alone. You should try work with the other trade workers to try and turn a profit." + selection_color = "#dcba97" + exp_requirements = 0 + + loadout_options = list( + /datum/outfit/loadout/energy_specialist, + /datum/outfit/loadout/ballistic_specialist, + /datum/outfit/loadout/jackofall_specialist + ) + + outfit = /datum/outfit/job/denholiday/f13shopkeeper + access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_TOWN, ACCESS_TOWN_CIV, ACCESS_TOWN_MERCH) + 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/holiday + ), + /datum/matchmaking_pref/rival = list( + /datum/job/holiday + ) + ) + +/datum/outfit/job/denholiday/f13shopkeeper + name = "Shopkeeper" + jobtype = /datum/job/holiday/f13shopkeeper + id = /obj/item/card/id/dogtag/town + ears = /obj/item/radio/headset/headset_town/commerce + belt = /obj/item/kit_spawner/townie + uniform = /obj/item/clothing/under/f13/roving + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + gloves = /obj/item/clothing/gloves/fingerless + l_pocket = /obj/item/storage/wallet/stash/high + r_pocket = /obj/item/flashlight/glowstick + shoes = /obj/item/clothing/shoes/f13/explorer + backpack_contents = list( + /obj/item/storage/pill_bottle/chem_tin/radx) + +/datum/outfit/loadout/energy_specialist + name = "Energy Specialist" + backpack_contents = list( + /obj/item/book/granter/crafting_recipe/blueprint/aer9=1, + /obj/item/book/granter/crafting_recipe/blueprint/lightplasmapistol=1 + ) + +/datum/outfit/loadout/ballistic_specialist + name = "Ballistic Specialist" + backpack_contents = list( + /obj/item/book/granter/crafting_recipe/blueprint/riotshotgun=1, + /obj/item/book/granter/crafting_recipe/blueprint/deagle=1 + ) + +/datum/outfit/loadout/jackofall_specialist + name = "Jack-Of-All Trade" + backpack_contents = list( + /obj/item/book/granter/crafting_recipe/blueprint/aep7=1, + /obj/item/book/granter/crafting_recipe/blueprint/uzi=1 + ) + +/datum/outfit/job/denholiday/f13shopkeeper/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/policepistol) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/policerifle) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/steelbib/heavy) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/armyhelmetheavy) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest) + ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src) + ADD_TRAIT(H, TRAIT_GENERIC, src) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/trail_carbine) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/lever_action) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/a180) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/huntingrifle) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/varmintrifle) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/huntingshotgun) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/thatgun) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/uzi) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/smg10mm) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/frag_shrapnel) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/concussion) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/explosive/shrapnelmine) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/pico_manip) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/super_matter_bin) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/phasic_scanning) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/super_capacitor) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/ultra_micro_laser) + +/datum/outfit/job/denholiday/f13shopkeeper/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + + diff --git a/hailmary.dme b/hailmary.dme index 455d6246afb..88791419367 100644 --- a/hailmary.dme +++ b/hailmary.dme @@ -2380,6 +2380,7 @@ #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\holiday.dm" #include "code\modules\jobs\job_types\khan.dm" #include "code\modules\jobs\job_types\legion.dm" #include "code\modules\jobs\job_types\locust_point.dm"