From e1380d3eda60b4f34cb9996be1ed15cfec292a3e Mon Sep 17 00:00:00 2001 From: Defaulterrama <136886118+Defaulterrama@users.noreply.github.com> Date: Tue, 3 Mar 2026 22:32:33 -0500 Subject: [PATCH 1/6] Update Vegas_Valley_Surface.dmm --- .../Vegas Valley/Vegas_Valley_Surface.dmm | 9391 +++++++++-------- 1 file changed, 5108 insertions(+), 4283 deletions(-) diff --git a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm index 5d66fb6753..779f6fd2d6 100644 --- a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm +++ b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm @@ -34,14 +34,6 @@ /obj/machinery/light, /turf/open/indestructible/ground/outside/desert, /area/maintenance/bar) -"aaI" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "aaJ" = ( /obj/effect/spawner/lootdrop/f13/armor/random, /obj/effect/turf_decal/weather/dirt{ @@ -326,6 +318,10 @@ /obj/item/reagent_containers/food/snacks/grown/apple, /turf/open/floor/wood_common, /area/f13/clinic) +"ahk" = ( +/obj/machinery/workbench/advanced, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/wasteland) "ahs" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" @@ -342,7 +338,9 @@ "ahu" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "ahy" = ( /obj/structure/table/wood, @@ -379,7 +377,9 @@ /area/f13/ambientlighting/building/f) "ahZ" = ( /obj/machinery/chem_master/advanced, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "aid" = ( /obj/effect/spawner/lootdrop/toolsbasic, @@ -423,7 +423,9 @@ "aiY" = ( /obj/machinery/clonepod, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "ajb" = ( /obj/machinery/light{ @@ -669,9 +671,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 8 }, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "anB" = ( @@ -843,7 +843,9 @@ "aqx" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "aqy" = ( /obj/structure/barricade/sandbags, @@ -938,10 +940,6 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) -"asc" = ( -/obj/effect/mob_spawn/human/corpse/enclave/soldier, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) "ase" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -1029,13 +1027,10 @@ icon_state = "horizontalbottombordertop0" }, /area/f13/wasteland) -"atw" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" - }, -/area/f13/ambientlighting/building/g) +"atA" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "atE" = ( /obj/machinery/power/port_gen/pacman/diesel{ anchored = 1 @@ -1623,16 +1618,6 @@ /obj/item/clothing/suit/armor/tiered/light/legion/recruit, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) -"aBw" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "aBF" = ( /obj/structure/car/rubbish4{ desc = "A rusty Pre-War Fire Engine carcass.. or at least you think that's what this is.
This carcass is damaged beyond repair."; @@ -1650,13 +1635,6 @@ icon_state = "bluerustysolid" }, /area/f13/followers) -"aCp" = ( -/obj/structure/bed/mattress{ - icon_state = "mattress2"; - pixel_y = 7 - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) "aCs" = ( /obj/structure/reagent_dispensers/compostbin, /obj/effect/turf_decal/weather/dirt{ @@ -1746,7 +1724,9 @@ "aDF" = ( /obj/structure/table, /obj/item/storage/pill_bottle/chem_tin/radx, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "aDJ" = ( /obj/machinery/light/lampost{ @@ -2154,6 +2134,11 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/i) +"aKn" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "aKt" = ( /obj/structure/chair/office{ dir = 8 @@ -2174,6 +2159,14 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"aKG" = ( +/obj/machinery/power/port_gen/pacman/diesel{ + anchored = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "aKJ" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8; @@ -2527,6 +2520,10 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"aQs" = ( +/obj/machinery/autolathe/ammo, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/wasteland) "aQw" = ( /obj/structure/anvil, /obj/item/melee/smith/hammer/premade, @@ -2538,11 +2535,6 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/d) -"aQx" = ( -/obj/structure/bed/old, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/purple, -/area/f13/ambientlighting/building/g) "aQC" = ( /mob/living/simple_animal/hostile/ghoul, /obj/effect/decal/cleanable/dirt{ @@ -2568,15 +2560,6 @@ "aQW" = ( /turf/closed/wall/f13/wood, /area/f13/building/abandoned/a) -"aRb" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) "aRk" = ( /obj/item/toy/cards/deck, /obj/structure/table/booth, @@ -2608,7 +2591,9 @@ /obj/structure/showcase/horrific_experiment{ icon_state = "pod_1" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "aRt" = ( /obj/structure/flora/tree/tall{ @@ -2654,9 +2639,7 @@ }, /area/f13/followers) "aRR" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ dir = 1 }, @@ -2675,8 +2658,7 @@ "aSa" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/sidewalk{ - dir = 1; - icon_state = "horizontaloutermain1" + icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) "aSi" = ( @@ -2978,15 +2960,9 @@ "aWT" = ( /obj/machinery/autolathe, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) -"aXb" = ( -/obj/dugpit, -/obj/item/stack/f13Cash/caps/onefivezero, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) "aXd" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -3065,6 +3041,24 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/p) +"aXP" = ( +/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/cleanable/dirt/dust, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "aXW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -3199,6 +3193,10 @@ }, /turf/open/floor/wood_wide, /area/f13/ncr) +"aZK" = ( +/obj/structure/rack/large/shelf_rust, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "aZR" = ( /obj/structure/wreck/trash/two_tire, /turf/open/indestructible/ground/outside/desert, @@ -3279,15 +3277,6 @@ /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"baS" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, -/turf/open/indestructible/ground/outside/grass, -/area/f13/wasteland) "baT" = ( /turf/open/indestructible/ground/outside/dirt/dark, /area/f13/wasteland) @@ -3609,6 +3598,11 @@ /obj/structure/wreck/trash/one_barrel, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +"bgm" = ( +/turf/open/floor/plating/f13/inside/gravel/edge{ + dir = 5 + }, +/area/f13/wasteland) "bgn" = ( /obj/machinery/microwave/stove, /obj/item/crafting/coffee_pot{ @@ -3661,6 +3655,10 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"bgZ" = ( +/obj/structure/target_stake, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "bhi" = ( /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/high, /obj/structure/reagent_dispensers/barrel/two, @@ -3676,18 +3674,6 @@ icon_state = "outerborder" }, /area/f13/wasteland) -"bhz" = ( -/obj/item/clothing/under/f13/police, -/obj/item/clothing/head/f13/police, -/obj/item/clothing/shoes/combat, -/obj/structure/closet, -/obj/item/clothing/head/beret, -/obj/item/storage/backpack/satchel/sec, -/obj/effect/spawner/lootdrop/f13/weapon/melee/tier1, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "bhD" = ( /obj/structure/chair/wood{ dir = 8 @@ -3827,6 +3813,12 @@ icon_state = "dirt" }, /area/f13/wasteland) +"bjo" = ( +/obj/structure/wreck/car/bike, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "bjA" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4"; @@ -3836,14 +3828,6 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) -"bjI" = ( -/obj/structure/railing{ - dir = 5 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "bjT" = ( /turf/open/floor/plasteel/stairs{ dir = 4 @@ -3938,9 +3922,7 @@ /area/f13/wasteland/legion) "blG" = ( /mob/living/simple_animal/hostile/retaliate/talker/buyer/basic, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "blH" = ( @@ -4037,9 +4019,7 @@ /area/f13/legioncamp) "bnk" = ( /obj/structure/table/reinforced, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "bnn" = ( @@ -4074,8 +4054,18 @@ dir = 1 }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/bunker) +"bnL" = ( +/obj/effect/turf_decal/big{ + dir = 10 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "bnN" = ( /obj/structure/table/wood, /obj/item/storage/box/medicine/antivenom5, @@ -4091,6 +4081,14 @@ icon_state = "floorrusty" }, /area/f13/followers) +"bok" = ( +/obj/item/kirbyplants{ + icon_state = "plant-22"; + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "bop" = ( /obj/structure/closet/crate/wicker, /turf/open/indestructible/ground/outside/dirt, @@ -4255,6 +4253,11 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +"bra" = ( +/obj/structure/closet/crate/trashcart, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "brc" = ( /obj/structure/simple_door/tentflap_cloth{ pixel_y = -3 @@ -4667,8 +4670,7 @@ /area/f13/ambientlighting/building/m) "bya" = ( /obj/structure/chair/f13chair2{ - dir = 1; - icon_state = "f13chair2" + dir = 1 }, /obj/machinery/light{ flickering = 1 @@ -4681,12 +4683,29 @@ /obj/structure/fluff/beach_umbrella/engine, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"byy" = ( +/obj/structure/chair/wood/wings{ + dir = 1 + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "byM" = ( /obj/structure/table/wood, /turf/open/floor/f13{ icon_state = "bar" }, /area/f13/ambientlighting/building/g) +"byQ" = ( +/obj/effect/landmark/start/f13/ncrconscript, +/obj/effect/landmark/start/f13/ncrconscript, +/obj/effect/landmark/start/f13/ncrconscript, +/obj/effect/landmark/start/f13/ncrconscript, +/obj/effect/landmark/start/f13/ncrconscript, +/obj/effect/landmark/start/f13/ncrconscript, +/obj/effect/landmark/start/f13/ncrconscript, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "bzf" = ( /obj/structure/tires/two, /turf/open/indestructible/ground/outside/road{ @@ -4782,11 +4801,6 @@ icon_state = "floorrusty" }, /area/f13/followers) -"bAG" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/green, -/area/f13/ambientlighting/building/g) "bAR" = ( /obj/structure/lamp_post/doubles/bent{ dir = 8 @@ -4813,6 +4827,31 @@ icon_state = "horizontalinnermain2" }, /area/f13/wasteland) +"bBt" = ( +/obj/structure/table, +/obj/item/lock_construct{ + pixel_x = 4; + pixel_y = 12 + }, +/obj/item/lock_construct{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/key{ + pixel_x = -5; + pixel_y = 7 + }, +/obj/item/key{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/f13{ + icon_state = "floorrusty" + }, +/area/f13/wasteland) "bBu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/tentclothcorner{ @@ -4832,7 +4871,9 @@ dir = 1; pixel_x = -16 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "bBF" = ( /obj/structure/rack, @@ -4939,7 +4980,9 @@ /area/f13/wasteland) "bDA" = ( /obj/item/card/id/rusted/brokenholodog/enclave, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "bDG" = ( /obj/structure/reagent_dispensers/barrel/dangerous, @@ -5171,6 +5214,10 @@ /obj/effect/overlay/desert/sonora/edge, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +"bGS" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "bHd" = ( /obj/effect/decal/fakelattice, /obj/structure/disposalpipe/segment{ @@ -5289,6 +5336,10 @@ /obj/machinery/smartfridge/bottlerack/seedbin/primitive, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"bIP" = ( +/obj/structure/table, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "bJc" = ( /obj/structure/railing/corner{ color = "#A47449" @@ -5556,15 +5607,10 @@ /area/f13/building/powered) "bNx" = ( /mob/living/simple_animal/hostile/supermutant/nightkin/rangedmutant, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/building/powered) -"bNB" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/vending/cola/random, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" }, -/area/f13/ambientlighting/building/g) +/area/f13/building/powered) "bNK" = ( /obj/structure/car/rubbish4{ pixel_x = -11; @@ -5891,6 +5937,10 @@ "bRM" = ( /turf/open/indestructible/ground/outside/dirt, /area/f13/ambientlighting/building/k) +"bRO" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "bRX" = ( /obj/structure/barricade/tentleathercorner{ dir = 1 @@ -5912,6 +5962,16 @@ /obj/structure/barricade/bars, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"bSi" = ( +/obj/structure/filingcabinet, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) +"bSj" = ( +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "bSo" = ( /obj/effect/mob_spawn/human/corpse/enclave/soldier, /obj/effect/decal/cleanable/blood/old{ @@ -5945,15 +6005,6 @@ icon_state = "verticalleftborderright2" }, /area/f13/ambientlighting/building/o) -"bSF" = ( -/obj/structure/obstacle/barbedwire{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 2; - icon_state = "dirt" - }, -/area/f13/wasteland) "bSY" = ( /obj/structure/rack, /obj/item/restraints/handcuffs, @@ -6229,16 +6280,11 @@ }, /turf/open/floor/f13/wood, /area/f13/building/abandoned/m) -"bYm" = ( -/obj/structure/reagent_dispensers/barrel/three, -/obj/item/reagent_containers/food/drinks/bottle/sunset{ - pixel_x = 4; - pixel_y = 15 - }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 10; - icon_state = "dirt" +"bYl" = ( +/obj/structure/chair/wood/wings{ + dir = 1 }, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland) "bYo" = ( /obj/effect/decal/cleanable/greenglow, @@ -6260,7 +6306,9 @@ /area/f13/wasteland/legion) "bYu" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/ncr) "bYz" = ( /obj/structure/chair/left{ @@ -6292,6 +6340,12 @@ /obj/structure/simple_door/house, /turf/open/floor/carpet, /area/f13/building/abandoned/x) +"bZp" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Armoury" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/wasteland) "bZt" = ( /obj/item/mine/shrapnel{ alpha = 65 @@ -6662,7 +6716,9 @@ /area/f13/building/powered) "cfd" = ( /obj/item/wrench/crude, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/bunker) "cfj" = ( /obj/effect/turf_decal/weather/dirt{ @@ -6715,7 +6771,9 @@ /obj/structure/sign/poster/ncr/irradiated_food{ pixel_y = 32 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/ncr) "cga" = ( /obj/structure/destructible/tribal_torch/wall/lit{ @@ -6751,10 +6809,14 @@ }, /area/f13/building/abandoned/t) "cgu" = ( -/obj/item/storage/trash_stack{ - icon_state = "Junk_3" +/obj/structure/shelf_wood, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/obj/item/pen, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" }, -/turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "cgv" = ( /obj/structure/simple_door, @@ -6787,6 +6849,10 @@ icon_state = "dirt" }, /area/f13/wasteland) +"chp" = ( +/obj/item/trash/f13/dog, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "cht" = ( /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) @@ -6901,9 +6967,7 @@ /area/f13/ncr) "ckc" = ( /obj/machinery/power/smes/engineering, -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /turf/open/floor/f13{ color = "#ffe9de"; icon_state = "darkrusty"; @@ -7191,6 +7255,12 @@ /obj/effect/overlay/desert/sonora/edge/corner, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +"coK" = ( +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "coL" = ( /obj/item/paper/crumpled, /turf/open/floor/wood_common, @@ -7268,6 +7338,10 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/a) +"cpU" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "cqa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -7555,8 +7629,7 @@ /area/f13/wasteland) "cuo" = ( /obj/structure/fence{ - dir = 1; - icon_state = "straight" + dir = 1 }, /obj/structure/barricade/wooden, /turf/open/indestructible/ground/inside/dirt, @@ -7574,7 +7647,9 @@ dir = 4; termtag = "Public" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "cuI" = ( /turf/closed/wall/f13/tunnel, @@ -7589,11 +7664,6 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) -"cva" = ( -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) "cvk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/spacevine, @@ -7627,7 +7697,6 @@ "cvH" = ( /obj/structure/reagent_dispensers/barrel/four, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -7667,6 +7736,13 @@ icon_state = "horizontalinnermain2left" }, /area/f13/wasteland) +"cwi" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "cwn" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/structure/reagent_dispensers/barrel/dangerous{ @@ -7952,6 +8028,11 @@ /obj/structure/sink/well, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"czG" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/fakelattice, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "czH" = ( /obj/structure/railing, /obj/structure/table/reinforced, @@ -7976,7 +8057,9 @@ "czV" = ( /mob/living/simple_animal/hostile/supermutant/nightkin/rangedmutant, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "czX" = ( /obj/structure/fluff/fokoff_sign, @@ -8123,11 +8206,12 @@ /obj/structure/table, /obj/item/paper/crumpled/bloody, /obj/item/reagent_containers/glass/bottle/FEV_solution/curling, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "cCv" = ( /turf/open/indestructible/ground/outside/gravel/path_desert{ - dir = 2; icon_state = "path_desert_end" }, /area/f13/wasteland) @@ -8617,6 +8701,11 @@ }, /turf/open/floor/plating/rust, /area/f13/followers) +"cIz" = ( +/obj/structure/table, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "cIE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/camera/autoname{ @@ -8689,6 +8778,10 @@ icon_state = "bluerustysolid" }, /area/f13/ambientlighting/building/o) +"cJw" = ( +/obj/item/trash/f13/k_ration, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "cJx" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt, @@ -8700,6 +8793,12 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +"cJB" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) "cJT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/tentclothedge, @@ -8731,10 +8830,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"cJZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/green, -/area/f13/ambientlighting/building/g) "cKa" = ( /obj/structure/barricade/wooden/strong, /obj/structure/decoration/rag{ @@ -8845,6 +8940,13 @@ name = "dirty floor" }, /area/f13/building/powered) +"cLN" = ( +/obj/item/kirbyplants{ + icon_state = "plant-22"; + pixel_x = -10 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "cLP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/gibspawner/human, @@ -8913,12 +9015,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "cMW" = ( -/obj/item/storage/trash_stack{ - icon_state = "trash_2" - }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticaloutermain1" - }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/wasteland) "cNt" = ( /obj/structure/flora/ausbushes/brflowers, @@ -9307,7 +9404,9 @@ }, /obj/machinery/atmospherics/components/unary/tank/oxygen, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "cTO" = ( /obj/structure/chair/office/light{ @@ -9513,7 +9612,9 @@ /area/f13/ambientlighting/building/i) "cXk" = ( /obj/structure/debris/v3, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "cXl" = ( /obj/item/storage/trash_stack, @@ -9583,18 +9684,6 @@ icon_state = "horizontaltopborderbottom2" }, /area/f13/wasteland) -"cYh" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, -/obj/structure/cable/outdoors{ - icon_state = "4-8" - }, -/turf/open/indestructible/ground/outside/road{ - dir = 8; - icon_state = "horizontalinnermain2left" - }, -/area/f13/wasteland) "cYi" = ( /obj/structure/chair/bench{ dir = 8; @@ -9692,6 +9781,10 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +"cZH" = ( +/obj/structure/table/wood/junk, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "cZI" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -9751,6 +9844,18 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"dan" = ( +/obj/effect/turf_decal/big{ + dir = 4 + }, +/obj/effect/decal/cleanable/oil{ + icon_state = "floor2"; + pixel_x = -12 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "daz" = ( /obj/structure/fence/corner, /turf/open/indestructible/ground/outside/desert, @@ -9826,13 +9931,6 @@ /obj/structure/table/greyscale, /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/f13/building/abandoned/z) -"dcd" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) "dcs" = ( /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, @@ -9963,6 +10061,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/p) +"ddQ" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "ddY" = ( /obj/structure/chair, /obj/effect/decal/cleanable/dirt{ @@ -10021,8 +10128,7 @@ /area/f13/ambientlighting/building/j) "dfk" = ( /obj/structure/fence{ - dir = 1; - icon_state = "straight" + dir = 1 }, /obj/structure/fence/corner{ dir = 1 @@ -10273,6 +10379,12 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) +"diZ" = ( +/obj/machinery/light/lampost, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) "dja" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/junk/small/bed, @@ -10313,9 +10425,7 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/casino) "djx" = ( -/mob/living/simple_animal/hostile/raider/sulphite{ - faction = list("raider") - }, +/mob/living/simple_animal/hostile/raider/sulphite, /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) @@ -10361,6 +10471,12 @@ /obj/structure/barricade/bars, /turf/open/floor/wood_common, /area/f13/clinic) +"dku" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "dkz" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -10432,6 +10548,12 @@ "dlP" = ( /turf/closed/wall/f13/wood/house/broken, /area/f13/ambientlighting/building/w) +"dlS" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/reagent_dispensers/rainwater_tank, +/obj/effect/decal/fakelattice, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "dlW" = ( /obj/structure/lattice, /obj/structure/table/optable/abductor, @@ -10471,15 +10593,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) -"dnd" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/grass, -/area/f13/wasteland) "dnm" = ( /turf/closed/indestructible/riveted, /area/f13/tcoms) @@ -10528,12 +10641,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) -"doc" = ( -/turf/open/indestructible/ground/outside/dirt{ - dir = 2; - icon_state = "dirt" - }, -/area/f13/wasteland) "dof" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, @@ -10711,7 +10818,6 @@ dir = 4 }, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -10724,27 +10830,12 @@ /obj/item/radio/headset, /turf/open/floor/carpet/royalblack, /area/f13/building/abandoned/l) -"dqu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood{ - icon_state = "housewood3-broken" - }, -/area/f13/ambientlighting/building/g) "dqv" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/town) -"dqC" = ( -/obj/structure/stairs/west, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "dqK" = ( /obj/structure/toilet{ dir = 8 @@ -10775,8 +10866,7 @@ /area/f13/ncr) "dqU" = ( /obj/effect/turf_decal/weather/snow/corner{ - dir = 1; - icon_state = "snow_corner" + dir = 1 }, /obj/effect/turf_decal/weather/snow/corner, /obj/structure/flora/ausbushes/ppflowers, @@ -10946,9 +11036,6 @@ icon_state = "common-broken5" }, /area/f13/ambientlighting/building/p) -"dtH" = ( -/turf/open/floor/plasteel/dark, -/area/f13/ambientlighting/building/g) "dtR" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood, @@ -11048,15 +11135,6 @@ }, /turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) -"dwg" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_6"; - pixel_x = -11; - pixel_y = 11 - }, -/mob/living/simple_animal/hostile/radscorpion, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) "dwn" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 @@ -11306,6 +11384,22 @@ }, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/t) +"dAp" = ( +/obj/machinery/smartfridge/bottlerack/seedbin/primitive, +/obj/item/seeds/agave, +/obj/item/seeds/poppy/broc, +/obj/item/seeds/poppy/broc, +/obj/item/seeds/wheat, +/obj/item/seeds/tower, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/item/seeds/xander, +/obj/item/seeds/xander, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "dAu" = ( /obj/effect/decal/cleanable/oil/streak, /obj/effect/decal/cleanable/oil/streak, @@ -11346,7 +11440,9 @@ /area/f13/wasteland) "dAV" = ( /obj/effect/gibspawner/human, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "dBe" = ( /obj/structure/fence/corner/wooden, @@ -11471,6 +11567,16 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/a) +"dCE" = ( +/obj/structure/fence/post{ + pixel_y = -18; + pixel_x = 16; + desc = "An iron support beam."; + name = "iron stanchion" + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_common, +/area/f13/wasteland) "dCU" = ( /obj/structure/simple_door/metal/store, /obj/effect/decal/cleanable/dirt, @@ -11482,11 +11588,6 @@ /obj/structure/barricade/wooden, /turf/closed/mineral/random/no_caves, /area/f13/wasteland) -"dDp" = ( -/turf/open/indestructible/ground/outside/gravel/path_desert{ - dir = 2 - }, -/area/f13/wasteland) "dDx" = ( /obj/structure/fence{ dir = 4 @@ -11521,6 +11622,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"dDM" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "dDN" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks, @@ -11649,9 +11757,7 @@ /obj/effect/decal/cleanable/dirt{ color = "000000" }, -/mob/living/simple_animal/hostile/raider/sulphite{ - faction = list("raider") - }, +/mob/living/simple_animal/hostile/raider/sulphite, /turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, /area/f13/ambientlighting/building/j) "dGT" = ( @@ -11818,8 +11924,7 @@ /area/f13/ambientlighting/building/e) "dJC" = ( /obj/effect/turf_decal/weather/snow/corner{ - dir = 5; - icon_state = "snow_corner" + dir = 5 }, /obj/structure/flora/burnedlog{ pixel_x = 8; @@ -11976,6 +12081,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_common, /area/f13/clinic) +"dLJ" = ( +/obj/item/storage/trash_stack{ + icon_state = "Junk_3" + }, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "dLM" = ( /obj/structure/chair/stool/retro/backed{ dir = 8 @@ -11983,9 +12095,7 @@ /turf/open/floor/wood_common, /area/f13/building/abandoned/z) "dLP" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/dirt{ dir = 9; icon_state = "dirt" @@ -12209,6 +12319,12 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"dOn" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "dOw" = ( /obj/structure/closet/fridge/cannibal, /obj/effect/decal/cleanable/dirt, @@ -12348,6 +12464,11 @@ /obj/structure/table/wood/fancy, /turf/open/floor/carpet/airless, /area/f13/ambientlighting/building/c) +"dQz" = ( +/obj/structure/table/booth, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "dQP" = ( /obj/structure/fence{ pixel_x = -14 @@ -12367,6 +12488,12 @@ icon_state = "bluedirtychess2" }, /area/f13/brotherhood) +"dQY" = ( +/obj/structure/rack/shelf_metal, +/obj/effect/spawner/lootdrop/tool_box, +/obj/item/salvage/low, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "dRb" = ( /obj/effect/turf_decal/weather/dirt, /obj/structure/chair/bench{ @@ -12410,7 +12537,6 @@ "dRK" = ( /obj/structure/fence/corner, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -12542,6 +12668,16 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"dTC" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress2"; + pixel_y = 5 + }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "dTE" = ( /obj/structure/sign/poster/contraband/red_rum{ pixel_y = 32 @@ -12642,13 +12778,6 @@ icon_state = "bluedirtychess2" }, /area/f13/followers) -"dUX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "dUZ" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -12756,13 +12885,6 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) -"dWQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "dXp" = ( /obj/structure/debris/v3, /turf/open/indestructible/ground/outside/sidewalk, @@ -12804,6 +12926,10 @@ }, /turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, /area/f13/ambientlighting/building/j) +"dYy" = ( +/obj/structure/billboard/hubris2, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "dYF" = ( /obj/effect/landmark/poster_spawner/pinup, /turf/closed/indestructible/f13vaultrusted, @@ -12828,8 +12954,7 @@ light_color = "#ff4747" }, /obj/effect/turf_decal/weather/snow/corner{ - dir = 8; - icon_state = "snow_corner" + dir = 8 }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ncr) @@ -12906,13 +13031,6 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/o) -"dZG" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/carpet/purple, -/area/f13/ambientlighting/building/g) "dZM" = ( /turf/open/indestructible/ground/outside/grass/dirtpath{ dir = 5 @@ -13004,13 +13122,6 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) -"ecc" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/open/indestructible/ground/outside/dirt{ - dir = 8; - icon_state = "dirt" - }, -/area/f13/caves) "ech" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/f13/armor/tier2, @@ -13132,9 +13243,7 @@ dir = 4; icon_state = "post_wood" }, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "eed" = ( @@ -13223,14 +13332,6 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ncr) -"efz" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_6"; - pixel_x = -11; - pixel_y = 11 - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) "efI" = ( /obj/machinery/vending/coffee, /obj/effect/decal/cleanable/dirt{ @@ -13243,7 +13344,9 @@ "efJ" = ( /obj/structure/showcase/horrific_experiment, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "efR" = ( /obj/structure/obstacle/barbedwire/end{ @@ -13356,7 +13459,9 @@ /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "ehJ" = ( /obj/structure/table, @@ -13412,14 +13517,6 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/m) -"eiU" = ( -/obj/structure/barricade/wooden/strong, -/obj/structure/decoration/rag{ - icon_state = "skin"; - pixel_y = 2 - }, -/turf/closed/wall/f13/tentwall, -/area/f13/wasteland) "ejg" = ( /obj/machinery/porta_turret/f13/turret_shotgun/burstfire/robot, /obj/effect/decal/cleanable/dirt/dust{ @@ -13440,14 +13537,6 @@ /obj/effect/landmark/start/f13/deputy, /turf/open/floor/f13/wood, /area/f13/building/abandoned/n) -"ejo" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) "ejr" = ( /obj/structure/curtain{ color = "#845f58"; @@ -13551,6 +13640,16 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +"ekZ" = ( +/obj/effect/decal/marking{ + icon_state = "dottedhorizontalcorroded"; + pixel_y = -17 + }, +/obj/structure/car/rubbish4{ + pixel_x = -20 + }, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) "elf" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderrightbottom" @@ -13664,7 +13763,9 @@ "end" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/ammo, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "enf" = ( /obj/structure/table/wood/bar, @@ -13759,6 +13860,11 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"enU" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "enZ" = ( /obj/structure/chair/f13chair1, /obj/item/cigbutt/cigarbutt, @@ -13859,12 +13965,6 @@ /obj/machinery/reagentgrinder, /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/maintenance/bar) -"ept" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/closed/wall/f13/wood/house, -/area/f13/ambientlighting/building/g) "epw" = ( /obj/structure/table/wood, /obj/item/stack/medical/poultice/ten, @@ -13998,7 +14098,9 @@ dir = 1; pixel_x = -16 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "erQ" = ( /obj/structure/reagent_dispensers/barrel/explosive, @@ -14459,6 +14561,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"ezE" = ( +/obj/structure/sign/brotherhoodcardboard, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "ezV" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -14754,14 +14862,6 @@ }, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) -"eEx" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/landmark/questing/item{ - location_description = "in that apartment complex on the west side of the valley." - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "eEF" = ( /obj/structure/chair/stool{ dir = 4; @@ -14947,6 +15047,16 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +"eGN" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress1"; + pixel_y = 9 + }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "eGO" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /obj/structure/obstacle/barbedwire/end, @@ -14977,6 +15087,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"eHh" = ( +/obj/item/kirbyplants{ + icon_state = "plant-17" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/wasteland) "eHp" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall/f13/wood/house, @@ -15162,7 +15278,9 @@ /obj/machinery/light/fo13colored/Red{ dir = 8 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "eKs" = ( /obj/structure/flora/grass/wasteland, @@ -15202,6 +15320,15 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"eKW" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "eLf" = ( /obj/structure/barricade/wooden/strong, /obj/structure/decoration/rag, @@ -15324,8 +15451,7 @@ "eME" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/snow/corner{ - dir = 8; - icon_state = "snow_corner" + dir = 8 }, /obj/machinery/hydroponics/soil{ mutmod = 0; @@ -15336,8 +15462,17 @@ /area/f13/wasteland) "eMN" = ( /obj/machinery/door/poddoor/shutters/old, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) +"eMO" = ( +/obj/structure/flora/brushwoodalt, +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) "eMS" = ( /obj/structure/barricade/tentclothedge{ color = "#7c0A02"; @@ -15345,6 +15480,10 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) +"eMZ" = ( +/obj/item/defibrillator/primitive, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "eNa" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/item/flag, @@ -15490,6 +15629,14 @@ }, /turf/open/floor/plasteel/f13/vault_floor/yellow, /area/f13/ambientlighting/building/j) +"eQj" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/power/port_gen/pacman/diesel{ + anchored = 1 + }, +/obj/item/stack/sheet/mineral/plasma/fifty, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "eQp" = ( /obj/structure/junk/small/table, /obj/structure/junk/small/tv, @@ -15575,6 +15722,10 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/b) +"eRO" = ( +/obj/structure/table/booth, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "eRZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -15738,6 +15889,11 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +"eUG" = ( +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "eUI" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/effect/decal/cleanable/greenglow, @@ -16014,11 +16170,19 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/greenglow, /obj/structure/reagent_dispensers/barrel/dangerous, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) +"eYx" = ( +/obj/structure/rack/shelf_metal, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/wasteland) "eYB" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "eYQ" = ( /turf/open/floor/wood_wide, @@ -16180,6 +16344,10 @@ /obj/structure/window/fulltile/house, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"fbM" = ( +/obj/effect/spawner/lootdrop/tool_box, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "fbO" = ( /obj/structure/simple_door/room, /obj/structure/barricade/wooden/strong, @@ -16341,6 +16509,10 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"feb" = ( +/obj/structure/safe, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "feg" = ( /obj/item/reagent_containers/food/drinks/coffee{ pixel_x = -7; @@ -16428,6 +16600,26 @@ icon_state = "outerborder" }, /area/f13/wasteland/town) +"ffw" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2"; + pixel_y = 4 + }, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) +"ffy" = ( +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/wasteland) +"ffB" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "ffJ" = ( /obj/machinery/light/small{ dir = 4 @@ -16655,6 +16847,12 @@ /obj/structure/simple_door/tentflap_cloth, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +"fiF" = ( +/obj/structure/chair/sofa/right{ + dir = 8 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "fiI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt{ @@ -16722,9 +16920,7 @@ }, /area/f13/ambientlighting/building/i) "fjA" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ dir = 1 }, @@ -16934,11 +17130,6 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) -"fmr" = ( -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/holofloor/carpet, -/area/f13/ambientlighting/building/g) "fmy" = ( /turf/open/floor/wood_common, /area/f13/clinic) @@ -17042,10 +17233,21 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"foA" = ( +/obj/structure/fence/post{ + pixel_y = -18; + pixel_x = 16; + desc = "An iron support beam."; + name = "iron stanchion" + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "foC" = ( /obj/structure/rack, /obj/item/reagent_containers/food/snacks/kebab/human, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "foE" = ( /obj/structure/stairs/north{ @@ -17120,9 +17322,7 @@ /obj/structure/fence/end/wooden{ dir = 8 }, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "fpF" = ( @@ -17139,11 +17339,6 @@ "fpI" = ( /turf/open/floor/plating/dirt, /area/f13/wasteland) -"fpJ" = ( -/turf/open/floor/plasteel/stairs{ - dir = 4 - }, -/area/f13/ambientlighting/building/g) "fpO" = ( /obj/structure/railing{ layer = 4.1 @@ -17250,6 +17445,14 @@ icon_state = "verticalleftborderleft0" }, /area/f13/building/lower_firetower) +"frG" = ( +/obj/item/kirbyplants{ + icon_state = "plant-25"; + pixel_y = 18; + pixel_x = -6 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "frK" = ( /obj/effect/decal/cleanable/blood/old{ icon_state = "gibbearcore" @@ -17331,6 +17534,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) +"fsB" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/obj/structure/bed/mattress{ + icon_state = "mattress2" + }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "fsN" = ( /obj/structure/wreck/car, /turf/open/indestructible/ground/outside/road{ @@ -17395,12 +17608,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"ftA" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, -/turf/open/indestructible/ground/outside/desert, -/area/f13/wasteland) "ftC" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 4 @@ -17427,6 +17634,14 @@ /obj/effect/landmark/start/f13/prospector, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +"ftP" = ( +/obj/machinery/door/unpowered/secure_NCR{ + color = "#e8e4ca"; + name = "Captain's Office" + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "fup" = ( /obj/structure/chair/sofa/left{ dir = 8; @@ -17514,6 +17729,15 @@ icon_state = "horizontaltopbordertop0" }, /area/f13/wasteland) +"fwg" = ( +/obj/structure/fence/post{ + pixel_y = -18; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "fwi" = ( /obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/inside/dirt, @@ -17574,11 +17798,6 @@ /obj/structure/frame/machine, /turf/open/floor/plasteel/dark, /area/engine/workshop) -"fwX" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/purple, -/area/f13/ambientlighting/building/g) "fxa" = ( /obj/effect/landmark/start/f13/vetlegionary, /turf/open/floor/f13/wood, @@ -17703,13 +17922,6 @@ icon_state = "whitebluechess" }, /area/f13/building/abandoned/j) -"fze" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) "fzl" = ( /obj/structure/fence/wooden{ dir = 1; @@ -17804,10 +18016,6 @@ "fAb" = ( /turf/closed/wall/f13/tunnel, /area/f13/building) -"fAf" = ( -/mob/living/simple_animal/hostile/radscorpion/black, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) "fAg" = ( /obj/item/flag/legion, /turf/open/indestructible/ground/outside/dirt{ @@ -17876,7 +18084,9 @@ /obj/machinery/light/fo13colored/Red{ dir = 4 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "fBo" = ( /obj/effect/decal/cleanable/dirt, @@ -18414,14 +18624,10 @@ dir = 4; light_color = "#c1caff" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/building/powered) -"fKH" = ( -/obj/structure/simple_door/bunker, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" }, -/area/f13/ambientlighting/building/g) +/area/f13/building/powered) "fKI" = ( /obj/structure/closet/crate/footlocker{ pixel_x = -8; @@ -18480,6 +18686,10 @@ icon_state = "outerbordercorner" }, /area/f13/wasteland) +"fLe" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "fLk" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall/f13/wood, @@ -18489,20 +18699,18 @@ icon_state = "innercornerpieceleft" }, /area/f13/wasteland) -"fLH" = ( -/obj/machinery/shower{ - dir = 1 +"fLu" = ( +/obj/machinery/button/door{ + pixel_y = 28; + id = 982 }, -/obj/structure/curtain, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bar" +/obj/structure/disposalpipe/broken{ + dir = 1 }, -/area/f13/ambientlighting/building/g) +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "fLL" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ dir = 10 }, @@ -18519,6 +18727,10 @@ /obj/structure/flora/wasteplant/wild_punga, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"fMf" = ( +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/wasteland) "fMi" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 8 @@ -18764,6 +18976,12 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) +"fPk" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "fPz" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain2" @@ -18816,9 +19034,7 @@ dir = 1; pixel_y = 17 }, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "fQA" = ( @@ -18943,6 +19159,12 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"fSI" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/components/unary/tank/air, +/obj/effect/decal/fakelattice, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "fSK" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowbrokenvertical" @@ -18993,6 +19215,10 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +"fTn" = ( +/obj/item/reagent_containers/glass/rag/towel, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "fTt" = ( /obj/structure/window/reinforced/spawner/east, /obj/structure/rack, @@ -19061,9 +19287,7 @@ }, /area/f13/wasteland) "fUz" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /obj/machinery/mineral/wasteland_vendor/medical, /turf/open/floor/plating/f13/inside, /area/f13/building) @@ -19150,6 +19374,10 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ncr) +"fVF" = ( +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "fVH" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -19243,6 +19471,11 @@ }, /turf/open/floor/plasteel/f13/vault_floor/blue/bluechess, /area/f13/legioncamp) +"fXb" = ( +/obj/effect/spawner/lootdrop/bedsheet, +/obj/structure/bed, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "fXf" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall/mineral/sandstone, @@ -19297,6 +19530,16 @@ /obj/structure/table/reinforced, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/t) +"fYh" = ( +/obj/structure/fence/post{ + pixel_y = -18; + pixel_x = 16; + desc = "An iron support beam."; + name = "iron stanchion" + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "fYj" = ( /turf/open/floor/f13{ icon_state = "floorrusty" @@ -19312,7 +19555,9 @@ "fYz" = ( /obj/machinery/door/unpowered/secure_bos, /obj/effect/mapping_helpers/network_builder/power_cable/auto, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/brotherhood/offices1st) "fYB" = ( /obj/structure/table/wood, @@ -19416,6 +19661,10 @@ /obj/structure/flora/wasteplant/wild_prickly, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"gaq" = ( +/obj/structure/fluff/hedge, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/wasteland) "gaw" = ( /obj/machinery/door/unpowered/secure_bos, /turf/open/floor/f13{ @@ -19468,6 +19717,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"gaX" = ( +/obj/machinery/chem_heater, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "gbc" = ( /turf/open/indestructible/ground/outside/water, /area/f13/caves) @@ -19567,6 +19822,11 @@ icon_state = "dirt" }, /area/f13/wasteland) +"gcN" = ( +/obj/structure/rack/shelf_metal, +/obj/item/salvage/low, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "gcP" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/weapon/melee/tier2, @@ -19588,14 +19848,11 @@ /obj/effect/overlay/fog, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) -"gdg" = ( -/obj/structure/decoration/rag{ - icon_state = "skulls"; - pixel_x = -4; - pixel_y = 2 - }, -/obj/structure/decoration/rag, -/turf/closed/wall/f13/tentwall, +"gdm" = ( +/obj/structure/table/reinforced, +/obj/structure/barricade/bars, +/obj/effect/spawner/structure/window/reinforced/indestructable, +/turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "gdo" = ( /obj/structure/debris/v1{ @@ -19781,9 +20038,6 @@ anchored = 1 }, /obj/item/storage/lockbox, -/obj/item/storage/lockbox/medal{ - pixel_y = -5 - }, /obj/item/card/id/dogtag/town/ncr, /obj/item/card/id/dogtag/town/ncr, /obj/item/card/id/dogtag/town/ncr, @@ -20132,12 +20386,6 @@ /obj/structure/flora/tree/oak_one, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"gkE" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/ammo/fiftypercent, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "gkK" = ( /obj/structure/chair/wood/wings, /obj/effect/landmark/start/f13/family_head, @@ -20243,8 +20491,7 @@ /area/f13/wasteland) "gmz" = ( /obj/structure/fence{ - dir = 1; - icon_state = "straight" + dir = 1 }, /obj/structure/fence/corner{ dir = 4 @@ -20530,12 +20777,6 @@ icon_state = "whitebluechess" }, /area/f13/building/abandoned/j) -"gqN" = ( -/obj/structure/simple_door/metal/dirtystore, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "gqS" = ( /obj/machinery/door/unpowered/secure_NCR{ name = "Medical" @@ -21061,6 +21302,11 @@ }, /turf/open/floor/wood_common, /area/maintenance/bar) +"gAE" = ( +/obj/effect/landmark/start/f13/ncrmp, +/obj/effect/landmark/start/f13/ncrmp, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "gAF" = ( /obj/structure/flora/tree/oak_three, /turf/open/indestructible/ground/outside/grass/dirtpath{ @@ -21284,9 +21530,7 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "gDM" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/grass/corner, /area/f13/wasteland/town) "gDO" = ( @@ -21294,6 +21538,13 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, /turf/open/indestructible/ground/outside/dirt, /area/f13/ambientlighting/building/k) +"gDP" = ( +/obj/effect/decal/marking{ + icon_state = "dottedhorizontalcorroded"; + pixel_y = -17 + }, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) "gDV" = ( /obj/structure/fence{ dir = 8 @@ -21417,6 +21668,10 @@ icon_state = "snow4" }, /area/f13/wasteland) +"gFV" = ( +/obj/machinery/power/floodlight, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "gGf" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -21486,6 +21741,22 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"gHu" = ( +/obj/item/reagent_containers/glass/bucket{ + pixel_y = 17; + pixel_x = 11 + }, +/obj/item/storage/bag/plants{ + pixel_y = -6; + pixel_x = -10 + }, +/obj/machinery/light/small{ + dir = 4; + light_color = "#ff4747" + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "gHy" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall/f13/wood/house, @@ -21766,7 +22037,9 @@ }, /area/f13/ambientlighting/building/p) "gLh" = ( -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/brotherhood/offices1st) "gLk" = ( /obj/effect/turf_decal, @@ -21813,7 +22086,6 @@ /obj/structure/barricade/wooden/planks, /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -21929,7 +22201,9 @@ /obj/effect/turf_decal/weather/dirt{ dir = 8 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/abandoned/t) "gMv" = ( /obj/structure/wreck/trash/machinepiletwo, @@ -22031,7 +22305,9 @@ "gOk" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/midhigh, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "gOy" = ( /turf/open/indestructible/ground/outside/road{ @@ -22123,14 +22399,6 @@ icon_state = "common-broken4" }, /area/f13/wasteland) -"gPB" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/questing/item{ - location_description = "in that apartment complex on the west side of the valley." - }, -/turf/open/floor/holofloor/carpet, -/area/f13/ambientlighting/building/g) "gPC" = ( /obj/machinery/light/small{ dir = 4; @@ -22152,17 +22420,6 @@ /obj/structure/fence, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"gPN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/landmark/questing/item{ - location_description = "in that apartment complex on the west side of the valley." - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "gPV" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -22542,9 +22799,7 @@ /turf/open/indestructible/ground/outside/grass/corner, /area/f13/wasteland) "gVb" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ dir = 1 }, @@ -22615,6 +22870,15 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"gWT" = ( +/obj/structure/car/rubbish2, +/obj/effect/turf_decal/big{ + dir = 10 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "gWU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fluff/hedge, @@ -22735,7 +22999,9 @@ /area/f13/wasteland) "gYB" = ( /obj/machinery/autolathe, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "gYE" = ( /obj/structure/table/wood, @@ -22768,6 +23034,10 @@ /obj/structure/nest/mirelurk, /turf/open/indestructible/ground/outside/dirt, /area/f13/underground/cave) +"gYV" = ( +/obj/structure/fluff/hedge, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "gZc" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -22829,12 +23099,6 @@ icon_state = "carpetstar" }, /area/f13/ambientlighting/building/z) -"gZY" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/ammo/fiftypercent, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "hab" = ( /obj/structure/table/wood/junk, /obj/effect/decal/cleanable/blood{ @@ -23072,21 +23336,11 @@ /obj/effect/decal/cleanable/robot_debris/gib, /turf/open/floor/plating/rust, /area/f13/building/powered) -"hcZ" = ( -/obj/effect/decal/cleanable/blood/drip, -/obj/effect/decal/remains/human, -/turf/open/indestructible/ground/outside/dirt{ - dir = 4; - icon_state = "dirtcorner" - }, -/area/f13/wasteland) "hde" = ( /obj/structure/barricade/tentclothedge{ pixel_y = -4 }, -/turf/open/indestructible/ground/outside/grass/dirtpath{ - dir = 2 - }, +/turf/open/indestructible/ground/outside/grass/dirtpath, /area/f13/ambientlighting/building/t) "hdp" = ( /obj/item/storage/trash_stack, @@ -23189,6 +23443,15 @@ dir = 1 }, /area/f13/wasteland) +"heA" = ( +/obj/structure/grille/broken, +/obj/effect/turf_decal/big{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "heB" = ( /mob/living/simple_animal/hostile/supermutant/meleemutant, /obj/effect/decal/cleanable/dirt, @@ -23269,7 +23532,9 @@ /obj/structure/simple_door/bunker, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/barricade/wooden, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "hfT" = ( /turf/closed/wall/f13/wood/house, @@ -23285,19 +23550,6 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) -"hgr" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "hgt" = ( /obj/structure/barricade/sandbags, /obj/structure/cable/outdoors{ @@ -23378,6 +23630,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"hhn" = ( +/obj/structure/decoration/clock, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "hhr" = ( /obj/structure/junk/locker, /obj/effect/spawner/lootdrop/f13/weapon/melee/tier3, @@ -23490,16 +23746,16 @@ "hiN" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/trash, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "hiP" = ( /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "hiW" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/dirt{ dir = 1; icon_state = "dirt" @@ -23665,6 +23921,15 @@ /obj/item/defibrillator/primitive, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"hkO" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 26; + pixel_x = -18 + }, +/turf/closed/mineral/random, +/area/f13/wasteland) "hkX" = ( /obj/effect/turf_decal/trimline/white/line, /turf/open/indestructible/ground/outside/road{ @@ -23893,6 +24158,10 @@ /obj/structure/obstacle/barbedwire, /turf/closed/wall/f13/wood/house/broken, /area/f13/wasteland/town) +"hnG" = ( +/obj/structure/chair/wood/wings, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "hnH" = ( /obj/structure/closet/cabinet, /obj/effect/decal/cleanable/dirt, @@ -23983,7 +24252,9 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "hox" = ( /obj/effect/turf_decal/weather/snow/corner{ @@ -24031,17 +24302,8 @@ /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/ambientlighting/building/p) "hpE" = ( -/obj/item/clothing/under/f13/police, -/obj/item/clothing/head/f13/police, -/obj/item/clothing/shoes/combat, -/obj/structure/closet, -/obj/item/clothing/head/beret, -/obj/item/storage/backpack/satchel/sec, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "hpH" = ( /obj/structure/lamp_post{ dir = 8 @@ -24075,9 +24337,7 @@ /obj/effect/decal/cleanable/dirt{ color = "000000" }, -/mob/living/simple_animal/hostile/raider/sulphite{ - faction = list("raider") - }, +/mob/living/simple_animal/hostile/raider/sulphite, /turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, /area/f13/ambientlighting/building/j) "hqa" = ( @@ -24085,6 +24345,10 @@ icon_state = "horizontaloutermain0" }, /area/f13/brotherhood/surface) +"hql" = ( +/obj/structure/sign/flag_texas, +/turf/closed/wall/f13/wood/interior, +/area/f13/wasteland) "hqn" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, @@ -24262,6 +24526,10 @@ /obj/structure/table/reinforced, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"hsD" = ( +/obj/item/pickaxe, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "hsI" = ( /obj/structure/table/reinforced, /obj/effect/decal/fakelattice, @@ -24314,6 +24582,12 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"hta" = ( +/obj/machinery/door/unpowered/celldoor{ + req_access_txt = "121" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "hti" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -24322,7 +24596,9 @@ /area/f13/wasteland/town) "htm" = ( /obj/structure/junk/machinery, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "htB" = ( /obj/machinery/light/small{ @@ -24349,8 +24625,17 @@ dir = 4 }, /mob/living/simple_animal/hostile/supermutant/rangedmutant, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) +"htS" = ( +/obj/structure/fence/post{ + pixel_y = -18; + pixel_x = 16 + }, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "htY" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -24359,6 +24644,12 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"huh" = ( +/obj/item/blacksmith/chain{ + pixel_x = -8 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "huj" = ( /obj/structure/flora/tree/cactus_alt, /turf/open/indestructible/ground/outside/dirt{ @@ -24451,7 +24742,9 @@ /area/f13/building/abandoned/h) "hvq" = ( /obj/effect/decal/cleanable/oil, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/bunker) "hvs" = ( /obj/structure/flora/tree/wasteland, @@ -24567,7 +24860,9 @@ "hwU" = ( /obj/structure/table, /obj/item/binoculars, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "hwW" = ( /turf/open/indestructible/ground/outside/desert{ @@ -24587,14 +24882,10 @@ "hxj" = ( /obj/structure/wreck/trash/machinepiletwo, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/caves) -"hxl" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" }, -/area/f13/ambientlighting/building/g) +/area/f13/caves) "hxr" = ( /turf/open/indestructible/ground/outside/road{ dir = 1; @@ -25068,8 +25359,18 @@ /obj/structure/table, /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) +"hDz" = ( +/obj/item/kirbyplants{ + icon_state = "plant-12"; + pixel_y = 21; + pixel_x = -14 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/wasteland) "hDC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/darkbrown, @@ -25314,7 +25615,6 @@ "hHf" = ( /obj/structure/flora/tree/tall, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -25650,16 +25950,6 @@ icon_state = "redrustyfull" }, /area/f13/building/abandoned/t) -"hMe" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6; - icon_state = "snow_corner" - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "hMh" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/sidewalk{ @@ -25713,10 +26003,7 @@ dir = 8; light_color = "#ff4747" }, -/obj/structure/fluff/rug/rug_rubber{ - icon = 'icons/fallout/objects/64x64_rugs.dmi'; - layer = 2.7 - }, +/obj/structure/fluff/rug/rug_rubber, /turf/open/floor/f13/wood{ icon_state = "oakfloor1" }, @@ -25781,6 +26068,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"hOl" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerborder" + }, +/area/f13/wasteland) "hOB" = ( /obj/structure/closet/fridge/meat, /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, @@ -26072,7 +26366,9 @@ /obj/structure/table/abductor, /obj/item/storage/backpack/duffelbag/syndie/surgery_adv, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "hSf" = ( /obj/effect/turf_decal/weather/dirt{ @@ -26345,6 +26641,10 @@ icon_state = "dirt" }, /area/f13/building/tribal) +"hWF" = ( +/obj/item/trash/f13/c_ration_1, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "hWJ" = ( /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/w) @@ -26489,14 +26789,6 @@ }, /turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) -"hZE" = ( -/obj/structure/reagent_dispensers/barrel/dangerous, -/obj/structure/reagent_dispensers/barrel/dangerous, -/turf/open/indestructible/ground/outside/dirt{ - icon_state = "dirt"; - dir = 6 - }, -/area/f13/wasteland) "hZG" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -26881,7 +27173,9 @@ /area/f13/wasteland) "ifx" = ( /obj/structure/bed/double, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "ifN" = ( /obj/structure/barricade/sandbags, @@ -27110,7 +27404,9 @@ /obj/effect/turf_decal/weather/dirt{ dir = 8 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/abandoned/t) "iiM" = ( /obj/structure/fence/corner/wooden, @@ -27495,10 +27791,6 @@ icon_state = "rubblepillar" }, /area/f13/ambientlighting/building/t) -"ioR" = ( -/mob/living/simple_animal/hostile/radscorpion, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) "ioY" = ( /obj/machinery/door/poddoor/gate{ id = "Workshop"; @@ -27519,6 +27811,12 @@ icon_state = "dirt" }, /area/f13/wasteland) +"iph" = ( +/obj/machinery/computer/operating, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "ipk" = ( /obj/structure/fluff/fokoff_sign, /turf/open/indestructible/ground/outside/dirt{ @@ -27632,12 +27930,6 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) -"irI" = ( -/obj/structure/closet/cabinet/anchored, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/f13/armor/tier1, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) "irJ" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "innermaincornerinner" @@ -27880,9 +28172,18 @@ }, /turf/open/floor/plating/dirt, /area/f13/ambientlighting/building/j) +"ivO" = ( +/obj/structure/sign/poster/ncr/keep_to_myself{ + desc = "The man. The myth. The unknown NCR Corporal who's photo was taken years ago and is still used today in various NCR camps to encourage proper behavior."; + name = "Satisfactory NCR Poster" + }, +/turf/closed/wall/f13/wood/interior, +/area/f13/wasteland) "ivQ" = ( /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/bunker) "ivV" = ( /obj/structure/rack, @@ -27975,6 +28276,12 @@ /obj/structure/sign/legion/smithy, /turf/closed/wall/f13/wood/house/broken, /area/f13/legioncamp) +"ixI" = ( +/obj/structure/railing/handrail/rusty, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "ixK" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 9 @@ -28183,6 +28490,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/t) +"iBf" = ( +/obj/structure/chair/sofa/left{ + dir = 8 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "iBg" = ( /obj/structure/obstacle/barbedwire, /turf/open/indestructible/ground/outside/road, @@ -28359,6 +28672,13 @@ name = "dirty floor" }, /area/f13/building/powered) +"iDN" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/start/f13/ncrmedofficer, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "iDS" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -28756,6 +29076,14 @@ }, /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/z) +"iKG" = ( +/obj/structure/cargocrate{ + icon_state = "cargocrate2" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "iKJ" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -28963,6 +29291,10 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"iNl" = ( +/obj/structure/table/wood/junk, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "iNn" = ( /obj/structure/rack, /obj/item/clothing/suit/pirate, @@ -29084,9 +29416,7 @@ dir = 1; pixel_y = 17 }, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "iQa" = ( @@ -29153,12 +29483,6 @@ /obj/machinery/light, /turf/open/floor/wood_common, /area/f13/building/abandoned/x) -"iRq" = ( -/turf/open/indestructible/ground/outside/dirt{ - dir = 2; - icon_state = "dirt" - }, -/area/f13/wasteland/legion) "iRw" = ( /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/inside/dirt, @@ -29233,17 +29557,6 @@ }, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) -"iSP" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_6"; - pixel_x = -11; - pixel_y = 11 - }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 8; - icon_state = "dirtcorner" - }, -/area/f13/wasteland) "iST" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood, @@ -29371,15 +29684,6 @@ /obj/effect/decal/fakelattice, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) -"iVA" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "iVU" = ( /obj/structure/chair/bench{ dir = 4; @@ -29457,7 +29761,9 @@ /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, /obj/machinery/light/fo13colored/Red, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "iWX" = ( /obj/effect/decal/cleanable/dirt, @@ -29585,6 +29891,15 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"iZh" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 26; + pixel_x = -18 + }, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "iZj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/twig4, @@ -29692,6 +30007,12 @@ /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plating/rust, /area/f13/building/powered) +"jak" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "jat" = ( /obj/item/storage/trash_stack{ icon_state = "Junk_9"; @@ -29700,6 +30021,11 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"jau" = ( +/obj/structure/table/wood/junk, +/obj/item/pen/fourcolor, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "jaM" = ( /obj/structure/chair{ dir = 8 @@ -30074,6 +30400,12 @@ icon_state = "wasteland33" }, /area/f13/ambientlighting/building/f) +"jgy" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerborder" + }, +/area/f13/wasteland) "jgP" = ( /turf/closed/wall/r_wall/rust, /area/f13/wasteland) @@ -30120,16 +30452,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"jhP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/effect/landmark/questing/item{ - location_description = "in that apartment complex on the west side of the valley." - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "jhX" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -30517,11 +30839,6 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"jnj" = ( -/obj/structure/closet/cabinet/anchored, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/holofloor/carpet, -/area/f13/ambientlighting/building/g) "jns" = ( /obj/structure/curtain{ color = "#c40e0e" @@ -30617,8 +30934,12 @@ "jph" = ( /obj/structure/wreck/trash/bus_door, /obj/item/flag/followers, -/turf/open/indestructible/ground/outside/grass/dirtpath{ - dir = 2 +/turf/open/indestructible/ground/outside/grass/dirtpath, +/area/f13/wasteland) +"jpl" = ( +/obj/structure/wreck/bus/rusted, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" }, /area/f13/wasteland) "jpq" = ( @@ -30935,6 +31256,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"juE" = ( +/obj/structure/chair/stool/retro/black, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "juM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -30960,6 +31285,12 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) +"juY" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/fakelattice, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "jvc" = ( /obj/structure/fence{ dir = 1 @@ -31086,6 +31417,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/royalblack, /area/f13/ambientlighting/building/w) +"jwS" = ( +/obj/structure/closet/locker, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "jxc" = ( /obj/structure/window/fulltile/wood, /obj/structure/curtain{ @@ -31106,6 +31441,13 @@ /obj/effect/spawner/lootdrop/trash, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"jxg" = ( +/obj/machinery/photocopier, +/obj/structure/decoration/clock{ + pixel_y = 27 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "jxh" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -31179,6 +31521,15 @@ icon_state = "common_dark-broken5" }, /area/f13/building/abandoned/n) +"jyb" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_y = -1; + pixel_x = -2 + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "jyd" = ( /turf/open/floor/f13{ color = "#d9c4b9"; @@ -31318,6 +31669,10 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +"jAn" = ( +/obj/structure/closet/crate/footlocker, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "jAp" = ( /obj/structure/decoration/hatch{ dir = 4 @@ -31478,15 +31833,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/basalt/wasteland, /area/f13/building/abandoned/g) -"jCz" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "jCC" = ( /obj/structure/table/wood, /turf/open/floor/plasteel/f13/stone/rugged, @@ -31573,6 +31919,14 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +"jEq" = ( +/obj/machinery/door/poddoor/gate/bunker{ + id = 983 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "jEr" = ( /obj/structure/table/wood, /obj/item/storage/box/cups, @@ -31728,6 +32082,14 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/j) +"jGT" = ( +/obj/effect/turf_decal/big{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "jHe" = ( /obj/structure/simple_door/wood, /turf/open/floor/wood_wide, @@ -31781,14 +32143,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/f13/ambientlighting/building/q) -"jIl" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/questing/item{ - location_description = "in that apartment complex on the west side of the valley." - }, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) "jIx" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -31857,6 +32211,13 @@ icon_state = "dark" }, /area/f13/brotherhood) +"jJE" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress1"; + pixel_y = 9 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "jJG" = ( /obj/structure/barricade/wooden, /turf/closed/wall/f13/wood/house/broken, @@ -31929,7 +32290,9 @@ /area/f13/wasteland) "jLb" = ( /obj/effect/spawner/lootdrop/trash, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "jLe" = ( /obj/effect/decal/remains/human, @@ -32085,9 +32448,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 4 }, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "jOt" = ( @@ -32137,6 +32498,13 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +"jPb" = ( +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "jPj" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/road{ @@ -32145,9 +32513,7 @@ /area/f13/wasteland) "jPt" = ( /obj/effect/overlay/desert_side, -/obj/structure/destructible/tribal_torch/wall{ - dir = 2 - }, +/obj/structure/destructible/tribal_torch/wall, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) "jPD" = ( @@ -32203,7 +32569,9 @@ icon_state = "floor6-old" }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "jQw" = ( /turf/open/indestructible/ground/outside/sidewalk{ @@ -32330,6 +32698,10 @@ /obj/structure/obstacle/barbedwire/end, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +"jRD" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "jRR" = ( /obj/structure/rack, /obj/item/clothing/suit/armor/tiered/medium/combat/swat, @@ -32419,6 +32791,13 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +"jTw" = ( +/obj/structure/table/wood/junk, +/obj/item/pen/red, +/obj/item/pen/charcoal, +/obj/item/pen, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "jTC" = ( /obj/structure/table{ layer = 2.9 @@ -32573,7 +32952,9 @@ /area/f13/building/abandoned/x) "jVt" = ( /mob/living/simple_animal/hostile/supermutant/nightkin, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "jVw" = ( /obj/structure/chair/office{ @@ -32728,6 +33109,10 @@ /obj/structure/fence/wooden, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"jZl" = ( +/obj/structure/barricade/wooden/planks, +/turf/closed/wall/f13/wood/interior, +/area/f13/wasteland) "jZu" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt/dust, @@ -32786,7 +33171,9 @@ icon_state = "ruinswindowbroken" }, /obj/structure/barricade/wooden, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/abandoned/t) "kae" = ( /obj/effect/turf_decal/weather/dirt{ @@ -33072,7 +33459,9 @@ "kfh" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "kfy" = ( /obj/structure/window/reinforced/spawner/north, @@ -33272,6 +33661,15 @@ /obj/item/stack/sheet/metal/fifty, /turf/open/indestructible/ground/outside/road, /area/f13/building/abandoned/k) +"kid" = ( +/obj/structure/table/booth, +/obj/item/paper_bin, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "kie" = ( /obj/structure/chair/f13chair2, /turf/open/floor/plating/rust, @@ -33320,16 +33718,17 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/f) -"kiK" = ( -/obj/structure/simple_door/house, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) +"kiz" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/components/unary/tank, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "kiL" = ( /obj/structure/table, /obj/item/paper/fluff/awaymissions/academy/class/biology, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "kiN" = ( /obj/effect/decal/cleanable/blood/splats, @@ -33432,7 +33831,9 @@ /area/f13/building/abandoned/h) "kkk" = ( /obj/structure/simple_door/bunker, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "kky" = ( /obj/structure/obstacle/barbedwire/end, @@ -33688,7 +34089,6 @@ "kox" = ( /obj/structure/simple_door/metal/fence, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -33800,21 +34200,13 @@ /obj/structure/table/booth, /turf/open/floor/wood_common/wood_common_light, /area/maintenance/bar) -"kqG" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_6"; - pixel_x = -11; - pixel_y = 11 - }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 1; - icon_state = "dirt" - }, +"kqB" = ( +/obj/structure/filingcabinet, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/wasteland) "kqJ" = ( /obj/effect/turf_decal/weather/snow/corner{ - dir = 6; - icon_state = "snow_corner" + dir = 6 }, /obj/effect/turf_decal/weather/snow/corner{ dir = 5 @@ -33955,9 +34347,8 @@ }, /area/f13/building/powered) "ktI" = ( -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain2right" - }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "ktM" = ( /turf/open/indestructible/ground/outside/sidewalk{ @@ -33967,7 +34358,9 @@ "kua" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "kud" = ( /obj/item/flag/khan, @@ -34174,6 +34567,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"kxf" = ( +/obj/item/reagent_containers/food/drinks/soda_cans/starkist, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "kxq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -34277,6 +34674,12 @@ dir = 6 }, /area/f13/wasteland) +"kyD" = ( +/obj/item/storage/money_stack/ncr{ + pixel_x = 5 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/wasteland) "kyE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -34412,14 +34815,6 @@ /obj/item/reagent_containers/food/snacks/f13/deathclawegg, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"kBr" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain0" - }, -/area/f13/wasteland) "kBw" = ( /obj/structure/simple_door/repaired, /obj/structure/barricade/wooden/planks, @@ -34634,6 +35029,11 @@ icon_state = "horizontaloutermain0" }, /area/f13/wasteland) +"kEW" = ( +/obj/machinery/door/unpowered/secure_NCR, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/wasteland) "kEZ" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/sidewalk{ @@ -34715,6 +35115,11 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/j) +"kGR" = ( +/obj/machinery/smartfridge/bottlerack/grownbin, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "kHa" = ( /obj/structure/debris/v3, /turf/open/indestructible/ground/outside/desert, @@ -35010,8 +35415,7 @@ /area/f13/ambientlighting/building/c) "kKT" = ( /obj/structure/chair/f13chair2{ - dir = 4; - icon_state = "f13chair2" + dir = 4 }, /turf/open/floor/f13{ icon_state = "floorrusty" @@ -35120,7 +35524,6 @@ "kMv" = ( /obj/effect/overlay/fog, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -35384,14 +35787,6 @@ icon_state = "dirt" }, /area/f13/caves) -"kOQ" = ( -/obj/structure/flora/tree/cactus, -/obj/effect/decal/remains/deadeyebot, -/turf/open/indestructible/ground/outside/dirt{ - dir = 9; - icon_state = "dirt" - }, -/area/f13/wasteland) "kOT" = ( /obj/structure/toilet{ dir = 8 @@ -35485,24 +35880,10 @@ }, /area/f13/building/abandoned/h) "kQz" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) -"kQC" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/autolathe/ammo, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) "kQD" = ( /turf/open/indestructible/ground/inside/dirt, /area/f13/building/abandoned/q) @@ -35516,6 +35897,13 @@ /obj/structure/flora/tree/jungle, /turf/open/indestructible/ground/outside/grass, /area/f13/ambientlighting/building/c) +"kQP" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -3 + }, +/turf/closed/wall/f13/wood/interior, +/area/f13/wasteland) "kRb" = ( /obj/structure/frame/machine, /obj/item/stack/cable_coil/red, @@ -35763,6 +36151,12 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"kVL" = ( +/obj/item/cultivator/rake, +/obj/machinery/hydroponics/soil, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "kVM" = ( /obj/structure/reagent_dispensers/beerkeg, /obj/effect/decal/cleanable/dirt{ @@ -35952,6 +36346,10 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +"kYv" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "kYH" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -36130,12 +36528,6 @@ }, /turf/open/floor/plating/dirt/dark, /area/f13/ncr) -"lbi" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" - }, -/area/f13/ambientlighting/building/g) "lbj" = ( /obj/structure/fence/wooden{ dir = 1; @@ -36160,6 +36552,11 @@ /obj/structure/flora/twig, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"lbu" = ( +/obj/structure/rack/shelf_metal, +/obj/item/weldingtool, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "lbw" = ( /mob/living/simple_animal/hostile/raider/baseball, /turf/open/floor/wood_wide, @@ -36321,6 +36718,18 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) +"lee" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Medical" + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "leh" = ( /obj/item/mine/shrapnel{ alpha = 65 @@ -36499,11 +36908,6 @@ /obj/structure/flora/tree/oak_four, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) -"liJ" = ( -/turf/open/indestructible/ground/outside/grass/dirtpath{ - dir = 2 - }, -/area/f13/wasteland) "ljh" = ( /obj/structure/cargocrate{ icon_state = "cargocrate2" @@ -36820,7 +37224,6 @@ /obj/structure/barricade/wooden/strong, /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -37104,6 +37507,17 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"lti" = ( +/obj/structure/car/rubbish4{ + pixel_x = -20 + }, +/obj/effect/turf_decal/big{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "ltm" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -37408,11 +37822,6 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ncr) -"lxY" = ( -/obj/structure/junk/small/bed, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/green, -/area/f13/ambientlighting/building/g) "lyg" = ( /obj/item/reagent_containers/glass/bucket, /turf/open/indestructible/ground/outside/dirt, @@ -37563,15 +37972,33 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"lAy" = ( +/obj/structure/table, +/obj/item/paper_bin, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/wasteland) "lAH" = ( /obj/structure/flora/grass/brown, /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/snow, /area/f13/wasteland) +"lAJ" = ( +/obj/structure/car/rubbish1, +/obj/effect/turf_decal/big{ + dir = 8 + }, +/obj/effect/decal/cleanable/oil{ + icon_state = "floor6"; + pixel_y = 9; + pixel_x = -10 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "lAR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fluff/rug/rug_rubber{ - icon = 'icons/fallout/objects/64x64_rugs.dmi'; icon_state = "rug_fancy" }, /turf/open/floor/wood_common/wood_common_dark, @@ -37735,12 +38162,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) -"lCN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "lCR" = ( /turf/open/floor/f13{ icon_state = "whitegreenrustychess" @@ -37816,6 +38237,11 @@ icon_state = "redmark" }, /area/f13/building/abandoned/t) +"lEm" = ( +/obj/structure/gallow, +/obj/structure/table/booth, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "lED" = ( /obj/structure/flora/grass/wasteland, /turf/closed/indestructible/f13/obsidian, @@ -37879,6 +38305,11 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/w) +"lFC" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/components/unary/tank/bz, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "lFD" = ( /obj/structure/decoration/rag, /obj/structure/decoration/rag{ @@ -38051,13 +38482,21 @@ icon_state = "bar" }, /area/f13/building/abandoned/j) +"lJf" = ( +/obj/structure/sign/parking, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) "lJh" = ( /obj/structure/ladder/unbreakable{ height = 2; id = "roboticdung"; level = 1 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "lJl" = ( /obj/effect/decal/marking{ @@ -38069,7 +38508,9 @@ /obj/structure/table, /obj/item/paper/crumpled/bloody, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "lJC" = ( /obj/structure/rack, @@ -38175,6 +38616,12 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ncr) +"lKQ" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "lKW" = ( /mob/living/simple_animal/hostile/supermutant/nightkin/elitemutant, /turf/open/floor/f13{ @@ -38230,7 +38677,9 @@ /obj/effect/turf_decal/weather/dirt{ dir = 5 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "lLG" = ( /obj/effect/decal/cleanable/dirt, @@ -38256,9 +38705,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "lLY" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /obj/structure/simple_door/metal/fence{ dir = 8 }, @@ -38772,7 +39219,9 @@ /area/f13/building/powered) "lUk" = ( /obj/machinery/chem_heater, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "lUn" = ( /obj/effect/decal/remains/deadeyebot, @@ -38880,6 +39329,10 @@ /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"lWz" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "lWM" = ( /obj/machinery/vending/engineering, /turf/open/floor/f13{ @@ -39126,6 +39579,10 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +"mbj" = ( +/obj/item/trash/f13/c_ration_2, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "mbn" = ( /obj/structure/wreck/trash/brokenvendor, /turf/open/floor/plating/rust, @@ -39524,7 +39981,9 @@ "mgc" = ( /obj/structure/simple_door/bunker, /obj/machinery/door/poddoor/shutters/radiation/preopen, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "mgj" = ( /obj/structure/table, @@ -39542,6 +40001,14 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/building/abandoned/q) +"mgt" = ( +/obj/effect/landmark/start/f13/ncrlieutenant, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) +"mgD" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_common, +/area/f13/wasteland) "mgO" = ( /obj/structure/fence/wooden{ dir = 1 @@ -39712,7 +40179,9 @@ /obj/effect/decal/remains{ icon_state = "remains" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "mjT" = ( /obj/effect/decal/cleanable/dirt, @@ -39774,6 +40243,12 @@ icon_state = "verticaloutermain0" }, /area/f13/followers) +"mlH" = ( +/obj/effect/spawner/structure/window/reinforced/indestructable, +/obj/structure/table, +/obj/structure/barricade/bars, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/wasteland) "mlV" = ( /obj/structure/reagent_dispensers/barrel/four, /turf/open/indestructible/ground/outside/grass/dirtpath{ @@ -39935,16 +40410,6 @@ icon_state = "greenrustyfull" }, /area/f13/ambientlighting/building/o) -"mnv" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/landmark/questing/item{ - location_description = "in that apartment complex on the west side of the valley." - }, -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" - }, -/area/f13/ambientlighting/building/g) "mnA" = ( /obj/machinery/light/fo13colored/Red{ dir = 4 @@ -40010,15 +40475,6 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/g) -"mnX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "mox" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/advcrafting, @@ -40143,6 +40599,13 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"mra" = ( +/obj/machinery/button/door{ + id = 984; + pixel_x = 27 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/wasteland) "mri" = ( /obj/machinery/light, /obj/effect/decal/cleanable/dirt/dust, @@ -40319,13 +40782,6 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"mur" = ( -/obj/effect/decal/remains/human/grave, -/turf/open/indestructible/ground/outside/dirt{ - dir = 4; - icon_state = "dirtcorner" - }, -/area/f13/wasteland) "muv" = ( /obj/effect/overlay/desert_side{ dir = 4 @@ -40467,15 +40923,6 @@ /obj/item/trash/f13/electronic/toaster, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) -"mwT" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_4"; - layer = 6 - }, -/turf/open/indestructible/ground/outside/desert{ - icon_state = "wasteland33" - }, -/area/f13/wasteland) "mxg" = ( /obj/structure/chair/wood{ dir = 8 @@ -40816,6 +41263,17 @@ icon_state = "bluedirtychess2" }, /area/f13/brotherhood) +"mBX" = ( +/obj/structure/fence/post{ + pixel_y = -18; + pixel_x = 16; + desc = "An iron support beam."; + name = "iron stanchion" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "mCa" = ( /obj/structure/table/wood/settler, /turf/open/indestructible/ground/outside/sidewalk{ @@ -41253,7 +41711,9 @@ /obj/machinery/workbench/forge{ pixel_x = 4 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/ncr) "mGY" = ( /obj/machinery/light/small, @@ -41299,6 +41759,10 @@ /obj/machinery/light/lampost, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/town) +"mHY" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/wasteland) "mIa" = ( /obj/structure/fence{ dir = 4 @@ -41424,6 +41888,9 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +"mLi" = ( +/turf/open/floor/plating/f13/inside/gravel/corner, +/area/f13/wasteland) "mLy" = ( /mob/living/simple_animal/hostile/ghoul, /turf/open/indestructible/ground/inside/mountain, @@ -41513,9 +41980,7 @@ /turf/closed/wall/f13/ruins, /area/f13/wasteland/town) "mNO" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/dirt{ dir = 1; icon_state = "dirtcorner" @@ -41584,9 +42049,7 @@ /obj/structure/fence/corner/wooden{ dir = 8 }, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/dirt{ dir = 4; icon_state = "dirt" @@ -41751,9 +42214,7 @@ }, /area/f13/building/abandoned/h) "mRx" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "mRy" = ( @@ -41781,6 +42242,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"mSa" = ( +/obj/structure/rack/shelf_metal, +/obj/item/salvage/low, +/obj/item/salvage/low, +/obj/item/salvage/low, +/obj/item/salvage/high, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "mSw" = ( /obj/effect/decal/marking{ pixel_x = -14 @@ -41797,6 +42266,10 @@ /obj/machinery/light/small, /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) +"mSP" = ( +/obj/item/trash/energybar, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "mSY" = ( /obj/structure/railing{ dir = 6; @@ -42044,14 +42517,18 @@ /obj/structure/fence/corner/wooden, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"mVy" = ( +/obj/structure/chair/wood/wings{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "mVz" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) "mVD" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ dir = 1 }, @@ -42079,6 +42556,12 @@ /obj/effect/spawner/lootdrop/ammo/civilian, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/p) +"mVY" = ( +/obj/structure/railing/handrail/rusty, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "mWg" = ( /obj/structure/car/rubbish2, /turf/open/indestructible/ground/outside/road{ @@ -42501,6 +42984,11 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"ndc" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/item/defibrillator/primitive, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "ndk" = ( /obj/effect/overlay/desert/sonora/edge, /turf/closed/wall/f13/tunnel, @@ -42569,6 +43057,9 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"ned" = ( +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "nei" = ( /obj/structure/campfire/barrel, /obj/effect/decal/cleanable/dirt, @@ -42662,6 +43153,10 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +"nfC" = ( +/obj/structure/window/fulltile/house, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "nfD" = ( /obj/machinery/door/unpowered/securedoor{ req_one_access_txt = "136" @@ -42812,7 +43307,6 @@ icon_state = "trash_2" }, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland/legion) @@ -42870,6 +43364,14 @@ /obj/structure/stairs/east, /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) +"niz" = ( +/obj/structure/table/booth, +/obj/structure/curtain, +/obj/machinery/reagentgrinder, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "niA" = ( /obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/outside/road{ @@ -43018,9 +43520,7 @@ }, /area/f13/building/abandoned/j) "nkz" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /obj/structure/flora/ausbushes/grassybush, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) @@ -43403,10 +43903,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) -"nqu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/holofloor/carpet, -/area/f13/ambientlighting/building/g) "nqv" = ( /obj/structure/obstacle/barbedwire/end{ dir = 8 @@ -43767,25 +44263,30 @@ icon_state = "whitedirtysolid" }, /area/f13/followers) +"nwb" = ( +/obj/structure/sign/poster/ncr/keep_to_myself{ + desc = "The man. The myth. The unknown NCR Corporal who's photo was taken years ago and is still used today in various NCR camps to encourage proper behavior."; + name = "Satisfactory NCR Poster" + }, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "nwc" = ( /obj/structure/simple_door/bunker, /turf/open/floor/f13{ icon_state = "dark" }, /area/f13/ambientlighting/building/o) -"nwj" = ( -/obj/structure/obstacle/barbedwire/end{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 2; - icon_state = "dirt" - }, -/area/f13/wasteland) "nwr" = ( /obj/structure/sign/directions/engineering, /turf/closed/wall/mineral/concrete, /area/engine/workshop) +"nwz" = ( +/obj/item/reagent_containers/glass/rag/towel, +/obj/effect/landmark/start/f13/ncroffduty, +/obj/effect/landmark/start/f13/ncroffduty, +/obj/effect/landmark/start/f13/ncroffduty, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "nwJ" = ( /obj/structure/simple_door/house, /turf/open/floor/f13{ @@ -43963,13 +44464,6 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/j) -"nzI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "nzO" = ( /obj/item/stack/sheet/mineral/wood/twenty{ pixel_y = 7 @@ -43997,6 +44491,16 @@ icon_state = "bluerustysolid" }, /area/f13/ambientlighting/building/o) +"nAb" = ( +/obj/structure/cargocrate, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) +"nAd" = ( +/obj/structure/wreck/trash/brokenvendor, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "nAe" = ( /obj/structure/stairs/east, /turf/open/floor/plating/rust, @@ -44212,12 +44716,6 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/f13/tentwall, /area/f13/building/tribal) -"nDk" = ( -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gibmid1" - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) "nDn" = ( /obj/effect/landmark/questing/people{ location_description = "You'll find 'em on the far west side of the valley, in that raider camp with the turrets outside." @@ -44238,6 +44736,13 @@ icon_state = "dirt" }, /area/f13/wasteland) +"nDB" = ( +/obj/effect/decal/cleanable/oil{ + icon_state = "floor5" + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "nDE" = ( /obj/machinery/door/unpowered/securedoor{ req_one_access_txt = "136" @@ -45019,6 +45524,22 @@ icon_state = "verticalleftborderleft0" }, /area/f13/building/lower_firetower) +"nQa" = ( +/obj/structure/closet/anchored, +/obj/item/clothing/shoes/f13/brownie, +/obj/item/clothing/shoes/f13/brownie, +/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/item/clothing/shoes/f13/brownie, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "nQe" = ( /obj/structure/decoration/rag{ icon_state = "skin" @@ -45117,6 +45638,11 @@ /obj/structure/window/fulltile/ruins, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/r) +"nSc" = ( +/turf/open/floor/plating/f13/inside/gravel/edge{ + dir = 6 + }, +/area/f13/wasteland) "nSh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/old, @@ -45178,6 +45704,11 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"nTw" = ( +/obj/structure/rack/shelf_metal, +/obj/item/salvage/tool, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "nTy" = ( /obj/structure/cable{ icon_state = "1-2" @@ -45198,9 +45729,7 @@ }, /area/f13/ambientlighting/building/q) "nTU" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ dir = 4 }, @@ -45250,6 +45779,11 @@ /obj/effect/mob_spawn/human/corpse/raider/baseball, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"nUt" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "nUC" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, @@ -45285,6 +45819,10 @@ /obj/item/wallframe/apc/fusebox, /turf/open/floor/plating/f13/outside/road, /area/f13/ambientlighting/building/w) +"nVA" = ( +/obj/structure/barricade/bars, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "nVD" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowbroken" @@ -45891,6 +46429,15 @@ /obj/structure/simple_door/wood, /turf/open/floor/plating/dirt/dark, /area/f13/building/abandoned/g) +"ofe" = ( +/obj/structure/fence/post{ + pixel_y = 14; + pixel_x = -16; + desc = "An iron support beam."; + name = "iron stanchion" + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "ofg" = ( /obj/structure/flora/brushwoodalt, /turf/open/indestructible/ground/outside/snow{ @@ -46073,16 +46620,6 @@ /obj/structure/dresser, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) -"oit" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/port_gen/pacman/diesel, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "oiv" = ( /obj/structure/flora/grass/jungle/b, /turf/open/indestructible/ground/outside/savannah, @@ -46473,12 +47010,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) -"onJ" = ( -/obj/structure/closet/cabinet/anchored, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/f13/armor/tier1, -/turf/open/floor/carpet/green, -/area/f13/ambientlighting/building/g) "onN" = ( /obj/structure/table/reinforced, /obj/item/flashlight/seclite, @@ -46524,6 +47055,16 @@ /obj/item/clothing/under/misc/bathrobe, /turf/open/floor/plasteel/vaporwave, /area/maintenance/bar) +"oos" = ( +/obj/structure/barricade/bars, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "oot" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/ghoul/legendary, @@ -46724,20 +47265,6 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"osc" = ( -/obj/structure/reagent_dispensers/barrel/four, -/obj/item/bottlecap_mine{ - pixel_x = 10; - pixel_y = 16 - }, -/obj/item/bottlecap_mine{ - pixel_y = 15 - }, -/turf/open/indestructible/ground/outside/dirt{ - icon_state = "dirt"; - dir = 4 - }, -/area/f13/wasteland) "ose" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -46887,14 +47414,6 @@ /obj/effect/validball_spawner, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) -"ovf" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/effect/spawner/lootdrop/ammo/fiftypercent, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "ovp" = ( /obj/machinery/door/poddoor/shutters{ id = "hospitalgarage1"; @@ -46954,6 +47473,15 @@ /obj/effect/mob_spawn/human/corpse, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"owH" = ( +/obj/structure/table/optable, +/obj/machinery/defibrillator_mount/loaded{ + pixel_x = -28 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "owK" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowbroken" @@ -46997,15 +47525,6 @@ icon_state = "bluedirtychess2" }, /area/f13/followers) -"oxz" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_6" - }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 2; - icon_state = "dirt" - }, -/area/f13/wasteland) "oxC" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 6 @@ -47080,7 +47599,6 @@ dir = 4 }, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -47097,6 +47615,10 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"ozi" = ( +/obj/effect/turf_decal/caution, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "ozn" = ( /mob/living/simple_animal/hostile/handy/gutsy, /obj/machinery/light, @@ -47179,7 +47701,9 @@ "oAs" = ( /obj/machinery/computer/operating, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "oAt" = ( /obj/structure/barricade/wooden/strong, @@ -47429,7 +47953,9 @@ /area/f13/tunnel/northeast) "oEK" = ( /obj/structure/wreck/trash/machinepile, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "oEL" = ( /obj/structure/flora/junglebush, @@ -47730,6 +48256,10 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/a) +"oJp" = ( +/obj/item/trash/f13/mre, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "oJA" = ( /obj/structure/decoration/clock{ pixel_y = 21 @@ -47770,6 +48300,16 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"oKo" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress2"; + pixel_y = 7 + }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "oKp" = ( /mob/living/simple_animal/hostile/handy, /turf/open/floor/f13/wood{ @@ -47845,13 +48385,6 @@ icon_state = "common_dark-broken5" }, /area/f13/ncr) -"oLh" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "oLl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -48016,15 +48549,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"oNu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" - }, -/area/f13/ambientlighting/building/g) "oNy" = ( /obj/structure/fence/wooden{ dir = 1 @@ -48074,6 +48598,11 @@ name = "dirty floor" }, /area/f13/building/powered) +"oNG" = ( +/obj/structure/table/wood/junk, +/obj/item/laser_pointer, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "oNJ" = ( /obj/item/storage/toolbox/mechanical, /obj/structure/rack/large/shelf, @@ -48247,7 +48776,9 @@ /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/armor/tier4, /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/superlow, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "oPT" = ( /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, @@ -48329,7 +48860,6 @@ "oQL" = ( /obj/structure/flora/grass/wasteland, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -48384,7 +48914,6 @@ "oRR" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/building/tribal) @@ -48480,6 +49009,10 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"oTO" = ( +/obj/structure/bedsheetbin/empty, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "oTP" = ( /obj/structure/simple_door/glass, /turf/open/floor/wood_common, @@ -48581,10 +49114,6 @@ /obj/structure/barricade/wooden, /turf/closed/wall/f13/wood/house, /area/f13/wasteland) -"oVp" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) "oVP" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 8; @@ -48635,7 +49164,6 @@ "oWq" = ( /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/underground/cave) @@ -48803,7 +49331,9 @@ }, /area/f13/brotherhood) "oZf" = ( -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "oZi" = ( /obj/structure/table, @@ -48902,6 +49432,12 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"paK" = ( +/obj/structure/decoration/clock{ + pixel_y = 27 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "paL" = ( /obj/structure/decoration/clock/old, /turf/closed/wall/f13/store, @@ -49011,12 +49547,6 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/sidewalkdirt, /area/f13/wasteland/followers) -"pcx" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/open/indestructible/ground/outside/dirt{ - icon_state = "dirtcorner" - }, -/area/f13/wasteland) "pcH" = ( /obj/structure/flora/grass/brown{ pixel_y = 11 @@ -49366,6 +49896,13 @@ /obj/structure/pondlily_small, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +"piZ" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "car_rubish1" + }, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) "pja" = ( /obj/structure/sink/greyscale{ dir = 1 @@ -49406,6 +49943,14 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/t) +"pjo" = ( +/obj/machinery/door/unpowered/secure_NCR{ + color = "#e8e4ca"; + name = "Captain's Lodge" + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "pju" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3, @@ -49728,9 +50273,7 @@ }, /area/f13/wasteland) "por" = ( -/obj/structure/destructible/tribal_torch/wall{ - dir = 2 - }, +/obj/structure/destructible/tribal_torch/wall, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "pot" = ( @@ -49748,7 +50291,9 @@ "ppb" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier1, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "ppg" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -50033,24 +50578,12 @@ }, /area/f13/wasteland) "pta" = ( -/mob/living/simple_animal/hostile/raider/sulphite{ - faction = list("raider") - }, +/mob/living/simple_animal/hostile/raider/sulphite, /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ icon_state = "housewood2" }, /area/f13/building/abandoned/a) -"ptb" = ( -/obj/structure/fence{ - dir = 8; - icon_state = "straight" - }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 1; - icon_state = "dirt" - }, -/area/f13/wasteland) "ptd" = ( /obj/structure/nest/gecko, /turf/open/indestructible/ground/outside/dirt, @@ -50059,6 +50592,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road, /area/f13/ambientlighting/building/o) +"pty" = ( +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "ptA" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -50204,11 +50741,6 @@ /obj/structure/wreck/trash/machinepiletwo, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) -"pvt" = ( -/obj/structure/bed/old, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/holofloor/carpet, -/area/f13/ambientlighting/building/g) "pvy" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -50325,22 +50857,21 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) -"pxK" = ( -/obj/machinery/shower{ - pixel_y = 16 - }, -/obj/structure/curtain, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "pxT" = ( /obj/structure/flora/brushwood{ pixel_x = 14 }, /turf/open/indestructible/ground/outside/snow, /area/f13/wasteland) +"pxU" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/closed/mineral/random, +/area/f13/wasteland) "pyb" = ( /obj/structure/wreck/trash/engine, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -50428,12 +50959,6 @@ /obj/effect/decal/cleanable/glass, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ambientlighting/building/x) -"pzj" = ( -/obj/structure/flora/tree/cactus, -/turf/open/indestructible/ground/outside/dirt{ - icon_state = "dirt" - }, -/area/f13/wasteland) "pzp" = ( /turf/closed/indestructible/rock{ desc = "A pre-War wall made of solid concrete."; @@ -50476,7 +51001,6 @@ icon_state = "car_rubish2" }, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -50524,8 +51048,7 @@ dir = 6 }, /obj/effect/turf_decal/weather/snow/corner{ - dir = 1; - icon_state = "snow_corner" + dir = 1 }, /turf/open/indestructible/ground/outside/snow{ icon_state = "snow_dug" @@ -50554,6 +51077,12 @@ }, /turf/closed/wall/f13/tentwall, /area/f13/building/tribal) +"pBE" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "pBN" = ( /obj/structure/simple_door/tentflap_cloth{ pixel_y = -5 @@ -50578,6 +51107,10 @@ /mob/living/simple_animal/hostile/centaur/strong, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"pCk" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "pCo" = ( /turf/closed/wall/f13/ruins, /area/f13/wasteland/town) @@ -50639,6 +51172,12 @@ /obj/structure/table/reinforced, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"pDU" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) "pDV" = ( /obj/structure/window/fulltile/wood, /obj/structure/curtain{ @@ -50658,6 +51197,10 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/a) +"pEl" = ( +/obj/structure/sign/poster/prewar/protectron, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "pEu" = ( /turf/closed/wall/f13/wood, /area/f13/building/abandoned/x) @@ -50791,6 +51334,16 @@ }, /turf/open/indestructible/ground/outside/snow, /area/f13/wasteland) +"pFU" = ( +/obj/structure/table, +/obj/item/storage/box/ration, +/obj/item/storage/box/ration, +/obj/item/storage/box/ration, +/obj/item/storage/box/ration, +/obj/item/storage/box/ration, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "pFV" = ( /obj/structure/flora/ausbushes/reedbush, /turf/open/indestructible/ground/outside/dirt, @@ -50840,6 +51393,11 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"pHg" = ( +/obj/structure/fluff/hedge, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "pHr" = ( /obj/structure/reagent_dispensers/barrel/explosive, /obj/effect/decal/cleanable/oil/streak, @@ -51142,7 +51700,6 @@ /area/f13/building/abandoned/l) "pKR" = ( /obj/structure/nest/ghoul{ - max_mobs = 2; radius = 5 }, /turf/open/indestructible/ground/outside/dirt, @@ -51481,6 +52038,12 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/f) +"pPz" = ( +/obj/structure/rack/shelf_metal, +/obj/item/salvage/high, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "pPC" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/raider/baseball, @@ -51613,7 +52176,9 @@ "pSO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/debris/v3, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "pSQ" = ( /obj/effect/decal/cleanable/dirt, @@ -51759,6 +52324,11 @@ /obj/effect/gibspawner/human, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"pUW" = ( +/obj/structure/rack/large/shelf_rust, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "pVa" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /obj/structure/chair/wood{ @@ -51777,13 +52347,6 @@ /obj/item/reagent_containers/pill/patch/jet, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) -"pVG" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "pVI" = ( /obj/item/storage/trash_stack{ icon_state = "Junk_3" @@ -51883,7 +52446,6 @@ "pWD" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -51927,7 +52489,9 @@ /obj/structure/table, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /obj/item/reagent_containers/glass/bottle/FEV_solution/two, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "pXt" = ( /obj/structure/closet/crate/medical, @@ -51960,6 +52524,11 @@ }, /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/j) +"pXA" = ( +/obj/machinery/door/unpowered/secure_NCR, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "pXG" = ( /obj/effect/decal/remains/human, /obj/effect/spawner/lootdrop/f13/weapon/melee/tier4, @@ -52025,7 +52594,9 @@ /area/f13/ambientlighting/building/m) "pYn" = ( /obj/structure/table, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "pYo" = ( /obj/structure/sign/poster/official/medical_green_cross{ @@ -52175,7 +52746,9 @@ /obj/item/dnainjector/paranoia{ name = "\improper DNA injector (Super Intellect)" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "qaB" = ( /turf/closed/wall/f13/wood/house, @@ -52275,6 +52848,10 @@ "qbz" = ( /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/maintenance/bar) +"qbB" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "qbT" = ( /obj/structure/wreck/trash/one_tire, /turf/open/indestructible/ground/outside/desert, @@ -52313,7 +52890,6 @@ "qcu" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/underground/cave) @@ -52481,6 +53057,13 @@ /obj/structure/simple_door/room, /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) +"qft" = ( +/obj/structure/rack/large/shelf_rust{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/toolsbasic, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "qfI" = ( /turf/open/floor/f13/wood{ icon_state = "housewood1-broken" @@ -52623,6 +53206,12 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) +"qha" = ( +/obj/structure/sign/departments/medbay/alt{ + name = "TRIAGE" + }, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "qhm" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/baconegg{ @@ -52671,6 +53260,19 @@ /obj/machinery/grill, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"qhU" = ( +/obj/structure/shelf_wood, +/obj/item/reagent_containers/hypospray/medipen/stimpak/super, +/obj/item/reagent_containers/hypospray/medipen/stimpak/super, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/defibrillator/loaded, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "qhZ" = ( /obj/machinery/door/locked/hard/maybe_trapped, /turf/open/indestructible/ground/outside/desert, @@ -53056,6 +53658,13 @@ /obj/effect/landmark/start/f13/tribal, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"qmJ" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Prison" + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "qmQ" = ( /obj/structure/fence{ dir = 1 @@ -53065,18 +53674,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) -"qmW" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "qmY" = ( /obj/structure/table, /obj/machinery/light{ @@ -53285,13 +53882,6 @@ /obj/item/stack/sheet/metal/five, /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) -"qrd" = ( -/obj/structure/fence{ - dir = 1; - icon_state = "straight" - }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) "qrf" = ( /obj/structure/simple_door/wood, /turf/open/indestructible/ground/inside/mountain, @@ -53410,10 +54000,20 @@ icon_state = "rubble" }, /area/f13/wasteland) +"qsE" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "qsG" = ( /obj/machinery/light, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/bunker) "qsN" = ( /obj/structure/simple_door/house, @@ -53464,6 +54064,13 @@ /obj/structure/table/wood/poker, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +"qtr" = ( +/obj/structure/fence/post{ + pixel_y = -18; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "qtu" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -53511,6 +54118,11 @@ /obj/structure/flora/wasteplant/wild_broc, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"quf" = ( +/turf/open/floor/plating/f13/inside/gravel/edge{ + dir = 10 + }, +/area/f13/wasteland) "quh" = ( /obj/structure/table/booth, /obj/item/candle, @@ -53612,10 +54224,13 @@ }, /area/f13/wasteland) "qwc" = ( -/obj/structure/billboard/poseidenenergy1, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 1; - icon_state = "horizontaloutermain1" +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"qwi" = ( +/obj/structure/curtain, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" }, /area/f13/wasteland) "qwl" = ( @@ -53673,6 +54288,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_common, /area/maintenance/bar) +"qxp" = ( +/obj/structure/chair/stool/retro/tan, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "qxs" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -53751,6 +54370,10 @@ /obj/machinery/light, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) +"qyA" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "qyB" = ( /obj/structure/chair/comfy, /obj/item/clothing/under/f13/bennys/gang, @@ -54185,11 +54808,17 @@ "qEv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fluff/rug/rug_rubber{ - icon = 'icons/fallout/objects/64x64_rugs.dmi'; icon_state = "rug_red" }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ncr) +"qEx" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy, +/obj/structure/barricade/bars, +/obj/effect/spawner/structure/window/reinforced/indestructable, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "qEI" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt{ @@ -54329,15 +54958,14 @@ name = "dirty floor" }, /area/f13/building/powered) +"qHg" = ( +/obj/machinery/autolathe, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/wasteland) "qHs" = ( /obj/structure/bed/dogbed, /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) -"qHt" = ( -/turf/open/floor/plasteel/stairs{ - dir = 7 - }, -/area/f13/ambientlighting/building/g) "qHu" = ( /obj/structure/flora/grass/green, /turf/open/indestructible/ground/outside/snow, @@ -54704,7 +55332,6 @@ "qOh" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -54728,9 +55355,7 @@ "qOC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc/fusebox/south, -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/q) "qOF" = ( @@ -54741,16 +55366,18 @@ icon_state = "housewood1-broken" }, /area/f13/ambientlighting/building/d) -"qOK" = ( -/obj/structure/simple_door/house, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) "qOP" = ( /obj/structure/flora/grass/jungle/b{ icon_state = "busha" }, /turf/open/indestructible/ground/outside/savannah, /area/f13/wasteland) +"qOV" = ( +/obj/structure/rack/shelf_metal, +/obj/item/salvage/low, +/obj/item/salvage/low, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "qOX" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/rank/medical/doctor/purple, @@ -54778,6 +55405,13 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/ncr) +"qOY" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_common, +/area/f13/wasteland) "qPa" = ( /turf/open/floor/carpet, /area/f13/ncr) @@ -55041,16 +55675,6 @@ icon_state = "greenrustyfull" }, /area/f13/ambientlighting/building/o) -"qTE" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ghoul, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "qTG" = ( /obj/structure/wreck/trash/halftire, /turf/open/indestructible/ground/outside/desert, @@ -55131,7 +55755,9 @@ /area/f13/building/powered) "qUI" = ( /obj/structure/rack, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "qUR" = ( /obj/structure/flora/tree/joshua, @@ -55216,10 +55842,6 @@ /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"qWc" = ( -/obj/structure/reagent_dispensers/barrel/dangerous, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) "qWh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -55256,6 +55878,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"qWz" = ( +/obj/item/cultivator/rake, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "qWB" = ( /obj/structure/tires/five, /turf/open/indestructible/ground/outside/desert, @@ -55304,7 +55930,9 @@ "qXk" = ( /obj/effect/spawner/lootdrop/f13/weapon/melee/tier3, /obj/structure/rack, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "qXn" = ( /obj/machinery/door/unpowered/secure_bos, @@ -55409,20 +56037,6 @@ icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) -"qYF" = ( -/obj/structure/barricade/wooden/strong, -/obj/structure/barricade/wooden/strong, -/obj/structure/decoration/rag{ - icon_state = "skin"; - pixel_y = 2 - }, -/obj/structure/decoration/rag{ - icon_state = "skulls"; - pixel_x = -4; - pixel_y = 2 - }, -/turf/closed/wall/f13/tentwall, -/area/f13/wasteland) "qYH" = ( /obj/structure/sign/poster/official/soft_cap_pop_art, /turf/closed/wall/f13/wood/house, @@ -55532,11 +56146,11 @@ }, /area/f13/wasteland) "raQ" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1; - icon_state = "snow_corner" +/obj/item/storage/bag/plants{ + pixel_y = 6; + pixel_x = 3 }, -/turf/open/indestructible/ground/outside/graveldirt, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "rbf" = ( /obj/structure/sign/poster/contraband/missing_gloves{ @@ -55612,6 +56226,23 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) +"rci" = ( +/obj/effect/landmark/start/f13/ncrrearechelon, +/obj/effect/landmark/start/f13/ncrrearechelon, +/obj/effect/landmark/start/f13/ncrrearechelon, +/obj/effect/landmark/start/f13/ncrtrooper, +/obj/effect/landmark/start/f13/ncrtrooper, +/obj/effect/landmark/start/f13/ncrtrooper, +/obj/effect/landmark/start/f13/ncrtrooper, +/obj/effect/landmark/start/f13/ncrtrooper, +/obj/effect/landmark/start/f13/ncrtrooper, +/obj/effect/landmark/start/f13/ncrcorporal, +/obj/effect/landmark/start/f13/ncrcorporal, +/obj/effect/landmark/start/f13/ncrcorporal, +/obj/effect/landmark/start/f13/ncrsergeant, +/obj/effect/landmark/start/f13/ncrsergeant, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "rcm" = ( /obj/structure/decoration/rag, /turf/closed/wall/f13/tentwall, @@ -55626,7 +56257,9 @@ "rcy" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/medical/vault/equipment, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "rcA" = ( /obj/structure/bed/mattress/pregame{ @@ -55683,6 +56316,11 @@ /obj/structure/flora/wasteplant/wild_coyote, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"rdi" = ( +/obj/machinery/power/apc/fusebox/west, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "rdk" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, @@ -55756,16 +56394,6 @@ icon_state = "horizontalinnermain1" }, /area/f13/casino) -"rek" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/fusebox/north, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "res" = ( /obj/structure/rack, /obj/item/seeds/poppy/broc, @@ -55845,13 +56473,11 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) -"rfr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/turf/open/floor/f13/wood{ - icon_state = "housewood3-broken" - }, -/area/f13/ambientlighting/building/g) +"rfs" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/reagent_dispensers/foamtank, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "rft" = ( /obj/machinery/iv_drip/primitive, /turf/open/floor/plasteel/f13/stone/rugged, @@ -55959,11 +56585,7 @@ }, /area/f13/wasteland) "rhc" = ( -/obj/structure/billboard/redrocket1, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 1; - icon_state = "horizontaloutermain1" - }, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland) "rhe" = ( /obj/structure/car/rubbish3, @@ -56043,16 +56665,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"rhO" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/questing/item{ - location_description = "in that apartment complex on the west side of the valley." - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) "rhR" = ( /turf/open/floor/f13/wood{ icon_state = "housewood2" @@ -56232,6 +56844,11 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"rkZ" = ( +/obj/machinery/hydroponics/soil, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "rlq" = ( /obj/machinery/computer/operating/followers, /obj/machinery/defibrillator_mount/loaded{ @@ -56337,6 +56954,14 @@ }, /turf/open/floor/wood_common, /area/f13/clinic) +"rnh" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress4"; + pixel_x = -1; + pixel_y = -1 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "rnk" = ( /obj/structure/fence/corner{ dir = 5 @@ -56608,7 +57233,9 @@ /area/f13/wasteland) "rqP" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "rqR" = ( /obj/structure/car/rubbish3{ @@ -56690,6 +57317,12 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +"rrO" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Medical" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "rrR" = ( /turf/closed/wall/mineral/concrete, /area/f13/ambientlighting/building/j) @@ -56756,7 +57389,9 @@ "rtk" = ( /obj/effect/gibspawner/human, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "rtm" = ( /obj/effect/overlay/desert/sonora/edge, @@ -56764,6 +57399,12 @@ icon_state = "common-broken2" }, /area/f13/wasteland) +"rts" = ( +/obj/structure/cargocrate, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "rtu" = ( /obj/structure/fence/end{ dir = 4 @@ -56783,7 +57424,9 @@ /obj/effect/turf_decal/weather/dirt{ dir = 4 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "rtV" = ( /obj/effect/decal/cleanable/blood/old{ @@ -56836,6 +57479,10 @@ icon_state = "dirt" }, /area/f13/wasteland/legion) +"ruJ" = ( +/obj/structure/sign/poster/official/ion_rifle, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "ruW" = ( /obj/structure/chair/wood{ dir = 8 @@ -56873,7 +57520,9 @@ }, /area/f13/brotherhood) "rvE" = ( -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "rvJ" = ( /obj/effect/decal/cleanable/dirt, @@ -56895,15 +57544,6 @@ }, /turf/open/floor/carpet/red, /area/f13/ambientlighting/building/e) -"rvV" = ( -/obj/structure/obstacle/barbedwire/end{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 2; - icon_state = "dirt" - }, -/area/f13/wasteland) "rvY" = ( /obj/item/storage/trash_stack{ icon_state = "Junk_8" @@ -56963,12 +57603,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) -"rxs" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, -/turf/open/indestructible/ground/outside/grass, -/area/f13/wasteland) "rxD" = ( /obj/structure/window/fulltile/ruins{ icon_state = "ruinswindowbrokenvertical" @@ -56998,7 +57632,9 @@ /obj/item/binoculars{ pixel_y = 8 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "rxV" = ( /turf/open/indestructible/ground/outside/sidewalk, @@ -57028,6 +57664,13 @@ }, /turf/closed/wall/f13/tentwall, /area/f13/wasteland) +"ryS" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "rzf" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -57101,6 +57744,12 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"rAg" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "rAh" = ( /obj/structure/fence/wooden{ dir = 4; @@ -57195,6 +57844,10 @@ /obj/structure/simple_door/house, /turf/open/floor/carpet, /area/f13/building/abandoned/z) +"rBR" = ( +/obj/structure/rack/large/shelf, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/wasteland) "rBY" = ( /obj/effect/turf_decal/arrows{ pixel_y = 7 @@ -57783,15 +58436,6 @@ /obj/effect/decal/fakelattice, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) -"rKE" = ( -/mob/living/simple_animal/hostile/raider/sulphite{ - faction = list("raider") - }, -/obj/effect/decal/cleanable/blood{ - icon_state = "floor6" - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) "rKG" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/inside/dirt, @@ -57839,6 +58483,11 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"rLN" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "rLQ" = ( /obj/structure/rack, /obj/item/crafting/campfirekit, @@ -57850,6 +58499,10 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"rLZ" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "rMe" = ( /obj/structure/table/wood, /obj/item/storage/backpack/duffelbag/med/surgery/primitive/anchored, @@ -58014,6 +58667,11 @@ /obj/structure/barricade/wooden, /turf/closed/wall/f13/wood/house/broken, /area/f13/legioncamp) +"rOd" = ( +/obj/structure/window/fulltile/house, +/obj/structure/barricade/wooden/planks, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "rOi" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright2bottom" @@ -58022,6 +58680,11 @@ "rOv" = ( /turf/open/floor/plating/rust, /area/f13/caves) +"rOB" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/power/smes/engineering, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "rOF" = ( /obj/structure/table/wood, /obj/item/reagent_containers/pill/healingpowder, @@ -58049,6 +58712,10 @@ icon_state = "greenrustyfull" }, /area/f13/ambientlighting/building/o) +"rOZ" = ( +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "rPl" = ( /obj/item/bedsheet{ icon_state = "sheetbrown" @@ -58172,7 +58839,6 @@ dir = 2 }, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -58307,6 +58973,11 @@ name = "dirty floor" }, /area/f13/building/powered) +"rSZ" = ( +/obj/machinery/door/unpowered/secure_NCR, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "rTf" = ( /obj/structure/rack, /turf/open/floor/f13/wood, @@ -58316,7 +58987,9 @@ /obj/machinery/light/floor, /obj/item/grenade/clusterbuster/facid, /obj/effect/spawner/lootdrop/f13/medical/surgical/blood, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "rTn" = ( /obj/structure/fence/door, @@ -58404,6 +59077,10 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/f) +"rUC" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/wasteland) "rUD" = ( /obj/machinery/door/poddoor/gate/preopen{ id = 334; @@ -58470,8 +59147,7 @@ }, /area/f13/wasteland) "rVP" = ( -/obj/structure/flora/wasteplant/wild_buffalogourd, -/turf/open/indestructible/ground/outside/desert, +/turf/open/floor/wood_common/wood_common_light, /area/f13/wasteland) "rVS" = ( /obj/structure/chair/folding, @@ -58508,7 +59184,6 @@ dir = 8 }, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -58529,9 +59204,7 @@ /obj/effect/overlay/desert_side{ dir = 4 }, -/obj/structure/destructible/tribal_torch/wall{ - dir = 2 - }, +/obj/structure/destructible/tribal_torch/wall, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) "rWK" = ( @@ -58570,6 +59243,13 @@ name = "dirty floor" }, /area/f13/building/powered) +"rXw" = ( +/obj/structure/rack/large/shelf_rust{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/tool_box, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "rXM" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/closed/wall/mineral/concrete, @@ -58889,6 +59569,16 @@ /obj/item/flashlight/seclite, /turf/open/floor/plating/rust, /area/f13/building/powered) +"sdI" = ( +/obj/structure/table, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/item/reagent_containers/medspray/sterilizine, +/obj/item/reagent_containers/medspray/sterilizine, +/obj/item/storage/firstaid/tactical, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "sdN" = ( /obj/machinery/light{ light_color = "#e8eaff" @@ -58908,6 +59598,10 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"sdS" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "sdX" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -58983,7 +59677,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 31 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/ncr) "sfg" = ( /obj/structure/decoration/vent, @@ -59083,9 +59779,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "sgx" = ( -/obj/structure/destructible/tribal_torch/wall{ - dir = 2 - }, +/obj/structure/destructible/tribal_torch/wall, /obj/effect/overlay/desert/sonora/edge{ dir = 1 }, @@ -59149,6 +59843,10 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"sht" = ( +/obj/structure/sign/poster/prewar/poster60, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "shv" = ( /obj/machinery/light/small/broken{ dir = 4 @@ -59214,7 +59912,6 @@ layer = 6 }, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -59392,6 +60089,12 @@ "slp" = ( /turf/open/floor/plating/f13/inside/gravel, /area/f13/building/abandoned/x) +"slq" = ( +/obj/structure/table/wood/junk, +/obj/item/toy/cards/deck, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "slu" = ( /turf/closed/wall/f13/wood, /area/f13/ambientlighting/building/q) @@ -59462,7 +60165,9 @@ /area/f13/wasteland) "smo" = ( /obj/machinery/rnd/experimentor, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "smq" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -59713,6 +60418,14 @@ /obj/machinery/power/apc/fusebox/north, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +"sqk" = ( +/obj/machinery/door/poddoor/gate/bunker{ + id = 982 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "sqv" = ( /turf/closed/wall/f13/store, /area/f13/wasteland) @@ -59826,6 +60539,14 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"ste" = ( +/obj/effect/turf_decal/big{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "stp" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -59971,6 +60692,10 @@ /obj/effect/decal/cleanable/oil, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"svx" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "svH" = ( /obj/effect/spawner/lootdrop/trash, /obj/effect/spawner/lootdrop/trash, @@ -60103,7 +60828,6 @@ /obj/structure/barricade/wooden/strong, /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -60175,6 +60899,13 @@ }, /turf/open/floor/plating/rust, /area/f13/wasteland) +"syx" = ( +/obj/machinery/button/door{ + pixel_y = 28; + id = 983 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "syC" = ( /obj/structure/fermenting_barrel, /turf/open/indestructible/ground/outside/desert, @@ -60299,6 +61030,11 @@ /obj/structure/reagent_dispensers/barrel/four, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +"sAQ" = ( +/obj/item/pen/fountain, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "sAV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -60404,6 +61140,24 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"sCu" = ( +/obj/machinery/smartfridge/bottlerack/gardentool/primitive, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/l4z, +/obj/item/reagent_containers/glass/bottle/nutrient/l4z, +/obj/item/reagent_containers/glass/bottle/nutrient/l4z, +/obj/item/reagent_containers/glass/bottle/nutrient/l4z, +/obj/item/reagent_containers/glass/bottle/nutrient/rh, +/obj/item/reagent_containers/glass/bottle/nutrient/rh, +/obj/item/reagent_containers/glass/bottle/nutrient/rh, +/obj/item/reagent_containers/glass/bottle/nutrient/rh, +/obj/item/reagent_containers/glass/bottle/nutrient/rh, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "sCw" = ( /obj/structure/chair/wood/wings{ dir = 4 @@ -60544,13 +61298,6 @@ /obj/structure/flora/bush, /turf/open/indestructible/ground/outside/snow, /area/f13/wasteland) -"sEI" = ( -/obj/structure/flora/tree/cactus, -/turf/open/indestructible/ground/outside/dirt{ - dir = 10; - icon_state = "dirt" - }, -/area/f13/wasteland) "sEJ" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/sidewalk{ @@ -60685,7 +61432,9 @@ /area/f13/building/powered) "sGy" = ( /obj/structure/AIcore/deactivated, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "sGB" = ( /obj/structure/barricade/tentclothcorner{ @@ -60849,14 +61598,6 @@ /obj/item/stack/tile/carpet/fifty, /turf/open/floor/plating, /area/f13/bar) -"sJH" = ( -/obj/item/paper/crumpled/bloody/ruins{ - name = "treasure map"; - pixel_y = -11; - pixel_x = -19 - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) "sJK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old{ @@ -60864,6 +61605,12 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"sJO" = ( +/obj/structure/curtain{ + color = "#363636" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "sJV" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/road, @@ -61068,6 +61815,10 @@ icon_state = "darkrusty" }, /area/f13/building/abandoned/h) +"sMT" = ( +/obj/structure/sign/poster/ncr/democracy, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "sNd" = ( /obj/structure/decoration/hatch{ desc = "A faded inscription reads: Manufactured in Queens, NY, 2062."; @@ -61079,6 +61830,14 @@ icon_state = "horizontaltopborderbottom0" }, /area/f13/wasteland) +"sNg" = ( +/obj/structure/shelf_wood, +/obj/item/storage/firstaid, +/obj/item/storage/firstaid, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "sNu" = ( /obj/structure/simple_door/interior, /turf/open/floor/f13/wood{ @@ -61381,6 +62140,11 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) +"sRW" = ( +/obj/structure/table/wood/junk, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "sSb" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -61533,6 +62297,12 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/building/abandoned/x) +"sUc" = ( +/obj/machinery/chem_dispenser, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "sUs" = ( /obj/structure/wreck/car, /obj/effect/decal/cleanable/dirt/dust, @@ -61636,9 +62406,6 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) -"sWE" = ( -/turf/open/floor/plasteel/elevatorshaft, -/area/f13/ambientlighting/building/g) "sWI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/landmark/start/f13/ncrcaptain, @@ -61836,6 +62603,10 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) +"sYW" = ( +/obj/machinery/gear_painter, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/wasteland) "sYX" = ( /obj/machinery/shower{ dir = 4 @@ -62045,7 +62816,9 @@ speak = list("UNITY!","EMBRACE PROGRESS!","EVOLVE!","MUST FINISH HIS WORK!","LET ME HELP YOU!") }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "tbM" = ( /obj/effect/overlay/desert_side{ @@ -62087,7 +62860,9 @@ /obj/machinery/light/small{ light_color = "#ff4747" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/brotherhood/offices1st) "tcK" = ( /obj/machinery/light/small{ @@ -62219,11 +62994,6 @@ icon_state = "darkrusty" }, /area/f13/building/abandoned/h) -"teQ" = ( -/obj/structure/junk/small/bed, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/royalblack, -/area/f13/ambientlighting/building/g) "teS" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -62418,6 +63188,10 @@ icon_state = "verticaloutermain1" }, /area/f13/wasteland/followers) +"thS" = ( +/obj/structure/sink/well, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "thW" = ( /obj/effect/overlay/desert/sonora/edge, /turf/open/indestructible/ground/outside/sidewalk{ @@ -62468,9 +63242,7 @@ /obj/effect/decal/cleanable/dirt{ color = "000000" }, -/mob/living/simple_animal/hostile/raider/sulphite{ - faction = list("raider") - }, +/mob/living/simple_animal/hostile/raider/sulphite, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "tji" = ( @@ -62637,7 +63409,9 @@ "tkT" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/ncr) "tkX" = ( /obj/structure/reagent_dispensers/barrel/dangerous, @@ -62887,7 +63661,9 @@ "toG" = ( /obj/structure/table/reinforced, /obj/structure/barricade/bars, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "toH" = ( /obj/effect/decal/fakelattice, @@ -62945,11 +63721,6 @@ /obj/structure/table, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/t) -"tpA" = ( -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/purple, -/area/f13/ambientlighting/building/g) "tpE" = ( /obj/structure/rack, /obj/effect/decal/fakelattice, @@ -63097,6 +63868,10 @@ icon_state = "verticalrightborderright3" }, /area/f13/ambientlighting/building/y) +"tse" = ( +/obj/structure/bed/mattress, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "tsn" = ( /obj/structure/closet/crate/large, /obj/item/stack/sheet/metal/fifty, @@ -63129,7 +63904,6 @@ /obj/item/weldingtool, /obj/effect/spawner/lootdrop/toolsbasic, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -63425,6 +64199,20 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/y) +"tyQ" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress1"; + pixel_y = 9 + }, +/obj/structure/bed/mattress{ + icon_state = "mattress2"; + pixel_y = -6 + }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "tyU" = ( /obj/structure/table/reinforced{ color = "#c1b6a5" @@ -63469,13 +64257,19 @@ "tzh" = ( /obj/structure/bed/double, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "tzr" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"tzv" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/wasteland) "tzB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -63586,8 +64380,7 @@ /area/f13/building/powered) "tBb" = ( /obj/structure/fence{ - dir = 8; - icon_state = "straight" + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/dirt{ @@ -63742,7 +64535,9 @@ dir = 1; termtag = "Private" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "tDv" = ( /obj/machinery/light, @@ -63771,12 +64566,6 @@ icon_state = "horizontalbottomborderbottom0" }, /area/f13/ambientlighting/building/y) -"tDI" = ( -/obj/structure/closet/cabinet/anchored, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/f13/armor/tier1, -/turf/open/floor/carpet/royalblack, -/area/f13/ambientlighting/building/g) "tDJ" = ( /turf/closed/indestructible/rock, /area/f13/wasteland) @@ -63988,10 +64777,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, /area/f13/ambientlighting/building/j) -"tGE" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "tGT" = ( /mob/living/simple_animal/cow/brahmin, /turf/open/indestructible/ground/outside/grass, @@ -64005,11 +64790,6 @@ }, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) -"tHr" = ( -/obj/structure/bed/old, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) "tHu" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/f13/weapon/melee/random, @@ -64311,7 +65091,9 @@ "tNA" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/ammo, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "tNB" = ( /obj/effect/turf_decal/weather/dirt{ @@ -64358,18 +65140,6 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) -"tOp" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "tOx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/f13/great_khan, @@ -64460,7 +65230,9 @@ /obj/effect/decal/cleanable/blood/old{ icon_state = "gibbearcore" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "tPI" = ( /obj/effect/overlay/desert/sonora/edge{ @@ -64512,6 +65284,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/road, /area/f13/building/abandoned/k) +"tQE" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain2bottom" + }, +/area/f13/wasteland) "tQI" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -64555,6 +65333,10 @@ }, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +"tQX" = ( +/obj/effect/decal/cleanable/shreds, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "tQY" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -64680,6 +65462,12 @@ icon_state = "dirt" }, /area/f13/wasteland) +"tSg" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/wasteland) "tSk" = ( /obj/machinery/light{ dir = 1; @@ -64729,7 +65517,6 @@ dir = 2 }, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -64777,13 +65564,8 @@ }, /area/f13/wasteland) "tTv" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier1, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "tTB" = ( /obj/structure/chair/wood{ dir = 4 @@ -64835,7 +65617,9 @@ /obj/effect/turf_decal/weather/dirt{ dir = 1 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "tUd" = ( /obj/effect/overlay/desert/sonora/edge/corner{ @@ -65067,6 +65851,10 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3, /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) +"tXN" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "tXZ" = ( /obj/structure/fence/wooden, /turf/open/indestructible/ground/outside/dirt{ @@ -65138,9 +65926,14 @@ icon_state = "horizontaltopbordertop2" }, /area/f13/wasteland) +"tZw" = ( +/turf/closed/wall/f13/wood/interior, +/area/f13/wasteland) "tZx" = ( /obj/structure/barricade/wooden, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/bunker) "tZz" = ( /obj/item/storage/trash_stack, @@ -65206,6 +65999,10 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"uaS" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) "ube" = ( /obj/machinery/light/small{ dir = 8 @@ -65286,11 +66083,6 @@ /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) -"ucp" = ( -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "ucs" = ( /obj/effect/spawner/lootdrop/f13/weapon/melee/random_mid, /turf/open/indestructible/ground/outside/dirt{ @@ -65498,7 +66290,9 @@ /area/f13/wasteland) "ueJ" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "ueL" = ( /obj/structure/table/wood, @@ -65533,6 +66327,11 @@ "ufo" = ( /turf/closed/wall/f13/tunnel, /area/f13/wasteland) +"ufp" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/reagent_dispensers/rainwater_tank, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "ufs" = ( /obj/structure/debris/v2, /turf/open/indestructible/ground/outside/dirt, @@ -65885,7 +66684,9 @@ name = "\improper DNA injector (Enhanced Muscle Cells)" }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "ujG" = ( /obj/effect/decal/cleanable/blood/old, @@ -66019,6 +66820,12 @@ icon_state = "common-broken3" }, /area/f13/ambientlighting/building/p) +"umk" = ( +/obj/structure/sign/parking, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "umv" = ( /turf/open/indestructible/ground/outside/gravel/path_desert{ dir = 1; @@ -66099,12 +66906,12 @@ name = "dirty floor" }, /area/f13/building/powered) -"unx" = ( -/obj/structure/simple_door/bunker/glass, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) +"unA" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/reagent_dispensers/foamtank, +/obj/effect/decal/fakelattice, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "unT" = ( /turf/open/indestructible/ground/outside/snow{ icon_state = "snow4" @@ -66120,6 +66927,11 @@ icon_state = "dirt" }, /area/f13/building/abandoned/g) +"uof" = ( +/obj/machinery/door/unpowered/secure_NCR, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "uoq" = ( /obj/structure/decoration/hatch{ dir = 8 @@ -66201,14 +67013,6 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/b) -"ups" = ( -/obj/structure/simple_door/metal/store{ - icon_state = "brokenstore" - }, -/turf/open/floor/f13{ - icon_state = "bluerustysolid" - }, -/area/f13/ambientlighting/building/g) "upK" = ( /obj/structure/barricade/wooden/strong, /obj/structure/decoration/rag, @@ -66300,6 +67104,10 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"urs" = ( +/obj/effect/decal/cleanable/vomit, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "urA" = ( /obj/structure/stairs/south, /turf/open/floor/carpet/green, @@ -66427,7 +67235,6 @@ }, /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -66451,7 +67258,9 @@ /obj/structure/window/fulltile/house{ icon_state = "housewindowbroken" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/abandoned/w) "utZ" = ( /obj/machinery/light/floor, @@ -66764,8 +67573,16 @@ /area/f13/ambientlighting/building/y) "uyU" = ( /obj/effect/decal/cleanable/robot_debris, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) +"uza" = ( +/obj/machinery/chem_master, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "uzc" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -66835,16 +67652,6 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/j) -"uAe" = ( -/obj/structure/flora/tree/tall{ - layer = 2; - pixel_y = 9 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 8; - icon_state = "outerpavement" - }, -/area/f13/wasteland) "uAo" = ( /obj/structure/tires/two, /turf/open/floor/plating/f13/inside/gravel, @@ -66975,6 +67782,15 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/f) +"uCa" = ( +/obj/structure/fence/post{ + pixel_y = 14; + pixel_x = 16; + desc = "An iron support beam."; + name = "iron stanchion" + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "uCe" = ( /obj/structure/simple_door/house, /turf/open/floor/f13{ @@ -67034,6 +67850,10 @@ icon_state = "outerpavementcorner" }, /area/f13/wasteland) +"uCY" = ( +/obj/structure/table, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/wasteland) "uDb" = ( /obj/structure/chair/comfy{ dir = 1 @@ -67096,16 +67916,6 @@ color = "#9c9c9c" }, /area/f13/building/abandoned/j) -"uEc" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "uEo" = ( /obj/machinery/hydroponics/soil, /obj/effect/turf_decal/weather/dirt{ @@ -67328,13 +68138,6 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) -"uGX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ghoul, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "uHb" = ( /obj/structure/rack, /obj/item/stack/sheet/metal/twenty, @@ -67508,6 +68311,10 @@ icon_state = "horizontalinnermain2" }, /area/f13/wasteland) +"uJz" = ( +/obj/structure/simple_door/interior, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "uJM" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/weapon/melee/tier3, @@ -67535,7 +68342,9 @@ /obj/effect/spawner/lootdrop/f13/resourcespawner, /obj/effect/spawner/lootdrop/f13/advcrafting, /obj/effect/spawner/lootdrop/f13/advcrafting, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/ncr) "uKy" = ( /obj/effect/turf_decal/weather/dirt, @@ -67563,17 +68372,14 @@ /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"uKK" = ( +/obj/machinery/photocopier, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "uKS" = ( /obj/machinery/light/small, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) -"uKU" = ( -/obj/structure/reagent_dispensers/barrel/dangerous, -/obj/structure/reagent_dispensers/barrel/dangerous, -/turf/open/indestructible/ground/outside/dirt{ - icon_state = "dirtcorner" - }, -/area/f13/wasteland) "uKY" = ( /obj/machinery/light/fo13colored/Red{ dir = 1 @@ -67640,7 +68446,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "uMe" = ( /obj/effect/decal/cleanable/blood/tracks{ @@ -67715,6 +68523,16 @@ /obj/effect/overlay/desert_side, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +"uMR" = ( +/obj/structure/rack/shelf_metal, +/obj/item/salvage/low, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +"uMS" = ( +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "uMX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/blue, @@ -67887,7 +68705,6 @@ }, /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -68018,6 +68835,10 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"uRi" = ( +/obj/structure/fluff/hedge, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "uRn" = ( /obj/effect/decal/cleanable/blood/old{ icon_state = "gibbear1" @@ -68252,12 +69073,6 @@ smooth = 1 }, /area/f13/brotherhood/surface) -"uUN" = ( -/turf/open/indestructible/ground/outside/dirt{ - dir = 1; - icon_state = "dirt" - }, -/area/f13/caves) "uUT" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt/dust, @@ -68340,15 +69155,6 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) -"uWm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" - }, -/area/f13/ambientlighting/building/g) "uWy" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -68376,9 +69182,7 @@ }, /area/f13/wasteland) "uWX" = ( -/obj/machinery/door/unpowered/secure_legion{ - req_access_txt = "123" - }, +/obj/machinery/door/unpowered/secure_legion, /obj/effect/overlay/desert/sonora/edge{ dir = 4 }, @@ -68441,7 +69245,9 @@ }, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "uXC" = ( /obj/effect/decal/cleanable/dirt, @@ -68481,10 +69287,6 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) -"uYa" = ( -/obj/structure/shopping_cart, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) "uYh" = ( /turf/open/indestructible/ground/outside/road, /area/f13/tunnel/southwest) @@ -68530,6 +69332,11 @@ icon_state = "floorrusty" }, /area/f13/building/powered) +"uYN" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "uYO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/vending/cola/random, @@ -68582,7 +69389,9 @@ "uZZ" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "vad" = ( /obj/structure/destructible/tribal_torch/wall/lit{ @@ -68601,6 +69410,12 @@ /obj/structure/sink/well, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) +"vaB" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "vaF" = ( /obj/structure/billboard/redrocket2, /turf/open/indestructible/ground/outside/sidewalkdirt{ @@ -68615,8 +69430,7 @@ /area/f13/wasteland) "vaI" = ( /obj/structure/fence{ - dir = 1; - icon_state = "straight" + dir = 1 }, /obj/structure/fence/corner, /obj/item/flag/khan, @@ -68657,6 +69471,10 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/superlow, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) +"vaZ" = ( +/obj/machinery/msgterminal/ncr, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "vbf" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -68682,7 +69500,9 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "vbB" = ( /turf/open/floor/plating/f13/inside/gravel/edge, @@ -68704,6 +69524,11 @@ dir = 8 }, /area/f13/brotherhood) +"vbI" = ( +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "vbT" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/delivery, @@ -68726,6 +69551,12 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"vcb" = ( +/obj/structure/table, +/obj/machinery/processor/chopping_block, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "vcg" = ( /obj/structure/window/fulltile/store{ icon_state = "storewindowleft" @@ -68833,6 +69664,10 @@ /obj/effect/mob_spawn/human/corpse/damaged, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"vdF" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "vdK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/wrench, @@ -68941,6 +69776,12 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/f) +"vfa" = ( +/obj/machinery/door/poddoor/gate/bunker{ + id = 984 + }, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) "vfe" = ( /obj/structure/railing{ color = "#A47449"; @@ -69016,7 +69857,6 @@ /area/f13/building/abandoned/j) "vgc" = ( /turf/open/indestructible/ground/outside/gravel/path_desert{ - dir = 2; icon_state = "path_desert_intersection" }, /area/f13/wasteland) @@ -69147,11 +69987,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/p) -"vig" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/royalblack, -/area/f13/ambientlighting/building/g) "vjf" = ( /obj/effect/overlay/desert_side, /obj/effect/overlay/desert_side{ @@ -69312,11 +70147,10 @@ icon_state = "bluerustysolid" }, /area/f13/followers) -"vln" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +"vlI" = ( +/obj/machinery/radioterminal/ncr, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "vlJ" = ( /obj/structure/barricade/tentclothedge{ dir = 4 @@ -69354,13 +70188,6 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) -"vmd" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ghoul/reaver, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "vmg" = ( /obj/item/flag/khan, /obj/effect/turf_decal/weather/dirt, @@ -69451,6 +70278,11 @@ icon_state = "snow5" }, /area/f13/wasteland) +"vnW" = ( +/obj/structure/rack/shelf_metal, +/obj/item/multitool, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "vnX" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks, @@ -69546,7 +70378,9 @@ /area/f13/building/abandoned/j) "vpw" = ( /obj/effect/decal/cleanable/robot_debris, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "vpB" = ( /obj/structure/lattice, @@ -69611,7 +70445,9 @@ }, /obj/structure/table/optable, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "vri" = ( /obj/effect/spawner/lootdrop/trash, @@ -69765,13 +70601,6 @@ /obj/structure/flora/ausbushes/reedbush, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) -"vtH" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/glass, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "vtI" = ( /obj/structure/barricade/wooden/strong, /turf/closed/wall/r_wall/rust, @@ -69788,6 +70617,10 @@ icon_state = "floorrusty" }, /area/f13/ncr) +"vtS" = ( +/obj/structure/reagent_dispensers/compostbin, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "vtU" = ( /obj/structure/curtain{ pixel_x = 32 @@ -69923,6 +70756,13 @@ icon_state = "dirt" }, /area/f13/wasteland) +"vvf" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Armoury" + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/wasteland) "vvo" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -70118,9 +70958,7 @@ /area/f13/wasteland) "vyG" = ( /obj/structure/campfire/barrel, -/turf/open/indestructible/ground/outside/grass/dirtpath{ - dir = 2 - }, +/turf/open/indestructible/ground/outside/grass/dirtpath, /area/f13/wasteland) "vyH" = ( /obj/effect/turf_decal/stripes/white/line{ @@ -70321,7 +71159,6 @@ "vBQ" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland) @@ -70349,11 +71186,6 @@ /obj/structure/beebox, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/c) -"vCa" = ( -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/green, -/area/f13/ambientlighting/building/g) "vCb" = ( /obj/structure/legion_extractor, /turf/open/floor/wood_common{ @@ -70474,6 +71306,14 @@ }, /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/j) +"vDH" = ( +/obj/effect/turf_decal/big{ + dir = 6 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "vDU" = ( /obj/effect/decal/marking, /turf/open/indestructible/ground/outside/road{ @@ -70502,7 +71342,9 @@ "vEs" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/trash, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "vEH" = ( /obj/structure/destructible/tribal_torch/wall/lit{ @@ -70635,7 +71477,9 @@ /area/f13/wasteland) "vGp" = ( /obj/structure/window/fulltile/ruins, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/abandoned/t) "vGr" = ( /obj/structure/car/rubbish3, @@ -70804,7 +71648,9 @@ "vJf" = ( /obj/machinery/rnd/experimentor, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "vJp" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -70910,7 +71756,9 @@ /obj/machinery/light/fo13colored/Red{ dir = 8 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "vKQ" = ( /obj/structure/dresser, @@ -71034,7 +71882,9 @@ /area/f13/wasteland) "vNr" = ( /obj/effect/decal/cleanable/oil/streak, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/bunker) "vNu" = ( /obj/effect/decal/cleanable/dirt, @@ -71083,9 +71933,7 @@ /obj/structure/fence{ dir = 4 }, -/turf/open/indestructible/ground/outside/grass/dirtpath{ - dir = 2 - }, +/turf/open/indestructible/ground/outside/grass/dirtpath, /area/f13/wasteland/followers) "vNZ" = ( /obj/structure/table/wood/junk, @@ -71134,6 +71982,17 @@ icon_state = "dark" }, /area/f13/brotherhood) +"vOv" = ( +/obj/structure/closet/locker/oldstyle{ + anchored = 1 + }, +/obj/item/storage/lockbox, +/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/plasteel/grimy, +/area/f13/wasteland) "vOw" = ( /obj/structure/debris/v1, /obj/structure/barricade/wooden/strong, @@ -71141,9 +72000,7 @@ /area/f13/wasteland/town) "vOD" = ( /obj/item/flag/followers, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "vOQ" = ( @@ -71152,6 +72009,10 @@ icon_state = "rubbleplate" }, /area/f13/wasteland) +"vPt" = ( +/obj/item/flag/ncr, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "vPF" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13, @@ -71160,12 +72021,13 @@ /obj/effect/overlay/desert/sonora/edge, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) -"vPQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) +"vPM" = ( +/obj/structure/rack/shelf_metal, +/obj/effect/spawner/lootdrop/tool_box, +/obj/effect/spawner/lootdrop/tool_box, +/obj/item/salvage/tool, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "vPV" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt/dust, @@ -71378,12 +72240,6 @@ name = "dirty floor" }, /area/f13/brotherhood) -"vTy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/item/lockpick_set/bobby_pin, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "vTF" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/seedspawner, @@ -71652,6 +72508,21 @@ icon_state = "bluedirtychess2" }, /area/f13/followers) +"vZw" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 26; + pixel_x = -18 + }, +/turf/closed/mineral/random, +/area/f13/wasteland) "vZy" = ( /turf/open/floor/engine/air, /area/engine/workshop) @@ -71755,15 +72626,6 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) -"wbg" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" - }, -/area/f13/ambientlighting/building/g) "wby" = ( /obj/effect/landmark/start/f13/ncrconscript, /turf/open/indestructible/ground/outside/graveldirt, @@ -71917,10 +72779,6 @@ icon_state = "innermaincornerouter" }, /area/f13/building/lower_firetower) -"wdV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/purple, -/area/f13/ambientlighting/building/g) "wea" = ( /obj/structure/curtain{ color = "#845f58" @@ -72054,6 +72912,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/royalblack, /area/f13/building/abandoned/l) +"wfN" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerborder" + }, +/area/f13/wasteland) "wfT" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -72580,6 +73445,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/h) +"wnU" = ( +/obj/structure/railing/handrail/rusty, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) "wnZ" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -72641,7 +73512,9 @@ /area/f13/legioncamp) "woY" = ( /obj/machinery/light/fo13colored/Red, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "woZ" = ( /obj/structure/closet/anchored, @@ -72963,9 +73836,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "wsV" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ dir = 9 }, @@ -73207,7 +74078,9 @@ /area/f13/ambientlighting/building/b) "wwj" = ( /mob/living/simple_animal/hostile/radscorpion/blue, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "wwx" = ( /obj/effect/decal/cleanable/dirt{ @@ -73237,11 +74110,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) -"wwO" = ( -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/royalblack, -/area/f13/ambientlighting/building/g) "wwR" = ( /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/j) @@ -73445,6 +74313,11 @@ /obj/effect/decal/cleanable/robot_debris, /turf/open/floor/plating/rust, /area/f13/building/powered) +"wzT" = ( +/obj/structure/rack/shelf_metal, +/obj/item/wrench, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "wzU" = ( /obj/structure/fence/cut/medium, /turf/open/indestructible/ground/outside/sidewalk{ @@ -73512,7 +74385,9 @@ icon_state = "poster82"; pixel_x = 32 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/ncr) "wAr" = ( /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, @@ -74086,7 +74961,9 @@ "wIg" = ( /obj/machinery/atmospherics/components/unary/tank/oxygen, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "wIi" = ( /obj/effect/decal/cleanable/dirt, @@ -74159,15 +75036,6 @@ /obj/structure/flora/tree/tall, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) -"wJz" = ( -/obj/structure/simple_door/house, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "wKh" = ( /obj/structure/car, /obj/structure/tires/five, @@ -74248,7 +75116,9 @@ "wLw" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/cash_random_low, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "wLL" = ( /obj/effect/decal/cleanable/dirt, @@ -74318,9 +75188,7 @@ /obj/structure/cable/outdoors{ icon_state = "4-8" }, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/road{ dir = 8; icon_state = "horizontalinnermain2left" @@ -74437,8 +75305,7 @@ /area/f13/ambientlighting/building/y) "wOi" = ( /obj/effect/turf_decal/weather/snow/corner{ - dir = 5; - icon_state = "snow_corner" + dir = 5 }, /obj/effect/turf_decal/weather/snow/corner{ dir = 6 @@ -74448,10 +75315,6 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) -"wOu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/royalblack, -/area/f13/ambientlighting/building/g) "wOB" = ( /obj/structure/flora/tree/oak_one, /turf/open/indestructible/ground/outside/grass, @@ -74474,12 +75337,6 @@ /obj/machinery/vending/boozeomat, /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/w) -"wOQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/f13{ - icon_state = "bluerustysolid" - }, -/area/f13/ambientlighting/building/g) "wOT" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4"; @@ -74520,6 +75377,10 @@ }, /turf/open/indestructible/ground/outside/dirthole, /area/f13/wasteland) +"wPF" = ( +/obj/structure/table/booth, +/turf/open/floor/plasteel/grimy, +/area/f13/wasteland) "wPH" = ( /obj/effect/overlay/desert_side, /obj/structure/destructible/tribal_torch/wall/lit, @@ -74648,6 +75509,15 @@ icon_state = "floorrusty" }, /area/f13/building/powered) +"wRi" = ( +/obj/structure/fence/post{ + pixel_y = -18; + pixel_x = 16; + desc = "An iron support beam."; + name = "iron stanchion" + }, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "wRn" = ( /obj/machinery/vending/hydronutrients{ force_free = 1 @@ -74707,7 +75577,9 @@ }, /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/abandoned/t) "wSd" = ( /turf/closed/wall/f13/wood, @@ -74790,7 +75662,9 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) "wTh" = ( -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/bunker) "wTj" = ( /mob/living/simple_animal/hostile/supermutant/rangedmutant/varmint, @@ -75072,6 +75946,10 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +"wXb" = ( +/obj/effect/landmark/start/f13/ncrlogisticsofficer, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/wasteland) "wXd" = ( /obj/structure/window/fulltile/wood_window, /obj/structure/barricade/bars, @@ -75163,6 +76041,10 @@ "wYW" = ( /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/k) +"wYZ" = ( +/obj/structure/closet/crate/trashcart, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "wZj" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13{ @@ -75174,12 +76056,6 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) -"wZv" = ( -/obj/structure/simple_door/house, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "wZH" = ( /turf/open/indestructible/ground/outside/roaddirt{ dir = 8; @@ -75399,7 +76275,9 @@ /area/f13/wasteland) "xdg" = ( /obj/item/clothing/head/f13/enclave, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/caves) "xdm" = ( /obj/effect/decal/cleanable/dirt, @@ -75491,12 +76369,6 @@ icon_state = "bluedirtychess2" }, /area/f13/brotherhood) -"xey" = ( -/obj/structure/decoration/rag{ - layer = 4.3 - }, -/turf/closed/wall/f13/tentwall, -/area/f13/wasteland) "xeI" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/road, @@ -76473,13 +77345,6 @@ /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) -"xsF" = ( -/obj/structure/barricade/wooden, -/turf/open/indestructible/ground/outside/dirt{ - dir = 2; - icon_state = "dirt" - }, -/area/f13/wasteland) "xsN" = ( /obj/effect/spawner/lootdrop/druggie_pill, /turf/open/indestructible/ground/outside/sidewalk{ @@ -76528,15 +77393,6 @@ icon_state = "floorrusty" }, /area/f13/building/abandoned/h) -"xtt" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "bluerustysolid" - }, -/area/f13/ambientlighting/building/g) "xty" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/dirt{ @@ -76675,14 +77531,6 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/ncr) -"xvX" = ( -/obj/structure/decoration/hatch{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain0" - }, -/area/f13/wasteland) "xwa" = ( /obj/structure/chair/sofa/right{ dir = 1 @@ -76721,6 +77569,12 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"xwC" = ( +/obj/structure/closet/crate/freezer/blood/anchored, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/wasteland) "xwF" = ( /obj/machinery/door/unpowered/securedoor/khandoor, /turf/closed/wall/mineral/wood, @@ -76766,7 +77620,6 @@ light_color = "#f4e3b0" }, /turf/open/indestructible/ground/outside/dirt{ - dir = 2; icon_state = "dirt" }, /area/f13/wasteland/legion) @@ -76787,6 +77640,12 @@ /obj/machinery/processor/chopping_block, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) +"xxN" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "xxQ" = ( /obj/structure/rack/shelf_metal, /obj/item/clothing/under/misc/black_dress{ @@ -76950,15 +77809,6 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) -"xAc" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_4"; - layer = 6 - }, -/turf/open/indestructible/ground/outside/desert{ - icon_state = "wasteland32" - }, -/area/f13/wasteland) "xAf" = ( /obj/machinery/chem_lab, /turf/closed/wall/f13/store, @@ -77087,7 +77937,9 @@ /obj/machinery/light/fo13colored/Red{ dir = 8 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "xBZ" = ( /obj/structure/chair/left{ @@ -77128,14 +77980,6 @@ }, /turf/open/floor/plating, /area/f13/bar) -"xCz" = ( -/obj/structure/simple_door/metal/store{ - icon_state = "brokenstore" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "xCD" = ( /obj/structure/chair/booth{ icon_state = "booth_south_middle" @@ -77145,6 +77989,14 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +"xCG" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/port_gen/pacman/diesel, +/obj/item/stack/sheet/mineral/plasma/fifty, +/turf/open/floor/f13{ + icon_state = "floorrusty" + }, +/area/f13/ambientlighting/building/f) "xCH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -77175,7 +78027,9 @@ "xDj" = ( /obj/structure/chair/office, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "xDn" = ( /obj/item/storage/trash_stack, @@ -77366,7 +78220,9 @@ "xGf" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/blueprintMid, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "xGn" = ( /obj/structure/chair/office/dark, @@ -77526,10 +78382,10 @@ /area/f13/ambientlighting/building/b) "xIz" = ( /obj/effect/turf_decal/siding/wood, -/obj/structure/fluff/rug/rug_rubber{ - icon = 'icons/fallout/objects/64x64_rugs.dmi' +/obj/structure/fluff/rug/rug_rubber, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) "xIC" = ( /obj/effect/turf_decal/delivery/red, @@ -77580,14 +78436,15 @@ dir = 5 }, /obj/effect/turf_decal/weather/snow/corner{ - dir = 9; - icon_state = "snow_corner" + dir = 9 }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "xJB" = ( /obj/structure/obstacle/jammed_door, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, /area/f13/building/powered) "xJC" = ( /obj/structure/closet/crate/radiation, @@ -77760,12 +78617,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/purple, /area/f13/bar) -"xMp" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" - }, -/area/f13/ambientlighting/building/g) "xNb" = ( /obj/structure/window/fulltile/house{ dir = 2; @@ -77826,12 +78677,9 @@ /turf/open/floor/f13/wood, /area/f13/wasteland) "xOc" = ( -/obj/item/storage/money_stack/ncr{ - pixel_x = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/spawner/lootdrop/toolsbasic, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "xOf" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -77899,11 +78747,6 @@ /obj/structure/barricade/bars, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) -"xPy" = ( -/turf/open/indestructible/ground/outside/grass/dirtpath{ - dir = 2 - }, -/area/f13/wasteland/town) "xPY" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt/dust, @@ -77954,6 +78797,16 @@ /obj/item/stock_parts/cell/high, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"xQm" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress1"; + pixel_y = 9 + }, +/obj/item/blacksmith/chain{ + pixel_x = -8 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "xQq" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/sidewalk{ @@ -78078,8 +78931,7 @@ /area/f13/wasteland/town) "xRW" = ( /obj/effect/turf_decal/weather/snow/corner{ - dir = 9; - icon_state = "snow_corner" + dir = 9 }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/ncr) @@ -78206,18 +79058,6 @@ icon_state = "common_dark-broken4" }, /area/f13/building/abandoned/n) -"xUu" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_6"; - pixel_x = -11; - pixel_y = 11 - }, -/obj/item/shovel/trench, -/turf/open/indestructible/ground/outside/dirt{ - dir = 5; - icon_state = "dirt" - }, -/area/f13/wasteland) "xUx" = ( /mob/living/simple_animal/hostile/raider/thief, /turf/open/indestructible/ground/outside/dirt, @@ -78362,9 +79202,7 @@ }, /area/f13/wasteland) "xWy" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland/town) "xWM" = ( @@ -78441,9 +79279,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 8 }, -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "xXJ" = ( @@ -78589,12 +79425,6 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/m) -"yap" = ( -/obj/structure/closet/cabinet/anchored, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/f13/armor/tier1, -/turf/open/floor/carpet/purple, -/area/f13/ambientlighting/building/g) "yau" = ( /obj/item/flag/khan, /obj/structure/fence/corner{ @@ -78691,6 +79521,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) +"ybD" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "ybH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -78767,16 +79604,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"ycu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ghoul/reaver, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "ycx" = ( /obj/structure/sink{ dir = 1; @@ -78797,6 +79624,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/p) +"ycM" = ( +/obj/structure/sign/poster/prewar/poster70, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "ycP" = ( /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/sidewalk{ @@ -79118,11 +79949,15 @@ }, /area/f13/wasteland) "yhZ" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/open/indestructible/ground/outside/dirt{ - dir = 4; - icon_state = "dirt" +/obj/structure/bed/mattress{ + icon_state = "mattress4"; + pixel_x = -8; + pixel_y = 6 }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/turf/open/floor/plasteel/grimy, /area/f13/wasteland) "yik" = ( /obj/machinery/computer/terminal{ @@ -79203,6 +80038,10 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/w) +"yjj" = ( +/obj/structure/legion_extractor, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "yjk" = ( /obj/structure/debris/v2, /turf/closed/mineral/random/low_chance, @@ -79225,15 +80064,6 @@ "yjy" = ( /turf/closed/wall/f13/wood/house, /area/f13/bar) -"yjB" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "yjG" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/inside/dirt, @@ -79256,15 +80086,6 @@ /obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) -"yke" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 2 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/indestructible/ground/outside/grass, -/area/f13/wasteland) "ykj" = ( /obj/structure/wreck/trash/two_barrels, /turf/open/floor/f13/wood, @@ -79353,6 +80174,10 @@ icon_state = "outerpavement" }, /area/f13/caves) +"ylR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "ylX" = ( /obj/structure/simple_door, /obj/structure/barricade/wooden/planks, @@ -79791,7 +80616,7 @@ yfv yfv yfv yfv -yfv +rkv yfv yfv yfv @@ -80082,18 +80907,18 @@ aTW aTW aTW aTW +tse +huh +nVA +xQm +nVA +rnh +huh aTW -aTW -yfv -aTW -aTW -aTW -aTW -aTW -yfv yfv yfv yfv +rkv yfv yfv yfv @@ -80370,32 +81195,32 @@ aTW aTW aTW aTW +xic +xic +xic +xic +xic +thS +hpE +hpE +hpE +hpE +hpE +hpE +hpE +hpE +oos +hta +oos +hta +oos +oos +hta aTW +pxU aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW +rkv +rkv aTW neZ bwE @@ -80656,47 +81481,47 @@ aTW aTW aTW aTW +azA +sqv +azA +azA +azA aTW aTW aTW +ned +rdi +ned aTW aTW aTW aTW +yjj +azA +azA +azA +azA +azA +azA +hpE +kyD +rVP +rVP +qHg +ahk +aQs +hpE +ned +ned +ned +ned +ylR +ned +ned +ned aTW aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW +rkv pjw pjw taO @@ -80957,48 +81782,48 @@ aTW aTW aTW aTW +azA +azA +shl +azA +azA +azA +azA aTW aTW +ned +ffB +ffB +ffB aTW +vtS +azA +qWz +azA +xic +xic +azA +azA +azA +hpE +hpE +rBR +rVP +rVP +rVP +rVP +hpE +ned +ned +ned +ned +ned +ned +ned +ned +bBt aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW +rkv pjw pjw vwf @@ -81259,48 +82084,48 @@ aTW aTW aTW aTW +azA +azA +shl +azA +pCk +azA +azA +azA +azA aTW +rrO aTW +ffB aTW +dAp +azA +raQ +azA +azA +xic +azA +azA +azA +xic +hpE +rVP +rVP +rVP +rVP +wXb +hpE +jwS +jwS +ned +jwS +nQa +hsD +vZw +sJO aTW aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW +rkv pjw pjw cEy @@ -81379,7 +82204,7 @@ eyn eyn eyn eyn -aHq +eyn aHq eyn eyn @@ -81560,49 +82385,49 @@ aTW aTW aTW aTW +azA +azA +azA +shl +azA +eRO +eRO +eRO +eRO +eRO +azA +pCk +loW +svx +cwi +sCu +gHu +svx +kGR +kVL +rkZ +rkZ +rkZ +svx +svx +vvf +tzv +tzv +tzv +eYx +eYx +hpE +hkO +ned +ffB +ned +hkO aTW +ned +ned +ned aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW +rkv pjw pjw taO @@ -81681,7 +82506,7 @@ eyn eyn eyn eyn -aHq +eyn eyn eyn oHx @@ -81861,50 +82686,50 @@ aTW aTW aTW aTW +azA +azA +azA +azA +shl +azA +eRO +eRO +lEm +eRO +eRO +azA +azA +hpE +hpE +hpE +hpE +hpE +hpE +hpE +hpE +hpE +xic +azA +svx +xic +hpE +sYW +rVP +tzv +rBR +eYx +hpE +hpE +nwb +qmJ +iZh aTW aTW +ryS +juE +ned aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW +rkv pjw pjw taO @@ -81983,7 +82808,7 @@ eyn eyn eyn eyn -aHq +eyn kVV lbU ubI @@ -82162,51 +82987,51 @@ aTW aTW aTW aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -eyn -eyn -kuV -tRo -kuV -bgF -kuV -fAf -kuV -kuV -uUN azA azA +azA +azA +azA +sqv +azA +eRO +eRO +eRO +eRO +eRO +azA +azA +hpE +gaX +sUc +uza +hpE +sdI +owH +iph +hpE +xic +azA +svx +xic +hpE +eYx +rVP +tzv +rVP +eYx +hpE +gcN +uVn +ktI +hpE +hpE aTW +bIP +bIP +ned aTW -aTW -aTW -aTW -aTW -aTW -aTW +rkv pjw pjw taO @@ -82285,7 +83110,7 @@ eyn eyn eyn eyn -aHq +eyn dsU kgK itB @@ -82464,51 +83289,51 @@ aTW aTW aTW aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -eyn -eyn -kuV -dwg -kuV -kuV -kuV -kuV -efz -kuV -uUN azA azA azA +azA +azA +shl +azA +azA +azA +azA +azA +azA +azA +azA +hpE +vbI +iDN +vbI +hpE +vbI +coK +vbI +hpE +azA +azA +svx +xic +hpE +eYx +rVP +tzv +tzv +tzv +vvf +ktI +ktI +ktI +gcN +hpE aTW +ned +juE +ned aTW -aTW -aTW -aTW -aTW -aTW +rkv pjw pjw pjw @@ -82587,7 +83412,7 @@ azA eyn eyn eyn -aHq +eyn oTg wai iiA @@ -82764,53 +83589,53 @@ aTW aTW aTW aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -eyn -eyn -kuV -kuV -efz -kuV -tRo -bgd -kuV -nDk -uUN -mcp azA azA +azA +azA +azA +azA +azA +shl +azA +mLi +nSc +odS +odS +hux +azA +hpE +hpE +niz +qwi +qwi +hpE +qwi +qwi +qwi +hpE +wRi +mkG +fYh +mkG +hpE +eYx +rVP +rVP +rVP +rVP +bZp +uVn +uVn +ktI +mSa +hpE aTW +ned +bgZ +ryS aTW -aTW -aTW -aTW -aTW -aTW +rkv pjw pjw pjw @@ -82889,7 +83714,7 @@ azA eyn eyn eyn -aHq +eyn oTg edX pJs @@ -83066,26 +83891,6 @@ aTW aTW aTW aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -azA azA azA azA @@ -83093,25 +83898,45 @@ azA azA azA azA -rRz -eyn -eyn -kuV -kuV -kuV -qWc -ioR -efz -qPf -eyn -uhS +shl +pCk +vbB +odS +odS +mHY +bgm azA +hpE +cgu +vbI +vbI +vbI +vbI +vbI +vbI +vbI +vbI +hpE +gvD +mgD azA +hpE +eYx +rVP +eYx +eYx +eYx +hpE +nTw +uVn +ktI +ktI +gcN +hpE aTW aTW aTW -aTW -aTW +rkv aTW pjw pjw @@ -83191,7 +84016,7 @@ azA eyn eyn eyn -aHq +eyn aHq eyn kVV @@ -83368,25 +84193,6 @@ aTW aTW aTW aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW azA azA azA @@ -83394,26 +84200,45 @@ azA azA azA azA +shl azA azA -eyn -gAg -oiF -ecc -oiF -eyn -eyn -asc -eyn -eyn -nrq -mcp +quf +odS +odS +odS azA -aTW -aTW -aTW -aTW -aTW +hpE +qhU +vbI +dku +dku +dku +dku +dku +dku +ddQ +lee +qOY +dCE +azA +hpE +hpE +bZp +hpE +hpE +hpE +hpE +hpE +uVn +uVn +ktI +uVn +qOV +hpE +hpE +hpE +rkv neZ taO lqh @@ -83545,7 +84370,7 @@ qJO pMr lsU krJ -hMe +cXi rtj rtj eyn @@ -83670,30 +84495,6 @@ aTW aTW aTW aTW -aTW -aTW -aTW -aTW -aTW -aTW -azA -azA -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -azA -azA -azA -azA -azA azA azA azA @@ -83701,21 +84502,45 @@ azA azA azA azA +sqv azA azA -snR -eyn -eyn -eyn -nDt -ctN azA azA -aTW -aTW -aTW -aTW -aTW +quf +mHY +hux +hpE +sNg +vbI +coK +vbI +xwC +qsE +ffw +qsE +qsE +qha +mgD +gvD +gvD +gvD +gvD +gvD +ofe +gvD +gvD +ofe +hpE +aZK +uVn +ktI +ktI +uVn +xOc +rXw +hpE +rkv aTW vwf vwf @@ -83979,45 +84804,45 @@ azA azA azA azA -azA -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -aTW -azA -jKr -azA -azA -azA -azA +shl azA azA azA -ndZ -rDi -rDi -yhZ -uhS -gAg -wTQ -wTQ -eyn -ctN -azA -azA +fZL azA azA azA -aTW -aTW -aTW +hpE +hpE +hpE +hpE +hpE +hpE +hpE +hpE +hpE +hpE +wRi +mgD +gvD +foA +gvD +gvD +gvD +uCa +gvD +foA +gvD +hpE +uVn +uVn +uVn +ktI +uVn +uVn +uVn +hpE +rkv aTW taO vwf @@ -84281,45 +85106,45 @@ azA azA azA azA +shl azA azA azA -azA -azA -azA -dzm -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -snR -rRz -kFh -pLm -nrq -azA -azA -azA -azA -azA -ndZ -rDi -uhS -azA -azA -azA -aTW -aTW +bho +wsd +wsd +wsd +wsd +wsd +wsd +wsd +wsd +wsd +wsd +wsd +wsd +wsd +ezE +dOn +wsd +wsd +wsd +wsd +wsd +wsd +wsd +wsd +mBX +hpE +hpE +ycM +uVn +ktI +ktI +fbM +qft +hpE +rkv aTW neZ vwf @@ -84427,7 +85252,7 @@ fGd shY lbC sBk -raQ +vpp ugZ bzD fqh @@ -84573,54 +85398,54 @@ aTW aTW aTW aTW -aTW azA azA -jKr -azA azA -gvU jKr azA azA -azA -azA -azA -ndZ -wfv -wfv -wfv -uhS +gvU jKr azA azA +shl azA azA azA -azA -azA -dzm -azA -azA -azA -azA -snR -rRz -rRz -cBf -kiP -tDV -azA -azA -azA -uKU -hZE -rRz -nrq -azA -azA -azA -aTW +ahs +uVn +uVn +uVn +eDX +eAw +eAw +eAw +eAw +eAw +eAw +eAw +eAw +eAw +lKQ +lKQ +eAw +eAw +eAw +eAw +eAw +eAw +eAw +eAw +eAw +eAw +ozi +ndc +gFV +uVn +ktI +ktI +uVn +hpE aTW aTW pjw @@ -84885,44 +85710,44 @@ azA azA azA azA +shl azA azA azA -snR -qYF -mvc -upK -nrq -azA -dzm -azA -azA -ljW -azA -azA -dzm -mwT -dzm -azA -azA -ckU -gAg -jbl -rRz -rRz -cBf -kiP -hcZ -azA -pcx -hUC -rRz -rRz -nrq -azA -azA -azA -aTW +ahs +eDX +eAw +eAw +hKZ +tPS +tPS +tPS +tPS +tPS +tPS +tPS +umk +tPS +xxN +tPS +tPS +tPS +tPS +tPS +tPS +tPS +tPS +tPS +tPS +tPS +jEq +heA +jGT +jGT +gWT +ktI +tQX +pEl aTW aTW pjw @@ -85042,7 +85867,7 @@ vSX lsU wWz qHu -pVG +shY bpn cDz cDz @@ -85187,44 +86012,44 @@ azA azA azA azA +sqv azA azA azA -snR -xey -uSL -aCp -kiP -osc -lpb -azA -dzm -azA -azA -azA -azA -dzm -azA -azA -azA -azA -azA -snR -rRz -rRz -rRz -cBf -nrq -azA -snR -cBf -rRz -rRz -nrq -azA -azA -aTW -aTW +ahs +lmd +rts +tPS +eJc +eJc +tPS +tPS +tPS +tPS +tPS +tPS +tPS +tPS +xxN +tPS +tPS +tPS +tPS +tPS +tPS +tPS +tPS +tPS +tPS +tPS +tPS +ste +lti +dan +vDH +ktI +pUW +hpE aTW rjL taO @@ -85489,44 +86314,44 @@ azA jKr azA azA -ckU -azA -azA -snR -gdg -cBf -cBf -cBf -cBf -kiP -wfv -uhS -ndZ -wfv -uhS -azA -azA -azA -azA -azA -azA -azA -gAg -jbl -rRz -rRz -cBf -nrq +shl azA -pzj -rRz -rRz -nDt -ctN azA azA -aTW -aTW +ahs +lmd +tPS +tPS +tPS +eJc +jpl +tPS +bho +wsd +wsd +wsd +wsd +wsd +dOn +wsd +wsd +wsd +wsd +iwB +tPS +tPS +tPS +bho +fwg +wsd +ozi +syx +uVn +uVn +uVn +uVn +ktI +hpE aTW taO taO @@ -85789,46 +86614,46 @@ tey bji azA azA +ckU azA +shl azA azA azA -azA -snR -eiU -aCp -avm -cBf -cBf -rKE -aXb -xUu -hUC -cBf -kiP -mur -azA -azA -azA -azA -azA -azA -azA -gAg -jbl -rRz -rRz -nrq -azA -gAg -wTQ -wTQ -ctN -azA -azA -azA -azA -aTW +ahs +lmd +kdY +kdY +kdY +tPS +eJc +tPS +ahs +ktI +ktI +ktI +ktI +ktI +ktI +uVn +uVn +uVn +uVn +lmd +tPS +tPS +tPS +ahs +qtr +hpE +hpE +sht +wzT +lbu +vnW +uVn +nDB +hpE aTW taO jhX @@ -86093,44 +86918,44 @@ dzm azA azA azA +shl azA azA azA -gAg -wTQ -wTQ -wTQ -jbl -avm -cBf -qky -uXz -cBf -cBf -cBf -kqG -azA -azA -azA -azA -azA -azA -azA -azA -gAg -wTQ -wTQ -ctN -azA -azA -azA -azA -azA -azA -azA -azA -aTW -aTW +ahs +lmd +eJc +eJc +tPS +tPS +tPS +tPS +ahs +ktI +hpE +hpE +hpE +hpE +kYv +hpE +hpE +hpE +uVn +lmd +tPS +tPS +tPS +aOB +eAw +aKG +ozi +fLu +uVn +eMZ +uVn +sdS +uMR +sMT aTW taO nxs @@ -86395,44 +87220,44 @@ azA azA azA azA +shl azA azA azA -ljW -azA -azA -azA -gAg -sEI -sJH -cBf -uYa -cBf -ajy -nDt -ctN -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -aTW -aTW +ahs +lmd +bjo +eJc +tPS +tPS +tPS +tPS +ahs +ktI +hpE +iNl +rhc +rhc +enU +rhc +rhc +hpE +uVn +lmd +tPS +tPS +tPS +tPS +tPS +tPS +sqk +jGT +lAJ +jGT +bnL +uVn +pPz +hpE neZ taO oFS @@ -86697,44 +87522,44 @@ azA gvU azA azA +sqv azA azA azA -ndZ -wfv -wfv -uhS -azA -gAg -jbl -cBf -nDt -bYm -kOQ -ctN -azA -azA -azA -dzm -azA -azA -azA -azA -ljW -azA -azA -azA -azA -azA -azA -ndZ -rDi -rDi -rDi -uhS -azA -aTW -aTW +ahs +lmd +kdY +tCA +kdY +tPS +eJc +eJc +ahs +ktI +nwb +jau +rhc +bYl +slq +bYl +rhc +hpE +uVn +wnU +tPS +tPS +tPS +tPS +tPS +tPS +tPS +ste +ste +ste +vDH +uVn +pUW +hpE pjw lSV jYM @@ -86999,44 +87824,44 @@ wfv wfv uhS azA +shl azA azA azA -snR -rRz -rRz -nrq -azA -azA -iSP -wTQ -ctN -gAg -ctN -azA -azA -azA -xAc -jKr -dzm -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -snR -sPT -cBf -cBf -nrq -azA -aTW -aTW +ahs +lJf +hsU +tPS +tPS +tPS +eJc +eJc +ahs +ktI +hpE +nAd +rhc +rhc +sRW +rhc +rhc +uMS +uVn +wnU +tPS +tPS +bho +wsd +fwg +wsd +ozi +tXN +ktI +ktI +ktI +ktI +ktI +hpE pjw lSV aRK @@ -87301,44 +88126,44 @@ rRz hYR nrq azA +shl azA azA azA -gAg -jbl -rRz -nrq -dzm -azA -azA -jKr -azA -azA -azA -dzm -azA -azA -azA -dzm -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -snR -cBf -sPT -cBf -nrq -azA -aTW -aTW +ahs +lmd +opg +tPS +tPS +tPS +eJc +tPS +ahs +ktI +hpE +vdF +rhc +rhc +jPb +rhc +rhc +hpE +uVn +wnU +tPS +tPS +ahs +uVn +htS +hpE +hpE +bRO +uVn +uVn +gFV +ktI +hpE +hpE pjw lSV aRK @@ -87469,7 +88294,7 @@ eyn eyn gfx sed -xOc +fIO sJu qPh eyn @@ -87603,43 +88428,43 @@ rRz nDt ctN azA +shl azA azA azA -azA -gAg -wTQ -ctN -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -snR -wfq -cBf -cBf -nrq -azA -ydO +ahs +lmd +kdY +uhp +kdY +tPS +tPS +tPS +ahs +ktI +hpE +atA +rhc +rhc +bGS +rhc +rhc +sMT +uVn +lmd +tPS +tPS +ahs +uVn +hpE +aZK +uVn +uVn +gdm +gdm +nwb +uof +hpE vkP vkP vkP @@ -87905,43 +88730,43 @@ nDt ctN azA azA +shl azA azA azA -azA -azA -azA -azA -azA -azA -dzm -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -gAg -wTQ -wTQ -kyp -ctN -azA -ner +ahs +lmd +qid +tPS +tPS +eJc +tPS +tPS +ahs +ktI +hpE +jZl +kQP +hql +pFU +rhc +rhc +hpE +uVn +lmd +tPS +tPS +ahs +uVn +hpE +uVn +uVn +uVn +qEx +pBE +uVn +ktI +hpE vkP laX olF @@ -88207,43 +89032,43 @@ ctN azA azA azA +sqv azA azA azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -ner +ahs +lmd +wvE +tPS +tPS +tPS +iKG +rts +ahs +ktI +hpE +fVF +feb +tZw +aKn +rhc +rhc +hpE +uVn +lmd +tPS +tPS +ahs +uVn +hpE +dQY +vPM +dQY +hpE +ktI +ktI +ktI +hpE vkP fiR hze @@ -88428,7 +89253,7 @@ azA azA azA azA -doc +snR uii hhh hhh @@ -88506,46 +89331,46 @@ azA azA azA azA -hay -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -mUB +azA +azA +azA +shl +azA +azA +azA +ahs +lmd +kdY +dqb +nvr +cNV +xhr +mJM +ahs +ktI +hpE +rhc +rhc +kQP +jyb +rhc +rhc +hpE +uVn +lmd +tPS +tPS +ahs +lWz +hpE +hpE +hpE +hpE +hpE +rSZ +hpE +hpE +hpE vkP jiP sEJ @@ -88627,7 +89452,7 @@ lqb azA azA azA -doc +snR cBf cBf yjl @@ -88807,47 +89632,47 @@ uQH uQH uQH uQH -uQH -mUB +fZR +azA +azA +azA +shl +azA +azA +azA +ahs +lmd +tPS +tPS +gyC +cNV +xhr +gTs +ahs +ktI +hpE +jAn +mgt +jZl +vcb +rhc +rhc +ruJ uVn -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP +lmd +tPS +tPS +ahs +uVn +uVn +hpE +hDz +cMW +cMW +rUC +ffy +hpE +hpE vkP jaM qLq @@ -88921,7 +89746,7 @@ cVP nrq azA azA -doc +snR cBf gqa nrq @@ -88929,7 +89754,7 @@ azA azA azA azA -doc +snR cBf cBf cBf @@ -88999,7 +89824,7 @@ rRz rRz rRz azA -doc +snR cBf nrq azA @@ -89032,7 +89857,7 @@ azA azA azA azA -doc +snR pmV fzO cBf @@ -89109,47 +89934,47 @@ uVn uVn uVn uVn +sLI +azA +azA +azA +shl +azA +azA +azA +ahs +nAb +iKG +tPS +gyC +cNV +xhr +xxN +lOb +ktI +hpE +fXb +bGS +tZw +cIz +bGS +rhc +hpE uVn +wnU +tPS +tPS +aOB +nEj uVn -uVn -vkP -pxK -lCN -wZv -tGE -wbg -rfr -vkP -oLh -hxl -vkP -xMp -rfr -tGE -vkP -lCN -fLH -vkP -tGE -xMp -dqu -vkP -lCN -fLH -vkP -tGE -xMp -dqu -vkP -lCN -fLH -vkP -tGE -tGE -tGE -vkP -lCN -fLH +fMf +cMW +cMW +cMW +rUC +ffy +hpE +hpE vkP thA fkM @@ -89193,7 +90018,7 @@ azA azA azA azA -rvV +uUe nDM cBf wak @@ -89223,7 +90048,7 @@ cVP nrq azA azA -doc +snR cBf twD nrq @@ -89231,7 +90056,7 @@ xSB azA azA azA -doc +snR cBf cBf aiJ @@ -89334,7 +90159,7 @@ uhS azA azA azA -doc +snR pmV cBf wxo @@ -89403,9 +90228,6 @@ xdw xdw xdw xdw -sAb -ner -uVn bvo bvo cIM @@ -89413,45 +90235,48 @@ bvo cIM bvo bvo +bvo +sLI +azA +azA +azA +shl +azA +azA +azA +ahs +lmd +uhp +kdY +uhp +gyC +cNV +tQE +fPk +fPk +hpE +hhn +pjo +hpE +hpE +bGS +rhc +hpE uVn -vkP -lCN -lCN -vkP -tGE -tGE -tGE -vkP -hxl -hxl -vkP -tGE -tGE -tGE -kiK -lCN -lCN -vkP -tGE -lbi -tGE -qOK -lCN -lCN -vkP -tGE -tGE -lbi -kiK -lCN -lCN -vkP -lbi -tGE -tGE -kiK -lCN -lCN +wnU +tPS +tPS +tPS +ahs +uVn +hpE +eHh +cMW +mra +tSg +ffy +hpE +azA vkP vkP vkP @@ -89495,7 +90320,7 @@ azA azA azA azA -bSF +rEO axb cBf cBf @@ -89505,7 +90330,7 @@ cBf cBf nrq puQ -doc +snR ojV qeg rzI @@ -89525,7 +90350,7 @@ cVP nrq azA azA -doc +snR cBf cBf ckE @@ -89636,7 +90461,7 @@ nrq azA azA azA -doc +snR xtf goM hhh @@ -89705,9 +90530,6 @@ azA azA azA azA -azA -ner -uVn bvo jcc inS @@ -89715,46 +90537,49 @@ inS inS iFx bvo +bvo +sLI +azA +azA +azA +sqv +azA +azA +azA +ahs +lmd +tPS +ijL +tPS +tPS +tPS +xxN +hpE +bSi +tTv +jTw +jRD +tTv +hpE +bGS +rhc +hpE uVn -vkP -yjB -aBw -vkP -tGE -tGE -tGE -kiK -mnX -mnX -kiK -tGE -tGE -tGE -vkP -uEc -yjB -vkP -vln -gkE -tGE -vkP -uEc -yjB -vkP -tGE -tGE -tGE -ept -hgr -yjB -vkP -gZY -tGE -xMp -vkP -uEc -tOp -vkP +wnU +tPS +tPS +tPS +uXT +nEj +hpE +hpE +hpE +hpE +mlH +mlH +hpE +azA +azA nmy rhZ smK @@ -89797,7 +90622,7 @@ azA azA azA azA -bSF +rEO axb cBf cBf @@ -89807,7 +90632,7 @@ cBf cBf nrq aAO -doc +snR ojV hjp xFA @@ -89827,7 +90652,7 @@ cVP kiP uhS azA -doc +snR oXm okX nrq @@ -89910,14 +90735,14 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA -azA -azA +ndZ +rDi +rDi +rDi +rDi +rDi +rDi +uhS jKr dzm azA @@ -90007,9 +90832,6 @@ azA azA azA azA -dzm -ner -uVn bvo gLa inS @@ -90017,47 +90839,50 @@ inS inS inS bvo -uVn -vkP -vkP -vkP -vkP -gkE -mnv -tGE -vkP -hxl -hxl -vkP -tGE -lbi -dqu -vkP -ept -vkP -vkP -eEx -vln -tGE -ept -vkP -vkP -vkP -vln -gPN -nzI -vkP -vkP -vkP -vkP -aaI -dqu -tGE -vkP -vkP -vkP -vkP +bvo +sLI +azA +azA +azA +shl +azA +azA +azA +ahs +lmd +tPS +tPS +tPS +tPS +tPS +xxN +nfC +aXP +hnG +cZH +byy +tTv +nwb +bGS rhc +hpE +uVn +lmd +tPS +tPS +tPS +tPS +uXT +nEj +uVn +hpE +rAg +wsd +wsd +ixI +wsd +wsd +jQw rhZ kqU smK @@ -90099,7 +90924,7 @@ azA azA fJI azA -nwj +jjl axb grD kPD @@ -90109,7 +90934,7 @@ jzu cBf nrq ojt -doc +snR pNe bmg xFA @@ -90212,14 +91037,14 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA -azA -azA +snR +qfO +qfO +qfO +qfO +qfO +qfO +nrq azA jKr azA @@ -90309,9 +91134,6 @@ azA azA jWe azA -azA -ner -uVn hnd nwV fgO @@ -90319,48 +91141,51 @@ nwV kqf inS bvo +bvo +sLI +azA +azA +azA +shl +azA +azA +azA +ahs +lmd +tPS +tPS +tPS +tPS +tPS +cJB +nfC +vOv +tTv +oNG +jRD +jRD +ftP +bGS +rhc +hpE uVn -vkP -pvt -gPB -vkP -tGE -xMp -xMp -vkP -hxl -mnX -vkP -vln -gkE -xMp -vkP -vig -teQ -vkP -tGE -tGE -tGE -vkP -fwX -aQx -vkP -gkE -atw -dqu -vkP -bAG -lxY -vkP -tGE -nzI -tGE -vkP -jIl -tHr -vkP -hwA -rhZ +lmd +tPS +tPS +tPS +tPS +tPS +uXT +eAw +hpE +eAw +eAw +eAw +mVY +ybD +eAw +gXS +quO kqU smK smK @@ -90401,7 +91226,7 @@ azA azA azA azA -rvV +uUe axb ojV lSt @@ -90411,7 +91236,7 @@ fri cBf nrq mcp -doc +snR pNe wDv wDv @@ -90426,7 +91251,7 @@ uzn azA azA gwF -doc +snR myl nDM kiP @@ -90514,14 +91339,14 @@ azA azA azA azA -azA -jKr -azA -azA -azA -azA -azA -azA +snR +qfO +nDt +eJw +iHH +wHI +fbI +nrq azA azA azA @@ -90611,9 +91436,6 @@ dzm azA azA azA -azA -ner -uVn cIM hUb inS @@ -90621,48 +91443,51 @@ nbJ inS inS bvo +bvo +sLI +azA +azA +azA +shl +azA +azA +azA +ahs +lmd +tPS +tPS +tPS +eJc +eJc +cJB +nfC +cZH +tTv +tTv +tTv +tTv +hpE +bGS +rhc +hpE uVn -vkP -nqu -nqu -kiK -nzI -nzI -lbi -vkP -hxl -dUX -vkP -vln -vln -tGE -kiK -wOu -wOu -vkP -oNu -dqu -tGE -wJz -dZG -wdV -vkP -dWQ -tGE -tGE -kiK -cJZ -cJZ -vkP -dWQ -uWm -tGE -kiK -oVp -fze -vkP -qwc -rhZ +sqF +wsd +iwB +tPS +tPS +tPS +tPS +tPS +vfa +smK +smK +smK +uaS +uaS +smK +smK +smK kqU kqU smK @@ -90703,7 +91528,7 @@ azA azA azA azA -bSF +rEO nDM ojV lrM @@ -90728,7 +91553,7 @@ azA azA azA gwF -doc +snR cBf nDM nDM @@ -90816,14 +91641,14 @@ azA azA azA azA +snR +qfO +nrq azA -azA -azA -azA -azA -azA -azA -azA +wNx +aWT +fbI +nrq azA azA azA @@ -90843,7 +91668,7 @@ wTQ ctN isX azA -doc +snR cBf cBf cBf @@ -90913,9 +91738,6 @@ azA ndZ wfv wfv -uhS -ner -uVn hnd lIV inS @@ -90923,48 +91745,51 @@ inS inS oPH bvo +bvo +sLI +azA +azA +azA +shl +azA +azA +azA +ahs +sqF +wsd +wsd +wsd +wsd +wsd +wfN +hpE +jxg +tTv +vaZ +vlI +uRi +hpE +bGS +rhc +hpE +lWz uVn -vkP -fmr -jnj -vkP -tGE -tGE -vTy -ept -mnX -hxl -vkP -tGE -tGE -tGE -vkP -wwO -tDI -vkP -lbi -tGE -tGE -vkP -yap -tpA -vkP -tGE -tGE -xMp -vkP -onJ -vCa -vkP -tGE -nzI -xMp -vkP -cva -irI -vkP -izU -rhZ +uVn +lmd +tPS +tPS +tPS +tPS +tPS +smK +smK +smK +uaS +uaS +smK +smK +smK +smK kqU smK smK @@ -91005,7 +91830,7 @@ azA azA azA vJH -bSF +rEO nDM ojV cDh @@ -91118,14 +91943,14 @@ azA azA azA azA +snR +qfO +xkl azA azA -azA -azA -azA -azA -azA -azA +tsU +qfO +nrq azA azA azA @@ -91145,7 +91970,7 @@ azA azA gwF azA -doc +snR cBf cBf cBf @@ -91215,9 +92040,6 @@ azA snR rRz rRz -nrq -ner -uVn hnd hUb inS @@ -91225,46 +92047,49 @@ inS nbJ roD bvo -uVn -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -hxl -hxl -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -kiK -vkP -vkP -vkP -vkP -vkP -vkP -kiK -vkP -vkP -vkP -vkP -vkP -vkP -kiK -vkP -vkP -vkP -vkP -vkP -vkP +bvo +kAJ +uQH +uQH +uQH +sqv +azA +azA +azA +uXT +eAw +eAw +eAw +eAw +eAw +lKQ +jgy +hpE +hpE +hpE +hpE +hpE +hpE +hpE +pXA +uMS +hpE +hpE +rOZ +hpE +hpE +wsd +wsd +wsd +wsd +wsd +hpE +wsd +wsd +dDM +ixI +wsd +wsd ioi rhZ smK @@ -91307,7 +92132,7 @@ mDq mDq sAb azA -bSF +rEO nDM wak ljz @@ -91316,7 +92141,7 @@ ljz akl nrq aQq -doc +snR cBf cBf cBf @@ -91420,14 +92245,14 @@ azA azA azA azA +snR +qfO +qfO +cyW azA -azA -azA -azA -azA -azA -azA -azA +qfO +qfO +nrq azA azA azA @@ -91516,10 +92341,7 @@ tEg ndZ rRz rRz -nDt -ctN -ner -uVn +rRz bvo wnv inS @@ -91527,47 +92349,50 @@ jPD inS uhe bvo -uVn -uVn -uVn -uVn -uVn -uVn -uVn -vkP -hxl -hxl -hxl -mnX -hxl -oLh -oLh -oLh -mnX -hxl -vtH -hxl -uGX -hxl -hxl -hxl -hxl -hxl -vtH -hxl -ovf -oLh -oLh -hxl -hxl -hxl -mnX -uGX -hxl -vtH -bNB -vkP -ktI +bvo +bvo +bvo +bvo +bvo +bvo +bvo +azA +azA +azA +azA +azA +azA +azA +azA +svx +hpE +hpE +oKo +jZl +tTv +qyA +uRi +hpE +bGS +rhc +rhc +rhc +rhc +bok +hpE +eAw +eAw +eAw +eAw +eAw +hpE +jak +eAw +eAw +mVY +eAw +eAw +nEj weO smK eLo @@ -91722,14 +92547,14 @@ azA azA azA azA +snR +cBx +nrq azA azA -azA -azA -azA -azA -azA -azA +uzn +gAg +ctN azA azA azA @@ -91817,10 +92642,7 @@ azA tEg rRz rRz -cBf -nrq -azA -azA +rRz bvo bvo bvo @@ -91835,41 +92657,44 @@ bvo bvo bvo bvo -uVn -vkP -hxl -qTE -hxl -hxl -ycu -hxl -mnX -mnX -mnX -hxl -hxl -hxl -mnX -qmW -mnX -mnX -mnX -hxl -hxl -hxl -mnX -mnX -mnX -mnX -mnX -mnX -mnX -hxl -mnX -vtH -hxl -xCz -hwA +bvo +azA +azA +pty +rLZ +czG +czG +ufp +azA +svx +hpE +dTC +rci +kQP +tTv +tTv +mVy +dQz +bGS +rhc +rhc +rhc +rhc +cLN +hpE +vaB +azA +mbj +azA +hpE +hpE +hpE +cyW +rLN +rLN +azA +azA +ahs arq smK kqU @@ -92024,9 +92849,9 @@ azA azA azA azA -azA -azA -azA +gAg +wTQ +ctN azA azA azA @@ -92120,9 +92945,6 @@ tEg snR rRz rRz -nrq -azA -azA bvo jwc rJx @@ -92131,47 +92953,50 @@ sOC jgd rJx bvo -cbF +xCG lox uBR cbF lzA bvo -uVn -vkP -hxl -hxl -vtH -hxl -mnX -hxl -hxl -hxl -vtH -hxl -hxl -hxl -hxl -mnX -hxl -hxl -hxl -hxl -hxl -hxl -mnX -mnX -qTE -mnX -mnX -mnX -hxl -oLh -jhP -ovf -bNB -vkP -hwA +bvo +azA +azA +eQj +juY +czG +czG +ufp +azA +svx +hpE +jJE +tTv +tZw +paK +kid +wPF +dQz +rhc +rhc +tTv +tTv +tTv +gAE +hpE +erZ +pCk +chp +dLJ +gzB +hpE +cyW +rLN +cyW +azA +azA +azA +ahs lcl kqU eLo @@ -92422,9 +93247,6 @@ tEg snR vtr nDt -ctN -azA -azA bvo jwc inS @@ -92439,40 +93261,43 @@ uNU uNU eWZ bvo -uVn -vkP -hxl -mnX -hxl -mnX -hxl -vkP -vkP -wOQ -wOQ -wOQ -vkP -vkP -unx -unx -vkP -vkP -fKH -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP +bvo +azA +azA +rOB +juY +juY +juY +rOB +svx +svx +hpE +yhZ +fTn +jZl +tTv +tTv +qxp +pHg +rhc +rhc +bSi +eKW +eUG +uKK +hpE +wYZ +kxf +azA +aUc +erZ +loW +rLN +cyW +azA +azA +azA +azA aSa kUI kqU @@ -92539,7 +93364,7 @@ wTQ wTQ wTQ ctN -rvV +uUe yfB fFj cBf @@ -92635,7 +93460,7 @@ dDG jQV cDB jrq -ptb +gon azA azA azA @@ -92724,9 +93549,6 @@ tEg gAg wTQ ctN -azA -azA -azA ntt xvQ inS @@ -92741,40 +93563,43 @@ oVW uNU kiv bvo -uVn -vkP -mnX -hxl -hxl -mnX -hxl -vkP -dcd -dcd -tTv -ejo -vkP -sWE -sWE -sWE -sWE -vkP -ucp -ucp -vkP -vkP -sgn -qMB -qMB -qMB -qMB -qMB -qMB -qMB -qMB -qMB -ydO -ahs +bvo +azA +azA +rfs +eQj +dlS +juY +nUt +svx +azA +hpE +byQ +rhc +uMS +rhc +rhc +rhc +bGS +bGS +bGS +hpE +hpE +nwb +hpE +hpE +wYZ +oMd +azA +urs +azA +loW +cyW +azA +azA +azA +azA +azA aSa arq smK @@ -92827,7 +93652,7 @@ azA azA azA azA -doc +snR cBf cBf nrq @@ -92841,7 +93666,7 @@ azA azA azA azA -bSF +rEO wFd cBf pGM @@ -92937,7 +93762,7 @@ cBf dDG tgG cIT -ptb +gon azA azA azA @@ -93026,9 +93851,6 @@ tEg azA azA azA -azA -azA -azA hnd xiV inS @@ -93043,41 +93865,44 @@ veW uNU hoi bvo -uVn -vkP -hxl -mnX -hxl -mnX -vtH -wOQ -rhO -vPQ -vPQ -vPQ -vkP -sWE -sWE -sWE -sWE -vkP -qHt -bjI -dqC -vkP -sLI -rVP +bvo azA azA -jXc +unA +czG +dlS +rLZ +pty +azA +azA +hpE +byQ +rhc +pXA +sAQ +bGS +bGS +bGS +rhc +bGS +kEW +rUC +cMW +uCY +hpE +bra +erZ +qbB +cJw +azA +loW +azA azA azA azA azA azA -ner ahs -hwA nbU smK smK @@ -93129,7 +93954,7 @@ azA azA gwF xIf -doc +snR cBf cBf nrq @@ -93143,7 +93968,7 @@ azA azA azA azA -bSF +rEO wFd cBf pis @@ -93239,7 +94064,7 @@ cBf dDG eKs wKZ -ptb +gon azA azA azA @@ -93328,9 +94153,6 @@ tEg ong azA azA -azA -azA -azA hnd baM inS @@ -93345,41 +94167,44 @@ fhG uNU soe bvo -uVn -vkP -oLh -hxl -hxl -hxl -uGX -xtt -dcd -vPQ -vPQ -kQC -vkP -sWE -sWE -sWE -sWE -vkP -dtH -fpJ -dtH -vkP -sLI +bvo azA -ndZ -rDi -pWt -dzm -ndZ -uhS azA -ohQ -ner +fSI +rLZ +rLZ +czG +pty +azA +azA +hpE +fsB +tTv +ivO +tTv +tTv +qxp +pHg +rhc +rhc +hpE +rUC +rUC +uCY +hpE +hpE +hpE +cXl +mSP +oJp +hpE +qwc +azA +azA +azA +dYy +azA ahs -hwA kPz smK smK @@ -93431,7 +94256,7 @@ azA azA gwF gwF -doc +snR cBf cBf nrq @@ -93445,7 +94270,7 @@ azA azA azA azA -bSF +rEO wFd cBf cBf @@ -93541,7 +94366,7 @@ cBf nSu cBf iWE -ptb +gon azA azA azA @@ -93630,9 +94455,6 @@ tEg tuY wfv uhS -azA -azA -azA ntt iuf inS @@ -93647,41 +94469,44 @@ pPx uNU soe bvo -uVn -vkP -oLh -hxl -hxl -hxl -hxl -ups -vPQ -aRb -vPQ +bvo +azA +azA +kiz +rLZ +pty +dlS +lFC +azA +azA hpE -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -vkP -sLI +oTO +eGN +kQP +tTv +wPF +kid +dQz +rhc +rhc +hpE +cMW +rUC +gaq +uCY +uCY +hpE +hWF +kxf +pCk +loW +azA +azA +azA +azA azA -doc -gMR -kiP -rDi -uer -nrq -dzm azA -ner ahs -hwA kPz smK smK @@ -93733,7 +94558,7 @@ azA azA azA azA -doc +snR cBf cBf nrq @@ -93747,7 +94572,7 @@ azA vJH azA azA -nwj +jjl yfB mgO mgO @@ -93932,9 +94757,6 @@ tEg snR qky nrq -azA -azA -azA bvo wDT inS @@ -93949,41 +94771,44 @@ oVW uNU xBk bvo -uVn -vkP -oLh -hxl -hxl -mnX -hxl -wOQ -vPQ -vPQ -vPQ -bhz -vkP -sgn -qMB -qMB -qMB -qMB -qMB -uAe -qMB -qMB -nqZ -shi -gAg -woz -cBf -joe -avm -nrq +bvo +azA +azA +azA +azA +azA +azA +azA +azA +azA +hpE +nwz +tTv +jZl +tTv +wPF +bSj +jRD +rhc +rhc +hpE +cMW +cMW +cMW +cMW +uCY +hpE +urs +erZ +azA +loW +azA +azA +azA +azA azA azA -ner ahs -hwA rhZ kqU smK @@ -94035,7 +94860,7 @@ azA azA dzm azA -doc +snR cBf cBf nrq @@ -94145,7 +94970,7 @@ kkQ cBf eGt cBf -ptb +gon azA azA azA @@ -94234,9 +95059,6 @@ tEg gAg wTQ ctN -azA -azA -azA bvo hxN inS @@ -94251,41 +95073,44 @@ uNU uNU voi bvo -uVn -vkP -hxl -hxl -hxl -hxl -hxl -vkP -vkP -vkP -vkP -vkP -vkP -sLI +bvo +rLf +rLf +rLf +rLf +rLf +rLf +rLf +rLf +rLf +hpE +tyQ +dTC +tZw +tTv +wPF +frG +uYN +rhc +rhc +hpE +kqB +tSg +cMW +cMW +lAy +hpE azA -jXc +azA +aQq +loW azA azA azA azA -ndZ -rDi -uhS azA -ndZ -mZx -gap -cBf -gMR -nrq -jXc azA -ner ahs -hwA rhZ kqU smK @@ -94337,7 +95162,7 @@ azA azA azA sHv -doc +snR cBf cBf nrq @@ -94447,7 +95272,7 @@ fxC kkQ cBf cBf -ptb +gon azA azA azA @@ -94536,9 +95361,6 @@ tEg azA azA gvU -azA -azA -azA rUx naX inS @@ -94553,41 +95375,44 @@ cbF lox mji bvo -uVn -vkP -hxl -vmd -mnX -vtH -hxl -vkP -uVn -uVn -uVn -uVn -uVn -sLI +bvo azA azA azA azA azA azA -sik -gMR -nrq azA -nIu -wTQ -gXD -wTQ -wTQ -vGi azA -dzm -ner +azA +hpE +hpE +hpE +hpE +hpE +hpE +hpE +hpE +uMS +uMS +hpE +mlH +mlH +mlH +hpE +hpE +hpE +rLf +rLf +rLf +hpE +azA +azA +azA +azA +azA +azA ahs -hwA rhZ kqU smK @@ -94639,12 +95464,12 @@ azA azA azA azA -doc +snR cBf cBf nrq azA -doc +snR cBf cBf cBf @@ -94838,9 +95663,6 @@ tEg azA azA azA -azA -azA -azA xNb xiV inS @@ -94855,41 +95677,44 @@ bvo bvo bvo bvo -uVn -vkP -mnX -mnX -hxl -hxl -oLh -vkP -uVn -uVn -uVn -axO -axO -ijk -vgK -axO -vgK -ijk -shL -axO -hUC -uGc -uyr -lpb +bvo azA azA +ljW +azA +azA +azA +azA +azA +hOl +lmd +tfP +gDP +smK +gDP +smK +piZ +hpE +rhc +rhc +gYV +rhc +rhc +cpU +gYV +fLe +hpE +azA +azA +azA +azA +qwc +azA azA -dzm azA -dzm azA azA -ner ahs -hwA rhZ mjp aMj @@ -94941,12 +95766,12 @@ azA azA azA azA -doc +snR cBf cBf nrq azA -doc +snR cBf feD snV @@ -95140,9 +95965,6 @@ tEg azA azA azA -azA -azA -azA rUx baM inS @@ -95151,6 +95973,9 @@ iUm inS jwc bvo +azA +azA +azA sgn qMB qMB @@ -95158,40 +95983,40 @@ qMB qMB qMB ydO -vkP -oit -hxl -mnX -hxl -oLh -vkP -uVn -uVn -cgu -axO -wGw -rdk -rdk -rdk -rdk -rdk -kjL -axO -cBf -avm -cBf -nrq azA -qtW +azA +azA +azA +ljW +ahs +lmd +tfP +gDP +smK +ekZ +smK +smK +hpE +rhc +rhc +rhc +rhc +rhc +rhc +rhc +rhc +hpE +azA +azA +azA +azA +azA azA azA azA azA azA -slm -ner ahs -hwA rhZ luk nOi @@ -95243,12 +96068,12 @@ azA azA azA azA -doc +snR cBf cBf nrq azA -doc +snR cBf cBf cBf @@ -95281,25 +96106,25 @@ hKk azA azA azA +axO +axO +axO +axO +axO +axO +axO +shL +axO +hUC +uGc +uyr +lpb azA azA azA +dzm azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA +dzm azA azA azA @@ -95442,9 +96267,6 @@ tEg azA azA azA -azA -azA -azA xNb baM vbj @@ -95453,6 +96275,9 @@ inS wMg jwc bvo +azA +azA +azA sLI xUy hYq @@ -95460,40 +96285,40 @@ hYq hYq xUy ner -vkP -jCz -hxl -hxl -hxl -oLh -vkP -uVn -uVn -uVn -tdR -yjr -rdk -dZQ -nLc -qjd -bBF -yba -axO -axO -axO -axO -axO -axO -vgK -ijk -axO -axO -vgK -ijk -axO -mUB +azA +azA +azA +azA +bho +jQw +lmd +tfP +gDP +smK +gDP +smK +smK +hpE +rhc +rhc +vPt +rhc +rhc +vPt +fiF +iBf +hpE +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA ahs -hwA rhZ gtc lxu @@ -95545,12 +96370,12 @@ azA azA azA ojt -doc +snR cBf cBf nrq ojt -doc +snR cBf ofC fzw @@ -95583,27 +96408,27 @@ hKk azA azA azA +axO +wGw +rdk +rdk +rdk +rdk +rdk +kjL +axO +cBf +avm +cBf +nrq azA -azA -azA -azA -azA -ndZ -rDi -rDi -rDi -rDi -rDi -rDi -uhS -azA -azA -azA +qtW azA azA azA azA azA +slm azA azA ecE @@ -95744,9 +96569,6 @@ tEg jKr azA azA -azA -azA -azA bvo pVT inS @@ -95755,6 +96577,9 @@ uPX inS lBY bvo +azA +azA +azA sLI hYq mWz @@ -95762,40 +96587,40 @@ mWz hra hYq ner -vkP -jCz -hxl -mnX -hxl -hxl -vkP +azA +ljW +azA +azA +ahs uVn -axO -axO -axO -iNn -rdk -suy -jBW -ngc -fGa -yba -rdk -qAP -ggF -xvq -aeE -eco -vxq -cSH -ymf -qrg -mBm -xom -eTC -axO +lmd +tfP +smK +smK +smK +smK +smK +hpE +rOd +rOd +hpE +uJz +uJz +hpE +rOd +rOd +hpE +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA ahs -hwA kPz gtc ybl @@ -95826,9 +96651,9 @@ uMn wYW azA azA -azA -azA -azA +ndZ +rDi +eMO azA azA azA @@ -95847,12 +96672,12 @@ azA azA azA azA -doc +snR cBf cBf nrq azA -doc +snR cBf mXD cBf @@ -95885,27 +96710,27 @@ hKk azA azA azA -azA -azA -azA -azA -azA -snR -qfO -qfO -qfO -qfO -qfO -qfO -nrq -azA -azA -azA -azA -azA -azA -azA -azA +tdR +yjr +rdk +dZQ +nLc +qjd +bBF +yba +axO +axO +axO +axO +axO +axO +vgK +ijk +axO +axO +vgK +ijk +axO azA azA ecE @@ -96046,9 +96871,6 @@ tEg dzm azA azA -azA -azA -azA bvo jwc inS @@ -96057,6 +96879,9 @@ hUb inS gLw bvo +azA +azA +azA sLI hYq jFm @@ -96064,39 +96889,39 @@ mWz hra hYq ner -vkP -rek -mnX -hxl -hxl -mnX -vkP +azA +azA +azA +azA +ahs uVn -axO -mfx -jRZ -wnP -rdk -rdk -nNR -yba -rdk -rdk -rdk -rdk -rdk -rdk -rdk -pyY -ozC -rdk -rdk -rdk -vxq -rdk -rPH -axO -axO +lmd +tfP +smK +smK +smK +smK +smK +pDU +lmd +azA +qwc +azA +azA +qwc +azA +azA +qwc +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA aSa rhZ luk @@ -96128,15 +96953,15 @@ aqO wYW azA azA -azA -azA -azA -azA +sik +gMR +nrq dzm +ndZ +uhS azA azA -azA -azA +ohQ azA azA azA @@ -96149,12 +96974,12 @@ omf omf omf uhS -doc +snR cBf cBf nrq azA -doc +snR cBf feD cBf @@ -96185,30 +97010,30 @@ azA azA hKk azA -azA -azA -azA -azA -azA -azA -azA -snR -qfO -nDt -eJw -iHH -wHI -fbI -nrq -azA -azA -azA -azA -azA -azA -azA -azA -azA +axO +axO +axO +iNn +rdk +suy +jBW +ngc +fGa +yba +rdk +qAP +ggF +xvq +aeE +eco +vxq +cSH +ymf +qrg +mBm +xom +eTC +axO azA ecE pka @@ -96348,9 +97173,6 @@ tEg jWe azA azA -azA -azA -azA xNb baM inS @@ -96359,6 +97181,9 @@ iUm inS sPl bvo +azA +azA +azA sLI hYq mWz @@ -96366,40 +97191,40 @@ mWz mWz hYq ner -vkP -hxl -mnX -hxl -hxl -hxl -vkP +azA +azA +azA +azA +ahs uVn -axO -pyY -rdk -ozC -rdk -jCV -jZF -swK -mOk -vxq -rdk -mOk -wsn -gMb -mOk -gtb -rdk -rup -flS -fpo -rdk -jkv -rdk -nvC -wWn -hwA +lmd +tfP +smK +smK +smK +smK +smK +ahs +lmd +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +ahs rhZ hiH kFH @@ -96430,16 +97255,16 @@ tZU wYW azA azA +snR +gMR +kiP +rDi +uer +nrq +dzm azA azA azA -azA -azA -azA -azA -azA -jHW -azA dzm azA azA @@ -96451,12 +97276,12 @@ wVv eZQ eZQ nrq -doc +snR cBf cBf nrq azA -doc +snR cBf cBf cBf @@ -96487,31 +97312,31 @@ azA azA hKk azA -azA -azA -azA -azA -azA -azA -azA -snR -qfO -nrq -azA -wNx -aWT -fbI -nrq -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA +axO +mfx +jRZ +wnP +rdk +rdk +nNR +yba +rdk +rdk +rdk +rdk +rdk +rdk +rdk +pyY +ozC +rdk +rdk +rdk +vxq +rdk +rPH +axO +axO ecE pka azA @@ -96541,7 +97366,7 @@ cpq egT qZA sLI -doc +snR hYR cBf nrq @@ -96650,9 +97475,6 @@ tEg azA azA azA -azA -azA -azA rUx baM wMg @@ -96661,6 +97483,9 @@ inS lCY rug bvo +azA +azA +azA sLI hYq hra @@ -96668,40 +97493,40 @@ mWz mWz hYq ner -vkP -oLh -hxl -hxl -hxl -oLh -vkP +azA +azA +ljW +azA +ahs uVn -axO -rdk -laF -iBY -rdk -qzi -mvC -fBy -uSv -rdk -rdk -vZc -mOk -hHP -enj -xOi -iSc -rhA -xnp -rdk -rdk -rdk -rdk -ybL -xaK -hwA +lmd +tfP +smK +smK +smK +smK +smK +ahs +lmd +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +ahs rhZ smK kqU @@ -96732,12 +97557,12 @@ aqO wYW azA azA -azA -azA -azA -azA -azA -azA +gAg +woz +cBf +joe +avm +nrq azA azA azA @@ -96753,7 +97578,7 @@ xCc gBk eZQ nrq -doc +snR cBf cBf nrq @@ -96789,31 +97614,31 @@ azA azA hKk azA -azA -azA -azA -azA -azA -azA -azA -snR -qfO -xkl -azA -azA -tsU -qfO -nrq -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA +axO +pyY +rdk +ozC +rdk +jCV +jZF +swK +mOk +vxq +rdk +mOk +wsn +gMb +mOk +gtb +rdk +rup +flS +fpo +rdk +jkv +rdk +nvC +wWn ecE pka azA @@ -96952,9 +97777,6 @@ tEg azA azA azA -azA -azA -azA xNb baM inS @@ -96963,6 +97785,9 @@ inS inS gLw bvo +azA +azA +azA sLI hYq jgs @@ -96970,40 +97795,40 @@ mWz mWz hYq ner -vkP -bNB -hxl -iVA -hxl -bNB -vkP -uVn -axO -fnx -qjq -laY -rdk -rdk -yba -rdk -rNa -rdk -rdk -rdk -vxq -rdk -rdk -rdk -rdk -rdk -ozC -rdk -kjL -pyY -fOT -axO -axO -hwA +azA +azA +azA +azA +aOB +nEj +lmd +tfP +smK +smK +smK +smK +smK +ahs +lmd +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +ahs rhZ smK kqU @@ -97034,13 +97859,13 @@ wYW wYW azA azA -azA -azA -azA -dzm -azA -azA -dzm +ndZ +mZx +gap +cBf +gMR +nrq +jXc azA azA azA @@ -97055,7 +97880,7 @@ uyy eZQ eZQ nrq -doc +snR cBf cBf nrq @@ -97091,31 +97916,31 @@ azA azA hKk azA -azA -azA -azA -azA -azA -azA -azA -snR -qfO -qfO -cyW -azA -qfO -qfO -nrq -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA +axO +rdk +laF +iBY +rdk +qzi +mvC +fBy +uSv +rdk +rdk +vZc +mOk +hHP +enj +xOi +iSc +rhA +xnp +rdk +rdk +rdk +rdk +ybL +xaK ecE pka azA @@ -97254,9 +98079,6 @@ tEg azA azA azA -azA -azA -azA bvo kim baM @@ -97265,6 +98087,9 @@ baM baM ogu bvo +azA +azA +azA sLI xUy hYq @@ -97272,40 +98097,40 @@ xKt hYq xUy ner -vkP -vkP -gqN -vkP -gqN -vkP -vkP -uVn -axO -jGd -kMT -gcP -cSH -rdk -ozC -skZ -rdk -rdk -rdk -kKl -rnE -aaC -nkV -ayd -qil -uQU -aso -rdk -uQU -kSD -axO -axO -qOr -hwA +azA +azA +azA +azA +azA +ahs +lmd +tfP +smK +smK +smK +smK +smK +ahs +lmd +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +azA +ahs kPz kqU kqU @@ -97336,14 +98161,14 @@ mUU loW azA azA +nIu +wTQ +gXD +wTQ +wTQ +vGi azA -azA -azA -azA -azA -azA -azA -azA +dzm azA azA azA @@ -97357,7 +98182,7 @@ omf omf omf ctN -doc +snR cBf cBf nrq @@ -97393,31 +98218,31 @@ azA azA hKk azA -azA -azA -azA -azA -azA -azA -azA -snR -cBx -nrq -azA -azA -uzn -gAg -ctN -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA +axO +fnx +qjq +laY +rdk +rdk +yba +rdk +rNa +rdk +rdk +rdk +vxq +rdk +rdk +rdk +rdk +rdk +ozC +rdk +kjL +pyY +fOT +axO +axO ecE pka azA @@ -97556,9 +98381,6 @@ tEg azA azA azA -azA -azA -azA bvo bvo rUx @@ -97567,6 +98389,9 @@ ajV xNb bvo bvo +azA +azA +azA kAJ uQH uQH @@ -97574,59 +98399,26 @@ uQH uQH uQH mUB -fKQ -fKQ -fKQ -kBr -fKQ -xvX -fKQ -uVn -axO -axO -axO -axO -axO -axO -rpZ -eTC -wUg -qWN -wUg -vgK -axO -axO -axO -vgK -ijk -axO -cym -cym -axO -vgK -axO -qOr -cMW -hwA -rhZ -kqU -kqU -smK -yky azA azA -lhS azA azA azA +ahs +lmd +tfP +smK +smK +smK +smK +smK +diZ +lmd +azA azA azA azA -lhS azA -ahs -fKQ -lmd azA azA azA @@ -97635,21 +98427,31 @@ azA azA azA azA -pQi azA azA azA azA azA +ahs +rhZ +kqU +kqU +smK +yky azA azA +lhS azA azA azA azA azA azA +lhS azA +ahs +fKQ +lmd azA azA azA @@ -97658,11 +98460,8 @@ azA azA azA azA +pQi azA -doc -cBf -cBf -nrq azA azA azA @@ -97685,6 +98484,10 @@ azA azA azA azA +snR +cBf +cBf +nrq azA azA azA @@ -97693,7 +98496,6 @@ azA azA azA azA -hKk azA azA azA @@ -97702,9 +98504,6 @@ azA azA azA azA -gAg -wTQ -ctN azA azA azA @@ -97719,7 +98518,33 @@ azA azA azA azA +hKk azA +axO +jGd +kMT +gcP +cSH +rdk +ozC +skZ +rdk +rdk +rdk +kKl +rnE +aaC +nkV +ayd +qil +uQU +aso +rdk +uQU +kSD +axO +axO +qOr ecE pka azA @@ -97881,8 +98706,16 @@ wsd wsd wsd wsd +jQw +sqF wsd wsd +tMH +smK +smK +bff +jQw +sqF wsd wsd wsd @@ -97901,15 +98734,7 @@ wsd wsd wsd wsd -wsd -wsd -wsd -wsd -wsd -wsd -wsd -hwA -hwA +jQw rhZ smK kqU @@ -97961,7 +98786,7 @@ azA azA azA azA -doc +snR cBf cBf nrq @@ -97997,31 +98822,31 @@ azA azA hKk azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA +axO +axO +axO +axO +axO +axO +rpZ +eTC +wUg +qWN +wUg +vgK +axO +axO +axO +vgK +ijk +axO +cym +cym +axO +vgK +axO +qOr +gzB ecE pka azA @@ -98187,10 +99012,10 @@ eAw eAw eAw eAw -eAw -eAw -eAw -nQB +nAH +smK +smK +rzw eAw eAw eAw @@ -104799,7 +105624,7 @@ yfv yfv azA azA -ftA +igE smK smK smK @@ -105101,7 +105926,7 @@ yfv yfv azA azA -ftA +igE smK smK smK @@ -105403,7 +106228,7 @@ yfv yfv azA azA -ftA +igE smK smK smK @@ -105705,7 +106530,7 @@ yfv azA azA azA -ftA +igE smK smK smK @@ -106007,7 +106832,7 @@ yfv azA azA azA -ftA +igE smK smK cNV @@ -106309,7 +107134,7 @@ yfv azA azA azA -ftA +igE smK smK cNV @@ -110157,7 +110982,7 @@ gSF qxS dZM gIe -xPy +fiL uow voV aYI @@ -111208,7 +112033,7 @@ eGT eGT eGT rrR -doc +snR avm rRz cBf @@ -111443,7 +112268,7 @@ azA azA azA azA -ftA +igE cNV cNV smK @@ -111510,7 +112335,7 @@ eGT eGT gRu rrR -doc +snR tey rRz rRz @@ -111745,7 +112570,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -111812,7 +112637,7 @@ rrR rrR rrR rrR -doc +snR cBf rRz cBf @@ -112047,7 +112872,7 @@ azA azA azA jXc -ftA +igE smK smK smK @@ -112349,7 +113174,7 @@ azA azA azA azA -ftA +igE cKE smK smK @@ -112651,7 +113476,7 @@ azA azA azA azA -ftA +igE cKE cKE smK @@ -112953,7 +113778,7 @@ azA azA azA azA -ftA +igE smK cKE cKE @@ -113255,7 +114080,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -113557,7 +114382,7 @@ azA azA dzm azA -ftA +igE smK smK smK @@ -113859,7 +114684,7 @@ yfv azA azA dzm -ftA +igE smK smK smK @@ -114161,7 +114986,7 @@ azA azA azA azA -ftA +igE smK smK cNV @@ -114463,7 +115288,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -114765,7 +115590,7 @@ azA azA azA azA -ftA +igE smK cKE smK @@ -114914,7 +115739,7 @@ dKv fRa ckK iwB -doc +snR aiJ cBf kiP @@ -115067,7 +115892,7 @@ azA azA azA azA -ftA +igE cNV eJc cKE @@ -115216,7 +116041,7 @@ ssm hyb hyb lmd -doc +snR dOy okX cBf @@ -115369,7 +116194,7 @@ azA azA azA azA -ftA +igE eJc cNV eJc @@ -115518,7 +116343,7 @@ cQV kgs hyb lmd -doc +snR uAt dOy cBf @@ -115671,7 +116496,7 @@ azA azA azA azA -ftA +igE eJc cNV eJc @@ -115820,7 +116645,7 @@ jjU ioi vXl lmd -doc +snR kwy orl dEx @@ -116122,7 +116947,7 @@ tlA tlA ktw lmd -doc +snR cBf asG cBf @@ -116813,7 +117638,7 @@ azA azA azA tEg -doc +snR cBf hYR vbX @@ -117115,7 +117940,7 @@ azA azA azA tEg -doc +snR cBf hZS vIW @@ -117417,7 +118242,7 @@ azA azA azA tEg -doc +snR cBf cBf oLu @@ -119158,7 +119983,7 @@ cKE sJc sLI azA -doc +snR cBf cBf kiP @@ -119417,7 +120242,7 @@ dCa ori pzp gwF -doc +snR cBf nrq eNA @@ -119460,7 +120285,7 @@ smK sJc sLI azA -doc +snR cBf cBf cBf @@ -119762,7 +120587,7 @@ smK sJc sLI azA -doc +snR cBf cBf geq @@ -120073,7 +120898,7 @@ wTQ ctN azA azA -doc +snR cBf nrq azA @@ -120375,7 +121200,7 @@ vFX mZc mZc azA -doc +snR cBf kiP uhS @@ -120625,7 +121450,7 @@ xsl ixa pzp kJn -doc +snR cBf nrq eNA @@ -120677,7 +121502,7 @@ iYG dcB mZc azA -doc +snR cBf cBf nrq @@ -120700,7 +121525,7 @@ azA azA azA azA -doc +snR cBf rRz cBf @@ -120927,7 +121752,7 @@ lpg ixa pzp bGM -doc +snR cBf nrq eNA @@ -120979,7 +121804,7 @@ uyw iYG mZc azA -doc +snR cBf cBf kiP @@ -121002,7 +121827,7 @@ azA azA azA azA -doc +snR kFh rRz cBf @@ -121105,7 +121930,7 @@ xXx xXx xXx xXx -rxs +hrk bff tMH fLp @@ -121229,7 +122054,7 @@ xsl xsl pzp kJn -doc +snR cBf nrq eNA @@ -121281,7 +122106,7 @@ azA uyw mZc azA -doc +snR cBf cBf cBf @@ -121304,7 +122129,7 @@ azA azA azA azA -doc +snR rRz rRz rRz @@ -121531,14 +122356,14 @@ gaw pzp dTv xQq -doc +snR cBf nrq eNA msE amS vKh -doc +snR kGt uVn sqC @@ -121583,7 +122408,7 @@ afB azA tlA azA -doc +snR cBf nDt bfq @@ -121833,7 +122658,7 @@ tEA jxw aHV lmd -doc +snR cBf dxL eNA @@ -121885,7 +122710,7 @@ pxi tUU mZc azA -doc +snR cBf nrq gAg @@ -122135,7 +122960,7 @@ jem aHQ pzp hKZ -doc +snR cBf nrq eNA @@ -122187,7 +123012,7 @@ iMH hBN mZc azA -doc +snR cBf nrq azA @@ -122196,7 +123021,7 @@ azA azA azA azA -doc +snR cBf cBf dEl @@ -122489,7 +123314,7 @@ mZc fPH mZc azA -doc +snR cBf nXa ndZ @@ -122507,7 +123332,7 @@ azA qhT xSB azA -doc +snR cBf cBf cBf @@ -122743,9 +123568,9 @@ mjp mjp mjp mjp -cYh +msE nrq -doc +snR dEx kiP nZj @@ -122791,7 +123616,7 @@ azA azA mZc azA -doc +snR cBf kiP hUC @@ -123093,7 +123918,7 @@ azA dzm azA azA -doc +snR cBf cBf avm @@ -123697,7 +124522,7 @@ azA azA mZc azA -doc +snR cBf cBf cBf @@ -124240,7 +125065,7 @@ pLm cBf nDt ctN -doc +snR cBf cBf dCa @@ -124302,7 +125127,7 @@ azA mZc azA azA -doc +snR cBf dEl azA @@ -124542,7 +125367,7 @@ cBf nDt ctN azA -doc +snR cBf cBf ori @@ -124624,7 +125449,7 @@ azA azA azA azA -doc +snR gkD cBf nQv @@ -124686,7 +125511,7 @@ azA azA azA azA -doc +snR cBf cBf nrq @@ -124844,7 +125669,7 @@ wTQ ctN azA azA -doc +snR cBf rjn pzp @@ -124926,7 +125751,7 @@ azA azA azA azA -doc +snR cBf rRz rRz @@ -124988,7 +125813,7 @@ azA azA azA gDr -doc +snR cBf cBf kiP @@ -125892,7 +126717,7 @@ azA azA azA azA -doc +snR cBf cBf dEx @@ -126194,7 +127019,7 @@ azA azA jWe azA -doc +snR cBf cBf iSY @@ -127201,7 +128026,7 @@ xXx nNW xXx xXx -liJ +qfV rlV wuZ xXx @@ -127503,7 +128328,7 @@ xXx xXx vLn xXx -liJ +qfV rlV wuZ xXx @@ -127696,7 +128521,7 @@ cBf czD dEl dzm -doc +snR cBf cBf dbJ @@ -127805,7 +128630,7 @@ xXx xXx xXx vLn -liJ +qfV rlV wuZ xXx @@ -127950,7 +128775,7 @@ azA azA azA azA -doc +snR nrq azA gAg @@ -128107,7 +128932,7 @@ tkN jxR xXx xXx -liJ +qfV rlV wuZ xXx @@ -128374,7 +129199,7 @@ gOy wwh cAr lmd -yke +aNG bPg nYs kEf @@ -128409,7 +129234,7 @@ mPo tkN mPo mPo -liJ +qfV rlV wuZ mPo @@ -128711,7 +129536,7 @@ xXx pfB xXx ouW -liJ +qfV rlV wuZ xXx @@ -128753,7 +129578,7 @@ oZJ mDq mDq upl -doc +snR kuV kOP axj @@ -128852,7 +129677,7 @@ azA azA azA azA -doc +snR fpB nrq azA @@ -129013,7 +129838,7 @@ xXx xXx xXx xXx -liJ +qfV rlV wuZ xXx @@ -129055,7 +129880,7 @@ rDi rDi uhS hKk -doc +snR kuV kuV eyn @@ -129280,7 +130105,7 @@ tkd dvG uVn lcl -rxs +hrk kZg kPG kPG @@ -129301,9 +130126,9 @@ pVX uta nzT qku -qrd -qrd -qrd +wVL +wVL +wVL gmz wuZ xXx @@ -129315,7 +130140,7 @@ xXx vLn xXx pfB -liJ +qfV rlV wuZ xXx @@ -129394,7 +130219,7 @@ azA azA azA azA -doc +snR cBf cBf cBf @@ -129617,7 +130442,7 @@ bVk xOt xOt gAO -liJ +qfV rlV ivA blp @@ -130203,9 +131028,9 @@ rlV dfk cuo cuo -qrd +wVL cuo -qrd +wVL cuo wuZ xXx @@ -130499,9 +131324,9 @@ rlV vIu cuo cuo -qrd +wVL qHJ -qrd +wVL vaI rlV rlV @@ -130610,7 +131435,7 @@ azA azA eaR azA -doc +snR dsF rEX rEX @@ -130661,7 +131486,7 @@ gwF azA azA azA -ftA +igE odS odS yky @@ -130825,7 +131650,7 @@ hde emD hci urq -liJ +qfV rlV sli nAl @@ -130912,7 +131737,7 @@ azA azA baQ azA -doc +snR cBf cBf cBf @@ -130963,7 +131788,7 @@ gwF azA azA azA -ftA +igE odS odS yky @@ -130972,7 +131797,7 @@ azA azA fhT azA -doc +snR cBf iPw tkj @@ -131274,7 +132099,7 @@ fag fag rQw azA -doc +snR cBf tBE cBf @@ -131429,7 +132254,7 @@ xXx xXx xXx xXx -liJ +qfV rlV wuZ xXx @@ -131483,7 +132308,7 @@ azA azA azA azA -doc +snR qRw rRz igR @@ -131731,7 +132556,7 @@ lkq lkq lkq iMf -liJ +qfV rlV wuZ xXx @@ -132385,7 +133210,7 @@ azA azA azA azA -doc +snR rdh nrq hKk @@ -132939,7 +133764,7 @@ pDe iHf iHf aEW -liJ +qfV rlV wuZ xXx @@ -133126,7 +133951,7 @@ rRz rRz azA azA -doc +snR rRz rRz rRz @@ -133428,7 +134253,7 @@ rRz rRz azA azA -doc +snR cBf cBf cBf @@ -133730,7 +134555,7 @@ rRz azA azA azA -doc +snR cBf cBf nDt @@ -134092,7 +134917,7 @@ xCm xCm rlV oeA -rxs +hrk kyc snK fPb @@ -134348,7 +135173,7 @@ azA azA azA azA -doc +snR qQX dBZ cUb @@ -134394,7 +135219,7 @@ udM xCm wuZ xXx -rxs +hrk arq snK eJc @@ -134696,7 +135521,7 @@ tDK xCm aDY xXx -rxs +hrk rhZ vYk eJc @@ -134925,7 +135750,7 @@ azA azA azA azA -doc +snR irs cBf rWb @@ -134998,7 +135823,7 @@ hQv xCm ijD xXx -rxs +hrk rhZ tfP eJc @@ -135227,7 +136052,7 @@ azA azA azA azA -doc +snR wfq cBf cBf @@ -135300,7 +136125,7 @@ pbS xCm gKS xXx -rxs +hrk rhZ tfP eJc @@ -135602,7 +136427,7 @@ ujr xCm aDY sXi -rxs +hrk rhZ tfP eJc @@ -135904,7 +136729,7 @@ xNh bdw lgL sNK -rxs +hrk arq gaI smK @@ -137716,7 +138541,7 @@ vlb gwI lgL aDY -rxs +hrk rhZ snK eJc @@ -138018,7 +138843,7 @@ sbw bof tCM ijD -rxs +hrk eeo gTY wsh @@ -138320,7 +139145,7 @@ wVs aqa tCM aDY -rxs +hrk azA dzm xOE @@ -138622,7 +139447,7 @@ lzc aqa tCM gKS -rxs +hrk bbF hGQ dVN @@ -138924,7 +139749,7 @@ bUm wCn bdw wuZ -rxs +hrk arq gaI eJc @@ -139226,7 +140051,7 @@ tCM bdw bdw wuZ -rxs +hrk kyc snK cKE @@ -139528,7 +140353,7 @@ fMD nAl nAl oeA -rxs +hrk kyc snK cKE @@ -139698,7 +140523,7 @@ azA azA azA azA -doc +snR cBf cBf cBf @@ -139830,7 +140655,7 @@ xXx xXx xXx vLn -rxs +hrk hpH vYk eJc @@ -140000,7 +140825,7 @@ azA azA azA azA -doc +snR cBf cBf cBf @@ -140132,7 +140957,7 @@ xXx xXx xXx xXx -rxs +hrk rhZ tfP smK @@ -140302,7 +141127,7 @@ azA azA azA azA -doc +snR cBf cBf cBf @@ -140582,9 +141407,9 @@ gHO slu dzm umv -dDp -dDp -dDp +mDq +mDq +mDq upl azA jKr @@ -141038,7 +141863,7 @@ cvW jmq iws jJf -dnd +kRX gvc tfP smK @@ -141186,9 +142011,9 @@ wli slu azA umv -dDp -dDp -dDp +mDq +mDq +mDq vgc xdw xdw @@ -143137,7 +143962,7 @@ xXx xXx xXx feo -liJ +qfV rlV rlV rlV @@ -144134,7 +144959,7 @@ cBf cBf nDt ctN -xsF +mIv iaS lan lan @@ -144279,7 +145104,7 @@ ptU pIU nrq azA -doc +snR cBf sAl sAl @@ -144581,7 +145406,7 @@ mQw bKe amS azA -doc +snR cBf qkT wus @@ -144883,7 +145708,7 @@ ipF rQF amS azA -doc +snR cBf wus enf @@ -145185,7 +146010,7 @@ ipF bKe amS azA -doc +snR cBf oPV oPV @@ -145193,7 +146018,7 @@ cBf nXa azA azA -doc +snR nrq azA azA @@ -145495,7 +146320,7 @@ wTQ hdp azA azA -doc +snR nrq azA azA @@ -146181,7 +147006,7 @@ qrS smK eJc lnD -baS +rCK rlV rlV rlV @@ -148176,7 +149001,7 @@ vcB mKy dzm azA -doc +snR tkj dai wfq @@ -148478,7 +149303,7 @@ bAm vcB azA azA -doc +snR lVe plm wTq @@ -151982,7 +152807,7 @@ qUU ckV ula rhJ -iRq +ojP gxZ gxZ ocH @@ -152042,7 +152867,7 @@ uUG iWl iWl iWl -doc +snR cBf gqa nrq @@ -152284,7 +153109,7 @@ hzY uSB dHA ruG -iRq +ojP gxZ gxZ ipX @@ -152344,7 +153169,7 @@ jjQ iWl qWB azA -doc +snR cBf twD nrq @@ -152646,7 +153471,7 @@ uSl iWl azA azA -doc +snR cBf cBf ckE @@ -152948,7 +153773,7 @@ vhA iWl azA azA -doc +snR cBf okX nrq @@ -153615,7 +154440,7 @@ gsh odS odS ioj -doc +snR wfq tkj nrq @@ -153917,7 +154742,7 @@ gsh odS odS ioj -doc +snR cBf mTU gFm @@ -155837,7 +156662,7 @@ nDt wTQ wTQ ctN -ftA +igE smK smK smK @@ -156139,7 +156964,7 @@ yfv yfv azA azA -ftA +igE smK smK smK @@ -156441,7 +157266,7 @@ azA azA azA azA -ftA +igE smK smK uFP @@ -156743,7 +157568,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -157045,7 +157870,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -157347,7 +158172,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -157649,7 +158474,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -157951,7 +158776,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -158253,7 +159078,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -158555,7 +159380,7 @@ dzm azA azA azA -ftA +igE smK smK smK @@ -158776,7 +159601,7 @@ azA azA azA azA -doc +snR pIU pIU pIU @@ -158857,7 +159682,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -158997,7 +159822,7 @@ azA azA azA azA -ftA +igE uVn iWl nSA @@ -159078,7 +159903,7 @@ azA azA azA azA -doc +snR pIU hXl kIA @@ -159159,7 +159984,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -159299,7 +160124,7 @@ pwY xTy azA azA -ftA +igE uVn iWl iWl @@ -159380,7 +160205,7 @@ azA azA azA azA -doc +snR pIU nFF ipF @@ -159461,7 +160286,7 @@ azA azA azA azA -ftA +igE smK lxu smK @@ -159601,7 +160426,7 @@ azA azA azA azA -ftA +igE uVn uVn uVn @@ -159682,7 +160507,7 @@ rRz rRz azA azA -doc +snR pIU xAl ipF @@ -159763,7 +160588,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -159963,7 +160788,7 @@ odS ioj azA azA -doc +snR tvG cBf cBf @@ -159984,7 +160809,7 @@ rRz rRz azA azA -doc +snR pIU hcJ ipF @@ -160065,7 +160890,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -160080,7 +160905,7 @@ aOn jHe sct sct -iRq +ojP gxZ kRA rOF @@ -160265,7 +161090,7 @@ odS ioj azA azA -doc +snR cBf rWb cBf @@ -160286,7 +161111,7 @@ rRz rRz azA azA -doc +snR pIU kpZ ipF @@ -160367,7 +161192,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -160567,7 +161392,7 @@ odS ioj azA azA -doc +snR cBf cxW cBf @@ -160588,7 +161413,7 @@ rRz rRz azA azA -doc +snR pIU cpe ipF @@ -160669,7 +161494,7 @@ azA azA azA azA -ftA +igE smK smK cNV @@ -160869,7 +161694,7 @@ odS ioj azA azA -doc +snR cBf cBf kFh @@ -160890,7 +161715,7 @@ rRz rRz azA azA -doc +snR pIU pIU xyK @@ -160971,7 +161796,7 @@ azA azA azA azA -ftA +igE smK smK mfA @@ -161171,7 +161996,7 @@ odS ioj azA azA -doc +snR cBf cBf cBf @@ -161273,7 +162098,7 @@ azA azA azA azA -ftA +igE smK cKE cKE @@ -161473,7 +162298,7 @@ odS ioj azA azA -doc +snR hYR tvG cBf @@ -161495,7 +162320,7 @@ rRz rRz rRz azA -doc +snR pIU pIU pIU @@ -161575,7 +162400,7 @@ azA azA azA azA -ftA +igE smK cKE mJM @@ -161775,7 +162600,7 @@ odS ioj azA azA -oxz +obu cBf cBf cBf @@ -161797,7 +162622,7 @@ rRz rRz rRz azA -doc +snR cBf cBf aiJ @@ -161877,7 +162702,7 @@ azA azA azA azA -ftA +igE eJc cKE vjT @@ -162179,7 +163004,7 @@ azA azA azA azA -ftA +igE eJc mJM xys @@ -162481,7 +163306,7 @@ sfw azA azA azA -ftA +igE eJc vjT jKr @@ -162783,7 +163608,7 @@ sfw sfw yfv azA -ftA +igE eJc gTs dcx @@ -163006,7 +163831,7 @@ rRz rRz azA azA -doc +snR cBf gqa nrq @@ -163085,7 +163910,7 @@ sSl sSl dzm azA -ftA +igE eJc mfA vjT @@ -163308,7 +164133,7 @@ rRz rRz azA azA -doc +snR cBf twD nrq @@ -163387,7 +164212,7 @@ hDu hDu jKr jKr -ftA +igE eJc eJc vjT @@ -163450,7 +164275,7 @@ sct sct sct sct -iRq +ojP ruG xqq avH @@ -163610,7 +164435,7 @@ rRz rRz azA azA -doc +snR cBf cBf ckE @@ -163689,7 +164514,7 @@ hDu sSl yfv dzm -ftA +igE smK vgd gTs @@ -163752,7 +164577,7 @@ sct sct owY sct -iRq +ojP ruG klx aOn @@ -163912,7 +164737,7 @@ rRz rRz rRz azA -doc +snR cBf okX nrq @@ -163991,7 +164816,7 @@ sfw sfw azA azA -ftA +igE smK fPb cKE @@ -164054,7 +164879,7 @@ mfr mfr mfr mfr -iRq +ojP ruG avH vNK @@ -164293,7 +165118,7 @@ xFH azA azA azA -ftA +igE smK smK cKE @@ -164356,7 +165181,7 @@ aOn rcP cCM mfr -iRq +ojP ruG xqq lJC @@ -164595,7 +165420,7 @@ azA azA azA azA -ftA +igE smK smK eJc @@ -164658,7 +165483,7 @@ aOn rcP rcP mfr -iRq +ojP ruG xqq sHF @@ -164725,7 +165550,7 @@ azA azA xTy azA -doc +snR cBf dEx cBf @@ -164897,7 +165722,7 @@ azA azA azA azA -ftA +igE smK smK eJc @@ -164960,7 +165785,7 @@ pfI aOn jQU mfr -iRq +ojP ruG xqq coa @@ -165199,7 +166024,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -165262,7 +166087,7 @@ kkK aOn uel mfr -iRq +ojP ruG avH rSi @@ -165501,7 +166326,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -165564,7 +166389,7 @@ kkK trd qpN mfr -iRq +ojP ruG avH ecq @@ -165803,7 +166628,7 @@ azA azA azA ida -ftA +igE smK smK smK @@ -165866,7 +166691,7 @@ kkK trd alc mfr -iRq +ojP ruG xqq avH @@ -166168,7 +166993,7 @@ kkK trd qpN mfr -iRq +ojP eLC vsE vsE @@ -166470,7 +167295,7 @@ kkK trd vTo mfr -iRq +ojP gxZ gxZ gxZ @@ -166772,7 +167597,7 @@ vkz aOn fNz mfr -iRq +ojP mqq mqq mqq @@ -167011,7 +167836,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -167074,7 +167899,7 @@ aOn aOn aOn mfr -iRq +ojP gxZ gxZ gxZ @@ -167313,7 +168138,7 @@ azA azA azA azA -ftA +igE smK smK smK @@ -167376,7 +168201,7 @@ aOn aOn qpN mfr -iRq +ojP gxZ gxZ gxZ @@ -167615,7 +168440,7 @@ yfv azA azA azA -ftA +igE fnE smK smK @@ -167678,7 +168503,7 @@ mfr mfr mfr mfr -iRq +ojP gxZ gxZ gxZ @@ -167917,7 +168742,7 @@ yfv azA azA jWe -ftA +igE smK smK smK @@ -167980,7 +168805,7 @@ sct sct jcP hVV -iRq +ojP gxZ gxZ gxZ @@ -168219,7 +169044,7 @@ yfv azA azA azA -ftA +igE smK smK smK From 529c43113324aaa6cdbc4aabf2d147e83fffd6dd Mon Sep 17 00:00:00 2001 From: Defaulterrama <136886118+Defaulterrama@users.noreply.github.com> Date: Wed, 4 Mar 2026 13:36:15 -0500 Subject: [PATCH 2/6] current progress --- .../Vegas Valley/Vegas_Valley_Sky.dmm | 5245 ++++++++-------- .../Vegas Valley/Vegas_Valley_Surface.dmm | 5320 ++++++++++++----- 2 files changed, 6158 insertions(+), 4407 deletions(-) diff --git a/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm b/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm index 0f7e7fbcf1..ff1346f8b8 100644 --- a/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm +++ b/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm @@ -107,14 +107,10 @@ }, /area/f13/ncr) "am" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/kitchen/knife/butcher, -/obj/item/kitchen/rollingpin, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/desert, +/area/f13/ncr) "an" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/medical/ancientfirstaid, @@ -291,11 +287,6 @@ }, /turf/open/floor/wood_wide, /area/f13/followers) -"aP" = ( -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) "aR" = ( /obj/structure/fermenting_barrel{ pixel_y = 10; @@ -396,14 +387,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/showroomfloor, /area/maintenance/bar) -"bi" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood, -/obj/item/book/granter/crafting_recipe/gunsmith_two, -/obj/item/book/granter/crafting_recipe/gunsmith_one, -/obj/item/stack/ore/blackpowder/five, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "bj" = ( /obj/structure/rack, /obj/item/reagent_containers/food/snacks/f13/fancylads, @@ -439,10 +422,10 @@ }, /area/f13/building/powered) "bo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small, -/turf/open/floor/carpet/royalblack, -/area/f13/ambientlighting/building/g) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/f13/wood, +/area/f13/ncr) "bp" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -620,18 +603,16 @@ /turf/open/floor/wood_wide, /area/f13/legioncamp) "bQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/turf/open/floor/f13/wood{ - icon_state = "housewood3-broken" - }, -/area/f13/ambientlighting/building/g) +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrcorporal, +/turf/open/floor/f13/wood, +/area/f13/ncr) "bR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start/f13/ncrranger, -/turf/open/floor/wood_common{ - icon_state = "common-broken5" - }, +/obj/effect/decal/fakelattice, +/obj/structure/closet/crate/footlocker, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/f13/wood, /area/f13/ncr) "bS" = ( /obj/structure/table, @@ -809,9 +790,11 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "cr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/purple, -/area/f13/ambientlighting/building/g) +/obj/structure/fluff/railing{ + dir = 8 + }, +/turf/open/floor/plating/f13/outside/roof/metal/corrugated, +/area/f13/wasteland) "cs" = ( /obj/structure/sign/legion/veteran, /turf/closed/wall/f13/wood/house, @@ -823,11 +806,9 @@ }, /area/f13/building/abandoned/z) "cu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" - }, -/area/f13/ambientlighting/building/g) +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/f13/wood, +/area/f13/ncr) "cw" = ( /obj/structure/fluff/railing, /turf/open/transparent/openspace, @@ -923,20 +904,17 @@ }, /turf/open/transparent/openspace, /area/f13/building/powered) -"cN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa/right{ - dir = 8 - }, -/mob/living/simple_animal/hostile/raider/ranged/biker, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "cO" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1-broken" }, -/area/f13/ambientlighting/building/g) +/area/f13/wasteland) "cP" = ( /obj/structure/chair/comfy/shuttle, /turf/open/floor/carpet/royalblack, @@ -1141,16 +1119,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"dm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/shower{ - dir = 1 - }, -/obj/structure/curtain, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "dn" = ( /mob/living/simple_animal/hostile/supermutant/nightkin, /obj/effect/decal/cleanable/dirt, @@ -1197,15 +1165,11 @@ }, /area/f13/brotherhood/offices1st) "dv" = ( -/obj/structure/toilet{ - dir = 8; - icon_state = "toilet00" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrtrooper, +/turf/open/floor/f13/wood, +/area/f13/ncr) "dx" = ( /obj/structure/rack/large/shelf_rust, /obj/effect/turf_decal/bot_white, @@ -1221,11 +1185,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"dy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/blue, -/area/f13/ambientlighting/building/g) "dz" = ( /obj/machinery/pool/drain, /obj/machinery/shower{ @@ -1374,15 +1333,10 @@ /turf/open/floor/plating/f13/outside/roof/metal/corrugated/green, /area/f13/wasteland) "dX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/microwave/stove, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/turf/open/floor/f13/wood{ + icon_state = "housebase" }, -/area/f13/ambientlighting/building/g) +/area/f13/wasteland) "dY" = ( /obj/structure/railing{ color = "#A47449"; @@ -1410,11 +1364,11 @@ /turf/open/floor/carpet/blue, /area/f13/followers) "ec" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/f13/armor/random, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/obj/structure/fluff/railing{ + dir = 4 + }, +/turf/open/floor/plating/f13/outside/roof/metal/corrugated, +/area/f13/wasteland) "ee" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/weapon/melee/random_mid, @@ -2170,11 +2124,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/purple, /area/f13/building/powered) -"gr" = ( -/obj/structure/bed/old, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/purple, -/area/f13/ambientlighting/building/g) "gs" = ( /obj/structure/table/wood, /obj/item/lighter{ @@ -2238,14 +2187,9 @@ }, /area/f13/brotherhood/offices1st) "gE" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/raider/tribal{ - name = "Cannibal Chef" - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) +/obj/effect/landmark/start/f13/ncrsergeant, +/turf/open/floor/f13/wood, +/area/f13/ncr) "gF" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/bottle/instacoffee{ @@ -2365,11 +2309,6 @@ }, /turf/open/transparent/openspace, /area/f13/building/powered) -"gU" = ( -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/holofloor/carpet, -/area/f13/ambientlighting/building/g) "gV" = ( /obj/effect/turf_decal/loading_area, /obj/effect/decal/cleanable/oil, @@ -2526,17 +2465,22 @@ /turf/open/floor/wood_common, /area/f13/ncr) "hx" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, /turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" + icon_state = "housebase" }, -/area/f13/ambientlighting/building/g) +/area/f13/wasteland) "hy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/junk/small/table, -/turf/open/floor/carpet/purple, -/area/f13/ambientlighting/building/g) +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrsergeant, +/turf/open/floor/f13/wood, +/area/f13/ncr) "hA" = ( /obj/machinery/light/fo13colored/Red{ dir = 1; @@ -2632,10 +2576,15 @@ /turf/open/floor/wood_common, /area/f13/ncr) "hM" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/junk/cabinet, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) +/obj/item/bedsheet/blanket/blanketalt{ + layer = -7 + }, +/obj/structure/bed/wooden, +/obj/effect/overlay/junk/curtain, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) "hN" = ( /obj/effect/decal/cleanable/dirt, /obj/item/mmi/posibrain, @@ -2777,10 +2726,13 @@ }, /area/f13/building/abandoned/l) "il" = ( -/obj/structure/junk/small/bed, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/royalblack, -/area/f13/ambientlighting/building/g) +/obj/machinery/door/unpowered/secure_NCR{ + name = "Veteran Ranger's Lodging" + }, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) "im" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/supermutant/nightkin, @@ -2873,16 +2825,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) -"iD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/toilet{ - dir = 8; - icon_state = "toilet00" - }, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "iE" = ( /turf/open/transparent/openspace, /area/f13/building/abandoned/j) @@ -2918,18 +2860,10 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/side, /area/f13/building/powered) "iL" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/wood{ - dir = 1 - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) -"iN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/ammo/fiftypercent, -/turf/open/floor/carpet/royalblack, -/area/f13/ambientlighting/building/g) +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/plating/f13/outside/roof/metal/corrugated, +/area/f13/ncr) "iO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/simple_door/metal/store, @@ -2941,23 +2875,10 @@ /obj/structure/barricade/wooden/planks/pregame, /turf/open/floor/plating/rust, /area/f13/brotherhood/offices1st) -"iQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/effect/spawner/lootdrop/ammo/fiftypercent, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "iR" = ( /obj/structure/lattice, /turf/open/floor/plating/rust, /area/f13/building/powered) -"iS" = ( -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "iT" = ( /obj/structure/fence/wooden{ dir = 4; @@ -2986,12 +2907,8 @@ /turf/open/floor/wood_common, /area/engine/workshop) "iX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/blood/tracks, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "iY" = ( /obj/effect/turf_decal, /obj/structure/barricade/sandbags, @@ -3108,10 +3025,9 @@ }, /area/f13/building/powered) "jo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, +/obj/structure/closet/locker, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "jp" = ( /obj/structure/dresser, /turf/open/floor/carpet/vault, @@ -3428,15 +3344,15 @@ }, /area/f13/legioncamp) "ko" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/turf/open/floor/f13/wood{ + icon_state = "housebase4-broken" + }, +/area/f13/wasteland) "kq" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/junk/cabinet, -/turf/open/floor/carpet/purple, -/area/f13/ambientlighting/building/g) +/turf/open/floor/f13/wood{ + icon_state = "oakfloor3-broken" + }, +/area/f13/wasteland) "kr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/armor/tier2, @@ -3679,12 +3595,13 @@ }, /area/f13/wasteland) "lf" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/vending/snack/random, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/decal/fakelattice, +/obj/effect/turf_decal/weather/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 }, -/area/f13/ambientlighting/building/g) +/turf/open/floor/f13/wood, +/area/f13/ncr) "lg" = ( /obj/machinery/light/small{ dir = 4 @@ -3867,13 +3784,9 @@ /turf/open/transparent/openspace, /area/f13/wasteland) "lD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/wood{ - dir = 8; - layer = 1 - }, +/obj/machinery/space_heater, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "lE" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_wide{ @@ -3916,9 +3829,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"lJ" = ( -/turf/closed/wall/f13/wood/house/broken, -/area/f13/ambientlighting/building/g) "lK" = ( /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) @@ -4174,11 +4084,6 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/plating/rust, /area/f13/building/powered) -"mx" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/junk/drawer, -/turf/open/floor/carpet/purple, -/area/f13/ambientlighting/building/g) "my" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -4230,13 +4135,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"mD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "mE" = ( /turf/open/transparent/openspace{ name = "air"; @@ -4254,13 +4152,6 @@ }, /turf/open/floor/carpet/red, /area/maintenance/bar) -"mH" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/fridge, -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" - }, -/area/f13/ambientlighting/building/g) "mI" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -4311,9 +4202,10 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/brotherhood/offices1st) "mP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start/f13/ncrranger, -/turf/open/floor/wood_common, +/obj/structure/closet/locker, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, /area/f13/ncr) "mQ" = ( /obj/structure/curtain{ @@ -4379,14 +4271,6 @@ /obj/structure/flora/grass/wasteland, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"na" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/f13/armor/random, -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" - }, -/area/f13/ambientlighting/building/g) "nc" = ( /obj/structure/barricade/sandbags, /obj/structure/table/wood, @@ -4422,14 +4306,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"nl" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/machinery/processor/chopping_block, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) "nm" = ( /obj/machinery/light/small/broken{ dir = 4 @@ -5445,11 +5321,12 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "qo" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/transparent/openspace, -/area/f13/ambientlighting/building/g) +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrtrooper, +/obj/effect/landmark/start/f13/ncrtrooper, +/turf/open/floor/f13/wood, +/area/f13/ncr) "qq" = ( /turf/open/floor/plating, /area/engine/workshop) @@ -5462,12 +5339,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"qs" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/blue, -/area/f13/ambientlighting/building/g) "qt" = ( /obj/structure/sink/greyscale{ pixel_y = 22; @@ -5503,12 +5374,16 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite, /area/f13/building/powered) "qy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/simple_door/house, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1" }, -/area/f13/ambientlighting/building/g) +/area/f13/wasteland) "qz" = ( /obj/structure/table/glass, /obj/item/paper_bin, @@ -5606,11 +5481,9 @@ /turf/open/floor/carpet/purple, /area/f13/building/powered) "qN" = ( -/obj/structure/closet/cabinet/anchored, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/f13/armor/random, -/turf/open/floor/carpet/royalblack, -/area/f13/ambientlighting/building/g) +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/f13/wood, +/area/f13/ncr) "qP" = ( /obj/structure/chair/comfy/black{ dir = 1 @@ -5642,11 +5515,9 @@ /turf/open/floor/wood_fancy, /area/f13/building/abandoned/j) "qT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/ammo/fiftypercent, +/obj/effect/decal/fakelattice, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "qU" = ( /obj/structure/railing{ dir = 10 @@ -5831,12 +5702,8 @@ }, /area/f13/building/powered) "rt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/questing/people{ - location_description = "I heard they're hold up in an appartment within the appartment complex on the western side of the valley." - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "ru" = ( /obj/structure/rack/shelf_metal, /obj/item/storage/toolbox/electrical, @@ -6036,15 +5903,10 @@ /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/underground/mountain) "sc" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/f13/wood, +/area/f13/ncr) "sd" = ( /obj/structure/chair/office{ dir = 8 @@ -6153,10 +6015,16 @@ /turf/open/floor/carpet/purple, /area/f13/building/powered) "sr" = ( -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/green, -/area/f13/ambientlighting/building/g) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor3-broken" + }, +/area/f13/wasteland) "ss" = ( /obj/structure/reagent_dispensers/barrel/explosive, /obj/effect/decal/cleanable/dirt, @@ -6402,13 +6270,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating/rust, /area/f13/building/powered) -"ti" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/raider/ranged, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "tj" = ( /obj/structure/fluff/railing{ dir = 8 @@ -6416,10 +6277,10 @@ /turf/open/floor/plating/f13/outside/roof/metal/corrugated/green, /area/f13/wasteland) "tk" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/junk/drawer, -/turf/open/floor/carpet/royalblack, -/area/f13/ambientlighting/building/g) +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) "tl" = ( /obj/structure/table/reinforced, /obj/item/locked_box/medical, @@ -6441,11 +6302,12 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "to" = ( -/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/stool/retro/black, +/obj/effect/landmark/start/f13/ncrranger, /turf/open/floor/f13/wood{ - icon_state = "housewood3-broken" + color = "#c5bab2" }, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "tp" = ( /mob/living/simple_animal/hostile/securitron/sentrybot, /obj/machinery/light/fo13colored/Red{ @@ -6470,12 +6332,6 @@ }, /turf/open/floor/plating/f13/outside/roof/wood/old, /area/f13/wasteland) -"tt" = ( -/obj/structure/simple_door/house, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "tu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/destructible/tribal_torch/wall/lit{ @@ -6531,12 +6387,6 @@ icon_state = "floordirty" }, /area/f13/building/abandoned/j) -"tD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/f13/alcoholspawner, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "tE" = ( /obj/effect/decal/cleanable/blood/splatter, /mob/living/simple_animal/hostile/radroach, @@ -6665,16 +6515,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"tV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/kirbyplants/random, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "tW" = ( /turf/closed/wall/f13/wood/house, /area/f13/followers) @@ -6983,13 +6823,16 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "uQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/autolathe, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1-broken" + }, +/area/f13/wasteland) "uR" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -7109,11 +6952,10 @@ /turf/open/floor/carpet/black, /area/maintenance/bar) "vd" = ( -/obj/structure/simple_door/bunker, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/open/floor/f13/wood{ + icon_state = "oakfloor4-broken" }, -/area/f13/ambientlighting/building/g) +/area/f13/wasteland) "ve" = ( /obj/structure/table/reinforced, /obj/item/blueprint/research, @@ -7177,13 +7019,9 @@ }, /area/f13/bar) "vo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 1 - }, -/mob/living/simple_animal/hostile/raider/ranged, +/obj/structure/closet/crate/footlocker, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "vp" = ( /obj/structure/table, /obj/item/stack/crafting/electronicparts, @@ -7207,20 +7045,6 @@ }, /turf/closed/wall/f13/wood, /area/f13/caves) -"vt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/raider/firefighter, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) -"vu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/vending/cola/random, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "vv" = ( /obj/machinery/light/fo13colored/Red{ dir = 8 @@ -7686,25 +7510,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) -"wL" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/green, -/area/f13/ambientlighting/building/g) "wM" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa{ - dir = 1 +/obj/structure/table/booth, +/turf/open/floor/f13/wood{ + color = "#c5bab2" }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "wN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa/left{ - dir = 1 +/obj/structure/bookcase/random{ + icon_state = "bookempty" }, -/mob/living/simple_animal/hostile/raider/baseball, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) "wO" = ( /obj/item/storage/trash_stack, /obj/effect/decal/cleanable/dirt, @@ -7851,22 +7670,6 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) -"xk" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/fridge/cannibal, -/obj/effect/decal/cleanable/blood/old{ - pixel_x = 12 - }, -/obj/effect/gibspawner/human/bodypartless, -/obj/item/organ/liver, -/obj/item/organ/eyes, -/mob/living/simple_animal/hostile/rat, -/mob/living/simple_animal/hostile/rat, -/mob/living/simple_animal/hostile/rat, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) "xl" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/advcrafting, @@ -7898,15 +7701,6 @@ /obj/structure/window/fulltile/wood_window, /turf/open/floor/carpet/blue, /area/f13/followers) -"xq" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "xr" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/plasteel/f13/vault_floor/blue/side{ @@ -8052,16 +7846,6 @@ icon_state = "bluerustysolid" }, /area/f13/followers) -"xL" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "xM" = ( /turf/closed/wall/f13/wood/interior, /area/f13/clinic) @@ -8124,15 +7908,6 @@ }, /turf/open/floor/plating/f13/outside/roof/wood/old, /area/f13/wasteland) -"xX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/cabinet/anchored, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/shoes/f13/raidertreads, -/obj/item/clothing/under/f13/raider_leather, -/obj/item/grenade/f13/frag, -/turf/open/floor/carpet/blue, -/area/f13/ambientlighting/building/g) "xY" = ( /obj/machinery/photocopier, /turf/open/floor/f13{ @@ -8147,10 +7922,6 @@ /obj/structure/barricade/bars, /turf/open/floor/f13/wood, /area/f13/legioncamp) -"yc" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/royalblack, -/area/f13/ambientlighting/building/g) "yd" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/handy/robobrain/nsb, @@ -8293,14 +8064,12 @@ /turf/open/transparent/openspace, /area/f13/wasteland) "yA" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 10 - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/structure/chair/stool/retro/tan, +/obj/effect/landmark/start/f13/ncrranger, +/turf/open/floor/f13/wood{ + color = "#c5bab2" }, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "yB" = ( /obj/machinery/light/small{ dir = 4; @@ -8383,9 +8152,6 @@ dir = 1 }, /area/f13/building/powered) -"yN" = ( -/turf/open/floor/plasteel/elevatorshaft, -/area/f13/ambientlighting/building/g) "yO" = ( /obj/structure/flora/grass/jungle/b{ icon_state = "grassb3"; @@ -8932,12 +8698,16 @@ /turf/open/transparent/openspace, /area/f13/wasteland) "As" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 }, -/area/f13/ambientlighting/building/g) +/turf/open/floor/f13/wood{ + icon_state = "oakfloor3-broken" + }, +/area/f13/wasteland) "At" = ( /turf/open/floor/plasteel/f13, /area/f13/wasteland) @@ -9019,28 +8789,6 @@ "AE" = ( /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite, /area/f13/brotherhood/offices1st) -"AF" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/box/drinkingglasses, -/turf/open/floor/carpet/blue, -/area/f13/ambientlighting/building/g) -"AG" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/fridge/cannibal, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/gibspawner/human, -/obj/item/organ/brain, -/obj/item/organ/genital/penis, -/obj/item/organ/genital/testicles, -/mob/living/simple_animal/hostile/rat, -/mob/living/simple_animal/hostile/rat, -/mob/living/simple_animal/hostile/rat, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) "AH" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/f13{ @@ -9050,10 +8798,16 @@ }, /area/f13/building/powered) "AI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1" + }, +/area/f13/wasteland) "AK" = ( /turf/open/floor/wood_wide, /area/f13/legioncamp) @@ -9073,9 +8827,10 @@ }, /area/f13/followers) "AP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/f13/wood, +/area/f13/ncr) "AQ" = ( /obj/structure/barricade/bars, /obj/structure/curtain, @@ -9114,14 +8869,9 @@ }, /area/f13/building/powered) "AV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/reagent_containers/food/snacks/burger/rat, -/obj/machinery/light/small, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) +/obj/effect/decal/cleanable/cobweb, +/turf/open/transparent/openspace, +/area/f13/ncr) "AW" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -9140,14 +8890,10 @@ /turf/open/floor/plating/f13/outside/roof/wood/old, /area/f13/wasteland) "AZ" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, -/turf/open/floor/carpet/blue, -/area/f13/ambientlighting/building/g) +/obj/effect/decal/cleanable/ash, +/turf/open/floor/f13/wood, +/area/f13/ncr) "Ba" = ( /obj/structure/falsewall/rust, /turf/open/floor/plating/rust, @@ -9261,14 +9007,16 @@ /turf/open/floor/carpet/red, /area/f13/building/powered) "Bu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/wood{ - dir = 1 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 }, /turf/open/floor/f13/wood{ - icon_state = "housewood3-broken" + icon_state = "oakfloor1" }, -/area/f13/ambientlighting/building/g) +/area/f13/wasteland) "Bv" = ( /obj/structure/table, /obj/machinery/cell_charger{ @@ -9463,11 +9211,10 @@ /turf/open/floor/wood_common, /area/f13/building/abandoned/m) "BV" = ( -/obj/structure/closet/cabinet/anchored, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/under/color/jumpskirt/random, -/turf/open/floor/carpet/green, -/area/f13/ambientlighting/building/g) +/obj/structure/closet/crate/footlocker, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/ncr) "BW" = ( /obj/structure/barricade/wooden/planks/pregame, /turf/closed/wall/mineral/wood, @@ -9830,15 +9577,6 @@ /obj/structure/simple_door/house/clean, /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite, /area/f13/ambientlighting/building/c) -"CT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sink{ - pixel_y = 15 - }, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "CU" = ( /obj/item/clothing/mask/cigarette, /turf/open/floor/plating/f13/outside/roof/metal/corrugated/green, @@ -10059,12 +9797,12 @@ }, /area/f13/building/powered) "DD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) +/obj/effect/decal/fakelattice, +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrcorporal, +/turf/open/floor/f13/wood, +/area/f13/ncr) "DE" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/lattice, @@ -10700,13 +10438,9 @@ /turf/open/floor/wood_common, /area/f13/ncr) "Fz" = ( -/obj/structure/window/fulltile/ruins{ - icon_state = "ruinswindowvertical" - }, -/turf/open/floor/f13/wood{ - icon_state = "housewood2" - }, -/area/f13/ambientlighting/building/g) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/ncr) "FA" = ( /obj/structure/wreck/trash/machinepiletwo, /turf/open/floor/plating/dirt, @@ -10744,11 +10478,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"FG" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/raider/baseball, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "FH" = ( /obj/effect/landmark/poster_spawner/pinup, /turf/closed/indestructible/rock{ @@ -10778,11 +10507,6 @@ }, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/c) -"FL" = ( -/obj/structure/bed/old, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) "FM" = ( /obj/structure/rack, /obj/item/ammo_box/magazine/m556/rifle/assault{ @@ -10867,13 +10591,6 @@ }, /turf/open/transparent/openspace, /area/f13/ncr) -"Gb" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/f13/alcoholspawner, -/turf/open/floor/carpet/blue, -/area/f13/ambientlighting/building/g) "Gc" = ( /obj/structure/mirror{ pixel_x = 32 @@ -10912,8 +10629,10 @@ }, /area/f13/brotherhood/offices1st) "Gf" = ( -/turf/closed/wall/f13/wood/house, -/area/f13/ambientlighting/building/g) +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1" + }, +/area/f13/wasteland) "Gg" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -10948,24 +10667,12 @@ /obj/item/binoculars, /turf/open/floor/wood_common, /area/maintenance/bar) -"Gk" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/bed/wooden, -/obj/item/bedsheet/brown, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/blue, -/area/f13/ambientlighting/building/g) "Gl" = ( /obj/structure/railing{ dir = 1 }, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/wasteland) -"Gm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/autolathe/ammo, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "Gn" = ( /obj/machinery/vending/snack, /turf/open/floor/plating/rust, @@ -11245,11 +10952,11 @@ }, /area/f13/building/powered) "Ha" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/ammo/fiftypercent, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "Hb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -11366,11 +11073,10 @@ }, /area/f13/building/powered) "Hs" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/f13/armor/random, +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "Ht" = ( /obj/structure/destructible/tribal_torch/lit, /obj/structure/railing/corner{ @@ -11634,14 +11340,6 @@ /obj/item/clothing/head/helmet/f13/brahmincowboyhat, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) -"Ig" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/questing/item{ - location_description = "in that apartment complex on the western side of The valley." - }, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) "Ih" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 10 @@ -11691,10 +11389,6 @@ /obj/item/gun/energy/laser/plasma/glock, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) -"Ip" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/holofloor/carpet, -/area/f13/ambientlighting/building/g) "Iq" = ( /obj/structure/reagent_dispensers/barrel/explosive, /obj/effect/decal/cleanable/greenglow, @@ -11965,8 +11659,9 @@ /turf/open/floor/plating/dirt/dark, /area/f13/caves) "Je" = ( -/turf/open/transparent/openspace, -/area/f13/ambientlighting/building/g) +/obj/structure/debris/v3, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "Jf" = ( /obj/item/card/id/rusted/brokenholodog/enclave, /obj/effect/decal/cleanable/dirt, @@ -12114,16 +11809,6 @@ /mob/living/simple_animal/pet/fox, /turf/open/floor/carpet/royalblack, /area/f13/clinic) -"JD" = ( -/obj/machinery/shower{ - pixel_y = 16 - }, -/obj/structure/curtain, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) "JF" = ( /obj/structure/closet/cabinet/anchored, /obj/item/clothing/under/f13/cowboyg, @@ -12492,11 +12177,6 @@ }, /turf/open/floor/mineral/titanium/white, /area/f13/clinic) -"KN" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/holofloor/carpet, -/area/f13/ambientlighting/building/g) "KO" = ( /turf/open/floor/f13{ icon_state = "greenrustyfull" @@ -12548,13 +12228,6 @@ icon_state = "floordirty" }, /area/f13/building/abandoned/j) -"KV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" - }, -/area/f13/ambientlighting/building/g) "KW" = ( /obj/structure/table/wood, /turf/open/floor/f13/wood, @@ -12575,10 +12248,15 @@ }, /area/f13/building/powered) "La" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/simple_door/house, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/obj/structure/table/booth, +/obj/item/flashlight/lamp/green{ + pixel_x = -5; + pixel_y = 10 + }, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) "Lb" = ( /obj/structure/simple_door/house, /turf/open/floor/wood_common/wood_common_light, @@ -12730,9 +12408,10 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "Lx" = ( -/obj/structure/simple_door/house, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/space_heater, +/turf/open/floor/f13/wood, +/area/f13/ncr) "Ly" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/effect/decal/cleanable/dirt, @@ -12890,12 +12569,6 @@ icon_state = "bluerustysolid" }, /area/f13/followers) -"LW" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" - }, -/area/f13/ambientlighting/building/g) "LX" = ( /obj/structure/chair/booth{ icon_state = "booth_east_south" @@ -13200,11 +12873,16 @@ }, /area/f13/building/powered) "MY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/ammo/fiftypercent, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/floor/f13/wood{ + icon_state = "housebase" + }, +/area/f13/wasteland) "MZ" = ( /obj/structure/barricade/sandbags, /obj/effect/decal/cleanable/dirt, @@ -13373,15 +13051,10 @@ }, /area/f13/building/powered) "Ny" = ( -/obj/machinery/shower{ - dir = 1 - }, -/obj/structure/curtain, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/turf/open/floor/f13/wood, +/area/f13/ncr) "Nz" = ( /obj/effect/decal/cleanable/oil/streak, /obj/structure/simple_door/bunker, @@ -13459,9 +13132,13 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "NP" = ( -/obj/structure/simple_door/house, -/turf/open/floor/carpet/blue, -/area/f13/ambientlighting/building/g) +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/tentclothedge, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) "NQ" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/dirt, @@ -13509,10 +13186,13 @@ }, /area/f13/building/powered) "NY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/workbench, +/obj/effect/decal/fakelattice, +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrtrooper, +/obj/effect/landmark/start/f13/ncrtrooper, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "NZ" = ( /obj/machinery/light/broken{ dir = 8 @@ -13604,21 +13284,6 @@ icon_state = "common-broken3" }, /area/maintenance/bar) -"Ol" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/effect/spawner/lootdrop/f13/weapon/melee/random, -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" - }, -/area/f13/ambientlighting/building/g) -"On" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa{ - dir = 8 - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "Oo" = ( /obj/structure/railing{ color = "#A47449" @@ -13743,11 +13408,8 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "OE" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "OH" = ( /obj/structure/railing{ dir = 9 @@ -13797,7 +13459,6 @@ }, /area/f13/building/powered) "ON" = ( -/obj/effect/landmark/start/f13/ncrveteranranger, /obj/structure/fluff/paper/stack, /obj/structure/fluff/paper/stack{ desc = "A stack of various papers, illegible scribbles scattered across each page."; @@ -13892,13 +13553,6 @@ }, /turf/open/floor/wood_common, /area/f13/ncr) -"Pa" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/kirbyplants/random, -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" - }, -/area/f13/ambientlighting/building/g) "Pb" = ( /obj/structure/railing/corner{ color = "#A47449"; @@ -13976,11 +13630,6 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) -"Po" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small, -/turf/open/floor/carpet/purple, -/area/f13/ambientlighting/building/g) "Pp" = ( /obj/machinery/vending/nukacolavendfull{ force_free = 1 @@ -14122,9 +13771,6 @@ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/m) -"PH" = ( -/turf/closed/wall/f13/wood/interior, -/area/f13/ambientlighting/building/g) "PI" = ( /turf/open/floor/wood_wide, /area/f13/ncr) @@ -14329,10 +13975,10 @@ }, /area/f13/building/powered) "Ql" = ( -/obj/structure/junk/small/bed, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/green, -/area/f13/ambientlighting/building/g) +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1-broken" + }, +/area/f13/wasteland) "Qm" = ( /obj/structure/window/fulltile/house{ opacity = 1 @@ -14500,11 +14146,11 @@ }, /area/f13/building/powered) "QI" = ( -/obj/structure/closet/cabinet/anchored, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/f13/armor/random, -/turf/open/floor/holofloor/carpet, -/area/f13/ambientlighting/building/g) +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/twig4, +/turf/open/floor/f13/wood, +/area/f13/ncr) "QJ" = ( /obj/machinery/autolathe, /turf/open/floor/f13{ @@ -14764,14 +14410,12 @@ }, /area/f13/ncr) "Rt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood, -/obj/item/toy/cards/deck, -/obj/effect/landmark/questing/item{ - location_description = "in that apartment complex on the western side of The valley." +/obj/structure/debris/v3{ + pixel_x = -15; + pixel_y = 6 }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/turf/closed/wall/f13/ruins, +/area/f13/ncr) "Ru" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -14792,14 +14436,6 @@ icon_state = "tent10" }, /area/f13/wasteland) -"Rx" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/clothing/neck/apron/chef, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) "Ry" = ( /obj/structure/chair/wood, /obj/effect/decal/cleanable/dirt, @@ -15054,13 +14690,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"Sg" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa/corner{ - dir = 8 - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "Sh" = ( /obj/structure/fireplace, /obj/effect/decal/cleanable/dirt, @@ -15099,18 +14728,9 @@ /turf/open/floor/wood_wide/wood_wide_light, /area/engine/workshop) "Sn" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/junk/small/table, -/turf/open/floor/carpet/green, -/area/f13/ambientlighting/building/g) -"So" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/kitchenspike, -/obj/effect/gibspawner/human/bodypartless, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) +/obj/structure/fluff/railing, +/turf/open/floor/plating/f13/outside/roof/metal/corrugated, +/area/f13/wasteland) "Sq" = ( /obj/structure/marker_beacon, /turf/open/floor/plasteel/f13, @@ -15159,11 +14779,22 @@ /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) "Sy" = ( -/obj/structure/simple_door/house, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 }, -/area/f13/ambientlighting/building/g) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor4-broken" + }, +/area/f13/wasteland) "Sz" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, @@ -15224,10 +14855,6 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) -"SL" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/f13/wood/house, -/area/f13/ambientlighting/building/g) "SM" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -15255,17 +14882,22 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "SQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/effect/spawner/lootdrop/ammo/fiftypercent, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1" }, -/area/f13/ambientlighting/building/g) +/area/f13/wasteland) "SS" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/trash_stack{ @@ -15287,10 +14919,11 @@ /turf/open/indestructible/ground/outside/roof, /area/f13/wasteland) "SV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/microwave/stove, +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/locker, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "SW" = ( /obj/structure/table, /obj/item/stack/cable_coil/thirty, @@ -15309,12 +14942,9 @@ /turf/open/floor/carpet/black, /area/f13/brotherhood/offices1st) "SY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/ammo/fiftypercent, -/turf/open/floor/carpet/blue, -/area/f13/ambientlighting/building/g) +/obj/structure/flora/twig3, +/turf/open/floor/f13/wood, +/area/f13/ncr) "SZ" = ( /obj/item/clothing/shoes/f13/enclave/serviceboots, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, @@ -15339,12 +14969,11 @@ }, /area/f13/brotherhood/offices1st) "Tc" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/tentclothedge, +/turf/open/floor/plating/f13/outside/roof/metal/corrugated, +/area/f13/ncr) "Td" = ( /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/x) @@ -15474,11 +15103,6 @@ icon_state = "bar" }, /area/f13/bar) -"Tx" = ( -/obj/structure/bed/old, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/holofloor/carpet, -/area/f13/ambientlighting/building/g) "Ty" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/fo13colored/Red{ @@ -15682,14 +15306,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"Ua" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/landmark/questing/item{ - location_description = "in that apartment complex on the western side of The valley." - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "Ub" = ( /obj/structure/railing{ dir = 4 @@ -15763,12 +15379,6 @@ /obj/structure/table, /turf/open/floor/carpet/red, /area/maintenance/bar) -"Uj" = ( -/obj/structure/window/fulltile/ruins, -/turf/open/floor/f13/wood{ - icon_state = "housewood2" - }, -/area/f13/ambientlighting/building/g) "Uk" = ( /obj/structure/window/fulltile/house{ opacity = 1 @@ -15907,17 +15517,6 @@ /obj/item/radio/old, /turf/open/floor/plating/rust, /area/f13/building/powered) -"UK" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "UL" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, @@ -15944,13 +15543,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"UP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) "UQ" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/handy, @@ -16046,13 +15638,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"Ve" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/fridge, -/turf/open/floor/f13/wood{ - icon_state = "housewood3-broken" - }, -/area/f13/ambientlighting/building/g) "Vf" = ( /obj/machinery/light{ dir = 1 @@ -16122,11 +15707,10 @@ /turf/open/floor/carpet/purple, /area/f13/building/powered) "Vs" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/ambientlighting/building/g) +/obj/effect/decal/fakelattice, +/obj/structure/closet/crate/footlocker, +/turf/open/floor/f13/wood, +/area/f13/ncr) "Vu" = ( /obj/structure/grille/ratvar{ name = "radio antenna" @@ -16199,11 +15783,16 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "VF" = ( -/obj/structure/simple_door/bunker/glass, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 }, -/area/f13/ambientlighting/building/g) +/turf/open/floor/f13/wood{ + icon_state = "oakfloor4-broken" + }, +/area/f13/wasteland) "VG" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt/dust, @@ -16297,10 +15886,13 @@ }, /area/f13/brotherhood/offices1st) "VW" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small, -/turf/open/floor/carpet/red, -/area/f13/ambientlighting/building/g) +/obj/machinery/smartfridge/bottlerack, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) "VX" = ( /obj/structure/rack/shelf_metal, /obj/item/stack/sheet/metal/fifty, @@ -16424,12 +16016,6 @@ /obj/structure/sign/departments/science, /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) -"Wx" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/f13/cash_random_med, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "Wy" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -16455,9 +16041,8 @@ /turf/open/floor/wood_wide, /area/f13/followers) "WC" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/turf/closed/wall/f13/ruins, +/area/f13/ncr) "WD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/cyan, @@ -16553,13 +16138,16 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "WQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/kitchenspike, -/obj/effect/gibspawner/human, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor3-broken" }, -/area/f13/ambientlighting/building/g) +/area/f13/wasteland) "WR" = ( /obj/structure/simple_door/repaired, /obj/effect/decal/cleanable/dirt{ @@ -16681,15 +16269,6 @@ /obj/item/stock_parts/cell/ammo/mfc, /turf/open/floor/plating/rust, /area/f13/building/powered) -"Xi" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/g) "Xj" = ( /obj/structure/table_frame, /obj/item/stack/sheet/plasteel, @@ -16751,23 +16330,11 @@ "Xs" = ( /turf/closed/wall/f13/wood/house, /area/maintenance/bar) -"Xt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small, -/turf/open/floor/f13/wood{ - icon_state = "housewood3-broken" - }, -/area/f13/ambientlighting/building/g) "Xu" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/grown/harebell, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/c) -"Xw" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/kirbyplants/random, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "Xx" = ( /obj/machinery/light/small{ dir = 1; @@ -16806,16 +16373,12 @@ }, /area/f13/building/abandoned/m) "XD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/blood/tracks, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 5 - }, -/obj/item/restraints/handcuffs/cable/random, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/structure/chair/stool/retro/black, +/obj/effect/landmark/start/f13/ncrveteranranger, +/turf/open/floor/f13/wood{ + color = "#c5bab2" }, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "XE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/destructible/tribal_torch/wall/lit{ @@ -16856,10 +16419,8 @@ }, /area/f13/building/powered) "XI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/fridge, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/area/f13/ncr) "XJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table_frame, @@ -17002,14 +16563,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"Yb" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/reagent_containers/food/snacks/burger/brain, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/g) "Yc" = ( /obj/effect/decal/cleanable/dirt, /obj/item/bodypart/l_leg/robot, @@ -17209,12 +16762,16 @@ }, /area/f13/building/powered) "YN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 }, -/turf/open/floor/holofloor/carpet, -/area/f13/ambientlighting/building/g) +/turf/open/floor/f13/wood{ + icon_state = "housebase4-broken" + }, +/area/f13/wasteland) "YO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/fo13colored/Red{ @@ -17352,10 +16909,16 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) "Zk" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small, -/turf/open/floor/carpet/green, -/area/f13/ambientlighting/building/g) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1" + }, +/area/f13/wasteland) "Zm" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/trash_stack{ @@ -17396,12 +16959,12 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) "Zs" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/microwave/stove, -/turf/open/floor/f13/wood{ - icon_state = "housewood3-broken" - }, -/area/f13/ambientlighting/building/g) +/obj/effect/decal/fakelattice, +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrtrooper, +/turf/open/floor/f13/wood, +/area/f13/ncr) "Zt" = ( /turf/closed/mineral/random/low_chance, /area/f13/wasteland) @@ -17442,10 +17005,8 @@ /turf/open/floor/carpet/red, /area/f13/legioncamp) "ZA" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/raider/tribal, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) +/turf/closed/mineral/random, +/area/f13/wasteland) "ZB" = ( /obj/structure/fence/wooden{ pixel_x = 13 @@ -17458,12 +17019,6 @@ }, /turf/open/transparent/openspace, /area/f13/building/powered) -"ZE" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/f13/cash_random_med, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/g) "ZF" = ( /obj/structure/railing/corner{ dir = 8 @@ -17521,12 +17076,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) -"ZQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/raider/ranged/boss, -/turf/open/floor/carpet/blue, -/area/f13/ambientlighting/building/g) "ZS" = ( /obj/structure/railing/corner{ color = "#A47449" @@ -17919,47 +17468,47 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +EI +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA xm xm xm @@ -18221,47 +17770,47 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +EI +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +iX +iX +iX +iX +iX +iX +iX +iX +iX +iX +iX +iX +iX +iX +iX +iX +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA xm xm xm @@ -18523,46 +18072,46 @@ xm xm xm xm +EI +ZA +ZA +iX +iX +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +iX +iX xm xm xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +WC +WC +rt +rt +WC +WC +WC +zi +iX +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA xm xm xm @@ -18829,6 +18378,16 @@ xm xm xm xm +iX +iX +ZA +ZA +ZA +ZA +ZA +iX +iX +iX xm xm xm @@ -18836,35 +18395,25 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +NP +hM +tk +tk +tk +tk +NP +zi +iX +iX +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA xm xm xm @@ -19132,6 +18681,13 @@ xm xm xm xm +iX +iX +iX +ZA +ZA +iX +iX xm xm xm @@ -19141,32 +18697,25 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +WC +rt +VW +tk +XD +tk +NP +zi +iX +iX +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA xm xm xm @@ -19436,6 +18985,11 @@ xm xm xm xm +iX +iX +iX +iX +iX xm xm xm @@ -19446,29 +19000,24 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +WC +wM +tk +La +wM +rt +zi +iX +iX +iX +iX +ZA +ZA +ZA +ZA +ZA +ZA +ZA xm xm xm @@ -19740,37 +19289,37 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +WC +wM +tk +yA +to +rt +zi +iX +iX +iX +iX +iX +ZA +ZA +ZA +ZA +ZA +ZA xm xm xm @@ -20042,37 +19591,37 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +rt +wM +tk +tk +tk +rt +zi +zi +zi +zi +zi +iX +iX +ZA +ZA +ZA +ZA +ZA xm xm xm @@ -20186,7 +19735,7 @@ xm zy CD DX -mP +eO Hh Jl jg @@ -20344,37 +19893,37 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +NP +tk +tk +tk +il +zi +zi +zi +zi +zi +zi +iX +iX +ZA +ZA +ZA +ZA xm xm xm @@ -20489,7 +20038,7 @@ py TN Uh Tm -bR +Iu px TN TN @@ -20646,37 +20195,37 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +rt +Oy +wN +mP +rt +zi +zi +zi +zi +zi +zi +iX +iX +ZA +ZA +ZA +ZA xm xm xm @@ -20947,38 +20496,38 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +WC +WC +rt +WC +WC +zi +zi +zi +zi +zi +zi +iX +iX +ZA +ZA +ZA +ZA xm xm xm @@ -21249,37 +20798,37 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +WQ +Gf +AI +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +iX +iX +iX +ZA +ZA xm xm xm @@ -21551,36 +21100,36 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +qy +vd +uQ +ec +ec +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -21853,6 +21402,17 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +Sn xm xm xm @@ -21863,26 +21423,15 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +rt +WC +rt +rt +rt +WC +Je +zi xm xm xm @@ -22155,6 +21704,17 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +Sn xm xm xm @@ -22165,26 +21725,15 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +WC +AV +qT +XI +Ha +lf +WC +zi xm xm xm @@ -22465,6 +22014,8 @@ xm xm xm xm +Zk +MY xm xm xm @@ -22476,17 +22027,15 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +ec +zi +rt +QI +Hs +XI +qN +rt +zi xm xm xm @@ -22767,6 +22316,8 @@ xm xm xm xm +kq +Gf xm xm xm @@ -22779,16 +22330,14 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +iL +Vs +Fz +XI +vo +rt +zi xm xm xm @@ -23069,6 +22618,8 @@ xm xm xm xm +ko +Gf xm xm xm @@ -23081,16 +22632,14 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +rt +Ny +XI +XI +hy +WC +zi xm xm xm @@ -23371,6 +22920,8 @@ xm xm xm xm +Gf +Gf xm xm xm @@ -23383,16 +22934,14 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +WC +gE +XI +XI +lD +WC +zi xm xm xm @@ -23673,6 +23222,8 @@ xm xm xm xm +vd +Ql xm xm xm @@ -23685,16 +23236,14 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +WC +vo +XI +XI +vo +am +zi xm xm xm @@ -23975,6 +23524,8 @@ xm xm xm xm +qy +YN xm xm xm @@ -23987,16 +23538,14 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +WC +bQ +XI +Fz +bQ +am +zi xm xm xm @@ -24275,6 +23824,14 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -24283,22 +23840,14 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +WC +XI +XI +Fz +AP +rt +zi xm xm xm @@ -24577,6 +24126,14 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -24585,22 +24142,14 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +rt +vo +XI +XI +vo +rt +zi xm xm xm @@ -24879,6 +24428,14 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -24887,22 +24444,14 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +Tc +bQ +Fz +XI +DD +WC +zi xm xm xm @@ -25181,6 +24730,14 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -25189,22 +24746,14 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +iL +XI +Fz +SY +WC +WC +zi xm xm xm @@ -25483,30 +25032,30 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +cr +cr +zi +WC +BV +Fz +vo +rt +zi +zi xm xm xm @@ -25785,29 +25334,29 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +zi +WC +Rt +Zs +XI +dv +rt +zi xm xm xm @@ -26087,29 +25636,29 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +zi +zi +zi +zi +zi +zi +zi +Zk +MY +Gf +Gf +cO +AI +zi +zi +rt +bR +qT +XI +XI +rt +zi xm xm xm @@ -26389,29 +25938,29 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +zi +zi +zi +zi +zi +zi +zi +qy +As +vd +dX +qy +Bu +zi +zi +rt +NY +XI +XI +vo +rt +zi xm xm xm @@ -26691,29 +26240,29 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +ec +zi +WC +Lx +sc +XI +qo +iL +zi xm xm xm @@ -26978,45 +26527,45 @@ xm xm xm xm -Gf -Gf -Gf -Gf -Gf -Fz -Gf -Gf -lJ -lJ -Gf -Gf -Fz -Gf -Gf -Gf -Gf -Gf -Gf -Fz -Gf -Gf -Gf -Gf -Gf -Gf -Fz -Gf -Gf -Gf -Gf -Gf -Gf +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +zi +iL +AZ Fz -Gf -Gf -Gf -Gf -Gf +bo +iL +Tc +zi +xm xm xm xm @@ -27280,278 +26829,6 @@ xm xm xm xm -Gf -JD -Vs -Gf -SV -KV -Ve -Gf -UK -vu -Gf -mH -bQ -SV -Gf -CT -Ny -Gf -XI -KV -Zs -Gf -CT -Ny -Gf -SV -Ol -Ve -Gf -CT -Ny -Gf -XI -jo -SV -Gf -CT -Ny -Gf -xm -xm -xm -xm -xm -xm -xm -xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -lw -lw -lw -lw -lw -lw -xm -xm -Rk -Rk -Rk -Rk -Rk -Rk -xm -xm -lw -lw -lw -lw -lw -lw -lw -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -gw -gw -gw -gw -FO -FO -FO -FO -nn -nc -Hw -lh -FO -FO -FO -FO -FO -FO -FO -FO -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -EI -"} -(34,1,1) = {" -EI -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm xm xm xm @@ -27567,6 +26844,14 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -27575,52 +26860,14 @@ xm xm xm zi -zi -zi -zi -zi +iL +XI +jo +SV +WC zi zi xm -Gf -xq -Vs -Gf -WC -WC -WC -Gf -OE -OE -Gf -WC -WC -WC -Gf -Vs -DD -Gf -rt -cu -WC -Gf -Vs -DD -Gf -WC -WC -cu -Gf -Vs -DD -Gf -cu -rt -WC -Gf -Vs -DD -Gf xm xm xm @@ -27666,12 +26913,12 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm +lw +lw +lw +lw +lw +lw xm xm Rk @@ -27716,7 +26963,6 @@ xm xm xm xm -xm Zt Zt Zt @@ -27724,19 +26970,20 @@ Zt Zt Zt Zt +Zt +gw +gw +gw +gw +gw FO FO FO FO -FO -FO -FO -FO -FO -FO -uf -dA -Kj +nn +nc +Hw +lh FO FO FO @@ -27753,8 +27000,8 @@ Zt Zt Zt Zt -xm -xm +Zt +Zt xm xm xm @@ -27830,7 +27077,7 @@ xm xm EI "} -(35,1,1) = {" +(34,1,1) = {" EI xm xm @@ -27884,45 +27131,45 @@ zi zi zi xm -Gf -dv -sc -tt -WC +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +zi +rt +cu rt WC -Sy -OE -OE -Sy -WC -WC -ZA -Sy -Vs -dv -Gf -AI -qT -WC -Lx -Vs -dv -Gf -Tc -Tc -WC -Sy -Vs -dv -Gf -ec -iL -LW -Sy -Vs -dv -Gf +rt +zi +xm +xm xm xm xm @@ -28019,8 +27266,7 @@ xm xm xm xm -xm -xm +Zt Zt Zt Zt @@ -28035,11 +27281,13 @@ FO FO FO FO -EF -XM -fL -BD -vs +FO +FO +uf +dA +Kj +FO +FO FO FO FO @@ -28051,10 +27299,9 @@ Zt Zt Zt Zt -xm -xm -xm -xm +Zt +Zt +Zt xm xm xm @@ -28132,7 +27379,7 @@ xm xm EI "} -(36,1,1) = {" +(35,1,1) = {" EI xm xm @@ -28186,45 +27433,45 @@ zi zi zi xm -Gf -Gf -Gf -Gf -Ua -hx -WC -Gf -OE -OE -Gf -WC -cu -Xt -Gf -Gf -Gf -Gf -Ua -Hs -ko -Gf -Gf -Gf -Gf -Wx -Ua -ko -Gf -Gf -Gf -Gf -Ha -Bu -ko -Gf -Gf -Gf -Gf +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +zi +zi +ec +ec +ec +zi +zi +xm +xm xm xm xm @@ -28269,11 +27516,11 @@ xm xm xm xm -lw -lw -lw -lw -lw +xm +xm +xm +xm +xm xm xm xm @@ -28323,8 +27570,6 @@ xm xm xm xm -xm -xm Zt Zt Zt @@ -28335,12 +27580,16 @@ FO FO FO FO -oT -hP -EL +FO +FO +FO +FO +EF XM -eq -FA +fL +BD +vs +FO FO FO FO @@ -28430,11 +27679,9 @@ xm xm xm xm -xm -xm EI "} -(37,1,1) = {" +(36,1,1) = {" EI xm xm @@ -28488,45 +27735,45 @@ zi zi zi xm -Gf -Tx -KN -Gf -WC -LW -LW -Gf -OE -OE -Gf -Ua -qT -LW -Gf -qN -il -Gf -WC -WC -WC -Gf -hy -gr -Gf +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +hx AI -na -to -Gf -Sn -Ql -Gf -WC -WC -WC -Gf -Ig -FL -Gf +OE +xm +xm +xm +xm +xm +xm xm xm xm @@ -28588,6 +27835,13 @@ Rk Rk xm xm +lw +lw +lw +lw +lw +lw +lw xm xm xm @@ -28620,16 +27874,8 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +Zt +Zt Zt Zt Zt @@ -28638,21 +27884,22 @@ FO FO FO FO -cB -qa -Vj -aA -Mw +oT +hP +EL +XM +eq +FA +FO +FO +FO +FO FO Zt Zt Zt Zt Zt -Zt -xm -xm -xm xm xm xm @@ -28736,7 +27983,7 @@ xm xm EI "} -(38,1,1) = {" +(37,1,1) = {" EI xm xm @@ -28790,45 +28037,45 @@ zi zi zi xm -Gf -YN -Ip -Sy -WC -WC -cu -Gf +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +Ql +VF OE -mD -Gf -AI -AI -WC -Sy -yc -bo -Gf -LW -to -WC -Sy -cr -Po -Gf -lD -FG -WC -Sy -wL -Zk -Gf -WC -cu -WC -Sy -AP -VW -Gf +xm +xm +xm +xm +xm +xm xm xm xm @@ -28932,7 +28179,6 @@ xm xm xm xm -xm Zt Zt Zt @@ -28940,18 +28186,19 @@ Zt FO FO FO -di -dL -XM -LO -KJ -Zu +FO +cB +qa +Vj +aA +Mw +FO +Zt +Zt +Zt Zt Zt Zt -xm -xm -xm xm xm xm @@ -29038,7 +28285,7 @@ xm xm EI "} -(39,1,1) = {" +(38,1,1) = {" EI xm xm @@ -29092,45 +28339,45 @@ zi zi zi xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +Zk Gf -gU -QI -Gf -WC -WC -Wx -Gf -OE -OE -Gf -Xw -WC -WC -Gf -tk -iN -Gf -cu -WC -Xw -Gf -kq -mx -Gf -WC -WC -Pa -Gf -BV -sr -Gf -WC -WC -Pa -Gf -aP -hM -Gf +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -29235,19 +28482,19 @@ xm xm xm xm -xm -xm -xm +Zt +Zt Zt Zt FO FO FO -Gi +di +dL XM -mZ -mk -aD +LO +KJ +Zu Zt Zt Zt @@ -29340,7 +28587,7 @@ xm xm EI "} -(40,1,1) = {" +(39,1,1) = {" EI xm xm @@ -29394,45 +28641,45 @@ zi zi zi xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +sr Gf -Gf -Gf -Gf -Gf -Gf -Gf -Gf -OE -OE -Gf -Gf -Gf -Gf -Gf -Gf -Gf -Gf -Sy -Gf -Gf -Gf -Gf -Gf -Gf -Sy -Gf -Gf -Gf -Gf -Gf -Gf -Sy -Gf -Gf -Gf -Gf -Gf -Gf +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -29486,13 +28733,12 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm +Rk +Rk +Rk +Rk +Rk +Rk xm xm xm @@ -29545,13 +28791,46 @@ Zt Zt FO FO -NA -da -dL -ug +FO +Gi +XM +mZ +mk aD Zt Zt +Zt +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -29603,57 +28882,39 @@ xm xm xm xm -zy -zy -zy -zy -zy -zy -zy -zy -zy -zy -zy -zy -zy -zy -zy -zy -zy -zy -zy -zy -zy -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -EI -"} -(41,1,1) = {" -EI -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +xm +xm +xm +xm +xm +EI +"} +(40,1,1) = {" +EI +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -29674,6 +28935,13 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -29695,6 +28963,19 @@ zi zi zi zi +zi +zi +zi +zi +zi +zi +Sy +Gf +MY +Gf +kq +AI +OE xm xm xm @@ -29702,40 +28983,6 @@ xm xm xm xm -Gf -vu -ti -OE -OE -OE -As -UK -As -OE -OE -OE -OE -OE -xL -OE -OE -OE -OE -OE -OE -SQ -As -As -OE -OE -vt -OE -xL -OE -OE -vu -Gf -xm xm xm xm @@ -29779,11 +29026,11 @@ xm xm xm xm -xm -xm -xm -xm -xm +lw +lw +lw +lw +lw xm xm xm @@ -29846,12 +29093,12 @@ xm Zt Zt FO -Us -cf -fL -LO -xS -Ed +FO +NA +da +dL +ug +aD Zt Zt xm @@ -29944,7 +29191,7 @@ xm xm EI "} -(42,1,1) = {" +(41,1,1) = {" EI xm xm @@ -29989,6 +29236,7 @@ xm xm xm xm +xm zi zi zi @@ -29996,6 +29244,19 @@ zi zi zi zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm zi zi zi @@ -30003,40 +29264,26 @@ zi zi zi zi -xm +zi +zi +zi +zi +zi +zi +zi +zi +SQ +As Gf -tV -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE -OE +Bu +YN OE -Uj +xm +xm +xm +xm +xm +xm xm xm xm @@ -30145,14 +29392,15 @@ xm xm xm xm -xm Zt Zt -xi -Nt -yO -si +FO +Us +cf +fL +LO xS +Ed Zt Zt xm @@ -30206,7 +29454,6 @@ xm xm xm xm -xm zy zy zy @@ -30246,7 +29493,7 @@ xm xm EI "} -(43,1,1) = {" +(42,1,1) = {" EI xm xm @@ -30306,41 +29553,6 @@ zi zi zi xm -Gf -lf -vt -OE -OE -OE -OE -OE -OE -OE -Xi -OE -OE -OE -OE -OE -OE -OE -Xi -OE -OE -OE -OE -OE -OE -Xi -OE -OE -As -iQ -As -vu -Gf -xm -xm xm xm xm @@ -30362,16 +29574,50 @@ zi zi zi zi -zi -zi -zi -zi -zi -zi xm xm xm xm +OE +OE +OE +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm xm xm xm @@ -30450,11 +29696,12 @@ xm xm xm Zt -RB -wc -Na -eq -Ib +Zt +xi +Nt +yO +si +xS Zt Zt xm @@ -30488,12 +29735,12 @@ xm xm xm xm -lw -lw -lw -lw -lw -lw +xm +xm +xm +xm +xm +xm xm xm xm @@ -30548,7 +29795,7 @@ xm xm EI "} -(44,1,1) = {" +(43,1,1) = {" EI xm xm @@ -30608,39 +29855,39 @@ zi zi zi xm -Gf -SL -SL -qy -SL -SL -Gf -Gf -Gf -Gf -Gf -Gf -Gf -VF -VF -Gf -Gf -vd -Gf -Gf -Gf -Fz -Fz -Fz -Gf -Gf -Gf -Gf -Fz -Fz -Fz -Gf -Gf +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +OE +xm +xm +xm +xm +xm +xm xm xm xm @@ -30752,11 +29999,12 @@ xm xm xm Zt -MP -aW -Vj -NA -uJ +RB +wc +Na +eq +Ib +Zt Zt xm xm @@ -30787,18 +30035,17 @@ xm xm xm xm +xm +xm lw lw lw lw lw lw -lw -lw -lw -lw -lw -lw +xm +xm +xm xm xm xm @@ -30850,7 +30097,7 @@ xm xm EI "} -(45,1,1) = {" +(44,1,1) = {" EI xm xm @@ -30910,27 +30157,27 @@ zi zi zi xm -Gf -bi -Gm -WC -WC -Xw -PH -dy -AZ -Gb -AF -Gf -yN -yN -yN -yN -Gf -iS -iS -iS -Gf +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -31053,12 +30300,12 @@ xm xm xm xm -xm Zt -FO -fL -LO -FO +MP +aW +Vj +NA +uJ Zt xm xm @@ -31152,7 +30399,7 @@ xm xm EI "} -(46,1,1) = {" +(45,1,1) = {" EI xm xm @@ -31212,27 +30459,27 @@ zi zi zi xm -Gf -NY -cu -WC -WC -WC -NP -dy -dy -ZQ -Gb -Gf -yN -yN -yN -yN -Gf -qo -qo -Je -Gf +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -31356,12 +30603,12 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm +Zt +FO +fL +LO +FO +Zt xm xm xm @@ -31454,7 +30701,7 @@ xm xm EI "} -(47,1,1) = {" +(46,1,1) = {" EI xm xm @@ -31514,27 +30761,27 @@ zi zi zi xm -Gf -uQ -WC -to -WC -ko -PH -SY -dy -dy -dy -Gf -yN -yN -yN -yN -Gf -Je -Je -Je -Gf +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -31738,11 +30985,11 @@ zy zy zy zy -zy -zy -zy -zy -zy +xm +xm +xm +xm +xm xm xm xm @@ -31756,7 +31003,7 @@ xm xm EI "} -(48,1,1) = {" +(47,1,1) = {" EI xm xm @@ -31816,36 +31063,36 @@ zi zi zi xm -Gf -WC -WC -MY -tD -wN -PH -qs -dy -dy -dy -Gf -Gf -Gf -Gf -Gf -Gf -Gf -Gf -Gf -Gf xm xm xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm +OE +xm +xm +OE xm xm xm @@ -32058,7 +31305,7 @@ xm xm EI "} -(49,1,1) = {" +(48,1,1) = {" EI xm xm @@ -32069,22 +31316,22 @@ xm xm xm xm -SU -SU -SU -SU -SU -SU -SU xm xm -SU -SU -SU -SU -SU -SU -SU +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -32118,29 +31365,29 @@ zi zi zi xm -Gf -WC -WC -ZE -Rt -wM -PH -xX -dy -dy -Gk -Gf -xm -xm -xm -xm -xm xm xm xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -32283,12 +31530,11 @@ xm xm xm xm -Ao -TJ -cz -Ao -Ao -Ao +xm +xm +xm +xm +xm xm xm xm @@ -32307,8 +31553,9 @@ lw lw lw lw -xm -xm +lw +lw +lw xm xm xm @@ -32360,7 +31607,7 @@ xm xm EI "} -(50,1,1) = {" +(49,1,1) = {" EI xm xm @@ -32420,29 +31667,29 @@ zi zi zi xm -Gf -WC -WC -cN -On -Sg -Gf -Gf -Fz -Fz -Gf -Gf -xm -xm -xm -xm -xm xm xm xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -32586,10 +31833,10 @@ xm xm xm Ao -gN -kP -xh -kP +TJ +cz +Ao +Ao Ao xm xm @@ -32623,12 +31870,12 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm +zy +zy +zy +zy +zy +zy zy zy zy @@ -32662,7 +31909,7 @@ xm xm EI "} -(51,1,1) = {" +(50,1,1) = {" EI xm xm @@ -32722,13 +31969,94 @@ zi zi zi xm -Gf -WC -to -SL -SL -SL -Gf +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -32763,6 +32091,227 @@ xm xm xm xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Ao +gN +kP +xh +kP +Ao +xm +xm +xm +xm +xm +xm +xm +xm +xm +lw +lw +lw +lw +lw +lw +lw +lw +lw +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +zy +zy +zy +zy +zy +zy +zy +zy +zy +zy +zy +zy +zy +zy +zy +zy +zy +zy +zy +zy +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +EI +"} +(51,1,1) = {" +EI +xm +xm +xm +xm +xm +xm +xm +xm +xm +SU +SU +SU +SU +SU +SU +SU +xm +xm +SU +SU +SU +SU +SU +SU +SU +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +OE +xm +xm +OE +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm zi zi zi @@ -33024,13 +32573,16 @@ zi zi zi xm -Gf -cu -WC -SL -CT -dm -Gf +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -33043,10 +32595,7 @@ zi zi zi zi -xm -xm -xm -xm +zi xm xm xm @@ -33326,13 +32875,16 @@ xm xm xm xm -Gf -vo -WC -La -Vs -Vs -Gf +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -33345,10 +32897,7 @@ zi zi zi zi -xm -xm -xm -xm +zi xm xm xm @@ -33628,13 +33177,16 @@ Rk Rk Rk xm -Gf -Xw -WC -SL -Vs -iD -Gf +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -33648,17 +33200,14 @@ zi zi zi zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -33930,13 +33479,18 @@ Rk Rk Rk xm -Gf -SL -La -SL -SL -SL -Gf +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm zi zi @@ -33948,20 +33502,15 @@ zi zi zi zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -34232,39 +33781,39 @@ Rk Rk Rk xm -Gf -So -yA -cO -cO -xk -Gf xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -34534,39 +34083,39 @@ Rk Rk Rk xm -Gf -WQ -XD -iX -iX -AG -Gf xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -34836,39 +34385,39 @@ Rk Rk Rk xm -Gf -dX -cO -gE -cO -AV -Gf xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -35138,39 +34687,39 @@ Rk Rk Rk xm -Gf -Rx -am -nl -Yb -UP -Gf xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -35440,38 +34989,38 @@ Rk Rk Rk xm -Gf -Gf -Fz -Fz -Fz -Gf -Gf xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -35750,29 +35299,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm diff --git a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm index 779f6fd2d6..ce90f5f1a4 100644 --- a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm +++ b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm @@ -74,6 +74,39 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/ncr) +"aaR" = ( +/obj/item/ammo_box/magazine/m556/rifle/empty{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/ammo_box/magazine/m556/rifle/empty{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/ammo_box/magazine/m556/rifle/empty{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/ammo_box/magazine/m556/rifle/empty{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/ammo_box/magazine/m556/rifle{ + pixel_y = -7; + pixel_x = -5 + }, +/obj/item/ammo_box/magazine/m556/rifle{ + pixel_y = -7; + pixel_x = -5 + }, +/obj/item/ammo_box/magazine/m556/rifle{ + pixel_y = -7; + pixel_x = -5 + }, +/obj/structure/rack/shelf_metal, +/obj/item/gun/ballistic/automatic/service/carbine, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "aaT" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/sofa{ @@ -146,6 +179,10 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/o) +"aci" = ( +/obj/structure/flora/grass/coyote/six, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "acn" = ( /obj/effect/overlay/desert/sonora/edge, /obj/structure/destructible/tribal_torch/wall/lit, @@ -210,6 +247,13 @@ icon_state = "dirt" }, /area/f13/wasteland) +"ael" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -3 + }, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) "aeE" = ( /obj/structure/rack, /obj/item/clothing/under/blacktango, @@ -320,8 +364,12 @@ /area/f13/clinic) "ahk" = ( /obj/machinery/workbench/advanced, +/obj/machinery/light{ + dir = 8; + flickering = 1 + }, /turf/open/floor/wood_common/wood_common_light, -/area/f13/wasteland) +/area/f13/ncr) "ahs" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" @@ -508,6 +556,12 @@ "akw" = ( /turf/closed/wall/mineral/wood, /area/f13/ambientlighting/building/d) +"akN" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "akT" = ( /turf/open/indestructible/ground/outside/snow, /area/f13/ncr) @@ -1030,7 +1084,7 @@ "atA" = ( /obj/machinery/vending/coffee, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "atE" = ( /obj/machinery/power/port_gen/pacman/diesel{ anchored = 1 @@ -2101,6 +2155,18 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"aJV" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/landmark/start/f13/ncroffduty, +/obj/effect/landmark/start/f13/ncroffduty, +/obj/effect/landmark/start/f13/ncrrearechelon, +/turf/open/floor/wood_common, +/area/f13/wasteland) "aJY" = ( /obj/machinery/light{ dir = 1; @@ -2136,9 +2202,11 @@ /area/f13/ambientlighting/building/i) "aKn" = ( /obj/structure/reagent_dispensers/water_cooler, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "aKt" = ( /obj/structure/chair/office{ dir = 8 @@ -2245,6 +2313,9 @@ /obj/item/stock_parts/cell/high/empty, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"aLM" = ( +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) "aLX" = ( /obj/structure/chair/left, /obj/effect/decal/cleanable/dirt/dust, @@ -2263,6 +2334,10 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/t) +"aMd" = ( +/obj/effect/decal/cleanable/ash, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "aMj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -2275,6 +2350,12 @@ /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"aMB" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "aMC" = ( /obj/effect/spawner/lootdrop/f13/medical/vault/equipment, /obj/structure/rack/large/shelf_rust, @@ -2523,7 +2604,7 @@ "aQs" = ( /obj/machinery/autolathe/ammo, /turf/open/floor/wood_common/wood_common_light, -/area/f13/wasteland) +/area/f13/ncr) "aQw" = ( /obj/structure/anvil, /obj/item/melee/smith/hammer/premade, @@ -2695,6 +2776,24 @@ /obj/machinery/light, /turf/open/floor/carpet/purple, /area/f13/bar) +"aTq" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) "aTr" = ( /obj/structure/window/fulltile/store{ icon_state = "storewindowtop" @@ -2821,6 +2920,15 @@ }, /turf/closed/mineral/random/low_chance, /area/f13/building/tribal) +"aUY" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "aVc" = ( /obj/structure/flora/stump{ pixel_x = -27; @@ -3058,7 +3166,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "aXW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -3096,6 +3204,12 @@ /obj/structure/simple_door/metal/fence/wooden, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"aYE" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "aYI" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 9 @@ -3196,7 +3310,7 @@ "aZK" = ( /obj/structure/rack/large/shelf_rust, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "aZR" = ( /obj/structure/wreck/trash/two_tire, /turf/open/indestructible/ground/outside/desert, @@ -3515,6 +3629,12 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"beK" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "beU" = ( /obj/item/kirbyplants{ icon_state = "plant-12"; @@ -3658,7 +3778,7 @@ "bgZ" = ( /obj/structure/target_stake, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "bhi" = ( /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/high, /obj/structure/reagent_dispensers/barrel/two, @@ -3914,6 +4034,15 @@ dir = 8 }, /area/f13/wasteland) +"blA" = ( +/obj/effect/turf_decal/big{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) "blF" = ( /obj/structure/chair/wood{ dir = 8 @@ -4062,10 +4191,12 @@ /obj/effect/turf_decal/big{ dir = 10 }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/fluff/rug/rug_rubber, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, -/area/f13/wasteland) +/area/f13/ncr) "bnN" = ( /obj/structure/table/wood, /obj/item/storage/box/medicine/antivenom5, @@ -4082,12 +4213,15 @@ }, /area/f13/followers) "bok" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22"; - pixel_x = 10; - pixel_y = 1 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" }, -/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland) "bop" = ( /obj/structure/closet/crate/wicker, @@ -4103,6 +4237,14 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating/rust, /area/f13/building/powered) +"boK" = ( +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_8"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "bpa" = ( /obj/structure/table/wood, /obj/machinery/chem_master/condimaster{ @@ -4231,6 +4373,17 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ncr) +"bqM" = ( +/mob/living/simple_animal/hostile/handy/protectron{ + faction = list("NCR"); + enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); + name = "National Guard Protectron"; + desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) "bqN" = ( /obj/effect/turf_decal/huge, /obj/effect/decal/cleanable/greenglow, @@ -4553,6 +4706,12 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) +"bwa" = ( +/obj/structure/chair/wood/wings{ + dir = 1 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "bwc" = ( /turf/open/indestructible/ground/outside/ruins{ icon_state = "rubble" @@ -4687,9 +4846,21 @@ /obj/structure/chair/wood/wings{ dir = 1 }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) +"byE" = ( +/obj/machinery/light{ + dir = 8; + flickering = 1 + }, +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "byM" = ( /obj/structure/table/wood, /turf/open/floor/f13{ @@ -4697,15 +4868,13 @@ }, /area/f13/ambientlighting/building/g) "byQ" = ( -/obj/effect/landmark/start/f13/ncrconscript, -/obj/effect/landmark/start/f13/ncrconscript, -/obj/effect/landmark/start/f13/ncrconscript, -/obj/effect/landmark/start/f13/ncrconscript, -/obj/effect/landmark/start/f13/ncrconscript, -/obj/effect/landmark/start/f13/ncrconscript, -/obj/effect/landmark/start/f13/ncrconscript, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/glass, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "bzf" = ( /obj/structure/tires/two, /turf/open/indestructible/ground/outside/road{ @@ -4828,30 +4997,11 @@ }, /area/f13/wasteland) "bBt" = ( -/obj/structure/table, -/obj/item/lock_construct{ - pixel_x = 4; - pixel_y = 12 - }, -/obj/item/lock_construct{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/item/key{ - pixel_x = -5; - pixel_y = 7 - }, -/obj/item/key{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/cable/outdoors{ + icon_state = "1-2" }, -/area/f13/wasteland) +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "bBu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/tentclothcorner{ @@ -5019,6 +5169,15 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/a) +"bEf" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "bEl" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -5160,6 +5319,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"bGj" = ( +/obj/structure/statue_fal, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "bGn" = ( /obj/structure/fence/end/wooden{ dir = 8 @@ -5196,6 +5359,12 @@ /obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"bGL" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "bGM" = ( /obj/structure/barricade/sandbags, /obj/machinery/camera/autoname{ @@ -5215,9 +5384,17 @@ /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) "bGS" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/mob/living/simple_animal/hostile/handy/protectron{ + faction = list("NCR"); + enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); + name = "National Guard Protectron"; + desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "bHd" = ( /obj/effect/decal/fakelattice, /obj/structure/disposalpipe/segment{ @@ -5337,9 +5514,9 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) "bIP" = ( -/obj/structure/table, +/obj/structure/table/wood/junk, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "bJc" = ( /obj/structure/railing/corner{ color = "#A47449" @@ -5480,6 +5657,10 @@ "bLC" = ( /turf/open/floor/plating/dirt, /area/f13/ncr) +"bLE" = ( +/obj/structure/flora/grass/coyote/twentynine, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "bLH" = ( /mob/living/simple_animal/hostile/ghoul, /obj/effect/decal/cleanable/dirt/dust, @@ -5626,6 +5807,14 @@ icon_state = "horizontalinnermain2" }, /area/f13/wasteland) +"bNM" = ( +/obj/structure/chair/bench{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain2top" + }, +/area/f13/wasteland) "bNO" = ( /obj/item/storage/trash_stack{ icon_state = "trash_2" @@ -5939,8 +6128,11 @@ /area/f13/ambientlighting/building/k) "bRO" = ( /obj/effect/decal/cleanable/oil, +/obj/structure/extinguisher_cabinet{ + pixel_y = 28 + }, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "bRX" = ( /obj/structure/barricade/tentleathercorner{ dir = 1 @@ -5957,7 +6149,8 @@ icon_state = "housewindowbroken" }, /obj/structure/barricade/wooden/planks{ - icon_state = "board-2" + icon_state = "board-2"; + desc = "This sps" }, /obj/structure/barricade/bars, /turf/open/floor/f13/wood, @@ -5965,13 +6158,13 @@ "bSi" = ( /obj/structure/filingcabinet, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "bSj" = ( /obj/structure/chair/wood/wings{ dir = 8 }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "bSo" = ( /obj/effect/mob_spawn/human/corpse/enclave/soldier, /obj/effect/decal/cleanable/blood/old{ @@ -6014,6 +6207,17 @@ }, /turf/open/floor/plasteel/f13/vault_floor/red/white, /area/f13/ambientlighting/building/j) +"bSZ" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +/area/f13/wasteland) "bTs" = ( /obj/structure/barricade/tentleathercorner{ dir = 8 @@ -6260,6 +6464,17 @@ /obj/effect/mob_spawn/human/corpse/ncr, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"bYe" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) "bYf" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -6282,10 +6497,10 @@ /area/f13/building/abandoned/m) "bYl" = ( /obj/structure/chair/wood/wings{ - dir = 1 + dir = 4 }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "bYo" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/floor/f13{ @@ -6345,7 +6560,7 @@ name = "Armoury" }, /turf/open/floor/wood_common/wood_common_light, -/area/f13/wasteland) +/area/f13/ncr) "bZt" = ( /obj/item/mine/shrapnel{ alpha = 65 @@ -6523,6 +6738,10 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland/town) +"cbD" = ( +/obj/structure/flora/grass/coyote/twelve, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "cbF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/port_gen/pacman/diesel, @@ -6651,6 +6870,14 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/w) +"cdT" = ( +/obj/structure/rack/shelf_metal, +/obj/item/stack/crafting/armor_plate, +/obj/item/stack/crafting/armor_plate, +/obj/item/stack/crafting/armor_plate, +/obj/item/stack/crafting/armor_plate, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "cdY" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -6817,7 +7044,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "cgv" = ( /obj/structure/simple_door, /obj/structure/closet/cardboard, @@ -6949,6 +7176,13 @@ icon_state = "dirt" }, /area/f13/wasteland) +"cjF" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "cjO" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/royalblack, @@ -7260,7 +7494,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "coL" = ( /obj/item/paper/crumpled, /turf/open/floor/wood_common, @@ -7338,10 +7572,19 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/a) +"cpS" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "cpU" = ( /mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "cqa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -7740,9 +7983,11 @@ /obj/structure/fence{ dir = 8 }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/indestructible/ground/outside/desert, -/area/f13/wasteland) +/area/f13/ncr) "cwn" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/structure/reagent_dispensers/barrel/dangerous{ @@ -8169,6 +8414,15 @@ /obj/item/trade_sign, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/town) +"cBO" = ( +/mob/living/simple_animal/hostile/handy/protectron{ + faction = list("NCR"); + enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); + name = "National Guard Protectron"; + desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "cBS" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt{ @@ -8387,6 +8641,22 @@ /obj/machinery/vending/cigarette/syndicate, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/l) +"cEN" = ( +/obj/item/ammo_box/magazine/m556/rifle/assault{ + pixel_x = 2 + }, +/obj/item/ammo_box/magazine/m556/rifle/assault{ + pixel_x = -4 + }, +/obj/structure/rack/shelf_metal, +/obj/item/ammo_box/magazine/m556/rifle/assault{ + pixel_x = -4 + }, +/obj/item/ammo_box/magazine/m556/rifle/assault{ + pixel_x = -4 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "cET" = ( /obj/structure/table/wood, /obj/machinery/chem_heater{ @@ -8703,9 +8973,11 @@ /area/f13/followers) "cIz" = ( /obj/structure/table, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "cIE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/camera/autoname{ @@ -8794,9 +9066,17 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) "cJB" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/leather/twenty, +/obj/item/stack/sheet/mineral/concrete/ten, +/obj/item/stack/sheet/mineral/limestone/ten, /turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain1" + icon_state = "horizontalbottombordertop2" }, /area/f13/wasteland) "cJT" = ( @@ -8870,11 +9150,13 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/f13/building/abandoned/z) "cKM" = ( -/obj/effect/landmark/start/f13/ncrsergeant, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" +/obj/structure/chair{ + dir = 8 }, -/area/f13/wasteland) +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) "cKR" = ( /mob/living/simple_animal/hostile/stalker, /obj/effect/turf_decal/weather/dirt{ @@ -8946,7 +9228,7 @@ pixel_x = -10 }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "cLP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/gibspawner/human, @@ -8968,10 +9250,12 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "cMj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/start/f13/ncrlieutenant, -/turf/open/floor/carpet/red, -/area/f13/ncr) +/obj/structure/table/booth, +/obj/item/flag/ncr{ + pixel_y = 22 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "cMu" = ( /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded" @@ -9015,8 +9299,11 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "cMW" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "cNt" = ( /obj/structure/flora/ausbushes/brflowers, /turf/open/indestructible/ground/outside/desert, @@ -9783,8 +10070,11 @@ /area/f13/ambientlighting/building/i) "cZH" = ( /obj/structure/table/wood/junk, +/obj/item/statuebust{ + pixel_y = 16 + }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "cZI" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -9855,7 +10145,7 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, -/area/f13/wasteland) +/area/f13/ncr) "daz" = ( /obj/structure/fence/corner, /turf/open/indestructible/ground/outside/desert, @@ -10065,11 +10355,13 @@ /obj/effect/decal/cleanable/blood{ icon_state = "tracks" }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "ddY" = ( /obj/structure/chair, /obj/effect/decal/cleanable/dirt{ @@ -10126,6 +10418,17 @@ }, /turf/open/floor/plating/dirt, /area/f13/ambientlighting/building/j) +"dfc" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "dfk" = ( /obj/structure/fence{ dir = 1 @@ -10472,11 +10775,13 @@ /turf/open/floor/wood_common, /area/f13/clinic) "dku" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "dkz" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -10509,6 +10814,12 @@ "dkX" = ( /turf/open/floor/f13/wood, /area/f13/building/abandoned/n) +"dlb" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/fakelattice, +/obj/machinery/power/smes/engineering, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "dln" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 @@ -10795,6 +11106,12 @@ /obj/structure/simple_door/metal/fence/wooden, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"dpT" = ( +/obj/structure/rack/shelf_metal, +/obj/item/stack/crafting/armor_plate, +/obj/item/stack/crafting/armor_plate/five, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "dpV" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -10802,6 +11119,18 @@ /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"dpY" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "dqb" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" @@ -10963,6 +11292,18 @@ /obj/structure/wreck/trash/engine, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"dsv" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "dsF" = ( /turf/closed/indestructible/rock{ desc = "A pre-War wall made of solid concrete."; @@ -11016,7 +11357,8 @@ /area/f13/brotherhood) "dtn" = ( /obj/structure/barricade/wooden/planks{ - icon_state = "board-2" + icon_state = "board-2"; + desc = "This sps" }, /obj/structure/barricade/wooden, /turf/closed/wall/f13/wood/house/broken, @@ -11568,14 +11910,16 @@ }, /area/f13/building/abandoned/a) "dCE" = ( -/obj/structure/fence/post{ - pixel_y = -18; - pixel_x = 16; - desc = "An iron support beam."; - name = "iron stanchion" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerbordercorner" }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, -/turf/open/floor/wood_common, /area/f13/wasteland) "dCU" = ( /obj/structure/simple_door/metal/store, @@ -11651,6 +11995,13 @@ /obj/structure/stairs/east, /turf/open/floor/f13/wood, /area/f13/building/abandoned/m) +"dEw" = ( +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "dEx" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/indestructible/ground/outside/dirt, @@ -11748,7 +12099,8 @@ /area/f13/legioncamp) "dGM" = ( /obj/structure/barricade/wooden/planks{ - icon_state = "board-2" + icon_state = "board-2"; + desc = "This sps" }, /turf/closed/wall/f13/wood/house, /area/f13/ncr) @@ -12319,8 +12671,14 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"dOi" = ( +/obj/structure/flora/brushwood, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "dOn" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" }, @@ -12338,6 +12696,9 @@ /obj/item/statuebust, /turf/open/floor/wood_common/wood_common_dark, /area/f13/building/abandoned/m) +"dOD" = ( +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "dOF" = ( /turf/open/floor/f13/wood{ icon_state = "housewood4-broken" @@ -12465,10 +12826,9 @@ /turf/open/floor/carpet/airless, /area/f13/ambientlighting/building/c) "dQz" = ( -/obj/structure/table/booth, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/fluff/hedge, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "dQP" = ( /obj/structure/fence{ pixel_x = -14 @@ -12493,7 +12853,7 @@ /obj/effect/spawner/lootdrop/tool_box, /obj/item/salvage/low, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "dRb" = ( /obj/effect/turf_decal/weather/dirt, /obj/structure/chair/bench{ @@ -12676,8 +13036,9 @@ /obj/item/bedsheet/blanket{ pixel_y = 1 }, +/obj/effect/landmark/start/f13/ncrconscript, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "dTE" = ( /obj/structure/sign/poster/contraband/red_rum{ pixel_y = 32 @@ -12801,6 +13162,15 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"dVp" = ( +/obj/structure/rack/shelf_metal, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/crafting/armor_plate, +/obj/item/stack/crafting/armor_plate, +/obj/item/stack/crafting/armor_plate, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "dVs" = ( /obj/effect/decal/marking{ icon_state = "dottedhorizontalcorroded" @@ -12885,6 +13255,10 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +"dWL" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "dXp" = ( /obj/structure/debris/v3, /turf/open/indestructible/ground/outside/sidewalk, @@ -12934,6 +13308,13 @@ /obj/effect/landmark/poster_spawner/pinup, /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) +"dYH" = ( +/obj/structure/barricade/wooden/planks{ + icon_state = "board-2"; + desc = "This sps" + }, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) "dYM" = ( /obj/structure/wreck/trash/brokenvendor, /obj/effect/decal/cleanable/dirt/dust, @@ -13275,6 +13656,13 @@ icon_state = "horizontaltopbordertopright" }, /area/f13/wasteland) +"eer" = ( +/obj/machinery/power/apc/fusebox/north, +/obj/structure/cable/outdoors{ + icon_state = "0-2" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "ees" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /obj/machinery/power/apc/fusebox/north, @@ -13416,6 +13804,13 @@ icon_state = "tunnelrusty" }, /area/f13/building/powered) +"egt" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/machinery/power/floodlight, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "egC" = ( /obj/item/storage/trash_stack{ icon_state = "trash_2" @@ -13862,9 +14257,11 @@ /area/f13/wasteland) "enU" = ( /mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "enZ" = ( /obj/structure/chair/f13chair1, /obj/item/cigbutt/cigarbutt, @@ -14394,6 +14791,10 @@ /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) +"ewm" = ( +/obj/machinery/light/fo13colored/Red, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "ewt" = ( /obj/structure/table/wood, /obj/machinery/cell_charger, @@ -14562,7 +14963,15 @@ }, /area/f13/building/powered) "ezE" = ( -/obj/structure/sign/brotherhoodcardboard, +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" }, @@ -15052,11 +15461,9 @@ icon_state = "mattress1"; pixel_y = 9 }, -/obj/item/bedsheet/blanket{ - pixel_y = 1 - }, +/obj/effect/landmark/start/f13/ncrconscript, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "eGO" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /obj/structure/obstacle/barbedwire/end, @@ -15092,7 +15499,7 @@ icon_state = "plant-17" }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "eHp" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall/f13/wood/house, @@ -15104,6 +15511,21 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +"eHQ" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) "eHU" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerborder"; @@ -15213,6 +15635,17 @@ icon_state = "whitedirtysolid" }, /area/f13/followers) +"eJl" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "eJn" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier4, @@ -15328,7 +15761,7 @@ pixel_y = 4 }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "eLf" = ( /obj/structure/barricade/wooden/strong, /obj/structure/decoration/rag, @@ -15483,7 +15916,7 @@ "eMZ" = ( /obj/item/defibrillator/primitive, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "eNa" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/item/flag, @@ -15515,6 +15948,15 @@ icon_state = "horizontalinnermain2left" }, /area/f13/wasteland) +"eND" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerinner" + }, +/area/f13/wasteland) "eNN" = ( /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, /area/f13/building/powered) @@ -15635,6 +16077,9 @@ anchored = 1 }, /obj/item/stack/sheet/mineral/plasma/fifty, +/obj/structure/cable/outdoors{ + icon_state = "0-2" + }, /turf/open/floor/plating/f13, /area/f13/wasteland) "eQp" = ( @@ -15692,7 +16137,8 @@ icon_state = "housewindowbroken" }, /obj/structure/barricade/wooden/planks{ - icon_state = "board-2" + icon_state = "board-2"; + desc = "This sps" }, /obj/structure/barricade/bars, /turf/open/indestructible/ground/outside/desert, @@ -15708,6 +16154,17 @@ /mob/living/simple_animal/cow/brahmin, /turf/open/indestructible/ground/outside/grass, /area/f13/ambientlighting/building/c) +"eRG" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) "eRI" = ( /obj/structure/barricade/bars{ max_integrity = 800; @@ -15893,7 +16350,7 @@ /obj/structure/table, /obj/machinery/microwave, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "eUI" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/effect/decal/cleanable/greenglow, @@ -16175,9 +16632,20 @@ }, /area/f13/building/powered) "eYx" = ( -/obj/structure/rack/shelf_metal, +/obj/item/gun/ballistic/automatic/service{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/gun/ballistic/automatic/service, +/obj/item/gun/ballistic/automatic/service{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/structure/guncase{ + anchored = 1 + }, /turf/open/floor/wood_common/wood_common_light, -/area/f13/wasteland) +/area/f13/ncr) "eYB" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -16347,7 +16815,7 @@ "fbM" = ( /obj/effect/spawner/lootdrop/tool_box, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "fbO" = ( /obj/structure/simple_door/room, /obj/structure/barricade/wooden/strong, @@ -16417,6 +16885,18 @@ /obj/structure/obstacle/barbedwire, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"fcu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "fcB" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -16492,6 +16972,13 @@ icon_state = "verticaloutermain1" }, /area/f13/wasteland) +"fdB" = ( +/obj/machinery/power/apc/fusebox/north, +/obj/structure/cable/outdoors{ + icon_state = "0-2" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "fdC" = ( /obj/structure/beebox, /obj/effect/turf_decal/weather/dirt{ @@ -16512,7 +16999,7 @@ "feb" = ( /obj/structure/safe, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "feg" = ( /obj/item/reagent_containers/food/drinks/coffee{ pixel_x = -7; @@ -16611,15 +17098,17 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "ffy" = ( /obj/structure/table/reinforced, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "ffB" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "ffJ" = ( /obj/machinery/light/small{ dir = 4 @@ -16852,7 +17341,7 @@ dir = 8 }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "fiI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt{ @@ -17084,6 +17573,16 @@ }, /turf/open/floor/carpet/red, /area/f13/ambientlighting/building/e) +"flK" = ( +/obj/machinery/hydroponics/soil, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "flS" = ( /obj/structure/table/wood, /obj/structure/dresser, @@ -17133,6 +17632,14 @@ "fmy" = ( /turf/open/floor/wood_common, /area/f13/clinic) +"fmC" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/plating/f13/inside/gravel/edge{ + dir = 1 + }, +/area/f13/wasteland) "fmE" = ( /obj/machinery/light/lampost{ dir = 1 @@ -17234,12 +17741,11 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "foA" = ( -/obj/structure/fence/post{ - pixel_y = -18; - pixel_x = 16; - desc = "An iron support beam."; - name = "iron stanchion" - }, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/mineral/concrete/ten, +/obj/item/stack/sheet/mineral/limestone/five, /turf/open/floor/wood_common, /area/f13/wasteland) "foC" = ( @@ -17380,9 +17886,10 @@ }, /area/f13/building/powered) "fqh" = ( -/obj/effect/landmark/start/f13/ncrsergeant, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor3-broken" +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerbordercorner" }, /area/f13/wasteland) "fqz" = ( @@ -17452,7 +17959,7 @@ pixel_x = -6 }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "frK" = ( /obj/effect/decal/cleanable/blood/old{ icon_state = "gibbearcore" @@ -17535,7 +18042,6 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "fsB" = ( -/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, /obj/structure/bed/mattress{ icon_state = "mattress2" }, @@ -17543,7 +18049,7 @@ pixel_y = 1 }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "fsN" = ( /obj/structure/wreck/car, /turf/open/indestructible/ground/outside/road{ @@ -17639,9 +18145,8 @@ color = "#e8e4ca"; name = "Captain's Office" }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "fup" = ( /obj/structure/chair/sofa/left{ dir = 8; @@ -17729,15 +18234,19 @@ icon_state = "horizontaltopbordertop0" }, /area/f13/wasteland) -"fwg" = ( -/obj/structure/fence/post{ - pixel_y = -18; - pixel_x = 16 +"fvX" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalrightborderright0" +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +"fwg" = ( +/obj/machinery/light/fo13colored/Red{ + dir = 4 }, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "fwi" = ( /obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/inside/dirt, @@ -18340,6 +18849,18 @@ icon_state = "bluedirtychess2" }, /area/f13/followers) +"fEU" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/handy/protectron{ + faction = list("NCR"); + enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); + name = "National Guard Protectron"; + desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) "fFh" = ( /obj/structure/table/wood/settler, /obj/item/reagent_containers/glass/bowl, @@ -18689,7 +19210,7 @@ "fLe" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "fLk" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall/f13/wood, @@ -18708,7 +19229,7 @@ dir = 1 }, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "fLL" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -18730,7 +19251,7 @@ "fMf" = ( /obj/machinery/door/unpowered/secure_NCR, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "fMi" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 8 @@ -18976,12 +19497,23 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) +"fPf" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) "fPk" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" }, /turf/closed/wall/mineral/brick, -/area/f13/wasteland) +/area/f13/ncr) "fPz" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain2" @@ -19217,8 +19749,9 @@ /area/f13/ambientlighting/building/i) "fTn" = ( /obj/item/reagent_containers/glass/rag/towel, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "fTt" = ( /obj/structure/window/reinforced/spawner/east, /obj/structure/rack, @@ -19376,8 +19909,12 @@ /area/f13/ncr) "fVF" = ( /obj/item/twohanded/required/kirbyplants/random, +/obj/machinery/light/small{ + dir = 8; + brightness = 9 + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "fVH" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -19412,6 +19949,12 @@ /obj/effect/decal/cleanable/generic, /turf/closed/wall/mineral/concrete, /area/f13/ambientlighting/building/j) +"fVQ" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "fVS" = ( /turf/closed/wall/f13/sunset/brick_small_dark, /area/f13/followers) @@ -19473,9 +20016,13 @@ /area/f13/legioncamp) "fXb" = ( /obj/effect/spawner/lootdrop/bedsheet, -/obj/structure/bed, +/obj/structure/bed/wooden, +/obj/machinery/light_switch{ + pixel_y = 29 + }, +/obj/effect/landmark/start/f13/ncrcaptain, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "fXf" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall/mineral/sandstone, @@ -19531,15 +20078,11 @@ /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/t) "fYh" = ( -/obj/structure/fence/post{ - pixel_y = -18; - pixel_x = 16; - desc = "An iron support beam."; - name = "iron stanchion" +/obj/machinery/light{ + pixel_x = 16 }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, -/turf/open/indestructible/ground/outside/desert, -/area/f13/wasteland) +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "fYj" = ( /turf/open/floor/f13{ icon_state = "floorrusty" @@ -19662,9 +20205,8 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "gaq" = ( -/obj/structure/fluff/hedge, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "gaw" = ( /obj/machinery/door/unpowered/secure_bos, /turf/open/floor/f13{ @@ -19722,7 +20264,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "gbc" = ( /turf/open/indestructible/ground/outside/water, /area/f13/caves) @@ -19826,7 +20368,7 @@ /obj/structure/rack/shelf_metal, /obj/item/salvage/low, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "gcP" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/weapon/melee/tier2, @@ -19853,7 +20395,7 @@ /obj/structure/barricade/bars, /obj/effect/spawner/structure/window/reinforced/indestructable, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "gdo" = ( /obj/structure/debris/v1{ color = "#343a33"; @@ -20413,6 +20955,12 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +"glf" = ( +/obj/structure/sign/parking, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "glg" = ( /obj/effect/gibspawner/human, /obj/effect/decal/cleanable/dirt, @@ -20982,6 +21530,13 @@ name = "dirty floor" }, /area/f13/building/powered) +"guP" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "guS" = ( /obj/structure/obstacle/barbedwire, /obj/structure/obstacle/barbedwire{ @@ -21235,6 +21790,13 @@ name = "dirty floor" }, /area/f13/building/powered) +"gzE" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "gzI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -21306,7 +21868,7 @@ /obj/effect/landmark/start/f13/ncrmp, /obj/effect/landmark/start/f13/ncrmp, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "gAF" = ( /obj/structure/flora/tree/oak_three, /turf/open/indestructible/ground/outside/grass/dirtpath{ @@ -21594,6 +22156,15 @@ /obj/structure/wreck/trash/machinepile, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"gEy" = ( +/obj/structure/table/wood/junk, +/obj/item/stamp/captain{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/stamp/denied, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "gEA" = ( /obj/machinery/light, /turf/open/floor/f13{ @@ -21670,8 +22241,11 @@ /area/f13/wasteland) "gFV" = ( /obj/machinery/power/floodlight, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "gGf" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -21719,6 +22293,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/basalt/wasteland, /area/f13/building/abandoned/g) +"gGH" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "gGV" = ( /obj/structure/bodycontainer/crematorium{ id = "600" @@ -21754,7 +22332,9 @@ dir = 4; light_color = "#ff4747" }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "gHy" = ( @@ -21986,6 +22566,12 @@ /mob/living/simple_animal/hostile/centaur/strong, /turf/open/floor/plating/rust, /area/f13/building/powered) +"gKD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2bottom" + }, +/area/f13/wasteland) "gKI" = ( /obj/effect/decal/marking{ icon_state = "singlehorizontal" @@ -22878,7 +23464,7 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, -/area/f13/wasteland) +/area/f13/ncr) "gWU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fluff/hedge, @@ -22993,6 +23579,18 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"gYy" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/window/fulltile/house{ + icon_state = "housewindowbroken" + }, +/obj/structure/curtain{ + color = "#363636" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "gYz" = ( /obj/structure/sign/poster/official/science, /turf/closed/wall/f13/store, @@ -23036,8 +23634,12 @@ /area/f13/underground/cave) "gYV" = ( /obj/structure/fluff/hedge, +/obj/machinery/light/small{ + dir = 8; + pixel_y = -7 + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "gZc" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -23048,6 +23650,17 @@ icon_state = "floorrusty" }, /area/f13/building/abandoned/h) +"gZg" = ( +/obj/structure/chair/bench{ + dir = 1 + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "gZl" = ( /obj/structure/cargocrate{ pixel_y = 32 @@ -23099,6 +23712,11 @@ icon_state = "carpetstar" }, /area/f13/ambientlighting/building/z) +"gZW" = ( +/obj/machinery/workbench, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "hab" = ( /obj/structure/table/wood/junk, /obj/effect/decal/cleanable/blood{ @@ -23380,6 +23998,13 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/m) +"hdP" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "hdT" = ( /obj/structure/shelf_wood, /obj/item/clothing/under/f13/tribe, @@ -23451,7 +24076,7 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, -/area/f13/wasteland) +/area/f13/ncr) "heB" = ( /mob/living/simple_animal/hostile/supermutant/meleemutant, /obj/effect/decal/cleanable/dirt, @@ -23633,7 +24258,7 @@ "hhn" = ( /obj/structure/decoration/clock, /turf/closed/wall/mineral/brick, -/area/f13/wasteland) +/area/f13/ncr) "hhr" = ( /obj/structure/junk/locker, /obj/effect/spawner/lootdrop/f13/weapon/melee/tier3, @@ -23922,14 +24547,8 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "hkO" = ( -/obj/structure/railing/wood/post{ - desc = "A wooden stanchion."; - name = "wooden stanchion"; - pixel_y = 26; - pixel_x = -18 - }, /turf/closed/mineral/random, -/area/f13/wasteland) +/area/f13/ncr) "hkX" = ( /obj/effect/turf_decal/trimline/white/line, /turf/open/indestructible/ground/outside/road{ @@ -24161,7 +24780,7 @@ "hnG" = ( /obj/structure/chair/wood/wings, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "hnH" = ( /obj/structure/closet/cabinet, /obj/effect/decal/cleanable/dirt, @@ -24345,10 +24964,14 @@ icon_state = "horizontaloutermain0" }, /area/f13/brotherhood/surface) +"hqe" = ( +/obj/structure/janitorialcart, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "hql" = ( /obj/structure/sign/flag_texas, /turf/closed/wall/f13/wood/interior, -/area/f13/wasteland) +/area/f13/ncr) "hqn" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, @@ -24529,7 +25152,7 @@ "hsD" = ( /obj/item/pickaxe, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "hsI" = ( /obj/structure/table/reinforced, /obj/effect/decal/fakelattice, @@ -24587,7 +25210,7 @@ req_access_txt = "121" }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "hti" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -24630,11 +25253,10 @@ }, /area/f13/building/powered) "htS" = ( -/obj/structure/fence/post{ - pixel_y = -18; - pixel_x = 16 +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2" }, -/turf/closed/wall/mineral/brick, /area/f13/wasteland) "htY" = ( /obj/structure/flora/grass/wasteland{ @@ -24649,7 +25271,7 @@ pixel_x = -8 }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "huj" = ( /obj/structure/flora/tree/cactus_alt, /turf/open/indestructible/ground/outside/dirt{ @@ -24676,6 +25298,10 @@ dir = 1 }, /area/f13/wasteland) +"huE" = ( +/obj/structure/flora/grass/coyote/three, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "huO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/f13/crafting, @@ -24753,6 +25379,12 @@ }, /turf/open/indestructible/ground/outside/snow, /area/f13/wasteland) +"hvC" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "hvN" = ( /obj/effect/overlay/junk/oldpipes{ pixel_y = -3 @@ -24957,6 +25589,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"hyn" = ( +/obj/structure/table, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "hys" = ( /obj/effect/overlay/desert_side{ dir = 8 @@ -25370,7 +26006,7 @@ pixel_x = -14 }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "hDC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/darkbrown, @@ -25989,6 +26625,12 @@ /obj/effect/spawner/lootdrop/trash, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"hNc" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "hNl" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -26297,6 +26939,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/ncr) +"hRc" = ( +/obj/effect/spawner/structure/window/reinforced/indestructable, +/obj/structure/table, +/obj/structure/barricade/bars, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "hRm" = ( /obj/structure/table/wood/junk, /obj/structure/fence{ @@ -26798,6 +27446,15 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland/town) +"hZK" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "hZL" = ( /obj/structure/lamp_post{ dir = 8 @@ -27186,6 +27843,12 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/j) +"ifQ" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "ifR" = ( /obj/structure/flora/grass/jungle/b, /obj/effect/turf_decal/weather/dirt{ @@ -27205,6 +27868,24 @@ /obj/structure/flora/tree/wasteland, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +"igd" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 28 + }, +/obj/item/gun/ballistic/automatic/service, +/obj/item/gun/ballistic/automatic/service{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/gun/ballistic/automatic/service{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/structure/guncase{ + anchored = 1 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "ige" = ( /obj/structure/table_frame, /turf/open/indestructible/ground/outside/sidewalk{ @@ -27217,6 +27898,13 @@ icon_state = "whitedirtysolid" }, /area/f13/followers) +"ign" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/cargocrate, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "igz" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/crafting, @@ -27310,6 +27998,13 @@ icon_state = "horizontaloutermain2" }, /area/f13/wasteland) +"iho" = ( +/obj/machinery/light{ + dir = 8; + pixel_y = -16 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "ihu" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -27516,6 +28211,17 @@ /obj/effect/spawner/lootdrop/ammo/civilian, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/ambientlighting/building/p) +"ikh" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) "ikk" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/medical/rnd/good, @@ -27816,7 +28522,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "ipk" = ( /obj/structure/fluff/fokoff_sign, /turf/open/indestructible/ground/outside/dirt{ @@ -28152,6 +28858,14 @@ dir = 5 }, /area/f13/wasteland) +"ivD" = ( +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_4"; + layer = 5 + }, +/obj/structure/flora/twig3, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "ivG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/network_builder/power_cable/auto, @@ -28172,13 +28886,22 @@ }, /turf/open/floor/plating/dirt, /area/f13/ambientlighting/building/j) +"ivI" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/machinery/light{ + pixel_x = 16 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "ivO" = ( /obj/structure/sign/poster/ncr/keep_to_myself{ desc = "The man. The myth. The unknown NCR Corporal who's photo was taken years ago and is still used today in various NCR camps to encourage proper behavior."; name = "Satisfactory NCR Poster" }, /turf/closed/wall/f13/wood/interior, -/area/f13/wasteland) +/area/f13/ncr) "ivQ" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -28495,7 +29218,7 @@ dir = 8 }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "iBg" = ( /obj/structure/obstacle/barbedwire, /turf/open/indestructible/ground/outside/road, @@ -28675,10 +29398,13 @@ "iDN" = ( /obj/effect/decal/cleanable/blood, /obj/effect/landmark/start/f13/ncrmedofficer, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "iDS" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -28750,6 +29476,12 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ncr) +"iEK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/wreck/bus/rusted, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) "iEQ" = ( /obj/effect/overlay/fog, /turf/open/indestructible/ground/outside/water/running, @@ -29294,7 +30026,7 @@ "iNl" = ( /obj/structure/table/wood/junk, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "iNn" = ( /obj/structure/rack, /obj/item/clothing/suit/pirate, @@ -29335,6 +30067,15 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland/town) +"iOE" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "iOG" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/three_course_meal, @@ -29629,6 +30370,19 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/f) +"iUu" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2"; + pixel_y = 4 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "iUB" = ( /obj/structure/simple_door/metal/store, /turf/open/floor/plating, @@ -29829,6 +30583,18 @@ icon_state = "dirt" }, /area/f13/wasteland) +"iXU" = ( +/obj/structure/rack/large/shelf, +/obj/item/storage/toolbox/ammo{ + pixel_x = 6; + pixel_y = 29 + }, +/obj/item/storage/toolbox/ammo{ + pixel_x = 6; + pixel_y = 2 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "iXY" = ( /obj/effect/turf_decal/weather/dirt{ color = "#a98c5d"; @@ -29892,14 +30658,11 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) "iZh" = ( -/obj/structure/railing/wood/post{ - desc = "A wooden stanchion."; - name = "wooden stanchion"; - pixel_y = 26; - pixel_x = -18 +/obj/structure/cable/outdoors{ + icon_state = "4-8" }, -/turf/closed/wall/mineral/brick, -/area/f13/wasteland) +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "iZj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/twig4, @@ -30025,7 +30788,7 @@ /obj/structure/table/wood/junk, /obj/item/pen/fourcolor, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "jaM" = ( /obj/structure/chair{ dir = 8 @@ -30401,7 +31164,9 @@ }, /area/f13/ambientlighting/building/f) "jgy" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerborder" }, @@ -30937,10 +31702,10 @@ /turf/open/indestructible/ground/outside/grass/dirtpath, /area/f13/wasteland) "jpl" = ( -/obj/structure/wreck/bus/rusted, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain1" +/obj/structure/cable/outdoors{ + icon_state = "4-8" }, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "jpq" = ( /obj/effect/turf_decal/weather/dirt, @@ -31259,7 +32024,7 @@ "juE" = ( /obj/structure/chair/stool/retro/black, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "juM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -31288,7 +32053,12 @@ "juY" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/fakelattice, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/floor/plating/f13, /area/f13/wasteland) "jvc" = ( @@ -31396,6 +32166,11 @@ /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"jwI" = ( +/obj/effect/spawner/lootdrop/trash, +/obj/structure/billboard/poseidenenergy2, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "jwL" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -31418,9 +32193,8 @@ /turf/open/floor/carpet/royalblack, /area/f13/ambientlighting/building/w) "jwS" = ( -/obj/structure/closet/locker, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "jxc" = ( /obj/structure/window/fulltile/wood, /obj/structure/curtain{ @@ -31447,7 +32221,7 @@ pixel_y = 27 }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "jxh" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -31527,9 +32301,11 @@ pixel_y = -1; pixel_x = -2 }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "jyd" = ( /turf/open/floor/f13{ color = "#d9c4b9"; @@ -31672,7 +32448,7 @@ "jAn" = ( /obj/structure/closet/crate/footlocker, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "jAp" = ( /obj/structure/decoration/hatch{ dir = 4 @@ -31920,13 +32696,13 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "jEq" = ( -/obj/machinery/door/poddoor/gate/bunker{ +/obj/machinery/door/poddoor/shutters{ id = 983 }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, -/area/f13/wasteland) +/area/f13/ncr) "jEr" = ( /obj/structure/table/wood, /obj/item/storage/box/cups, @@ -31952,6 +32728,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"jEU" = ( +/obj/structure/sign/warning/securearea, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "jEZ" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -32011,6 +32791,10 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"jFD" = ( +/obj/structure/flora/grass/coyote/nineteen, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "jFN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -32089,7 +32873,7 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, -/area/f13/wasteland) +/area/f13/ncr) "jHe" = ( /obj/structure/simple_door/wood, /turf/open/floor/wood_wide, @@ -32133,6 +32917,13 @@ /obj/machinery/door/poddoor/shutters, /turf/open/floor/plating/rust, /area/f13/building/powered) +"jHT" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/smoke_machine{ + name = "generator mechanism" + }, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "jHW" = ( /obj/structure/flora/tree/cactus_alt, /turf/open/indestructible/ground/outside/desert, @@ -32216,8 +33007,13 @@ icon_state = "mattress1"; pixel_y = 9 }, +/obj/effect/landmark/start/f13/ncrconscript, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "jJG" = ( /obj/structure/barricade/wooden, /turf/closed/wall/f13/wood/house/broken, @@ -32502,9 +33298,11 @@ /obj/structure/chair/wood/wings{ dir = 8 }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "jPj" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/road{ @@ -32699,8 +33497,13 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "jRD" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, -/turf/open/floor/plasteel/grimy, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "jRR" = ( /obj/structure/rack, @@ -32796,8 +33599,12 @@ /obj/item/pen/red, /obj/item/pen/charcoal, /obj/item/pen, +/obj/machinery/light/small{ + dir = 8; + brightness = 9 + }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "jTC" = ( /obj/structure/table{ layer = 2.9 @@ -32962,6 +33769,15 @@ }, /turf/open/floor/f13/wood, /area/f13/wasteland) +"jVC" = ( +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "jVF" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/mineral/random, @@ -32977,6 +33793,11 @@ /obj/structure/junk/small/tv, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) +"jVW" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/power/floodlight, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "jWe" = ( /obj/structure/flora/tree/cactus, /turf/open/indestructible/ground/outside/desert, @@ -33035,6 +33856,14 @@ /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"jXw" = ( +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_4"; + layer = 5 + }, +/obj/structure/flora/twig, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "jXx" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/graveldirt, @@ -33112,7 +33941,7 @@ "jZl" = ( /obj/structure/barricade/wooden/planks, /turf/closed/wall/f13/wood/interior, -/area/f13/wasteland) +/area/f13/ncr) "jZu" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt/dust, @@ -33214,6 +34043,14 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/w) +"kaI" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) "kaJ" = ( /obj/effect/decal/marking{ pixel_x = -14 @@ -33429,7 +34266,8 @@ /area/f13/building/powered) "kex" = ( /obj/structure/barricade/wooden/planks{ - icon_state = "board-2" + icon_state = "board-2"; + desc = "This sps" }, /turf/closed/wall/f13/wood, /area/f13/ncr) @@ -33669,7 +34507,7 @@ pixel_y = 4 }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "kie" = ( /obj/structure/chair/f13chair2, /turf/open/floor/plating/rust, @@ -33721,6 +34559,12 @@ "kiz" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/components/unary/tank, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, /turf/open/floor/plating/f13, /area/f13/wasteland) "kiL" = ( @@ -34201,9 +35045,13 @@ /turf/open/floor/wood_common/wood_common_light, /area/maintenance/bar) "kqB" = ( -/obj/structure/filingcabinet, +/obj/structure/table, +/obj/machinery/button/door{ + pixel_y = 28; + id = 980 + }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "kqJ" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 @@ -34347,9 +35195,11 @@ }, /area/f13/building/powered) "ktI" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "ktM" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft2top" @@ -34582,7 +35432,8 @@ "kxv" = ( /obj/structure/window/fulltile/house/broken, /obj/structure/barricade/wooden/planks{ - icon_state = "board-2" + icon_state = "board-2"; + desc = "This sps" }, /turf/open/floor/plating/rust, /area/f13/building/powered) @@ -34678,8 +35529,9 @@ /obj/item/storage/money_stack/ncr{ pixel_x = 5 }, +/obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/wood_common/wood_common_light, -/area/f13/wasteland) +/area/f13/ncr) "kyE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -34839,6 +35691,21 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/a) +"kBK" = ( +/obj/structure/window/fulltile/house, +/obj/structure/curtain{ + color = "#363636" + }, +/obj/structure/barricade/wooden/planks{ + icon_state = "board-2"; + desc = "This sps" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +"kBR" = ( +/obj/effect/turf_decal/vg_decals/numbers/eight, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "kBZ" = ( /obj/structure/obstacle/barbedwire/end{ dir = 8 @@ -35016,6 +35883,15 @@ /obj/structure/weightmachine/weightlifter, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"kEe" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "kEf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bedsheetbin, @@ -35030,10 +35906,14 @@ }, /area/f13/wasteland) "kEW" = ( -/obj/machinery/door/unpowered/secure_NCR, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/effect/spawner/structure/window/reinforced/indestructable, +/obj/structure/table, +/obj/structure/barricade/bars, +/obj/machinery/door/poddoor/shutters{ + id = 980 + }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "kEZ" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/sidewalk{ @@ -35117,7 +35997,9 @@ /area/f13/ambientlighting/building/j) "kGR" = ( /obj/machinery/smartfridge/bottlerack/grownbin, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "kHa" = ( @@ -35221,6 +36103,12 @@ /obj/structure/decoration/rag, /turf/closed/mineral/random/low_chance, /area/f13/building/tribal) +"kIx" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) "kIA" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating/rust, @@ -35413,6 +36301,13 @@ /obj/vehicle/ridden/fuel/motorcycle/buggy, /turf/open/floor/plasteel/rockvault, /area/f13/ambientlighting/building/c) +"kKP" = ( +/obj/structure/window/fulltile/house, +/obj/structure/curtain{ + color = "#363636" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "kKT" = ( /obj/structure/chair/f13chair2{ dir = 4 @@ -35469,6 +36364,15 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) +"kLD" = ( +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "kLL" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -35902,8 +36806,11 @@ dir = 1; pixel_y = -3 }, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/closed/wall/f13/wood/interior, -/area/f13/wasteland) +/area/f13/ncr) "kRb" = ( /obj/structure/frame/machine, /obj/item/stack/cable_coil/red, @@ -36153,8 +37060,9 @@ /area/f13/wasteland) "kVL" = ( /obj/item/cultivator/rake, -/obj/machinery/hydroponics/soil, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "kVM" = ( @@ -36347,9 +37255,14 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) "kYv" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, -/turf/closed/wall/mineral/brick, -/area/f13/wasteland) +/obj/structure/curtain, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) "kYH" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -36556,7 +37469,7 @@ /obj/structure/rack/shelf_metal, /obj/item/weldingtool, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "lbw" = ( /mob/living/simple_animal/hostile/raider/baseball, /turf/open/floor/wood_wide, @@ -36590,7 +37503,8 @@ /area/f13/ambientlighting/building/d) "lbQ" = ( /obj/structure/barricade/wooden/planks{ - icon_state = "board-2" + icon_state = "board-2"; + desc = "This sps" }, /turf/closed/wall/f13/wood/house/broken, /area/f13/legioncamp) @@ -36725,11 +37639,13 @@ /obj/effect/decal/cleanable/blood{ icon_state = "tracks" }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "leh" = ( /obj/item/mine/shrapnel{ alpha = 65 @@ -36959,6 +37875,13 @@ /obj/structure/flora/tree/tall, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"ljY" = ( +/obj/machinery/light/small{ + dir = 4; + light_color = "red" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "lkc" = ( /obj/structure/chair, /obj/effect/decal/cleanable/dirt{ @@ -37514,10 +38437,13 @@ /obj/effect/turf_decal/big{ dir = 4 }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, -/area/f13/wasteland) +/area/f13/ncr) "ltm" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -37541,6 +38467,15 @@ /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) +"ltz" = ( +/obj/machinery/light/fo13colored/Red{ + dir = 1; + pixel_x = -16 + }, +/obj/effect/decal/cleanable/blood, +/obj/item/reagent_containers/spray/pepper, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "ltA" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt{ @@ -37732,6 +38667,13 @@ }, /turf/open/floor/plating/dirt, /area/f13/wasteland) +"lwP" = ( +/obj/structure/fence, +/obj/structure/obstacle/barbedwire{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "lxa" = ( /obj/structure/fence{ dir = 4 @@ -37976,7 +38918,7 @@ /obj/structure/table, /obj/item/paper_bin, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "lAH" = ( /obj/structure/flora/grass/brown, /obj/structure/barricade/sandbags, @@ -37992,10 +38934,13 @@ pixel_y = 9; pixel_x = -10 }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, -/area/f13/wasteland) +/area/f13/ncr) "lAR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fluff/rug/rug_rubber{ @@ -38215,6 +39160,12 @@ icon_state = "horizontaltopborderbottom0" }, /area/f13/wasteland/city) +"lDP" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom3" + }, +/area/f13/wasteland) "lEe" = ( /obj/structure/railing/corner{ color = "#A47449"; @@ -38238,8 +39189,11 @@ }, /area/f13/building/abandoned/t) "lEm" = ( -/obj/structure/gallow, /obj/structure/table/booth, +/obj/structure/gallow{ + pixel_x = 14; + pixel_y = 10 + }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "lED" = ( @@ -38297,6 +39251,13 @@ /obj/structure/nest/ghoul, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"lFq" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) "lFv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -38308,6 +39269,12 @@ "lFC" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/components/unary/tank/bz, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, /turf/open/floor/plating/f13, /area/f13/wasteland) "lFD" = ( @@ -38408,10 +39375,27 @@ }, /turf/open/indestructible/ground/outside/sidewalkdirt, /area/f13/followers) +"lHR" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "lHV" = ( /obj/structure/wreck/trash/engine, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) +"lIh" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Medical" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) "lIl" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 9 @@ -38424,6 +39408,18 @@ "lIo" = ( /turf/open/transparent/openspace, /area/f13/wasteland/city) +"lIp" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) "lIq" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -38617,7 +39613,9 @@ /turf/open/floor/wood_common/wood_common_dark, /area/f13/ncr) "lKQ" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft0" }, @@ -38638,6 +39636,17 @@ icon_state = "common-broken2" }, /area/f13/wasteland) +"lLc" = ( +/obj/structure/window/fulltile/house/broken, +/obj/structure/curtain{ + color = "#363636" + }, +/obj/structure/barricade/wooden/planks, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "lLd" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -39048,6 +40057,16 @@ /obj/structure/closet/crate/trashcart, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +"lRB" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/mineral/concrete/ten, +/obj/item/stack/sheet/mineral/limestone/five, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) "lRQ" = ( /obj/structure/barricade/tentleathercorner{ dir = 8 @@ -39330,9 +40349,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "lWz" = ( -/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/structure/closet/locker, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "lWM" = ( /obj/machinery/vending/engineering, /turf/open/floor/f13{ @@ -39497,6 +40516,17 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/c) +"lZG" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2top" + }, +/area/f13/wasteland) "lZK" = ( /obj/structure/chair/pew{ dir = 1 @@ -39522,6 +40552,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"mab" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "mae" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -39579,6 +40618,15 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +"mbi" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/sign/brotherhoodcardboard, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "mbj" = ( /obj/item/trash/f13/c_ration_2, /turf/open/indestructible/ground/outside/desert, @@ -39699,6 +40747,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"mcV" = ( +/turf/open/floor/plasteel/stairs{ + barefootstep = "woodbarefoot"; + color = "#A47449"; + footstep = "wood" + }, +/area/f13/ncr) "mcW" = ( /obj/machinery/smartfridge/drying_rack, /turf/open/indestructible/ground/outside/desert, @@ -39751,6 +40806,19 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +"mdI" = ( +/obj/structure/shelf_wood, +/obj/item/reagent_containers/hypospray/medipen/stimpak/super, +/obj/item/reagent_containers/hypospray/medipen/stimpak/super, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/defibrillator/loaded, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) "mdQ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/oil/slippery, @@ -40002,13 +41070,32 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/building/abandoned/q) "mgt" = ( -/obj/effect/landmark/start/f13/ncrlieutenant, -/turf/open/floor/wood_fancy/wood_fancy_light, +/obj/item/wirecutters, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +"mgC" = ( +/obj/structure/table/wood, +/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "mgD" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, /turf/open/floor/wood_common, /area/f13/wasteland) +"mgI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "mgO" = ( /obj/structure/fence/wooden{ dir = 1 @@ -40244,11 +41331,13 @@ }, /area/f13/followers) "mlH" = ( -/obj/effect/spawner/structure/window/reinforced/indestructable, /obj/structure/table, /obj/structure/barricade/bars, +/obj/machinery/door/poddoor/shutters{ + id = 980 + }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "mlV" = ( /obj/structure/reagent_dispensers/barrel/four, /turf/open/indestructible/ground/outside/grass/dirtpath{ @@ -40395,6 +41484,10 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"mnl" = ( +/obj/structure/rack/shelf_metal, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "mns" = ( /obj/machinery/light/fo13colored/Aqua{ bulb_colour = "#b4ddea"; @@ -40512,6 +41605,12 @@ "mpc" = ( /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/m) +"mpj" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "mps" = ( /obj/machinery/door/morgue, /turf/open/indestructible/ground/outside/desert, @@ -40605,7 +41704,7 @@ pixel_x = 27 }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "mri" = ( /obj/machinery/light, /obj/effect/decal/cleanable/dirt/dust, @@ -40775,6 +41874,16 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) +"muo" = ( +/obj/structure/table/booth, +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "muq" = ( /obj/item/storage/trash_stack, /obj/effect/turf_decal/weather/dirt{ @@ -40875,6 +41984,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/h) +"mvF" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/leather/twenty, +/obj/item/stack/sheet/mineral/concrete/ten, +/obj/item/stack/sheet/mineral/plasma/twentyfive, +/turf/open/floor/wood_common, +/area/f13/wasteland) "mvI" = ( /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) @@ -41019,6 +42137,12 @@ /obj/structure/spacevine, /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/y) +"myt" = ( +/obj/effect/turf_decal/delivery, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "myA" = ( /obj/structure/wreck/trash/engine, /turf/open/indestructible/ground/outside/dirt{ @@ -41264,15 +42388,14 @@ }, /area/f13/brotherhood) "mBX" = ( -/obj/structure/fence/post{ - pixel_y = -18; - pixel_x = 16; - desc = "An iron support beam."; - name = "iron stanchion" +/obj/structure/fence{ + dir = 8 }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalrightborderright0" +/obj/structure/obstacle/barbedwire{ + dir = 4; + pixel_y = 16 }, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "mCa" = ( /obj/structure/table/wood/settler, @@ -41472,6 +42595,10 @@ /obj/structure/decoration/rag, /turf/closed/wall/f13/wood, /area/f13/building/tribal) +"mEj" = ( +/obj/structure/flora/grass/coyote/twentyfour, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "mEm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/reinforced, @@ -42213,6 +43340,17 @@ icon_state = "floorrusty" }, /area/f13/building/abandoned/h) +"mRd" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/reagent_dispensers/rainwater_tank, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "mRx" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/graveldirt, @@ -42249,7 +43387,7 @@ /obj/item/salvage/low, /obj/item/salvage/high, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "mSw" = ( /obj/effect/decal/marking{ pixel_x = -14 @@ -42521,8 +43659,9 @@ /obj/structure/chair/wood/wings{ dir = 4 }, +/obj/effect/landmark/start/f13/ncrlieutenant, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "mVz" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, @@ -42986,9 +44125,8 @@ /area/f13/ambientlighting/building/j) "ndc" = ( /obj/effect/decal/cleanable/cobweb, -/obj/item/defibrillator/primitive, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "ndk" = ( /obj/effect/overlay/desert/sonora/edge, /turf/closed/wall/f13/tunnel, @@ -43058,8 +44196,17 @@ }, /area/f13/wasteland) "ned" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "nei" = ( /obj/structure/campfire/barrel, /obj/effect/decal/cleanable/dirt, @@ -43098,6 +44245,16 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/m) +"neD" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "neH" = ( /obj/structure/closet/crate/trashcart, /turf/open/indestructible/ground/outside/dirt{ @@ -43155,8 +44312,11 @@ /area/f13/wasteland/town) "nfC" = ( /obj/structure/window/fulltile/house, +/obj/structure/curtain{ + color = "#363636" + }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "nfD" = ( /obj/machinery/door/unpowered/securedoor{ req_one_access_txt = "136" @@ -43320,6 +44480,15 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +"nht" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) "nhv" = ( /obj/machinery/computer/terminal, /obj/structure/table/reinforced, @@ -43371,7 +44540,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "niA" = ( /obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/outside/road{ @@ -43791,6 +44960,13 @@ icon_state = "floordirty" }, /area/f13/building/powered) +"nov" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "noA" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, @@ -43963,6 +45139,12 @@ /obj/structure/sign/poster/prewar/poster65, /turf/closed/wall/f13/store, /area/f13/wasteland) +"nrn" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "nrq" = ( /turf/open/indestructible/ground/outside/dirt{ dir = 1; @@ -44064,6 +45246,18 @@ /obj/effect/overlay/fog, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +"nsN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "nsX" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -44108,6 +45302,13 @@ /obj/effect/landmark/start/f13/druid, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"ntF" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/legion_extractor, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "ntG" = ( /obj/structure/nest/ghoul, /obj/effect/decal/cleanable/dirt, @@ -44269,7 +45470,7 @@ name = "Satisfactory NCR Poster" }, /turf/closed/wall/mineral/brick, -/area/f13/wasteland) +/area/f13/ncr) "nwc" = ( /obj/structure/simple_door/bunker, /turf/open/floor/f13{ @@ -44282,11 +45483,10 @@ /area/engine/workshop) "nwz" = ( /obj/item/reagent_containers/glass/rag/towel, -/obj/effect/landmark/start/f13/ncroffduty, -/obj/effect/landmark/start/f13/ncroffduty, -/obj/effect/landmark/start/f13/ncroffduty, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/ash, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "nwJ" = ( /obj/structure/simple_door/house, /turf/open/floor/f13{ @@ -44419,6 +45619,17 @@ /obj/machinery/vending/engivend, /turf/open/indestructible/ground/outside/road, /area/f13/building/abandoned/k) +"nyy" = ( +/obj/effect/turf_decal/big{ + dir = 4 + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) "nyz" = ( /turf/open/floor/f13{ icon_state = "floordirty" @@ -44500,7 +45711,7 @@ "nAd" = ( /obj/structure/wreck/trash/brokenvendor, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "nAe" = ( /obj/structure/stairs/east, /turf/open/floor/plating/rust, @@ -44580,6 +45791,26 @@ /obj/structure/barricade/bars, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"nBj" = ( +/obj/structure/railing/wood/post{ + name = "wooden flag pole" + }, +/obj/structure/railing/wood/post{ + name = "wooden flag pole"; + pixel_y = 20 + }, +/obj/structure/railing/wood/post{ + name = "wooden flag pole"; + pixel_y = 42 + }, +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = 11; + pixel_y = 58; + layer = 10; + anchored = 1 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "nBm" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -44740,9 +45971,9 @@ /obj/effect/decal/cleanable/oil{ icon_state = "floor5" }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "nDE" = ( /obj/machinery/door/unpowered/securedoor{ req_one_access_txt = "136" @@ -45483,6 +46714,15 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite, /area/f13/ambientlighting/building/c) +"nPi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain2bottom" + }, +/area/f13/wasteland) "nPk" = ( /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/t) @@ -45493,7 +46733,9 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "nPx" = ( -/obj/structure/railing/wood/post, +/obj/structure/railing/wood/post{ + name = "wooden flag pole" + }, /turf/open/indestructible/ground/outside/sidewalkdirt, /area/f13/followers) "nPG" = ( @@ -45539,7 +46781,7 @@ }, /obj/item/clothing/shoes/f13/brownie, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "nQe" = ( /obj/structure/decoration/rag{ icon_state = "skin" @@ -45708,7 +46950,7 @@ /obj/structure/rack/shelf_metal, /obj/item/salvage/tool, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "nTy" = ( /obj/structure/cable{ icon_state = "1-2" @@ -45780,10 +47022,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "nUt" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, -/turf/open/floor/plating/f13, -/area/f13/wasteland) +/obj/structure/simple_door/metal/fence/wooden, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "nUC" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, @@ -45822,7 +47063,7 @@ "nVA" = ( /obj/structure/barricade/bars, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "nVD" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowbroken" @@ -45855,6 +47096,10 @@ icon_state = "horizontalbottombordertopright" }, /area/f13/building/lower_firetower) +"nVV" = ( +/obj/structure/table/booth, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "nWd" = ( /mob/living/simple_animal/hostile/supermutant/rangedmutant, /obj/effect/decal/cleanable/dirt, @@ -46057,6 +47302,10 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"oah" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "oao" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -46401,6 +47650,15 @@ icon_state = "dirt" }, /area/f13/wasteland) +"oew" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/fakelattice, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/structure/grille/broken, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "oeA" = ( /turf/open/indestructible/ground/outside/grass/corner{ dir = 4 @@ -46430,12 +47688,16 @@ /turf/open/floor/plating/dirt/dark, /area/f13/building/abandoned/g) "ofe" = ( -/obj/structure/fence/post{ - pixel_y = 14; - pixel_x = -16; - desc = "An iron support beam."; - name = "iron stanchion" +/obj/structure/cable/outdoors{ + icon_state = "4-8" }, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/leatherstrips, +/obj/item/stack/sheet/mineral/concrete/ten, +/obj/item/stack/sheet/mineral/limestone/twenty, +/obj/item/stack/sheet/mineral/limestone/five, /turf/open/floor/wood_common, /area/f13/wasteland) "ofg" = ( @@ -46602,6 +47864,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) +"ohJ" = ( +/obj/structure/table/wood/junk, +/obj/item/melee/baton/cattleprod, +/obj/item/melee/classic_baton/militarypolice, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "ohO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/wood{ @@ -47064,7 +48332,7 @@ pixel_x = 16 }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "oot" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/ghoul/legendary, @@ -47300,6 +48568,10 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) +"osB" = ( +/obj/structure/fluff/hedge, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "osM" = ( /obj/structure/table/wood/settler, /obj/effect/decal/cleanable/dirt{ @@ -47481,7 +48753,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "owK" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowbroken" @@ -47618,7 +48890,7 @@ "ozi" = ( /obj/effect/turf_decal/caution, /turf/closed/wall/mineral/brick, -/area/f13/wasteland) +/area/f13/ncr) "ozn" = ( /mob/living/simple_animal/hostile/handy/gutsy, /obj/machinery/light, @@ -47993,6 +49265,12 @@ /obj/effect/landmark/start/f13/explorer, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) +"oFi" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "oFl" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" @@ -48308,8 +49586,9 @@ /obj/item/bedsheet/blanket{ pixel_y = 1 }, +/obj/effect/landmark/start/f13/ncrconscript, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "oKp" = ( /mob/living/simple_animal/hostile/handy, /turf/open/floor/f13/wood{ @@ -48515,6 +49794,14 @@ /obj/effect/landmark/start/f13/family_member, /turf/open/floor/carpet/orange, /area/f13/ambientlighting/building/c) +"oMY" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) "oMZ" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -48602,7 +49889,7 @@ /obj/structure/table/wood/junk, /obj/item/laser_pointer, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "oNJ" = ( /obj/item/storage/toolbox/mechanical, /obj/structure/rack/large/shelf, @@ -48621,6 +49908,15 @@ icon_state = "bluedirtychess2" }, /area/f13/brotherhood) +"oNR" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "oNS" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small, @@ -48877,6 +50173,13 @@ icon_state = "horizontaloutermain0" }, /area/f13/wasteland) +"oQS" = ( +/obj/effect/decal/cleanable/generic, +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "oRq" = ( /obj/item/storage/trash_stack{ icon_state = "Junk_10" @@ -49011,8 +50314,11 @@ /area/f13/wasteland) "oTO" = ( /obj/structure/bedsheetbin/empty, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "oTP" = ( /obj/structure/simple_door/glass, /turf/open/floor/wood_common, @@ -49265,6 +50571,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"oXG" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain3" + }, +/area/f13/wasteland) "oXN" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 1; @@ -49433,15 +50745,20 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "paK" = ( -/obj/structure/decoration/clock{ - pixel_y = 27 +/obj/machinery/light{ + dir = 1; + layer = 2.9 }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "paL" = ( /obj/structure/decoration/clock/old, /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/m) +"paN" = ( +/obj/structure/flora/grass/coyote/twentythree, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "paU" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -49501,6 +50818,12 @@ }, /turf/open/indestructible/ground/outside/gravel, /area/f13/wasteland) +"pbH" = ( +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_5" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "pbJ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -49773,6 +51096,12 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +"pgX" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "pgY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/crafting, @@ -49785,6 +51114,21 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +"phi" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/leatherstrips, +/obj/item/stack/sheet/mineral/concrete/ten, +/obj/item/stack/sheet/mineral/limestone/twenty, +/obj/item/stack/sheet/mineral/limestone/five, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop2" + }, +/area/f13/wasteland) "phk" = ( /obj/structure/sign/poster/random, /turf/closed/indestructible/rock{ @@ -49844,6 +51188,17 @@ icon_state = "verticalleftborderleft3" }, /area/f13/wasteland) +"phR" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "phS" = ( /obj/effect/overlay/desert/sonora/edge, /turf/open/indestructible/ground/outside/sidewalk{ @@ -49948,9 +51303,8 @@ color = "#e8e4ca"; name = "Captain's Lodge" }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "pju" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3, @@ -50235,6 +51589,13 @@ /obj/structure/spacevine, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"pnz" = ( +/obj/structure/chair/stool/retro/black, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "pnI" = ( /obj/structure/chair/left{ dir = 4 @@ -50796,6 +52157,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"pwe" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain2top" + }, +/area/f13/wasteland) "pwi" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -51077,12 +52449,19 @@ }, /turf/closed/wall/f13/tentwall, /area/f13/building/tribal) +"pBr" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "pBE" = ( /obj/structure/chair/office/dark{ dir = 8 }, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "pBN" = ( /obj/structure/simple_door/tentflap_cloth{ pixel_y = -5 @@ -51102,6 +52481,18 @@ icon_state = "horizontaltopbordertop2right" }, /area/f13/wasteland) +"pCa" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) "pCb" = ( /obj/item/reagent_containers/food/snacks/meat/cutlet/plain/human, /mob/living/simple_animal/hostile/centaur/strong, @@ -51200,7 +52591,7 @@ "pEl" = ( /obj/structure/sign/poster/prewar/protectron, /turf/closed/wall/mineral/brick, -/area/f13/wasteland) +/area/f13/ncr) "pEu" = ( /turf/closed/wall/f13/wood, /area/f13/building/abandoned/x) @@ -51338,12 +52729,11 @@ /obj/structure/table, /obj/item/storage/box/ration, /obj/item/storage/box/ration, -/obj/item/storage/box/ration, -/obj/item/storage/box/ration, -/obj/item/storage/box/ration, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "pFV" = ( /obj/structure/flora/ausbushes/reedbush, /turf/open/indestructible/ground/outside/dirt, @@ -51394,10 +52784,10 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "pHg" = ( -/obj/structure/fluff/hedge, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, -/turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/obj/machinery/power/floodlight, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "pHr" = ( /obj/structure/reagent_dispensers/barrel/explosive, /obj/effect/decal/cleanable/oil/streak, @@ -51691,6 +53081,11 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +"pKM" = ( +/obj/structure/fence, +/obj/structure/obstacle/barbedwire, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "pKP" = ( /obj/item/taperecorder/empty, /obj/item/card/data/disk, @@ -52043,7 +53438,7 @@ /obj/item/salvage/high, /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "pPC" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/raider/baseball, @@ -52132,6 +53527,14 @@ /obj/effect/spawner/lootdrop/clothing_low, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +"pRE" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain2top" + }, +/area/f13/wasteland) "pRK" = ( /turf/open/floor/f13/wood{ icon_state = "housewood2" @@ -52325,10 +53728,9 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "pUW" = ( -/obj/structure/rack/large/shelf_rust, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/weightlifter, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "pVa" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /obj/structure/chair/wood{ @@ -52526,9 +53928,11 @@ /area/f13/ambientlighting/building/j) "pXA" = ( /obj/machinery/door/unpowered/secure_NCR, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "pXG" = ( /obj/effect/decal/remains/human, /obj/effect/spawner/lootdrop/f13/weapon/melee/tier4, @@ -52569,6 +53973,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"pYc" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "pYh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -53063,7 +54473,7 @@ }, /obj/effect/spawner/lootdrop/toolsbasic, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "qfI" = ( /turf/open/floor/f13/wood{ icon_state = "housewood1-broken" @@ -53211,7 +54621,7 @@ name = "TRIAGE" }, /turf/closed/wall/mineral/brick, -/area/f13/wasteland) +/area/f13/ncr) "qhm" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/baconegg{ @@ -53261,18 +54671,10 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "qhU" = ( -/obj/structure/shelf_wood, -/obj/item/reagent_containers/hypospray/medipen/stimpak/super, -/obj/item/reagent_containers/hypospray/medipen/stimpak/super, -/obj/item/reagent_containers/hypospray/medipen/stimpak, -/obj/item/reagent_containers/hypospray/medipen/stimpak, -/obj/item/reagent_containers/hypospray/medipen/stimpak, -/obj/item/reagent_containers/hypospray/medipen/stimpak, -/obj/item/defibrillator/loaded, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "qhZ" = ( /obj/machinery/door/locked/hard/maybe_trapped, /turf/open/indestructible/ground/outside/desert, @@ -53421,6 +54823,14 @@ /obj/structure/wreck/trash/machinepiletwo, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"qkq" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) "qku" = ( /obj/structure/fence/corner{ dir = 1 @@ -53614,6 +55024,12 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/j) +"qmc" = ( +/obj/item/storage/trash_stack{ + icon_state = "Junk_3" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "qmd" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks, @@ -53662,9 +55078,11 @@ /obj/machinery/door/unpowered/secure_NCR{ name = "Prison" }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "qmQ" = ( /obj/structure/fence{ dir = 1 @@ -53683,6 +55101,18 @@ /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, /turf/open/floor/plasteel/neutral, /area/f13/clinic) +"qng" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress2"; + pixel_y = 5 + }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/obj/effect/landmark/start/f13/ncrconscript, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "qnl" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, @@ -54004,10 +55434,13 @@ /obj/structure/chair{ dir = 8 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "qsG" = ( /obj/machinery/light, /obj/effect/turf_decal/delivery, @@ -54065,11 +55498,10 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) "qtr" = ( -/obj/structure/fence/post{ - pixel_y = -18; - pixel_x = 16 +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" }, -/turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "qtu" = ( /obj/effect/decal/cleanable/dirt{ @@ -54232,7 +55664,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "qwl" = ( /obj/effect/turf_decal/huge, /obj/item/storage/trash_stack, @@ -54291,7 +55723,7 @@ "qxp" = ( /obj/structure/chair/stool/retro/tan, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "qxs" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -54300,6 +55732,18 @@ icon_state = "horizontaloutermainleft" }, /area/f13/wasteland) +"qxt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +/area/f13/wasteland) "qxw" = ( /obj/structure/wreck/trash/machinepiletwo, /turf/open/floor/f13{ @@ -54373,7 +55817,7 @@ "qyA" = ( /mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "qyB" = ( /obj/structure/chair/comfy, /obj/item/clothing/under/f13/bennys/gang, @@ -54493,6 +55937,10 @@ }, /turf/open/floor/wood_common, /area/maintenance/bar) +"qAq" = ( +/obj/item/defibrillator/primitive, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "qAu" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -54566,6 +56014,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/h) +"qBe" = ( +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "qBg" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, @@ -54818,7 +56270,7 @@ /obj/structure/barricade/bars, /obj/effect/spawner/structure/window/reinforced/indestructable, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "qEI" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt{ @@ -54831,6 +56283,13 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/o) +"qEK" = ( +/obj/structure/curtain{ + color = "#363636" + }, +/obj/structure/window/fulltile/house, +/turf/open/indestructible/ground/outside/desert, +/area/f13/ncr) "qEO" = ( /obj/structure/chair/pew, /turf/open/floor/wood_common/wood_common_dark, @@ -54961,7 +56420,7 @@ "qHg" = ( /obj/machinery/autolathe, /turf/open/floor/wood_common/wood_common_light, -/area/f13/wasteland) +/area/f13/ncr) "qHs" = ( /obj/structure/bed/dogbed, /turf/open/floor/f13/wood, @@ -54970,6 +56429,12 @@ /obj/structure/flora/grass/green, /turf/open/indestructible/ground/outside/snow, /area/f13/wasteland) +"qHy" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "qHD" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 5 @@ -55155,6 +56620,14 @@ icon_state = "floordirtysolid" }, /area/f13/wasteland) +"qLk" = ( +/obj/effect/decal/cleanable/generic, +/obj/structure/table/booth, +/obj/item/flag/ncr{ + pixel_y = 22 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "qLo" = ( /mob/living/simple_animal/chicken{ name = "rad-chicken" @@ -55377,7 +56850,7 @@ /obj/item/salvage/low, /obj/item/salvage/low, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "qOX" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/rank/medical/doctor/purple, @@ -55409,7 +56882,18 @@ /obj/effect/decal/cleanable/blood{ icon_state = "tracks" }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, /turf/open/floor/wood_common, /area/f13/wasteland) "qPa" = ( @@ -55644,6 +57128,10 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"qSG" = ( +/obj/structure/flora/brushwoodalt, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) "qSQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -55675,6 +57163,14 @@ icon_state = "greenrustyfull" }, /area/f13/ambientlighting/building/o) +"qTD" = ( +/obj/effect/turf_decal/big{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) "qTG" = ( /obj/structure/wreck/trash/halftire, /turf/open/indestructible/ground/outside/desert, @@ -56227,22 +57723,10 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) "rci" = ( -/obj/effect/landmark/start/f13/ncrrearechelon, -/obj/effect/landmark/start/f13/ncrrearechelon, -/obj/effect/landmark/start/f13/ncrrearechelon, -/obj/effect/landmark/start/f13/ncrtrooper, -/obj/effect/landmark/start/f13/ncrtrooper, -/obj/effect/landmark/start/f13/ncrtrooper, -/obj/effect/landmark/start/f13/ncrtrooper, -/obj/effect/landmark/start/f13/ncrtrooper, -/obj/effect/landmark/start/f13/ncrtrooper, -/obj/effect/landmark/start/f13/ncrcorporal, -/obj/effect/landmark/start/f13/ncrcorporal, -/obj/effect/landmark/start/f13/ncrcorporal, -/obj/effect/landmark/start/f13/ncrsergeant, -/obj/effect/landmark/start/f13/ncrsergeant, +/obj/effect/decal/cleanable/ash, +/obj/item/clothing/mask/cigarette/cigar/ncr, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "rcm" = ( /obj/structure/decoration/rag, /turf/closed/wall/f13/tentwall, @@ -56317,10 +57801,11 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "rdi" = ( -/obj/machinery/power/apc/fusebox/west, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "rdk" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, @@ -56586,7 +58071,7 @@ /area/f13/wasteland) "rhc" = ( /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "rhe" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/dirt{ @@ -56832,6 +58317,12 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"rkr" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "rkv" = ( /turf/closed/indestructible/f13/obsidian, /area/f13/wasteland) @@ -56845,9 +58336,19 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "rkZ" = ( -/obj/machinery/hydroponics/soil, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, -/turf/open/indestructible/ground/outside/desert, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/floor/wood_common, /area/f13/wasteland) "rlq" = ( /obj/machinery/computer/operating/followers, @@ -56890,6 +58391,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) +"rma" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) "rmg" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -56905,6 +58414,10 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/m) +"rmr" = ( +/obj/structure/barricade/wooden, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) "rmt" = ( /obj/structure/barricade/bars{ max_integrity = 800; @@ -56961,7 +58474,7 @@ pixel_y = -1 }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "rnk" = ( /obj/structure/fence/corner{ dir = 5 @@ -57125,7 +58638,8 @@ icon_state = "housewindowbroken" }, /obj/structure/barricade/wooden/planks{ - icon_state = "board-2" + icon_state = "board-2"; + desc = "This sps" }, /obj/structure/barricade/bars, /obj/structure/curtain{ @@ -57322,7 +58836,7 @@ name = "Medical" }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "rrR" = ( /turf/closed/wall/mineral/concrete, /area/f13/ambientlighting/building/j) @@ -57482,7 +58996,7 @@ "ruJ" = ( /obj/structure/sign/poster/official/ion_rifle, /turf/closed/wall/mineral/brick, -/area/f13/wasteland) +/area/f13/ncr) "ruW" = ( /obj/structure/chair/wood{ dir = 8 @@ -57642,6 +59156,10 @@ "rxY" = ( /turf/closed/wall/f13/wood, /area/f13/ambientlighting/building/s) +"ryf" = ( +/obj/structure/flora/grass/coyote/seven, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "ryj" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -57665,12 +59183,9 @@ /turf/closed/wall/f13/tentwall, /area/f13/wasteland) "ryS" = ( -/obj/structure/railing/wood/post{ - desc = "A wooden stanchion."; - name = "wooden stanchion" - }, +/obj/item/reagent_containers/spray/pepper/empty, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "rzf" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -57846,8 +59361,40 @@ /area/f13/building/abandoned/z) "rBR" = ( /obj/structure/rack/large/shelf, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 24; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 24; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 24; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 24; + pixel_x = 8 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = -2; + pixel_x = 8 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = -2; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 12; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 12; + pixel_x = 8 + }, /turf/open/floor/wood_common/wood_common_light, -/area/f13/wasteland) +/area/f13/ncr) "rBY" = ( /obj/effect/turf_decal/arrows{ pixel_y = 7 @@ -58318,6 +59865,10 @@ /obj/structure/wreck/trash/machinepiletwo, /turf/open/indestructible/ground/outside/snow, /area/f13/wasteland) +"rJp" = ( +/obj/effect/decal/cleanable/ash, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "rJq" = ( /obj/structure/closet/crate/trashcart{ pixel_y = 15 @@ -58417,6 +59968,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"rKn" = ( +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "rKu" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/medical/rnd/mid, @@ -58671,12 +60231,18 @@ /obj/structure/window/fulltile/house, /obj/structure/barricade/wooden/planks, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "rOi" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright2bottom" }, /area/f13/wasteland) +"rOj" = ( +/obj/structure/rack/shelf_metal, +/obj/item/salvage/low, +/obj/effect/decal/cleanable/cobweb, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "rOv" = ( /turf/open/floor/plating/rust, /area/f13/caves) @@ -58714,8 +60280,16 @@ /area/f13/ambientlighting/building/o) "rOZ" = ( /obj/machinery/door/unpowered/secure_NCR, -/turf/open/indestructible/ground/outside/desert, -/area/f13/wasteland) +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +"rPe" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) "rPl" = ( /obj/item/bedsheet{ icon_state = "sheetbrown" @@ -58975,9 +60549,11 @@ /area/f13/building/powered) "rSZ" = ( /obj/machinery/door/unpowered/secure_NCR, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, -/turf/open/indestructible/ground/outside/desert, -/area/f13/wasteland) +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "rTf" = ( /obj/structure/rack, /turf/open/floor/f13/wood, @@ -59078,9 +60654,11 @@ }, /area/f13/ambientlighting/building/f) "rUC" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "rUD" = ( /obj/machinery/door/poddoor/gate/preopen{ id = 334; @@ -59148,7 +60726,7 @@ /area/f13/wasteland) "rVP" = ( /turf/open/floor/wood_common/wood_common_light, -/area/f13/wasteland) +/area/f13/ncr) "rVS" = ( /obj/structure/chair/folding, /obj/effect/decal/cleanable/dirt/dust, @@ -59249,7 +60827,7 @@ }, /obj/effect/spawner/lootdrop/tool_box, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "rXM" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/closed/wall/mineral/concrete, @@ -59578,7 +61156,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "sdN" = ( /obj/machinery/light{ light_color = "#e8eaff" @@ -59600,8 +61178,9 @@ /area/f13/wasteland) "sdS" = ( /obj/effect/decal/cleanable/robot_debris, +/obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "sdX" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -59806,12 +61385,21 @@ }, /turf/closed/mineral/random/low_chance, /area/f13/wasteland) +"sgR" = ( +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ncr) "sgU" = ( /obj/structure/railing{ dir = 8 }, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/building/abandoned/l) +"shb" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "shf" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/cash_random_low, @@ -59846,7 +61434,7 @@ "sht" = ( /obj/structure/sign/poster/prewar/poster60, /turf/closed/wall/mineral/brick, -/area/f13/wasteland) +/area/f13/ncr) "shv" = ( /obj/machinery/light/small/broken{ dir = 4 @@ -60090,10 +61678,25 @@ /turf/open/floor/plating/f13/inside/gravel, /area/f13/building/abandoned/x) "slq" = ( -/obj/structure/table/wood/junk, -/obj/item/toy/cards/deck, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +"slr" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/closed/wall/mineral/brick, /area/f13/wasteland) "slu" = ( /turf/closed/wall/f13/wood, @@ -60193,6 +61796,14 @@ }, /turf/open/floor/plasteel/f13/vault_floor/blue/bluechess, /area/f13/legioncamp) +"smC" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) "smE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -60419,13 +62030,13 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "sqk" = ( -/obj/machinery/door/poddoor/gate/bunker{ +/obj/machinery/door/poddoor/shutters{ id = 982 }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, -/area/f13/wasteland) +/area/f13/ncr) "sqv" = ( /turf/closed/wall/f13/store, /area/f13/wasteland) @@ -60484,6 +62095,18 @@ icon_state = "floordirtysolid" }, /area/f13/wasteland) +"srf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) "srr" = ( /obj/structure/reagent_dispensers/compostbin, /turf/open/indestructible/ground/outside/graveldirt, @@ -60543,10 +62166,11 @@ /obj/effect/turf_decal/big{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, -/area/f13/wasteland) +/area/f13/ncr) "stp" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -60693,7 +62317,9 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "svx" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "svH" = ( @@ -60905,7 +62531,7 @@ id = 983 }, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "syC" = ( /obj/structure/fermenting_barrel, /turf/open/indestructible/ground/outside/desert, @@ -61032,9 +62658,11 @@ /area/f13/building/abandoned/g) "sAQ" = ( /obj/item/pen/fountain, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "sAV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -61155,7 +62783,9 @@ /obj/item/reagent_containers/glass/bottle/nutrient/rh, /obj/item/reagent_containers/glass/bottle/nutrient/rh, /obj/item/reagent_containers/glass/bottle/nutrient/rh, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "sCw" = ( @@ -61281,6 +62911,15 @@ /obj/structure/lattice, /turf/open/floor/plating/rust, /area/f13/building/powered) +"sEn" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "sEr" = ( /obj/structure/bed/old, /obj/effect/decal/cleanable/dirt/dust, @@ -61320,6 +62959,14 @@ /obj/effect/overlay/desert_side, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"sEV" = ( +/obj/machinery/vending/wallmed{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) "sEY" = ( /obj/structure/bed/double, /obj/effect/decal/cleanable/dirt/dust, @@ -61332,6 +62979,17 @@ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) +"sFe" = ( +/obj/effect/turf_decal/big{ + dir = 8 + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) "sFi" = ( /obj/structure/toilet{ dir = 4 @@ -61368,6 +63026,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +"sFL" = ( +/obj/item/crowbar, +/turf/open/floor/wood_common, +/area/f13/wasteland) "sFR" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -61453,6 +63115,14 @@ icon_state = "rubble" }, /area/f13/wasteland) +"sGJ" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "sGN" = ( /obj/structure/chair/bench{ dir = 4; @@ -61598,6 +63268,20 @@ /obj/item/stack/tile/carpet/fifty, /turf/open/floor/plating, /area/f13/bar) +"sJE" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/mob/living/simple_animal/hostile/handy/protectron{ + faction = list("NCR"); + enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); + name = "National Guard Protectron"; + desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "sJK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old{ @@ -61609,8 +63293,15 @@ /obj/structure/curtain{ color = "#363636" }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "sJV" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/road, @@ -61793,6 +63484,26 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"sMw" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +"sMA" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "sMD" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalbottombordertop0" @@ -61818,7 +63529,7 @@ "sMT" = ( /obj/structure/sign/poster/ncr/democracy, /turf/closed/wall/mineral/brick, -/area/f13/wasteland) +/area/f13/ncr) "sNd" = ( /obj/structure/decoration/hatch{ desc = "A faded inscription reads: Manufactured in Queens, NY, 2062."; @@ -61837,7 +63548,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "sNu" = ( /obj/structure/simple_door/interior, /turf/open/floor/f13/wood{ @@ -61901,6 +63612,13 @@ icon_state = "horizontaltopborderbottom2right" }, /area/f13/wasteland/city) +"sOw" = ( +/obj/effect/landmark/start/f13/ncroffduty, +/obj/effect/landmark/start/f13/ncroffduty, +/obj/effect/landmark/start/f13/ncrrearechelon, +/obj/effect/landmark/start/f13/ncrrearechelon, +/turf/open/floor/wood_common, +/area/f13/wasteland) "sOC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small{ @@ -62072,6 +63790,14 @@ }, /turf/open/floor/f13, /area/f13/ambientlighting/building/o) +"sRg" = ( +/obj/machinery/workbench/forge{ + pixel_x = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) "sRi" = ( /obj/structure/fence{ dir = 4 @@ -62096,6 +63822,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"sRv" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/fakelattice, +/obj/machinery/space_heater, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "sRw" = ( /obj/effect/decal/cleanable/blood/gibs/human/body, /turf/open/floor/f13{ @@ -62140,11 +63872,20 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) +"sRT" = ( +/obj/structure/campfire, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "sRW" = ( /obj/structure/table/wood/junk, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/item/toy/cards/deck, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "sSb" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -62299,10 +64040,16 @@ /area/f13/building/abandoned/x) "sUc" = ( /obj/machinery/chem_dispenser, +/obj/machinery/light/fo13colored/Aqua{ + bulb_colour = "#b4ddea"; + desc = "A lighting fixture with blue UV lighting."; + dir = 8; + name = "UV light" + }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "sUs" = ( /obj/structure/wreck/car, /obj/effect/decal/cleanable/dirt/dust, @@ -62344,6 +64091,18 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +"sVj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/ammo{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/storage/toolbox/ammo{ + pixel_x = -6; + pixel_y = 29 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "sVG" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/graveldirt, @@ -62407,9 +64166,8 @@ }, /area/f13/wasteland) "sWI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/start/f13/ncrcaptain, -/turf/open/floor/carpet/red, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) "sWL" = ( /obj/structure/window/fulltile/house{ @@ -62606,7 +64364,7 @@ "sYW" = ( /obj/machinery/gear_painter, /turf/open/floor/wood_common/wood_common_light, -/area/f13/wasteland) +/area/f13/ncr) "sYX" = ( /obj/machinery/shower{ dir = 4 @@ -62749,6 +64507,14 @@ "taO" = ( /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"tbe" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) "tbg" = ( /obj/machinery/light/small{ dir = 1 @@ -63165,6 +64931,13 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/y) +"thp" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "thA" = ( /obj/machinery/light/small{ dir = 1 @@ -63871,7 +65644,7 @@ "tse" = ( /obj/structure/bed/mattress, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "tsn" = ( /obj/structure/closet/crate/large, /obj/item/stack/sheet/metal/fifty, @@ -64211,8 +65984,12 @@ /obj/item/bedsheet/blanket{ pixel_y = 1 }, +/obj/effect/landmark/start/f13/ncrconscript, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/fancy/cigarettes/cigpack_greytort, +/obj/item/lighter/iconic, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "tyU" = ( /obj/structure/table/reinforced{ color = "#c1b6a5" @@ -64267,9 +66044,11 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "tzv" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/floor/wood_common/wood_common_light, -/area/f13/wasteland) +/area/f13/ncr) "tzB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -64436,6 +66215,15 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"tBQ" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/closed/wall/f13/tunnel, +/area/f13/wasteland) "tBZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -64908,6 +66696,13 @@ }, /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, /area/f13/clinic) +"tJx" = ( +/obj/machinery/door/unpowered/secure_NCR, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "tJC" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/trash, @@ -64919,6 +66714,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +"tJF" = ( +/obj/effect/decal/fakelattice, +/obj/structure/grille, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "tJR" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/sidewalk{ @@ -64973,6 +66773,12 @@ icon_state = "floordirty" }, /area/f13/building/powered) +"tKO" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "tKQ" = ( /obj/item/storage/toolbox/mechanical/old, /obj/structure/table/reinforced, @@ -65140,6 +66946,14 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"tOr" = ( +/obj/structure/punching_bag, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "tOx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/f13/great_khan, @@ -65285,7 +67099,9 @@ /turf/open/indestructible/ground/outside/road, /area/f13/building/abandoned/k) "tQE" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain2bottom" }, @@ -65335,8 +67151,9 @@ /area/f13/wasteland) "tQX" = ( /obj/effect/decal/cleanable/shreds, +/obj/machinery/power/floodlight, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "tQY" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -65467,7 +67284,7 @@ dir = 4 }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "tSk" = ( /obj/machinery/light{ dir = 1; @@ -65564,8 +67381,10 @@ }, /area/f13/wasteland) "tTv" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/generic, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "tTB" = ( /obj/structure/chair/wood{ dir = 4 @@ -65839,6 +67658,21 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"tXn" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "tXE" = ( /obj/structure/barricade/wooden/planks, /turf/closed/wall/mineral/wood, @@ -65854,7 +67688,7 @@ "tXN" = ( /obj/effect/decal/cleanable/glass, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "tXZ" = ( /obj/structure/fence/wooden, /turf/open/indestructible/ground/outside/dirt{ @@ -65927,8 +67761,9 @@ }, /area/f13/wasteland) "tZw" = ( +/obj/structure/railing/wood/underlayer, /turf/closed/wall/f13/wood/interior, -/area/f13/wasteland) +/area/f13/ncr) "tZx" = ( /obj/structure/barricade/wooden, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -66543,6 +68378,17 @@ icon_state = "dirt" }, /area/f13/wasteland) +"uhs" = ( +/mob/living/simple_animal/hostile/handy/protectron{ + faction = list("NCR"); + enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); + name = "National Guard Protectron"; + desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "uhv" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 6 @@ -66561,6 +68407,18 @@ /obj/structure/billboard/radiationking, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"uhL" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "uhN" = ( /obj/structure/fence{ dir = 4 @@ -66821,10 +68679,8 @@ }, /area/f13/ambientlighting/building/p) "umk" = ( -/obj/structure/sign/parking, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain0" - }, +/obj/structure/flora/branch_broken, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "umv" = ( /turf/open/indestructible/ground/outside/gravel/path_desert{ @@ -66912,6 +68768,17 @@ /obj/effect/decal/fakelattice, /turf/open/floor/plating/f13, /area/f13/wasteland) +"unH" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/leather/twenty, +/obj/item/stack/sheet/mineral/concrete/ten, +/obj/item/stack/sheet/mineral/plasma/twentyfive, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "unT" = ( /turf/open/indestructible/ground/outside/snow{ icon_state = "snow4" @@ -66929,9 +68796,11 @@ /area/f13/building/abandoned/g) "uof" = ( /obj/machinery/door/unpowered/secure_NCR, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "uoq" = ( /obj/structure/decoration/hatch{ dir = 8 @@ -66940,6 +68809,21 @@ icon_state = "horizontalinnermain2" }, /area/f13/wasteland) +"uou" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/mob/living/simple_animal/hostile/handy/protectron{ + faction = list("NCR"); + enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); + name = "National Guard Protectron"; + desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "uow" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/inside/dirt, @@ -67013,6 +68897,15 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/b) +"upH" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 28 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "upK" = ( /obj/structure/barricade/wooden/strong, /obj/structure/decoration/rag, @@ -67300,6 +69193,20 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) +"uuR" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/car/rubbish3{ + icon_state = "car_rubish2" + }, +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) "uvj" = ( /obj/structure/reagent_dispensers/barrel/explosive, /turf/open/indestructible/ground/outside/sidewalk{ @@ -67582,7 +69489,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "uzc" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -67783,11 +69690,12 @@ }, /area/f13/ambientlighting/building/f) "uCa" = ( -/obj/structure/fence/post{ - pixel_y = 14; - pixel_x = 16; - desc = "An iron support beam."; - name = "iron stanchion" +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 }, /turf/open/floor/wood_common, /area/f13/wasteland) @@ -67851,9 +69759,13 @@ }, /area/f13/wasteland) "uCY" = ( -/obj/structure/table, +/obj/structure/filingcabinet, +/obj/machinery/light{ + dir = 8; + pixel_y = -16 + }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, -/area/f13/wasteland) +/area/f13/ncr) "uDb" = ( /obj/structure/chair/comfy{ dir = 1 @@ -68216,6 +70128,12 @@ /obj/effect/overlay/desert_side, /turf/closed/mineral/random/low_chance, /area/f13/wasteland) +"uIh" = ( +/obj/structure/stairs/south{ + color = "#A47449" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/ncr) "uIi" = ( /obj/structure/chair/sofa/right{ dir = 4 @@ -68303,6 +70221,14 @@ icon_state = "floordirty" }, /area/f13/ambientlighting/building/p) +"uJs" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +/area/f13/wasteland) "uJw" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" @@ -68314,6 +70240,10 @@ "uJz" = ( /obj/structure/simple_door/interior, /turf/open/indestructible/ground/outside/desert, +/area/f13/ncr) +"uJH" = ( +/obj/structure/sign/warning/securearea, +/turf/closed/wall/mineral/brick, /area/f13/wasteland) "uJM" = ( /obj/structure/table/reinforced, @@ -68375,7 +70305,7 @@ "uKK" = ( /obj/machinery/photocopier, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "uKS" = ( /obj/machinery/light/small, /turf/open/floor/wood_common, @@ -68527,12 +70457,13 @@ /obj/structure/rack/shelf_metal, /obj/item/salvage/low, /obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "uMS" = ( -/obj/machinery/door/unpowered/secure_NCR, -/turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "uMX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/blue, @@ -68836,9 +70767,8 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) "uRi" = ( -/obj/structure/fluff/hedge, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "uRn" = ( /obj/effect/decal/cleanable/blood/old{ icon_state = "gibbear1" @@ -68861,6 +70791,18 @@ /obj/structure/bed, /turf/open/floor/wood_mosaic, /area/f13/building/abandoned/x) +"uRF" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/leather/twenty, +/obj/item/stack/sheet/mineral/concrete/ten, +/obj/item/stack/sheet/mineral/limestone/ten, +/turf/open/floor/wood_common, +/area/f13/wasteland) "uSd" = ( /obj/structure/wreck/trash/machinepile, /obj/effect/decal/cleanable/dirt, @@ -68884,6 +70826,15 @@ /obj/effect/spawner/lootdrop/f13/armor/tier1, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +"uSm" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/ncr) "uSv" = ( /obj/structure/rack, /obj/item/clothing/head/caphat/formal/fedcover{ @@ -69107,6 +71058,12 @@ "uVo" = ( /turf/closed/wall/f13/wood, /area/f13/ambientlighting/building/e) +"uVv" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "uVw" = ( /turf/open/indestructible/ground/outside/roaddirt{ icon_state = "innerpavement" @@ -69333,10 +71290,12 @@ }, /area/f13/building/powered) "uYN" = ( -/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/table/booth, +/obj/structure/decoration/clock{ + pixel_x = 29 + }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "uYO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/vending/cola/random, @@ -69473,8 +71432,12 @@ /area/f13/ambientlighting/building/z) "vaZ" = ( /obj/machinery/msgterminal/ncr, +/obj/machinery/light/small{ + dir = 4; + brightness = 9 + }, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "vbf" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -69525,10 +71488,16 @@ }, /area/f13/brotherhood) "vbI" = ( +/obj/machinery/light/fo13colored/Aqua{ + desc = "A lighting fixture with cold blue lighting."; + name = "UV light" + }, +/obj/effect/landmark/start/f13/ncrcombatmedic, +/obj/effect/landmark/start/f13/ncrcombatmedic, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "vbT" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/delivery, @@ -69554,9 +71523,11 @@ "vcb" = ( /obj/structure/table, /obj/machinery/processor/chopping_block, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "vcg" = ( /obj/structure/window/fulltile/store{ icon_state = "storewindowleft" @@ -69667,7 +71638,7 @@ "vdF" = ( /obj/machinery/vending/cigarette, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "vdK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/wrench, @@ -69753,6 +71724,14 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +"veM" = ( +/obj/structure/chair/bench{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "veS" = ( /obj/structure/junk/locker, /obj/effect/decal/cleanable/dirt, @@ -69777,7 +71756,7 @@ }, /area/f13/ambientlighting/building/f) "vfa" = ( -/obj/machinery/door/poddoor/gate/bunker{ +/obj/machinery/door/poddoor/shutters{ id = 984 }, /turf/open/indestructible/ground/outside/road, @@ -70003,6 +71982,33 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/o) +"vju" = ( +/obj/item/radio/headset/headset_ncr{ + pixel_y = 24; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 12; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = -2; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = -2; + pixel_x = -14 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 12; + pixel_x = -14 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 24; + pixel_x = -14 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "vjA" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/indestructible/ground/outside/dirt{ @@ -70150,7 +72156,7 @@ "vlI" = ( /obj/machinery/radioterminal/ncr, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "vlJ" = ( /obj/structure/barricade/tentclothedge{ dir = 4 @@ -70282,7 +72288,7 @@ /obj/structure/rack/shelf_metal, /obj/item/multitool, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "vnX" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks, @@ -70760,9 +72766,11 @@ /obj/machinery/door/unpowered/secure_NCR{ name = "Armoury" }, -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, /turf/open/floor/wood_common/wood_common_light, -/area/f13/wasteland) +/area/f13/ncr) "vvo" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -71313,7 +73321,7 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, -/area/f13/wasteland) +/area/f13/ncr) "vDU" = ( /obj/effect/decal/marking, /turf/open/indestructible/ground/outside/road{ @@ -71667,6 +73675,10 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) +"vJr" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "vJu" = ( /obj/machinery/smartfridge/bottlerack/gardentool/primitive, /turf/open/indestructible/ground/outside/dirt, @@ -71838,6 +73850,16 @@ /mob/living/simple_animal/hostile/raider/sulphite, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) +"vMj" = ( +/obj/effect/decal/fakelattice, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "vMK" = ( /obj/machinery/light/small{ dir = 8; @@ -71992,7 +74014,7 @@ /obj/item/card/id/dogtag/town/ncr, /obj/item/card/id/dogtag/town/ncr, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "vOw" = ( /obj/structure/debris/v1, /obj/structure/barricade/wooden/strong, @@ -72010,9 +74032,9 @@ }, /area/f13/wasteland) "vPt" = ( -/obj/item/flag/ncr, +/obj/structure/fluff/hedge, /turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/wasteland) +/area/f13/ncr) "vPF" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13, @@ -72027,7 +74049,7 @@ /obj/effect/spawner/lootdrop/tool_box, /obj/item/salvage/tool, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "vPV" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt/dust, @@ -72093,6 +74115,15 @@ }, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) +"vQZ" = ( +/obj/structure/chair/bench{ + dir = 1; + pixel_y = -16 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "vRd" = ( /obj/structure/fence/wooden{ dir = 1 @@ -72448,6 +74479,13 @@ /obj/structure/barricade/bars, /turf/open/floor/f13/wood, /area/f13/building/abandoned/m) +"vYa" = ( +/obj/structure/table/reinforced, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "vYk" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontaltopborderbottom2right" @@ -72515,14 +74553,8 @@ pixel_y = 24; pixel_x = 16 }, -/obj/structure/railing/wood/post{ - desc = "A wooden stanchion."; - name = "wooden stanchion"; - pixel_y = 26; - pixel_x = -18 - }, /turf/closed/mineral/random, -/area/f13/wasteland) +/area/f13/ncr) "vZy" = ( /turf/open/floor/engine/air, /area/engine/workshop) @@ -72626,6 +74658,14 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +"waW" = ( +/obj/structure/window/fulltile/house, +/obj/structure/curtain{ + color = "#363636" + }, +/obj/structure/barricade/wooden/planks, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "wby" = ( /obj/effect/landmark/start/f13/ncrconscript, /turf/open/indestructible/ground/outside/graveldirt, @@ -72678,6 +74718,13 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/w) +"wcr" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "wcu" = ( /obj/structure/fence{ dir = 8 @@ -72822,6 +74869,20 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/road, /area/f13/ambientlighting/building/g) +"weF" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner" + }, +/area/f13/wasteland) "weH" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood{ @@ -72913,7 +74974,9 @@ /turf/open/floor/carpet/royalblack, /area/f13/building/abandoned/l) "wfN" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/indestructible/ground/outside/sidewalk{ dir = 8; icon_state = "outerborder" @@ -73446,7 +75509,13 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/h) "wnU" = ( -/obj/structure/railing/handrail/rusty, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop0" }, @@ -73731,6 +75800,17 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +"wrX" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/power/port_gen/pacman/diesel{ + anchored = 1 + }, +/obj/item/stack/sheet/mineral/plasma/fifty, +/obj/structure/cable/outdoors{ + icon_state = "0-8" + }, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "wsb" = ( /obj/machinery/door/unpowered/secure_bos, /obj/effect/mapping_helpers/network_builder/power_cable/auto, @@ -73784,6 +75864,14 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) +"wsr" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -3 + }, +/obj/structure/railing/wood/underlayer, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) "wsv" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -74124,6 +76212,14 @@ icon_state = "dirt" }, /area/f13/wasteland) +"wxd" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) "wxo" = ( /obj/structure/bed/mattress{ icon_state = "mattress4"; @@ -74316,8 +76412,11 @@ "wzT" = ( /obj/structure/rack/shelf_metal, /obj/item/wrench, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "wzU" = ( /obj/structure/fence/cut/medium, /turf/open/indestructible/ground/outside/sidewalk{ @@ -75014,6 +77113,10 @@ icon_state = "dirt" }, /area/f13/wasteland/legion) +"wIT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/wasteland) "wJe" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8 @@ -75027,11 +77130,25 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/w) +"wJq" = ( +/obj/effect/turf_decal/vg_decals/numbers/five, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "wJw" = ( /obj/structure/table/wood, /obj/machinery/processor/chopping_block, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"wJx" = ( +/obj/item/book/granter/crafting_recipe/blueprint/service, +/obj/structure/rack/shelf_metal, +/obj/item/book/granter/crafting_recipe/blueprint/scoutcarbine, +/obj/machinery/light{ + dir = 4; + light_color = "#228B22" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "wJy" = ( /obj/structure/flora/tree/tall, /turf/open/indestructible/ground/outside/desert, @@ -75380,7 +77497,7 @@ "wPF" = ( /obj/structure/table/booth, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "wPH" = ( /obj/effect/overlay/desert_side, /obj/structure/destructible/tribal_torch/wall/lit, @@ -75510,13 +77627,14 @@ }, /area/f13/building/powered) "wRi" = ( -/obj/structure/fence/post{ - pixel_y = -18; - pixel_x = 16; - desc = "An iron support beam."; - name = "iron stanchion" +/obj/structure/fence{ + dir = 4 }, -/turf/closed/wall/mineral/brick, +/obj/structure/obstacle/barbedwire{ + dir = 4; + pixel_y = 16 + }, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "wRn" = ( /obj/machinery/vending/hydronutrients{ @@ -75599,6 +77717,10 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"wSh" = ( +/obj/structure/flora/grass/coyote/eighteen, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "wSi" = ( /obj/effect/overlay/desert_side{ dir = 1 @@ -75949,7 +78071,7 @@ "wXb" = ( /obj/effect/landmark/start/f13/ncrlogisticsofficer, /turf/open/floor/wood_common/wood_common_light, -/area/f13/wasteland) +/area/f13/ncr) "wXd" = ( /obj/structure/window/fulltile/wood_window, /obj/structure/barricade/bars, @@ -76259,6 +78381,17 @@ icon_state = "verticaloutermain3" }, /area/f13/wasteland) +"xcO" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "xdb" = ( /turf/closed/wall/f13/store{ desc = "A pre-War wall made of solid concrete."; @@ -76637,6 +78770,12 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"xiG" = ( +/obj/structure/chair/bench{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "xiS" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/reagent_dispensers/barrel/three, @@ -77574,7 +79713,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, -/area/f13/wasteland) +/area/f13/ncr) "xwF" = ( /obj/machinery/door/unpowered/securedoor/khandoor, /turf/closed/wall/mineral/wood, @@ -77641,7 +79780,9 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) "xxN" = ( -/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, @@ -78419,6 +80560,11 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"xJc" = ( +/obj/machinery/power/apc/fusebox/south, +/obj/structure/cable/outdoors, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "xJg" = ( /obj/structure/chair/wood{ dir = 4 @@ -78479,6 +80625,14 @@ icon_state = "housewood1-broken" }, /area/f13/wasteland) +"xKp" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "xKt" = ( /obj/structure/simple_door/tent, /turf/open/indestructible/ground/outside/desert{ @@ -78676,10 +80830,17 @@ /obj/item/stack/sheet/glass/fifty, /turf/open/floor/f13/wood, /area/f13/wasteland) +"xNY" = ( +/obj/structure/chair/bench{ + dir = 1; + pixel_y = -16 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "xOc" = ( /obj/effect/spawner/lootdrop/toolsbasic, /turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/area/f13/ncr) "xOf" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -78806,7 +80967,7 @@ pixel_x = -8 }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/area/f13/ncr) "xQq" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/sidewalk{ @@ -79058,6 +81219,12 @@ icon_state = "common_dark-broken4" }, /area/f13/building/abandoned/n) +"xUw" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "xUx" = ( /mob/living/simple_animal/hostile/raider/thief, /turf/open/indestructible/ground/outside/dirt, @@ -79205,6 +81372,12 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland/town) +"xWF" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "xWM" = ( /obj/structure/car/rubbish2, /turf/open/indestructible/ground/outside/sidewalk{ @@ -79268,6 +81441,12 @@ icon_state = "dirt" }, /area/f13/wasteland) +"xXr" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "xXx" = ( /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) @@ -79425,6 +81604,11 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/m) +"yae" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) "yau" = ( /obj/item/flag/khan, /obj/structure/fence/corner{ @@ -79627,7 +81811,7 @@ "ycM" = ( /obj/structure/sign/poster/prewar/poster70, /turf/closed/wall/mineral/brick, -/area/f13/wasteland) +/area/f13/ncr) "ycP" = ( /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/sidewalk{ @@ -79957,8 +82141,9 @@ /obj/item/bedsheet/blanket{ pixel_y = 1 }, +/obj/effect/landmark/start/f13/ncrconscript, /turf/open/floor/plasteel/grimy, -/area/f13/wasteland) +/area/f13/ncr) "yik" = ( /obj/machinery/computer/terminal{ dir = 4; @@ -80039,7 +82224,12 @@ }, /area/f13/ambientlighting/building/w) "yjj" = ( -/obj/structure/legion_extractor, +/obj/structure/table/booth, +/obj/structure/gallow{ + pixel_x = 14; + pixel_y = 10; + layer = 10 + }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "yjk" = ( @@ -80174,10 +82364,22 @@ icon_state = "outerpavement" }, /area/f13/caves) +"ylL" = ( +/obj/machinery/light_switch{ + pixel_y = -6; + pixel_x = -23 + }, +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "ylR" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) +/turf/closed/mineral/random/no_caves, +/area/f13/ncr) "ylX" = ( /obj/structure/simple_door, /obj/structure/barricade/wooden/planks, @@ -80293,8 +82495,8 @@ rkv rkv rkv rkv -rkv -rkv +gXH +gXH rkv rkv rkv @@ -80576,6 +82778,7 @@ yfv yfv yfv yfv +rkv yfv yfv yfv @@ -80593,25 +82796,24 @@ yfv yfv yfv yfv +ufo +aJV +sOw +tBQ yfv yfv yfv yfv yfv yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +ylR +ylR +ylR +ylR +ylR +ylR +ylR +ylR yfv yfv yfv @@ -80878,6 +83080,7 @@ aTW aTW aTW aTW +rkv aTW aTW aTW @@ -80895,18 +83098,17 @@ aTW aTW aTW aTW +ufo +gvD +gvD +ufo aTW aTW aTW aTW aTW aTW -aTW -aTW -aTW -aTW -aTW -aTW +hkO tse huh nVA @@ -81180,43 +83382,43 @@ aTW aTW aTW aTW +rkv aTW aTW aTW aTW aTW -aTW -aTW -aTW -aTW -aTW -aTW +hkO +hkO +hkO +hkO +hkO aTW aTW aTW aTW xic -xic -xic -xic +gZW xic thS -hpE -hpE -hpE -hpE -hpE -hpE -hpE -hpE -oos +gvD +gvD +jwS +jwS +jwS +jwS +jwS +jwS +jwS +jwS +nVA hta oos hta oos oos hta -aTW +hkO pxU aTW rkv @@ -81488,38 +83690,38 @@ azA azA aTW aTW -aTW -ned +hkO +eer rdi -ned -aTW -aTW +ewm +hkO +hkO aTW aTW -yjj -azA -azA azA azA azA +xic azA -hpE +uou +iOE +jwS kyD rVP rVP qHg ahk aQs -hpE -ned -ned -ned -ned -ylR -ned -ned -ned -aTW +jwS +jwS +uaE +uaE +uaE +xXA +uaE +uaE +uaE +hkO aTW rkv pjw @@ -81784,45 +83986,45 @@ aTW aTW azA azA -shl +wRi azA azA azA azA aTW -aTW -ned -ffB -ffB -ffB -aTW +hkO +uaE +akN +mmm +rdi +hkO vtS azA qWz -azA xic xic -azA -azA -azA -hpE -hpE +xic +xic +gvD +gvD +jwS +jwS rBR rVP rVP rVP rVP -hpE -ned -ned -ned -ned -ned -ned +mnl +jwS +uaE +uhL +mmm ned ned -bBt -aTW +mmm +sMA +dpi +hkO rkv pjw pjw @@ -82086,45 +84288,45 @@ aTW aTW azA azA -shl -azA -pCk -azA -azA -azA +wRi azA -aTW +qLk +eRO +eRO +eRO +cMj +hkO rrO -aTW +hkO ffB -aTW +hkO dAp azA raQ azA azA -xic -azA -azA +dWL azA +gvD +gvD xic -hpE -rVP -rVP -rVP +jwS +vju +uMS +uMS rVP wXb -hpE -jwS -jwS -ned +mnl jwS +lWz +ffB +lWz nQa hsD vZw sJO -aTW -aTW +hkO +hkO rkv pjw pjw @@ -82388,7 +84590,7 @@ aTW azA azA azA -shl +wRi azA eRO eRO @@ -82396,37 +84598,37 @@ eRO eRO eRO azA -pCk -loW -svx +oQS +cwi +uSm cwi sCu gHu -svx +ntF kGR kVL -rkZ -rkZ -rkZ svx svx +rkZ +shb +svx vvf tzv -tzv -tzv -eYx -eYx -hpE -hkO -ned +cjF +hdP +rVP +rVP +mnl +jwS +fwg ffB -ned +uaE +hkO +hkO +mgt +sMw +iUu hkO -aTW -ned -ned -ned -aTW rkv pjw pjw @@ -82690,45 +84892,45 @@ azA azA azA azA -shl +wRi azA -eRO +yjj eRO lEm eRO -eRO -azA -azA -hpE -hpE -hpE -hpE -hpE -hpE -hpE -hpE -hpE -xic +lEm azA -svx +jpl +jwS +jwS +jwS +jwS +jwS +jwS +jwS +jwS +jwS xic -hpE +xXr +gvD +flK +jwS sYW rVP -tzv -rBR -eYx -hpE -hpE +fvX +iXU +dpT +jwS +jwS nwb qmJ -iZh -aTW -aTW +jwS +hkO +qAq ryS -juE -ned -aTW +pnz +uaE +hkO rkv pjw pjw @@ -82993,44 +85195,44 @@ azA azA azA sqv +ljW azA -eRO -eRO -eRO -eRO -eRO azA azA -hpE +azA +azA +azA +jpl +jwS gaX sUc uza -hpE +jwS sdI owH iph -hpE +jwS xic -azA -svx +xXr +gvD xic -hpE -eYx -rVP -tzv +jwS +igd rVP -eYx -hpE -gcN -uVn -ktI -hpE -hpE -aTW -bIP +fvX +sVj +cdT +jwS +rOj +dOD +iZh +jwS +jwS +uaE +ohJ bIP -ned -aTW +uaE +hkO rkv pjw pjw @@ -83294,45 +85496,45 @@ azA azA azA azA -shl -azA -azA -azA +wRi +jXw azA azA azA azA azA -hpE -vbI +pYc +xUw +jwS +qhU iDN -vbI -hpE -vbI +qhU +jwS +qhU coK vbI -hpE -azA -azA -svx +jwS xic -hpE +mgD +gvD +xic +jwS eYx rVP -tzv +beK tzv tzv vvf ktI -ktI -ktI +guP +neD gcN -hpE -aTW -ned +jwS +ltz +uaE juE -ned -aTW +uaE +hkO rkv pjw pjw @@ -83596,45 +85798,45 @@ azA azA azA azA -shl -azA +wRi +qhE mLi nSc odS odS hux -azA -hpE -hpE +jpl +jwS +jwS niz +kYv qwi -qwi -hpE +jwS qwi qwi qwi -hpE -wRi -mkG -fYh -mkG -hpE -eYx -rVP +jwS +jwS +xXr +gvD +jRD +jwS +mnl +uMS rVP rVP rVP bZp -uVn -uVn -ktI +dOD +sWI +iZh mSa -hpE -aTW -ned +jwS +hkO +dpY bgZ -ryS -aTW +aUY +hkO rkv pjw pjw @@ -83898,44 +86100,44 @@ azA azA azA azA -shl +wRi pCk vbB odS odS mHY bgm -azA -hpE +jpl +jwS cgu -vbI -vbI -vbI -vbI -vbI -vbI -vbI -vbI -hpE -gvD +qhU +smC +qhU +sEV +qhU +qhU +qhU +qhU +jwS mgD +gvD azA -hpE -eYx +jwS +dVp rVP -eYx -eYx -eYx -hpE +aaR +wJx +cEN +jwS nTw -uVn -ktI -ktI +dOD +ifQ +aMB gcN -hpE -aTW -aTW -aTW +jwS +hkO +hkO +hkO rkv aTW pjw @@ -84200,18 +86402,18 @@ azA azA azA azA -shl -azA +wRi +aUc azA quf odS odS odS -azA -hpE +jpl +lIh qhU -vbI -dku +qhU +qkq dku dku dku @@ -84220,24 +86422,24 @@ dku ddQ lee qOY -dCE -azA -hpE -hpE +gvD +jRD +jwS +jwS bZp -hpE -hpE -hpE -hpE -hpE -uVn -uVn -ktI -uVn +jwS +jwS +jwS +jwS +jwS +tOr +dEw +iZh +dOD qOV -hpE -hpE -hpE +jwS +jwS +jwS rkv neZ taO @@ -84503,43 +86705,43 @@ azA azA azA sqv -azA +cbD azA azA azA quf mHY -hux -hpE +fmC +jwS sNg -vbI +rPe coK -vbI +mdI xwC -qsE +cKM ffw qsE -qsE +cKM qha -mgD -gvD -gvD +xXr gvD +mab +tXn gvD gvD +mab +kLD +mvF ofe -gvD -gvD -ofe -hpE -aZK -uVn -ktI -ktI -uVn +jwS +sgR +mcV +thp +sWI +dOD xOc rXw -hpE +jwS rkv aTW vwf @@ -84804,44 +87006,44 @@ azA azA azA azA -shl -azA -azA -azA +wRi +ljW +fZL +ivD fZL azA azA -azA -hpE -hpE -hpE -hpE -hpE -hpE -hpE -hpE -hpE -hpE -wRi +jpl +jwS +jwS +jwS +jwS +jwS +jwS +jwS +jwS +jwS +jwS +jwS mgD gvD -foA -gvD gvD +hZK gvD +wIT uCa -gvD +sFL foA -gvD -hpE -uVn -uVn -uVn +uRF +jwS +sgR +uIh +sEn +guP +guP ktI -uVn -uVn -uVn -hpE +xJc +jwS rkv aTW taO @@ -84953,7 +87155,7 @@ wCM vpp hak qKf -cKM +mca iap pDb mca @@ -85106,21 +87308,21 @@ azA azA azA azA -shl +wRi azA azA azA -bho -wsd -wsd -wsd -wsd +wBl wsd wsd +xKp wsd wsd wsd wsd +gKD +htS +rmK wsd wsd wsd @@ -85130,20 +87332,20 @@ wsd wsd wsd wsd +ckK +rOi +rmK wsd wsd -wsd -wsd -mBX -hpE -hpE +bEf +bEf ycM -uVn -ktI -ktI +pBr +dOD +sWI fbM qft -hpE +jwS rkv aTW neZ @@ -85255,7 +87457,7 @@ sBk vpp ugZ bzD -fqh +vGz iap iap vGz @@ -85408,26 +87610,25 @@ gvU jKr azA azA -shl -azA +wRi azA azA +ljW ahs -uVn -uVn -uVn +izU +ioi +rma eDX eAw eAw +wwd +gpB +eDX eAw eAw -eAw -eAw -eAw -eAw +glf eAw lKQ -lKQ eAw eAw eAw @@ -85435,17 +87636,18 @@ eAw eAw eAw eAw +ioi eAw eAw eAw ozi ndc gFV -uVn -ktI -ktI -uVn -hpE +dOD +sWI +sWI +pUW +jwS aTW aTW pjw @@ -85710,42 +87912,42 @@ azA azA azA azA -shl +wRi azA azA azA -ahs +qzA eDX eAw -eAw -hKZ -tPS -tPS -tPS -tPS -tPS -tPS +lKQ +arq tPS -umk tPS -xxN tPS +uhs tPS tPS tPS +cNV +cNV +nPi tPS tPS tPS +nrn +nrn +nrn +nrn tPS tPS tPS tPS jEq heA -jGT +sFe jGT gWT -ktI +dOD tQX pEl aTW @@ -86013,13 +88215,13 @@ azA azA azA sqv +qhE azA azA -azA -ahs +xxH lmd rts -tPS +xxN eJc eJc tPS @@ -86027,29 +88229,29 @@ tPS tPS tPS tPS -tPS -tPS -tPS +nrn +uVv +nrn xxN tPS tPS tPS +fEU +qtr +nrn tPS tPS tPS tPS tPS -tPS -tPS -tPS -tPS -ste +jEq +qTD lti dan vDH -ktI -pUW -hpE +dOD +aZK +jwS aTW rjL taO @@ -86314,44 +88516,44 @@ azA jKr azA azA -shl -azA +wRi +ljW azA azA ahs lmd tPS -tPS +xxN tPS eJc -jpl +eJc tPS -bho -wsd -wsd -wsd -wsd +lDP +lFq +rmK wsd -dOn wsd wsd +xKp wsd wsd +rmK +rmK iwB tPS tPS -tPS +luk bho -fwg +wsd wsd ozi syx -uVn -uVn -uVn -uVn -ktI -hpE +iZh +dOD +dOD +dOD +dOD +jwS aTW taO taO @@ -86616,44 +88818,44 @@ azA azA ckU azA -shl -azA +wRi azA azA +qhE ahs lmd -kdY -kdY +mbi +eJl kdY tPS eJc tPS ahs -ktI -ktI -ktI -ktI -ktI -ktI -uVn -uVn -uVn -uVn +pgX +nht +nht +eHQ +kge +bSZ +aTq +hwA +qZA +lZG lmd tPS +eJc tPS -tPS -ahs -qtr -hpE -hpE +xxH +asH +slr +jwS sht wzT lbu vnW -uVn +sWI nDB -hpE +jwS aTW taO jhX @@ -86918,41 +89120,41 @@ dzm azA azA azA -shl -azA +wRi azA +aUc azA ahs -lmd -eJc +kyc eJc +kaI tPS +rVM tPS -tPS -tPS +luk ahs -ktI -hpE -hpE -hpE -hpE -kYv -hpE -hpE -hpE -uVn -lmd -tPS -tPS -tPS +bGL +jwS +jwS +waW +jwS +jwS +lLc +jwS +jwS +rkr +fPf +nrn +qtr +eJc aOB eAw aKG ozi fLu -uVn +iZh eMZ -uVn +sWI sdS uMR sMT @@ -87220,44 +89422,44 @@ azA azA azA azA -shl -azA -azA +wRi azA +jUr +aci ahs lmd bjo -eJc -tPS +kaI tPS tPS tPS -ahs -ktI -hpE +luk +cAr +bGL +jwS iNl rhc -rhc +iho enU -rhc -rhc -hpE -uVn +tKO +fYh +jwS +qBe lmd +nrn +nrn tPS tPS -tPS -tPS -tPS -tPS +nrn +nrn sqk jGT lAJ -jGT +blA bnL -uVn +sWI pPz -hpE +jwS neZ taO oFS @@ -87386,7 +89588,7 @@ aXo brU wjC kAA -sWI +tTi blR fBA fIO @@ -87523,43 +89725,43 @@ gvU azA azA sqv -azA +qhE azA azA ahs lmd kdY -tCA +ikh kdY tPS eJc eJc -ahs -ktI +xxH +oMY nwb jau rhc bYl slq -bYl rhc -hpE -uVn -wnU -tPS -tPS -tPS +rhc +jwS +dsv +fPf tPS +nrn tPS tPS +nrn tPS -ste -ste +sqk +qTD +nyy ste vDH -uVn -pUW -hpE +dOD +aZK +jwS pjw lSV jYM @@ -87690,7 +89892,7 @@ kVV uzR tTi rVG -cMj +tTi mrF fOW tum @@ -87824,44 +90026,44 @@ wfv wfv uhS azA -shl -azA +wRi azA azA +ljW ahs lJf hsU -tPS +xxN tPS tPS eJc eJc -ahs -ktI -hpE +jUV +dpM +jwS nAd rhc -rhc +iNl sRW +bwa rhc -rhc -uMS +rOZ uVn -wnU -tPS +lmd +cNV tPS -bho -wsd -fwg +lDP +oFi wsd +xcO ozi tXN +wcr ktI -ktI -ktI -ktI -ktI -hpE +egt +aMB +dOD +jwS pjw lSV aRK @@ -88126,44 +90328,44 @@ rRz hYR nrq azA -shl +wRi azA azA azA -ahs +kIx lmd opg -tPS +xxN tPS tPS eJc tPS ahs -ktI -hpE +bGL +jwS vdF rhc rhc jPb rhc rhc -hpE +pEl uVn -wnU -tPS +lmd +cNV tPS -ahs -uVn -htS -hpE -hpE +oDA +uup +jwS +oNR +jwS bRO -uVn -uVn -gFV -ktI -hpE -hpE +dOD +dOD +dOD +pBr +jwS +jwS pjw lSV aRK @@ -88428,43 +90630,43 @@ rRz nDt ctN azA -shl -azA +wRi +ljW azA azA -ahs -lmd +qzA +izU kdY -uhp +dfc kdY tPS tPS tPS -ahs -ktI -hpE +ioi +bGL +jwS atA rhc rhc -bGS +slq rhc rhc sMT -uVn +nQO lmd tPS tPS ahs -uVn -hpE +mgI +jwS aZK -uVn -uVn +dOD +dOD gdm gdm nwb uof -hpE +jwS vkP vkP vkP @@ -88730,43 +90932,43 @@ nDt ctN azA azA -shl -azA -azA +wRi +lbp azA -ahs -lmd +qhE +oDA +yae qid -tPS +xxN tPS eJc tPS -tPS -ahs -ktI -hpE +luk +oDA +dpM +jwS jZl -kQP +ael hql pFU rhc rhc -hpE -uVn -lmd +kBR +kEe +pCa tPS tPS -ahs -uVn -hpE -uVn -uVn -uVn +lIp +qBe +jwS +dOD +pHg +tXN qEx pBE -uVn -ktI -hpE +dOD +iZh +jwS vkP laX olF @@ -89034,41 +91236,41 @@ azA azA sqv azA -azA +aUc azA ahs lmd wvE -tPS +xxN tPS tPS iKG rts -ahs -ktI -hpE +sRg +tbe +jwS fVF feb -tZw +aLM aKn rhc rhc -hpE +wJq uVn -lmd +eRG tPS tPS -ahs -uVn -hpE +qxt +uYI +jwS dQY vPM dQY -hpE -ktI -ktI +jwS +upH ktI -hpE +xWF +jwS vkP fiR hze @@ -89334,43 +91536,43 @@ azA azA azA azA -shl -azA +wRi +ljW azA azA ahs lmd kdY -dqb -nvr +uuR +pwe cNV xhr mJM ahs -ktI -hpE -rhc -rhc +rma +jwS +fdB +bBt kQP jyb rhc rhc -hpE -uVn +kBR +cpS lmd -tPS -tPS -ahs -lWz -hpE -hpE -hpE -hpE -hpE +nrn +nrn +xdE +uVn +jwS +jwS +jwS +jwS +jwS rSZ -hpE -hpE -hpE +jwS +jwS +jwS vkP jiP sEJ @@ -89636,43 +91838,43 @@ fZR azA azA azA -shl -azA +wRi +paN azA azA ahs lmd tPS tPS -gyC +pRE cNV xhr gTs ahs -ktI -hpE +oMY +jwS jAn -mgt +rhc jZl vcb rhc rhc ruJ uVn -lmd -tPS +vyg +nrn tPS ahs +aMd uVn -uVn -hpE +jwS hDz -cMW -cMW +rKn +gaq rUC -ffy -hpE -hpE +vYa +jwS +jwS vkP jaM qLq @@ -89938,43 +92140,43 @@ sLI azA azA azA -shl -azA +wRi azA azA +ljW ahs nAb iKG tPS -gyC +pRE cNV xhr -xxN -lOb -ktI -hpE +sGJ +wxd +dxr +jwS fXb -bGS -tZw +rhc +aLM cIz -bGS +hNc rhc -hpE +qEK uVn -wnU +vyg tPS tPS aOB nEj uVn fMf -cMW -cMW -cMW -rUC +gaq +gaq +gaq +gaq ffy -hpE -hpE +jwS +jwS vkP thA fkM @@ -90240,42 +92442,42 @@ sLI azA azA azA -shl -azA +wRi +qhE azA azA ahs -lmd +weO uhp kdY -uhp -gyC +dfc +bNM cNV tQE fPk fPk -hpE +jwS hhn pjo -hpE -hpE +jwS +jwS bGS -rhc -hpE -uVn -wnU -tPS +fYh +jwS +cpS +lmd tPS tPS +eJc ahs uVn -hpE +jwS eHh -cMW +gaq mra tSg ffy -hpE +jwS azA vkP vkP @@ -90544,40 +92746,40 @@ azA azA sqv azA +jFD azA -azA -ahs -lmd +xxH +arq tPS ijL -tPS -tPS -tPS +gZg +sRT +vQZ xxN -hpE +jwS bSi -tTv +ylL jTw -jRD -tTv -hpE -bGS +uRi +uRi +jwS +slq rhc -hpE +jwS uVn wnU tPS tPS -tPS +luk uXT nEj -hpE -hpE -hpE -hpE -mlH -mlH -hpE +jwS +jwS +jwS +jwS +hRc +hRc +jEU azA azA nmy @@ -90844,37 +93046,37 @@ sLI azA azA azA -shl -azA -azA +wRi azA -ahs -lmd -tPS -tPS +ljW +qhE +xxH +lcl tPS tPS +xxN +veM tPS xxN nfC aXP hnG -cZH +gEy byy -tTv +uRi nwb -bGS +slq rhc -hpE +qEK uVn lmd tPS tPS -tPS -tPS +bqM +qtr uXT nEj -uVn +izU hpE rAg wsd @@ -91146,37 +93348,37 @@ sLI azA azA azA -shl -azA +wRi azA +fZL azA ahs -lmd -tPS -tPS -tPS -tPS -tPS -cJB +hwA +ign +myt +xxN +cNV +unH +phi nfC vOv -tTv +uRi oNG -jRD -jRD +uRi +uRi ftP -bGS +slq rhc -hpE +qEK uVn lmd tPS tPS -tPS -tPS -tPS -uXT -eAw +nrn +eJc +cNV +qzA +ioi hpE eAw eAw @@ -91448,35 +93650,35 @@ sLI azA azA azA -shl -azA +wRi azA +qhE azA ahs -lmd -tPS -tPS -tPS -eJc +ioi +myt +myt +sJE eJc +lRB cJB nfC cZH -tTv -tTv -tTv -tTv -hpE -bGS +uRi +uRi +uRi +uRi +jwS +slq rhc -hpE -uVn -sqF +jwS +cpS +dCE wsd iwB tPS tPS -tPS +cNV tPS tPS vfa @@ -91750,43 +93952,43 @@ sLI azA azA azA -shl -azA +wRi +ljW azA azA -ahs -sqF -wsd -wsd +ioi +ioi +ioi wsd +xKp wsd wsd wfN -hpE +jwS jxg -tTv +uRi vaZ vlI -uRi -hpE -bGS +dQz +jwS +slq rhc -hpE -lWz +jwS uVn +nQO uVn lmd tPS tPS +nrn tPS -tPS -tPS -smK +nrn +vfa smK smK uaS uaS -smK +luk smK smK smK @@ -92055,34 +94257,34 @@ uQH sqv azA azA -azA -uXT -eAw -eAw -eAw -eAw -eAw -lKQ +aUc +ioi +uJs +kna +kna +phR +weF +eND jgy -hpE -hpE -hpE -hpE -hpE -hpE -hpE -pXA -uMS -hpE -hpE +jwS +rmr +wsr +rmr +dYH +wsr +jwS +gzE rOZ -hpE -hpE -wsd -wsd -wsd -wsd -wsd +jwS +rOZ +rOZ +jwS +sqF +bok +djp +fcu +fqh +srf hpE wsd wsd @@ -92359,32 +94561,32 @@ bvo azA azA azA +jpl +odS +odS azA +jpl azA -azA -azA -azA -svx -hpE -hpE +jwS +jwS oKo -jZl -tTv +dYH +uRi qyA uRi -hpE -bGS -rhc +jwS +slq rhc +byE rhc rhc -bok -hpE -eAw -eAw -eAw -eAw +jwS +jwS +bYe eAw +nsN +gpB +nsN hpE jak eAw @@ -92660,35 +94862,35 @@ bvo bvo azA azA -pty -rLZ +vMj +nov czG czG -ufp -azA -svx -hpE -dTC +mRd +jpl +lhS +jwS +qng rci -kQP -tTv -tTv +ael +uRi +uRi mVy -dQz -bGS -rhc +muo +slq rhc +cpU rhc rhc cLN -hpE +jwS vaB azA mbj azA hpE hpE -hpE +uJH cyW rLN rLN @@ -92965,25 +95167,25 @@ azA eQj juY czG -czG +sRv ufp +jpl azA -svx -hpE +jwS jJE -tTv +vJr tZw paK kid wPF dQz +slq rhc -rhc -tTv -tTv -tTv +uRi +uRi +uRi gAE -hpE +jwS erZ pCk chp @@ -92999,7 +95201,7 @@ azA ahs lcl kqU -eLo +iEK smK yky azA @@ -93265,38 +95467,38 @@ bvo azA azA rOB -juY -juY -juY +oew +czG +czG rOB -svx -svx -hpE +jpl +azA +kBK yhZ fTn jZl -tTv -tTv +uRi +uRi qxp -pHg -rhc +uRi +slq rhc bSi eKW eUG uKK -hpE +jwS wYZ kxf azA aUc erZ -loW +mBX rLN cyW azA azA -azA +ljW azA aSa kUI @@ -93567,33 +95769,33 @@ bvo azA azA rfs -eQj +wrX dlS -juY -nUt -svx +czG +rLZ +jpl azA -hpE -byQ +kKP +gGH +oah +rOZ +cBO rhc -uMS rhc rhc +slq rhc -bGS -bGS -bGS -hpE -hpE +jwS +jwS nwb -hpE -hpE +jwS +jwS wYZ oMd azA urs azA -loW +mBX cyW azA azA @@ -93866,38 +96068,38 @@ uNU hoi bvo bvo -azA +mUU azA unA czG dlS -rLZ -pty -azA -azA -hpE +jVW +tJF +qHy +svx +gYy byQ -rhc +bBt pXA sAQ -bGS -bGS -bGS +bBt +bBt +bBt +lHR rhc -bGS -kEW -rUC +jwS +aYE cMW -uCY -hpE +ivI +jwS bra erZ qbB cJw azA -loW -azA +mBX azA +ljW azA azA azA @@ -94173,36 +96375,36 @@ azA fSI rLZ rLZ -czG +dlb pty +qhE azA -azA -hpE +kKP fsB -tTv +rJp ivO -tTv -tTv +qyA +uRi qxp -pHg -rhc -rhc -hpE -rUC -rUC -uCY -hpE -hpE -hpE +uRi +hvC +bBt +tJx +fVQ +gaq +gaq +jwS +jwS +jwS cXl mSP oJp hpE -qwc -azA +lwP +lwP +qSG azA azA -dYy azA ahs kPz @@ -94473,36 +96675,36 @@ bvo azA azA kiz -rLZ +jHT pty dlS lFC azA azA -hpE +jwS oTO eGN -kQP -tTv -wPF -kid +ael +paK dQz +kid +wPF rhc -rhc -hpE -cMW -rUC +fYh +jwS +hyn +gaq gaq uCY -uCY -hpE +hyn +jwS hWF kxf pCk -loW azA azA azA +mBX azA azA azA @@ -94781,30 +96983,30 @@ azA azA azA azA -hpE +jwS nwz tTv jZl -tTv +uRi wPF bSj -jRD +uRi rhc rhc -hpE -cMW -cMW -cMW -cMW -uCY -hpE +jwS +osB +gaq +gaq +gaq +osB +jwS urs erZ +hqe azA -loW -azA -azA -azA +nBj +dWL +mBX azA azA azA @@ -95074,41 +97276,41 @@ uNU voi bvo bvo -rLf -rLf -rLf -rLf -rLf -rLf -rLf -rLf -rLf -hpE +pKM +pKM +pKM +pKM +pKM +pKM +pKM +pKM +pKM +jwS tyQ dTC tZw -tTv -wPF -frG +uRi uYN +frG +qyA rhc rhc -hpE +jwS kqB tSg -cMW -cMW +gaq +gaq lAy -hpE +jwS azA azA aQq -loW -azA -azA azA azA +mUU +mBX azA +aUc azA ahs rhZ @@ -95377,38 +97579,38 @@ mji bvo bvo azA +qhE +erZ azA azA azA +qhE azA azA -azA -azA -azA -hpE -hpE -hpE -hpE -hpE -hpE -hpE -hpE -uMS -uMS -hpE -mlH -mlH +jwS +jwS +jwS +jwS +jwS +jwS +jwS +jwS +rOZ +rOZ +jwS +kEW mlH +kEW +jwS +jwS +jwS +pKM +pKM +pKM hpE +pKM +pKM hpE -hpE -rLf -rLf -rLf -hpE -azA -azA -azA azA azA azA @@ -95682,7 +97884,7 @@ azA azA ljW azA -azA +aUc azA azA azA @@ -95694,16 +97896,16 @@ smK gDP smK piZ -hpE +kBR rhc rhc -gYV +vPt rhc rhc cpU gYV fLe -hpE +jwS azA azA azA @@ -95996,21 +98198,21 @@ smK ekZ smK smK -hpE -rhc -rhc +wJq +mpj rhc +nUt rhc rhc rhc rhc rhc -hpE -azA +jwS azA azA azA azA +ljW azA azA azA @@ -96285,7 +98487,7 @@ hYq hYq xUy ner -azA +huE azA azA azA @@ -96298,24 +98500,24 @@ smK gDP smK smK -hpE -rhc -rhc +kBR +nVV +nVV vPt rhc rhc -vPt +ljY fiF iBf -hpE -azA -azA -azA +jwS azA +aUc azA +umk azA azA azA +wSh azA azA ahs @@ -96589,36 +98791,36 @@ hYq ner azA ljW -azA +qmc azA ahs uVn lmd tfP +cNV +cNV smK smK smK -smK -smK -hpE +jwS rOd rOd -hpE +sMT uJz uJz -hpE +nwb rOd rOd -hpE -azA -azA -azA -azA -azA +jwS azA azA azA +ndZ +rDi +rDi +uhS azA +ljW azA ahs kPz @@ -96889,37 +99091,37 @@ mWz hra hYq ner +cJw azA azA -azA -azA +jwI ahs uVn lmd tfP smK -smK -smK +cNV +cNV smK smK pDU lmd azA -qwc -azA -azA -qwc -azA +jVC +snR +nrq +jVC +qhE azA qwc azA -azA -azA -azA -azA -azA -azA -azA +pbH +ndZ +dPr +cBf +cBf +kiP +uhS azA azA aSa @@ -97191,8 +99393,8 @@ mWz mWz hYq ner -azA -azA +boK +qhE azA azA ahs @@ -97201,29 +99403,29 @@ lmd tfP smK smK -smK +cNV smK smK ahs lmd azA +bGj +snR +kiP +rDi +rDi +rDi +rDi +rDi +rDi +dPr +xiG +mgC +xNY +cBf +nrq azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA +dYy ahs rhZ hiH @@ -97502,7 +99704,7 @@ uVn lmd tfP smK -smK +kYf smK smK smK @@ -97510,20 +99712,20 @@ ahs lmd azA azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA +snR +cBf +cBf +cBf +cBf +cBf +cBf +cBf +cBf +xiG +mgC +xNY +cBf +nrq azA azA ahs @@ -97795,8 +99997,8 @@ mWz mWz hYq ner -azA -azA +erZ +qhE azA azA aOB @@ -97804,29 +100006,29 @@ nEj lmd tfP smK -smK -smK +kYf +kYf smK smK ahs lmd azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA +ryf +snR +nDt +wTQ +wTQ +wTQ +wTQ +wTQ +wTQ +jbl +cBf +cBf +nDt +wTQ +ctN +dOi azA ahs rhZ @@ -98097,39 +100299,39 @@ xKt hYq xUy ner +aUc +mEj +erZ azA -azA -azA -azA -azA +qhE ahs lmd tfP -smK -smK -smK -smK +eJc +kYf +kYf +kYf smK ahs lmd azA +aUc +snR +nrq azA azA +jFD azA azA azA +gAg +wTQ +wTQ +ctN +ljW azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA +aUc +cbD ahs kPz kqU @@ -98399,39 +100601,39 @@ uQH uQH uQH mUB +cXl +erZ azA azA -azA -azA -azA +aUc ahs lmd tfP -smK -smK -smK -smK -smK +rVM +oXG +kYf +kYf +kYf diZ lmd azA azA +snR +nrq azA +ljW +boK azA azA +aUc +bLE azA azA azA azA azA azA -azA -azA -azA -azA -azA -azA -azA +mUU ahs rhZ kqU @@ -98708,9 +100910,9 @@ wsd wsd jQw sqF -wsd -wsd -tMH +elf +wsh +rVM smK smK bff @@ -99010,9 +101212,9 @@ eAw eAw eAw eAw -eAw -eAw -nAH +rZy +dVN +smK smK smK rzw @@ -99312,7 +101514,7 @@ smK smK smK pAX -smK +kvH smK smK smK From b131715e4d3d297cd39a8ec619ef47014ed94207 Mon Sep 17 00:00:00 2001 From: Defaulterrama <136886118+Defaulterrama@users.noreply.github.com> Date: Thu, 5 Mar 2026 23:29:53 -0500 Subject: [PATCH 3/6] lot of stuff a --- .../Vegas Valley/Vegas_Valley_Sky.dmm | 10866 ++++---- .../Vegas Valley/Vegas_Valley_Surface.dmm | 22756 ++++++++-------- 2 files changed, 16518 insertions(+), 17104 deletions(-) diff --git a/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm b/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm index ff1346f8b8..f7ead1f70f 100644 --- a/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm +++ b/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm @@ -12,15 +12,6 @@ }, /turf/open/floor/wood_common, /area/f13/clinic) -"ac" = ( -/obj/machinery/iv_drip, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/wood_common{ - icon_state = "common-broken3" - }, -/area/f13/ncr) "ad" = ( /obj/structure/railing{ layer = 4.1; @@ -100,12 +91,6 @@ smooth = 1 }, /area/f13/brotherhood/offices1st) -"al" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken3" - }, -/area/f13/ncr) "am" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, @@ -139,16 +124,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"aq" = ( -/obj/structure/chair/sofa/right{ - color = "#475340" - }, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ff4747" - }, -/turf/open/floor/carpet/red, -/area/f13/ncr) "as" = ( /obj/structure/railing{ dir = 10 @@ -206,12 +181,6 @@ /obj/structure/barricade/bars, /turf/open/floor/plasteel/dark, /area/f13/building/abandoned/l) -"aA" = ( -/obj/structure/flora/grass/jungle/b{ - pixel_x = -22 - }, -/turf/open/floor/plating/dirt, -/area/f13/caves) "aB" = ( /obj/structure/table, /obj/item/storage/crayons, @@ -224,15 +193,6 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) -"aD" = ( -/obj/structure/fluff{ - icon = 'icons/fallout/objects/cave_decor.dmi'; - icon_state = "support_wall"; - name = "support wall"; - density = 1 - }, -/turf/closed/mineral/random/low_chance, -/area/f13/caves) "aG" = ( /obj/item/weldingtool, /obj/effect/decal/cleanable/dirt, @@ -256,6 +216,12 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +"aK" = ( +/turf/open/indestructible/ground/outside/dirt{ + dir = 9; + icon_state = "dirt" + }, +/area/f13/wasteland) "aL" = ( /obj/effect/decal/cleanable/ash/snappop_phoenix, /obj/item/cigbutt/cigarbutt, @@ -265,16 +231,6 @@ }, /turf/open/floor/carpet/purple, /area/f13/building/powered) -"aM" = ( -/obj/structure/bookcase/random{ - icon_state = "bookempty" - }, -/obj/item/toy/cards/deck{ - pixel_y = 17; - pixel_x = 6 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "aO" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/mug/coco{ @@ -287,14 +243,11 @@ }, /turf/open/floor/wood_wide, /area/f13/followers) -"aR" = ( -/obj/structure/fermenting_barrel{ - pixel_y = 10; - pixel_x = 8; - density = 0; - layer = 3.1 +"aQ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 }, -/turf/open/indestructible/ground/outside/snow, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "aT" = ( /obj/structure/bed/double, @@ -320,10 +273,6 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) -"aW" = ( -/obj/structure/flora/branch, -/turf/open/floor/plating/dirt/dark, -/area/f13/caves) "aX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -331,12 +280,6 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) -"aY" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "ba" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -446,6 +389,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"bs" = ( +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "bt" = ( /obj/structure/filingcabinet, /turf/open/floor/carpet/royalblack, @@ -685,8 +632,11 @@ /turf/open/floor/holofloor/carpet, /area/f13/ambientlighting/building/e) "cc" = ( -/turf/open/floor/carpet/red, -/area/f13/ncr) +/obj/structure/simple_door/tentflap_cloth{ + pixel_y = -3 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/ambientlighting/building/u) "ce" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -695,18 +645,9 @@ /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) "cf" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/obj/structure/wreck/trash/one_barrel{ - pixel_x = -13; - pixel_y = -3 - }, -/obj/structure/wreck/trash/one_barrel{ - pixel_y = 9 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/obj/structure/flora/big_bush, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "cg" = ( /obj/structure/closet/firecloset/full, /obj/machinery/light/fo13colored/Red{ @@ -790,10 +731,7 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "cr" = ( -/obj/structure/fluff/railing{ - dir = 8 - }, -/turf/open/floor/plating/f13/outside/roof/metal/corrugated, +/turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "cs" = ( /obj/structure/sign/legion/veteran, @@ -841,18 +779,6 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) -"cB" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/structure/flora/ausbushes/stalkybush{ - pixel_y = 17 - }, -/turf/open/indestructible/ground/outside/water, -/area/f13/caves) "cC" = ( /obj/structure/railing{ layer = 4.1 @@ -863,13 +789,6 @@ /obj/effect/spawner/lootdrop/trash, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) -"cE" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "cF" = ( /obj/structure/reagent_dispensers/barrel/three, /obj/effect/decal/cleanable/dirt, @@ -981,26 +900,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) -"da" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt, -/obj/structure/fluff{ - icon = 'icons/fallout/objects/cave_decor.dmi'; - icon_state = "boards_mammoth_we-5"; - name = "planks"; - desc = "planks to keep your shoes clean of mud" - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) "db" = ( /turf/open/floor/holofloor/carpet, /area/f13/ambientlighting/building/e) -"dc" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/mineral/random/low_chance, -/area/f13/caves) "dd" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -1013,58 +915,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"de" = ( -/obj/structure/rack, -/obj/item/clothing/shoes/winterboots/ice_boots, -/obj/item/clothing/shoes/winterboots/ice_boots, -/obj/item/clothing/shoes/winterboots/ice_boots, -/obj/item/clothing/shoes/winterboots/ice_boots, -/obj/item/clothing/shoes/winterboots/ice_boots, -/obj/item/clothing/shoes/winterboots/ice_boots, -/obj/item/clothing/shoes/winterboots/ice_boots, -/obj/item/clothing/shoes/winterboots/ice_boots, -/obj/item/clothing/shoes/winterboots/ice_boots, -/obj/item/clothing/shoes/winterboots/ice_boots, -/obj/item/clothing/suit/armor/tiered/hooded/wintercoat/cargo{ - name = "NCR winter coat" - }, -/obj/item/clothing/suit/armor/tiered/hooded/wintercoat/cargo{ - name = "NCR winter coat" - }, -/obj/item/clothing/suit/armor/tiered/hooded/wintercoat/cargo{ - name = "NCR winter coat" - }, -/obj/item/clothing/suit/armor/tiered/hooded/wintercoat/cargo{ - name = "NCR winter coat" - }, -/obj/item/clothing/suit/armor/tiered/hooded/wintercoat/cargo{ - name = "NCR winter coat" - }, -/obj/item/clothing/suit/armor/tiered/hooded/wintercoat/cargo{ - name = "NCR winter coat" - }, -/obj/item/clothing/suit/armor/tiered/hooded/wintercoat/cargo{ - name = "NCR winter coat" - }, -/obj/item/clothing/suit/armor/tiered/hooded/wintercoat/cargo{ - name = "NCR winter coat" - }, -/obj/item/clothing/suit/armor/tiered/hooded/wintercoat/cargo{ - name = "NCR winter coat" - }, -/obj/item/clothing/suit/armor/tiered/hooded/wintercoat/cargo{ - name = "NCR winter coat" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/shoes/f13/mutie/boots/ncr/ranger, -/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, -/turf/open/floor/wood_wide, -/area/f13/ncr) "df" = ( /obj/structure/simple_door/bunker, /obj/structure/barricade/wooden/planks, @@ -1094,10 +944,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"di" = ( -/obj/structure/flora/rock/jungle, -/turf/open/floor/plating/dirt, -/area/f13/caves) "dj" = ( /obj/structure/lattice/catwalk, /obj/structure/campfire/barrel, @@ -1195,16 +1041,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/blue/side, /area/f13/building/powered) -"dA" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/structure/fluff{ - icon = 'icons/fallout/objects/cave_decor.dmi'; - icon_state = "boards_mammoth_we-3"; - name = "planks"; - desc = "planks to keep your shoes clean of mud" - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) "dB" = ( /obj/structure/simple_door/glass, /turf/open/floor/wood_common, @@ -1216,9 +1052,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/purple, /area/f13/building/powered) -"dD" = ( -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "dE" = ( /obj/structure/table/wood/junk, /obj/item/radio/old, @@ -1254,9 +1087,6 @@ }, /turf/open/floor/wood_wide, /area/f13/followers) -"dL" = ( -/turf/open/floor/plating/dirt, -/area/f13/caves) "dM" = ( /obj/structure/simple_door/bunker, /turf/open/floor/f13{ @@ -1307,20 +1137,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"dU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood{ - icon_state = "floor6"; - pixel_x = -18; - pixel_y = 15 - }, -/obj/effect/decal/cleanable/ash{ - pixel_x = -9; - pixel_y = 13 - }, -/obj/structure/fluff/rug/rug_rubber, -/turf/open/floor/wood_common, -/area/f13/ncr) "dV" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -1364,10 +1180,7 @@ /turf/open/floor/carpet/blue, /area/f13/followers) "ec" = ( -/obj/structure/fluff/railing{ - dir = 4 - }, -/turf/open/floor/plating/f13/outside/roof/metal/corrugated, +/turf/open/floor/plating/f13/outside/roof/red, /area/f13/wasteland) "ee" = ( /obj/effect/decal/cleanable/dirt, @@ -1442,11 +1255,13 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) "eq" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18 }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "er" = ( /turf/open/floor/wood_common/wood_common_light, /area/f13/wasteland) @@ -1598,9 +1413,11 @@ }, /area/f13/building/powered) "eO" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/dirt{ + dir = 5; + icon_state = "dirt" + }, +/area/f13/wasteland) "eP" = ( /turf/closed/wall/mineral/wood, /area/f13/ambientlighting/building/d) @@ -1678,13 +1495,9 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "fb" = ( -/obj/structure/sign/poster/ncr/loaded{ - pixel_y = 32 - }, -/turf/open/floor/wood_wide{ - icon_state = "wide-broken1" - }, -/area/f13/ncr) +/obj/structure/fluff/railing/corner, +/turf/open/transparent/openspace, +/area/f13/wasteland) "fc" = ( /obj/structure/simple_door/bunker/glass, /turf/open/floor/f13{ @@ -1694,12 +1507,15 @@ }, /area/f13/building/powered) "fd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - color = "#A47449" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 }, -/turf/open/floor/wood_common, -/area/f13/ncr) +/obj/structure/closet/crate/large, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "fe" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -1784,13 +1600,6 @@ /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/carpet, /area/f13/ambientlighting/building/c) -"fq" = ( -/obj/effect/decal/cleanable/blood{ - dir = 5; - icon_state = "tracks" - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "fr" = ( /obj/item/clothing/head/welding/weldingjapan, /obj/effect/decal/cleanable/dirt{ @@ -1865,6 +1674,10 @@ /obj/structure/wreck/trash/one_tire, /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland) +"fB" = ( +/obj/item/cultivator/rake, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "fD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, @@ -1912,22 +1725,6 @@ /obj/item/reagent_containers/food/snacks/f13/fancylads, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) -"fL" = ( -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) -"fM" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt, -/obj/structure/fluff{ - icon = 'icons/fallout/objects/cave_decor.dmi'; - icon_state = "boards_drought_we-3"; - name = "planks"; - desc = "planks to keep your shoes clean of mud" - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) "fN" = ( /turf/closed/wall/rust, /area/f13/brotherhood/offices1st) @@ -1949,8 +1746,11 @@ /turf/open/floor/wood_wide, /area/f13/legioncamp) "fR" = ( -/turf/open/floor/wood_common, -/area/f13/ncr) +/obj/structure/fluff/railing{ + dir = 10 + }, +/turf/open/transparent/openspace, +/area/f13/wasteland) "fS" = ( /obj/structure/window/fulltile/house, /turf/open/indestructible/ground/outside/desert, @@ -1964,13 +1764,6 @@ "fU" = ( /turf/open/transparent/openspace, /area/f13/building/abandoned/m) -"fV" = ( -/obj/structure/flora/grass/brown{ - pixel_x = -6; - pixel_y = 12 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "fW" = ( /obj/effect/turf_decal/bot_red, /obj/effect/decal/cleanable/dirt/dust, @@ -1980,12 +1773,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"fX" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/turf/open/transparent/openspace, -/area/f13/wasteland) "fY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table_frame, @@ -2124,20 +1911,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/purple, /area/f13/building/powered) -"gs" = ( -/obj/structure/table/wood, -/obj/item/lighter{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/storage/fancy/cigarettes/cigpack_bigboss{ - pixel_x = 10 - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "gt" = ( /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/z) +"gu" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "gv" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/securitron/sentrybot/pristine, @@ -2166,6 +1948,10 @@ dir = 8 }, /area/f13/building/powered) +"gB" = ( +/obj/structure/flora/wasteplant/wild_yucca, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "gC" = ( /obj/machinery/vending/autodrobe{ force_free = 1 @@ -2218,13 +2004,6 @@ /obj/item/clothing/head/cowboyhat/black, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) -"gH" = ( -/obj/structure/fence/wooden{ - pixel_x = 13; - density = 0 - }, -/turf/open/transparent/openspace, -/area/f13/ncr) "gI" = ( /obj/machinery/light/small{ dir = 4; @@ -2346,10 +2125,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"ha" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_wide, -/area/f13/ncr) "hc" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, @@ -2371,39 +2146,30 @@ "hf" = ( /turf/closed/wall/mineral/wood, /area/f13/legioncamp) -"hh" = ( -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken5" +"hg" = ( +/obj/structure/barricade/tentclothedge{ + dir = 4 }, -/area/f13/ncr) +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/obj/structure/barricade/tentclothedge{ + dir = 4; + pixel_x = 15; + pixel_y = 12; + layer = 5 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "hj" = ( /obj/structure/table, /obj/item/book/granter/crafting_recipe/gunsmith_three, /turf/open/floor/plating/rust, /area/f13/building/powered) -"hk" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "hl" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 11 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) -"hn" = ( -/obj/structure/closet/crate/bin/trashbin{ - pixel_x = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/wooden, -/area/f13/ncr) +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "ho" = ( /obj/structure/rack/large/shelf_rust, /obj/effect/spawner/lootdrop/clothing_middle, @@ -2447,23 +2213,9 @@ icon_state = "tunnelrusty" }, /area/f13/building/powered) -"hv" = ( -/obj/structure/flora/grass/brown{ - pixel_x = -6 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "hw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bucket{ - pixel_y = 17; - pixel_x = -8 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "hx" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -2552,29 +2304,6 @@ /obj/effect/spawner/lootdrop/f13/attachments, /turf/open/floor/plating/rust, /area/f13/building/powered) -"hL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack, -/obj/item/radio/tribal{ - pixel_x = 3; - pixel_y = 17 - }, -/obj/item/reagent_containers/glass/beaker/waterbottle{ - pixel_x = 4 - }, -/obj/item/reagent_containers/glass/beaker/waterbottle{ - pixel_x = -2; - pixel_y = -4 - }, -/obj/item/smelling_salts{ - pixel_x = 7; - pixel_y = -4 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "hM" = ( /obj/item/bedsheet/blanket/blanketalt{ layer = -7 @@ -2606,17 +2335,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"hP" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/structure/flora/rock/pile/largejungle{ - icon_state = "bush2"; - pixel_x = -13; - pixel_y = -4 - }, -/turf/open/indestructible/ground/outside/water, -/area/f13/caves) "hQ" = ( /obj/structure/curtain{ color = "#845f58"; @@ -2631,13 +2349,6 @@ /obj/structure/simple_door/bunker, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/building/powered) -"hU" = ( -/obj/structure/sign/departments/medbay/alt{ - name = "TRIAGE" - }, -/obj/structure/decoration/rag, -/turf/closed/wall/f13/wood, -/area/f13/ncr) "hW" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -2692,6 +2403,14 @@ /obj/item/mop, /turf/open/floor/wood_fancy, /area/maintenance/bar) +"id" = ( +/obj/machinery/hydroponics/soil, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"ie" = ( +/obj/structure/flora/tree/tall, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "if" = ( /mob/living/simple_animal/hostile/handy/gutsy/flamer, /turf/open/floor/plasteel/f13/vault_floor/blue/side{ @@ -2791,15 +2510,19 @@ dir = 1 }, /area/f13/building/powered) -"iu" = ( -/obj/structure/table/wood, -/turf/open/floor/plating/f13/outside/roof/wood/old, +"iv" = ( +/obj/structure/flora/grass/coyote/six, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "iw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/sofa, /turf/open/floor/carpet/red, /area/maintenance/bar) +"ix" = ( +/obj/structure/rack, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "iy" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 4 @@ -2837,12 +2560,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, /area/maintenance/bar) -"iI" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "iJ" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low, @@ -2942,12 +2659,6 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) -"jd" = ( -/obj/structure/chair/folding{ - dir = 8 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "je" = ( /obj/structure/window/fulltile/house/broken, /obj/structure/barricade/bars, @@ -2965,19 +2676,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"jg" = ( -/obj/structure/table/booth, -/obj/machinery/computer/terminal{ - dir = 1; - pixel_y = 3; - pixel_x = 5 - }, -/obj/machinery/light/small{ - dir = 4; - light_color = "#ff4747" - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "ji" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, @@ -3043,6 +2741,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"jr" = ( +/obj/structure/shelf_wood, +/obj/item/book/random, +/obj/item/book/random, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "js" = ( /obj/structure/window/fulltile/store{ icon_state = "storewindowbottom" @@ -3099,12 +2803,6 @@ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/m) -"jA" = ( -/obj/structure/fireplace, -/turf/open/indestructible/ground/outside/ruins{ - name = "cobblestone floor" - }, -/area/f13/ncr) "jB" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/big{ @@ -3132,10 +2830,6 @@ }, /turf/open/transparent/openspace, /area/f13/building/abandoned/m) -"jE" = ( -/obj/structure/flora/grass/brown, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "jF" = ( /obj/machinery/light{ dir = 8; @@ -3204,9 +2898,24 @@ }, /area/f13/building/powered) "jQ" = ( -/obj/structure/flora/grass/both, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/structure/barricade/tentclothcorner, +/obj/effect/overlay/desert/sonora/edge{ + dir = 9 + }, +/obj/structure/barricade/tentclothedge{ + dir = 4; + pixel_x = 15; + pixel_y = 12; + layer = 5 + }, +/obj/item/paper/crumpled{ + name = "tied crude paper"; + desc = "A piece of paper with a hole near the top, tied to the wooden fence using a leather strip."; + info = "It's been days since they dug in and we blew the tunnel, trapping ourselves up here. We were finally forced to feed on horse. We'll last a while like this but--When the horses run out? I have no idea what happens."; + anchored = 1 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "jR" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 1; @@ -3348,6 +3057,23 @@ icon_state = "housebase4-broken" }, /area/f13/wasteland) +"kp" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -20; + pixel_x = -7 + }, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirtcorner" + }, +/area/f13/wasteland) "kq" = ( /turf/open/floor/f13/wood{ icon_state = "oakfloor3-broken" @@ -3507,6 +3233,10 @@ "kP" = ( /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) +"kQ" = ( +/obj/structure/flora/grass/coyote/thirteen, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "kR" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/floor/f13{ @@ -3521,6 +3251,12 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +"kU" = ( +/obj/structure/simple_door/tentflap_cloth{ + pixel_y = -3 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "kV" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -3539,18 +3275,6 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) -"kW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/toolbox/ammo{ - pixel_y = 16; - pixel_x = 3 - }, -/obj/item/storage/toolbox/ammo{ - pixel_y = 10; - pixel_x = -6 - }, -/turf/open/floor/wood_wide, -/area/f13/ncr) "kX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -3610,17 +3334,6 @@ color = "#c5bab2" }, /area/f13/building/abandoned/z) -"lh" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/plating/dirt/dark, -/area/f13/caves) -"li" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "lj" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -3704,12 +3417,6 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) -"ls" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/turf/open/transparent/openspace, -/area/f13/caves) "lt" = ( /obj/machinery/light/fo13colored/Red{ dir = 4 @@ -3739,13 +3446,6 @@ "lw" = ( /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland) -"lx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "ly" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -3788,11 +3488,9 @@ /turf/open/floor/f13/wood, /area/f13/ncr) "lE" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_wide{ - icon_state = "wide-broken4" - }, -/area/f13/ncr) +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland) "lF" = ( /obj/structure/railing, /obj/machinery/light/small{ @@ -3864,10 +3562,6 @@ /obj/machinery/light/small/broken, /turf/open/floor/wood_common, /area/f13/clinic) -"lQ" = ( -/obj/structure/flora/ausbushes/fullgrass, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "lR" = ( /obj/structure/railing{ dir = 10 @@ -3911,26 +3605,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"lY" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 8 - }, -/obj/structure/table, -/obj/item/tank/internals/anesthetic, -/obj/item/tank/internals/anesthetic{ - pixel_y = -2; - pixel_x = 4 - }, -/obj/item/clothing/mask/breath/medical, -/obj/item/clothing/mask/breath/medical{ - pixel_x = 3; - pixel_y = -2 - }, -/turf/open/floor/wood_common{ - icon_state = "common-broken2" - }, -/area/f13/ncr) "lZ" = ( /obj/structure/falsewall/rust, /turf/open/floor/f13{ @@ -3981,12 +3655,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"mg" = ( -/obj/structure/sign/departments/medbay/alt{ - name = "TRIAGE" - }, -/turf/closed/wall/f13/wood, -/area/f13/ncr) "mh" = ( /obj/machinery/door/window{ dir = 1 @@ -3997,26 +3665,10 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"mi" = ( -/obj/structure/chair/folding, -/turf/open/floor/wood_common, -/area/f13/ncr) "mj" = ( /obj/machinery/vending/snack, /turf/open/floor/wood_common, /area/engine/workshop) -"mk" = ( -/obj/structure/fluff/rails, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/floor/plating/tunnel{ - icon_state = "tunnelchess2" - }, -/area/f13/caves) "ml" = ( /obj/effect/decal/remains/human, /obj/item/clothing/head/f13/enclave/peacekeeper, @@ -4044,10 +3696,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"mp" = ( -/obj/structure/fluff/hedge, -/turf/open/floor/wood_common, -/area/f13/ncr) "mq" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8 @@ -4084,6 +3732,9 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/plating/rust, /area/f13/building/powered) +"mx" = ( +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "my" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -4135,6 +3786,12 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +"mD" = ( +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) "mE" = ( /turf/open/transparent/openspace{ name = "air"; @@ -4190,6 +3847,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/c) +"mM" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirt" + }, +/area/f13/ambientlighting/building/u) "mN" = ( /obj/structure/bed/old, /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, @@ -4243,11 +3909,10 @@ }, /area/f13/building/powered) "mW" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 +/turf/open/indestructible/ground/outside/dirt{ + dir = 1; + icon_state = "dirtcorner" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/f13/outside/roof/wood/old, /area/f13/wasteland) "mX" = ( /obj/structure/weightmachine/stacklifter, @@ -4266,16 +3931,14 @@ /area/f13/ambientlighting/building/c) "mZ" = ( /obj/effect/turf_decal/weather/dirt{ - dir = 6 + dir = 1 }, -/obj/structure/flora/grass/wasteland, /turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) -"nc" = ( -/obj/structure/barricade/sandbags, -/obj/structure/table/wood, -/turf/open/floor/plating/dirt, -/area/f13/caves) +/area/f13/wasteland) +"ne" = ( +/obj/structure/flora/branch, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "nh" = ( /obj/effect/turf_decal/big{ dir = 1 @@ -4319,10 +3982,6 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) -"nn" = ( -/obj/structure/barricade/wooden, -/turf/closed/wall/f13/wood, -/area/f13/caves) "no" = ( /obj/structure/fluff/railing{ dir = 4 @@ -4407,14 +4066,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) -"nF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fluff/rug/rug_rubber{ - icon = 'icons/fallout/objects/64x64_rugs.dmi'; - icon_state = "rug_fancy" - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "nG" = ( /turf/open/floor/carpet/royalblack, /area/f13/clinic) @@ -4437,19 +4088,14 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/side, /area/f13/building/powered) "nK" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 +/obj/structure/barricade/tentclothedge{ + dir = 4 }, -/turf/open/transparent/openspace, -/area/f13/wasteland) -"nL" = ( -/obj/item/newspaper{ - pixel_x = -6; - pixel_y = 6 +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirt" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/red, -/area/f13/ncr) +/area/f13/ambientlighting/building/u) "nM" = ( /turf/closed/wall/f13/wood, /area/f13/ambientlighting/building/e) @@ -4482,14 +4128,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) -"nS" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 4; - layer = 4.1 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "nU" = ( /obj/effect/decal/cleanable/blood/gibs, /obj/structure/lattice, @@ -4515,23 +4153,11 @@ "nX" = ( /turf/open/indestructible, /area/f13/tcoms) -"nY" = ( -/obj/item/reagent_containers/glass/bucket/wood{ - pixel_y = 17; - pixel_x = -8 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "nZ" = ( /obj/structure/barricade/wooden, /obj/structure/simple_door/metal/dirtystore, /turf/open/floor/plating/rust, /area/f13/brotherhood/offices1st) -"oa" = ( -/turf/open/floor/plating/wooden{ - icon_state = "housebase4-broken" - }, -/area/f13/ncr) "ob" = ( /obj/structure/curtain{ color = "#845f58"; @@ -4558,6 +4184,11 @@ name = "dirty floor" }, /area/f13/building/powered) +"od" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland) "oe" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 1; @@ -4642,12 +4273,6 @@ }, /turf/open/floor/carpet/royalblue, /area/f13/building/powered) -"op" = ( -/obj/structure/railing{ - color = "#A47449" - }, -/turf/open/transparent/openspace, -/area/f13/ncr) "oq" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/f13/cash_random_med, @@ -4660,6 +4285,10 @@ color = "#c5bab2" }, /area/f13/building/abandoned/z) +"ot" = ( +/obj/machinery/autolathe/ammo/unlocked_basic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "ou" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/big{ @@ -4701,11 +4330,12 @@ /turf/open/floor/carpet/royalblack, /area/f13/clinic) "oA" = ( -/obj/structure/window/fulltile/wood, -/obj/structure/barricade/bars, -/obj/structure/curtain, -/turf/open/floor/wood_common, -/area/f13/ncr) +/obj/structure/closet/crate/footlocker, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/effect/spawner/lootdrop/f13/cash_random_med, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "oB" = ( /obj/machinery/autolathe, /obj/machinery/light{ @@ -4771,14 +4401,6 @@ dir = 6 }, /area/f13/building/powered) -"oL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8; - light_color = "#ff4747" - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "oM" = ( /obj/structure/wreck/trash/machinepile, /obj/machinery/light/fo13colored/Red{ @@ -4831,15 +4453,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"oT" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/indestructible/ground/outside/water, -/area/f13/caves) "oU" = ( /obj/structure/window/fulltile/house{ opacity = 1 @@ -4858,11 +4471,6 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) -"oW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/unpowered/secure_NCR, -/turf/open/floor/wood_common, -/area/f13/ncr) "oX" = ( /obj/effect/landmark/poster_spawner/prewar, /turf/closed/indestructible/rock{ @@ -4897,6 +4505,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"pb" = ( +/obj/structure/campfire, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "pc" = ( /obj/structure/simple_door/bunker, /obj/effect/turf_decal/bot, @@ -4919,12 +4531,20 @@ /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland) "pg" = ( -/obj/machinery/light/small{ - dir = 1; - light_color = "#ff4747" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 }, -/turf/open/transparent/openspace, -/area/f13/ncr) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "ph" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -5046,21 +4666,12 @@ /turf/open/floor/wood_wide/wood_wide_light, /area/engine/workshop) "px" = ( -/obj/structure/filingcabinet{ - pixel_x = 11 - }, -/obj/structure/filingcabinet{ - pixel_x = 1 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) -"py" = ( -/obj/structure/decoration/rag{ - icon_state = "skin"; - pixel_y = 2 +/obj/effect/turf_decal/weather/dirt{ + dir = 4 }, -/turf/closed/wall/f13/wood, -/area/f13/ncr) +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "pz" = ( /obj/item/kirbyplants/random, /turf/open/floor/f13{ @@ -5217,17 +4828,20 @@ /obj/structure/simple_door/glass, /turf/open/floor/wood_common, /area/engine/workshop) +"pY" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -3 + }, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "pZ" = ( /obj/machinery/vending/robotics, /turf/open/floor/f13{ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"qa" = ( -/obj/structure/flora/rock/pile/largejungle, -/obj/structure/car, -/turf/open/floor/plating/dirt, -/area/f13/caves) "qb" = ( /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) @@ -5428,14 +5042,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) -"qG" = ( -/obj/machinery/vending/snack, -/obj/machinery/light/small{ - dir = 4; - light_color = "#ff4747" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "qH" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -5449,13 +5055,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) -"qJ" = ( -/obj/structure/window/fulltile/wood, -/obj/structure/curtain{ - color = "#808080" - }, -/turf/open/floor/f13/wood, -/area/f13/ncr) "qK" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -5709,26 +5308,6 @@ /obj/item/storage/toolbox/electrical, /turf/open/floor/plating/rust, /area/f13/building/powered) -"rw" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/ash{ - pixel_x = 7; - pixel_y = -7 - }, -/obj/item/reagent_containers/medspray/sterilizine{ - pixel_x = -9; - pixel_y = 8 - }, -/obj/item/reagent_containers/medspray/silver_sulf{ - pixel_y = 5; - pixel_x = -5 - }, -/obj/item/reagent_containers/glass/rag{ - pixel_x = 5; - pixel_y = 6 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "rx" = ( /obj/structure/curtain{ color = "#845f58"; @@ -5802,10 +5381,6 @@ }, /turf/open/transparent/openspace, /area/f13/brotherhood/offices1st) -"rJ" = ( -/obj/structure/barricade/wooden/planks, -/turf/closed/wall/f13/wood, -/area/f13/caves) "rK" = ( /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) @@ -5830,6 +5405,12 @@ /obj/item/clothing/suit/armor/outfit/jacket/jamrock, /turf/open/floor/carpet/red, /area/f13/ambientlighting/building/c) +"rN" = ( +/obj/structure/chair/bench{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "rO" = ( /obj/structure/table/wood/settler, /obj/item/storage/backpack/duffelbag/med/surgery/primitive, @@ -5947,26 +5528,20 @@ }, /turf/open/floor/plating, /area/engine/workshop) -"si" = ( -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) "sj" = ( -/obj/structure/table/booth, -/obj/item/folder{ - pixel_x = -6; - pixel_y = 2 - }, -/obj/item/paper_bin{ - pixel_x = 9; - pixel_y = 3 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 }, -/obj/item/pen{ - pixel_x = 8; - pixel_y = 3 +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18 }, -/turf/open/floor/wood_common, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "sl" = ( /obj/effect/spawner/lootdrop/trash, /obj/effect/decal/cleanable/dirt{ @@ -6031,11 +5606,6 @@ /obj/item/reagent_containers/hypospray/medipen/stimpak, /turf/open/floor/plating/rust, /area/f13/building/powered) -"su" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/generic, -/turf/open/floor/wood_common, -/area/f13/ncr) "sv" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/supermutant/nightkin/rangedmutant, @@ -6054,6 +5624,19 @@ name = "dirty floor" }, /area/f13/building/powered) +"sx" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"sy" = ( +/obj/machinery/workbench, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "sz" = ( /obj/structure/table_frame, /obj/item/stack/sheet/metal, @@ -6112,6 +5695,10 @@ }, /turf/open/floor/wood_common, /area/f13/followers) +"sG" = ( +/obj/structure/flora/tree/joshua, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "sH" = ( /mob/living/simple_animal/hostile/handy/gutsy/flamer, /obj/effect/decal/cleanable/blood/splatter, @@ -6251,6 +5838,10 @@ icon_state = "common-broken5" }, /area/maintenance/bar) +"td" = ( +/obj/structure/flora/brushwood, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "te" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/remains/human, @@ -6324,13 +5915,8 @@ /turf/closed/wall/f13/wood/house, /area/maintenance/bar) "ts" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) "tu" = ( /obj/effect/decal/cleanable/dirt, @@ -6387,6 +5973,10 @@ icon_state = "floordirty" }, /area/f13/building/abandoned/j) +"tD" = ( +/obj/structure/sink/puddle, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "tE" = ( /obj/effect/decal/cleanable/blood/splatter, /mob/living/simple_animal/hostile/radroach, @@ -6411,6 +6001,11 @@ /obj/item/paper_bin, /turf/open/floor/holofloor/carpet, /area/f13/ambientlighting/building/e) +"tH" = ( +/obj/structure/shelf_wood, +/obj/effect/spawner/lootdrop/f13/cash_random_high, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "tI" = ( /obj/structure/railing{ color = "#A47449"; @@ -6565,29 +6160,6 @@ icon_state = "greenrustyfull" }, /area/f13/followers) -"uf" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gibmid1" - }, -/obj/structure/flora/rock/jungle{ - icon_state = "rock3"; - pixel_x = -3 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) -"ug" = ( -/obj/structure/fluff/rails, -/obj/structure/fluff{ - icon = 'icons/fallout/objects/cave_decor.dmi'; - icon_state = "minecart_fallen"; - name = "minecart"; - desc = "a toppled over minecart, filled with useless rocks" - }, -/turf/open/floor/plating/dirt/dark, -/area/f13/caves) "uh" = ( /obj/machinery/pool/drain, /obj/effect/decal/cleanable/dirt, @@ -6778,17 +6350,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"uI" = ( -/obj/machinery/sleeper, -/turf/open/floor/wood_common, -/area/f13/ncr) -"uJ" = ( -/obj/structure/fluff/rails{ - icon_state = "rails-r"; - dir = 8 - }, -/turf/open/floor/plating/dirt, -/area/f13/caves) "uK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/wood, @@ -6983,24 +6544,11 @@ /obj/structure/wreck/trash/brokenvendor, /turf/open/floor/plating/rust, /area/f13/building/powered) -"vi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "vj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) -"vk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood{ - dir = 8; - icon_state = "tracks" - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "vl" = ( /mob/living/simple_animal/hostile/securitron/sentrybot, /turf/open/floor/f13{ @@ -7009,6 +6557,18 @@ name = "dirty floor" }, /area/f13/building/powered) +"vm" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) "vn" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -7038,13 +6598,6 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) -"vs" = ( -/obj/structure/decoration/rag{ - icon_state = "skin"; - layer = 5.0 - }, -/turf/closed/wall/f13/wood, -/area/f13/caves) "vv" = ( /obj/machinery/light/fo13colored/Red{ dir = 8 @@ -7098,15 +6651,6 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) -"vC" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/f13/attachments, -/obj/effect/spawner/lootdrop/f13/attachments, -/obj/effect/spawner/lootdrop/f13/attachments, -/turf/open/floor/f13/wood{ - icon_state = "housebase4-broken" - }, -/area/f13/ncr) "vD" = ( /obj/machinery/light/fo13colored/Red, /obj/effect/decal/cleanable/blood/old, @@ -7157,13 +6701,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"vJ" = ( -/obj/structure/flora/grass/brown{ - pixel_x = 9; - pixel_y = 11 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "vK" = ( /obj/structure/window/fulltile/house/broken, /obj/structure/barricade/wooden/planks/pregame, @@ -7287,9 +6824,15 @@ /turf/open/floor/mineral/titanium/white, /area/f13/clinic) "wc" = ( -/obj/structure/flora/junglebush/b, -/turf/open/floor/plating/dirt/dark, -/area/f13/caves) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/obj/structure/flora/branch_broken, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "we" = ( /obj/structure/table, /obj/structure/railing/dancing_pole{ @@ -7510,6 +7053,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) +"wJ" = ( +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "wM" = ( /obj/structure/table/booth, /turf/open/floor/f13/wood{ @@ -7534,10 +7080,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"wP" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "wQ" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -7569,6 +7111,17 @@ /obj/structure/lattice/catwalk, /turf/open/transparent/openspace, /area/f13/wasteland) +"wU" = ( +/turf/open/indestructible/ground/outside/ruins{ + dir = 5; + icon_state = "rubbleplate" + }, +/area/f13/wasteland) +"wV" = ( +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt" + }, +/area/f13/wasteland) "wW" = ( /turf/closed/indestructible/f13vaultrusted, /area/f13/wasteland) @@ -7629,11 +7182,6 @@ dir = 8 }, /area/f13/building/powered) -"xf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/wood_common, -/area/f13/ncr) "xg" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -7652,14 +7200,6 @@ }, /turf/open/transparent/openspace, /area/f13/ambientlighting/building/p) -"xi" = ( -/obj/structure/fluff{ - icon = 'icons/fallout/objects/cave_decor.dmi'; - icon_state = "support_wall_broken"; - name = "support wall" - }, -/turf/closed/mineral/random/low_chance, -/area/f13/wasteland) "xj" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -7670,6 +7210,11 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +"xk" = ( +/obj/structure/bed/wooden, +/obj/item/bedsheet/cult, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "xl" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/advcrafting, @@ -7792,9 +7337,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"xE" = ( -/turf/closed/indestructible/rock, -/area/f13/caves) "xF" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4; @@ -7876,10 +7418,6 @@ }, /turf/open/floor/plating, /area/f13/bar) -"xS" = ( -/obj/structure/fluff/rails, -/turf/open/floor/plating/dirt/dark, -/area/f13/caves) "xT" = ( /obj/structure/simple_door/house/clean, /turf/open/floor/wood_fancy, @@ -7901,13 +7439,9 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"xW" = ( -/obj/structure/fence/wooden{ - dir = 4; - icon_state = "post_wood" - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) +"xX" = ( +/turf/closed/mineral/random/low_chance, +/area/f13/caves) "xY" = ( /obj/machinery/photocopier, /turf/open/floor/f13{ @@ -7968,13 +7502,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"yl" = ( -/obj/structure/window/fulltile/wood, -/obj/structure/curtain{ - color = "#808080" - }, -/turf/open/floor/wood_wide, -/area/f13/ncr) "ym" = ( /obj/structure/dresser, /obj/structure/sign/poster/contraband/pinup_couch{ @@ -7996,6 +7523,12 @@ /obj/item/toy/plush/beeplushie, /turf/open/floor/carpet, /area/f13/ambientlighting/building/c) +"yp" = ( +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt"; + dir = 6 + }, +/area/f13/wasteland) "yq" = ( /obj/effect/decal/cleanable/ash/large, /turf/open/floor/f13{ @@ -8127,6 +7660,12 @@ "yJ" = ( /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/c) +"yK" = ( +/obj/structure/fluff/railing/corner{ + dir = 1 + }, +/turf/open/transparent/openspace, +/area/f13/wasteland) "yL" = ( /obj/structure/rack/shelf_metal, /obj/item/stock_parts/cell/ammo/mfc, @@ -8152,14 +7691,6 @@ dir = 1 }, /area/f13/building/powered) -"yO" = ( -/obj/structure/flora/grass/jungle/b{ - icon_state = "grassb3"; - pixel_x = -5; - pixel_y = 1 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) "yP" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/remains/human, @@ -8272,16 +7803,16 @@ /obj/item/kirbyplants/random, /turf/open/floor/plasteel/f13, /area/f13/wasteland) -"zf" = ( -/obj/structure/fluff/hedge, -/turf/open/floor/wood_common{ - icon_state = "common-broken2" - }, -/area/f13/ncr) "zg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) +"zh" = ( +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirt" + }, +/area/f13/ambientlighting/building/u) "zi" = ( /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/wasteland) @@ -8445,12 +7976,6 @@ }, /turf/open/floor/wood_common, /area/f13/clinic) -"zJ" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "zL" = ( /obj/machinery/computer/rdconsole/core, /obj/effect/decal/cleanable/dirt/dust, @@ -8488,25 +8013,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"zQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_y = 11; - pixel_x = -2 - }, -/obj/item/reagent_containers/medspray/sterilizine{ - pixel_x = -9; - pixel_y = 4 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) -"zR" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "zS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/sofa/corp{ @@ -8525,11 +8031,10 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) "zU" = ( -/obj/structure/bookcase/random{ - icon_state = "bookempty" - }, -/turf/open/floor/wood_common, -/area/f13/ncr) +/obj/structure/rack, +/obj/effect/spawner/lootdrop/f13/weapon/melee/random_high, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "zV" = ( /obj/structure/rack/shelf_metal, /obj/item/storage/toolbox/emergency, @@ -8637,12 +8142,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, /area/maintenance/bar) -"Aj" = ( -/obj/structure/flora/grass/both{ - icon_state = "snowgrass_esw" - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "Al" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ @@ -8679,14 +8178,9 @@ }, /area/f13/building/powered) "Aq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/optable, -/obj/effect/decal/cleanable/blood{ - icon_state = "gib1"; - pixel_y = -6 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "Ar" = ( /obj/structure/railing{ dir = 1 @@ -8711,26 +8205,6 @@ "At" = ( /turf/open/floor/plasteel/f13, /area/f13/wasteland) -"Au" = ( -/obj/structure/table/wood, -/obj/item/lighter{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/storage/fancy/cigarettes/cigpack_bigboss{ - pixel_x = 10 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/toy/cards/deck/unum{ - pixel_y = 12; - pixel_x = -7 - }, -/obj/item/radio/tribal{ - pixel_x = -4; - pixel_y = 1 - }, -/turf/open/floor/carpet/red, -/area/f13/ncr) "Av" = ( /obj/item/clothing/head/f13/enclave/peacekeeper, /obj/effect/decal/cleanable/dirt, @@ -8789,6 +8263,11 @@ "AE" = ( /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite, /area/f13/brotherhood/offices1st) +"AF" = ( +/obj/structure/shelf_wood, +/obj/effect/spawner/lootdrop/f13/weapon/melee/random_high, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "AH" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/f13{ @@ -8831,12 +8310,6 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/f13/wood, /area/f13/ncr) -"AQ" = ( -/obj/structure/barricade/bars, -/obj/structure/curtain, -/obj/structure/window/fulltile/wood/broken, -/turf/open/floor/wood_common, -/area/f13/ncr) "AR" = ( /obj/structure/debris/v3, /obj/effect/decal/cleanable/blood/splatter, @@ -8882,13 +8355,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, /area/maintenance/bar) -"AY" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6; - icon_state = "snow_corner" - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "AZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/ash, @@ -8944,6 +8410,10 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite, /area/f13/brotherhood/offices1st) +"Bk" = ( +/obj/structure/legion_extractor, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "Bl" = ( /obj/structure/lattice/catwalk, /obj/structure/table/wood, @@ -8997,6 +8467,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"Br" = ( +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins{ + icon_state = "rubbleplate" + }, +/area/f13/wasteland) "Bs" = ( /turf/open/floor/plating/f13/outside/roof/metal/verdigris, /area/f13/wasteland) @@ -9072,17 +8548,6 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) -"BD" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/structure/barricade/sandbags, -/obj/structure/table/wood, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) "BE" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -9113,6 +8578,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/purple, /area/f13/ambientlighting/building/c) +"BI" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirtcorner" + }, +/area/f13/wasteland) "BJ" = ( /obj/structure/debris/v1, /turf/open/floor/f13{ @@ -9236,13 +8712,14 @@ }, /area/f13/brotherhood/offices1st) "BZ" = ( -/obj/item/newspaper{ - pixel_x = -6; - pixel_y = 6 +/obj/structure/barricade/tentclothedge{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt"; + dir = 4 + }, +/area/f13/ambientlighting/building/u) "Ca" = ( /obj/structure/railing, /turf/open/transparent/openspace, @@ -9305,38 +8782,11 @@ /turf/open/transparent/openspace, /area/f13/brotherhood/offices1st) "Cj" = ( -/obj/structure/rack, -/obj/item/gun/ballistic/automatic/m1garand, -/obj/item/ammo_box/magazine/m556/rifle/empty{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/ammo_box/magazine/m556/rifle/empty{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/ammo_box/magazine/m556/rifle/empty{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/ammo_box/magazine/m556/rifle/empty{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/ammo_box/magazine/m556/rifle{ - pixel_y = -7; - pixel_x = -5 - }, -/obj/item/ammo_box/magazine/m556/rifle{ - pixel_y = -7; - pixel_x = -5 - }, -/obj/item/ammo_box/magazine/m556/rifle{ - pixel_y = -7; - pixel_x = -5 +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirt" }, -/turf/open/floor/wood_wide, -/area/f13/ncr) +/area/f13/wasteland) "Ck" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/f13/wood/house, @@ -9404,12 +8854,6 @@ /obj/item/stack/f13Cash/denarius, /turf/open/floor/f13/wood, /area/f13/legioncamp) -"Cr" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken2" - }, -/area/f13/ncr) "Cs" = ( /turf/closed/wall/f13/wood/house/broken, /area/f13/bar) @@ -9480,13 +8924,6 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) -"CD" = ( -/obj/machinery/door/unpowered/secure_NCR{ - color = "#e8e4ca"; - name = "Ranger Lodge" - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "CE" = ( /turf/closed/wall/f13/tentwall{ icon_state = "tent5" @@ -9585,15 +9022,6 @@ /obj/structure/barricade/wooden/strong, /turf/closed/wall/f13/wood/house, /area/f13/legioncamp) -"CX" = ( -/obj/structure/bed/wooden, -/obj/item/bedsheet/blanket, -/obj/machinery/light/small{ - dir = 8; - light_color = "#ff4747" - }, -/turf/open/floor/carpet, -/area/f13/ncr) "CY" = ( /obj/structure/table/wood/settler, /obj/item/storage/belt/fannypack/pink, @@ -9616,9 +9044,6 @@ dir = 1 }, /area/f13/building/powered) -"Db" = ( -/turf/open/floor/plating/wooden, -/area/f13/ncr) "Dc" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -9769,13 +9194,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"Dx" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 9 - }, -/turf/open/transparent/openspace, -/area/f13/ncr) "Dz" = ( /obj/machinery/light{ dir = 1; @@ -9908,12 +9326,6 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) -"DX" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common{ - icon_state = "common-broken4" - }, -/area/f13/ncr) "DY" = ( /obj/structure/reagent_dispensers/barrel/four, /obj/effect/decal/cleanable/dirt, @@ -9931,6 +9343,10 @@ /obj/effect/decal/remains/human, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) +"Eb" = ( +/obj/structure/reagent_dispensers/compostbin, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "Ec" = ( /obj/structure/railing/corner{ dir = 1 @@ -9938,8 +9354,11 @@ /turf/open/transparent/openspace, /area/f13/building/powered) "Ed" = ( -/turf/closed/wall/f13/wood, -/area/f13/caves) +/obj/structure/fluff/railing{ + dir = 6 + }, +/turf/open/transparent/openspace, +/area/f13/wasteland) "Ee" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -10108,17 +9527,27 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +"EC" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 8 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 10 + }, +/obj/structure/barricade/tentclothedge{ + dir = 4; + pixel_x = 15; + pixel_y = 12; + layer = 5 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "ED" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ icon_state = "housebase" }, /area/f13/legioncamp) -"EF" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/item/flag/ncr, -/turf/open/floor/plating/dirt, -/area/f13/caves) "EG" = ( /obj/structure/table/wood, /obj/item/clothing/shoes/f13/jamrock, @@ -10143,10 +9572,6 @@ /obj/item/storage/book/bible/booze, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) -"EL" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating/dirt/dark, -/area/f13/caves) "EM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/campfire, @@ -10247,15 +9672,6 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) -"EZ" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "Fa" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -10392,13 +9808,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"Ft" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken6" - }, -/area/f13/ncr) "Fu" = ( /obj/structure/barricade/sandbags, /turf/open/floor/f13{ @@ -10407,6 +9816,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"Fv" = ( +/obj/structure/flora/ausbushes/grassybush, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "Fw" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt{ @@ -10428,23 +9841,10 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"Fy" = ( -/obj/structure/table, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_y = 11; - pixel_x = -2 - }, -/obj/item/reagent_containers/hypospray/medipen/stimpak/epipak, -/turf/open/floor/wood_common, -/area/f13/ncr) "Fz" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/ncr) -"FA" = ( -/obj/structure/wreck/trash/machinepiletwo, -/turf/open/floor/plating/dirt, -/area/f13/caves) "FB" = ( /obj/structure/window/fulltile/house/broken, /obj/structure/barricade/bars, @@ -10507,24 +9907,15 @@ }, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/c) -"FM" = ( -/obj/structure/rack, -/obj/item/ammo_box/magazine/m556/rifle/assault{ - pixel_x = 2 - }, -/obj/item/ammo_box/magazine/m556/rifle/assault{ - pixel_x = -4 - }, -/turf/open/floor/wood_wide, -/area/f13/ncr) +"FL" = ( +/obj/item/grown/log/tree, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "FN" = ( /obj/structure/bed, /obj/item/bedsheet/centcom, /turf/open/floor/wood_fancy, /area/f13/clinic) -"FO" = ( -/turf/closed/mineral/random/low_chance, -/area/f13/caves) "FP" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3, @@ -10584,13 +9975,6 @@ /obj/machinery/microwave/stove, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) -"Ga" = ( -/obj/structure/railing/corner{ - color = "#A47449"; - dir = 1 - }, -/turf/open/transparent/openspace, -/area/f13/ncr) "Gc" = ( /obj/structure/mirror{ pixel_x = 32 @@ -10645,28 +10029,35 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) -"Gh" = ( -/obj/structure/fluff/hedge, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_wide, -/area/f13/ncr) "Gi" = ( -/obj/structure/flora/grass/jungle/b{ - pixel_x = -22 - }, -/obj/structure/fluff{ - icon = 'icons/fallout/objects/cave_decor.dmi'; - icon_state = "stalagmite"; - name = "stalagmite"; - density = 1 +/obj/effect/turf_decal/weather/dirt{ + dir = 5 }, -/turf/open/floor/plating/dirt/dark, -/area/f13/caves) +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "Gj" = ( /obj/structure/table/wood, /obj/item/binoculars, /turf/open/floor/wood_common, /area/maintenance/bar) +"Gk" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -9 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirt" + }, +/area/f13/ambientlighting/building/u) "Gl" = ( /obj/structure/railing{ dir = 1 @@ -10694,13 +10085,6 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) -"Gq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/unpowered/secure_NCR{ - name = "Medical" - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "Gr" = ( /obj/effect/turf_decal/stripes/white/corner{ dir = 4 @@ -10822,16 +10206,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"GG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - color = "#A47449"; - dir = 8; - layer = 4.1 - }, -/obj/machinery/light/small, -/turf/open/floor/wood_common, -/area/f13/ncr) "GH" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/handy/gutsy/flamer, @@ -10881,10 +10255,6 @@ dir = 4 }, /area/f13/building/powered) -"GQ" = ( -/obj/structure/flora/tree/pine, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "GR" = ( /obj/machinery/light/fo13colored/Red{ dir = 8 @@ -10992,12 +10362,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/purple, /area/f13/building/powered) -"Hh" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/wooden{ - icon_state = "housebase4-broken" - }, -/area/f13/ncr) "Hi" = ( /obj/structure/disposalpipe/junction/yjunction, /obj/effect/decal/cleanable/dirt, @@ -11090,19 +10454,6 @@ /obj/item/book/granter/crafting_recipe/blueprint/aer9, /turf/open/floor/plating/rust, /area/f13/building/powered) -"Hw" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt, -/obj/structure/fluff{ - icon = 'icons/fallout/objects/cave_decor.dmi'; - icon_state = "boards_drought_we-2"; - name = "planks"; - desc = "planks to keep your shoes clean of mud" - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) "Hx" = ( /obj/structure/table, /obj/item/newspaper, @@ -11274,6 +10625,13 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +"HU" = ( +/obj/structure/barricade/tentclothcorner, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirt" + }, +/area/f13/ambientlighting/building/u) "HW" = ( /mob/living/simple_animal/hostile/supermutant/nightkin/rangedmutant, /obj/structure/chair/office{ @@ -11286,12 +10644,11 @@ }, /area/f13/building/powered) "HX" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 1 +/obj/effect/turf_decal/weather/dirt{ + dir = 6 }, -/turf/open/transparent/openspace, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "HY" = ( /obj/structure/closet/cabinet, /turf/open/floor/wood_fancy, @@ -11315,10 +10672,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"Ib" = ( -/obj/structure/fluff/rails, -/turf/open/floor/plating/dirt, -/area/f13/caves) "Ic" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/drip, @@ -11332,6 +10685,13 @@ name = "dirty floor" }, /area/f13/building/powered) +"Ie" = ( +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins{ + dir = 5; + icon_state = "rubbleplate" + }, +/area/f13/wasteland) "If" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -11340,12 +10700,6 @@ /obj/item/clothing/head/helmet/f13/brahmincowboyhat, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) -"Ih" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "Ii" = ( /obj/structure/sign/warning/fire, /turf/closed/indestructible/f13vaultrusted, @@ -11415,12 +10769,11 @@ /obj/structure/dresser, /turf/open/floor/carpet/cyan, /area/maintenance/bar) -"Iu" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common{ - icon_state = "common-broken5" - }, -/area/f13/ncr) +"It" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) "Iv" = ( /obj/structure/lattice, /obj/structure/table_frame, @@ -11510,10 +10863,6 @@ /obj/item/bikehorn, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/wasteland) -"II" = ( -/obj/structure/fence/wooden, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "IJ" = ( /obj/structure/railing{ dir = 6 @@ -11530,8 +10879,10 @@ }, /area/f13/building/powered) "IM" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/f13/outside/roof/wood/old, +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirt" + }, /area/f13/wasteland) "IN" = ( /obj/effect/decal/cleanable/dirt, @@ -11652,12 +11003,6 @@ }, /turf/open/floor/wood_wide, /area/f13/followers) -"Jd" = ( -/obj/structure/obstacle/barbedwire/end{ - dir = 8 - }, -/turf/open/floor/plating/dirt/dark, -/area/f13/caves) "Je" = ( /obj/structure/debris/v3, /turf/closed/wall/mineral/brick, @@ -11691,18 +11036,6 @@ /obj/structure/table, /turf/open/floor/wood_fancy, /area/f13/clinic) -"Jl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start/f13/ncrveteranranger, -/obj/structure/chair/office/dark, -/obj/structure/fluff/paper/stack{ - desc = "A stack of various papers, illegible scribbles scattered across each page."; - pixel_x = 6; - pixel_y = -4; - dir = 4 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "Jm" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -11758,12 +11091,6 @@ icon_state = "floordirty" }, /area/f13/building/abandoned/j) -"Ju" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/turf/open/transparent/openspace, -/area/f13/wasteland) "Jw" = ( /obj/item/storage/bag/money/small, /obj/effect/decal/cleanable/dirt, @@ -11809,6 +11136,9 @@ /mob/living/simple_animal/pet/fox, /turf/open/floor/carpet/royalblack, /area/f13/clinic) +"JD" = ( +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "JF" = ( /obj/structure/closet/cabinet/anchored, /obj/item/clothing/under/f13/cowboyg, @@ -11922,12 +11252,6 @@ /obj/structure/window/fulltile/house, /turf/open/indestructible/ground/outside/desert, /area/f13/building/abandoned/m) -"JW" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_wide{ - icon_state = "wide-broken5" - }, -/area/f13/ncr) "JX" = ( /obj/item/pizzabox/meat, /obj/effect/decal/cleanable/dirt, @@ -11948,6 +11272,10 @@ /obj/structure/dresser, /turf/open/floor/carpet/blue, /area/f13/followers) +"Kb" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "Kc" = ( /obj/structure/table/glass, /obj/item/flashlight/lamp/green, @@ -11991,10 +11319,6 @@ dir = 1 }, /area/f13/building/powered) -"Kj" = ( -/obj/structure/flora/brushwood, -/turf/open/floor/plating/dirt, -/area/f13/caves) "Kk" = ( /obj/structure/decoration/clock/old/active{ pixel_y = 28 @@ -12034,15 +11358,6 @@ "Kq" = ( /turf/open/transparent/openspace, /area/f13/ambientlighting/building/d) -"Kr" = ( -/obj/structure/railing/corner{ - color = "#A47449"; - dir = 8 - }, -/turf/open/floor/wood_common{ - icon_state = "common-broken5" - }, -/area/f13/ncr) "Ks" = ( /obj/structure/lattice/catwalk, /obj/structure/chair/stool{ @@ -12118,12 +11433,6 @@ "KE" = ( /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/m) -"KF" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common{ - icon_state = "common-broken3" - }, -/area/f13/ncr) "KG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -12139,25 +11448,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"KJ" = ( -/obj/structure/fluff/rails{ - icon_state = "rails-b2" - }, -/obj/structure/fluff/rails{ - icon_state = "rails-b1"; - pixel_y = 11; - pixel_x = -3 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/turf/open/floor/plating/tunnel{ - icon_state = "tunnelrusty" - }, -/area/f13/caves) "KK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -12445,10 +11735,6 @@ }, /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) -"LD" = ( -/obj/structure/barricade/wooden, -/turf/closed/wall/f13/wood, -/area/f13/ncr) "LE" = ( /turf/open/transparent/openspace, /area/f13/underground/cave) @@ -12517,12 +11803,6 @@ /obj/machinery/photocopier, /turf/open/floor/carpet/royalblack, /area/f13/clinic) -"LO" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) "LQ" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/splatter, @@ -12569,6 +11849,15 @@ icon_state = "bluerustysolid" }, /area/f13/followers) +"LW" = ( +/obj/structure/simple_door/tentflap_cloth{ + pixel_y = -3 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "LX" = ( /obj/structure/chair/booth{ icon_state = "booth_east_south" @@ -12578,14 +11867,6 @@ "LY" = ( /turf/open/floor/plating/f13/outside/roof, /area/f13/wasteland) -"LZ" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 8; - layer = 4.1 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "Ma" = ( /obj/machinery/light, /turf/open/floor/plasteel/f13/vault_floor/red/white/whiteredchess, @@ -12616,13 +11897,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"Mg" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6; - icon_state = "snow_corner" - }, -/turf/open/transparent/openspace, -/area/f13/wasteland) "Mh" = ( /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/food/drinks/bottle/fernet{ @@ -12642,25 +11916,6 @@ /obj/structure/fluff/railing/corner, /turf/open/floor/plating/f13/outside/roof/metal/corrugated/green, /area/f13/wasteland) -"Mk" = ( -/obj/structure/fireplace{ - pixel_y = 10 - }, -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/f13/foodspawner, -/obj/item/toy/cards/deck{ - pixel_x = 6 - }, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken3" - }, -/area/f13/ncr) -"Mm" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/turf/open/transparent/openspace, -/area/f13/wasteland) "Mn" = ( /obj/structure/table/reinforced, /obj/item/locked_box/weapon/melee/tier3, @@ -12700,15 +11955,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"Mw" = ( -/obj/structure/fluff{ - icon = 'icons/fallout/objects/cave_decor.dmi'; - icon_state = "stalagmite2"; - name = "stalagmite"; - density = 1 - }, -/turf/open/floor/plating/dirt, -/area/f13/caves) "Mx" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/mid, @@ -12761,12 +12007,14 @@ }, /area/f13/building/powered) "MF" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5; - icon_state = "snow_corner" +/obj/structure/barricade/tentclothcorner{ + dir = 4 }, -/turf/open/transparent/openspace, -/area/f13/wasteland) +/obj/effect/overlay/desert/sonora/edge{ + dir = 5 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "MG" = ( /obj/structure/dresser, /turf/open/floor/carpet/black, @@ -12818,14 +12066,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"MP" = ( -/obj/structure/fluff{ - icon = 'icons/fallout/objects/cave_decor.dmi'; - icon_state = "support_beams"; - name = "support wall" - }, -/turf/closed/mineral/random/low_chance, -/area/f13/wasteland) "MQ" = ( /obj/structure/railing{ color = "#A47449"; @@ -12890,16 +12130,6 @@ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/m) -"Na" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/structure/flora/grass/jungle/b{ - pixel_x = -19; - pixel_y = 10 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) "Nb" = ( /obj/structure/lattice, /turf/open/floor/plating/tunnel{ @@ -12928,9 +12158,6 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) -"Nf" = ( -/turf/open/transparent/openspace, -/area/f13/ncr) "Ng" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/simple_door/interior, @@ -13006,12 +12233,6 @@ }, /turf/open/floor/wood_common, /area/f13/followers) -"Nt" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) "Nu" = ( /turf/open/floor/mineral/titanium/white, /area/f13/clinic) @@ -13025,19 +12246,6 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) -"Nw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/stool/retro/tan{ - pixel_x = -9; - pixel_y = 11 - }, -/obj/item/kirbyplants{ - icon_state = "plant-12"; - pixel_x = 11; - pixel_y = 20 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "Nx" = ( /obj/effect/decal/cleanable/robot_debris{ pixel_x = 4; @@ -13065,9 +12273,11 @@ }, /area/f13/brotherhood/offices1st) "NA" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/plating/dirt, -/area/f13/caves) +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "NB" = ( /obj/structure/railing{ color = "#A47449"; @@ -13103,10 +12313,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/white, /area/f13/followers) -"NI" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/red, -/area/f13/ncr) "NJ" = ( /obj/structure/chair/booth{ icon_state = "booth_west_north" @@ -13118,9 +12324,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/maintenance/bar) -"NL" = ( -/obj/effect/turf_decal/weather/snow/corner, -/turf/open/floor/plating/f13/outside/roof/wood/old, +"NM" = ( +/obj/structure/flora/wasteplant/wild_broc, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "NN" = ( /obj/effect/decal/cleanable/dirt, @@ -13312,10 +12518,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"Ot" = ( -/obj/structure/flora/grass/wasteland, -/turf/open/floor/plating/dirt, -/area/f13/caves) "Ou" = ( /obj/structure/window/fulltile/house, /obj/structure/curtain{ @@ -13431,15 +12633,6 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) -"OK" = ( -/obj/structure/table/optable, -/obj/effect/decal/cleanable/blood{ - icon_state = "gib2_flesh" - }, -/turf/open/floor/wood_common{ - icon_state = "common-broken4" - }, -/area/f13/ncr) "OL" = ( /obj/structure/debris/v1, /obj/effect/decal/cleanable/dirt, @@ -13458,16 +12651,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"ON" = ( -/obj/structure/fluff/paper/stack, -/obj/structure/fluff/paper/stack{ - desc = "A stack of various papers, illegible scribbles scattered across each page."; - pixel_x = 6; - pixel_y = -4; - dir = 1 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "OO" = ( /obj/structure/simple_door/interior, /turf/open/indestructible/ground/outside/desert, @@ -13496,20 +12679,10 @@ /obj/machinery/hydroponics/soil/pot, /turf/open/floor/wood_common, /area/engine/workshop) -"OS" = ( -/obj/effect/turf_decal/weather/snow/corner, -/turf/open/transparent/openspace, -/area/f13/wasteland) "OT" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) -"OU" = ( -/obj/structure/obstacle/barbedwire/end{ - dir = 4 - }, -/turf/open/floor/plating/dirt/dark, -/area/f13/caves) "OV" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/brute, @@ -13523,10 +12696,12 @@ }, /area/f13/building/powered) "OW" = ( -/obj/structure/bed/wooden, -/obj/item/bedsheet/blanket, -/turf/open/floor/carpet, -/area/f13/ncr) +/obj/effect/decal/remains/xeno{ + desc = "They look like the remains of...A horse?"; + name = "animal remains" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "OX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/destructible/tribal_torch/wall/lit{ @@ -13543,23 +12718,6 @@ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/j) -"OZ" = ( -/obj/machinery/smartfridge/bottlerack, -/obj/effect/spawner/lootdrop/f13/alcoholspawner, -/obj/effect/spawner/lootdrop/f13/alcoholspawner, -/obj/item/flashlight/lamp/green{ - pixel_y = 17; - pixel_x = -6 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) -"Pb" = ( -/obj/structure/railing/corner{ - color = "#A47449"; - dir = 8 - }, -/turf/open/transparent/openspace, -/area/f13/ncr) "Pc" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plasteel/f13/vault_floor/blue/side{ @@ -13618,12 +12776,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland) -"Pl" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/turf/open/transparent/openspace, -/area/f13/wasteland) "Pm" = ( /obj/structure/window/fulltile/store{ icon_state = "ruinswindowvertical" @@ -13694,10 +12846,6 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) -"Pv" = ( -/obj/structure/decoration/rag, -/turf/closed/wall/f13/wood, -/area/f13/ncr) "Pw" = ( /obj/effect/landmark/poster_spawner/pinup, /turf/closed/indestructible/f13vaultrusted, @@ -13757,23 +12905,12 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) -"PD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6; - icon_state = "snow_corner" - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "PE" = ( /obj/structure/table/wood, /turf/open/floor/f13{ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/m) -"PI" = ( -/turf/open/floor/wood_wide, -/area/f13/ncr) "PJ" = ( /obj/structure/toilet{ pixel_y = 10 @@ -13887,16 +13024,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"PY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/defibrillator/loaded, -/turf/open/floor/wood_common, -/area/f13/ncr) -"PZ" = ( -/obj/effect/turf_decal/weather/dirt, -/turf/open/transparent/openspace, -/area/f13/caves) "Qa" = ( /obj/machinery/light/fo13colored/Red, /obj/effect/decal/cleanable/dirt, @@ -14167,10 +13294,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"QM" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "QN" = ( /obj/structure/table/wood, /obj/item/clothing/accessory/necklace{ @@ -14291,42 +13414,10 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/followers) -"Re" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/secure/weapon{ - anchored = 1 - }, -/obj/item/ammo_box/magazine/m9mm, -/obj/item/ammo_box/magazine/m9mm, -/obj/item/ammo_box/magazine/m9mm, -/obj/item/ammo_box/magazine/m9mm/doublestack{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/ammo_box/magazine/m9mm/doublestack{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/ammo_box/magazine/m9mm/doublestack{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/machinery/light/small{ - dir = 4; - light_color = "#ff4747" - }, -/turf/open/floor/wood_wide, -/area/f13/ncr) "Rf" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13, /area/f13/wasteland) -"Rg" = ( -/obj/structure/flora/grass/both{ - icon_state = "snowgrass_w" - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "Rh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, @@ -14403,12 +13494,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"Rs" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common{ - icon_state = "common-broken2" - }, -/area/f13/ncr) "Rt" = ( /obj/structure/debris/v3{ pixel_x = -15; @@ -14457,14 +13542,6 @@ }, /turf/open/floor/f13/wood, /area/f13/legioncamp) -"RB" = ( -/obj/structure/fluff{ - icon = 'icons/fallout/objects/cave_decor.dmi'; - icon_state = "support_wall"; - name = "support wall" - }, -/turf/closed/mineral/random/low_chance, -/area/f13/wasteland) "RC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/circuit/f13_blue, @@ -14485,9 +13562,9 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "RE" = ( -/obj/structure/simple_door/wood, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/closet/crate/large, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "RF" = ( /mob/living/simple_animal/hostile/handy, /turf/open/floor/f13{ @@ -14496,6 +13573,18 @@ name = "dirty floor" }, /area/f13/building/powered) +"RG" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 10; + icon_state = "dirt" + }, +/area/f13/wasteland) "RH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/poster_spawner/prewar, @@ -14587,10 +13676,6 @@ /obj/structure/debris/v2, /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) -"RS" = ( -/obj/structure/barricade/wooden/strong, -/turf/closed/wall/f13/wood, -/area/f13/ncr) "RT" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/sweater/turtleskirt/blackpink, @@ -14675,10 +13760,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"Se" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "Sf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/fo13colored/Red{ @@ -14701,12 +13782,6 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/e) -"Sj" = ( -/obj/structure/chair/folding{ - dir = 4 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "Sk" = ( /obj/machinery/light/small{ dir = 4; @@ -14805,15 +13880,6 @@ }, /turf/open/floor/wood_common, /area/f13/followers) -"SC" = ( -/turf/open/floor/carpet, -/area/f13/ncr) -"SD" = ( -/obj/structure/chair/folding{ - dir = 8 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "SF" = ( /obj/structure/sign/poster/official/fruit_bowl, /turf/closed/wall/f13/wood/house, @@ -14845,9 +13911,14 @@ }, /area/f13/building/powered) "SJ" = ( -/obj/structure/flora/grass/wasteland, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/effect/decal/cleanable/generic, +/obj/item/book/granter/crafting_recipe/gunsmith_one, +/obj/item/book/granter/crafting_recipe/gunsmith_two, +/obj/item/book/granter/crafting_recipe/gunsmith_three, +/obj/item/book/granter/crafting_recipe/gunsmith_four, +/obj/structure/shelf_wood, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "SK" = ( /obj/structure/railing/corner{ color = "#A47449"; @@ -15032,13 +14103,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"Tm" = ( -/obj/structure/table/booth, -/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, -/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common, -/area/f13/ncr) "Tn" = ( /obj/structure/sign/flag_enclave{ pixel_y = 34 @@ -15074,10 +14138,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"Ts" = ( -/obj/structure/chair/folding, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "Tt" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/remains/human, @@ -15208,9 +14268,6 @@ }, /turf/open/floor/plating, /area/f13/bar) -"TN" = ( -/turf/closed/wall/f13/wood, -/area/f13/ncr) "TO" = ( /obj/machinery/light/fo13colored/Red{ dir = 1 @@ -15228,21 +14285,6 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) -"TQ" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = -7; - pixel_y = 16 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/clothing/head/beret/ncr/ncr_sof{ - pixel_x = -6 - }, -/turf/open/floor/carpet, -/area/f13/ncr) "TR" = ( /obj/item/flag/bos, /obj/effect/decal/cleanable/dirt{ @@ -15355,25 +14397,6 @@ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/m) -"Uh" = ( -/obj/structure/table/booth, -/obj/effect/spawner/lootdrop/f13/ncr_k_ration{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/structure/decoration/clock{ - pixel_x = 30 - }, -/obj/effect/spawner/lootdrop/f13/ncr_k_ration{ - pixel_x = 5; - pixel_y = 12 - }, -/obj/item/reagent_containers/food/drinks/bottle/nukashine{ - pixel_y = 5; - pixel_x = -5 - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "Ui" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -15407,10 +14430,12 @@ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/n) -"Us" = ( -/obj/structure/decoration/rag, -/turf/closed/wall/f13/wood, -/area/f13/caves) +"Uq" = ( +/obj/structure/fluff/railing{ + dir = 9 + }, +/turf/open/transparent/openspace, +/area/f13/wasteland) "Ut" = ( /obj/structure/window/fulltile/house, /obj/structure/curtain{ @@ -15442,15 +14467,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"Ux" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - light_color = "#ff4747" - }, -/turf/open/floor/wood_wide{ - icon_state = "wide-broken2" - }, -/area/f13/ncr) "Uy" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/f13/wood/house, @@ -15517,6 +14533,12 @@ /obj/item/radio/old, /turf/open/floor/plating/rust, /area/f13/building/powered) +"UK" = ( +/obj/structure/chair/bench{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "UL" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, @@ -15548,6 +14570,9 @@ /mob/living/simple_animal/hostile/handy, /turf/open/floor/carpet/purple, /area/f13/building/powered) +"UR" = ( +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ambientlighting/building/u) "US" = ( /obj/machinery/light/fo13colored/Red, /obj/effect/decal/cleanable/dirt, @@ -15602,11 +14627,9 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "UZ" = ( -/obj/structure/railing{ - color = "#A47449" - }, -/turf/open/floor/wood_common, -/area/f13/ncr) +/obj/structure/flora/wasteplant/fever_blossom, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "Va" = ( /obj/structure/bed/mattress{ icon_state = "mattress5" @@ -15621,11 +14644,6 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) -"Vc" = ( -/obj/structure/rack, -/obj/item/book/granter/crafting_recipe/blueprint/service, -/turf/open/floor/wood_wide, -/area/f13/ncr) "Vd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter, @@ -15661,13 +14679,6 @@ }, /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland) -"Vj" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) "Vk" = ( /turf/closed/mineral/random/no_caves, /area/f13/underground/cave) @@ -15689,6 +14700,9 @@ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/j) +"Vo" = ( +/turf/closed/wall/f13/ruins, +/area/f13/wasteland) "Vp" = ( /obj/machinery/shower{ dir = 4 @@ -15717,12 +14731,6 @@ }, /turf/open/transparent/openspace, /area/f13/building/abandoned/l) -"Vv" = ( -/obj/structure/chair/sofa/left{ - color = "#475340" - }, -/turf/open/floor/carpet/red, -/area/f13/ncr) "Vw" = ( /turf/closed/wall/f13/wood/house, /area/f13/legioncamp) @@ -15833,6 +14841,10 @@ icon_state = "housewood4-broken" }, /area/f13/ambientlighting/building/m) +"VM" = ( +/obj/item/reagent_containers/glass/bucket, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "VN" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/effect/decal/cleanable/dirt, @@ -15971,23 +14983,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"Wn" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/turf/open/transparent/openspace, -/area/f13/wasteland) -"Wp" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4; - light_color = "#ff4747" - }, -/turf/open/floor/wood_common, -/area/f13/ncr) "Wr" = ( /obj/structure/railing{ color = "#A47449" @@ -16215,15 +15210,16 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) -"Xa" = ( -/obj/structure/fence/corner/wooden, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "Xb" = ( /mob/living/simple_animal/hostile/centaur, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +"Xc" = ( +/turf/open/indestructible/ground/outside/ruins{ + icon_state = "rubbleplate" + }, +/area/f13/wasteland) "Xd" = ( /obj/structure/table/wood/settler, /obj/effect/decal/cleanable/dirt{ @@ -16348,6 +15344,9 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +"Xz" = ( +/turf/open/floor/plating/f13/outside/roof/metal/corrugated/red, +/area/f13/wasteland) "XA" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/blueprintLowMid, @@ -16439,12 +15438,6 @@ /obj/item/bedsheet/brown, /turf/open/floor/carpet/red, /area/f13/legioncamp) -"XM" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) "XN" = ( /obj/machinery/vending/clothing{ force_free = 1 @@ -16668,6 +15661,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, /area/f13/legioncamp) +"Yu" = ( +/obj/structure/barricade/tentclothedge{ + dir = 8 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "Yv" = ( /obj/structure/simple_door/interior, /turf/open/floor/wood_fancy, @@ -16733,11 +15735,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) -"YH" = ( -/obj/structure/fence/corner/wooden{ - dir = 8 - }, -/turf/open/floor/plating/f13/outside/roof/wood/old, +"YI" = ( +/obj/machinery/smartfridge/bottlerack/seedbin/primitive, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "YJ" = ( /obj/effect/decal/cleanable/blood/drip, @@ -16804,11 +15804,6 @@ }, /turf/open/floor/wood_wide, /area/f13/followers) -"YT" = ( -/obj/structure/fluff/hedge, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "YU" = ( /obj/structure/bed, /turf/open/floor/carpet/vault, @@ -16969,21 +15964,14 @@ /turf/closed/mineral/random/low_chance, /area/f13/wasteland) "Zu" = ( -/obj/structure/barricade/wooden, -/turf/closed/mineral/random/low_chance, -/area/f13/caves) -"Zv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fermenting_barrel{ - pixel_y = 15; - pixel_x = -6; - density = 0 +/obj/structure/barricade/tentclothedge{ + pixel_y = -4 }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 }, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) "Zw" = ( /obj/item/storage/trash_stack{ icon_state = "trash_2" @@ -17007,12 +15995,6 @@ "ZA" = ( /turf/closed/mineral/random, /area/f13/wasteland) -"ZB" = ( -/obj/structure/fence/wooden{ - pixel_x = 13 - }, -/turf/open/transparent/openspace, -/area/f13/ncr) "ZC" = ( /obj/structure/railing{ dir = 1 @@ -17034,6 +16016,16 @@ /obj/effect/decal/remains/human, /turf/open/floor/carpet/royalblue, /area/f13/building/powered) +"ZI" = ( +/turf/open/indestructible/ground/outside/dirt{ + dir = 10; + icon_state = "dirt" + }, +/area/f13/wasteland) +"ZJ" = ( +/obj/structure/flora/wasteplant/wild_xander, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "ZK" = ( /obj/effect/spawner/lootdrop/f13/advcrafting, /obj/effect/turf_decal/bot_white, @@ -17049,14 +16041,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/c) -"ZM" = ( -/obj/structure/flora/twig{ - pixel_y = 23; - pixel_x = -8 - }, -/obj/structure/flora/grass/brown, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "ZN" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -17076,12 +16060,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) -"ZS" = ( -/obj/structure/railing/corner{ - color = "#A47449" +"ZP" = ( +/obj/structure/fluff/railing/corner{ + dir = 8 }, /turf/open/transparent/openspace, -/area/f13/ncr) +/area/f13/wasteland) "ZU" = ( /obj/structure/barricade/wooden, /turf/closed/indestructible/rock{ @@ -17575,103 +16559,103 @@ yT yT yT yT -xm -xm -xm -xm -xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -IM -IM -TN -TN -TN -TN -TN -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -fX -dD -dD -GQ -QM -QM -Aj -Zt -Zt -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -17784,22 +16768,22 @@ ZA ZA ZA ZA -iX -iX -iX -iX -iX -iX -iX -iX -iX -iX -iX -iX -iX -iX -iX -iX +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA ZA ZA ZA @@ -17877,103 +16861,103 @@ yT yT yT yT -xm -xm -xm -xm -xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -Zt -Zt -zy -IM -IM -PD -dD -dD -aY -xm -xm -xm -xm -xm -zy -TN -TN -OW -TQ -CX -TN -TN -iu -zy -Zt -Zt -xm -xm -xm -xm -fX -QM -dD -dD -GQ -fV -dD -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -18101,7 +17085,7 @@ WC WC WC zi -iX +ZA ZA ZA ZA @@ -18179,102 +17163,102 @@ yT yT yT yT -xm -xm -xm -xm -xm -xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -zy -TN -TN -qJ -TN -RS -aR -aY -xm -xm -xm -xm -xm -IM -qJ -OZ -SC -SC -fR -mp -qJ -zy -zy -xW -xm -xm -xm -xm -xm -xm -nK -nK -nK -nK -fX -GQ -dD -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -18404,7 +17388,7 @@ tk NP zi iX -iX +ZA ZA ZA ZA @@ -18481,6 +17465,101 @@ yT yT yT yT +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -18488,101 +17567,6 @@ xm xm xm xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -IM -TN -aq -cc -YT -TN -Zv -IM -xm -xm -xm -xm -xm -IM -TN -jA -Rs -BZ -eO -KF -CD -zy -IM -xW -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -Mg -dD -fV -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm xm xm xm @@ -18783,105 +17767,105 @@ yT yT yT yT +xX +xX +xX +xX xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm xm xm xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -GQ -Wn -xm -xm -xm -zy -RS -Vv -nL -Ft -RE -zy -IM -xm -xm -xm -xm -xm -zy -qJ -Oy -Wp -eO -zU -aM -qJ -IM -IM -xW -xm -xm -xm -xm -xm -xm -xm -xm -xm -OS -QM -dD -GQ -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm xm xm xm @@ -19010,7 +17994,7 @@ zi iX iX iX -iX +ZA ZA ZA ZA @@ -19085,112 +18069,112 @@ yT yT yT yT +xX +xX +xX xm xm xm -xm -xm -xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -jE -QM -Wn -xm -IM -IM -TN -TN -Au -NI -wP -qJ -IM -IM -xm -xm -xm -xm -xm -zy -TN -TN -TN -oW -TN -TN -TN -IM -zy -xW -xm -xm -xm -xm -xm -xm -xm -xm -xm -OS -QM -dD -Rg -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -19313,7 +18297,7 @@ iX iX iX iX -iX +ZA ZA ZA ZA @@ -19393,98 +18377,89 @@ xm xm xm xm -xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -dD -GQ -dD -Wn -xm -RS -RS -Pv -qJ -hn -Cr -wP -qJ -zy -xm -xm -xm -xm -xm -xm -zy -CD -oL -nF -eO -ON -sj -py -zy -Ts -xW -xm -xm -xm -xm -xm -xm -xm -xm -xm -OS -dD -QM -Aj -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -19493,6 +18468,15 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -19603,7 +18587,7 @@ zi xm xm xm -xm +fb rt wM tk @@ -19695,106 +18679,106 @@ xm xm xm xm -xm -xm -Zt -Zt -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -gw -Zt -Zt -lQ -fV -Mm -xm -xm -qJ -Sj -lx -al -wP -hh -HX -TN -xm -xm -xm -xm -xm -xm -xm -zy -CD -DX -eO -Hh -Jl -jg -qJ -gs -YH -Xa -xm -xm -xm -xm -xm -xm -xm -xm -xm -Pl -GQ -vJ -Zt -Zt -Zt -gw -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -19905,7 +18889,7 @@ zi xm xm xm -xm +cw zi NP tk @@ -19998,105 +18982,105 @@ xm xm xm xm -xm -xm -xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -QM -hv -Wn -xm -xm -TN -Mk -wP -Db -Se -Dx -Ga -TN -xm -xm -xm -xm -xm -xm -xm -py -TN -Uh -Tm -Iu -px -TN -TN -II -Xa -xm -xm -xm -xm -xm -xm -xm -xm -xm -OS -dD -dD -dD -Zt -Zt -Zt -gw -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -20207,7 +19191,7 @@ zi xm xm xm -xm +cw zi rt Oy @@ -20301,96 +19285,81 @@ xm xm xm xm -xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -GQ -QM -Wn -xm -xm -qJ -jd -oa -vi -qG -HX -Nf -RS -xm -xm -xm -xm -xm -xm -xm -xm -TN -TN -qJ -qJ -qJ -TN -zy -zy -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -OS -dD -QM -Zt -Zt -Zt -gw -gw -Zt -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -20399,6 +19368,21 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -20509,7 +19493,7 @@ zi zi xm xm -xm +cw zi WC WC @@ -20603,40 +19587,104 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -dD -Wn xm xm -TN -TN -qJ -qJ -RS -TN -Pv -TN xm xm xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -20647,50 +19695,9 @@ xm xm xm xm -zy -IM -zy -zJ -IM -IM -zy xm xm xm -OS -dD -dD -jQ -Zt -Zt -gw -Zt -Zt -Zt -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt xm xm xm @@ -20710,43 +19717,20 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -EI -"} -(13,1,1) = {" -EI -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT +EI +"} +(13,1,1) = {" +EI +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT xm xm xm @@ -20905,94 +19889,79 @@ xm xm xm xm -xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -xm -nK -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -IM -IM -AY -dD -iI -IM -IM -xm -xm -xm -OS -xm -GQ -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -21003,6 +19972,21 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -21114,8 +20098,6 @@ zi qy vd uQ -ec -ec zi zi zi @@ -21130,7 +20112,9 @@ zi zi zi zi -xm +zi +zi +lC xm xm xm @@ -21208,103 +20192,103 @@ xm xm xm xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -IM -NL -dD -dD -dD -iI -zy -xm -xm -xm -xm -fX -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm +Ao +TJ +cz +Ao +Ao +Ao xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -21415,24 +20399,24 @@ zi Sn xm xm -xm -xm -xm -xm -xm -xm -xm -xm +ZP +BC +BC +BC +BC +BC +BC +fR zi rt WC rt -rt +cu rt WC Je zi -xm +lC xm xm xm @@ -21510,103 +20494,103 @@ xm xm xm xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -zy -zy -Ih -dD -dD -dD -aY -xm -xm -xm -xm -Zt -Zt -Zt -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm xm +Ao +gN +kP +xh +kP +Ao xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -21724,7 +20708,7 @@ xm xm xm xm -xm +cw zi WC AV @@ -21734,7 +20718,7 @@ Ha lf WC zi -xm +lC xm xm xm @@ -21812,28 +20796,103 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +wc +pY +zU +JD +oA +Zu +sx +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt xm xm +Ao +Cn +ZY +Fd +kP +Ao xm xm xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -21855,50 +20914,7 @@ xm xm xm xm -zy -zy -zy -zR -Ih -dD -aY xm -zy -zy -IM -zy -Zt -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt xm xm xm @@ -21909,6 +20925,12 @@ xm xm xm xm +EI +"} +(17,1,1) = {" +EI +yT +yT xm xm xm @@ -21941,12 +20963,6 @@ xm xm xm xm -EI -"} -(17,1,1) = {" -EI -yT -yT xm xm xm @@ -21982,6 +20998,8 @@ xm xm xm xm +Zk +MY xm xm xm @@ -21992,6 +21010,23 @@ xm xm xm xm +cw +zi +zi +rt +QI +Hs +XI +qN +rt +zi +lC +xm +xm +xm +xm +xm +xm xm xm xm @@ -22014,8 +21049,6 @@ xm xm xm xm -Zk -MY xm xm xm @@ -22027,15 +21060,6 @@ xm xm xm xm -ec -zi -rt -QI -Hs -XI -qN -rt -zi xm xm xm @@ -22044,6 +21068,27 @@ xm xm xm xm +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +xm +xm +xm +xm xm xm xm @@ -22053,17 +21098,103 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +hw +ie +pY +xk +JD +JD +LW +hw +sG +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm xm xm +Ao +bj +ZY +Al +ZY +YA xm xm xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -22084,56 +21215,6 @@ xm xm xm xm -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -xE -xE -xE -xE -FO -FO -FO -xm -xm -xm -xm -xm xm xm xm @@ -22146,6 +21227,10 @@ xm xm xm xm +EI +"} +(18,1,1) = {" +EI xm xm xm @@ -22159,47 +21244,7 @@ xm xm xm xm -zy -IM -IM -zR -zy xm -zy -IM -zy -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt xm xm xm @@ -22243,10 +21288,6 @@ xm xm xm xm -EI -"} -(18,1,1) = {" -EI xm xm xm @@ -22259,6 +21300,8 @@ xm xm xm xm +kq +Gf xm xm xm @@ -22269,6 +21312,17 @@ xm xm xm xm +ZP +fR +zi +iL +Vs +Fz +XI +vo +rt +zi +lC xm xm xm @@ -22316,8 +21370,10 @@ xm xm xm xm -kq -Gf +yT +yT +yT +yT xm xm xm @@ -22328,16 +21384,11 @@ xm xm xm xm +yT +yT +yT xm xm -zi -iL -Vs -Fz -XI -vo -rt -zi xm xm xm @@ -22350,18 +21401,100 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +eq +OW +kQ +EC +hg +hg +hg +jQ +hw xm +hw +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm xm xm +Ao +fK +kP +Cb +ZY +Ao xm xm xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -22386,10 +21519,6 @@ xm xm xm xm -yT -yT -yT -yT xm xm xm @@ -22400,9 +21529,10 @@ xm xm xm xm -yT -yT -yT +EI +"} +(19,1,1) = {" +EI xm xm xm @@ -22419,25 +21549,6 @@ xm xm xm xm -Zt -Zt -Zt -Zt -xE -xE -Nf -Nf -Nf -FO -py -TN -oA -oA -mg -LD -LZ -GG -Pv xm xm xm @@ -22467,40 +21578,6 @@ xm xm xm xm -zy -zy -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt xm xm xm @@ -22525,6 +21602,8 @@ xm xm xm xm +ko +Gf xm xm xm @@ -22536,6 +21615,16 @@ xm xm xm xm +cw +zi +rt +Ny +XI +XI +hy +WC +zi +lC xm xm xm @@ -22545,10 +21634,6 @@ xm xm xm xm -EI -"} -(19,1,1) = {" -EI xm xm xm @@ -22583,6 +21668,9 @@ xm xm xm xm +lw +lw +lw xm xm xm @@ -22598,6 +21686,9 @@ xm xm xm xm +yT +yT +yT xm xm xm @@ -22613,33 +21704,104 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +wJ +xX +xX +eq +RE +FL +kp +zh +zh +zh +zh +Gk +IM xm +hw +hw +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm xm -ko -Gf xm xm +Ao +Yq +kP +kP +ke +Ao +Ao +Ao xm xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm xm xm -zi -rt -Ny -XI -XI -hy -WC -zi xm xm xm @@ -22669,6 +21831,10 @@ xm xm xm xm +EI +"} +(20,1,1) = {" +EI xm xm xm @@ -22684,9 +21850,6 @@ xm xm xm xm -lw -lw -lw xm xm xm @@ -22702,9 +21865,6 @@ xm xm xm xm -yT -yT -yT xm xm xm @@ -22722,30 +21882,7 @@ xm xm xm xm -Zt -Zt -Zt -xE -TN -pg -Nf -ZS -LD -LD -Fy -OK -rw -hw -Gq -fR -Iu -fd xm -Rk -Rk -Rk -Rk -Rk xm xm xm @@ -22767,41 +21904,10 @@ xm xm xm xm +Gf +Gf xm xm -zy -Zt -Zt -Zt -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt xm xm xm @@ -22811,6 +21917,16 @@ xm xm xm xm +cw +zi +WC +gE +XI +XI +lD +WC +zi +lC xm xm xm @@ -22847,10 +21963,6 @@ xm xm xm xm -EI -"} -(20,1,1) = {" -EI xm xm xm @@ -22858,6 +21970,9 @@ xm xm xm xm +lw +lw +lw xm xm xm @@ -22873,6 +21988,9 @@ xm xm xm xm +yT +yT +yT xm xm xm @@ -22889,6 +22007,69 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +wJ +Kb +xX +sj +hw +hw +BI +yp +Fv +mx +mx +bs +mx +mx +eO +hw +hw +hw +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -22896,11 +22077,28 @@ xm xm xm xm +Ao +Ao +Ao +yS +Ao +Ao +zG +Ao xm xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -22920,8 +22118,6 @@ xm xm xm xm -Gf -Gf xm xm xm @@ -22934,17 +22130,13 @@ xm xm xm xm -zi -WC -gE -XI -XI -lD -WC -zi xm xm xm +EI +"} +(21,1,1) = {" +EI xm xm xm @@ -22986,9 +22178,6 @@ xm xm xm xm -lw -lw -lw xm xm xm @@ -23004,9 +22193,6 @@ xm xm xm xm -yT -yT -yT xm xm xm @@ -23020,39 +22206,29 @@ xm xm xm xm +vd +Ql xm xm xm xm xm -Zt -Zt -xE -TN -Nf -Nf -op -zQ -ac -su -vk -nS -nS -LD -nY -fR -fd xm -Rk -Rk -Rk -Rk -Rk xm xm xm xm xm +cw +zi +WC +vo +XI +XI +vo +am +zi +lC xm xm xm @@ -23062,47 +22238,9 @@ xm xm xm xm -TN -TN -yl -yl -py -TN xm xm xm -NL -dD -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt xm xm xm @@ -23134,6 +22272,9 @@ xm xm xm xm +lw +lw +lw xm xm xm @@ -23149,10 +22290,9 @@ xm xm xm xm -EI -"} -(21,1,1) = {" -EI +yT +yT +yT xm xm xm @@ -23171,6 +22311,67 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +ot +wJ +wJ +xX +BZ +BZ +mM +yp +mx +mx +mx +mx +mx +mx +mx +aK +OW +hw +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -23179,11 +22380,27 @@ xm xm xm xm +Ao +uL +ZY +kP +kP +vj +Ao xm xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -23218,12 +22435,14 @@ xm xm xm xm +EI +"} +(22,1,1) = {" +EI xm xm xm xm -vd -Ql xm xm xm @@ -23236,14 +22455,6 @@ xm xm xm xm -zi -WC -vo -XI -XI -vo -am -zi xm xm xm @@ -23288,9 +22499,6 @@ xm xm xm xm -lw -lw -lw xm xm xm @@ -23300,20 +22508,29 @@ xm xm xm xm +qy +YN xm xm xm xm xm xm -yT -yT -yT xm xm xm xm xm +cw +zi +WC +bQ +XI +Fz +bQ +am +zi +lC xm xm xm @@ -23328,81 +22545,18 @@ xm xm xm xm -Zt -xE -xE -Nf -Nf -op -Aq -dU -eO -fq -Nf -Nf -oA -fR -eO -fd xm -Rk -Rk -Rk -Rk -Rk xm xm -Rk -Rk -Rk -Rk xm xm xm xm xm xm -IM -cE -TN -fb -Nf -Nf -Nf -TN xm xm xm -hk -dD -Zt -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt xm xm xm @@ -23437,6 +22591,14 @@ xm xm xm xm +lw +lw +lw +lw +lw +lw +lw +lw xm xm xm @@ -23451,11 +22613,66 @@ xm xm xm xm -EI -"} -(22,1,1) = {" -EI xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +sy +wJ +wJ +kU +UR +UR +cc +Aq +mx +mx +mx +mx +mx +cf +aK +mW +hw +ie +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -23465,10 +22682,65 @@ xm xm xm xm +Ao +UC +gm +eU +ZY +DP +en xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +EI +"} +(23,1,1) = {" +EI xm xm xm @@ -23524,8 +22796,6 @@ xm xm xm xm -qy -YN xm xm xm @@ -23539,14 +22809,30 @@ xm xm xm zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +cw +zi WC -bQ +XI XI Fz -bQ -am +AP +rt zi -xm +lC xm xm xm @@ -23630,81 +22916,64 @@ xm xm xm xm -xm -Zt -xE -Nf -Nf -op -PY -Nw -Iu -fR -Nf -Nf -AQ -eO -KF -UZ -xm -Rk -Rk -Rk -Rk -Rk -xm -xm -Rk -Rk -Rk -Rk -xm -xm -xm -xm -xm -xm -NL -dD -Pv -PI -gH -ZB -ZB -TN -iI -zy -NL -dD -dD -dD -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +SJ +wJ +wJ +xX +nK +nK +HU +ZI +mx +UK +pb +mx +aK +Cj +mW +hw +hw +hw +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -23715,10 +22984,27 @@ xm xm xm xm +Ao +pp +FZ +Xg +mN +uA +Ao xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -23755,7 +23041,7 @@ xm xm EI "} -(23,1,1) = {" +(24,1,1) = {" EI xm xm @@ -23825,12 +23111,12 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi +OE +OE +Vo +Vo +Vo +OE zi xm xm @@ -23839,16 +23125,16 @@ xm xm xm xm -xm +cw zi -WC +rt +vo XI XI -Fz -AP +vo rt zi -xm +lC xm xm xm @@ -23932,80 +23218,63 @@ xm xm xm xm -xm -xm -xE -xE -Nf -Pb -TN +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +It +jr +wJ +xX +xX +pg +sG hl -xf -eO -lY -FO -hU -mi -eO -Kr -xm -Rk -Rk -Rk -Rk -Rk -xm -xm -Rk -Rk -Rk -Rk -xm -xm -xm -xm -xm -xm -NL -dD -yl -lE -Cj -Vc -FM -TN -dD -mW -zy -ts -dD -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm +vm +RG +mx +rN +aK +hw +hw +hw +ne +hw +hw +Eb +Eb +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -24017,10 +23286,27 @@ xm xm xm xm +Ao +Ao +Pm +Ao +Jh +Ao +Ao xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -24057,7 +23343,7 @@ xm xm EI "} -(24,1,1) = {" +(25,1,1) = {" EI xm xm @@ -24127,14 +23413,13 @@ xm xm xm zi +OE +cr +cr +cr +cr +OE zi -zi -zi -zi -zi -zi -zi -xm xm xm xm @@ -24142,15 +23427,16 @@ xm xm xm xm +cw zi -rt -vo -XI +Tc +bQ +Fz XI -vo -rt +DD +WC zi -xm +lC xm xm xm @@ -24235,200 +23521,58 @@ xm xm xm xm -xm -Zt -xE -xE -xE -TN -TN -uI -hL -dc -FO -FO -zf -SD -fR -xm -xm -xm -xm -xm -xm -xm -xm -Rk -Rk -Rk -Rk -xm -xm -xm -xm -xm -xm -NL -dD -yl -JW -PI -Db -Ux -py -dD -dD -EZ -dD -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -gw -Zt -Zt -Zt -Zt -xm -xm -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -EI -"} -(25,1,1) = {" -EI -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -zi +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +It +tH +wJ +xX +xX +Yu +Yu +Yu +MF +wV +mx +aK +mW +hw +hw +hw +hw +hw +hw +fB +hw +id +id +id +id +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX zi zi zi @@ -24444,176 +23588,6 @@ xm xm xm xm -zi -Tc -bQ -Fz -XI -DD -WC -zi -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -lw -lw -lw -lw -lw -lw -lw -lw -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -Zt -Zt -xE -xE -TN -TN -TN -FO -FO -FO -FO -FO -xm -xm -xm -xm -xm -xm -xm -xm -xm -zy -IM -IM -zy -xm -xm -xm -xm -xm -xm -IM -zR -TN -kW -ha -ha -Gh -TN -Zt -dD -Zt -Zt -gw -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -gw -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm xm xm xm @@ -24625,6 +23599,16 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -24731,21 +23715,21 @@ xm xm xm zi +OE +cr +cr +cr +cr +OE zi -zi -zi -zi -zi -zi -zi -xm -xm -xm xm xm xm xm xm +fb +no +Ed zi iL XI @@ -24754,7 +23738,7 @@ SY WC WC zi -xm +lC xm xm xm @@ -24840,81 +23824,70 @@ xm xm xm xm -xm -xm -Zt -Zt -xE -xE -xE -xE -FO -FO -FO -FO -QM -MF -xm -xm -xm -xm -Rk -Rk -Rk -Rk -Rk -zy -IM -zy -xm -Zt -Zt -xm -xm -Ju -li -hk -TN -vC -Re -de -TN -TN -Zt -Zt -Zt -gw -gw -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -gw -gw -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +AF +wJ +xX +xX +oA +JD +JD +LW +mD +Cj +mW +hw +hw +hw +hw +hw +sG +hw +hw +VM +hw +hw +hw +hw +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -24927,6 +23900,17 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -25033,21 +24017,21 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi +Vo +lE +Ie +cr +cr +OE zi xm xm xm xm xm -xm -cr -cr +cw +zi +zi zi WC BV @@ -25056,7 +24040,7 @@ vo rt zi zi -xm +lC xm xm xm @@ -25142,81 +24126,70 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +It +xX +wJ +xX +xX +oA +JD +JD +Zu +ie +hw +td +hw +sG +hw +hw +hw +hw +hw +tD +hw +id +id +id +id +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm -xm -xm -xm -Zt -Zt -Zt -gw -gw -gw -Zt -GQ -jE -jE -MF -Ju -xm -xm -Rk -Rk -Rk -Rk -Rk -zy -zy -Zt -Zt -Zt -Zt -Zt -Mg -dD -GQ -fV -TN -TN -TN -TN -TN -Zt -Zt -gw -gw -gw -Zt -Zt -Zt -gw -gw -gw -gw -gw -gw -gw -gw -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -25229,6 +24202,17 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -25335,19 +24319,19 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi +Vo +cr +lE +lE +cr +Vo zi xm xm xm xm xm -xm +cw zi zi WC @@ -25357,8 +24341,8 @@ XI dv rt zi -xm -xm +Uq +yK xm xm xm @@ -25445,76 +24429,69 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +It +xX +xX +xX +xX +JD +JD +JD +Zu +hw +tD +hw +FL +hw +hw +hw +hw +hw +hw +Bk +YI +hw +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm -xm -xm -Zt -Zt -Zt -Zt -gw -Zt -QM -dD -dD -GQ -dD -Wn -xm -Rk -Rk -Rk -Rk -Rk -zy -Zt -Zt -gw -gw -gw -gw -GQ -jE -dD -SJ -Zt -Zt -Zt -Zt -Zt -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -25527,6 +24504,13 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -25637,12 +24621,12 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi +OE +cr +cr +lE +cr +Vo zi Zk MY @@ -25659,7 +24643,7 @@ XI XI rt zi -xm +lC xm xm xm @@ -25747,76 +24731,69 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xk +ix +xk +Zu +fd +iv +OW +hw +hw +hw +hw +NM +hw +hw +hw +hw +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm -xm -xm -Zt -Zt -Zt -gw -gw -Zt -GQ -ZM -QM -Zt -xm -Zt -Rk -Rk -Rk -Rk -Rk -Zt -gw -gw -gw -Zt -Zt -gw -gw -Zt -jQ -Zt -Zt -Zt -Zt -Zt -gw -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -25828,6 +24805,13 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -25939,12 +24923,12 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi +OE +cr +cr +cr +cr +Vo zi qy As @@ -25961,7 +24945,7 @@ XI vo rt zi -xm +lC xm xm xm @@ -26049,76 +25033,69 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +eq +RE +hw +hw +hw +hw +sG +hw +ZJ +hw +hw +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm xm xm xm -Zt -Zt -Zt -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -gw -Zt -FO -ls -PZ -FO -gw -gw -Zt -Zt -Zt -gw -gw -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -26130,6 +25107,13 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -26241,20 +25225,20 @@ xm xm xm zi +OE +cr +cr +cr +cr +OE zi -zi -zi -zi -zi -zi -zi -xm xm xm xm xm xm -ec +cw +zi zi WC Lx @@ -26263,7 +25247,7 @@ XI qo iL zi -xm +lC xm xm xm @@ -26352,66 +25336,44 @@ xm xm xm xm -xm -xm -xm -xm -xm -Zt -Zt -Zt -gw -gw -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -gw -FO -FO -lh -Nt -si -OU -rJ -gw -gw -gw -gw -gw -FO -FO -FO -FO -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +gu +sG +hw +hw +gB +hw +hw +hw +hw +aQ +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -26421,6 +25383,21 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -26432,6 +25409,13 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -26543,20 +25527,20 @@ xm xm xm zi +Vo +cr +cr +cr +lE +OE zi -zi -zi -zi -zi -zi -zi -xm -xm xm xm xm xm xm +ZP +fR zi iL AZ @@ -26565,7 +25549,7 @@ bo iL Tc zi -xm +lC xm xm xm @@ -26656,60 +25640,38 @@ xm xm xm xm -xm -xm -xm -xm -Zt -Zt -Zt -gw -gw -gw -gw -gw -gw -gw -Zt -Zt -Zt -gw -gw -FO -FO -FO -FO -Ot -fM -Jd -FO -FO -FO -FO -FO -FO -FO -FO -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +Gi +UZ +hw +sG +hw +hw +hw +NA +aQ +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -26723,6 +25685,21 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm @@ -26734,6 +25711,13 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -26845,12 +25829,12 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi +Vo +cr +cr +lE +lE +OE zi xm xm @@ -26858,7 +25842,7 @@ xm xm xm xm -xm +cw zi iL XI @@ -26867,7 +25851,7 @@ SV WC zi zi -xm +lC xm xm xm @@ -26957,71 +25941,36 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -gw -gw -gw -gw -gw -FO -FO -FO -FO -nn -nc -Hw -lh -FO -FO -FO -FO -FO -FO -FO -FO -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +xm +xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +Gi +hw +hw +NA +NA +px +ts +xX +xX +xX +xX +xX +xX xm xm xm @@ -27029,6 +25978,33 @@ xm xm xm xm +ec +ec +ec +ec +ec +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm xm xm xm @@ -27037,6 +26013,14 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +xm xm xm xm @@ -27120,9 +26104,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -27147,12 +26131,12 @@ xm zi zi zi -zi -zi -zi -zi -zi -zi +Vo +cr +Xc +lE +lE +OE zi xm xm @@ -27160,7 +26144,7 @@ xm xm xm xm -xm +cw zi rt cu @@ -27168,8 +26152,8 @@ rt WC rt zi -xm -xm +Uq +yK xm xm xm @@ -27261,83 +26245,83 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +Gi +aQ +iX +iX +iX +HX +xX +xX +xX +xX +xX xm xm xm xm xm -Zt -Zt -Zt -Zt -Zt -Zt -Zt -FO -FO -FO -FO -FO -FO -FO -FO -FO -FO -uf -dA -Kj -FO -FO -FO -FO -FO -FO -FO -FO -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm xm +Bs +Bs +Bs xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -27422,9 +26406,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -27447,14 +26431,14 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi -zi -zi +Vo +Vo +Vo +cr +lE +lE +lE +OE zi xm xm @@ -27462,15 +26446,15 @@ xm xm xm xm -xm +cw zi zi -ec -ec -ec zi zi -xm +zi +zi +zi +lC xm xm xm @@ -27563,100 +26547,83 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +mZ +iX +iX +ts +xX +xX +xX +xX +xX xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -FO -FO -FO -FO -FO -FO -FO -FO -EF -XM -fL -BD -vs -FO -FO -FO -FO -FO -FO -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -27679,10 +26646,6 @@ xm xm xm xm -EI -"} -(36,1,1) = {" -EI xm xm xm @@ -27700,6 +26663,10 @@ xm xm xm xm +EI +"} +(36,1,1) = {" +EI xm xm xm @@ -27727,13 +26694,6 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi xm xm xm @@ -27765,9 +26725,6 @@ xm xm xm xm -hx -AI -OE xm xm xm @@ -27775,6 +26732,33 @@ xm xm xm xm +zi +Vo +cr +cr +cr +cr +lE +lE +Vo +zi +xm +xm +xm +xm +xm +xm +xm +hx +AI +OE +BC +BC +BC +BC +yK +xm +xm xm xm xm @@ -27865,72 +26849,46 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +mZ +iX +iX +ts +xX +xX +xX +xX xm xm xm -xm -xm -xm -xm -xm -xm -Zt -Zt -Zt -Zt -Zt -Zt -FO -FO -FO -FO -oT -hP -EL -XM -eq -FA -FO -FO -FO -FO -FO -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -27938,10 +26896,36 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -28026,9 +27010,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -28051,14 +27035,14 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi -zi -zi +Vo +cr +cr +cr +lE +lE +lE +Vo zi xm xm @@ -28167,6 +27151,23 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -28178,61 +27179,18 @@ xm xm xm xm -xm -Zt -Zt -Zt -Zt -FO -FO -FO -FO -cB -qa -Vj -aA -Mw -FO -Zt -Zt -Zt -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -28240,10 +27198,36 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -28328,9 +27312,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -28353,14 +27337,14 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi -zi -zi +OE +cr +cr +lE +lE +lE +lE +Vo zi xm xm @@ -28470,6 +27454,21 @@ xm xm xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -28482,59 +27481,18 @@ xm xm xm xm -Zt -Zt -Zt -Zt -FO -FO -FO -di -dL -XM -LO -KJ -Zu -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -28542,10 +27500,36 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -28630,9 +27614,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -28655,14 +27639,14 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi -zi -zi +OE +cr +cr +cr +lE +lE +lE +Vo zi xm xm @@ -28774,42 +27758,16 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -Zt -Zt -FO -FO -FO -Gi -XM -mZ -mk -aD -Zt -Zt -Zt -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX xm xm xm @@ -28825,6 +27783,18 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -28848,6 +27818,20 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -28932,9 +27916,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -28957,14 +27941,14 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi -zi -zi +OE +cr +cr +cr +cr +lE +lE +OE zi zi zi @@ -29078,36 +28062,11 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -Zt -Zt -FO -FO -NA -da -dL -ug -aD -Zt -Zt -xm -xm -xm -xm -xm -xm -xm +xX +xX +xX +xX +xX xm xm xm @@ -29126,6 +28085,18 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -29149,6 +28120,19 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -29234,9 +28218,13 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi +zi +zi +zi +zi zi zi zi @@ -29253,23 +28241,19 @@ xm xm xm xm -xm -xm -xm -xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi zi zi +OE +cr +cr +cr +cr +lE +lE +OE +OE +Vo +Vo zi zi SQ @@ -29382,27 +28366,9 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -Zt -Zt -FO -Us -cf -fL -LO -xS -Ed -Zt -Zt +xX +xX +xX xm xm xm @@ -29421,6 +28387,18 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -29444,6 +28422,12 @@ xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -29535,9 +28519,7 @@ xm xm xm xm -xm -xm -xm +zi zi zi zi @@ -29559,19 +28541,21 @@ xm xm xm xm +xm +xm zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +OE +OE +cr +cr +cr +wU +cr +lE +lE +lE +lE +OE zi zi xm @@ -29685,6 +28669,8 @@ xm xm xm xm +xX +xm xm xm xm @@ -29695,15 +28681,6 @@ xm xm xm xm -Zt -Zt -xi -Nt -yO -si -xS -Zt -Zt xm xm xm @@ -29716,6 +28693,13 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -29837,9 +28821,7 @@ xm xm xm xm -xm -xm -xm +zi zi zi zi @@ -29861,20 +28843,22 @@ xm xm xm xm +xm +xm zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +Vo +lE +Xc +cr +cr +cr +cr +cr +lE +lE +lE +Vo +Vo zi xm xm @@ -29979,6 +28963,13 @@ xm xm xm xm +lw +lw +lw +lw +lw +xm +xm xm xm xm @@ -29998,20 +28989,19 @@ xm xm xm xm -Zt -RB -wc -Na -eq -Ib -Zt -Zt xm xm xm xm xm xm +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -30037,12 +29027,6 @@ xm xm xm xm -lw -lw -lw -lw -lw -lw xm xm xm @@ -30139,9 +29123,7 @@ xm xm xm xm -xm -xm -xm +zi zi zi zi @@ -30163,20 +29145,22 @@ xm xm xm xm +xm +xm zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +Vo +lE +lE +cr +cr +cr +cr +cr +cr +lE +lE +lE +OE zi xm xm @@ -30277,6 +29261,18 @@ xm xm xm xm +lw +lw +lw +lw +lw +lw +lw +lw +lw +lw +lw +lw xm xm xm @@ -30300,14 +29296,14 @@ xm xm xm xm -Zt -MP -aW -Vj -NA -uJ -Zt xm +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -30336,18 +29332,6 @@ xm xm xm xm -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw xm xm xm @@ -30441,9 +29425,7 @@ xm xm xm xm -xm -xm -xm +zi zi zi zi @@ -30465,20 +29447,22 @@ xm xm xm xm +xm +xm zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +OE +lE +lE +lE +cr +cr +cr +cr +cr +cr +lE +lE +OE zi xm xm @@ -30576,40 +29560,52 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -Zt -FO -fL -LO -FO -Zt -xm +xm +xm +xm +lw +lw +lw +lw +lw +lw +lw +lw +lw +lw +lw +lw +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -30638,18 +29634,6 @@ xm xm xm xm -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw xm xm xm @@ -30743,9 +29727,7 @@ xm xm xm xm -xm -xm -xm +zi zi zi zi @@ -30767,20 +29749,22 @@ xm xm xm xm +xm +xm zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +OE +lE +lE +lE +cr +cr +cr +cr +Xc +cr +cr +lE +OE zi xm xm @@ -30881,6 +29865,18 @@ xm xm xm xm +lw +lw +lw +lw +lw +lw +lw +lw +lw +lw +lw +lw xm xm xm @@ -30900,6 +29896,18 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -30940,30 +29948,6 @@ xm xm xm xm -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm zy zy zy @@ -31045,9 +30029,7 @@ xm xm xm xm -xm -xm -xm +zi zi zi zi @@ -31069,20 +30051,22 @@ xm xm xm xm +xm +xm zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +OE +od +Br +lE +cr +cr +cr +cr +cr +cr +cr +cr +OE zi zi zi @@ -31183,6 +30167,18 @@ xm xm xm xm +lw +lw +lw +lw +lw +lw +lw +lw +lw +lw +lw +lw xm xm xm @@ -31202,6 +30198,18 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -31242,30 +30250,6 @@ xm xm xm xm -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm zy zy zy @@ -31347,9 +30331,7 @@ xm xm xm xm -xm -xm -xm +zi zi zi zi @@ -31371,22 +30353,24 @@ xm xm xm xm +xm +xm zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +OE +lE +lE +lE +lE +lE +lE +cr +cr +cr +cr +cr +Vo +Vo +Vo zi xm xm @@ -31487,6 +30471,14 @@ xm xm xm xm +lw +lw +lw +lw +lw +lw +lw +lw xm xm xm @@ -31508,6 +30500,18 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -31533,31 +30537,11 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -lw -xm -xm +Xz +Xz +Xz +Xz +Xz xm xm xm @@ -31649,9 +30633,7 @@ xm xm xm xm -xm -xm -xm +zi zi zi zi @@ -31673,22 +30655,24 @@ xm xm xm xm +xm +xm zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +OE +lE +lE +lE +lE +cr +cr +cr +cr +cr +cr +cr +cr +cr +OE zi xm xm @@ -31789,6 +30773,14 @@ xm xm xm xm +lw +lw +lw +lw +lw +lw +lw +lw xm xm xm @@ -31810,6 +30802,18 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -31832,41 +30836,21 @@ xm xm xm xm -Ao -TJ -cz -Ao -Ao -Ao -xm -xm -xm -xm -xm -xm -xm -xm -xm -lw -lw -lw -lw -lw -lw -lw -lw -lw -xm -xm -xm -xm -xm -xm -xm -xm xm xm xm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz xm xm xm @@ -31951,9 +30935,7 @@ xm xm xm xm -xm -xm -xm +zi zi zi zi @@ -31975,22 +30957,24 @@ xm xm xm xm +xm +xm zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +OE +OE +OE +OE +Vo +Vo +Vo +Vo +cr +cr +cr +cr +cr +cr +OE zi xm xm @@ -32120,6 +31104,18 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -32134,30 +31130,6 @@ xm xm xm xm -Ao -gN -kP -xh -kP -Ao -xm -xm -xm -xm -xm -xm -xm -xm -xm -lw -lw -lw -lw -lw -lw -lw -lw -lw xm xm xm @@ -32169,6 +31141,18 @@ xm xm xm xm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz xm xm xm @@ -32253,9 +31237,7 @@ xm xm xm xm -xm -xm -xm +zi zi zi zi @@ -32277,6 +31259,8 @@ xm xm xm xm +xm +xm zi zi zi @@ -32285,14 +31269,14 @@ zi zi zi zi -zi -zi -zi -zi -zi -zi -zi -zi +Vo +cr +cr +cr +cr +cr +lE +Vo zi xm xm @@ -32401,6 +31385,12 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi xm xm xm @@ -32416,6 +31406,18 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -32436,41 +31438,23 @@ xm xm xm xm -Ao -Cn -ZY -Fd -kP -Ao -xm -xm -xm -xm -xm -xm -xm -xm -xm -lw -lw -lw -lw -lw -lw -lw -lw -lw -zi -zi -zi -zi -zi -zi xm xm xm xm xm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz xm xm xm @@ -32555,9 +31539,7 @@ xm xm xm xm -xm -xm -xm +zi zi zi zi @@ -32586,15 +31568,17 @@ xm xm xm xm +xm +xm zi -zi -zi -zi -zi -zi -zi -zi -zi +Vo +cr +cr +cr +cr +Br +lE +Vo zi xm xm @@ -32703,6 +31687,12 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi xm xm xm @@ -32718,6 +31708,18 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -32738,41 +31740,23 @@ xm xm xm xm -Ao -bj -ZY -Al -ZY -YA -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -zi -zi -zi -zi -zi -zi xm xm xm xm xm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz xm xm xm @@ -32857,9 +31841,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -32889,14 +31873,14 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi -zi -zi +Vo +cr +cr +cr +lE +lE +lE +Vo zi xm xm @@ -33005,6 +31989,12 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi xm xm xm @@ -33020,6 +32010,18 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -33040,41 +32042,23 @@ xm xm xm xm -Ao -fK -kP -Cb -ZY -Ao -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -zi -zi -zi -zi -zi -zi xm xm xm xm xm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz xm xm xm @@ -33159,9 +32143,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -33191,14 +32175,14 @@ xm xm xm zi -zi -zi -zi -zi -zi -zi -zi -zi +OE +OE +OE +OE +OE +OE +OE +OE zi xm xm @@ -33307,6 +32291,12 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi xm xm xm @@ -33321,6 +32311,20 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -33336,47 +32340,27 @@ xm xm xm xm -SU -SU -SU -SU -SU -xm -Ao -Yq -kP -kP -ke -Ao -Ao -Ao -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm xm xm xm xm -zi -zi -zi -zi -zi -zi xm xm xm xm xm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz xm xm xm @@ -33461,9 +32445,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -33585,89 +32569,30 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -zy -zy -zy -zy -zy -zy -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -SU -SU -SU -SU -SU -SU -SU -SU -SU -xm -Ao -Ao -Ao -yS -Ao -Ao -zG -Ao -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm zi zi zi @@ -33682,6 +32607,65 @@ xm xm xm xm +xm +xm +xm +xm +xm +xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +xm +xm +xm +xm +xm +xm zy zy zy @@ -33763,9 +32747,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -33910,14 +32894,13 @@ xm xm xm xm -zy -zy -zy -zy -zy -zy -xm xm +zi +zi +zi +zi +zi +zi xm xm xm @@ -33932,28 +32915,26 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm xm -SU -SU -SU -SU -SU -SU -SU -SU -SU xm xm -Ao -uL -ZY -kP -kP -vj -Ao xm xm xm @@ -33970,14 +32951,17 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi xm xm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz xm xm xm @@ -34065,9 +33049,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -34212,13 +33196,13 @@ xm xm xm xm -zy -zy -zy -zy -zy -zy xm +zi +zi +zi +zi +zi +zi xm xm xm @@ -34233,29 +33217,26 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm xm xm -SU -SU -SU -SU -SU -SU -SU -SU -SU -SU xm -Ao -UC -gm -eU -ZY -DP -en xm xm xm @@ -34272,14 +33253,17 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi xm xm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz xm xm xm @@ -34367,9 +33351,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -34500,80 +33484,21 @@ xm xm xm xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -zy -zy -zy -zy -zy -zy -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -SU -SU -SU -SU -SU -SU -SU -SU -SU -SU -xm -Ao -pp -FZ -Xg -mN -uA -Ao -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm zi zi zi @@ -34588,6 +33513,65 @@ xm xm xm xm +xm +xm +xm +xm +xm +xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +xm +xm +xm +xm +xm +xm zy zy zy @@ -34669,9 +33653,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -34816,13 +33800,13 @@ xm xm xm xm -zy -zy -zy -zy -zy -zy xm +zi +zi +zi +zi +zi +zi xm xm xm @@ -34837,29 +33821,26 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +xm xm xm xm xm xm -SU -SU -SU -SU -SU -SU -SU -SU -SU -SU xm -Ao -Ao -Pm -Ao -Jh -Ao -Ao xm xm xm @@ -34876,14 +33857,17 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi xm xm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz xm xm xm @@ -34971,9 +33955,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -35119,6 +34103,12 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi xm xm xm @@ -35133,6 +34123,19 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -35144,19 +34147,6 @@ xm xm xm xm -SU -SU -SU -SU -SU -SU -SU -SU -SU -SU -xm -xm -xm xm xm xm @@ -35178,12 +34168,6 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi xm xm xm @@ -35273,9 +34257,9 @@ xm xm xm xm -xm -xm -xm +zi +zi +zi zi zi zi @@ -35421,6 +34405,12 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi xm xm xm @@ -35435,6 +34425,19 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -35446,25 +34449,6 @@ xm xm xm xm -SU -SU -SU -SU -SU -SU -SU -SU -SU -SU -xm -xm -xm -xm -xm -xm -xm -xm -xm xm xm xm @@ -35723,6 +34707,12 @@ xm xm xm xm +zi +zi +zi +zi +zi +zi xm xm xm @@ -35737,6 +34727,19 @@ xm xm xm xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec xm xm xm @@ -35748,25 +34751,6 @@ xm xm xm xm -SU -SU -SU -SU -SU -SU -SU -SU -SU -SU -xm -xm -xm -xm -xm -xm -xm -xm -xm xm xm xm diff --git a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm index ce90f5f1a4..b39c0b3f23 100644 --- a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm +++ b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm @@ -18,32 +18,40 @@ /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) "aaz" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, -/obj/item/wallframe/apc/fusebox, -/turf/open/indestructible/ground/outside/road, -/area/f13/building/abandoned/k) +/obj/item/clothing/mask/chameleon, +/obj/item/clothing/glasses/hud/diagnostic{ + pixel_y = 6 + }, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "aaC" = ( -/obj/structure/rack, -/obj/item/clothing/under/f13/formal, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded"; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "aaG" = ( /obj/machinery/hydroponics/soil, /obj/machinery/light, /turf/open/indestructible/ground/outside/desert, /area/maintenance/bar) "aaJ" = ( -/obj/effect/spawner/lootdrop/f13/armor/random, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 +/obj/structure/table/wood/junk, +/obj/item/clothing/mask/cigarette/rollie/cannabis{ + pixel_y = 5 }, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 +/obj/item/clothing/mask/cigarette/rollie/cannabis{ + pixel_y = 10 }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) +/obj/item/clothing/mask/cigarette/rollie/cannabis{ + pixel_y = 15 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "aaL" = ( /obj/structure/stairs/north{ color = "#A47449" @@ -64,16 +72,6 @@ /obj/machinery/vending/cola, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/t) -"aaO" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/item/trash/f13/c_ration_3{ - pixel_y = 11; - pixel_x = 11 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "aaR" = ( /obj/item/ammo_box/magazine/m556/rifle/empty{ pixel_x = 6; @@ -168,6 +166,15 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"acf" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "acg" = ( /obj/structure/chair{ dir = 4 @@ -215,15 +222,6 @@ /obj/item/ingot/uranium, /turf/open/floor/plating/rust, /area/f13/building/powered) -"adi" = ( -/obj/structure/chair/wood{ - dir = 1 - }, -/obj/effect/landmark/start/f13/ncrtrooper, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/wasteland) "adp" = ( /obj/effect/decal/cleanable/oil/streak, /obj/effect/decal/cleanable/dirt{ @@ -240,6 +238,12 @@ }, /turf/open/floor/plasteel/f13/vault_floor/red/white, /area/f13/ambientlighting/building/j) +"adR" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_common{ + icon_state = "common-broken2" + }, +/area/f13/ambientlighting/building/m) "adY" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/dirt{ @@ -255,26 +259,25 @@ /turf/closed/wall/f13/wood/interior, /area/f13/ncr) "aeE" = ( -/obj/structure/rack, -/obj/item/clothing/under/blacktango, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outercorner" + }, +/area/f13/wasteland) "aeX" = ( /obj/structure/car/rubbish4, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "aeY" = ( -/obj/structure/sign/departments/medbay/alt{ - name = "TRIAGE" - }, -/turf/closed/wall/f13/wood, -/area/f13/ncr) -"afq" = ( -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" +/obj/effect/decal/cleanable/cobweb, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 }, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "aft" = ( /obj/item/stack/sheet/animalhide/human, /turf/open/indestructible/ground/outside/graveldirt, @@ -520,9 +523,11 @@ }, /area/f13/ambientlighting/building/y) "ajU" = ( -/obj/machinery/light, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) "ajV" = ( /obj/structure/simple_door/metal/store{ icon_state = "brokenstore" @@ -563,8 +568,17 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "akT" = ( -/turf/open/indestructible/ground/outside/snow, -/area/f13/ncr) +/obj/structure/fluff/rails{ + icon_state = "rails-b1"; + pixel_y = 11; + pixel_x = -3 + }, +/obj/structure/fluff/rails{ + icon_state = "rails-r"; + dir = 8 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "akU" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -691,16 +705,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) -"amC" = ( -/obj/structure/rack, -/obj/item/defibrillator/loaded, -/obj/item/toy/figure/chemist{ - pixel_y = 16; - pixel_x = -8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "amQ" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -728,6 +732,12 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"anA" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/f13/weapon/melee/tier3, +/obj/effect/spawner/lootdrop/low_tools, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/w) "anB" = ( /obj/effect/landmark/poster_spawner/pinup, /turf/closed/wall/f13/wood/house, @@ -769,19 +779,30 @@ name = "dirty floor" }, /area/f13/building/powered) +"aoB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/structure/rack/large/shelf_rust, +/obj/machinery/light, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "aoD" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/machinery/power/port_gen/infinite/diesel{ - anchored = 1; - active = 1 +/obj/structure/fence/wooden{ + dir = 8 }, -/obj/structure/cable/outdoors{ - icon_state = "0-8" +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"aoO" = ( +/obj/item/restraints/legcuffs/bola, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/area/f13/ambientlighting/building/m) "aoV" = ( /obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt{ @@ -836,6 +857,13 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/w) +"apx" = ( +/obj/machinery/food_cart, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) "apD" = ( /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) @@ -895,12 +923,9 @@ }, /area/f13/building/powered) "aqx" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/caves) +/obj/structure/sign/warning/radiation, +/turf/closed/indestructible/rock, +/area/f13/wasteland) "aqy" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/sidewalk{ @@ -1009,10 +1034,11 @@ }, /area/f13/wasteland) "aso" = ( -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 8 }, -/area/f13/ambientlighting/building/h) +/area/f13/wasteland) "asD" = ( /mob/living/simple_animal/hostile/raider/thief, /turf/open/indestructible/ground/outside/dirt, @@ -1223,12 +1249,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +"avq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +"avs" = ( +/obj/structure/table/wood/club, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "avt" = ( +/obj/structure/table/wood/junk, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" - }, -/area/f13/ambientlighting/building/p) +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "avu" = ( /obj/machinery/light/small{ dir = 1 @@ -1246,10 +1281,13 @@ }, /area/f13/wasteland/followers) "avw" = ( -/obj/structure/closet, -/obj/item/crafting/lunchbox, -/turf/open/floor/f13/wood, -/area/f13/wasteland) +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "avz" = ( /obj/structure/chair/wood{ dir = 1 @@ -1366,6 +1404,16 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +"awS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "axa" = ( /obj/effect/decal/cleanable/blood/gibs/human/limb, /turf/open/indestructible/ground/outside/dirt{ @@ -1428,13 +1476,13 @@ }, /mob/living/simple_animal/hostile/ghoul, /obj/item/stock_parts/cell/high/empty, -/obj/effect/spawner/lootdrop/trash, /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "axO" = ( -/turf/closed/wall/f13/wood/house, -/area/f13/ambientlighting/building/h) +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "axR" = ( /obj/effect/decal/cleanable/glass, /turf/open/indestructible/ground/inside/dirt, @@ -1461,14 +1509,9 @@ }, /area/f13/building/abandoned/h) "ayd" = ( -/obj/structure/rack, -/obj/item/clothing/under/f13/relaxedwear{ - pixel_x = 8; - pixel_y = -4 - }, -/obj/item/clothing/under/f13/spring, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "aye" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -1493,11 +1536,11 @@ }, /area/f13/building/powered) "ayt" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) "ayH" = ( /obj/structure/chair/middle{ dir = 8 @@ -1605,6 +1648,12 @@ }, /turf/open/indestructible/ground/outside/dirt/harsh, /area/f13/followers) +"azN" = ( +/obj/structure/flora/branch_broken, +/obj/structure/flora/twig3, +/obj/structure/flora/twig4, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "azW" = ( /obj/structure/closet/crate/bin/trash_fallout{ pixel_y = 16 @@ -1629,6 +1678,12 @@ /obj/structure/sign/yield, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"aAo" = ( +/obj/effect/spawner/lootdrop/druggie_pill, +/turf/open/floor/f13/wood{ + icon_state = "housebase4-broken" + }, +/area/f13/ambientlighting/building/m) "aAE" = ( /obj/effect/decal/cleanable/oil, /turf/open/indestructible/ground/outside/sidewalk, @@ -1679,6 +1734,10 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"aBR" = ( +/obj/machinery/door/morgue, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "aCd" = ( /obj/structure/table, /obj/item/storage/box/beakers, @@ -1759,10 +1818,12 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/building/tribal) "aDt" = ( -/obj/structure/flora/tree/tall, +/obj/structure/closet/crate/trashcart, +/obj/item/trash/f13/rotten, +/obj/item/trash/f13/rotten, +/obj/item/trash/f13/rotten, /turf/open/indestructible/ground/outside/sidewalk{ - dir = 1; - icon_state = "outerpavement" + icon_state = "verticaloutermain2" }, /area/f13/wasteland) "aDA" = ( @@ -1834,6 +1895,12 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/m) +"aEq" = ( +/obj/machinery/food_cart, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) "aEv" = ( /obj/machinery/workbench, /obj/machinery/light, @@ -1933,12 +2000,10 @@ }, /area/f13/wasteland) "aFU" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/dirt{ - dir = 8; - icon_state = "dirt" - }, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "aFX" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/outside/dirt{ @@ -2004,10 +2069,6 @@ /mob/living/simple_animal/hostile/eyebot, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) -"aHg" = ( -/obj/machinery/autolathe, -/turf/open/floor/wood_wide, -/area/f13/ncr) "aHk" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/f13/wood, @@ -2058,6 +2119,22 @@ icon_state = "horizontaloutermain0" }, /area/f13/casino) +"aIa" = ( +/obj/machinery/vending/cigarette, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"aIc" = ( +/obj/structure/chair/wood{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/machinery/light{ + dir = 4; + pixel_y = -16 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "aIi" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt{ @@ -2134,12 +2211,13 @@ }, /area/f13/wasteland) "aJw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start/f13/ncrmedofficer, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken3" +/obj/effect/decal/cleanable/generic, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" }, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "aJx" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -2261,6 +2339,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/t) +"aLq" = ( +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_4"; + layer = 5 + }, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, +/area/f13/wasteland) "aLr" = ( /obj/structure/barricade/wooden/strong, /obj/structure/barricade/wooden/planks, @@ -2338,6 +2425,10 @@ /obj/effect/decal/cleanable/ash, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"aMe" = ( +/obj/structure/debris/v3, +/turf/closed/indestructible/rock, +/area/f13/wasteland) "aMj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -2377,12 +2468,6 @@ icon_state = "reddirtyfull" }, /area/f13/brotherhood) -"aMQ" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "aMZ" = ( /obj/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -2470,12 +2555,11 @@ /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) "aOz" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 10 +/obj/structure/wreck/trash/five_tires, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/area/f13/wasteland) "aOB" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerborder"; @@ -2520,6 +2604,13 @@ }, /turf/open/floor/plating/dirt/dark, /area/f13/building/abandoned/g) +"aPG" = ( +/obj/structure/junk/small/tv{ + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "aPJ" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowbrokenvertical" @@ -2560,12 +2651,9 @@ }, /area/f13/building/abandoned/h) "aPP" = ( -/obj/effect/decal/remains/human, -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "aPS" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/dirt{ @@ -2624,6 +2712,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +"aQE" = ( +/obj/structure/chair/stool{ + dir = 8; + icon_state = "bench"; + pixel_y = 17 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) "aQF" = ( /obj/structure/fence/wooden{ dir = 1 @@ -2749,6 +2847,11 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +"aSp" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermainright" + }, +/area/f13/wasteland) "aSu" = ( /obj/structure/window/reinforced/spawner, /obj/structure/window/reinforced/spawner/west, @@ -2820,13 +2923,13 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "aTG" = ( -/obj/machinery/door/unpowered/securedoor{ - req_one_access_txt = "121" - }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/ncr) +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/cloth/ten, +/obj/item/stack/sheet/glass/ten, +/obj/item/stack/sheet/glass/ten, +/obj/item/stack/sheet/mineral/limestone/five, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "aTK" = ( /obj/structure/toilet, /obj/effect/decal/cleanable/dirt, @@ -2866,12 +2969,6 @@ "aTW" = ( /turf/closed/mineral/random, /area/f13/wasteland) -"aTY" = ( -/obj/structure/flora/tree/wasteland, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow5" - }, -/area/f13/wasteland) "aUc" = ( /obj/structure/flora/tree/wasteland, /turf/open/indestructible/ground/outside/desert, @@ -2895,11 +2992,12 @@ }, /area/f13/ambientlighting/building/j) "aUl" = ( -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/cloth/ten, +/obj/item/stack/sheet/glass/ten, +/obj/item/stack/sheet/metal/ten, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "aUD" = ( /obj/structure/fence/wooden{ dir = 1 @@ -2929,15 +3027,6 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) -"aVc" = ( -/obj/structure/flora/stump{ - pixel_x = -27; - pixel_y = 16 - }, -/obj/structure/flora/branch_broken, -/obj/structure/destructible/tribal_torch/wall/lit, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "aVe" = ( /obj/effect/spawner/lootdrop/f13/alcoholspawner, /obj/structure/table/wood/fancy, @@ -3072,11 +3161,11 @@ }, /area/f13/wasteland) "aXd" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 9 +/obj/structure/table/snooker{ + dir = 1 }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "aXh" = ( /obj/structure/fence, /obj/effect/overlay/desert_side{ @@ -3113,11 +3202,6 @@ /obj/effect/mapping_helpers/network_builder/power_cable/cyan, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) -"aXo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/start/f13/ncrrearechelon, -/turf/open/floor/wood_wide, -/area/f13/ncr) "aXw" = ( /obj/effect/turf_decal/huge{ dir = 4 @@ -3260,10 +3344,12 @@ /obj/item/reagent_containers/food/snacks/grown/poppy, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) -"aZg" = ( -/obj/effect/turf_decal/weather/snow/corner, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +"aZi" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "aZj" = ( /turf/open/floor/plasteel/dark, /area/engine/workshop) @@ -3300,13 +3386,6 @@ "aZz" = ( /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ambientlighting/building/x) -"aZA" = ( -/obj/item/storage/toolbox/mechanical{ - pixel_y = 14; - pixel_x = 5 - }, -/turf/open/floor/wood_wide, -/area/f13/ncr) "aZK" = ( /obj/structure/rack/large/shelf_rust, /turf/open/indestructible/ground/outside/sidewalk, @@ -3316,8 +3395,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "aZV" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/f13/wood, +/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) "aZY" = ( /obj/machinery/light{ @@ -3535,17 +3615,11 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) -"bcQ" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) +"bcP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/human, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "bdc" = ( /obj/structure/debris/v4, /turf/open/indestructible/ground/outside/sidewalk, @@ -3577,6 +3651,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"bdR" = ( +/obj/structure/stairs/north{ + color = "#A47449" + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1; + layer = 10000 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/caves) "bdW" = ( /obj/structure/rack/shelf_metal, /obj/effect/mapping_helpers/network_builder/power_cable/auto, @@ -3587,13 +3671,10 @@ /turf/open/floor/wood_common, /area/f13/building/abandoned/x) "bdX" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "ber" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/dirt{ @@ -3635,16 +3716,6 @@ }, /turf/open/floor/wood_common/wood_common_light, /area/f13/ncr) -"beU" = ( -/obj/item/kirbyplants{ - icon_state = "plant-12"; - pixel_y = 21; - pixel_x = -14 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) "bfb" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -3701,6 +3772,18 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"bfO" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) +"bfU" = ( +/obj/structure/wreck/trash/machinepile, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "bgd" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/indestructible/ground/outside/dirt, @@ -3723,22 +3806,9 @@ dir = 5 }, /area/f13/wasteland) -"bgn" = ( -/obj/machinery/microwave/stove, -/obj/item/crafting/coffee_pot{ - pixel_y = 15 - }, -/obj/structure/sign/poster/prewar/poster74{ - pixel_x = 32 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "bgw" = ( -/obj/structure/table/wood, -/obj/structure/barricade/sandbags, -/obj/structure/barricade/bars, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/turf/closed/wall/r_wall/rust, +/area/f13/sewer/powered) "bgC" = ( /obj/effect/overlay/desert_side{ dir = 8 @@ -3758,6 +3828,26 @@ /obj/structure/nest/scorpion, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) +"bgH" = ( +/obj/item/storage/trash_stack{ + icon_state = "Junk_3" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +"bgK" = ( +/obj/machinery/light{ + dir = 4; + light_color = "#228B22" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +"bgM" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "bgO" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/light/lampost{ @@ -3889,10 +3979,9 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "biF" = ( -/obj/structure/table/booth, -/obj/item/reagent_containers/food/drinks/coffee, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/effect/mob_spawn/human/corpse/enclavescientist, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "biH" = ( /obj/structure/closet/locker/fridge, /obj/item/reagent_containers/food/snacks/f13/gecko_kebab, @@ -3934,7 +4023,7 @@ }, /area/f13/wasteland) "bjo" = ( -/obj/structure/wreck/car/bike, +/obj/structure/chair/bench, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, @@ -3967,8 +4056,9 @@ /turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) "bki" = ( -/turf/closed/wall/f13/tentwall, -/area/f13/ncr) +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "bko" = ( /obj/item/flag/khan, /turf/open/indestructible/ground/outside/road, @@ -4070,13 +4160,10 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/ambientlighting/building/c) "blR" = ( -/obj/structure/table/wood, -/obj/machinery/computer/terminal{ - dir = 1; - pixel_y = 4 - }, -/turf/open/floor/carpet/red, -/area/f13/ncr) +/obj/effect/spawner/lootdrop/wastelootgood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "blS" = ( /obj/item/storage/trash_stack{ icon_state = "trash_2" @@ -4178,6 +4265,14 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/o) +"bnJ" = ( +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "bnK" = ( /obj/machinery/light{ dir = 1 @@ -4202,6 +4297,13 @@ /obj/item/storage/box/medicine/antivenom5, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"bnO" = ( +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "bof" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/curtain{ @@ -4246,16 +4348,11 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "bpa" = ( -/obj/structure/table/wood, -/obj/machinery/chem_master/condimaster{ - pixel_y = 17 - }, -/obj/machinery/reagentgrinder{ - pixel_y = -1; - pixel_x = -2 +/obj/structure/wreck/trash/machinepile, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/area/f13/wasteland) "bph" = ( /obj/machinery/door/airlock/virology/glass{ req_one_access_txt = "133" @@ -4268,10 +4365,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) -"bpn" = ( -/obj/structure/flora/stump, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "bpo" = ( /turf/open/indestructible/ground/outside/road, /area/f13/ambientlighting/building/o) @@ -4285,13 +4378,13 @@ /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/x) "bpA" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 }, -/obj/effect/spawner/lootdrop/trash, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood_fancy/wood_fancy_dark, -/area/f13/bar) +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) "bpC" = ( /obj/machinery/light{ dir = 4 @@ -4340,8 +4433,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) "bqb" = ( -/turf/closed/wall/f13/wood, -/area/f13/ncr) +/mob/living/simple_animal/hostile/radscorpion/black, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "bqj" = ( /mob/living/simple_animal/hostile/ghoul/legendary, /turf/open/floor/wood_common, @@ -4354,6 +4449,12 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"bqo" = ( +/obj/item/trash/f13/tin, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "bqB" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft1" @@ -4365,25 +4466,11 @@ icon_state = "verticaloutermain2" }, /area/f13/wasteland) -"bqI" = ( -/obj/machinery/radioterminal/ncr, -/obj/structure/curtain{ - color = "#808080"; - pixel_x = -32 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "bqM" = ( -/mob/living/simple_animal/hostile/handy/protectron{ - faction = list("NCR"); - enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); - name = "National Guard Protectron"; - desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain1" - }, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "bqN" = ( /obj/effect/turf_decal/huge, /obj/effect/decal/cleanable/greenglow, @@ -4425,6 +4512,12 @@ }, /turf/open/floor/plating/rust, /area/f13/followers) +"bro" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "brw" = ( /obj/structure/debris/v3{ layer = 2; @@ -4461,14 +4554,6 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) -"brU" = ( -/obj/structure/table/wood, -/obj/item/clothing/head/helmet/f13/ncr/gambler{ - pixel_y = -3; - pixel_x = -4 - }, -/turf/open/floor/wood_wide, -/area/f13/ncr) "bsi" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/bottle/blackpowder, @@ -4484,11 +4569,13 @@ }, /area/f13/brotherhood) "bsp" = ( -/mob/living/simple_animal/hostile/radscorpion/black, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/rust, -/area/f13/caves) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "bsA" = ( /obj/structure/rack, /obj/item/flashlight{ @@ -4576,10 +4663,25 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "btN" = ( -/obj/structure/obstacle/barbedwire/end{ - dir = 4 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/chair/bench, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" }, -/turf/open/indestructible/ground/outside/snow, /area/f13/wasteland) "btS" = ( /obj/structure/closet/fridge, @@ -4670,16 +4772,6 @@ icon_state = "verticalleftborderleft1" }, /area/f13/wasteland) -"bvB" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/structure/sink/well{ - pixel_x = -20 - }, -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "bvI" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13, @@ -4730,9 +4822,16 @@ /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/powered) "bwE" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/obj/effect/spawner/lootdrop/f13/junkspawners, +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench"; + pixel_y = 17 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "bwK" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, @@ -4778,6 +4877,13 @@ /obj/structure/reagent_dispensers/barrel/three, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"bxu" = ( +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbrokenvertical" + }, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "bxC" = ( /obj/structure/closet/fridge, /obj/effect/decal/cleanable/dirt, @@ -4861,6 +4967,12 @@ }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +"byK" = ( +/obj/machinery/light/lampost{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) "byM" = ( /obj/structure/table/wood, /turf/open/floor/f13{ @@ -4875,6 +4987,13 @@ }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +"byR" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/mob/living/simple_animal/hostile/ghoul, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "bzf" = ( /obj/structure/tires/two, /turf/open/indestructible/ground/outside/road{ @@ -4896,20 +5015,22 @@ /obj/effect/overlay/desert_side, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"bzw" = ( +/obj/effect/decal/cleanable/glass, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "bzD" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/glass/beaker/waterbottle{ - pixel_y = 4; - pixel_x = 4 - }, -/obj/item/reagent_containers/food/drinks/flask{ - pixel_y = 3; - pixel_x = -5 - }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" +/obj/item/kirbyplants/dead{ + desc = "A mummified potted plant."; + name = "very dead potted plant"; + pixel_x = -1; + pixel_y = 11 }, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "bzH" = ( /obj/item/storage/toolbox/mechanical, /obj/effect/decal/cleanable/dirt{ @@ -4984,12 +5105,9 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "bBb" = ( -/obj/structure/railing/corner{ - color = "#A47449" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/structure/flora/rock/pile/largejungle, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "bBi" = ( /obj/structure/car, /turf/open/indestructible/ground/outside/road{ @@ -5026,19 +5144,9 @@ }, /area/f13/building/powered) "bBF" = ( -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/head/beret/headband, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/mask/bandana/black, -/obj/item/clothing/mask/bandana/blue, -/obj/item/clothing/mask/bandana/durathread, -/obj/item/clothing/mask/bandana/gold, -/obj/item/clothing/mask/bandana/green, -/obj/item/clothing/mask/bandana/red, -/obj/item/clothing/mask/bandana/skull, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/oil, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "bBR" = ( /obj/structure/debris/v3, /turf/open/indestructible/ground/outside/dirt{ @@ -5073,10 +5181,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/maintenance/bar) -"bCH" = ( -/mob/living/simple_animal/chicken, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "bCK" = ( /turf/closed/wall/f13/tunnel, /area/f13/building/abandoned/h) @@ -5093,6 +5197,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"bDg" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "bDh" = ( /mob/living/simple_animal/hostile/eyebot, /turf/open/indestructible/ground/outside/desert{ @@ -5100,12 +5208,15 @@ }, /area/f13/wasteland) "bDm" = ( -/obj/structure/window/fulltile/ruins{ - icon_state = "ruinswindowbrokenvertical" +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 }, -/obj/structure/barricade/wooden/planks/pregame, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/turf/open/indestructible/ground/outside/road{ + dir = 1; + icon_state = "horizontaltopborderbottom0" + }, +/area/f13/wasteland) "bDo" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -5129,11 +5240,9 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "bDA" = ( -/obj/item/card/id/rusted/brokenholodog/enclave, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/caves) +/obj/machinery/seed_extractor, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "bDG" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/structure/reagent_dispensers/barrel/dangerous{ @@ -5263,9 +5372,12 @@ }, /area/f13/ambientlighting/building/y) "bFn" = ( -/obj/structure/cargocrate, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "bFt" = ( /turf/open/indestructible/ground/outside/sidewalkdirt{ icon_state = "horizontalbottomborderbottom0" @@ -5291,6 +5403,10 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +"bFS" = ( +/obj/effect/spawner/lootdrop/f13/weapon/gun/energy/mid, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "bFW" = ( /obj/effect/decal/cleanable/blood{ icon_state = "floor6" @@ -5298,18 +5414,17 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "bFX" = ( -/obj/structure/stairs/north{ - color = "#A47449" - }, -/obj/structure/sign/poster/contraband/buzzfuzz{ - pixel_y = 32 +/obj/effect/turf_decal/weather/dirt{ + dir = 9 }, -/turf/open/floor/wood_wide, -/area/f13/ncr) +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "bFY" = ( -/obj/structure/wreck/trash/engine, -/turf/open/floor/plating/f13/outside/road, -/area/f13/ambientlighting/building/w) +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) "bGd" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/barricade/sandbags, @@ -5338,27 +5453,20 @@ }, /turf/closed/wall/mineral/wood, /area/f13/wasteland/legion) -"bGB" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/hypospray/medipen/stimpak/super{ - pixel_x = 1; - pixel_y = 8 - }, -/obj/item/reagent_containers/hypospray/medipen/stimpak{ - pixel_x = -2 - }, -/obj/structure/sign/poster/ncr/democracy{ - pixel_y = -32 +"bGD" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_2" }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop3" }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) -"bGH" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"bGH" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul/glowing/strong/legendary, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "bGL" = ( /obj/structure/cable/outdoors{ icon_state = "4-8" @@ -5384,17 +5492,13 @@ /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) "bGS" = ( -/obj/structure/cable/outdoors{ - icon_state = "4-8" - }, -/mob/living/simple_animal/hostile/handy/protectron{ - faction = list("NCR"); - enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); - name = "National Guard Protectron"; - desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/machinery/light{ + dir = 8 }, -/turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/ncr) +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "bHd" = ( /obj/effect/decal/fakelattice, /obj/structure/disposalpipe/segment{ @@ -5423,24 +5527,8 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/underground/cave) "bHu" = ( -/obj/structure/table/wood, -/obj/item/kirbyplants{ - icon_state = "plant-25"; - pixel_y = 18; - pixel_x = -6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/fancy/donut_box{ - pixel_y = -5 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) -"bHF" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/obj/effect/landmark/start/f13/ncrconscript, -/turf/open/indestructible/ground/outside/graveldirt, +/obj/structure/flora/rock/jungle, +/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "bHH" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -5484,13 +5572,12 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "bHY" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/outdoors, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "bHZ" = ( /turf/open/floor/wood_common/wood_common_dark, /area/f13/building/abandoned/m) @@ -5647,6 +5734,17 @@ }, /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/j) +"bLf" = ( +/obj/structure/statue/petrified, +/obj/item/clothing/under/f13/ravenharness, +/obj/item/gun/ballistic/automatic/assault_carbine/policerifle{ + layer = -3 + }, +/obj/item/clothing/head/cowboyhat{ + pixel_y = 15 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "bLo" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/indestructible/ground/outside/dirt{ @@ -5654,9 +5752,14 @@ icon_state = "dirt" }, /area/f13/wasteland) -"bLC" = ( -/turf/open/floor/plating/dirt, -/area/f13/ncr) +"bLv" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_2" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2" + }, +/area/f13/wasteland) "bLE" = ( /obj/structure/flora/grass/coyote/twentynine, /turf/open/indestructible/ground/outside/desert, @@ -5679,6 +5782,10 @@ /obj/machinery/recharger, /turf/open/floor/plasteel/f13/vault_floor/red/whiteredfull, /area/f13/brotherhood) +"bLZ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) "bMj" = ( /obj/structure/simple_door/metal/dirtystore, /obj/effect/decal/cleanable/dirt, @@ -5693,12 +5800,6 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/a) -"bMp" = ( -/obj/structure/fluff/hedge, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/ncr) "bMJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old{ @@ -5731,13 +5832,6 @@ /obj/machinery/computer/slot_machine, /turf/open/floor/carpet/purple, /area/f13/bar) -"bNa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "bNc" = ( /obj/structure/chair/booth{ icon_state = "booth_west_south" @@ -5771,6 +5865,11 @@ icon_state = "floordirtysolid" }, /area/f13/wasteland) +"bNp" = ( +/obj/structure/table/wood/junk, +/obj/item/melee/onehanded/knife/ritualdagger, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "bNw" = ( /obj/effect/turf_decal/huge{ dir = 4 @@ -5823,13 +5922,6 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) -"bNV" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/structure/destructible/tribal_torch/wall/lit, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "bNY" = ( /obj/effect/decal/remains{ icon_state = "remains" @@ -5839,15 +5931,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"bOc" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/item/storage/trash_stack{ - pixel_y = 18 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "bOd" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/dirt{ @@ -5868,6 +5951,16 @@ /obj/item/storage/fancy/donut_box, /turf/open/floor/carpet/royalblack, /area/f13/building/abandoned/l) +"bOC" = ( +/obj/structure/fence/end/wooden{ + dir = 8 + }, +/obj/item/flag/legion{ + pixel_y = 28; + pixel_x = 1 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "bOE" = ( /mob/living/simple_animal/hostile/raider/firefighter, /turf/open/indestructible/ground/outside/road{ @@ -5921,7 +6014,6 @@ dir = 4; pixel_x = 10 }, -/obj/effect/spawner/lootdrop/trash, /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) @@ -6109,11 +6201,12 @@ /turf/open/floor/plating, /area/f13/bar) "bRy" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/item/stack/f13Cash/random/denarius/high, +/obj/item/stack/f13Cash/random/aureus/low, +/obj/structure/rack/shelf_metal, +/obj/item/reagent_containers/pill/patch/healpoultice, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "bRz" = ( /obj/machinery/hydroponics/soil, /obj/structure/flora/bush, @@ -6131,8 +6224,17 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 28 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +"bRU" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "bRX" = ( /obj/structure/barricade/tentleathercorner{ dir = 1 @@ -6218,6 +6320,13 @@ icon_state = "horizontaloutermain2" }, /area/f13/wasteland) +"bTn" = ( +/obj/machinery/light_switch{ + pixel_y = -26 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "bTs" = ( /obj/structure/barricade/tentleathercorner{ dir = 8 @@ -6291,8 +6400,19 @@ }, /area/f13/followers) "bUo" = ( -/obj/structure/loot_pile, -/turf/open/indestructible/ground/outside/snow, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 48; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "bUt" = ( /obj/structure/destructible/tribal_torch/wall/lit, @@ -6320,7 +6440,7 @@ "bUW" = ( /obj/machinery/vending/coffee, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/area/f13/ambientlighting/building/m) "bVk" = ( /obj/structure/barricade/tentclothcorner{ dir = 1 @@ -6335,18 +6455,17 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) "bVN" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -29; - pixel_y = -1 +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 +/obj/structure/chalkboard{ + icon_state = "board_text1"; + desc = "A classic chalkboard. Seems to have a graph down of the NCR's current inventory, or rather their past inventory." }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" }, -/area/f13/ncr) +/area/f13/wasteland) "bVR" = ( /obj/machinery/door/poddoor/gate/preopen{ id = 334; @@ -6404,18 +6523,13 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/bluechess, /area/f13/legioncamp) "bXa" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/obj/structure/bed/mattress{ - icon_state = "mattress2"; - pixel_y = -1; - pixel_x = 2 - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" +/obj/structure/fence/wooden, +/obj/item/flag/legion{ + pixel_y = 28; + pixel_x = 1 }, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "bXd" = ( /obj/structure/tires/five, /turf/open/indestructible/ground/outside/sidewalk, @@ -6519,12 +6633,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) -"bYu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/ncr) "bYz" = ( /obj/structure/chair/left{ dir = 1 @@ -6533,14 +6641,13 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "bYA" = ( -/obj/effect/decal/cleanable/blood, -/obj/machinery/light, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/f13/crafting, -/turf/open/floor/plasteel/f13/vault_floor/floor{ - icon_state = "floordirty" +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 }, -/area/f13/ambientlighting/building/p) +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "bYD" = ( /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/c) @@ -6555,6 +6662,15 @@ /obj/structure/simple_door/house, /turf/open/floor/carpet, /area/f13/building/abandoned/x) +"bZd" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "bZp" = ( /obj/machinery/door/unpowered/secure_NCR{ name = "Armoury" @@ -6587,16 +6703,6 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) -"bZG" = ( -/obj/structure/flora/grass/both, -/obj/structure/flora/brushwood{ - pixel_x = -21 - }, -/obj/item/storage/trash_stack{ - icon_state = "trash_2" - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "bZN" = ( /obj/structure/simple_door/house, /obj/effect/decal/cleanable/dirt/dust, @@ -6638,21 +6744,6 @@ /obj/item/clothing/glasses/sunglasses, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) -"cad" = ( -/obj/structure/filingcabinet{ - pixel_x = 10 - }, -/obj/structure/filingcabinet{ - pixel_x = -1 - }, -/obj/structure/noticeboard{ - pixel_y = 29 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1-broken" - }, -/area/f13/ncr) "cag" = ( /obj/structure/stairs/south, /obj/effect/decal/cleanable/dirt{ @@ -6680,15 +6771,10 @@ /turf/closed/wall/f13/tentwall, /area/f13/wasteland/legion) "caI" = ( -/obj/item/storage/trash_stack, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/obj/structure/chair/stool, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "caM" = ( /obj/structure/car/rubbish1{ pixel_y = -16 @@ -6750,10 +6836,9 @@ }, /area/f13/ambientlighting/building/f) "cbK" = ( -/obj/structure/simple_door/brokenglass, -/obj/structure/barricade/wooden/planks/pregame, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "cbM" = ( /obj/machinery/hydroponics/soil, /obj/machinery/light{ @@ -6792,6 +6877,13 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"cce" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2" + }, +/obj/item/reagent_containers/pill/bitterdrink, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "ccg" = ( /obj/effect/overlay/desert_side, /obj/effect/decal/cleanable/dirt{ @@ -6947,20 +7039,6 @@ name = "rusted floor" }, /area/f13/bunker) -"cfj" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) "cfk" = ( /obj/item/reagent_containers/glass/bucket/wood, /turf/open/indestructible/ground/outside/desert, @@ -6987,21 +7065,12 @@ /turf/closed/mineral/random/low_chance, /area/f13/wasteland) "cfW" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/hypospray/medipen/stimpak{ - pixel_y = 9 - }, -/obj/item/reagent_containers/hypospray/medipen/stimpak{ - pixel_y = 5; - pixel_x = 4 - }, -/obj/structure/sign/poster/ncr/irradiated_food{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/obj/structure/flora/rock/jungle{ + icon_state = "rock3"; + pixel_x = -3 }, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "cga" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -7050,6 +7119,16 @@ /obj/structure/closet/cardboard, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"cgG" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/structure/wreck/trash/bus_door, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "cgI" = ( /obj/structure/table/wood, /turf/open/floor/wood_common/wood_common_dark, @@ -7060,6 +7139,16 @@ icon_state = "dirt" }, /area/f13/wasteland) +"cgQ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "chb" = ( /obj/structure/chair/pew/left{ dir = 1 @@ -7093,10 +7182,6 @@ icon_state = "horizontalinnermain2left" }, /area/f13/wasteland) -"chQ" = ( -/obj/item/flag/ncr/snow, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "chT" = ( /obj/structure/wreck/trash/machinepile, /turf/open/floor/plating/f13/inside/gravel, @@ -7126,13 +7211,19 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/building/abandoned/w) +"ciq" = ( +/turf/open/floor/f13/wood{ + icon_state = "housewood4-broken" + }, +/area/f13/ambientlighting/building/m) "ciI" = ( /obj/item/reagent_containers/food/snacks/kebab/human, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "ciV" = ( -/obj/structure/chair/stool, -/turf/open/indestructible/ground/outside/dirt, +/obj/item/chair/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, /area/f13/wasteland) "cjb" = ( /obj/structure/simple_door/house, @@ -7153,11 +7244,12 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "cjq" = ( -/obj/structure/window/fulltile/house{ - icon_state = "housewindowbrokenvertical" +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/fakelattice, +/obj/effect/overlay/junk/toilet{ + dir = 8 }, -/obj/structure/barricade/wooden/planks/pregame, -/turf/open/floor/f13/wood, +/turf/open/floor/plating/f13, /area/f13/wasteland) "cjt" = ( /obj/structure/rack, @@ -7195,10 +7287,6 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) -"cjZ" = ( -/obj/structure/ore_box, -/turf/open/floor/plating/dirt, -/area/f13/ncr) "ckc" = ( /obj/machinery/power/smes/engineering, /obj/structure/cable, @@ -7250,6 +7338,12 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"ckA" = ( +/obj/structure/shelf_wood, +/obj/item/seeds/cannabis, +/obj/item/seeds/cannabis, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "ckE" = ( /obj/effect/decal/remains/deadeyebot, /turf/open/indestructible/ground/outside/dirt{ @@ -7359,10 +7453,6 @@ /obj/effect/decal/cleanable/blood/gibs/human/limb, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"cml" = ( -/obj/machinery/smartfridge/bottlerack/grownbin, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "cmp" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -7512,6 +7602,11 @@ /obj/item/trash/f13/k_ration, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"coT" = ( +/obj/effect/decal/cleanable/generic, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "cpa" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4"; @@ -7539,30 +7634,17 @@ /turf/open/indestructible/ground/outside/road, /area/f13/tunnel/southwest) "cpq" = ( -/obj/structure/chair/stool, -/obj/machinery/light/broken, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) -"cpt" = ( -/turf/closed/wall/f13/wood/house/broken, -/area/f13/legioncamp) -"cpw" = ( -/obj/structure/chair/wood{ - dir = 8 +/obj/effect/decal/marking{ + pixel_x = -14 }, -/obj/effect/decal/cleanable/cobweb{ +/turf/open/indestructible/ground/outside/road{ dir = 1; - icon_state = "cobweb2" - }, -/obj/structure/decoration/clock/old{ - pixel_y = 29; - pixel_x = -1 - }, -/obj/machinery/light/small{ - dir = 1 + icon_state = "horizontaltopborderbottom0" }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/area/f13/wasteland) +"cpt" = ( +/turf/closed/wall/f13/wood/house/broken, +/area/f13/legioncamp) "cpK" = ( /obj/structure/toilet{ pixel_y = 13 @@ -7718,18 +7800,6 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/s) -"cso" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) "csq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -7885,15 +7955,16 @@ }, /area/f13/wasteland) "cuA" = ( -/obj/structure/table, -/obj/machinery/computer/terminal{ - dir = 4; - termtag = "Public" +/obj/effect/decal/remains/human, +/obj/structure/chair/stool{ + dir = 8; + icon_state = "bench"; + pixel_y = 17 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" }, -/area/f13/caves) +/area/f13/wasteland) "cuI" = ( /turf/closed/wall/f13/tunnel, /area/f13/building/powered) @@ -7925,12 +7996,6 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/a) -"cvy" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "cvF" = ( /obj/structure/chair/sofa/right{ dir = 4 @@ -8012,10 +8077,10 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "cwT" = ( -/turf/closed/wall/f13/tentwall{ - icon_state = "tent10" - }, -/area/f13/ncr) +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/pill/healingpowder, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "cwX" = ( /obj/structure/rack/shelf_metal, /obj/item/storage/belt/utility/full/engi, @@ -8176,9 +8241,9 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "cym" = ( -/obj/structure/simple_door/interior, +/obj/item/vending_refill/coffee, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/area/f13/ambientlighting/building/m) "cyp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/car/rubbish2, @@ -8248,6 +8313,11 @@ /obj/structure/barricade/bars, /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) +"czh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "czr" = ( /obj/structure/bed{ pixel_y = 15 @@ -8314,11 +8384,19 @@ }, /area/f13/wasteland) "cAe" = ( -/obj/effect/turf_decal/weather/dirt, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/closet/crate/large{ + pixel_y = 17; + layer = 5.1; + name = "large crate wall"; + anchored = 1 }, -/area/f13/ncr) +/obj/structure/closet/crate/large{ + layer = 4.9; + name = "large crate wall"; + anchored = 1 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "cAm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/remains/human, @@ -8358,6 +8436,14 @@ dir = 5 }, /area/f13/wasteland) +"cAP" = ( +/mob/living/simple_animal/hostile/handy/protectron{ + faction = list("raider") + }, +/turf/open/floor/f13{ + icon_state = "floorrusty" + }, +/area/f13/ambientlighting/building/j) "cAZ" = ( /turf/closed/wall/f13/wood, /area/f13/building/abandoned/g) @@ -8415,14 +8501,10 @@ /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/town) "cBO" = ( -/mob/living/simple_animal/hostile/handy/protectron{ - faction = list("NCR"); - enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); - name = "National Guard Protectron"; - desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." - }, -/turf/open/floor/wood_fancy/wood_fancy_light, -/area/f13/ncr) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "cBS" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt{ @@ -8469,6 +8551,13 @@ icon_state = "path_desert_end" }, /area/f13/wasteland) +"cCw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) "cCx" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/graveldirt, @@ -8541,11 +8630,11 @@ /turf/closed/mineral/random, /area/f13/wasteland) "cDz" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "cDB" = ( /obj/structure/wreck/trash/machinepiletwo{ pixel_x = 2; @@ -8567,15 +8656,15 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) "cDN" = ( -/obj/item/storage/trash_stack{ - icon_state = "trash_2" - }, -/obj/structure/flora/grass/brown{ - pixel_x = 9; - pixel_y = 11 +/obj/structure/flora/rock/pile/largejungle, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "cDU" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -8585,11 +8674,6 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) -"cDX" = ( -/obj/structure/closet/crate/miningcar, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "cDZ" = ( /mob/living/simple_animal/hostile/raider, /obj/structure/campfire/barrel{ @@ -8619,10 +8703,14 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/p) "cEy" = ( -/obj/effect/spawner/lootdrop/trash, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "cEA" = ( /obj/structure/rack, /obj/item/multitool, @@ -8657,34 +8745,6 @@ }, /turf/open/floor/wood_common/wood_common_light, /area/f13/ncr) -"cET" = ( -/obj/structure/table/wood, -/obj/machinery/chem_heater{ - pixel_y = 5; - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/beaker/large{ - pixel_y = 16; - pixel_x = -7 - }, -/obj/item/reagent_containers/glass/beaker/large{ - pixel_y = 12; - pixel_x = -7 - }, -/obj/item/reagent_containers/glass/beaker/large{ - pixel_y = 5; - pixel_x = -7 - }, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 10; - pixel_y = 4 - }, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 5; - pixel_y = 4 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "cEY" = ( /obj/structure/fence/corner{ dir = 4 @@ -8737,6 +8797,14 @@ icon_state = "transition1" }, /area/f13/wasteland) +"cFz" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul/reaver, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "cFB" = ( /obj/item/storage/money_stack/legion, /obj/effect/decal/cleanable/dirt, @@ -8745,6 +8813,14 @@ }, /turf/open/floor/carpet/red, /area/f13/legioncamp) +"cFH" = ( +/obj/structure/table/wood, +/obj/item/pen/fourcolor, +/obj/item/paper_bin, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "cFM" = ( /obj/machinery/power/port_gen/pacman/diesel, /turf/open/indestructible/ground/outside/sidewalk, @@ -8769,6 +8845,13 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"cFZ" = ( +/obj/item/radio{ + name = "walkie talkie" + }, +/obj/structure/shelf_wood, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "cGa" = ( /obj/structure/simple_door/metal/store, /turf/open/floor/f13{ @@ -8781,6 +8864,16 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/m) +"cGe" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench_center" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "cGq" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/grass/dirtpath{ @@ -8922,13 +9015,14 @@ /obj/effect/turf_decal/weather/dirt{ dir = 1 }, -/obj/structure/flora/rock/pile/largejungle{ - pixel_y = -3; - pixel_x = -34 - }, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/area/f13/caves) +"cHW" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul/reaver, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "cIa" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/inside/mountain, @@ -8949,12 +9043,11 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) "cIs" = ( -/obj/effect/mob_spawn/human/corpse/ncr, -/turf/open/indestructible/ground/outside/dirt{ - dir = 1; - icon_state = "dirtcorner" +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" }, -/area/f13/wasteland) +/area/f13/ambientlighting/building/m) "cIu" = ( /obj/structure/sink{ dir = 1; @@ -9036,12 +9129,6 @@ /obj/item/stack/sheet/glass/five, /turf/open/floor/plasteel, /area/engine/workshop) -"cIW" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken3" - }, -/area/f13/ncr) "cJl" = ( /obj/structure/simple_door/metal/store{ icon_state = "brokenstore" @@ -9125,17 +9212,17 @@ /obj/structure/decoration/rag, /turf/closed/mineral/random/low_chance, /area/f13/caves) -"cKD" = ( -/obj/structure/table/booth, -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/effect/spawner/lootdrop/trash, -/obj/effect/decal/cleanable/dirt{ - color = "#363636" +"cKC" = ( +/obj/item/trash/can, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" }, -/turf/open/floor/carpet/purple, -/area/f13/bar) +/area/f13/wasteland) +"cKD" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) "cKE" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain2" @@ -9158,12 +9245,13 @@ }, /area/f13/ncr) "cKR" = ( -/mob/living/simple_animal/hostile/stalker, -/obj/effect/turf_decal/weather/dirt{ +/obj/structure/chair/wood{ dir = 8 }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "cKW" = ( /obj/structure/simple_door/metal/fence/wooden, /obj/effect/overlay/desert_side{ @@ -9271,20 +9359,6 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/r) -"cMJ" = ( -/obj/structure/chair/wood{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start/f13/ncrcombatmedic, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "cMK" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -9324,18 +9398,6 @@ icon_state = "outerpavement" }, /area/f13/wasteland) -"cNI" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/structure/closet/crate/grave, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/wasteland) "cNV" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain2" @@ -9390,12 +9452,6 @@ /obj/effect/spawner/lootdrop/gambling, /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) -"cPG" = ( -/obj/item/storage/trash_stack{ - icon_state = "Junk_3" - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "cPH" = ( /obj/effect/overlay/desert_side{ dir = 4 @@ -9457,10 +9513,6 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/g) -"cQi" = ( -/obj/structure/barricade/wooden/strong, -/turf/closed/wall/f13/wood/house, -/area/f13/ncr) "cQx" = ( /obj/structure/closet/crate/bin/trashbin{ pixel_x = 5; @@ -9481,6 +9533,17 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +"cQJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/flora/wasteplant/wild_fungus, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "cQV" = ( /obj/structure/junk/locker, /turf/open/indestructible/ground/outside/ruins, @@ -9496,18 +9559,11 @@ /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) -"cRc" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "cRj" = ( -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/wooden, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) "cRm" = ( /obj/structure/fence{ dir = 8 @@ -9535,16 +9591,16 @@ }, /area/f13/wasteland) "cRC" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/lootdrop/f13/crafting, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/machinery/porta_turret/f13/turret_shotgun/burstfire/robot, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "cRJ" = ( -/obj/item/storage/trash_stack{ - icon_state = "Junk_3" +/obj/effect/turf_decal/weather/dirt{ + dir = 8 }, -/turf/open/floor/plating/f13/outside/road, -/area/f13/ambientlighting/building/w) +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "cRT" = ( /obj/structure/flora/timber, /turf/open/indestructible/ground/outside/desert, @@ -9599,10 +9655,11 @@ /turf/open/floor/plasteel/dark, /area/f13/building/abandoned/l) "cSH" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/machinery/smartfridge/bottlerack, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "cSI" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -9776,11 +9833,12 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "cVI" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood{ - icon_state = "housewood1-broken" - }, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/booth, +/obj/item/clothing/suit/armor/tiered/hooded/techpriest, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "cVP" = ( /obj/structure/barricade/wooden/strong, /turf/closed/wall/mineral/wood, @@ -9882,15 +9940,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"cXi" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "cXj" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 1; @@ -9993,13 +10042,6 @@ /obj/machinery/vending/coffee, /turf/open/floor/wood_common, /area/f13/clinic) -"cYL" = ( -/obj/structure/railing{ - color = "#A47449" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "cYQ" = ( /obj/machinery/vending/nukacolavend, /obj/effect/decal/cleanable/dirt{ @@ -10015,13 +10057,6 @@ /obj/structure/simple_door/tent, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"cYT" = ( -/obj/structure/curtain{ - color = "#808080"; - pixel_x = -32 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "cYW" = ( /obj/structure/table/reinforced, /obj/structure/barricade/bars{ @@ -10152,7 +10187,6 @@ /area/f13/wasteland) "daG" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "daI" = ( @@ -10166,14 +10200,30 @@ /turf/open/floor/plasteel/dark, /area/f13/ambientlighting/building/y) "daT" = ( -/obj/structure/flora/grass/brown{ - pixel_x = 9; - pixel_y = 11 +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks"; + dir = 10 }, -/obj/structure/flora/brushwoodalt{ - pixel_y = -12 +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"daW" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) +"daY" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/effect/decal/cleanable/oil, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" }, -/turf/open/indestructible/ground/outside/snow, /area/f13/wasteland) "dbb" = ( /obj/effect/turf_decal/huge{ @@ -10196,11 +10246,6 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) -"dbw" = ( -/turf/open/floor/f13/wood{ - icon_state = "housewood3-broken" - }, -/area/f13/ncr) "dbB" = ( /obj/structure/closet/crate/secure/gear{ anchored = 1; @@ -10293,17 +10338,12 @@ }, /area/f13/wasteland) "ddn" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -5; - pixel_y = 1 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 1 +/obj/structure/flora/twig3{ + pixel_x = -7; + pixel_y = -14 }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "ddq" = ( /obj/effect/landmark/start/f13/venator, /obj/effect/overlay/desert_side{ @@ -10333,10 +10373,6 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) -"ddE" = ( -/obj/structure/closet/crate/footlocker, -/turf/open/floor/plating/dirt, -/area/f13/ncr) "ddL" = ( /obj/structure/chair/west_middle, /obj/effect/decal/cleanable/dirt{ @@ -10447,6 +10483,11 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/a) +"dfA" = ( +/obj/structure/table/wood/junk, +/obj/item/paperslip, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "dfN" = ( /obj/structure/fence/wooden{ dir = 1 @@ -10520,7 +10561,8 @@ /area/f13/wasteland) "dgN" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1 + dir = 1; + layer = 1000 }, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) @@ -10537,22 +10579,9 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/building/tribal) "dgW" = ( -/obj/structure/stalkeregg, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) -"dhi" = ( -/obj/item/trash/cheesie{ - pixel_x = -12; - pixel_y = -4 - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow5" +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating/f13/outside/road{ + icon_state = "verticalrightborderright0" }, /area/f13/wasteland) "dhl" = ( @@ -10588,9 +10617,12 @@ }, /area/f13/wasteland) "dhC" = ( -/mob/living/simple_animal/hostile/raider, -/turf/open/floor/plating/f13/outside/road, -/area/f13/ambientlighting/building/w) +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 6; + icon_state = "outerpavement" + }, +/area/f13/wasteland) "dhD" = ( /obj/structure/campfire/barrel{ pixel_x = -8; @@ -10602,12 +10634,18 @@ /area/f13/wasteland) "dhI" = ( /obj/item/storage/trash_stack, -/turf/open/floor/plating/dirt/dark, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "dhM" = ( /obj/item/clothing/under/f13/recon/outcast, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"dhS" = ( +/obj/item/gun/ballistic/shotgun/hunting, +/obj/item/gun/ballistic/shotgun/hunting, +/obj/structure/shelf_wood, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "dhW" = ( /obj/machinery/light{ dir = 8; @@ -10633,14 +10671,6 @@ }, /turf/closed/mineral/random, /area/f13/wasteland) -"dia" = ( -/obj/structure/table, -/obj/item/storage/box/prisoner{ - pixel_x = 3; - pixel_y = 5 - }, -/turf/open/floor/plating/dirt, -/area/f13/ncr) "dij" = ( /obj/structure/fence/corner/wooden, /obj/structure/destructible/tribal_torch/lit, @@ -10682,6 +10712,13 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) +"diG" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerouter" + }, +/area/f13/wasteland) "diZ" = ( /obj/machinery/light/lampost, /turf/open/indestructible/ground/outside/sidewalk{ @@ -10693,14 +10730,6 @@ /obj/structure/junk/small/bed, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) -"djf" = ( -/obj/effect/turf_decal/weather/snow/corner, -/obj/structure/closet/crate/footlocker, -/obj/item/clothing/suit/jacket/flannel/brown, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/ncr) "djm" = ( /turf/open/indestructible/ground/outside/grass/dirtpath{ dir = 10 @@ -10820,15 +10849,6 @@ /obj/machinery/power/smes/engineering, /turf/open/floor/plating/f13, /area/f13/wasteland) -"dln" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/structure/barricade/sandbags, -/obj/structure/barricade/bars, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "dlp" = ( /obj/structure/railing{ color = "#A47449"; @@ -10856,6 +10876,13 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"dlI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "dlP" = ( /turf/closed/wall/f13/wood/house/broken, /area/f13/ambientlighting/building/w) @@ -10907,14 +10934,13 @@ "dnm" = ( /turf/closed/indestructible/riveted, /area/f13/tcoms) -"dnw" = ( -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 +"dnB" = ( +/obj/effect/decal/cleanable/oil{ + pixel_x = -8 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" }, -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "dnI" = ( /obj/structure/rack, @@ -11186,23 +11212,14 @@ }, /area/f13/building/powered) "dqP" = ( -/obj/structure/closet/crate/footlocker, -/obj/item/clothing/head/f13/ncr/ncr_flapcap, -/obj/item/clothing/under/f13/ncr_camo, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/ncr) -"dqU" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 +/obj/effect/turf_decal/weather/dirt{ + dir = 10 }, -/obj/effect/turf_decal/weather/snow/corner, -/obj/structure/flora/ausbushes/ppflowers, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" +/obj/effect/turf_decal/weather/dirt{ + dir = 4 }, -/area/f13/wasteland) +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "dqV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -11236,9 +11253,9 @@ }, /area/f13/ambientlighting/building/m) "drA" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/carpet/black, -/area/f13/building/abandoned/b) +/obj/structure/chair/stool/retro/tan, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "drC" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/wood_common, @@ -11315,15 +11332,9 @@ }, /area/f13/brotherhood) "dsH" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/effect/spawner/lootdrop/trash, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/wood_fancy/wood_fancy_dark, -/area/f13/bar) +/obj/structure/flora/grass/coyote/one, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "dsJ" = ( /obj/machinery/light{ dir = 8 @@ -11338,10 +11349,6 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) -"dsU" = ( -/obj/structure/barricade/wooden/strong, -/turf/closed/wall/f13/tunnel, -/area/f13/ncr) "dsY" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -11477,20 +11484,17 @@ }, /turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) +"dvR" = ( +/obj/structure/sign/flag_america, +/turf/closed/wall/r_wall/rust, +/area/f13/sewer/powered) "dwn" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/obj/structure/bed/mattress, -/obj/item/bedsheet/blanket{ - pixel_y = 1; - pixel_x = -1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/ncr) +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/glass/ten, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/mineral/plasma/twentyfive, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "dwo" = ( /obj/structure/bed, /turf/open/floor/f13/wood{ @@ -11510,9 +11514,9 @@ }, /area/f13/wasteland) "dwV" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/structure/table/wood/fancy/green, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "dxf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt{ @@ -11566,6 +11570,12 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +"dxK" = ( +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/leather/ten, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "dxL" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/dirt{ @@ -11632,14 +11642,6 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) -"dzd" = ( -/obj/structure/fluff/hedge, -/obj/machinery/light/small{ - dir = 8; - light_color = "#ff4747" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "dzh" = ( /obj/machinery/computer/security/bos, /obj/structure/table/reinforced, @@ -11668,7 +11670,6 @@ /area/f13/wasteland) "dzn" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/trash, /obj/effect/spawner/lootdrop/clothing_low, /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -11706,6 +11707,13 @@ icon_state = "horizontalinnermain2left" }, /area/f13/casino) +"dzY" = ( +/obj/machinery/light{ + dir = 4; + pixel_y = -16 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "dAc" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -11932,6 +11940,12 @@ /obj/structure/barricade/wooden, /turf/closed/mineral/random/no_caves, /area/f13/wasteland) +"dDq" = ( +/obj/item/mine/shrapnel, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) "dDx" = ( /obj/structure/fence{ dir = 4 @@ -12034,6 +12048,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/powered) +"dFN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "dFQ" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes{ @@ -12052,11 +12071,12 @@ /turf/open/floor/wood_common, /area/f13/clinic) "dGb" = ( -/obj/machinery/door/unpowered/celldoor{ - req_access_txt = "121" - }, +/obj/structure/flora/branch_broken, +/obj/structure/flora/twig3, +/obj/structure/flora/twig4, +/obj/item/stack/sheet/mineral/wood/five, /turf/open/floor/f13/wood, -/area/f13/ncr) +/area/f13/ambientlighting/building/m) "dGd" = ( /obj/structure/decoration/clock/old{ pixel_y = 32 @@ -12098,12 +12118,10 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "dGM" = ( -/obj/structure/barricade/wooden/planks{ - icon_state = "board-2"; - desc = "This sps" - }, -/turf/closed/wall/f13/wood/house, -/area/f13/ncr) +/obj/structure/flora/wasteplant/wild_fungus, +/obj/effect/decal/cleanable/blood, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "dGQ" = ( /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt{ @@ -12163,11 +12181,12 @@ /turf/closed/wall/r_wall/rust, /area/f13/brotherhood) "dHZ" = ( -/obj/structure/chair/wood{ - dir = 1 +/obj/effect/turf_decal/weather/dirt{ + dir = 9 }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/item/clothing/shoes/ballandchain, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "dIa" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -12207,6 +12226,12 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"dIL" = ( +/obj/item/shard, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom3" + }, +/area/f13/wasteland) "dIM" = ( /obj/structure/obstacle/old_locked_door, /turf/open/floor/plasteel/dark, @@ -12252,9 +12277,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "dJl" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/road, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/f13/wood, +/area/f13/ambientlighting/building/m) "dJq" = ( /obj/structure/sign/legion/guardhouse, /turf/closed/wall/mineral/wood, @@ -12274,20 +12299,19 @@ }, /turf/open/floor/carpet/red, /area/f13/ambientlighting/building/e) -"dJC" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/structure/flora/burnedlog{ - pixel_x = 8; - pixel_y = 3 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "dJF" = ( /obj/effect/decal/cleanable/greenglow, /turf/closed/mineral/random, /area/f13/caves) +"dJH" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2_flesh" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "dJI" = ( /obj/structure/table/abductor, /obj/effect/decal/cleanable/dirt, @@ -12546,9 +12570,19 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) "dMZ" = ( -/obj/structure/flora/brushwoodalt, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/structure/flora/rock/jungle{ + icon_state = "rock3"; + pixel_x = -3 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "dNd" = ( /obj/effect/decal/cleanable/dirt/dust{ dir = 4 @@ -12829,6 +12863,14 @@ /obj/structure/fluff/hedge, /turf/open/floor/plasteel/grimy, /area/f13/ncr) +"dQI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "dQP" = ( /obj/structure/fence{ pixel_x = -14 @@ -13004,20 +13046,6 @@ smooth = 1 }, /area/f13/casino) -"dTy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/structure/destructible/tribal_torch/wall/lit, -/obj/structure/mirror{ - pixel_x = -25 - }, -/obj/structure/sign/poster/contraband/pinup_shower{ - pixel_y = -31 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "dTz" = ( /obj/structure/chair/bench{ dir = 8; @@ -13084,12 +13112,14 @@ /turf/closed/wall/mineral/concrete, /area/f13/clinic) "dUo" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 }, -/obj/structure/legion_extractor, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/area/f13/caves) "dUy" = ( /obj/structure/fence/wooden{ dir = 8 @@ -13112,10 +13142,9 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "dUJ" = ( -/obj/structure/debris/v2, -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/ruins, -/area/f13/wasteland) +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "dUK" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -13226,6 +13255,12 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/building/tribal) +"dWa" = ( +/obj/machinery/door/password{ + door_id = "veryevilroom" + }, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "dWb" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "verticalleftborderright0" @@ -13287,13 +13322,6 @@ /obj/structure/wreck/trash/two_barrels, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"dXO" = ( -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 8; - light_color = "#f4e3b0" - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "dXR" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -13326,19 +13354,6 @@ icon_state = "common-broken3" }, /area/f13/wasteland) -"dZa" = ( -/obj/structure/chair/folding{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 8; - light_color = "#ff4747" - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "dZg" = ( /obj/structure/target_stake, /obj/item/target/clown, @@ -13418,10 +13433,15 @@ }, /area/f13/wasteland/town) "dZQ" = ( -/obj/structure/rack, -/obj/item/clothing/head/sombrero, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/item/clothing/mask/bandana/blue, +/obj/item/clothing/mask/bandana/blue, +/obj/item/clothing/mask/bandana/blue, +/obj/machinery/light{ + dir = 4; + pixel_y = -16 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "dZS" = ( /obj/structure/fence/corner/wooden{ dir = 8 @@ -13480,12 +13500,12 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) "ebh" = ( -/obj/structure/window/fulltile/store{ - icon_state = "storewindowtop" +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbrokenvertical" }, -/obj/structure/barricade/wooden/planks/pregame, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "ebU" = ( /obj/machinery/autolathe/ammo, /turf/open/floor/plasteel/f13/stone/rugged, @@ -13512,11 +13532,10 @@ }, /area/f13/building/abandoned/a) "eco" = ( -/obj/structure/rack, -/obj/item/clothing/under/sundress, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "ecq" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -13535,6 +13554,11 @@ icon_state = "floordirty" }, /area/f13/building/powered) +"ecx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/rockvault/alien, +/area/f13/ambientlighting/building/m) "ecy" = ( /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/outside/sidewalk, @@ -13566,15 +13590,11 @@ }, /turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) -"edn" = ( -/obj/structure/reagent_dispensers/rainwater_tank, -/obj/item/flag/ncr/snow{ - pixel_y = 21 - }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/wasteland) +"edf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "edv" = ( /obj/structure/chair/wood{ dir = 1 @@ -13615,10 +13635,6 @@ icon_state = "verticalleftborderleft1" }, /area/f13/wasteland) -"edX" = ( -/obj/structure/sign/warning/electricshock, -/turf/closed/wall/f13/tunnel, -/area/f13/ncr) "eea" = ( /obj/structure/fence/wooden{ dir = 4; @@ -13707,19 +13723,6 @@ /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/dirt, /area/f13/underground/cave) -"efb" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 31 - }, -/obj/machinery/light/small{ - dir = 4; - light_color = "#ff4747" - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "efI" = ( /obj/machinery/vending/coffee, /obj/effect/decal/cleanable/dirt{ @@ -13811,6 +13814,11 @@ /obj/machinery/power/floodlight, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +"egv" = ( +/obj/machinery/atmospherics/components/unary/tank/stimulum, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "egC" = ( /obj/item/storage/trash_stack{ icon_state = "trash_2" @@ -13833,8 +13841,9 @@ }, /area/f13/building/powered) "egT" = ( -/turf/closed/wall/f13/store, -/area/f13/ambientlighting/building/p) +/obj/structure/flora/grass/coyote/twentyfive, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "egV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -13849,6 +13858,13 @@ icon_state = "crossborder" }, /area/f13/building/powered) +"ehh" = ( +/obj/item/stack/sheet/mineral/sandbags, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) "ehy" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/effect/decal/cleanable/greenglow, @@ -13858,6 +13874,12 @@ name = "rusted floor" }, /area/f13/building/powered) +"ehF" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +/area/f13/wasteland) "ehJ" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt/dust, @@ -13956,19 +13978,6 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) -"ejU" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/structure/closet/crate/large, -/obj/effect/spawner/lootdrop/f13/ncr_c_ration, -/obj/effect/spawner/lootdrop/f13/ncr_c_ration, -/obj/effect/spawner/lootdrop/f13/ncr_k_ration{ - pixel_y = -9; - pixel_x = -4 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "eka" = ( /obj/structure/closet/fridge/standard, /turf/open/floor/f13{ @@ -14132,12 +14141,6 @@ dir = 4 }, /area/f13/wasteland) -"emw" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "emA" = ( /obj/item/chair/stool, /turf/open/indestructible/ground/outside/dirt, @@ -14180,14 +14183,12 @@ }, /area/f13/building/abandoned/h) "enj" = ( -/obj/structure/rack, -/obj/item/clothing/under/lawyer/female{ - pixel_x = -5; - pixel_y = -5 +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "enp" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/sidewalk{ @@ -14209,10 +14210,10 @@ }, /area/f13/brotherhood/surface) "enA" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/f13/crafting, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/turf/open/floor/wood_common{ + icon_state = "common-broken4" + }, +/area/f13/ambientlighting/building/m) "enC" = ( /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland/town) @@ -14327,6 +14328,11 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) +"eoK" = ( +/obj/structure/flora/wasteplant/wild_fungus, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "eoR" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road, @@ -14447,10 +14453,12 @@ }, /area/f13/ambientlighting/building/b) "eqx" = ( -/obj/structure/closet/crate/trashcart, -/obj/effect/spawner/lootdrop/trash, +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench_center" + }, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain2left" + icon_state = "verticalrightborderright0" }, /area/f13/wasteland) "eqB" = ( @@ -14515,8 +14523,11 @@ }, /area/f13/ambientlighting/building/w) "erZ" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/desert, +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, /area/f13/wasteland) "esi" = ( /obj/effect/overlay/desert_side, @@ -14563,13 +14574,6 @@ }, /turf/open/floor/wood_common, /area/f13/building/abandoned/x) -"esJ" = ( -/obj/item/trash/f13/steak{ - pixel_x = -6; - pixel_y = 5 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "esR" = ( /obj/structure/table/optable/abductor, /obj/effect/decal/cleanable/dirt, @@ -14602,6 +14606,11 @@ /obj/structure/simple_door/metal/fence/wooden, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"etj" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "etk" = ( /obj/structure/filingcabinet{ pixel_x = -6 @@ -14638,6 +14647,12 @@ dir = 4 }, /area/f13/ambientlighting/building/y) +"etD" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "etF" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 10 @@ -14703,10 +14718,21 @@ /obj/structure/decoration/rag, /turf/closed/wall/mineral/concrete/blastproof, /area/f13/brotherhood) +"euC" = ( +/obj/structure/chair/office{ + pixel_y = 24 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "euK" = ( -/obj/structure/chalkboard, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "euT" = ( /obj/structure/barricade/wooden, /obj/structure/decoration/rag, @@ -14715,12 +14741,11 @@ "euU" = ( /turf/closed/wall/rust, /area/f13/bunker) -"evg" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 +"evm" = ( +/obj/item/broom, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" }, -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "evp" = ( /obj/structure/reagent_dispensers/rainwater_tank, @@ -14802,6 +14827,13 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/i) +"eww" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerinner" + }, +/area/f13/wasteland) "ewx" = ( /obj/structure/car/rubbish2, /turf/open/indestructible/ground/outside/desert{ @@ -14809,14 +14841,11 @@ }, /area/f13/wasteland) "ewE" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/item/twohanded/spear/bonespear/deathclaw, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "ewN" = ( /turf/open/indestructible/ground/outside/road{ dir = 8; @@ -14835,20 +14864,6 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/m) -"exm" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_2"; - pixel_x = 4; - pixel_y = 3 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "exq" = ( /obj/structure/flora/grass/wasteland, /turf/open/indestructible/ground/outside/dirt{ @@ -14885,6 +14900,14 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +"eyc" = ( +/obj/machinery/vending/nukacolavend, +/obj/structure/billboard/nukagirl{ + pixel_y = 20; + pixel_x = -17 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "eyd" = ( /obj/item/ammo_casing/c10mm, /obj/effect/decal/cleanable/dirt{ @@ -14962,6 +14985,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"ezC" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "ezE" = ( /obj/structure/cable/outdoors{ icon_state = "2-4" @@ -15161,21 +15188,16 @@ /obj/item/reagent_containers/food/snacks/meat/slab/human, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"eCW" = ( +/obj/structure/simple_door/metal/iron, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "eDa" = ( -/obj/structure/mopbucket, -/obj/item/mop, -/turf/open/floor/plasteel/f13/vault_floor/floor{ - icon_state = "floordirty" - }, -/area/f13/ambientlighting/building/p) -"eDc" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/f13/seedspawner, -/obj/effect/spawner/lootdrop/f13/seedspawner, -/obj/effect/spawner/lootdrop/f13/seedspawner, -/obj/effect/spawner/lootdrop/f13/seedspawner, -/turf/open/floor/plating/dirt, -/area/f13/ncr) +/obj/structure/simple_door/brokenglass, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "eDn" = ( /obj/structure/table/wood, /obj/item/paper, @@ -15212,15 +15234,6 @@ /obj/effect/overlay/fog, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) -"eDU" = ( -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 1; - pixel_y = 12 - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow3" - }, -/area/f13/wasteland) "eDW" = ( /obj/machinery/light{ dir = 8; @@ -15248,14 +15261,6 @@ /obj/item/reagent_containers/food/drinks/bottle/sunset, /turf/open/floor/f13/wood, /area/f13/legioncamp) -"eEd" = ( -/obj/structure/chair/wood{ - pixel_x = 9; - pixel_y = 14 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "eEe" = ( /turf/closed/indestructible/rock, /area/f13/underground/cave) @@ -15341,21 +15346,8 @@ }, /area/f13/wasteland) "eFC" = ( -/obj/structure/closet/crate/footlocker, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_y = -1 - }, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_y = 3 - }, -/obj/item/lighter{ - pixel_x = 9; - pixel_y = -10 - }, -/turf/open/indestructible/ground/outside/ruins{ - name = "cobblestone floor" - }, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/water/running, +/area/f13/caves) "eFE" = ( /obj/structure/wreck/trash/four_barrels, /turf/open/indestructible/ground/outside/desert, @@ -15389,11 +15381,9 @@ }, /area/f13/wasteland) "eGa" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/f13/foodspawner, -/obj/item/pda, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/mob/living/simple_animal/hostile/radscorpion/black, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "eGd" = ( /obj/machinery/light/small{ dir = 8; @@ -15412,13 +15402,6 @@ icon_state = "outerborder" }, /area/f13/wasteland/city) -"eGk" = ( -/obj/item/cigbutt{ - pixel_y = 9; - pixel_x = -13 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "eGt" = ( /obj/item/chair/folding, /turf/open/indestructible/ground/outside/dirt, @@ -15599,11 +15582,9 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "eIL" = ( -/obj/structure/wreck/trash/autoshaft, -/obj/effect/decal/cleanable/oil/streak, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/indestructible/ground/outside/road, -/area/f13/building/abandoned/k) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/rockvault/alien, +/area/f13/ambientlighting/building/m) "eIM" = ( /obj/structure/car/rubbish2, /turf/open/indestructible/ground/outside/road, @@ -15789,26 +15770,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/t) -"eLn" = ( -/obj/structure/table, -/obj/item/flashlight/seclite{ - pixel_x = 2; - pixel_y = 9 - }, -/obj/item/flashlight/seclite{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/item/toy/cards/deck/unum{ - pixel_y = -2 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) "eLo" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -15882,17 +15843,13 @@ }, /area/f13/ambientlighting/building/o) "eME" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 +/obj/structure/fluff/rails{ + icon_state = "rails-b1"; + pixel_y = 11; + pixel_x = -3 }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "eMN" = ( /obj/machinery/door/poddoor/shutters/old, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -15992,16 +15949,10 @@ }, /area/f13/wasteland) "eOv" = ( -/obj/structure/closet/crate/footlocker{ - pixel_y = -1; - pixel_x = -8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/head/helmet/f13/ncr/bandolier, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/ncr) +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "eOE" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8 @@ -16012,6 +15963,10 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"eOR" = ( +/obj/structure/decoration/vent, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "eOX" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt{ @@ -16020,6 +15975,18 @@ /obj/item/reagent_containers/food/drinks/bottle/sunset, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) +"ePc" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"ePf" = ( +/obj/structure/shelf_wood, +/obj/item/seeds/cannabis, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "ePG" = ( /obj/structure/simple_door/house, /obj/effect/mapping_helpers/network_builder/power_cable/auto, @@ -16117,6 +16084,18 @@ name = "dirty floor" }, /area/f13/building/powered) +"eRb" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/twohanded/spear, +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "eRc" = ( /obj/machinery/light{ dir = 8 @@ -16190,12 +16169,18 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/m) +"eSe" = ( +/obj/item/stack/sheet/mineral/sandbags, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "eSh" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/obj/structure/closet/secure_closet/freezer, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/food/drinks/soda_cans/cream, +/obj/item/reagent_containers/food/drinks/soda_cans/cream, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/turf/open/floor/plasteel/rockvault/alien, +/area/f13/ambientlighting/building/m) "eSr" = ( /obj/structure/chair/bench{ dir = 4; @@ -16227,6 +16212,11 @@ /obj/structure/flora/tree/oak_five, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"eSX" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "eSY" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -16260,9 +16250,12 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "eTC" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/f13/wood/house, -/area/f13/ambientlighting/building/h) +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "eTD" = ( /obj/structure/barricade/tentleatheredge, /obj/structure/decoration/rag{ @@ -16473,11 +16466,11 @@ }, /area/f13/wasteland) "eWg" = ( -/obj/structure/simple_door/wood, -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" +/obj/item/storage/trash_stack{ + icon_state = "Junk_10" }, -/area/f13/ncr) +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "eWl" = ( /obj/structure/barricade/wooden/strong, /obj/structure/barricade/wooden/planks/pregame, @@ -16503,6 +16496,24 @@ icon_state = "wasteland33" }, /area/f13/wasteland) +"eWG" = ( +/obj/structure/reagent_dispensers/barrel/dangerous{ + pixel_y = -5; + pixel_x = 6 + }, +/obj/structure/reagent_dispensers/barrel/dangerous{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/structure/reagent_dispensers/barrel/dangerous{ + pixel_y = -5; + pixel_x = -8 + }, +/obj/structure/reagent_dispensers/barrel/dangerous{ + pixel_y = -9 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "eWP" = ( /obj/structure/dresser, /turf/open/floor/wood_common, @@ -16652,9 +16663,6 @@ name = "rusted floor" }, /area/f13/building/powered) -"eYQ" = ( -/turf/open/floor/wood_wide, -/area/f13/ncr) "eYR" = ( /obj/structure/window/fulltile/wood, /obj/structure/curtain{ @@ -16664,6 +16672,20 @@ /obj/structure/window/fulltile/wood, /turf/open/indestructible/ground/outside/desert, /area/f13/building/abandoned/p) +"eYU" = ( +/obj/machinery/vending/coffee{ + pixel_y = -11 + }, +/obj/machinery/vending/nukacolavend{ + pixel_y = -11; + pixel_x = 31 + }, +/obj/machinery/vending/cigarette{ + pixel_y = -11; + pixel_x = -31 + }, +/turf/closed/wall/f13/store, +/area/f13/building/powered) "eYY" = ( /obj/structure/table/booth, /obj/effect/decal/cleanable/dirt{ @@ -16697,14 +16719,15 @@ /obj/structure/pondlily_small, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +"eZL" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/ambientlighting/building/m) "eZQ" = ( /turf/open/indestructible/ground/outside/dirt, /area/f13/building/lower_firetower) -"eZS" = ( -/obj/machinery/workbench, -/obj/item/melee/onehanded/club/ncrflag, -/turf/open/floor/wood_wide, -/area/f13/ncr) "fag" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -16878,13 +16901,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"fcs" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/obj/structure/obstacle/barbedwire, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "fcu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing/wood/post{ @@ -16987,14 +17003,21 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/c) "fdE" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 +/obj/structure/fence/wooden{ + dir = 4; + icon_state = "post_wood" }, -/obj/structure/destructible/tribal_torch/wall/lit{ +/turf/open/indestructible/ground/outside/dirt{ dir = 8; - light_color = "#f4e3b0" + icon_state = "dirtcorner" }, -/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/wasteland) +"fdS" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/obj/structure/flora/grass/coyote/thirty, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "feb" = ( /obj/structure/safe, @@ -17212,15 +17235,19 @@ /turf/closed/wall/f13/supermart, /area/f13/followers) "fhl" = ( -/obj/structure/table, -/turf/open/floor/plasteel/f13/vault_floor/floor{ - icon_state = "floordirty" +/obj/structure/table/booth, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = -6 }, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "fhs" = ( -/obj/structure/debris/v3, -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/ruins, +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, /area/f13/wasteland) "fhu" = ( /obj/structure/loom, @@ -17324,14 +17351,10 @@ /area/f13/ambientlighting/building/o) "fiz" = ( /obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 + dir = 1 }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "fiD" = ( /obj/structure/simple_door/tentflap_cloth, /turf/open/floor/plasteel/f13/stone/rugged, @@ -17441,6 +17464,14 @@ icon_state = "innerpavement" }, /area/f13/wasteland) +"fjU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust, +/obj/item/toy/cards/deck/cas, +/obj/item/toy/cards/deck/cas/black, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "fjV" = ( /obj/structure/rack, /obj/item/clothing/under/f13/raiderharness, @@ -17584,21 +17615,8 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "flS" = ( -/obj/structure/table/wood, -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) -"flZ" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/turf/open/indestructible/ground/inside/dirt, +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) "fmf" = ( /obj/structure/destructible/tribal_torch/wall/lit{ @@ -17666,12 +17684,10 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "fnx" = ( -/obj/machinery/light/small/broken{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "fnz" = ( /obj/structure/bookcase/random/religion, /obj/effect/decal/cleanable/dirt{ @@ -17679,6 +17695,16 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) +"fnD" = ( +/obj/structure/table, +/obj/machinery/computer/terminal{ + dir = 4; + termtag = "Public" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "fnE" = ( /obj/item/storage/trash_stack{ icon_state = "Junk_9"; @@ -17700,6 +17726,14 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland/legion) +"fnW" = ( +/obj/machinery/seed_extractor, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "foc" = ( /obj/structure/table/wood, /obj/item/paper/contract/employment, @@ -17717,23 +17751,22 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/y) -"fop" = ( -/obj/structure/barricade/wooden/snowed, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow3" - }, +"foo" = ( +/obj/structure/table/booth, +/turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"fop" = ( +/obj/effect/decal/cleanable/generic, +/obj/effect/decal/cleanable/dirt, +/obj/item/twohanded/legionaxe, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "fow" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) +/obj/structure/junk/small/table, +/obj/item/stack/sheet/mineral/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "foz" = ( /obj/effect/landmark/questing/animals{ location_description = "To the far southwest, behind the old farmhouse with that freaky basement in it." @@ -17755,13 +17788,6 @@ name = "rusted floor" }, /area/f13/building/powered) -"foE" = ( -/obj/structure/stairs/north{ - color = "#A47449"; - dir = 8 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "foG" = ( /obj/structure/barricade/tentclothedge{ color = "#7c0A02" @@ -17807,10 +17833,15 @@ }, /area/f13/casino) "fpo" = ( -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "fpB" = ( /obj/structure/flora/tree_stump, /turf/open/indestructible/ground/outside/dirt, @@ -18025,10 +18056,6 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) -"fso" = ( -/obj/structure/flora/stump, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "fsq" = ( /obj/structure/flora/grass/wasteland{ layer = 4.2; @@ -18095,6 +18122,18 @@ /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/f13/wood, /area/f13/building/abandoned/n) +"ftu" = ( +/obj/item/stack/sheet/mineral/wood/twenty, +/obj/item/stack/sheet/mineral/wood/twenty, +/obj/structure/shelf_wood, +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" + }, +/turf/open/floor/f13/wood{ + icon_state = "housewood1-broken" + }, +/area/f13/ambientlighting/building/m) "fty" = ( /obj/structure/car/rubbish1, /turf/open/indestructible/ground/outside/grass, @@ -18189,17 +18228,6 @@ dir = 8 }, /area/f13/brotherhood) -"fvm" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken6" - }, -/area/f13/ncr) "fvo" = ( /obj/structure/obstacle/barbedwire/end{ dir = 1; @@ -18248,12 +18276,21 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "fwi" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/inside/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, /area/f13/wasteland) "fwp" = ( -/turf/open/floor/plating/f13/outside/road, -/area/f13/ambientlighting/building/w) +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "fwv" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/indestructible/ground/outside/sidewalk, @@ -18307,6 +18344,15 @@ /obj/structure/frame/machine, /turf/open/floor/plasteel/dark, /area/engine/workshop) +"fwZ" = ( +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "fxa" = ( /obj/effect/landmark/start/f13/vetlegionary, /turf/open/floor/f13/wood, @@ -18354,12 +18400,6 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) -"fyd" = ( -/obj/effect/landmark/start/f13/ncrheavytrooper, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor4-broken" - }, -/area/f13/wasteland) "fye" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain2" @@ -18398,12 +18438,17 @@ icon_state = "horizontalbottombordertop3" }, /area/f13/wasteland) +"fyC" = ( +/obj/item/storage/trash_stack, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +/area/f13/wasteland) "fyN" = ( -/obj/structure/decoration/rag{ - icon_state = "skin" +/obj/item/chair/wood, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" }, -/obj/structure/barricade/wooden, -/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "fyP" = ( /turf/closed/mineral/random/low_chance, @@ -18519,6 +18564,11 @@ /mob/living/simple_animal/hostile/supermutant/rangedmutant/varmint, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"fzU" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ghoul, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "fzZ" = ( /turf/open/floor/wood_mosaic/wood_mosaic_light, /area/f13/legioncamp) @@ -18533,10 +18583,8 @@ }, /area/f13/wasteland/legion) "fAj" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_5" - }, -/turf/open/indestructible/ground/outside/graveldirt, +/obj/item/electropack/shockcollar/explosive, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "fAw" = ( /obj/structure/barricade/wooden/strong, @@ -18589,7 +18637,6 @@ /area/f13/building/abandoned/h) "fBl" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/trash, /obj/machinery/light/fo13colored/Red{ dir = 4 }, @@ -18620,17 +18667,10 @@ }, /area/f13/ambientlighting/building/o) "fBy" = ( -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/mask/gas/cyborg, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) -"fBA" = ( -/obj/structure/chair/folding{ - dir = 1 +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2top" }, -/turf/open/floor/carpet/red, -/area/f13/ncr) +/area/f13/wasteland) "fBM" = ( /obj/effect/decal/marking{ icon_state = "dottedhorizontalcorroded" @@ -18660,6 +18700,12 @@ icon_state = "dark" }, /area/f13/casino) +"fCk" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "verticaloutermainbottom" + }, +/area/f13/wasteland) "fCo" = ( /obj/effect/landmark/poster_spawner/pinup, /turf/closed/wall/f13/wood/house, @@ -18699,12 +18745,6 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) -"fCP" = ( -/obj/effect/landmark/start/f13/ncrcorporal, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1-broken" - }, -/area/f13/wasteland) "fCW" = ( /obj/structure/chair/office/dark, /turf/open/floor/f13/wood, @@ -18713,12 +18753,6 @@ /obj/structure/reagent_dispensers/barrel/three, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) -"fDn" = ( -/obj/item/flag/ncr/snow, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow3" - }, -/area/f13/wasteland) "fDs" = ( /obj/structure/shopping_cart, /turf/open/indestructible/ground/outside/sidewalk{ @@ -18726,12 +18760,15 @@ }, /area/f13/wasteland) "fDt" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 +/obj/structure/fluff/rails, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 }, -/obj/item/shovel/trench, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "fDu" = ( /obj/structure/sign/yield, /turf/open/indestructible/ground/outside/sidewalk{ @@ -18749,22 +18786,14 @@ /obj/item/book/manual/wiki/security_space_law, /turf/open/floor/wood_common/wood_common_dark, /area/f13/building/abandoned/n) -"fDG" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) "fDK" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/obj/structure/chair/bench{ - dir = 8; - pixel_x = 14 +/obj/structure/flora/rock/pile/largejungle{ + icon_state = "bush2"; + pixel_x = -13; + pixel_y = -4 }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "fDR" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt{ @@ -18851,16 +18880,11 @@ /area/f13/followers) "fEU" = ( /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/handy/protectron{ - faction = list("NCR"); - enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); - name = "National Guard Protectron"; - desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain1" +/obj/item/storage/trash_stack{ + icon_state = "Junk_9" }, -/area/f13/wasteland) +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "fFh" = ( /obj/structure/table/wood/settler, /obj/item/reagent_containers/glass/bowl, @@ -18899,16 +18923,10 @@ }, /area/f13/brotherhood) "fGa" = ( -/obj/structure/rack, -/obj/item/clothing/head/caphat/parade, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) -"fGd" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "fGs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/destructible/tribal_torch/wall/lit{ @@ -18991,10 +19009,21 @@ /obj/effect/spawner/lootdrop/clothing_low, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +"fIM" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "fIO" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "fIP" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop0" @@ -19156,6 +19185,17 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/t) +"fKM" = ( +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18; + desc = s + }, +/obj/item/stack/sheet/glass/ten, +/obj/item/stack/sheet/mineral/limestone/ten, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "fKO" = ( /obj/machinery/light/small{ brightness = 7; @@ -19228,6 +19268,9 @@ /obj/structure/disposalpipe/broken{ dir = 1 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) "fLL" = ( @@ -19237,6 +19280,14 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"fLP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/book/granter/trait/chemistry, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "fLU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -19323,13 +19374,12 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) "fMZ" = ( -/obj/structure/flora/tree/pine, -/obj/structure/flora/twig3{ - pixel_x = -7; - pixel_y = -14 +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "fNl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, @@ -19375,19 +19425,6 @@ icon_state = "housewood2-broken" }, /area/f13/building/abandoned/j) -"fNL" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/item/flashlight/lantern{ - on = 1; - light_on = 1; - icon_state = "lantern-on"; - pixel_x = -3; - pixel_y = -3 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "fNN" = ( /obj/structure/car/rubbish4, /turf/open/indestructible/ground/outside/desert, @@ -19422,15 +19459,10 @@ /turf/open/floor/wood_common/wood_common_light, /area/maintenance/bar) "fOf" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/obj/effect/gibspawner/human/bodypartless, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "fOj" = ( /obj/structure/window/reinforced/spawner/east, /obj/structure/fluff/railing{ @@ -19452,31 +19484,26 @@ dir = 4 }, /area/f13/wasteland) -"fOL" = ( -/obj/structure/chair/stool/retro, -/obj/machinery/light/small{ - dir = 8; - light_color = "#ff4747" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +"fOJ" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/gloves, +/obj/item/wallframe/apc/fusebox, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/w) "fOT" = ( -/obj/structure/rack, -/obj/item/clothing/shoes/sneakers/black{ - pixel_y = -5 - }, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/shoes/f13/tan{ - pixel_x = 5; - pixel_y = 5 +/obj/machinery/smartfridge/bottlerack{ + pixel_x = 3 }, -/obj/item/clothing/shoes/f13/brownie, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "fOW" = ( -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/structure/flora/rock/jungle, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "fOX" = ( /obj/structure/decoration/hatch, /turf/open/indestructible/ground/outside/road{ @@ -19613,7 +19640,6 @@ dir = 1 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/trash, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood{ icon_state = "housewood2" @@ -19691,6 +19717,12 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"fSs" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft2bottom" + }, +/area/f13/wasteland) "fSI" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/components/unary/tank/air, @@ -19728,11 +19760,15 @@ }, /area/f13/wasteland) "fSZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken2" +/obj/structure/decoration/rag{ + icon_state = "flag_ncr"; + name = "NCR banner"; + pixel_y = 32 }, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "fTl" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -19785,12 +19821,9 @@ /turf/closed/wall/f13/wood/house, /area/f13/legioncamp) "fTI" = ( -/mob/living/simple_animal/hostile/stalker, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, +/obj/structure/reagent_dispensers/barrel/dangerous, /turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/area/f13/wasteland) "fTK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/junk/locker, @@ -19798,13 +19831,12 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/u) "fUa" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" }, -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "fUf" = ( /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) @@ -19814,11 +19846,6 @@ icon_state = "horizontalinnermain2" }, /area/f13/wasteland) -"fUm" = ( -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow3" - }, -/area/f13/wasteland) "fUz" = ( /obj/effect/turf_decal/weather/dirt, /obj/machinery/mineral/wasteland_vendor/medical, @@ -19883,30 +19910,6 @@ /obj/structure/mirelurkegg, /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) -"fVy" = ( -/obj/structure/rack, -/obj/item/reagent_containers/glass/mortar{ - pixel_y = 14; - pixel_x = -6 - }, -/obj/item/pestle{ - pixel_y = 13; - pixel_x = 6 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/obj/item/reagent_containers/hypospray/medipen/stimpak/epipak{ - pixel_y = -6 - }, -/obj/item/reagent_containers/hypospray/medipen/stimpak/epipak{ - pixel_y = -2 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "fVF" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light/small{ @@ -20005,6 +20008,17 @@ icon_state = "bluerustysolid" }, /area/f13/ambientlighting/building/o) +"fWM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/structure/rack/large/shelf_rust, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "fWU" = ( /obj/structure/toilet{ dir = 1 @@ -20077,6 +20091,24 @@ /obj/structure/table/reinforced, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/t) +"fXZ" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, +/area/f13/wasteland) +"fYb" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul, +/obj/structure/destructible/tribal_torch/lit, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) +"fYd" = ( +/obj/structure/wreck/trash/three_barrels, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "fYh" = ( /obj/machinery/light{ pixel_x = 16 @@ -20111,6 +20143,19 @@ /obj/item/storage/book/bible/booze, /turf/open/floor/carpet/red, /area/f13/ambientlighting/building/e) +"fYG" = ( +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18 + }, +/obj/item/stack/sheet/hay/twenty, +/obj/item/stack/sheet/hay/twenty, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/mineral/limestone/ten, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "fYN" = ( /obj/machinery/light/small{ brightness = 7 @@ -20186,14 +20231,29 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) +"fZZ" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" + }, +/area/f13/wasteland) "gag" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "gai" = ( -/obj/structure/flora/tree/wasteland, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/effect/turf_decal/weather, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/item/kirbyplants/dead{ + desc = "A mummified potted plant."; + name = "very dead potted plant"; + pixel_x = -1; + pixel_y = 11 + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "gal" = ( /obj/structure/table/optable/primitive, /turf/open/floor/f13/wood{ @@ -20284,14 +20344,17 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "gbB" = ( -/obj/structure/closet/crate/bin, -/obj/effect/spawner/lootdrop/f13/junkspawners, -/obj/effect/spawner/lootdrop/f13/junkspawners, -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken2" +/obj/effect/turf_decal/weather/dirt{ + dir = 9 }, -/area/f13/ncr) +/obj/effect/mob_spawn/human/corpse/legion, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +"gbF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/f13Cash/caps/twofive, +/turf/open/floor/wood_worn, +/area/f13/ambientlighting/building/m) "gbL" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -20370,10 +20433,12 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) "gcP" = ( -/obj/structure/table/reinforced, -/obj/effect/spawner/lootdrop/f13/weapon/melee/tier2, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/glass, +/obj/structure/table/booth, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "gcU" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6"; @@ -20472,6 +20537,11 @@ /obj/structure/barricade/bars, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"gem" = ( +/turf/open/floor/f13/wood{ + icon_state = "housewood1-broken" + }, +/area/f13/ambientlighting/building/m) "gen" = ( /obj/structure/fence/wooden{ dir = 4; @@ -20494,13 +20564,13 @@ /obj/structure/obstacle/barbedwire, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) -"ges" = ( -/obj/item/flashlight/lantern{ - pixel_y = 17; - pixel_x = 6 +"get" = ( +/obj/item/statuebust{ + anchored = 1; + can_be_unanchored = 1 }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "geG" = ( /obj/structure/chair/booth{ icon_state = "booth_west_north" @@ -20540,6 +20610,12 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/o) +"gfa" = ( +/obj/structure/table/wood/junk, +/obj/effect/spawner/lootdrop/f13/attachments, +/obj/effect/spawner/lootdrop/f13/attachments, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "gfi" = ( /turf/open/indestructible/ground/outside/dirt{ icon_state = "dirtcorner" @@ -20564,28 +20640,6 @@ dir = 8 }, /area/f13/wasteland) -"gfq" = ( -/obj/structure/chair/wood{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/vomit/old{ - pixel_x = 11; - pixel_y = -7 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) -"gfx" = ( -/obj/structure/closet/locker/oldstyle{ - anchored = 1 - }, -/obj/item/storage/lockbox, -/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/wood_common/wood_common_dark, -/area/f13/ncr) "gfz" = ( /obj/structure/table, /obj/item/kitchen/knife, @@ -20674,22 +20728,15 @@ /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) "ggj" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/trash/f13/c_ration_3{ - pixel_y = 6; - pixel_x = 7 - }, -/obj/item/trash/f13/c_ration_1{ - pixel_x = 7; - pixel_y = -6 +/obj/structure/stairs/north{ + color = "#A47449" }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" +/obj/effect/turf_decal/weather/dirt{ + dir = 1; + layer = 10000 }, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "ggr" = ( /obj/structure/bed/wooden{ pixel_y = 15 @@ -20707,11 +20754,9 @@ /turf/open/floor/carpet, /area/f13/legioncamp) "ggF" = ( -/obj/structure/rack, -/obj/item/clothing/under/f13/bluedress, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/junk/jukebox, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "ggI" = ( /obj/structure/table/wood, /obj/structure/decoration/rag, @@ -20756,10 +20801,6 @@ /obj/effect/decal/remains/human, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"ghi" = ( -/obj/effect/landmark/start/f13/ncroffduty, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "gho" = ( /mob/living/simple_animal/hostile/supermutant/rangedmutant, /turf/open/floor/plating/rust, @@ -20893,6 +20934,15 @@ icon_state = "horizontaloutermain2left" }, /area/f13/wasteland) +"gjz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "gjG" = ( /obj/structure/bonfire, /obj/item/stack/rods/ten, @@ -21020,10 +21070,8 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "glZ" = ( -/obj/structure/simple_door/interior, -/obj/structure/barricade/wooden/planks/pregame, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/m) "gmj" = ( /mob/living/simple_animal/hostile/ghoul/soldier/armored, /obj/effect/decal/cleanable/dirt, @@ -21061,6 +21109,13 @@ /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"gng" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small{ + light_color = "#ff4747" + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "gnk" = ( /obj/effect/decal/marking{ icon_state = "dottedvertical" @@ -21069,6 +21124,14 @@ icon_state = "verticalinnermain2" }, /area/f13/wasteland) +"gnq" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "gnr" = ( /turf/closed/wall/f13/wood/house/broken, /area/f13/building/abandoned/w) @@ -21179,6 +21242,12 @@ /obj/item/twohanded/baseball/spiked, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +"goG" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "goJ" = ( /obj/machinery/light/small{ dir = 1; @@ -21236,6 +21305,16 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"gpT" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/chair/wood/wings{ + pixel_y = 23 + }, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_common{ + icon_state = "common-broken4" + }, +/area/f13/ambientlighting/building/m) "gqa" = ( /obj/structure/car/rubbish3, /obj/structure/wreck/trash/halftire{ @@ -21283,6 +21362,15 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"gqz" = ( +/obj/structure/car/rubbish3{ + icon_state = "debris1" + }, +/turf/open/indestructible/ground/outside/road{ + dir = 8; + icon_state = "horizontalinnermain2right" + }, +/area/f13/wasteland) "gqA" = ( /obj/structure/window/fulltile/house{ dir = 2; @@ -21325,12 +21413,6 @@ icon_state = "whitebluechess" }, /area/f13/building/abandoned/j) -"gqS" = ( -/obj/machinery/door/unpowered/secure_NCR{ - name = "Medical" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "grb" = ( /obj/structure/flora/tree/tall, /obj/effect/decal/remains/human{ @@ -21347,6 +21429,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"grh" = ( +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "gri" = ( /obj/machinery/light/fo13colored/Red{ dir = 4 @@ -21384,6 +21471,15 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) +"grJ" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) "grL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, @@ -21427,11 +21523,9 @@ }, /area/f13/wasteland) "gtb" = ( -/obj/structure/rack, -/obj/item/clothing/under/dress/sundress/white, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/mob/living/simple_animal/hostile/ghoul, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "gtc" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/road{ @@ -21588,6 +21682,13 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"gwk" = ( +/obj/effect/decal/fakelattice, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) "gwn" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light, @@ -21609,6 +21710,10 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"gwE" = ( +/obj/structure/flora/grass/coyote/seventeen, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "gwF" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/desert, @@ -21689,6 +21794,11 @@ icon_state = "horizontalinnermain2right" }, /area/f13/wasteland) +"gyr" = ( +/obj/structure/table/plasmaglass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "gyt" = ( /obj/machinery/light{ bulb_colour = "#BC8F8F"; @@ -21812,9 +21922,10 @@ /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) "gzM" = ( -/obj/structure/flora/tree/dead, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/structure/table, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/w) "gzU" = ( /obj/structure/weightmachine/weightlifter, /turf/open/indestructible/ground/outside/dirt, @@ -21867,6 +21978,9 @@ "gAE" = ( /obj/effect/landmark/start/f13/ncrmp, /obj/effect/landmark/start/f13/ncrmp, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/f13/ncr) "gAF" = ( @@ -21910,6 +22024,17 @@ /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/lower_firetower) +"gBo" = ( +/obj/machinery/light/lampost{ + dir = 4; + pixel_x = 27; + pixel_y = 27 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerturn" + }, +/area/f13/wasteland) "gBt" = ( /obj/item/reagent_containers/pill/healingpowder, /obj/effect/overlay/desert/sonora/edge, @@ -21928,19 +22053,14 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "gBE" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/effect/turf_decal/weather/snow/corner, -/obj/item/flashlight/lantern{ - on = 1; - light_on = 1; - icon_state = "lantern-on"; - pixel_x = -11; - pixel_y = 18 +/obj/item/reagent_containers/pill/patch/healpoultice, +/obj/item/reagent_containers/pill/patch/healpoultice, +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "gBO" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "IsebelAttire"; @@ -21953,11 +22073,9 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) "gBQ" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, +/obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/area/f13/wasteland) "gCb" = ( /obj/structure/barricade/sandbags, /turf/open/floor/plating/rust, @@ -21973,6 +22091,15 @@ smooth = 1 }, /area/f13/casino) +"gCl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + light_color = "red" + }, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "gCo" = ( /obj/machinery/light/small{ brightness = 7 @@ -22054,6 +22181,15 @@ /obj/effect/overlay/desert/sonora/edge, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +"gDb" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/obj/item/trash/can, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) "gDi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/wreck/trash/brokenvendor, @@ -22107,6 +22243,15 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +"gDS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 1; + light_color = "#d8b1b1" + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "gDV" = ( /obj/structure/fence{ dir = 8 @@ -22233,12 +22378,14 @@ icon_state = "bluerustysolid" }, /area/f13/ambientlighting/building/o) -"gFK" = ( -/obj/structure/flora/stump, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow4" +"gFQ" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" }, -/area/f13/wasteland) +/obj/effect/decal/cleanable/generic, +/obj/machinery/light/small, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "gFV" = ( /obj/machinery/power/floodlight, /obj/structure/cable/outdoors{ @@ -22400,11 +22547,12 @@ }, /area/f13/building/powered) "gHY" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/trash, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building/abandoned/a) +/obj/machinery/light_switch{ + pixel_y = 29 + }, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "gIc" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -22634,19 +22782,6 @@ color = "#e4e4e4" }, /area/f13/building/powered) -"gLl" = ( -/obj/effect/turf_decal/weather/snow/corner, -/obj/structure/bed/mattress{ - icon_state = "mattress2"; - pixel_y = -1; - pixel_x = 2 - }, -/obj/item/bedsheet/blanket, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/ncr) "gLo" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -22675,26 +22810,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"gLH" = ( -/obj/structure/rack, -/obj/item/stack/medical/suture{ - pixel_y = -8 - }, -/obj/item/stack/medical/suture{ - pixel_y = -4 - }, -/obj/item/stack/medical/ointment/twelve{ - pixel_x = 10; - pixel_y = -10 - }, -/obj/item/stack/medical/gauze/adv{ - pixel_y = 4 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "gLK" = ( /obj/structure/billboard/poseidenenergy2, /turf/open/indestructible/ground/outside/sidewalk{ @@ -22743,14 +22858,18 @@ /turf/open/floor/engine/air, /area/engine/workshop) "gMb" = ( -/obj/structure/rack, -/obj/item/clothing/under/pants/jeans{ - pixel_y = -10 +/obj/item/clothing/head/beret/headband, +/obj/structure/statue/petrified, +/obj/item/clothing/under/pants/mustangjeans{ + pixel_y = -8 }, -/obj/item/clothing/under/f13/cowboyg, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/item/clothing/mask/cigarette/rollie{ + pixel_x = -5; + pixel_y = 12 + }, +/obj/item/clothing/suit/armor/outfit/jacket/ncrcfjacket, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "gMd" = ( /obj/effect/landmark/legion_attack{ phrase = "The legion has claimed the southern bridge; No more will raiders and degerates roam free. Praise Caesar."; @@ -22760,13 +22879,6 @@ icon_state = "horizontalinnermain2" }, /area/f13/wasteland) -"gMf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "gMh" = ( /obj/structure/table/wood, /obj/structure/decoration/rag, @@ -22814,13 +22926,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "gMH" = ( -/obj/structure/dresser, -/obj/item/radio/tribal{ - pixel_y = 15 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/structure/table/wood/junk, +/obj/item/assembly/signaler, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "gML" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/simple_door/tent, @@ -22932,13 +23041,24 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "gOW" = ( -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_x = -16 }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/railing/wood/underlayer, +/obj/structure/railing/wood/underlayer, +/obj/structure/railing/wood/underlayer{ + pixel_y = 23 + }, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) "gOZ" = ( /obj/structure/flora/wasteplant/wild_broc, /turf/open/indestructible/ground/outside/dirt{ @@ -23034,10 +23154,12 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "gQn" = ( -/obj/effect/spawner/lootdrop/trash, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/stone/rugged, -/area/f13/building/abandoned/g) +/obj/structure/billboard/ritas, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outercorner" + }, +/area/f13/wasteland) "gQp" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small{ @@ -23252,6 +23374,22 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/m) +"gTE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/chem_dispenser, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) +"gTM" = ( +/obj/structure/chair/wood{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "gTN" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 10 @@ -23260,21 +23398,6 @@ icon_state = "common-broken3" }, /area/f13/wasteland) -"gTS" = ( -/obj/item/reagent_containers/glass/bucket{ - pixel_y = 17; - pixel_x = 11 - }, -/obj/item/storage/bag/plants{ - pixel_y = -6; - pixel_x = -10 - }, -/obj/machinery/light/small{ - dir = 4; - light_color = "#ff4747" - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "gTW" = ( /obj/structure/closet/crate/footlocker{ anchored = 1 @@ -23465,13 +23588,6 @@ icon_state = "verticalinnermain0" }, /area/f13/ncr) -"gWU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fluff/hedge, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) "gXh" = ( /obj/structure/table/wood, /obj/item/kirbyplants{ @@ -23494,19 +23610,6 @@ }, /turf/open/floor/carpet/orange, /area/f13/ambientlighting/building/c) -"gXB" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/item/storage/trash_stack, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "gXD" = ( /obj/structure/wreck/car, /turf/open/indestructible/ground/outside/dirt{ @@ -23579,6 +23682,11 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"gYw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood/club, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "gYy" = ( /obj/structure/cable/outdoors{ icon_state = "1-2" @@ -23607,17 +23715,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/dirt, /area/f13/building/abandoned/q) -"gYJ" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) "gYP" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -23650,6 +23747,10 @@ icon_state = "floorrusty" }, /area/f13/building/abandoned/h) +"gZe" = ( +/obj/item/clothing/head/crown, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "gZg" = ( /obj/structure/chair/bench{ dir = 1 @@ -23742,9 +23843,12 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/t) "hak" = ( -/obj/effect/landmark/start/f13/ncrfirstsergeant, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/structure/chair/booth{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "ham" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, @@ -23817,23 +23921,11 @@ /turf/open/floor/carpet/airless, /area/f13/ambientlighting/building/c) "hbn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/arrows{ +/obj/structure/chair/stool{ dir = 1; - pixel_y = -7 - }, -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain0" - }, -/area/f13/wasteland) -"hbo" = ( -/obj/structure/flora/grass/brown{ - pixel_x = -6; - pixel_y = 12 + icon_state = "bench_center" }, -/turf/open/indestructible/ground/outside/snow, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "hbp" = ( /obj/machinery/power/apc/fusebox/north, @@ -23879,23 +23971,6 @@ /mob/living/simple_animal/hostile/ghoul, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) -"hbU" = ( -/obj/structure/table, -/obj/item/restraints/handcuffs{ - pixel_y = 7 - }, -/obj/item/restraints/handcuffs{ - pixel_y = 4; - pixel_x = 4 - }, -/obj/item/restraints/handcuffs{ - pixel_y = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) "hbV" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -23919,10 +23994,10 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "hct" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/cig_packs, -/obj/effect/spawner/lootdrop/cig_packs, -/turf/open/indestructible/ground/outside/graveldirt, +/obj/structure/wreck/trash/one_tire, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, /area/f13/wasteland) "hcz" = ( /obj/effect/decal/cleanable/dirt, @@ -23967,6 +24042,13 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"hdr" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/trash_stack{ + icon_state = "Junk_10" + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "hdv" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -23998,6 +24080,11 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/m) +"hdM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bookshelf, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "hdP" = ( /obj/structure/cable/outdoors{ icon_state = "1-4" @@ -24123,14 +24210,21 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) "hfc" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/indestructible/ground/outside/road, -/area/f13/building/abandoned/k) -"hfm" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/ruins, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +"hfm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "hfn" = ( /obj/machinery/door/unpowered/securedoor/khandoor, /obj/effect/decal/cleanable/dirt{ @@ -24154,13 +24248,12 @@ }, /area/f13/wasteland) "hfR" = ( -/obj/structure/simple_door/bunker, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/barricade/wooden, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/obj/structure/junk/machinery, +/turf/open/indestructible/ground/outside/road{ + dir = 1; + icon_state = "horizontaltopborderbottom0" }, -/area/f13/caves) +/area/f13/wasteland) "hfT" = ( /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/u) @@ -24168,6 +24261,10 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"hgn" = ( +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "hgo" = ( /obj/structure/reagent_dispensers/rainwater_tank, /obj/effect/turf_decal/weather/dirt{ @@ -24322,14 +24419,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"hhY" = ( -/obj/structure/campfire/barrel, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = -4; - pixel_x = 7 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "hib" = ( /obj/item/trash/f13/instamash, /turf/open/indestructible/ground/outside/dirt, @@ -24354,6 +24443,11 @@ /obj/item/ingot/uranium, /turf/open/floor/plating/rust, /area/f13/building/powered) +"hiz" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "hiH" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain2right" @@ -24369,12 +24463,15 @@ }, /area/f13/wasteland) "hiN" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 }, -/area/f13/building/powered) +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "hiP" = ( /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/inside/mountain, @@ -24513,6 +24610,14 @@ dir = 4 }, /area/f13/wasteland) +"hkd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) "hkm" = ( /obj/structure/wreck/trash/five_tires, /obj/effect/decal/cleanable/dirt/dust, @@ -24555,6 +24660,14 @@ icon_state = "horizontalinnermain1" }, /area/f13/ambientlighting/building/b) +"hle" = ( +/obj/item/storage/trash_stack{ + icon_state = "Junk_9"; + pixel_x = 2; + pixel_y = 19 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "hlf" = ( /obj/structure/fence/corner{ dir = 8 @@ -24624,6 +24737,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"hmi" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "hmj" = ( /obj/structure/closet/fridge/standard{ anchored = 1 @@ -24796,11 +24915,10 @@ }, /area/f13/wasteland/town) "hnJ" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/pill/bitterdrink, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "hnL" = ( /obj/structure/chair/wood{ dir = 1 @@ -24849,13 +24967,11 @@ }, /area/f13/ambientlighting/building/j) "hot" = ( -/obj/machinery/light{ - dir = 1; - light_color = "#706891" +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/obj/machinery/smartfridge/bottlerack/lootshelf/condiment, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "hou" = ( /obj/structure/ladder/unbreakable{ level = 1; @@ -24876,12 +24992,8 @@ }, /area/f13/building/powered) "hox" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "hoz" = ( /obj/effect/spawner/lootdrop/f13/armor/tier1, /turf/open/indestructible/ground/outside/dirt, @@ -24916,10 +25028,16 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "hpp" = ( -/obj/machinery/light, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/marking{ + pixel_x = -14 + }, +/obj/structure/car/rubbish3{ + icon_state = "car_rubish2" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "hpE" = ( /turf/closed/wall/mineral/brick, /area/f13/wasteland) @@ -24959,6 +25077,12 @@ /mob/living/simple_animal/hostile/raider/sulphite, /turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, /area/f13/ambientlighting/building/j) +"hpZ" = ( +/obj/effect/decal/fakelattice, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) "hqa" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain0" @@ -25010,15 +25134,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/wasteland) -"hqC" = ( -/obj/item/newspaper{ - pixel_x = -2 - }, -/obj/structure/rack, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken3" - }, -/area/f13/ncr) "hqE" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, @@ -25086,6 +25201,13 @@ icon_state = "outerpavement" }, /area/f13/ambientlighting/building/u) +"hrf" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 8 + }, +/area/f13/wasteland) "hrg" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -25125,10 +25247,6 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"hrQ" = ( -/obj/structure/fence/corner/wooden, -/turf/open/indestructible/ground/outside/desert, -/area/f13/wasteland) "hrR" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -25144,6 +25262,12 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"hso" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "hsv" = ( /obj/structure/table/reinforced, /obj/structure/table/reinforced, @@ -25218,11 +25342,10 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland/town) "htm" = ( -/obj/structure/junk/machinery, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/caves) +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/trash_stack, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) "htB" = ( /obj/machinery/light/small{ brightness = 7; @@ -25372,13 +25495,6 @@ name = "rusted floor" }, /area/f13/bunker) -"hvs" = ( -/obj/structure/flora/tree/wasteland, -/obj/item/trash/candy{ - pixel_x = -14 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "hvC" = ( /obj/structure/cable/outdoors{ icon_state = "2-8" @@ -25392,27 +25508,6 @@ /obj/machinery/atmospherics/components/unary/tank/water_vapor, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"hvT" = ( -/obj/structure/closet/anchored, -/obj/item/clothing/shoes/f13/brownie, -/obj/item/clothing/shoes/f13/brownie, -/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/item/clothing/shoes/f13/brownie, -/obj/structure/sign/poster/prewar/poster94{ - pixel_y = 30 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) "hvW" = ( /obj/structure/chair/left, /turf/open/floor/wood_common, @@ -25468,12 +25563,28 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +"hwE" = ( +/obj/structure/simple_door/metal/dirtystore, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "hwF" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +"hwJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "hwL" = ( /obj/structure/sign/warning/fire{ name = "\improper DANGER: FUEL STORAGE"; @@ -25512,12 +25623,20 @@ }, /area/f13/building/abandoned/h) "hxj" = ( -/obj/structure/wreck/trash/machinepiletwo, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/caves) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) +"hxm" = ( +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "hxr" = ( /turf/open/indestructible/ground/outside/road{ dir = 1; @@ -25536,6 +25655,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +"hxD" = ( +/obj/machinery/light/small{ + dir = 8; + light_color = "#d8b1b1" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "hxJ" = ( /obj/machinery/vending/dinnerware{ default_price = 0; @@ -25558,14 +25684,6 @@ }, /turf/open/floor/wood_common, /area/maintenance/bar) -"hya" = ( -/obj/structure/campfire, -/obj/item/cigbutt{ - pixel_y = 11; - pixel_x = 4 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "hyb" = ( /turf/closed/indestructible/rock{ desc = "A pre-War wall made of solid concrete."; @@ -25599,15 +25717,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) -"hyP" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_2"; - pixel_x = 4; - pixel_y = 3 - }, -/obj/effect/landmark/start/f13/ncrrep, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "hyZ" = ( /obj/structure/table/wood, /obj/structure/curtain{ @@ -25817,6 +25926,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +"hBs" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "hBx" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -25843,6 +25957,13 @@ }, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +"hBL" = ( +/obj/structure/simple_door/wood, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "hBN" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -25950,28 +26071,15 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess, /area/f13/ambientlighting/building/j) "hDi" = ( -/obj/structure/fence{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 8; - icon_state = "dirt" - }, -/area/f13/wasteland) -"hDp" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/item/storage/trash_stack{ - icon_state = "trash_2" - }, -/obj/structure/decoration/rag{ - icon_state = "flag_ncr"; - name = "NCR banner"; - pixel_y = 32 +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/displaycase/trophy, +/obj/item/toy/plush, +/obj/structure/fluff/railing{ + dir = 1 }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/structure/fluff/railing, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "hDq" = ( /obj/structure/window/reinforced/spawner{ dir = 8 @@ -26316,11 +26424,9 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland/town) "hHP" = ( -/obj/structure/rack, -/obj/item/clothing/under/f13/petrochico, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/decoration/vent/rusty, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "hHW" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/gecko, @@ -26376,6 +26482,14 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/low, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"hIG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden, +/obj/structure/barricade/tentclothedge{ + dir = 8 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "hIH" = ( /obj/structure/bed/wooden{ pixel_y = 15 @@ -26464,11 +26578,6 @@ /obj/structure/fence/corner, /turf/open/floor/plating/dirt, /area/f13/wasteland) -"hKe" = ( -/obj/structure/wreck/trash/machinepiletwo, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/indestructible/ground/outside/road, -/area/f13/building/abandoned/k) "hKk" = ( /turf/open/indestructible/ground/outside/gravel/path_desert{ dir = 8 @@ -26504,6 +26613,10 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"hKw" = ( +/obj/structure/sign/poster/official/foam_force_ad, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "hKF" = ( /mob/living/simple_animal/hostile/ghoul/reaver, /obj/effect/decal/cleanable/dirt, @@ -26512,11 +26625,14 @@ }, /area/f13/wasteland/city) "hKK" = ( -/obj/structure/stairs/west{ - color = "#A47449" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 39; + pixel_x = -16 }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "hKN" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft2" @@ -26534,6 +26650,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"hKX" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "hKZ" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerborder" @@ -26593,10 +26715,6 @@ icon_state = "outerpavement" }, /area/f13/wasteland) -"hMj" = ( -/obj/machinery/msgterminal/ncr, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "hMm" = ( /obj/structure/table/wood, /obj/item/toy/cards/deck, @@ -26612,19 +26730,12 @@ }, /area/f13/building/powered) "hMS" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "hMU" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/obj/item/trash/f13/tin, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "hNc" = ( /obj/structure/cable/outdoors{ icon_state = "1-4" @@ -26639,17 +26750,6 @@ dir = 1 }, /area/f13/wasteland) -"hNm" = ( -/obj/effect/landmark/start/f13/ncrmp, -/obj/machinery/light/small{ - dir = 8; - light_color = "#ff4747" - }, -/obj/structure/fluff/rug/rug_rubber, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/ncr) "hNq" = ( /obj/structure/car/rubbish3, /obj/effect/decal/cleanable/glass, @@ -26710,6 +26810,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"hOi" = ( +/obj/machinery/computer/camera_advanced{ + id = "veryevilnetwork" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "hOl" = ( /obj/item/flag/ncr, /turf/open/indestructible/ground/outside/sidewalk{ @@ -26823,15 +26930,12 @@ }, /area/f13/followers) "hPz" = ( -/obj/structure/wreck/car/bike{ - dir = 8 +/obj/structure/chair/booth{ + dir = 4 }, -/turf/open/floor/plating/f13/outside/road, -/area/f13/ambientlighting/building/w) -"hPF" = ( -/obj/effect/landmark/start/f13/ncrrearechelon, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "hPN" = ( /obj/structure/car/rubbish1, /obj/effect/decal/cleanable/dirt, @@ -26907,6 +27011,10 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"hQM" = ( +/obj/machinery/light, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "hQO" = ( /obj/structure/car/rubbish4{ pixel_x = -19; @@ -26938,13 +27046,19 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/area/f13/caves) "hRc" = ( /obj/effect/spawner/structure/window/reinforced/indestructable, /obj/structure/table, /obj/structure/barricade/bars, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/ncr) +"hRe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/desert/sonora/edge, +/obj/structure/chair/booth, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) "hRm" = ( /obj/structure/table/wood/junk, /obj/structure/fence{ @@ -26998,6 +27112,13 @@ name = "dirty floor" }, /area/f13/building/powered) +"hRY" = ( +/obj/machinery/light/small{ + dir = 8; + pixel_y = -7 + }, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "hSb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/stairs/east, @@ -27018,20 +27139,6 @@ name = "rusted floor" }, /area/f13/building/powered) -"hSf" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) "hSg" = ( /obj/structure/reagent_dispensers/barrel/old, /turf/open/indestructible/ground/outside/desert, @@ -27177,17 +27284,6 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ambientlighting/building/g) -"hTU" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) "hUb" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, @@ -27221,18 +27317,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"hVn" = ( -/obj/structure/bed/old, -/obj/item/bedsheet/blanket{ - pixel_y = 1 - }, -/obj/structure/sign/poster/prewar/poster74{ - pixel_y = 32 - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/ncr) "hVs" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -27289,6 +27373,13 @@ icon_state = "dirt" }, /area/f13/building/tribal) +"hWz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "hWF" = ( /obj/item/trash/f13/c_ration_1, /turf/open/indestructible/ground/outside/desert, @@ -27301,12 +27392,16 @@ /obj/machinery/processor/chopping_block, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) -"hWU" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 +"hWP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/trash_stack{ + icon_state = "trash_2" }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +"hWU" = ( +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "hWZ" = ( /obj/structure/simple_door/metal/store{ icon_state = "brokenstore" @@ -27368,15 +27463,12 @@ }, /area/f13/ambientlighting/building/y) "hYg" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/obj/item/flashlight/lantern{ - pixel_y = 17; - pixel_x = 10 +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks"; + dir = 5 }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "hYq" = ( /turf/closed/wall/f13/tentwall, /area/f13/ambientlighting/building/f) @@ -27529,14 +27621,6 @@ icon_state = "horizontaltopbordertop0" }, /area/f13/wasteland) -"iap" = ( -/obj/structure/chair/wood{ - dir = 1 - }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/wasteland) "iat" = ( /obj/effect/decal/fakelattice, /obj/structure/lamp_post{ @@ -27619,14 +27703,6 @@ /obj/structure/fence, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) -"ibC" = ( -/obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 8; - light_color = "#ff4747" - }, -/turf/open/floor/f13/wood, -/area/f13/ncr) "ibQ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -27664,12 +27740,6 @@ /obj/structure/debris/v2, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) -"icM" = ( -/obj/structure/flora/brushwood{ - pixel_x = -21 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "icO" = ( /turf/open/indestructible/ground/outside/savannah, /area/f13/wasteland) @@ -27732,6 +27802,10 @@ /obj/structure/closet/crate/freezer, /turf/open/indestructible/ground/outside/sidewalkdirt, /area/f13/wasteland/followers) +"idu" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "idG" = ( /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt{ @@ -28006,12 +28080,11 @@ /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) "ihu" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/chair/stool/retro/tan, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2left" }, -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "ihw" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/delivery, @@ -28020,6 +28093,10 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +"ihM" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "ihP" = ( /obj/structure/barricade/wooden/strong, /obj/structure/barricade/tentleatheredge, @@ -28068,6 +28145,14 @@ name = "dirty floor" }, /area/f13/building/powered) +"iid" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "iio" = ( /obj/structure/simple_door/tentflap_cloth, /turf/open/indestructible/ground/outside/dirt, @@ -28078,13 +28163,6 @@ /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"iiA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/outdoors{ - icon_state = "1-2" - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "iiG" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ @@ -28132,20 +28210,19 @@ }, /area/f13/building/powered) "ijh" = ( -/obj/structure/rack, -/obj/item/shovel, -/obj/item/cultivator, -/obj/item/shovel/spade, -/obj/item/clothing/under/f13/ncrcaravan, -/turf/open/floor/plating/dirt, -/area/f13/ncr) +/obj/effect/decal/cleanable/blood{ + icon_state = "gib1"; + pixel_y = -6 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "ijk" = ( -/obj/structure/window/fulltile/house{ - dir = 2; - icon_state = "housewindowbrokenvertical" +/obj/effect/decal/cleanable/robot_debris, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "ijl" = ( /obj/structure/simple_door/metal/fence, /turf/open/indestructible/ground/outside/sidewalk{ @@ -28207,10 +28284,11 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "ijZ" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/ammo/civilian, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood{ + icon_state = "housewood1-broken" + }, +/area/f13/ambientlighting/building/m) "ikh" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" @@ -28254,9 +28332,19 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "ikE" = ( -/obj/structure/flora/tree/tall, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/item/fermichem/pHpaper, +/obj/item/fermichem/pHpaper, +/obj/structure/table/wood, +/obj/machinery/reagentgrinder, +/obj/machinery/light{ + light_color = "#e8eaff" + }, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "ikH" = ( /obj/structure/flora/tree/tall{ layer = 2; @@ -28360,20 +28448,12 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "imc" = ( -/obj/item/storage/trash_stack{ - icon_state = "Junk_10"; - pixel_x = -11; - pixel_y = -13 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/obj/effect/turf_decal/weather/snow/corner, -/obj/structure/closet/crate/trashcart, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" +/obj/effect/turf_decal/weather/dirt{ + dir = 10 }, -/area/f13/wasteland) +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "imf" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -28463,16 +28543,6 @@ /obj/item/stack/ore/iron, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"iox" = ( -/obj/structure/flora/brushwoodalt{ - pixel_x = 16; - pixel_y = 11 - }, -/obj/structure/flora/grass/green{ - pixel_x = 10 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "ioy" = ( /obj/structure/table/wood, /obj/structure/table/wood, @@ -28539,14 +28609,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"ipq" = ( -/obj/machinery/door/unpowered/secure_NCR{ - name = "Prison" - }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/ncr) "ipF" = ( /turf/open/floor/plating/rust, /area/f13/building/powered) @@ -28594,10 +28656,24 @@ icon_state = "dirt" }, /area/f13/wasteland) +"iqu" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 8 + }, +/area/f13/wasteland) "iqv" = ( /obj/machinery/door/locked/hard/trapped, /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) +"iqM" = ( +/obj/structure/table/booth, +/obj/item/storage/box/papersack, +/obj/item/storage/box/papersack, +/obj/item/storage/box/papersack, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "iqY" = ( /obj/structure/window/fulltile/house{ dir = 2 @@ -28679,6 +28755,18 @@ /mob/living/simple_animal/cow/brahmin/horse, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"isM" = ( +/obj/structure/chair/sofa/right{ + color = "#475340"; + dir = 4; + pixel_x = 5 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "isQ" = ( /obj/structure/closet/cabinet/anchored, /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, @@ -28707,6 +28795,13 @@ /obj/effect/landmark/start/f13/prospector, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +"itr" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/obj/item/stack/sheet/mineral/wood/five, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "itB" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -28715,7 +28810,7 @@ pixel_y = 18 }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/area/f13/caves) "itE" = ( /obj/structure/closet/crate/trashcart, /turf/open/indestructible/ground/outside/sidewalk, @@ -28797,15 +28892,9 @@ }, /area/f13/ambientlighting/building/b) "iva" = ( -/obj/structure/barricade/wooden, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) +/obj/structure/table/wood/club, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "ivg" = ( /obj/structure/chair/wood, /obj/effect/landmark/start/f13/tribal, @@ -28921,12 +29010,23 @@ }, /area/f13/ambientlighting/building/i) "ivX" = ( -/obj/effect/turf_decal/weather/snow/corner, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/structure/flora/rock/jungle, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"iwk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "iwp" = ( /obj/item/trash/f13/porknbeans, /turf/open/indestructible/ground/outside/dirt, @@ -28947,18 +29047,9 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "iwR" = ( -/obj/structure/table/booth, -/obj/item/crafting/coffee_pot{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/reagent_containers/food/drinks/bottle/instacoffee, -/obj/machinery/light{ - dir = 1; - light_color = "#706891" - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/effect/turf_decal/vg_decals/atmos/mix, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "ixa" = ( /obj/structure/table, /obj/machinery/computer/terminal{ @@ -28986,15 +29077,14 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) "ixw" = ( -/obj/machinery/light{ - dir = 1; - light_color = "#706891" - }, -/obj/structure/table, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/lootdrop/cig_packs, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/structure/table/booth, +/obj/item/reagent_containers/food/condiment/pack/coffee, +/obj/item/reagent_containers/food/condiment/pack/coffee, +/obj/item/reagent_containers/food/condiment/pack/coffee, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "ixz" = ( /obj/structure/sign/legion/smithy, /turf/closed/wall/f13/wood/house/broken, @@ -29098,6 +29188,13 @@ /obj/structure/obstacle/barbedwire, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +"izz" = ( +/obj/machinery/vending/hydronutrients{ + force_free = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "izB" = ( /obj/structure/bed/mattress{ icon_state = "mattress4" @@ -29161,6 +29258,15 @@ /obj/structure/table/wood, /turf/open/floor/carpet/red, /area/f13/ambientlighting/building/e) +"iAe" = ( +/obj/structure/chair/stool{ + dir = 1; + icon_state = "bench" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "iAh" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -29172,6 +29278,22 @@ }, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"iAm" = ( +/obj/structure/rack/shelf_metal, +/obj/item/clothing/head/helmet/f13/combat/mk2, +/obj/item/clothing/suit/armor/tiered/medium/combat/mk2, +/obj/effect/spawner/bundle/f13/assault_carbine, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/shoes/combat, +/obj/machinery/light/fo13colored/Red{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/blueprintVHighBallistics, +/obj/effect/spawner/lootdrop/f13/blueprintVHigh, +/obj/effect/spawner/lootdrop/f13/blueprintMid, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "iAt" = ( /obj/structure/reagent_dispensers/barrel/three, /turf/open/floor/plating/rust, @@ -29182,6 +29304,15 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) +"iAH" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/vending/games, +/obj/machinery/light/small{ + brightness = 7; + dir = 4 + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "iAL" = ( /obj/structure/simple_door/interior, /obj/effect/decal/cleanable/dirt, @@ -29240,13 +29371,6 @@ /obj/structure/janitorialcart, /turf/open/indestructible/ground/outside/sidewalkdirt, /area/f13/wasteland/followers) -"iBL" = ( -/obj/effect/decal/cleanable/glass, -/obj/structure/chair/bench{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "iBP" = ( /obj/machinery/door/poddoor/shutters{ id = "garage"; @@ -29262,12 +29386,11 @@ /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, /area/f13/clinic) "iBY" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/mask/muzzle, -/obj/item/clothing/mask/muzzle, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/chair/stool/retro/backed{ + dir = 8 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "iCt" = ( /obj/effect/turf_decal/huge{ dir = 8 @@ -29426,6 +29549,14 @@ }, /turf/open/floor/carpet/red, /area/f13/building/abandoned/t) +"iDY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/fo13colored/Red{ + dir = 1 + }, +/turf/open/floor/plating/rust, +/area/f13/sewer/powered) "iEq" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -29449,9 +29580,15 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "iEF" = ( -/obj/machinery/door/poddoor/shutters/preopen, -/turf/open/floor/plating/f13/outside/road, -/area/f13/ambientlighting/building/w) +/obj/item/clockwork/alloy_shards{ + name = "rocks"; + desc = "Rocks. Mindblowing."; + anchored = 1 + }, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, +/area/f13/wasteland) "iEI" = ( /obj/structure/fence{ dir = 4 @@ -29467,15 +29604,6 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) -"iEJ" = ( -/obj/structure/fluff/hedge, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - light_color = "#ff4747"; - dir = 4 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "iEK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -29491,17 +29619,9 @@ /obj/effect/overlay/desert/sonora/edge, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) -"iFf" = ( -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 1; - pixel_y = 18 - }, -/obj/item/reagent_containers/glass/bucket{ - pixel_y = 17; - pixel_x = 11 - }, -/turf/open/floor/plating/dirt, -/area/f13/wasteland) +"iFi" = ( +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) "iFj" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, @@ -29525,12 +29645,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) -"iFv" = ( -/obj/structure/flora/grass/green, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow4" - }, -/area/f13/wasteland) "iFx" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/ghoul/glowing, @@ -29649,7 +29763,6 @@ /obj/effect/overlay/desert/sonora/edge/corner{ dir = 4 }, -/obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "iHx" = ( @@ -29687,16 +29800,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"iIa" = ( -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 4; - pixel_x = 7 - }, -/obj/structure/cable/outdoors{ - icon_state = "1-2" - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "iIG" = ( /obj/machinery/telecomms/relay/preset/telecomms, /turf/open/indestructible, @@ -29748,9 +29851,11 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "iJF" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "iJM" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/dirt{ @@ -29852,7 +29957,6 @@ /area/maintenance/bar) "iKV" = ( /obj/structure/debris/v1, -/obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "iKX" = ( @@ -29867,6 +29971,13 @@ }, /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, /area/f13/ambientlighting/building/j) +"iLb" = ( +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/structure/rack, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "iLc" = ( /obj/structure/wreck/trash/two_barrels, /obj/effect/decal/fakelattice, @@ -29925,10 +30036,11 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) "iLM" = ( -/obj/structure/table/wood, -/obj/machinery/processor/chopping_block, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "iMa" = ( /obj/machinery/iv_drip/primitive, /obj/effect/turf_decal/siding/wood{ @@ -30028,11 +30140,13 @@ /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) "iNn" = ( -/obj/structure/rack, -/obj/item/clothing/suit/pirate, -/obj/item/clothing/head/pirate, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/statue/petrified, +/obj/item/clothing/suit/armor/outfit/jacket/police/lieutenant{ + layer = 5 + }, +/obj/item/clothing/under/rank/civilian/victorianblackdress, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "iNo" = ( /turf/open/indestructible/ground/outside/grass, /area/f13/ambientlighting/building/c) @@ -30043,6 +30157,13 @@ }, /turf/closed/wall/f13/wood, /area/f13/building/tribal) +"iNy" = ( +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "iNH" = ( /obj/structure/table{ layer = 2.9 @@ -30077,11 +30198,11 @@ /turf/open/floor/wood_common, /area/f13/wasteland) "iOG" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/three_course_meal, -/obj/item/kitchen/fork, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "iOS" = ( /obj/structure/barricade/wooden, /obj/structure/decoration/rag{ @@ -30201,6 +30322,12 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland/town) +"iQV" = ( +/obj/item/crafting/campfirekit, +/obj/item/crafting/campfirekit, +/obj/structure/shelf_wood, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "iQZ" = ( /obj/structure/simple_door/metal/store{ icon_state = "brokenstore" @@ -30220,6 +30347,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) +"iRo" = ( +/mob/living/simple_animal/hostile/ghoul, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) "iRp" = ( /obj/machinery/light, /turf/open/floor/wood_common, @@ -30263,10 +30396,9 @@ }, /area/f13/wasteland) "iSc" = ( -/obj/item/clothing/shoes/sneakers/black, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/turf_decal/vg_decals/department/hop, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "iSe" = ( /obj/effect/decal/marking{ icon_state = "singlehorizontal" @@ -30315,12 +30447,9 @@ }, /area/f13/ambientlighting/building/b) "iTe" = ( -/obj/structure/flora/twig2{ - pixel_x = 11; - pixel_y = -7 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/item/reagent_containers/pill/patch/healpoultice, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "iTh" = ( /obj/structure/stairs/north, /turf/open/floor/f13{ @@ -30342,10 +30471,6 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/w) -"iTM" = ( -/mob/living/simple_animal/cow/brahmin, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "iTN" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, @@ -30357,9 +30482,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "iUj" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontaltopborderbottom1" +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2" }, /area/f13/wasteland) "iUm" = ( @@ -30438,6 +30563,10 @@ /obj/effect/decal/fakelattice, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +"iVB" = ( +/obj/structure/simple_door/metal/dirtystore, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "iVU" = ( /obj/structure/chair/bench{ dir = 4; @@ -30472,12 +30601,19 @@ "iWl" = ( /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/a) +"iWm" = ( +/obj/structure/railing/corner, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft1" + }, +/area/f13/wasteland) "iWu" = ( -/obj/structure/stairs/north{ - color = "#A47449" +/obj/effect/turf_decal/weather/dirt{ + dir = 6 }, -/turf/open/floor/wood_wide, -/area/f13/ncr) +/obj/structure/fluff/rails, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "iWy" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 28 @@ -30520,15 +30656,16 @@ }, /area/f13/building/powered) "iWX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8; - light_color = "#ff4747" +/obj/item/flag/legion{ + pixel_y = 28; + pixel_x = 1 }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/fence/wooden{ + dir = 1; + icon_state = "post_wood" }, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "iXg" = ( /obj/structure/table/wood/bar, /turf/open/indestructible/ground/outside/grass/dirtpath, @@ -30541,15 +30678,9 @@ }, /area/f13/building/tribal) "iXz" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/outdoors{ - icon_state = "1-2" - }, +/obj/structure/flora/twig3, /turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/area/f13/caves) "iXD" = ( /obj/machinery/iv_drip, /obj/machinery/light{ @@ -30622,6 +30753,12 @@ /obj/structure/table/wood, /turf/open/floor/carpet/airless, /area/f13/ambientlighting/building/c) +"iYw" = ( +/obj/item/trash/candy, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) "iYF" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /turf/open/indestructible/ground/outside/dirt, @@ -30663,6 +30800,13 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +"iZi" = ( +/obj/structure/fence/door/opened, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerinner" + }, +/area/f13/wasteland) "iZj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/twig4, @@ -30745,6 +30889,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"iZS" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "jac" = ( /obj/structure/guncase, /obj/machinery/light/small, @@ -30908,14 +31056,11 @@ }, /area/f13/brotherhood) "jcO" = ( -/obj/structure/chair/wood{ +/obj/effect/turf_decal/weather/dirt{ dir = 1 }, -/obj/machinery/light/small{ - light_color = "#ff4747" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/dirt, +/area/f13/caves) "jcP" = ( /obj/structure/fence/end/wooden{ dir = 8; @@ -30960,17 +31105,6 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"jdp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil{ - icon_state = "floor6"; - pixel_y = 9; - pixel_x = -10 - }, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken6" - }, -/area/f13/ncr) "jdr" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/sofa/right{ @@ -31011,6 +31145,12 @@ name = "dirty floor" }, /area/f13/brotherhood) +"jeh" = ( +/obj/effect/spawner/bundle/f13/caravan_shotgun, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "jem" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft2top" @@ -31035,18 +31175,30 @@ /obj/effect/turf_decal/weather/dirt{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/area/f13/caves) "jeL" = ( -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/under/f13/ncr_formal_uniform, -/obj/item/clothing/under/f13/ncr/ncr_officer, -/obj/item/clothing/head/beret/ncr_codresscap, -/obj/structure/closet/cabinet/anchored, -/obj/item/clothing/under/f13/ncr_formal_uniform, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/item/blacksmith/chain{ + pixel_y = -7; + desc = "A length of chain hanging from an overhead support beam with cuffs at the bottom."; + anchored = 1 + }, +/obj/item/restraints/handcuffs{ + pixel_x = 4; + pixel_y = -21; + anchored = 1; + desc = "A pair of handcuffs attached to a chain overhead, bleak." + }, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) +"jeT" = ( +/obj/structure/chair/stool, +/obj/machinery/light{ + dir = 1; + light_color = "#706891" + }, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "jeV" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -31057,18 +31209,35 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) "jfb" = ( -/obj/structure/barricade/wooden, /obj/effect/turf_decal/weather/dirt{ - dir = 4 + dir = 5 }, +/obj/effect/decal/cleanable/robot_debris, /turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/area/f13/wasteland) +"jfg" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/porta_turret/f13/turret_shotgun/burstfire/robot, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "jfl" = ( /obj/structure/obstacle/barbedwire/end{ dir = 8 }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"jfx" = ( +/obj/item/radio/intercom/retro{ + pixel_y = 32 + }, +/obj/machinery/camera/autoname{ + pixel_x = 27 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "jfy" = ( /mob/living/simple_animal/hostile/raider/ranged, /turf/open/indestructible/ground/outside/dirt{ @@ -31103,6 +31272,19 @@ /obj/machinery/workbench, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) +"jfT" = ( +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench"; + pixel_y = 17 + }, +/obj/structure/billboard/superduper1{ + pixel_y = 33 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "jfW" = ( /obj/effect/decal/marking{ icon_state = "dottedvertical" @@ -31150,13 +31332,6 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) -"jgl" = ( -/obj/structure/stairs/west{ - color = "#A47449"; - dir = 4 - }, -/turf/open/floor/plating/dirt, -/area/f13/wasteland) "jgs" = ( /obj/machinery/workbench, /turf/open/indestructible/ground/outside/desert{ @@ -31280,6 +31455,12 @@ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) +"jiN" = ( +/obj/item/radio/intercom/retro{ + pixel_x = 31 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "jiP" = ( /obj/structure/table/wood, /obj/item/paper, @@ -31303,11 +31484,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) -"jiV" = ( -/turf/open/floor/wood_wide{ - icon_state = "wide-broken1" - }, -/area/f13/ncr) "jiW" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/dirt{ @@ -31414,12 +31590,9 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "jkv" = ( -/mob/living/simple_animal/hostile/ghoul, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" - }, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "jkH" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/handy, @@ -31458,19 +31631,14 @@ }, /area/f13/wasteland) "jlb" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/obj/structure/flora/grass/brown{ - pixel_x = -6; - pixel_y = 12 +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" +/obj/structure/chair/booth{ + dir = 1 }, +/turf/open/floor/plasteel/bar, /area/f13/wasteland) "jle" = ( /obj/effect/turf_decal/delivery, @@ -31523,6 +31691,16 @@ }, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) +"jlT" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded"; + pixel_x = -14 + }, +/obj/structure/car/rubbish1, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "jlY" = ( /mob/living/simple_animal/hostile/supermutant/rangedmutant, /obj/effect/decal/cleanable/dirt, @@ -31590,6 +31768,10 @@ }, /turf/open/floor/plating/dirt, /area/f13/ambientlighting/building/j) +"jmW" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_worn, +/area/f13/ambientlighting/building/m) "jmZ" = ( /obj/structure/fence/wooden{ dir = 4 @@ -31825,12 +32007,19 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "jrB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt{ +/obj/structure/fence/wooden{ + dir = 4; + icon_state = "post_wood" + }, +/obj/item/flag/legion{ + pixel_y = 28; + pixel_x = 1 + }, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt"; dir = 1 }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/area/f13/wasteland) "jrJ" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -31886,10 +32075,11 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "jsI" = ( -/obj/structure/bed/mattress/pregame, -/obj/effect/spawner/lootdrop/f13/weapon/melee/random, +/obj/structure/table/booth, +/obj/item/seeds/coffee, +/obj/item/seeds/coffee/robusta, /turf/open/floor/f13/wood, -/area/f13/wasteland) +/area/f13/ambientlighting/building/m) "jsN" = ( /obj/structure/fence{ dir = 8 @@ -31929,16 +32119,15 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "jtd" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -31 - }, -/obj/structure/sign/poster/contraband/scum{ - pixel_x = -32 +/obj/structure/fluff/rails{ + dir = 1 }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2"; + pixel_y = 4 }, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "jtf" = ( /obj/structure/table/optable, /obj/effect/decal/cleanable/greenglow, @@ -32136,6 +32325,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +"jwh" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib1"; + pixel_y = -6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/pill/bitterdrink, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"jwi" = ( +/obj/structure/table/wood/junk, +/obj/structure/fluff/paper/stack{ + desc = "A stack of various papers, illegible scribbles scattered across each page."; + pixel_x = 6 + }, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "jwq" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermainbottom" @@ -32167,7 +32373,6 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "jwI" = ( -/obj/effect/spawner/lootdrop/trash, /obj/structure/billboard/poseidenenergy2, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) @@ -32195,15 +32400,6 @@ "jwS" = ( /turf/closed/wall/mineral/brick, /area/f13/ncr) -"jxc" = ( -/obj/structure/window/fulltile/wood, -/obj/structure/curtain{ - color = "#808080" - }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/ncr) "jxe" = ( /obj/effect/turf_decal/weather/dirt, /obj/structure/closet/crate/bin{ @@ -32212,7 +32408,6 @@ /obj/effect/decal/cleanable/dirt{ color = "000000" }, -/obj/effect/spawner/lootdrop/trash, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) "jxg" = ( @@ -32253,6 +32448,12 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"jxn" = ( +/obj/item/grenade/syndieminibomb/concussion, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) "jxq" = ( /obj/structure/fermenting_barrel, /obj/effect/turf_decal/weather/dirt{ @@ -32321,6 +32522,16 @@ icon_state = "common_dark-broken3" }, /area/f13/building/abandoned/n) +"jyj" = ( +/obj/item/trash/f13/tin_large, +/obj/structure/car/rubbish3{ + pixel_x = -14; + pixel_y = 6 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "jys" = ( /obj/machinery/door/poddoor/shutters/preopen, /turf/open/indestructible/ground/outside/road{ @@ -32418,6 +32629,12 @@ icon_state = "verticalrightborderright2bottom" }, /area/f13/wasteland) +"jzy" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, +/area/f13/wasteland) "jzE" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/blood/gibs, @@ -32468,6 +32685,11 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"jAz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/destructible/tribal_torch/lit, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "jAA" = ( /obj/structure/table/wood, /obj/machinery/light/small{ @@ -32479,6 +32701,20 @@ }, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +"jAK" = ( +/obj/structure/table/wood/junk, +/obj/item/clothing/mask/cigarette/rollie/cannabis{ + pixel_y = 15 + }, +/obj/item/clothing/mask/cigarette/rollie/cannabis{ + pixel_y = 10 + }, +/obj/item/clothing/mask/cigarette/rollie/cannabis{ + pixel_y = 5 + }, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "jAR" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/crafting, @@ -32504,13 +32740,15 @@ icon_state = "dirtcorner" }, /area/f13/wasteland/legion) +"jBi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/debris/v4, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "jBl" = ( -/obj/effect/turf_decal/arrows{ - pixel_y = 7 - }, -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain1" +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) "jBn" = ( @@ -32518,6 +32756,15 @@ /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/wood_common, /area/maintenance/bar) +"jBq" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outermaincornerinner" + }, +/area/f13/wasteland) "jBy" = ( /obj/machinery/chem_heater, /turf/open/floor/plasteel/neutral, @@ -32547,15 +32794,13 @@ }, /area/f13/building/powered) "jBW" = ( -/obj/structure/rack, -/obj/item/clothing/neck/tie, -/obj/item/clothing/neck/tie/black, -/obj/item/clothing/neck/tie/blue, -/obj/item/clothing/neck/tie/red, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/marking{ + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "jCb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/reagentgrinder, @@ -32614,10 +32859,11 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) "jCV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/rack, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerturn" + }, +/area/f13/wasteland) "jDc" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/mapping_helpers/network_builder/power_cable/auto, @@ -32820,10 +33066,14 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "jGd" = ( -/obj/effect/spawner/lootdrop/f13/crafting, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "jGh" = ( /obj/machinery/light{ bulb_colour = "#BC8F8F"; @@ -32878,6 +33128,13 @@ /obj/structure/simple_door/wood, /turf/open/floor/wood_wide, /area/f13/legioncamp) +"jHg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/restraints/legcuffs/beartrap, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "jHh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/wreck/trash/machinepiletwo, @@ -33019,10 +33276,11 @@ /turf/closed/wall/f13/wood/house/broken, /area/f13/wasteland) "jJH" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/wood_common{ - icon_state = "common-broken2" +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench" }, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "jJJ" = ( /turf/open/floor/f13/wood, @@ -33035,6 +33293,11 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"jJZ" = ( +/obj/structure/flora/twig3, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "jKo" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/outside/dirt{ @@ -33085,11 +33348,8 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "jLb" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/building/powered) +/turf/closed/wall/f13/tentwall, +/area/f13/ambientlighting/building/m) "jLe" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, @@ -33124,18 +33384,17 @@ }, /area/f13/brotherhood) "jLT" = ( -/obj/structure/table/wood, -/obj/item/stack/f13Cash/random/med, -/turf/open/floor/f13/wood, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "jMa" = ( /obj/machinery/door/locked/easy/maybe_trapped, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/x) -"jMc" = ( -/obj/structure/barricade/wooden, -/turf/closed/mineral/random/low_chance, -/area/f13/ncr) "jMh" = ( /obj/structure/simple_door, /obj/structure/barricade/wooden/strong, @@ -33154,12 +33413,12 @@ }, /area/f13/building/abandoned/j) "jMn" = ( -/obj/effect/spawner/lootdrop/trash, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood{ - icon_state = "housewood2" +/obj/structure/tires/two, +/turf/open/indestructible/ground/outside/dirt{ + dir = 9; + icon_state = "dirt" }, -/area/f13/building/abandoned/a) +/area/f13/wasteland) "jMo" = ( /obj/structure/fence/door{ dir = 4 @@ -33534,14 +33793,9 @@ }, /area/f13/building/powered) "jRZ" = ( -/obj/structure/rack, -/obj/item/clothing/under/f13/Retro_Biker_Vest, -/obj/item/clothing/gloves/Biker, -/obj/item/clothing/head/fluff/Bikerhelmet, -/obj/item/clothing/mask/frog, -/obj/effect/decal/cleanable/dirt/dust, +/obj/item/trash/chips, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/area/f13/ambientlighting/building/m) "jSb" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/misc/cmo, @@ -33659,11 +33913,11 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) "jUl" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood_common{ + icon_state = "common-broken2" }, -/area/f13/ambientlighting/building/p) +/area/f13/ambientlighting/building/m) "jUm" = ( /obj/structure/wreck/trash/autoshaft, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -33764,10 +34018,10 @@ }, /area/f13/building/powered) "jVw" = ( -/obj/structure/chair/office{ - dir = 4 +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2left" }, -/turf/open/floor/f13/wood, /area/f13/wasteland) "jVC" = ( /obj/item/melee/onehanded/club/ncrflag{ @@ -33842,6 +34096,10 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"jXk" = ( +/obj/structure/flora/twig2, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "jXm" = ( /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low, /turf/open/indestructible/ground/outside/dirt, @@ -33874,6 +34132,14 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/i) +"jXH" = ( +/obj/structure/flora/tree/wasteland{ + icon_state = "deadtree_4" + }, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) "jXZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -33914,14 +34180,22 @@ }, /area/f13/wasteland) "jYM" = ( -/obj/effect/spawner/lootdrop/trash, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/indestructible/ground/outside/road, -/area/f13/caves) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "jYN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common/wood_common_dark, /area/f13/building/abandoned/m) +"jYR" = ( +/obj/structure/chair/stool/retro/backed{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "jZa" = ( /obj/structure/fence{ dir = 1 @@ -33968,12 +34242,11 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "jZF" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/lockpick_set/bobby_pin, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/overlay/desert/sonora/edge, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) "jZI" = ( /turf/closed/wall/f13/wood/house/broken, /area/f13/wasteland) @@ -34014,6 +34287,15 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"kaf" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outercorner" + }, +/area/f13/wasteland) "kaq" = ( /obj/machinery/light/small{ dir = 8 @@ -34082,6 +34364,13 @@ /obj/effect/decal/cleanable/robot_debris/old, /turf/open/floor/plating/rust, /area/f13/building/powered) +"kaU" = ( +/obj/item/mine/shrapnel, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 8 + }, +/area/f13/wasteland) "kbd" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -34090,22 +34379,9 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "kbo" = ( -/obj/machinery/smartfridge/bottlerack/gardentool/primitive, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/l4z, -/obj/item/reagent_containers/glass/bottle/nutrient/l4z, -/obj/item/reagent_containers/glass/bottle/nutrient/l4z, -/obj/item/reagent_containers/glass/bottle/nutrient/l4z, -/obj/item/reagent_containers/glass/bottle/nutrient/rh, -/obj/item/reagent_containers/glass/bottle/nutrient/rh, -/obj/item/reagent_containers/glass/bottle/nutrient/rh, -/obj/item/reagent_containers/glass/bottle/nutrient/rh, -/obj/item/reagent_containers/glass/bottle/nutrient/rh, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/obj/structure/furnace, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "kbF" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -34124,16 +34400,30 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"kbY" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerborder" + }, +/area/f13/wasteland) +"kck" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "kcn" = ( /obj/structure/flora/wasteplant/wild_prickly, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"kcF" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 +"kcw" = ( +/obj/item/stack/sheet/mineral/wood, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt"; + dir = 1 }, -/obj/effect/landmark/start/f13/ncroffduty, -/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "kcN" = ( /obj/machinery/light{ @@ -34196,6 +34486,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"kdx" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "kdH" = ( /obj/structure/glowshroom, /turf/open/indestructible/ground/inside/mountain, @@ -34265,12 +34559,10 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "kex" = ( -/obj/structure/barricade/wooden/planks{ - icon_state = "board-2"; - desc = "This sps" +/turf/closed/indestructible/rock{ + layer = 50 }, -/turf/closed/wall/f13/wood, -/area/f13/ncr) +/area/f13/caves) "kez" = ( /obj/structure/rack, /obj/item/camera, @@ -34378,14 +34670,8 @@ /obj/effect/turf_decal/weather/dirt{ dir = 6 }, -/obj/structure/table/wood, -/obj/structure/decoration/rag{ - icon_state = "flag_ncr"; - name = "NCR banner"; - pixel_y = 32 - }, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/area/f13/caves) "kgN" = ( /obj/structure/chair/office/dark, /obj/effect/decal/cleanable/dirt/dust, @@ -34430,6 +34716,16 @@ /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/carpet/airless, /area/f13/ambientlighting/building/c) +"khv" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/structure/junk/small, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "khB" = ( /obj/effect/turf_decal/huge{ dir = 8 @@ -34494,11 +34790,11 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "kib" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/stack/sheet/metal/fifty, -/turf/open/indestructible/ground/outside/road, -/area/f13/building/abandoned/k) +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "kid" = ( /obj/structure/table/booth, /obj/item/paper_bin, @@ -34525,7 +34821,6 @@ }, /area/f13/ambientlighting/building/f) "kio" = ( -/obj/effect/spawner/lootdrop/trash, /obj/machinery/workbench, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/q) @@ -34567,6 +34862,10 @@ }, /turf/open/floor/plating/f13, /area/f13/wasteland) +"kiH" = ( +/obj/structure/sign/poster/official/cohiba_robusto_ad, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "kiL" = ( /obj/structure/table, /obj/item/paper/fluff/awaymissions/academy/class/biology, @@ -34589,6 +34888,10 @@ icon_state = "dirt" }, /area/f13/wasteland) +"kji" = ( +/obj/effect/decal/remains/human, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "kjl" = ( /obj/machinery/door/unpowered/securedoor{ req_access_txt = "25" @@ -34596,9 +34899,22 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "kjr" = ( -/obj/structure/obstacle/barbedwire/end, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/structure/closet/crate/large{ + layer = 4.9; + name = "large crate wall"; + anchored = 1 + }, +/obj/structure/closet/crate/large{ + pixel_y = 17; + layer = 5.1; + name = "large crate wall"; + anchored = 1 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "kjH" = ( /obj/machinery/light/small{ dir = 8; @@ -34612,12 +34928,13 @@ }, /area/f13/ambientlighting/building/o) "kjL" = ( -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gibmid1" +/obj/structure/grille/broken, +/obj/item/trash/f13/tin, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/area/f13/wasteland) "kjM" = ( /obj/structure/table/optable, /obj/structure/curtain{ @@ -34697,6 +35014,13 @@ /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"kkF" = ( +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 8 + }, +/area/f13/wasteland) "kkK" = ( /obj/structure/chair/pew{ dir = 1 @@ -34767,21 +35091,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) -"klZ" = ( -/obj/item/newspaper{ - pixel_x = 2; - pixel_y = -8 - }, -/obj/structure/chair/f13chair1{ - pixel_x = -10; - pixel_y = 16 - }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 19; - pixel_x = 1 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "kme" = ( /turf/open/floor/f13{ icon_state = "floorrusty" @@ -34820,22 +35129,17 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "kmB" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/obj/structure/closet/crate/footlocker{ - pixel_y = 11; - pixel_x = 6 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/under/f13/ncr/scout, -/obj/item/clothing/under/f13/ncr/sniper{ - pixel_x = 7 +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" +/area/f13/wasteland) +"kmD" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain1" }, -/area/f13/ncr) +/area/f13/wasteland) "kmF" = ( /obj/structure/barricade/wooden/strong, /turf/closed/wall/f13/wood/house, @@ -34858,17 +35162,30 @@ icon_state = "horizontaloutermain2" }, /area/f13/wasteland) +"knm" = ( +/obj/structure/shelf_wood, +/obj/item/camera{ + pixel_x = 3; + pixel_y = 11 + }, +/obj/item/camera{ + pixel_x = 3; + pixel_y = 11 + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "knE" = ( /obj/structure/barricade/wooden/strong, /obj/structure/barricade/bars, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) "knH" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 10 +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "knK" = ( /obj/machinery/light/small/broken{ dir = 8 @@ -35053,17 +35370,10 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/ncr) "kqJ" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/structure/flora/tree_stump{ - pixel_y = 8 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/item/twohanded/legionaxe, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "kqU" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/road, @@ -35114,11 +35424,11 @@ }, /area/f13/ambientlighting/building/o) "krJ" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 +/obj/structure/simple_door/bunker, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/area/f13/sewer/powered) "krK" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/dirt{ @@ -35178,13 +35488,13 @@ }, /area/f13/wasteland) "ktB" = ( -/obj/effect/turf_decal/weather/snow/corner, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/trash/f13/c_ration_3, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" +/obj/item/reagent_containers/pill/bitterdrink, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" }, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "ktE" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt/dust, @@ -35289,7 +35599,6 @@ /turf/open/floor/f13, /area/f13/ambientlighting/building/o) "kuS" = ( -/mob/living/simple_animal/hostile/handy/protectron, /obj/effect/decal/cleanable/dirt{ color = "000000" }, @@ -35297,6 +35606,9 @@ brightness = 7; dir = 8 }, +/mob/living/simple_animal/hostile/handy/protectron{ + faction = list("raider") + }, /turf/open/floor/f13{ icon_state = "floorrusty" }, @@ -35437,6 +35749,14 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"kxz" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/junk/locker, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/f13/sewer/powered) "kxM" = ( /obj/structure/cable/outdoors{ icon_state = "1-2" @@ -35620,37 +35940,26 @@ dir = 8 }, /area/f13/wasteland) -"kAA" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = -5; - pixel_y = 13 - }, -/obj/item/stack/f13Cash/caps/onefivezero{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/stack/f13Cash/ncr{ - amount = 187 +"kAC" = ( +/obj/structure/decoration/vent, +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/m) +"kAH" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/booth, +/obj/machinery/light/small{ + dir = 1; + light_color = "#d8b1b1" }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "kAJ" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 5; icon_state = "outerpavement" }, /area/f13/wasteland) -"kAL" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, -/obj/item/storage/trash_stack{ - pixel_y = 18 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "kAY" = ( /obj/structure/table/wood, /obj/effect/overlay/desert_side{ @@ -35703,9 +36012,20 @@ /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) "kBR" = ( -/obj/effect/turf_decal/vg_decals/numbers/eight, +/obj/effect/turf_decal/vg_decals/numbers/nine, /turf/closed/wall/mineral/brick, /area/f13/ncr) +"kBU" = ( +/mob/living/simple_animal/hostile/handy/protectron{ + faction = list("raider") + }, +/obj/effect/decal/cleanable/dirt{ + color = "000000" + }, +/turf/open/floor/f13{ + icon_state = "floorrusty" + }, +/area/f13/ambientlighting/building/j) "kBZ" = ( /obj/structure/obstacle/barbedwire/end{ dir = 8 @@ -36016,11 +36336,18 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) "kHo" = ( -/obj/effect/turf_decal/weather/dirt, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken4" +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" }, -/area/f13/ncr) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -13 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "kHs" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -36077,11 +36404,20 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "kHN" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain2" +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/booth, +/obj/item/dice/d20, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +"kHO" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small{ + brightness = 7; + dir = 8 }, -/area/f13/wasteland) +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "kHP" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -36103,23 +36439,15 @@ /obj/structure/decoration/rag, /turf/closed/mineral/random/low_chance, /area/f13/building/tribal) -"kIx" = ( -/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom0" - }, -/area/f13/wasteland) "kIA" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating/rust, /area/f13/building/powered) "kIF" = ( -/obj/structure/flora/tree/pine, -/obj/structure/flora/brushwood{ - pixel_x = 14 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rock/jungle, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "kIK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/marking{ @@ -36206,10 +36534,9 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/t) "kJH" = ( -/obj/structure/tires/two, -/turf/open/indestructible/ground/outside/dirt{ - dir = 1; - icon_state = "dirt" +/obj/effect/decal/cleanable/robot_debris, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" }, /area/f13/wasteland) "kJN" = ( @@ -36245,11 +36572,10 @@ /turf/open/floor/carpet/red, /area/f13/legioncamp) "kKl" = ( -/obj/structure/rack, -/obj/item/clothing/under/suit_jacket/navy, -/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/booth, +/obj/effect/decal/cleanable/glass, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/area/f13/ambientlighting/building/m) "kKp" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt/dust, @@ -36410,7 +36736,8 @@ /area/f13/wasteland) "kMh" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1 + dir = 1; + layer = 1000 }, /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -36457,9 +36784,9 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) "kMT" = ( -/obj/machinery/vending/autodrobe, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "kMU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/smartfridge/bottlerack/lootshelf/books, @@ -36587,7 +36914,6 @@ pixel_y = -5; pixel_x = 6 }, -/obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "kNE" = ( @@ -36620,22 +36946,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) -"kNV" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/glass/bowl{ - pixel_y = -1; - pixel_x = 1 - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_y = 3; - pixel_x = 1 - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_y = 7; - pixel_x = 1 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "kOg" = ( /obj/item/storage/toolbox/ammo, /turf/open/indestructible/ground/outside/dirt, @@ -36699,6 +37009,12 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/p) +"kOU" = ( +/obj/structure/wreck/trash/machinepile, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2" + }, +/area/f13/wasteland) "kOX" = ( /turf/closed/wall/mineral/concrete, /area/engine/workshop) @@ -36907,25 +37223,9 @@ }, /area/f13/ambientlighting/building/b) "kSD" = ( -/obj/item/clothing/shoes/sneakers/black{ - pixel_x = -5; - pixel_y = -10 - }, -/obj/item/clothing/shoes/sneakers/black{ - pixel_x = 5; - pixel_y = -10 - }, -/obj/item/clothing/shoes/sneakers/brown{ - pixel_x = -5 - }, -/obj/item/clothing/shoes/sneakers/red{ - pixel_x = 5; - pixel_y = 10 - }, -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/stool, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/area/f13/ambientlighting/building/m) "kSG" = ( /obj/structure/table/wood, /obj/structure/table/wood, @@ -36957,6 +37257,11 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"kST" = ( +/obj/structure/flora/rock/jungle, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "kTq" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/greenglow{ @@ -36977,15 +37282,6 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) -"kTQ" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "kTR" = ( /obj/structure/chair/f13chair2{ dir = 4 @@ -37046,6 +37342,13 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/t) +"kVy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/simple_door/tentflap_cloth, +/turf/open/floor/wood_common{ + icon_state = "common-broken4" + }, +/area/f13/ambientlighting/building/m) "kVC" = ( /obj/effect/decal/cleanable/glass, /obj/structure/destructible/tribal_torch/lit, @@ -37085,9 +37388,9 @@ /turf/closed/wall/f13/wood/interior, /area/f13/ambientlighting/building/z) "kVV" = ( -/obj/structure/barricade/wooden/planks, -/turf/closed/wall/f13/wood, -/area/f13/ncr) +/obj/structure/fluff/rails, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "kWj" = ( /obj/structure/fence/corner{ dir = 4 @@ -37100,10 +37403,6 @@ /obj/effect/turf_decal/vg_decals/radiation, /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) -"kWq" = ( -/obj/structure/barricade/wooden/planks, -/turf/closed/wall/f13/tentwall, -/area/f13/ncr) "kWs" = ( /obj/structure/debris/v4, /obj/structure/debris/v2, @@ -37142,6 +37441,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/q) +"kWO" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "kWP" = ( /obj/effect/turf_decal/huge{ dir = 1 @@ -37170,6 +37475,14 @@ /obj/structure/closet/crate/wooden, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"kXc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/hydroponics, +/obj/item/circuitboard/machine/hydroponics/automagic, +/obj/item/circuitboard/machine/hydroponics/automagic, +/obj/item/circuitboard/machine/hydroponics/automagic, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "kXd" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/ghoul/glowing/strong, @@ -37193,15 +37506,8 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/maintenance/bar) "kXs" = ( -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/turf/open/indestructible/ground/inside/dirt, +/obj/structure/obstacle/tanktrap, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "kXz" = ( /obj/effect/decal/cleanable/dirt, @@ -37239,12 +37545,11 @@ }, /area/f13/building/powered) "kYn" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/blood{ - icon_state = "floor6" +/obj/machinery/food_cart, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" }, -/turf/open/floor/plating/rust, -/area/f13/caves) +/area/f13/wasteland) "kYq" = ( /obj/effect/overlay/desert_side{ dir = 8 @@ -37367,6 +37672,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) +"lam" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/m) "lan" = ( /turf/open/indestructible/ground/outside/dirt, /area/f13/underground/cave) @@ -37401,17 +37712,22 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "laF" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/mask/balaclava, -/obj/item/clothing/mask/balaclava, -/obj/item/clothing/mask/balaclava, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "laG" = ( /obj/structure/closet/crate/bin/trashbin, /turf/open/floor/wood_common, /area/f13/clinic) +"laH" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerpavementcorner" + }, +/area/f13/wasteland) "laX" = ( /obj/machinery/light/small{ dir = 1 @@ -37421,12 +37737,17 @@ }, /area/f13/ambientlighting/building/g) "laY" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/mask/bandana/skull, -/obj/item/clothing/mask/bandana/skull, -/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/wood/junk, +/obj/item/storage/box/gun/rifle/hunting, +/obj/effect/spawner/lootdrop/f13/attachments, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/area/f13/ambientlighting/building/m) +"laZ" = ( +/obj/structure/flora/tree/wasteland{ + pixel_y = 5 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "lbc" = ( /obj/structure/table/wood/settler, /obj/effect/decal/cleanable/dirt{ @@ -37436,11 +37757,14 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "lbd" = ( -/obj/structure/cable/outdoors{ - icon_state = "1-2" +/obj/effect/turf_decal/weather/dirt{ + dir = 6 }, -/turf/open/floor/plating/dirt/dark, -/area/f13/ncr) +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "lbj" = ( /obj/structure/fence/wooden{ dir = 1; @@ -37481,10 +37805,14 @@ /turf/open/floor/bronze, /area/f13/building/abandoned/m) "lbC" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 +/obj/item/clockwork/alloy_shards{ + name = "rocks"; + desc = "Rocks. Mindblowing."; + anchored = 1 + }, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" }, -/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "lbG" = ( /obj/effect/spawner/lootdrop/f13/bomb/tier2, @@ -37520,12 +37848,8 @@ /obj/effect/turf_decal/weather/dirt{ dir = 9 }, -/obj/structure/chair/folding{ - dir = 4 - }, -/obj/effect/decal/cleanable/cobweb, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/area/f13/caves) "lbW" = ( /turf/closed/wall/f13/store{ desc = "A pre-War wall made of solid concrete."; @@ -37557,18 +37881,6 @@ /obj/structure/wreck/trash/two_barrels, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) -"lcv" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/structure/closet/crate/grave, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/wasteland) "lcO" = ( /obj/machinery/hydroponics/soil, /obj/effect/overlay/desert_side{ @@ -37615,14 +37927,6 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) -"ldV" = ( -/obj/structure/railing/corner{ - color = "#A47449"; - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "ldX" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -37661,16 +37965,22 @@ icon_state = "verticalinnermain2" }, /area/f13/ambientlighting/building/b) +"len" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) "let" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/decal/marking{ + pixel_x = -14 }, -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "leu" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -37713,10 +38023,19 @@ /turf/open/floor/wood_common, /area/f13/clinic) "lfS" = ( -/obj/structure/kitchenspike, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) +"lfU" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "lfY" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/melee/tier3, @@ -37724,6 +38043,10 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) +"lgi" = ( +/obj/structure/debris/v3, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "lgn" = ( /obj/structure/wreck/trash/machinepiletwo, /turf/open/indestructible/ground/outside/sidewalk{ @@ -37741,13 +38064,6 @@ dir = 1 }, /area/f13/wasteland) -"lgB" = ( -/obj/structure/window/fulltile/wood, -/obj/structure/curtain{ - color = "#808080" - }, -/turf/open/floor/wood_wide, -/area/f13/ncr) "lgI" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -37891,9 +38207,24 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) "lki" = ( -/obj/item/trash/chips, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/structure/reagent_dispensers/barrel/dangerous{ + pixel_y = -5; + pixel_x = 6 + }, +/obj/structure/reagent_dispensers/barrel/dangerous{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/structure/reagent_dispensers/barrel/dangerous{ + pixel_y = -5; + pixel_x = -8 + }, +/obj/structure/reagent_dispensers/barrel/dangerous{ + pixel_y = -9 + }, +/obj/effect/decal/cleanable/greenglow, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "lkn" = ( /obj/effect/overlay/desert/sonora/edge, /turf/open/indestructible/ground/outside/sidewalk{ @@ -38092,6 +38423,12 @@ icon_state = "verticalrightborderright0" }, /area/f13/ambientlighting/building/i) +"lnQ" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerborder" + }, +/area/f13/wasteland) "lof" = ( /obj/structure/reagent_dispensers/barrel/explosive{ pixel_x = -9; @@ -38180,14 +38517,8 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "lpb" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_4"; - layer = 6 - }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 4; - icon_state = "dirtcorner" - }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, /area/f13/wasteland) "lpd" = ( /obj/structure/table, @@ -38213,6 +38544,14 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"lps" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "lpy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, @@ -38259,7 +38598,6 @@ /obj/effect/decal/cleanable/greenglow, /mob/living/simple_animal/hostile/ghoul, /obj/structure/nest/ghoul, -/obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "lqm" = ( @@ -38286,6 +38624,12 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"lqA" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) "lqB" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt/dust, @@ -38402,6 +38746,13 @@ /obj/structure/debris/v3, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +"lsr" = ( +/obj/structure/chair/sofa/right{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "lsx" = ( /obj/structure/table/wood/junk, /obj/item/reagent_containers/food/snacks/kebab/rat/double, @@ -38414,7 +38765,13 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "lsU" = ( -/turf/open/indestructible/ground/outside/snow, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft1" + }, /area/f13/wasteland) "lsW" = ( /obj/effect/turf_decal/weather/dirt{ @@ -38660,13 +39017,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) -"lwL" = ( -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 4; - pixel_y = -8 - }, -/turf/open/floor/plating/dirt, -/area/f13/wasteland) "lwP" = ( /obj/structure/fence, /obj/structure/obstacle/barbedwire{ @@ -38716,13 +39066,10 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "lxh" = ( -/obj/effect/spawner/lootdrop/f13/ncr_c_ration{ - pixel_y = 17; - pixel_x = 3 - }, -/obj/effect/decal/cleanable/glass, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) "lxp" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/effect/decal/cleanable/greenglow, @@ -38731,13 +39078,19 @@ icon_state = "dirt" }, /area/f13/wasteland) -"lxr" = ( -/obj/effect/turf_decal/weather/snow/corner, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 +"lxq" = ( +/obj/machinery/smartfridge/bottlerack{ + pixel_x = -3 }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 8; + pixel_y = -30; + pixel_x = 17 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "lxs" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/closed/wall/f13/wood/house, @@ -38754,16 +39107,6 @@ /obj/structure/barricade/wooden/strong, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) -"lxW" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 4; - light_color = "#ff4747" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "lyg" = ( /obj/item/reagent_containers/glass/bucket, /turf/open/indestructible/ground/outside/dirt, @@ -38801,18 +39144,6 @@ /obj/effect/decal/marking, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) -"lyQ" = ( -/obj/machinery/chem_master, -/obj/effect/decal/cleanable/robot_debris{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/obj/machinery/light/small, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "lyR" = ( /obj/structure/window/fulltile/wood/broken, /obj/structure/fence{ @@ -38900,30 +39231,11 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) -"lAb" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) "lAy" = ( /obj/structure/table, /obj/item/paper_bin, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/ncr) -"lAH" = ( -/obj/structure/flora/grass/brown, -/obj/structure/barricade/sandbags, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "lAJ" = ( /obj/structure/car/rubbish1, /obj/effect/turf_decal/big{ @@ -38942,12 +39254,14 @@ }, /area/f13/ncr) "lAR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fluff/rug/rug_rubber{ - icon_state = "rug_fancy" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -13 }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "lAT" = ( /obj/machinery/door/poddoor/gate/preopen{ name = "north gate"; @@ -39064,25 +39378,19 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "lCb" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/obj/item/flashlight/lantern{ - on = 1; - light_on = 1; - icon_state = "lantern-on"; - pixel_x = -14; - pixel_y = 20 +/obj/effect/decal/cleanable/blood{ + dir = 6; + icon_state = "tracks" }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "lCo" = ( /turf/closed/wall/mineral/wood, /area/f13/wasteland) "lCr" = ( -/obj/effect/decal/cleanable/glass, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "lCA" = ( /obj/structure/barricade/tentclothcorner{ dir = 4 @@ -39291,10 +39599,9 @@ icon_state = "bluerustysolid" }, /area/f13/followers) -"lFO" = ( -/obj/structure/flora/grass/brown, -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/snow, +"lFV" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "lFW" = ( /obj/structure/table/reinforced, @@ -39325,14 +39632,6 @@ dir = 4 }, /area/f13/wasteland) -"lGW" = ( -/obj/structure/barricade/concrete, -/obj/structure/car/rubbish1{ - pixel_x = 15 - }, -/obj/structure/grille/broken, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "lGY" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -39396,15 +39695,6 @@ name = "rusted floor" }, /area/f13/ncr) -"lIl" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/obj/item/storage/trash_stack{ - pixel_y = 18 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "lIo" = ( /turf/open/transparent/openspace, /area/f13/wasteland/city) @@ -39427,6 +39717,13 @@ /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/m) +"lIs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "lIA" = ( /obj/structure/campfire, /turf/open/indestructible/ground/outside/dirt, @@ -39453,6 +39750,12 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +"lIQ" = ( +/obj/structure/table/booth, +/obj/item/stack/wrapping_paper, +/obj/item/stack/wrapping_paper, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "lIV" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier1, @@ -39479,21 +39782,23 @@ }, /area/f13/building/abandoned/j) "lJf" = ( -/obj/structure/sign/parking, +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge{ + pixel_y = -14; + layer = 5 + }, +/obj/structure/railing/wood/underlayer{ + layer = 6 + }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop0" }, /area/f13/wasteland) "lJh" = ( -/obj/structure/ladder/unbreakable{ - height = 2; - id = "roboticdung"; - level = 1 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/caves) +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "lJl" = ( /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded" @@ -39529,7 +39834,6 @@ "lJY" = ( /obj/structure/junk/locker, /obj/structure/grille/broken, -/obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "lJZ" = ( @@ -39593,11 +39897,16 @@ }, /area/f13/wasteland/legion) "lKJ" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/f13/wood{ - icon_state = "housewood2" +/obj/structure/sign/poster/contraband/pinup_bed{ + pixel_x = 32 }, -/area/f13/building/abandoned/a) +/obj/structure/sacrificealtar, +/obj/effect/decal/cleanable/blood, +/obj/machinery/light/fo13colored/Red{ + dir = 4 + }, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "lKM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/gibspawner/human, @@ -39606,12 +39915,9 @@ }, /area/f13/ambientlighting/building/i) "lKN" = ( -/obj/structure/window/fulltile/wood, -/obj/structure/curtain{ - color = "#808080" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/mob_spawn/human/corpse/legion, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "lKQ" = ( /obj/structure/cable/outdoors{ icon_state = "4-8" @@ -39681,15 +39987,11 @@ }, /area/f13/caves) "lLC" = ( -/obj/structure/junk/locker, -/obj/item/storage/backpack/enclave, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/obj/structure/railing, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2left" }, -/area/f13/caves) +/area/f13/wasteland) "lLG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -39984,11 +40286,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "lQf" = ( -/obj/item/storage/trash_stack, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain2" - }, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/rust, +/area/f13/sewer/powered) "lQn" = ( /obj/structure/chair{ dir = 8 @@ -40039,6 +40339,11 @@ icon_state = "common-broken2" }, /area/f13/wasteland) +"lQZ" = ( +/obj/structure/junk/micro, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "lRc" = ( /obj/structure/barricade/wooden/strong, /turf/closed/wall/mineral/wood, @@ -40092,15 +40397,12 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) "lSG" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/obj/structure/bed, -/obj/item/bedsheet/blanket, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/ncr) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "lSI" = ( /obj/effect/decal/remains/deadeyebot, /obj/effect/decal/cleanable/dirt, @@ -40224,6 +40526,11 @@ /mob/living/simple_animal/hostile/centaur/strong, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"lUg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/shreds, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "lUi" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt/dust, @@ -40259,6 +40566,11 @@ icon_state = "verticalinnermain3" }, /area/f13/building/abandoned/t) +"lUG" = ( +/obj/effect/decal/cleanable/robot_debris, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "lUJ" = ( /mob/living/simple_animal/hostile/raider/legendary, /turf/open/indestructible/ground/outside/dirt, @@ -40281,6 +40593,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +"lUY" = ( +/obj/structure/table/wood/junk, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +"lVc" = ( +/obj/machinery/vending/hydroseeds, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "lVe" = ( /obj/structure/reagent_dispensers/barrel/three, /obj/effect/decal/cleanable/greenglow, @@ -40317,12 +40637,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"lWa" = ( -/obj/structure/chair/folding{ - dir = 1 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "lWi" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/lattice, @@ -40393,11 +40707,14 @@ }, /area/f13/wasteland) "lXj" = ( -/obj/effect/decal/marking{ - icon_state = "dottedvertical" +/obj/effect/decal/cleanable/oil{ + icon_state = "floor6"; + pixel_y = 9; + pixel_x = -10 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" }, -/obj/structure/car/rubbish2, -/turf/open/indestructible/ground/outside/road, /area/f13/wasteland) "lXr" = ( /turf/open/indestructible/ground/outside/road{ @@ -40473,6 +40790,21 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/j) +"lYi" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "lYp" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -40568,6 +40900,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"mag" = ( +/obj/item/grenade/syndieminibomb/concussion, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "mah" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -40618,15 +40954,6 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) -"mbi" = ( -/obj/effect/decal/marking{ - icon_state = "dottedverticaldegraded" - }, -/obj/structure/sign/brotherhoodcardboard, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain0" - }, -/area/f13/wasteland) "mbj" = ( /obj/item/trash/f13/c_ration_2, /turf/open/indestructible/ground/outside/desert, @@ -40684,10 +41011,10 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) "mca" = ( -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/wasteland) +/obj/structure/simple_door/metal/dirtystore, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "mcb" = ( /obj/structure/table, /turf/open/floor/plating/rust, @@ -40702,19 +41029,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"mcv" = ( -/obj/structure/closet/crate/large, -/obj/item/stack/sheet/hay/ten, -/obj/item/stack/sheet/cloth/ten{ - pixel_y = -6; - pixel_x = 4 - }, -/obj/item/stack/sheet/leather/ten{ - pixel_x = -4; - pixel_y = -10 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "mcC" = ( /obj/structure/fluff/railing{ dir = 4 @@ -40722,11 +41036,9 @@ /turf/open/water, /area/f13/ambientlighting/building/j) "mcI" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/f13{ - icon_state = "whitegreenrustychess" - }, -/area/f13/building/abandoned/a) +/obj/structure/billboard/nukagirl2, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "mcJ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -40931,32 +41243,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"meN" = ( -/obj/structure/table/wood, -/obj/item/assembly/igniter{ - pixel_x = 7; - pixel_y = 12 - }, -/obj/item/storage/box/pillbottles{ - pixel_y = 4; - pixel_x = 4 - }, -/obj/item/paper_bin{ - pixel_x = -5; - pixel_y = 19 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 20 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "mfh" = ( /obj/effect/spawner/lootdrop/f13/armor/randomraiderchest, /obj/effect/decal/cleanable/dirt/dust, @@ -40986,16 +41272,10 @@ /turf/open/floor/plasteel/f13/vault_floor/red/white, /area/f13/ambientlighting/building/j) "mfx" = ( -/obj/structure/rack, -/obj/item/clothing/mask/rat, -/obj/item/clothing/mask/rat/bat, -/obj/item/clothing/mask/rat/bear, -/obj/item/clothing/mask/rat/fox, -/obj/item/clothing/mask/rat/jackal, -/obj/item/clothing/mask/rat/raven, -/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/stool, +/obj/machinery/light/broken, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/area/f13/ambientlighting/building/m) "mfA" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain3" @@ -41103,6 +41383,10 @@ /obj/structure/barricade/wooden/planks, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"mgR" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "mgS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/waste{ @@ -41122,11 +41406,6 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) -"mhe" = ( -/obj/structure/closet/crate/large, -/obj/item/stack/sheet/mineral/concrete/fifty, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "mhi" = ( /obj/effect/decal/remains/human, /turf/open/indestructible/ground/inside/mountain, @@ -41200,10 +41479,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, /area/f13/legioncamp) -"mij" = ( -/obj/effect/turf_decal/weather/snow/corner, -/turf/open/floor/plating/dirt/dark, -/area/f13/wasteland) +"mic" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood/club, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "miw" = ( /obj/structure/wreck/trash/two_tire, /obj/structure/wreck/trash/one_tire, @@ -41262,14 +41542,18 @@ /obj/item/clothing/glasses/welding, /turf/open/floor/plasteel/dark, /area/engine/workshop) -"mjH" = ( -/obj/effect/decal/remains{ - icon_state = "remains" +"mjG" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/area/f13/wasteland) +"mjH" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 }, -/area/f13/caves) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "mjT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood/settler, @@ -41618,12 +41902,6 @@ "mpt" = ( /turf/open/floor/plating/f13/inside, /area/f13/building) -"mpv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/robot_debris, -/obj/machinery/light/small, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "mpB" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -41679,12 +41957,9 @@ /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) "mqN" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/effect/turf_decal/weather/snow/corner, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/item/shield/riot/legion, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "mqT" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/indestructible/ground/outside/desert, @@ -41712,6 +41987,13 @@ icon_state = "bluerustysolid" }, /area/f13/followers) +"mrl" = ( +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowdestroyed" + }, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "mrD" = ( /obj/structure/barricade/tentclothcorner{ color = "#7c0A02"; @@ -41719,11 +42001,6 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) -"mrF" = ( -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken6" - }, -/area/f13/ncr) "mrK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood/fancy/red, @@ -41802,6 +42079,11 @@ icon_state = "horizontalinnermain2left" }, /area/f13/wasteland) +"msO" = ( +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "msS" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -41844,16 +42126,6 @@ /obj/machinery/microwave/stove, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) -"mtT" = ( -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 20; - pixel_x = 11 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "mtY" = ( /obj/structure/bookcase, /obj/item/book/manual/wiki/tcomms, @@ -41885,12 +42157,10 @@ /turf/open/floor/plasteel/grimy, /area/f13/ncr) "muq" = ( -/obj/item/storage/trash_stack, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/obj/structure/barricade/wooden/planks, +/obj/structure/simple_door/metal/dirtystore, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "muv" = ( /obj/effect/overlay/desert_side{ dir = 4 @@ -41978,12 +42248,14 @@ /turf/open/floor/f13, /area/f13/ambientlighting/building/o) "mvC" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/rack, -/obj/item/clothing/mask/society, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "mvF" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/large, @@ -42037,10 +42309,8 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) "mwN" = ( -/obj/structure/table/booth, -/obj/item/trash/f13/electronic/toaster, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/turf/closed/wall/f13/store, +/area/f13/building/powered) "mxg" = ( /obj/structure/chair/wood{ dir = 8 @@ -42091,6 +42361,10 @@ /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) +"mxW" = ( +/obj/structure/sign/poster/prewar/poster79, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "mxX" = ( /obj/machinery/light/small{ dir = 4 @@ -42113,11 +42387,11 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) "myg" = ( -/obj/structure/stairs/north{ - color = "#A47449" +/obj/structure/wreck/trash/bus_door, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/area/f13/wasteland) "myl" = ( /obj/structure/car/rubbish2, /obj/structure/car/rubbish3, @@ -42150,6 +42424,13 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"myC" = ( +/obj/effect/decal/cleanable/greenglow{ + pixel_x = -8; + pixel_y = 12 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "myD" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt/dust, @@ -42172,6 +42453,12 @@ /obj/structure/table/wood, /turf/open/floor/carpet/orange, /area/f13/ambientlighting/building/c) +"myO" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "myU" = ( /turf/open/indestructible/ground/outside/desert{ icon_state = "wasteland32" @@ -42186,17 +42473,10 @@ }, /area/f13/wasteland) "mzb" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/wood_fancy/wood_fancy_dark, -/area/f13/bar) -"mzf" = ( -/obj/structure/barricade/sandbags, -/obj/structure/table/wood, -/obj/structure/barricade/bars, -/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "mzi" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -42302,30 +42582,28 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "mAQ" = ( -/obj/structure/chair/bench{ - dir = 4; - pixel_x = -16 +/obj/structure/fluff/rails{ + icon_state = "rails-r"; + dir = 8 }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "mAW" = ( /obj/structure/simple_door/tentflap_cloth, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) +"mBh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/simple_door/metal/dirtystore, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "mBm" = ( -/obj/structure/rack, -/obj/item/clothing/head/that, -/obj/item/clothing/head/f13/beaver{ - pixel_x = -7; - pixel_y = -10 - }, -/obj/item/clothing/head/f13/trilby{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/turf_decal/vg_decals/department/bar, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +"mBp" = ( +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "mBr" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, @@ -42408,27 +42686,6 @@ /obj/item/reagent_containers/pill/salicyclic, /turf/open/floor/f13, /area/f13/ambientlighting/building/o) -"mCj" = ( -/obj/structure/guncase{ - anchored = 1 - }, -/obj/item/gun/ballistic/shotgun/hunting, -/obj/item/gun/ballistic/shotgun/hunting{ - pixel_y = -3; - pixel_x = 3 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/item/gun/ballistic/revolver/police, -/obj/item/melee/classic_baton/militarypolice{ - pixel_y = -7; - pixel_x = 1 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) "mCy" = ( /turf/closed/indestructible/f13vaultrusted, /area/f13/ambientlighting/building/x) @@ -42451,34 +42708,6 @@ /obj/effect/spawner/lootdrop/f13/ncr_c_ration, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) -"mCS" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/hypospray/medipen/stimpak{ - pixel_y = 11; - pixel_x = 2 - }, -/obj/item/reagent_containers/hypospray/medipen/stimpak{ - pixel_y = 8; - pixel_x = -1 - }, -/obj/item/reagent_containers/medspray/synthflesh{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/item/reagent_containers/glass/bottle{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/reagent_containers/dropper{ - pixel_y = -6 - }, -/obj/effect/decal/cleanable/cobweb{ - dir = 1; - icon_state = "cobweb2" - }, -/obj/effect/turf_decal/weather/dirt, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "mDa" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small{ @@ -42514,13 +42743,16 @@ }, /area/f13/wasteland) "mDw" = ( -/obj/structure/flora/stump, -/obj/item/cigbutt{ - pixel_x = -5; - pixel_y = 17 +/obj/structure/cable/outdoors{ + icon_state = "4-8" }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/structure/decoration/rag{ + icon_state = "flag_ncr"; + name = "NCR banner"; + pixel_y = 32 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "mDz" = ( /obj/structure/chair/sofa/right{ dir = 1 @@ -42558,14 +42790,11 @@ }, /area/f13/wasteland) "mDT" = ( -/obj/structure/railing/corner{ - color = "#A47449" - }, -/obj/machinery/door/unpowered/secure_NCR{ - name = "Medical" +/obj/structure/fluff/rails{ + icon_state = "rails-b2" }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "mDU" = ( /obj/structure/ladder/unbreakable{ level = 1; @@ -42575,13 +42804,9 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/m) "mDZ" = ( -/obj/structure/chair/stool/retro/black, -/obj/structure/extinguisher_cabinet{ - pixel_x = -29; - pixel_y = -1 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "mEa" = ( /obj/machinery/door/unpowered/secure_bos, /obj/effect/mapping_helpers/network_builder/power_cable/auto, @@ -42669,16 +42894,6 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"mER" = ( -/obj/structure/flora/stump, -/obj/structure/flora/grass/brown{ - pixel_x = 9; - pixel_y = 11 - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow4" - }, -/area/f13/wasteland) "mET" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/office/dark{ @@ -42688,17 +42903,6 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) -"mFd" = ( -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) "mFh" = ( /obj/structure/table/wood, /obj/structure/decoration/clock{ @@ -42783,6 +42987,11 @@ /obj/effect/decal/cleanable/blood/gibs/human/limb, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"mGu" = ( +/obj/structure/table/wood/club, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "mGw" = ( /obj/structure/fence/corner{ dir = 8 @@ -42835,13 +43044,12 @@ }, /area/f13/ambientlighting/building/m) "mGU" = ( -/obj/machinery/workbench/forge{ - pixel_x = 4 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6" }, -/area/f13/ncr) +/obj/effect/gibspawner/human/bodypartless, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "mGY" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -42902,6 +43110,13 @@ /obj/item/wrench, /turf/open/indestructible/ground/outside/road, /area/f13/building/abandoned/k) +"mIi" = ( +/obj/structure/table/wood/junk, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "mIm" = ( /obj/structure/chair/left{ dir = 1 @@ -42951,6 +43166,10 @@ icon_state = "horizontalinnermain2left" }, /area/f13/wasteland) +"mJm" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "mJL" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -42971,10 +43190,9 @@ }, /area/f13/wasteland) "mKb" = ( -/obj/machinery/smartfridge/bottlerack/lootshelf/cans, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/structure/table/wood/club, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "mKv" = ( /obj/structure/fence{ dir = 8 @@ -43046,13 +43264,26 @@ }, /area/f13/ambientlighting/building/i) "mLN" = ( -/obj/structure/sign/flag_america, -/turf/closed/wall/r_wall/rust, -/area/f13/caves) -"mLX" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/obj/structure/rack/large/shelf_rust{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) +"mLW" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom1" + }, +/area/f13/wasteland) +"mLX" = ( +/obj/structure/closet/crate/miningcar{ + layer = 5 + }, +/obj/structure/fluff/rails, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "mMp" = ( /obj/structure/dresser, /turf/open/floor/wood_common{ @@ -43129,10 +43360,10 @@ /area/f13/ambientlighting/building/d) "mNW" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/floor{ - icon_state = "floordirty" +/turf/open/floor/wood_common{ + icon_state = "common-broken4" }, -/area/f13/ambientlighting/building/p) +/area/f13/ambientlighting/building/m) "mOb" = ( /turf/open/indestructible/ground/inside/subway, /area/f13/wasteland) @@ -43161,10 +43392,12 @@ }, /area/f13/ambientlighting/building/o) "mOk" = ( -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/chair/comfy/green{ + dir = 4; + pixel_x = -12 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "mOr" = ( /obj/structure/curtain{ color = "#845f58"; @@ -43183,9 +43416,8 @@ }, /area/f13/wasteland) "mOF" = ( -/mob/living/simple_animal/hostile/handy, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "mOV" = ( /obj/machinery/light/fo13colored/Red{ dir = 1 @@ -43288,6 +43520,12 @@ /obj/machinery/door/unpowered/securedoor/legion, /turf/open/floor/plating/f13/inside/gravel, /area/f13/legioncamp) +"mQG" = ( +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) "mQK" = ( /obj/structure/fluff/railing{ dir = 8 @@ -43419,17 +43657,21 @@ /turf/open/floor/carpet/red, /area/f13/ambientlighting/building/e) "mTa" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 +/obj/effect/turf_decal/weather/dirt{ + dir = 6 }, -/turf/open/floor/plating/dirt, -/area/f13/wasteland) +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "mTb" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "mTc" = ( /obj/structure/curtain, /obj/effect/decal/cleanable/dirt, @@ -43452,11 +43694,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) -"mTs" = ( -/obj/effect/turf_decal/weather/snow/corner, -/mob/living/simple_animal/chicken, -/turf/open/floor/plating/dirt, -/area/f13/wasteland) "mTu" = ( /obj/structure/barricade/wooden, /obj/structure/decoration/rag, @@ -43496,18 +43733,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"mTP" = ( -/obj/item/trash/f13/crisps, -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) -"mTQ" = ( -/obj/item/radio/tribal{ - pixel_y = 24; - pixel_x = 5 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "mTS" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -43630,12 +43855,12 @@ }, /area/f13/ambientlighting/building/o) "mVp" = ( -/obj/structure/closet/crate/freezer/blood, -/obj/effect/turf_decal/weather/dirt{ - dir = 8 +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "mVr" = ( /obj/structure/simple_door/bunker/glass, /turf/open/floor/f13{ @@ -43813,24 +44038,6 @@ "mZc" = ( /turf/closed/wall/f13/ruins, /area/f13/wasteland) -"mZg" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/reagent_containers/spray/pepper{ - pixel_x = -9; - pixel_y = 4 - }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/ncr) "mZo" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/road{ @@ -44068,9 +44275,9 @@ /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) "ncc" = ( -/obj/structure/chair/stool, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/structure/nest/ghoul, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "ncf" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt, @@ -44125,6 +44332,9 @@ /area/f13/ambientlighting/building/j) "ndc" = ( /obj/effect/decal/cleanable/cobweb, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) "ndk" = ( @@ -44145,6 +44355,13 @@ icon_state = "wide-broken3" }, /area/f13/ambientlighting/building/u) +"ndw" = ( +/obj/item/grenade/syndieminibomb/concussion, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) "ndx" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/floor/plating/f13/outside/road{ @@ -44184,12 +44401,6 @@ "ndO" = ( /turf/open/indestructible/ground/outside/dirt/harsh, /area/f13/wasteland) -"ndW" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow4" - }, -/area/f13/wasteland) "ndZ" = ( /turf/open/indestructible/ground/outside/dirt{ icon_state = "dirtcorner" @@ -44207,11 +44418,6 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) -"nei" = ( -/obj/structure/campfire/barrel, -/obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "nek" = ( /obj/structure/reagent_dispensers/barrel/dangerous{ pixel_y = -5; @@ -44232,6 +44438,11 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"neu" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "nev" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -44269,6 +44480,12 @@ icon_state = "greenrustyfull" }, /area/f13/ambientlighting/building/o) +"neN" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "neO" = ( /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/t) @@ -44288,6 +44505,13 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"nfh" = ( +/obj/item/shard, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) "nfv" = ( /obj/machinery/computer/card/legion, /obj/effect/decal/cleanable/dirt, @@ -44391,13 +44615,9 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "ngc" = ( -/obj/structure/rack, -/obj/item/clothing/under/redeveninggown, -/obj/item/clothing/under/redeveninggown, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/simple_door/brokenglass, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "ngd" = ( /mob/living/simple_animal/hostile/raider/ranged/boss, /turf/open/floor/carpet/blue, @@ -44502,9 +44722,11 @@ }, /area/f13/building/powered) "nhC" = ( -/obj/structure/barricade/wooden/planks, -/turf/closed/wall/f13/wood/house, -/area/f13/ncr) +/obj/structure/chair/folding, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "nhF" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -44542,9 +44764,9 @@ }, /area/f13/ncr) "niA" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain1" +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom1" }, /area/f13/wasteland) "niF" = ( @@ -44553,10 +44775,10 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "niG" = ( -/obj/effect/spawner/lootdrop/trash, +/obj/machinery/vending/clothing, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building/abandoned/a) +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "niP" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/road{ @@ -44699,10 +44921,6 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/t) -"nkI" = ( -/obj/structure/billboard/boardedwell, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "nkM" = ( /obj/structure/wreck/car/bike, /turf/open/indestructible/ground/outside/road{ @@ -44728,15 +44946,10 @@ }, /area/f13/ambientlighting/building/b) "nkV" = ( -/obj/structure/rack, -/obj/item/clothing/under/f13/cowboyt, -/obj/item/clothing/under/f13/cowboyb{ - pixel_x = 4; - pixel_y = -11 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/greenglow, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "nlf" = ( /obj/structure/tires/five{ pixel_x = 7; @@ -44770,6 +44983,17 @@ }, /turf/open/indestructible/ground/inside/subway, /area/f13/tunnel) +"nlw" = ( +/obj/structure/table, +/obj/machinery/computer/terminal/stored_password{ + door_id = "veryevilroom"; + proj_pass_rate = 25 + }, +/obj/machinery/light/fo13colored/Red{ + dir = 1 + }, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "nlA" = ( /obj/structure/obstacle/barbedwire/end{ dir = 1 @@ -44812,10 +45036,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "nml" = ( -/obj/effect/decal/cleanable/ash, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "nmn" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt, @@ -44848,10 +45072,17 @@ }, /area/f13/wasteland) "nmA" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, -/turf/open/floor/plating/f13/outside/road, -/area/f13/ambientlighting/building/w) +/obj/item/storage/trash_stack, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) +"nmF" = ( +/obj/structure/closet/crate/trashcart, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "nmH" = ( /obj/structure/curtain{ color = "#845f58"; @@ -45007,6 +45238,17 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/k) +"npm" = ( +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + pixel_x = -16 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "npx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/gibs/down{ @@ -45074,6 +45316,15 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/j) +"nqp" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerouter" + }, +/area/f13/wasteland) "nqt" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -45114,6 +45365,13 @@ /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plating, /area/f13/bar) +"nqY" = ( +/obj/structure/chair/stool/retro/tan, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerborder" + }, +/area/f13/wasteland) "nqZ" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 1; @@ -45186,11 +45444,11 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) "nrR" = ( -/obj/effect/decal/cleanable/blood, -/mob/living/simple_animal/hostile/radroach, +/obj/structure/table/booth, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "nrU" = ( /turf/closed/mineral/random/no_caves, /area/f13/caves) @@ -45246,6 +45504,10 @@ /obj/effect/overlay/fog, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +"nsL" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) "nsN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing/wood/post{ @@ -45316,6 +45578,16 @@ icon_state = "horizontalinnermain0" }, /area/f13/ambientlighting/building/y) +"ntH" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "ntM" = ( /obj/structure/simple_door/metal/fence/wooden, /turf/open/indestructible/ground/inside/dirt, @@ -45341,16 +45613,6 @@ /obj/structure/flora/twig4, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"nuS" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 4; - layer = 4.1 - }, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken6" - }, -/area/f13/ncr) "nuY" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -45420,15 +45682,12 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "nvC" = ( -/obj/structure/rack, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/shoes/workboots{ - pixel_x = -5; - pixel_y = -4 +/obj/effect/turf_decal/weather/dirt{ + dir = 10 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/spawner/lootdrop/f13/advcrafting, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "nvD" = ( /obj/structure/railing{ color = "#A47449" @@ -45442,9 +45701,13 @@ /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/k) "nvF" = ( -/obj/structure/table/wood, -/turf/open/floor/f13/wood, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowdestroyed" + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "nvK" = ( /obj/structure/flora/grass/jungle/b, /turf/open/indestructible/ground/outside/dirt, @@ -45493,6 +45756,13 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/m) +"nwK" = ( +/obj/structure/grille/broken, +/obj/item/trash/f13/borscht, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) "nwL" = ( /turf/closed/wall/f13/wood, /area/f13/building/abandoned/t) @@ -45540,15 +45810,11 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "nxr" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, -/obj/structure/closet/crate/large, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/area/f13/wasteland) "nxs" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -45589,9 +45855,9 @@ }, /area/f13/building/powered) "nyh" = ( -/obj/structure/decoration/rag, -/turf/closed/wall/f13/wood, -/area/f13/ncr) +/obj/item/clothing/shoes/ballandchain, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "nyk" = ( /obj/item/storage/trash_stack{ icon_state = "Junk_10" @@ -45676,13 +45942,10 @@ }, /area/f13/ambientlighting/building/j) "nzO" = ( -/obj/item/stack/sheet/mineral/wood/twenty{ - pixel_y = 7 - }, -/turf/open/indestructible/ground/outside/ruins{ - name = "cobblestone floor" - }, -/area/f13/ncr) +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) "nzT" = ( /turf/closed/wall/f13/tentwall, /area/f13/ambientlighting/building/b) @@ -45777,14 +46040,15 @@ /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/g) "nAU" = ( -/obj/effect/spawner/lootdrop/f13/junkspawners, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/structure/flora/tree/joshua, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "nAV" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/f13/alcoholspawner, -/turf/open/floor/f13/wood, +/obj/effect/decal/cleanable/glass, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) "nBd" = ( /obj/structure/window/fulltile/wood, @@ -45912,10 +46176,13 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "nDc" = ( -/obj/structure/chair/wood, -/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "nDd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -45972,6 +46239,7 @@ icon_state = "floor5" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) "nDE" = ( @@ -46027,11 +46295,24 @@ }, /area/f13/wasteland) "nEL" = ( -/obj/structure/bookcase/random{ - icon_state = "bookempty" +/obj/effect/turf_decal/weather/dirt{ + dir = 1 }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/turf_decal/weather/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -13 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "nES" = ( /obj/structure/curtain{ color = "#845f58"; @@ -46056,6 +46337,11 @@ /mob/living/simple_animal/hostile/molerat, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"nFm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/trash_stack, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "nFo" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes/cigpack_bigboss, @@ -46075,9 +46361,8 @@ }, /area/f13/wasteland) "nFD" = ( -/obj/structure/bed/mattress/pregame, -/turf/open/floor/f13/wood, -/area/f13/wasteland) +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "nFF" = ( /obj/machinery/autolathe/ammo, /obj/item/book/granter/crafting_recipe/gunsmith_four, @@ -46126,15 +46411,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/dirt, /area/f13/building/abandoned/q) -"nFZ" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) "nGb" = ( /obj/structure/rack/shelf_metal, /obj/item/clothing/head/chefhat, @@ -46183,32 +46459,12 @@ }, /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, /area/f13/building/powered) -"nHb" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/structure/stairs/west{ - color = "#A47449"; - dir = 4 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) "nHo" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = 5; - pixel_y = 4 +/obj/item/storage/trash_stack{ + icon_state = "Junk_10" }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "nHZ" = ( /obj/structure/car/rubbish4, /turf/open/indestructible/ground/outside/sidewalk{ @@ -46220,6 +46476,18 @@ /obj/machinery/door/locked/easy, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +"nIl" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/chair/sofa/left{ + color = "#475340"; + dir = 4; + pixel_x = 5 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "nIm" = ( /obj/structure/sign/poster/official/build, /turf/closed/wall/mineral/concrete, @@ -46290,11 +46558,11 @@ }, /area/f13/ambientlighting/building/m) "nIX" = ( -/obj/structure/window/fulltile/house{ - icon_state = "housewindowvertical" +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 }, -/obj/structure/barricade/wooden/planks/pregame, -/turf/open/floor/f13/wood, +/turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) "nJd" = ( /turf/open/indestructible/ground/outside/ruins{ @@ -46314,6 +46582,10 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +"nJi" = ( +/obj/structure/table/booth, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "nJm" = ( /obj/structure/wreck/car/bike{ dir = 4; @@ -46348,11 +46620,6 @@ /obj/item/chair/stool/retro, /turf/open/floor/carpet/purple, /area/f13/bar) -"nJY" = ( -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/ncr) "nKg" = ( /turf/open/floor/f13/wood{ icon_state = "housewood2-broken" @@ -46394,14 +46661,6 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) -"nKO" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor3-broken" - }, -/area/f13/ncr) "nKZ" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 1 @@ -46423,12 +46682,22 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "nLc" = ( -/obj/structure/rack, -/obj/item/clothing/head/crown, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/remains/human, +/obj/item/clothing/suit/armor/outfit/jacket/police, +/obj/item/clothing/under/f13/police, +/obj/item/clothing/head/f13/police/officer, +/obj/item/melee/classic_baton/police, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib1"; + pixel_y = -6 + }, +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "nLj" = ( /obj/effect/overlay/desert/sonora/edge, /obj/effect/overlay/desert/sonora/edge/corner{ @@ -46474,6 +46743,12 @@ icon_state = "dirt" }, /area/f13/legioncamp) +"nLJ" = ( +/obj/structure/table/wood, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "nLP" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -46521,11 +46796,6 @@ icon_state = "verticalrightborderleft0" }, /area/f13/wasteland/city) -"nMC" = ( -/turf/closed/wall/f13/tentwall{ - icon_state = "tent9" - }, -/area/f13/ncr) "nMO" = ( /obj/effect/spawner/lootdrop/toolsbasic, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -46608,15 +46878,10 @@ }, /area/f13/wasteland) "nNE" = ( -/obj/structure/stalkeregg, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) +/obj/structure/table/wood/junk, +/obj/effect/spawner/lootdrop/f13/cash_random_med, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "nNM" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, @@ -46625,12 +46890,10 @@ }, /area/f13/ambientlighting/building/w) "nNR" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" - }, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/dirt, +/obj/structure/nest/ghoul, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "nNW" = ( /obj/structure/flora/tree/jungle/small, /turf/open/indestructible/ground/outside/grass, @@ -46756,9 +47019,9 @@ }, /area/f13/wasteland) "nPV" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/wood_common{ - icon_state = "common-broken5" +/obj/item/mine/shrapnel, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" }, /area/f13/wasteland) "nPZ" = ( @@ -46792,13 +47055,6 @@ /obj/structure/flora/wasteplant/wild_datura, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"nQx" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/structure/destructible/tribal_torch/lit, -/turf/open/floor/plating/dirt/dark, -/area/f13/wasteland) "nQB" = ( /obj/machinery/light/lampost, /turf/open/indestructible/ground/outside/sidewalk{ @@ -46824,13 +47080,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "nQN" = ( -/obj/structure/flora/grass/wasteland{ - layer = 4.2; - pixel_x = 6; - pixel_y = 9 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "nQO" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain1" @@ -46915,6 +47167,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +"nSG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/cards/deck/unum, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "nSN" = ( /obj/machinery/door/unpowered/secure_bos, /obj/effect/mapping_helpers/network_builder/power_cable/auto, @@ -46931,11 +47188,10 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "nSW" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/ncr) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_worn, +/area/f13/ambientlighting/building/m) "nTc" = ( /obj/machinery/light{ dir = 8; @@ -46958,12 +47214,10 @@ /turf/closed/wall/f13/supermart, /area/f13/followers) "nTz" = ( -/obj/machinery/door/unpowered/secure_NCR{ - color = "#e8e4ca"; - name = "Captain's Lodge" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/machinery/icecream_vat, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/rockvault/alien, +/area/f13/ambientlighting/building/m) "nTT" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -46978,19 +47232,27 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "nUb" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) -"nUf" = ( -/obj/structure/chair/stool/retro/black{ - pixel_y = 19; - pixel_x = 7 +/obj/structure/rack/large/shelf_rust, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/dice, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) +"nUe" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/tentclothedge{ + dir = 4 }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +"nUf" = ( +/obj/structure/window/fulltile/ruins/broken, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks{ + icon_state = "board-2"; + desc = "This sps" }, -/area/f13/ncr) +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "nUg" = ( /obj/structure/table/wood/settler, /obj/effect/spawner/lootdrop/f13/alcoholspawner, @@ -47055,11 +47317,11 @@ /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) "nVz" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/gloves, -/obj/item/wallframe/apc/fusebox, -/turf/open/floor/plating/f13/outside/road, -/area/f13/ambientlighting/building/w) +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2left" + }, +/area/f13/wasteland) "nVA" = ( /obj/structure/barricade/bars, /turf/open/indestructible/ground/inside/mountain, @@ -47100,6 +47362,13 @@ /obj/structure/table/booth, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +"nVY" = ( +/obj/structure/chair/sofa/left{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "nWd" = ( /mob/living/simple_animal/hostile/supermutant/rangedmutant, /obj/effect/decal/cleanable/dirt, @@ -47165,13 +47434,14 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "nXi" = ( -/obj/structure/chair/bench{ - dir = 4 +/obj/structure/decoration/rag{ + icon_state = "flag_ncr"; + name = "NCR banner"; + pixel_y = 32 }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" }, -/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "nXs" = ( /obj/structure/barricade/wooden, @@ -47236,9 +47506,21 @@ }, /area/f13/ambientlighting/building/o) "nYQ" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"nYW" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "nYZ" = ( /obj/structure/table, /obj/machinery/computer/terminal{ @@ -47267,11 +47549,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) "nZE" = ( -/obj/structure/chair/wood{ - dir = 4 +/obj/effect/turf_decal/siding/wood, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" }, -/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, -/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "nZH" = ( /obj/structure/fence{ @@ -47284,16 +47565,21 @@ icon_state = "horizontaltopbordertop0" }, /area/f13/wasteland) +"nZL" = ( +/obj/item/trash/can, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2" + }, +/area/f13/wasteland) "nZP" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 +/obj/structure/fence/wooden{ + dir = 8 }, -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_2"; - pixel_x = 4; - pixel_y = 3 +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt"; + dir = 1 }, -/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "nZV" = ( /obj/structure/tires/two, @@ -47380,10 +47666,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"obz" = ( -/obj/structure/flora/grass/both, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "obB" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8 @@ -47411,15 +47693,6 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/g) -"ocb" = ( -/obj/structure/window/fulltile/wood/broken, -/obj/structure/curtain{ - color = "#808080" - }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/ncr) "ocn" = ( /obj/structure/flora/tree/tall, /turf/open/indestructible/ground/outside/dirt{ @@ -47700,12 +47973,6 @@ /obj/item/stack/sheet/mineral/limestone/five, /turf/open/floor/wood_common, /area/f13/wasteland) -"ofg" = ( -/obj/structure/flora/brushwoodalt, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow5" - }, -/area/f13/wasteland) "ofn" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /obj/effect/decal/cleanable/dirt, @@ -47722,6 +47989,13 @@ /obj/effect/mob_spawn/human/corpse/raider/ranged/biker, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"ofG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) "ofN" = ( /obj/structure/wreck/trash/autoshaft, /turf/open/indestructible/ground/outside/road{ @@ -47888,6 +48162,11 @@ /obj/structure/dresser, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +"ois" = ( +/obj/structure/simple_door/metal/dirtystore, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "oiv" = ( /obj/structure/flora/grass/jungle/b, /turf/open/indestructible/ground/outside/savannah, @@ -47922,12 +48201,19 @@ }, /area/f13/caves) "oiL" = ( -/obj/structure/fluff/hedge, -/obj/machinery/light/small{ - light_color = "#ff4747" +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge{ + pixel_y = -14; + layer = 5 }, -/turf/open/floor/wood_wide, -/area/f13/ncr) +/obj/structure/railing/wood/underlayer{ + layer = 6 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop3" + }, +/area/f13/wasteland) "oiN" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden, @@ -47966,6 +48252,15 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) +"ojq" = ( +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench" + }, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "ojt" = ( /mob/living/simple_animal/hostile/raider/baseball, /turf/open/indestructible/ground/outside/desert, @@ -48062,20 +48357,12 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) -"okx" = ( -/obj/structure/campfire/barrel{ - pixel_x = 3; - pixel_y = 17; - density = 0 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) "oky" = ( -/obj/item/vending_refill/coffee, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "okE" = ( /obj/structure/debris/v4, /obj/structure/debris/v2, @@ -48099,14 +48386,6 @@ icon_state = "redrustyfull" }, /area/f13/building/abandoned/t) -"okQ" = ( -/obj/structure/flora/tree/pine, -/obj/structure/flora/twig4{ - pixel_x = 16; - pixel_y = -10 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "okR" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -48132,14 +48411,13 @@ }, /area/f13/ambientlighting/building/i) "olg" = ( -/obj/structure/fence/corner{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - dir = 6; - icon_state = "outerpavement" +/obj/structure/chair/comfy/black{ + dir = 4; + pixel_x = -12 }, -/area/f13/wasteland) +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "olr" = ( /obj/machinery/grill, /turf/open/indestructible/ground/outside/sidewalkdirt, @@ -48207,7 +48485,6 @@ /area/f13/building/lower_firetower) "omh" = ( /obj/structure/debris/v3, -/obj/effect/spawner/lootdrop/trash, /obj/structure/fence{ dir = 8 }, @@ -48223,6 +48500,16 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/a) +"oml" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "omB" = ( /obj/structure/table, /obj/item/ammo_box/shotgun/trainshot, @@ -48272,6 +48559,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"onB" = ( +/obj/structure/chair/comfy/throne, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "onI" = ( /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, @@ -48420,6 +48711,11 @@ "opY" = ( /turf/closed/wall/f13/wood, /area/f13/building/abandoned/b) +"oqo" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/machinery/light, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "oqr" = ( /obj/structure/obstacle/barbedwire{ dir = 1 @@ -48713,6 +49009,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/tunnel, /area/f13/building/powered) +"ovN" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerborder" + }, +/area/f13/wasteland) "owm" = ( /obj/structure/railing{ color = "#A47449" @@ -48784,6 +49087,13 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) +"oxb" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6" + }, +/turf/open/floor/plating/rust, +/area/f13/sewer/powered) "oxv" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain3" @@ -48815,29 +49125,14 @@ }, /area/f13/ambientlighting/building/m) "oxJ" = ( -/turf/closed/wall/f13/wood/house, -/area/f13/ncr) -"oxQ" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/pen/fountain{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/item/storage/keys_set{ - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/storage/keys_set{ - pixel_x = -8; - pixel_y = -2 +/obj/effect/turf_decal/siding/wood{ + dir = 1; + layer = 1000 }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/filingcabinet{ + layer = 10000 }, +/turf/open/floor/plasteel/grimy, /area/f13/ncr) "oya" = ( /obj/structure/table, @@ -48910,10 +49205,12 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "ozC" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, /mob/living/simple_animal/hostile/ghoul, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "ozM" = ( /obj/structure/fence{ dir = 8 @@ -48990,6 +49287,10 @@ /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/wood_common, /area/f13/building/abandoned/z) +"oAB" = ( +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "oAV" = ( /obj/structure/railing{ dir = 6 @@ -49063,6 +49364,16 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"oCf" = ( +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench" + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "oCj" = ( /obj/effect/landmark/start/f13/tribal_new, /obj/structure/chair/bench{ @@ -49071,6 +49382,11 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"oCk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "oCt" = ( /obj/structure/table/wood/fancy/monochrome, /turf/open/floor/carpet/blue, @@ -49224,11 +49540,17 @@ /turf/closed/wall/f13/tunnel, /area/f13/tunnel/northeast) "oEK" = ( -/obj/structure/wreck/trash/machinepile, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/obj/effect/turf_decal/siding/wood{ + dir = 1; + layer = 1000 }, -/area/f13/caves) +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul/reaver, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "oEL" = ( /obj/structure/flora/junglebush, /turf/open/indestructible/ground/outside/dirt, @@ -49363,6 +49685,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"oHa" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "oHd" = ( /obj/structure/sign/poster/contraband/atmosia_independence{ pixel_x = -32 @@ -49390,11 +49716,8 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/large, -/obj/effect/spawner/lootdrop/trash, -/obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/area/f13/caves) "oHA" = ( /obj/structure/flora/grass/wasteland, /turf/open/indestructible/ground/outside/desert{ @@ -49412,16 +49735,6 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) -"oHL" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/structure/stairs/west{ - color = "#A47449"; - dir = 2 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "oHR" = ( /obj/structure/fence{ dir = 4 @@ -49438,19 +49751,15 @@ }, /area/f13/wasteland) "oHW" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) +/obj/structure/cross, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "oHY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -49512,15 +49821,14 @@ icon_state = "common-broken2" }, /area/f13/wasteland) -"oJi" = ( +"oJc" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/shower{ - dir = 8; - pixel_y = -6; - pixel_x = 2 +/obj/machinery/light{ + dir = 4; + pixel_y = -16 }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "oJl" = ( /obj/structure/table/wood, /obj/structure/decoration/clock{ @@ -49567,11 +49875,14 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) "oJW" = ( -/obj/structure/closet/crate/large, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/area/f13/caves) "oKa" = ( /obj/structure/barricade/tentclothcorner{ dir = 1 @@ -49642,28 +49953,18 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "oKZ" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22"; - pixel_x = -9; - pixel_y = 20 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/ash{ - pixel_x = 10; - pixel_y = 15 - }, -/obj/effect/decal/cleanable/blood{ - plane = -14; - layer = 3.7; - icon_state = "drip4" - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 }, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken5" +/obj/structure/sign/do_not_enter, +/obj/effect/turf_decal/siding/wood, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" }, -/area/f13/ncr) +/area/f13/wasteland) "oLl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -49671,9 +49972,25 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) "oLn" = ( -/obj/structure/chair/wood, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +"oLo" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/effect/decal/cleanable/oil{ + icon_state = "floor5"; + pixel_x = -19 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "oLu" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -49761,10 +50078,6 @@ icon_state = "housewood2-broken" }, /area/f13/building/abandoned/j) -"oMD" = ( -/obj/structure/barricade/wooden/planks/pregame, -/turf/closed/wall/f13/wood, -/area/f13/caves) "oML" = ( /turf/open/indestructible/ground/outside/road, /area/f13/ambientlighting/building/y) @@ -50023,6 +50336,13 @@ }, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +"oPg" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outercorner" + }, +/area/f13/wasteland) "oPu" = ( /obj/structure/wreck/trash/three_barrels, /turf/open/indestructible/ground/outside/grass, @@ -50080,14 +50400,13 @@ /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, /area/f13/clinic) "oPU" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/effect/decal/cleanable/glass, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "oPV" = ( /obj/structure/chair/bench{ dir = 4; @@ -50108,11 +50427,10 @@ }, /area/f13/building/powered) "oQd" = ( -/obj/machinery/light, -/turf/open/floor/plasteel/f13/vault_floor/floor{ - icon_state = "floordirty" - }, -/area/f13/ambientlighting/building/p) +/obj/structure/table/wood/junk, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "oQe" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8 @@ -50180,6 +50498,11 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"oRn" = ( +/obj/structure/chair/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "oRq" = ( /obj/item/storage/trash_stack{ icon_state = "Junk_10" @@ -50238,6 +50561,17 @@ icon_state = "whitedirtysolid" }, /area/f13/followers) +"oSt" = ( +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "oSx" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -50275,8 +50609,10 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "oTg" = ( -/turf/closed/wall/f13/tunnel, -/area/f13/ncr) +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/wasteplant/wild_fungus, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "oTj" = ( /obj/structure/chair/bench{ dir = 8; @@ -50288,13 +50624,11 @@ }, /area/f13/wasteland) "oTk" = ( -/obj/effect/decal/remains{ - icon_state = "remains" +/obj/machinery/light/fo13colored/Red{ + dir = 8 }, -/obj/effect/spawner/lootdrop/trash, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building/abandoned/a) +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "oTC" = ( /obj/structure/barricade/sandbags, /obj/effect/decal/cleanable/dirt, @@ -50415,6 +50749,10 @@ /obj/effect/spawner/lootdrop/ammo/shotgun, /turf/open/floor/f13/wood, /area/f13/building/abandoned/w) +"oUX" = ( +/obj/structure/flora/grass/coyote/two, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "oVl" = ( /obj/effect/decal/fakelattice, /obj/structure/barricade/wooden, @@ -50433,26 +50771,10 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/f) -"oWh" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 8; - light_color = "#f4e3b0" - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -29; - pixel_y = -1 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +"oWi" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "oWl" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -50474,11 +50796,9 @@ }, /area/f13/underground/cave) "oWA" = ( -/obj/machinery/light/broken{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/machinery/light, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "oWB" = ( /obj/structure/sign/flag_america, /turf/closed/wall/mineral/concrete/blastproof, @@ -50525,15 +50845,8 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "oWZ" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/item/clothing/head/beret/ncr/ncr_sapper{ - pixel_x = -3; - pixel_y = 7 - }, -/turf/open/indestructible/ground/outside/graveldirt, +/obj/item/melee/onehanded/slavewhip, +/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "oXd" = ( /obj/item/reagent_containers/glass/bucket, @@ -50643,10 +50956,9 @@ }, /area/f13/brotherhood) "oZf" = ( -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/caves) +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "oZi" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -50738,12 +51050,14 @@ }, /area/f13/wasteland) "paG" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 +/obj/structure/fence{ + dir = 4 }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outermaincornerouter" + }, +/area/f13/wasteland) "paK" = ( /obj/machinery/light{ dir = 1; @@ -50871,13 +51185,15 @@ /turf/open/indestructible/ground/outside/sidewalkdirt, /area/f13/wasteland/followers) "pcH" = ( -/obj/structure/flora/grass/brown{ - pixel_y = 11 - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow10" - }, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/f13/building/powered) +"pcQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "pcZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -50905,6 +51221,16 @@ /obj/item/queen_bee/bought, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"pdF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/fermichem/pHmeter, +/obj/item/fermichem/pHbooklet, +/obj/structure/table/wood, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "pdG" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 10 @@ -50969,6 +51295,12 @@ icon_state = "darkrusty" }, /area/f13/building/abandoned/h) +"pev" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood{ + icon_state = "housewood4-broken" + }, +/area/f13/ambientlighting/building/m) "peC" = ( /obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/glass, @@ -50982,6 +51314,18 @@ /obj/structure/junk/small/table, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +"peH" = ( +/obj/structure/flora/grass/coyote/thirteen, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"peM" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2" + }, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "peN" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -51024,6 +51368,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"pfL" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/obj/item/pen/fourcolor, +/obj/item/paper_bin, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "pfN" = ( /obj/structure/sink{ dir = 8; @@ -51065,9 +51418,14 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "pgi" = ( -/obj/structure/junk/cabinet, -/turf/open/floor/plating/dirt, -/area/f13/ncr) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -9 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "pgo" = ( /obj/structure/simple_door/interior, /turf/open/floor/wood_common, @@ -51096,6 +51454,12 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +"pgO" = ( +/obj/structure/shelf_wood, +/obj/item/camera_film, +/obj/item/camera_film, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "pgX" = ( /obj/structure/cable/outdoors{ icon_state = "2-4" @@ -51247,10 +51611,33 @@ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) +"piG" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/item/chair/stool/retro, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +"piH" = ( +/obj/item/trash/waffles, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "piJ" = ( /obj/structure/pondlily_small, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +"piS" = ( +/obj/structure/fluff/rug/rug_rubber{ + pixel_y = 15 + }, +/obj/structure/fluff/paper/stack{ + dir = 5 + }, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "piZ" = ( /obj/structure/car/rubbish4{ pixel_y = -9; @@ -51357,11 +51744,8 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "pkq" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken4" - }, -/area/f13/ncr) +/turf/open/floor/wood_worn, +/area/f13/ambientlighting/building/m) "pks" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -51374,21 +51758,22 @@ /turf/open/floor/plating/dirt/dark, /area/f13/building/abandoned/g) "pkS" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 +/obj/effect/decal/cleanable/glass, +/obj/structure/fence/corner{ + dir = 5 }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) -"pkU" = ( -/obj/effect/turf_decal/weather/snow/corner{ +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; dir = 1 }, -/obj/effect/landmark/start/f13/ncroffduty, -/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"pkU" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + layer = 1000 + }, +/turf/closed/wall/f13/wood, +/area/f13/ambientlighting/building/m) "pkV" = ( /obj/structure/chair/sofa/corner, /obj/machinery/light/small{ @@ -51447,16 +51832,6 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/w) -"plu" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 8; - light_color = "#f4e3b0" - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "plx" = ( /obj/structure/toilet, /obj/effect/decal/cleanable/dirt{ @@ -51562,26 +51937,6 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) -"pnq" = ( -/obj/structure/table, -/obj/machinery/computer/terminal{ - termtag = "Secret"; - dir = 8; - pixel_x = 5; - pixel_y = -6 - }, -/obj/item/phone{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/cigbutt/cigarbutt{ - pixel_y = -14; - pixel_x = 3 - }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/ncr) "pnt" = ( /obj/structure/fence/cut/medium{ dir = 4 @@ -51792,6 +52147,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/building/abandoned/w) +"pqV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/chair/wood/modern, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "pqY" = ( /obj/effect/decal/cleanable/blood/splats, /turf/open/floor/f13{ @@ -51827,6 +52190,14 @@ /obj/effect/decal/cleanable/blood, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"prA" = ( +/obj/structure/fluff/railing/corner{ + dir = 1 + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "prC" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -51848,9 +52219,12 @@ /area/f13/building/abandoned/p) "psg" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/f13/wood, -/area/f13/building/abandoned/g) +/obj/machinery/chem_master/advanced, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "psk" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/cardboard, @@ -51915,10 +52289,6 @@ icon_state = "wasteland33" }, /area/f13/wasteland) -"psL" = ( -/obj/machinery/smartfridge/chemistry, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "psM" = ( /obj/structure/closet/crate/bin/trashbin, /obj/effect/overlay/desert/sonora/edge{ @@ -51949,6 +52319,12 @@ /obj/structure/nest/gecko, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"ptj" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/ambientlighting/building/m) "ptp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road, @@ -52169,14 +52545,12 @@ }, /area/f13/wasteland) "pwi" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "pwv" = ( /obj/structure/rack, /obj/item/locked_box/weapon/ammo/tier4, @@ -52219,6 +52593,10 @@ }, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +"pxq" = ( +/obj/machinery/photocopier, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "pxv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, @@ -52230,10 +52608,14 @@ }, /area/f13/ambientlighting/building/o) "pxT" = ( -/obj/structure/flora/brushwood{ - pixel_x = 14 +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/effect/turf_decal/siding/wood, +/obj/structure/fluff/rug/rug_rubber, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" }, -/turf/open/indestructible/ground/outside/snow, /area/f13/wasteland) "pxU" = ( /obj/structure/railing/wood/post{ @@ -52321,11 +52703,15 @@ /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) "pyY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" +/obj/structure/statue/petrified, +/obj/item/clothing/under/sailordress, +/obj/item/clothing/head/f13/hairband{ + pixel_y = 6; + layer = 5 }, -/area/f13/ambientlighting/building/h) +/obj/item/clothing/head/wig, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "pze" = ( /obj/structure/car/rubbish4, /obj/effect/decal/cleanable/glass, @@ -52341,6 +52727,16 @@ smooth = 1 }, /area/f13/casino) +"pzq" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/displaycase/trophy, +/obj/item/toy/gun/justicar, +/obj/structure/fluff/railing, +/obj/structure/fluff/railing{ + dir = 1 + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "pzv" = ( /obj/machinery/door/airlock/hatch{ req_access_txt = "120" @@ -52349,12 +52745,12 @@ /turf/open/floor/plating/rust, /area/f13/brotherhood) "pzF" = ( -/obj/structure/window/fulltile/store{ - icon_state = "storewindowbottom" +/obj/effect/turf_decal/weather/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 }, -/obj/structure/barricade/wooden/planks/pregame, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "pzG" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/reagent_dispensers/barrel/dangerous, @@ -52405,6 +52801,17 @@ dir = 4 }, /area/f13/wasteland) +"pAK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth, +/obj/item/stack/sheet/cloth, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "pAW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, @@ -52415,17 +52822,6 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) -"pBl" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/wasteland) "pBm" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/grass/dirtpath{ @@ -52530,20 +52926,21 @@ icon_state = "horizontaltopbordertop2right" }, /area/f13/wasteland) +"pCP" = ( +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleftbottom" + }, +/area/f13/wasteland) "pCX" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) -"pDb" = ( -/obj/structure/chair/wood{ - dir = 1 - }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor3-broken" - }, -/area/f13/wasteland) "pDe" = ( /obj/structure/barricade/tentclothedge{ dir = 4 @@ -52577,10 +52974,14 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/q) "pDW" = ( -/mob/living/simple_animal/hostile/radscorpion/blue, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/rust, -/area/f13/caves) +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "pEa" = ( /obj/effect/spawner/lootdrop/f13/weapon/melee/tier2, /obj/effect/decal/cleanable/dirt, @@ -52601,16 +53002,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"pEx" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22"; - pixel_x = -10 - }, -/obj/machinery/jukebox{ - pixel_x = 5 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "pEQ" = ( /obj/machinery/light{ dir = 4 @@ -52674,7 +53065,6 @@ /area/f13/ambientlighting/building/b) "pFw" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/trash, /obj/effect/spawner/lootdrop/clothing_low, /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -52715,15 +53105,12 @@ /turf/open/indestructible/ground/outside/desert, /area/maintenance/bar) "pFP" = ( -/obj/structure/flora/brushwood{ - pixel_x = 14 +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 }, -/obj/structure/campfire/barrel, -/obj/item/trash/can{ - pixel_x = -7; - pixel_y = -7 +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2left" }, -/turf/open/indestructible/ground/outside/snow, /area/f13/wasteland) "pFU" = ( /obj/structure/table, @@ -52921,18 +53308,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/f13/ambientlighting/building/y) -"pJs" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 4; - light_color = "#f4e3b0" - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/storage/trash_stack, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "pJu" = ( /obj/effect/turf_decal/delivery, /mob/living/simple_animal/hostile/supermutant, @@ -53017,29 +53392,6 @@ icon_state = "housewood2" }, /area/f13/wasteland) -"pKu" = ( -/obj/structure/closet/fridge, -/obj/item/storage/fancy/egg_box{ - pixel_y = -6 - }, -/obj/item/storage/fancy/egg_box{ - pixel_y = -6 - }, -/obj/item/reagent_containers/food/snacks/meat/slab, -/obj/item/reagent_containers/food/snacks/meat/slab, -/obj/item/reagent_containers/food/snacks/meat/slab, -/obj/item/reagent_containers/food/snacks/meat/slab, -/obj/structure/railing{ - color = "#A47449"; - layer = 4.1 - }, -/obj/item/reagent_containers/food/condiment/mayonnaise{ - pixel_x = 7; - pixel_y = -7 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "pKv" = ( /obj/effect/decal/cleanable/greenglow{ pixel_x = -8; @@ -53048,7 +53400,6 @@ /obj/effect/decal/cleanable/greenglow, /obj/structure/nest/ghoul, /obj/item/stock_parts/cell/high, -/obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "pKw" = ( @@ -53258,11 +53609,24 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "pMr" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 +/obj/structure/railing/wood/underlayer{ + layer = 6 + }, +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge{ + pixel_y = -14; + layer = 5 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" }, -/turf/open/floor/plating/dirt, /area/f13/wasteland) +"pMC" = ( +/turf/open/floor/wood_wide{ + icon_state = "wide-broken1" + }, +/area/f13/ambientlighting/building/m) "pMH" = ( /obj/structure/fence/wooden{ dir = 4; @@ -53282,6 +53646,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"pMS" = ( +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, +/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "pMT" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /turf/open/floor/plating/rust, @@ -53336,6 +53710,14 @@ icon_state = "outerbordercorner" }, /area/f13/wasteland) +"pNV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "pOa" = ( /obj/structure/rack, /obj/structure/reagent_dispensers/barrel/explosive, @@ -53470,6 +53852,12 @@ icon_state = "verticalinnermain0" }, /area/f13/building/abandoned/t) +"pQd" = ( +/obj/structure/table/booth, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "pQi" = ( /obj/structure/fence/post, /obj/structure/fence/corner, @@ -53495,22 +53883,44 @@ /turf/open/indestructible/ground/outside/road, /area/f13/tunnel/northeast) "pQD" = ( -/obj/structure/table/wood, -/obj/item/storage/bag/casings{ - pixel_y = 5; - pixel_x = 1 +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" }, -/obj/item/clothing/glasses/welding{ - pixel_y = -8 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 }, -/turf/open/floor/wood_wide, -/area/f13/ncr) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/chair/bench, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "pQZ" = ( /obj/structure/fence/corner{ dir = 4 }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland/followers) +"pRi" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "pRs" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/simple_door/tent, @@ -53729,6 +54139,7 @@ /area/f13/wasteland) "pUW" = ( /obj/structure/weightlifter, +/obj/machinery/light/small, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) "pVa" = ( @@ -53739,28 +54150,28 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "pVs" = ( -/obj/structure/closet/fridge/cannibal, -/obj/effect/spawner/lootdrop/f13/foodspawner, -/obj/effect/spawner/lootdrop/f13/foodspawner, -/turf/open/floor/f13/wood, -/area/f13/wasteland) +/obj/machinery/door/locked/easy/maybe_trapped, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "pVt" = ( /obj/effect/decal/cleanable/insectguts, /obj/item/reagent_containers/pill/patch/jet, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "pVI" = ( -/obj/item/storage/trash_stack{ - icon_state = "Junk_3" +/obj/effect/turf_decal/siding/wood{ + dir = 1; + layer = 1000 }, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 +/obj/machinery/light{ + dir = 4; + pixel_y = -16 }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 +/obj/item/storage/trash_stack{ + icon_state = "trash_3" }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "pVT" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, @@ -53896,16 +54307,11 @@ }, /area/f13/building/powered) "pXt" = ( -/obj/structure/closet/crate/medical, -/obj/item/reagent_containers/hypospray/medipen/stimpak, -/obj/item/reagent_containers/hypospray/medipen/stimpak, -/obj/item/reagent_containers/hypospray/medipen/stimpak, -/obj/effect/decal/cleanable/cobweb, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_3" }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "pXw" = ( /obj/effect/spawner/lootdrop/cig_packs, /turf/open/indestructible/ground/outside/sidewalk{ @@ -53941,12 +54347,6 @@ "pXK" = ( /turf/open/indestructible, /area/f13/tcoms) -"pXQ" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "pXT" = ( /obj/effect/turf_decal, /obj/effect/decal/cleanable/dirt, @@ -54032,18 +54432,6 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/f) -"pYD" = ( -/obj/machinery/chem_lab, -/obj/item/reagent_containers/glass/bottle{ - pixel_x = 8; - pixel_y = -10 - }, -/obj/structure/sign/poster/contraband/buzzfuzz{ - pixel_y = 32 - }, -/obj/effect/turf_decal/weather/dirt, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "pYT" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/glass{ @@ -54085,6 +54473,17 @@ }, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +"pZJ" = ( +/obj/structure/sign/basic{ + name = "sign backing" + }, +/obj/item/reagent_containers/food/snacks/icecreamsandwich{ + pixel_x = -1; + anchored = 1; + name = "ice cream sign" + }, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "pZS" = ( /obj/effect/turf_decal/weather/dirt{ dir = 6 @@ -54125,13 +54524,6 @@ "qas" = ( /turf/open/indestructible/ground/outside/sidewalk, /area/f13/building/abandoned/m) -"qav" = ( -/obj/structure/fluff/hedge, -/obj/structure/sign/poster/contraband/bountyhunters{ - pixel_y = 32 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "qax" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4"; @@ -54294,7 +54686,6 @@ pixel_x = -8; pixel_y = -5 }, -/obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "qcu" = ( @@ -54344,6 +54735,16 @@ /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"qcJ" = ( +/obj/effect/decal/cleanable/ash, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +"qcL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "qcW" = ( /obj/structure/flora/ausbushes/ppflowers{ pixel_y = 5 @@ -54428,32 +54829,18 @@ }, /area/f13/building/abandoned/t) "qen" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 +/obj/structure/fluff/hedge, +/obj/structure/decoration/rag{ + icon_state = "flag_ncr"; + name = "NCR banner"; + pixel_y = 32 }, -/obj/item/stack/sheet/mineral/sandbags, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "qes" = ( /obj/structure/simple_door/glass, /turf/open/floor/f13/wood, /area/maintenance/bar) -"qeM" = ( -/obj/machinery/smartfridge/bottlerack/seedbin/primitive, -/obj/item/seeds/agave, -/obj/item/seeds/poppy/broc, -/obj/item/seeds/poppy/broc, -/obj/item/seeds/wheat, -/obj/item/seeds/tower, -/obj/effect/spawner/lootdrop/f13/seedspawner, -/obj/effect/spawner/lootdrop/f13/seedspawner, -/obj/effect/spawner/lootdrop/f13/seedspawner, -/obj/effect/spawner/lootdrop/f13/seedspawner, -/obj/effect/spawner/lootdrop/f13/seedspawner, -/obj/item/seeds/xander, -/obj/item/seeds/xander, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "qeX" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 1 @@ -54608,40 +54995,35 @@ }, /area/f13/wasteland) "qgV" = ( -/obj/structure/table/booth, -/obj/item/reagent_containers/food/drinks/coffee{ - pixel_x = -6 +/obj/structure/rack/large/shelf_rust{ + dir = 8 }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/decal/cleanable/glass, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/item/clothing/head/beret/headband, +/obj/item/clothing/head/beret/headband, +/obj/item/clothing/head/beret/headband, +/obj/item/clothing/head/beret/headband, +/obj/item/clothing/under/pants/jeanshort, +/obj/item/clothing/under/pants/jeanshort, +/obj/item/clothing/under/pants/jeanshort, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "qha" = ( /obj/structure/sign/departments/medbay/alt{ name = "TRIAGE" }, /turf/closed/wall/mineral/brick, /area/f13/ncr) -"qhm" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/baconegg{ - pixel_y = -1; - pixel_x = -1 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = 9; - pixel_y = 14 - }, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = 9; - pixel_y = 10 +"qhy" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 }, -/obj/item/reagent_containers/food/drinks/mug/coco{ - pixel_y = 9; - pixel_x = -5 +/obj/structure/junk/locker, +/turf/open/indestructible/ground/outside/road{ + dir = 1; + icon_state = "horizontaltopborderbottom0" }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/area/f13/wasteland) "qhB" = ( /obj/structure/rack, /obj/item/stack/sheet/glass/ten, @@ -54655,6 +55037,15 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"qhG" = ( +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "qhL" = ( /obj/machinery/biogenerator, /obj/effect/decal/cleanable/dirt/dust, @@ -54704,14 +55095,10 @@ }, /area/f13/ambientlighting/building/o) "qil" = ( -/obj/structure/rack, -/obj/item/clothing/under/f13/worn, -/obj/item/clothing/under/f13/rag{ - pixel_x = 3; - pixel_y = -6 - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "qio" = ( /obj/effect/turf_decal, /obj/structure/rack/shelf_metal, @@ -54720,14 +55107,6 @@ /obj/item/clothing/glasses/welding, /turf/open/indestructible/ground/outside/road, /area/engine/workshop) -"qiE" = ( -/obj/effect/decal/cleanable/cobweb{ - dir = 1; - icon_state = "cobweb2" - }, -/obj/structure/fluff/hedge, -/turf/open/floor/plating/dirt, -/area/f13/ncr) "qiF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/marking, @@ -54743,6 +55122,16 @@ name = "dirty floor" }, /area/f13/building/powered) +"qiI" = ( +/obj/structure/ladder/unbreakable{ + height = 2; + id = "roboticdung"; + level = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "qiS" = ( /obj/structure/fence/wooden{ dir = 4; @@ -54752,19 +55141,10 @@ /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/grass/dirtpath, /area/f13/ambientlighting/building/t) -"qjb" = ( -/obj/structure/flora/grass/green, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow3" - }, -/area/f13/wasteland) "qjd" = ( -/obj/structure/rack, -/obj/item/clothing/head/nursehat, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/window/fulltile/wood/broken, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "qjm" = ( /obj/structure/car/rubbish1, /turf/open/indestructible/ground/outside/road{ @@ -54773,12 +55153,15 @@ }, /area/f13/wasteland) "qjq" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/shreds, +/obj/effect/spawner/lootdrop/f13/cash_random_med, +/obj/effect/spawner/lootdrop/f13/cash_random_med, +/obj/structure/rack/shelf_metal, +/obj/structure/rack/shelf_metal, +/obj/effect/spawner/lootdrop/f13/blueprintMid, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "qjr" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/bomb/tier2, @@ -54910,28 +55293,6 @@ /obj/effect/overlay/desert_side, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) -"qlb" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -5 - }, -/obj/item/pen{ - pixel_x = -7 - }, -/obj/item/stamp/captain{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/item/stamp/denied{ - pixel_x = 8; - pixel_y = -2 - }, -/obj/machinery/light/small{ - dir = 8; - light_color = "#ff4747" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "qlf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -54961,10 +55322,6 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/a) -"qlk" = ( -/obj/structure/junk/small/bed, -/turf/open/floor/f13/wood, -/area/f13/ncr) "qln" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/sidewalk{ @@ -55000,17 +55357,14 @@ }, /area/f13/ambientlighting/building/i) "qlZ" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/obj/structure/flora/grass/jungle/b{ - pixel_x = 17; - pixel_y = 3 - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 }, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "qma" = ( /obj/structure/sign/departments/medbay, /turf/closed/wall/rust, @@ -55045,9 +55399,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "qmg" = ( -/obj/effect/turf_decal/weather/snow/corner, -/obj/structure/barricade/sandbags, -/turf/open/indestructible/ground/outside/graveldirt, +/obj/structure/wreck/car/bike, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, /area/f13/wasteland) "qmh" = ( /obj/effect/overlay/desert_side{ @@ -55133,10 +55488,11 @@ }, /area/f13/wasteland/town) "qnM" = ( -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken2" +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" }, -/area/f13/ncr) +/area/f13/ambientlighting/building/m) "qnN" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -55145,10 +55501,6 @@ "qnY" = ( /turf/closed/indestructible/f13/matrix, /area/f13/tunnel/northeast) -"qob" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet, -/area/f13/ncr) "qoc" = ( /obj/structure/fence/door, /turf/open/indestructible/ground/outside/sidewalk, @@ -55277,12 +55629,11 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "qpU" = ( -/obj/structure/barricade/wooden, -/turf/open/indestructible/ground/outside/dirt{ - dir = 8; - icon_state = "dirt" - }, -/area/f13/wasteland) +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/simple_door/brokenglass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "qqh" = ( /obj/structure/table, /turf/open/indestructible/ground/outside/road{ @@ -55298,11 +55649,6 @@ /obj/effect/overlay/junk/curtain, /turf/open/floor/f13/wood, /area/f13/building/abandoned) -"qqz" = ( -/turf/open/floor/wood_wide{ - icon_state = "wide-broken5" - }, -/area/f13/ncr) "qqM" = ( /obj/effect/decal/cleanable/blood/splats, /turf/open/indestructible/ground/inside/mountain, @@ -55312,24 +55658,16 @@ /obj/item/stack/sheet/metal/five, /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) -"qrf" = ( -/obj/structure/simple_door/wood, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "qrg" = ( -/obj/structure/rack, -/obj/item/clothing/head/cowboyhat/black{ - pixel_x = -5; - pixel_y = -3 - }, -/obj/item/clothing/head/cowboyhat/pink{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/clothing/head/cowboyhat/white, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/displaycase/trophy, +/obj/item/toy/plush/bird, +/obj/structure/fluff/railing, +/obj/structure/fluff/railing{ + dir = 1 + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "qrC" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/dirt, @@ -55343,18 +55681,6 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) -"qrK" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 4 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start/f13/ncrmedofficer, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "qrP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -55454,6 +55780,12 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/w) +"qsV" = ( +/obj/structure/table/wood/junk, +/obj/item/restraints/handcuffs/sinew, +/obj/item/clothing/mask/muzzle, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "qsX" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -55692,10 +56024,14 @@ }, /area/f13/wasteland) "qwC" = ( -/turf/closed/wall/f13/tentwall{ - icon_state = "tent5" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 }, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "qwK" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/grass, @@ -55811,9 +56147,10 @@ }, /area/f13/building/powered) "qyx" = ( -/obj/machinery/light, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "qyA" = ( /mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, /turf/open/floor/plasteel/grimy, @@ -55857,6 +56194,18 @@ icon_state = "bluerustysolid" }, /area/f13/ambientlighting/building/o) +"qyX" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded"; + pixel_x = -14 + }, +/obj/structure/car/rubbish3{ + icon_state = "car_rubish2" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "qza" = ( /obj/structure/table/wood, /obj/item/clothing/suit/captunic, @@ -55868,10 +56217,9 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "qzi" = ( -/obj/structure/rack, -/obj/item/clothing/mask/scarecrow, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/chair/stool/retro/backed, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "qzm" = ( /obj/structure/flora/twig, /turf/open/indestructible/ground/outside/sidewalk{ @@ -55894,9 +56242,10 @@ }, /area/f13/building/lower_firetower) "qzy" = ( -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/poster/prewar/poster60, +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/m) "qzA" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom2left" @@ -56009,11 +56358,12 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) "qAP" = ( -/obj/structure/rack, -/obj/item/clothing/under/f13/pinkdress, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/table/booth, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "qBe" = ( /obj/structure/table/wood/junk, /turf/open/indestructible/ground/outside/sidewalk, @@ -56061,20 +56411,6 @@ icon_state = "outerpavementcorner" }, /area/f13/wasteland) -"qBX" = ( -/obj/machinery/autolathe/ammo, -/obj/item/book/granter/crafting_recipe/gunsmith_one, -/obj/item/book/granter/crafting_recipe/gunsmith_two, -/obj/item/book/granter/crafting_recipe/gunsmith_three, -/obj/machinery/light/small{ - dir = 4; - light_color = "#ff4747" - }, -/obj/structure/sign/poster/contraband/revolver{ - pixel_x = 31 - }, -/turf/open/floor/wood_wide, -/area/f13/ncr) "qCb" = ( /obj/structure/fence/wooden{ pixel_x = -15 @@ -56147,14 +56483,6 @@ icon_state = "floordirty" }, /area/f13/building/powered) -"qCJ" = ( -/obj/effect/turf_decal/weather/snow/corner, -/obj/structure/stairs/west{ - color = "#A47449"; - dir = 2 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "qCP" = ( /obj/structure/cargocrate{ pixel_y = 32 @@ -56184,13 +56512,11 @@ }, /area/f13/wasteland) "qDl" = ( -/obj/structure/car, -/obj/structure/tires/five, -/turf/open/indestructible/ground/outside/dirt{ - dir = 1; - icon_state = "dirt" - }, -/area/f13/wasteland) +/obj/item/melee/onehanded/knife/hunting, +/obj/item/melee/onehanded/knife/hunting, +/obj/structure/shelf_wood, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "qDn" = ( /turf/closed/mineral/random/low_chance, /area/f13/building/powered) @@ -56232,6 +56558,11 @@ /obj/structure/spacevine, /turf/closed/wall/rust, /area/f13/wasteland) +"qEl" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "qEm" = ( /obj/effect/overlay/desert_side{ dir = 1 @@ -56257,13 +56588,6 @@ "qEt" = ( /turf/closed/wall/f13/wood/house, /area/maintenance/bar) -"qEv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fluff/rug/rug_rubber{ - icon_state = "rug_red" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "qEx" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy, @@ -56426,9 +56750,18 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) "qHu" = ( -/obj/structure/flora/grass/green, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/item/clothing/head/helmet/f13/combat/mk2/legion, +/obj/item/clothing/suit/armor/tiered/medium/combat/mk2/legion, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2"; + pixel_y = 4 + }, +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "qHy" = ( /obj/structure/cable/outdoors{ icon_state = "2-8" @@ -56442,12 +56775,15 @@ /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/town) "qHE" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 +/obj/effect/turf_decal/weather/dirt{ + dir = 9 }, -/obj/structure/simple_door/metal/fence/wooden, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/mob_spawn/human/corpse/legion, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/area/f13/caves) "qHJ" = ( /obj/structure/simple_door/metal/fence{ dir = 8 @@ -56475,24 +56811,16 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/x) "qIr" = ( -/obj/structure/table/wood, -/obj/item/clothing/gloves/color/latex/nitrile{ - pixel_x = -1 - }, -/obj/machinery/computer/terminal{ - dir = 4; - pixel_y = 13; - pixel_x = -2 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 8 +/obj/item/stack/f13Cash/random/denarius/high, +/obj/item/stack/f13Cash/random/aureus/low, +/obj/item/rack_parts, +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6"; + pixel_x = -18; + pixel_y = 15 }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "qIt" = ( /obj/structure/table/greyscale, /obj/item/kitchen/rollingpin, @@ -56551,11 +56879,18 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) "qJO" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 +/obj/structure/sign/legion/mines{ + pixel_y = 51; + layer = 100 }, -/turf/open/floor/plating/dirt, -/area/f13/wasteland) +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "qJZ" = ( /obj/machinery/door/airlock/medical/glass{ name = "Chemistry Lab"; @@ -56566,15 +56901,29 @@ }, /area/f13/followers) "qKf" = ( -/obj/structure/table/wood, -/obj/item/newspaper{ - pixel_x = 7; - pixel_y = 3 +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_x = 16 }, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 }, -/area/f13/wasteland) +/obj/structure/railing/wood/underlayer, +/obj/structure/railing/wood/underlayer{ + pixel_y = 23 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 39; + pixel_x = -16 + }, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) "qKm" = ( /obj/effect/decal/cleanable/robot_debris/gib, /obj/effect/decal/cleanable/oil/streak, @@ -56592,6 +56941,13 @@ /obj/machinery/workbench/forge, /turf/open/floor/plasteel/dark, /area/engine/workshop) +"qKE" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/mob/living/simple_animal/hostile/radscorpion/black, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "qKK" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden, @@ -56711,9 +57067,12 @@ }, /area/f13/building/powered) "qMo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/rust, -/area/f13/caves) +/obj/effect/decal/cleanable/oil{ + icon_state = "floor5" + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "qMs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -56725,6 +57084,10 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"qMC" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "qMG" = ( /obj/structure/railing{ color = "#A47449"; @@ -56739,15 +57102,11 @@ /obj/structure/decoration/rag, /turf/closed/mineral/random/low_chance, /area/f13/wasteland) -"qMR" = ( -/obj/structure/curtain{ - color = "#808080"; - pixel_x = -32 - }, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken6" - }, -/area/f13/ncr) +"qMM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/plasteel/rockvault/alien, +/area/f13/ambientlighting/building/m) "qMU" = ( /obj/structure/bed/mattress{ icon_state = "mattress2"; @@ -56791,6 +57150,12 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +"qOb" = ( +/obj/item/clothing/head/f13/enclave, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "qOf" = ( /obj/machinery/smartfridge/bottlerack, /obj/item/reagent_containers/food/drinks/bottle/whiskey, @@ -56808,16 +57173,15 @@ icon_state = "dirt" }, /area/f13/wasteland) +"qOp" = ( +/obj/structure/junk/small/table, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "qOr" = ( -/obj/machinery/vending/cola/random, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticaloutermain1" - }, +/obj/effect/turf_decal/weather/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) -"qOs" = ( -/obj/structure/barricade/wooden, -/turf/closed/mineral/snowmountain/cavern, -/area/f13/caves) "qOw" = ( /obj/structure/simple_door/house, /turf/open/floor/f13, @@ -56851,33 +57215,6 @@ /obj/item/salvage/low, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) -"qOX" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/under/rank/medical/doctor/purple, -/obj/item/clothing/under/rank/medical/doctor/green, -/obj/item/clothing/under/rank/medical/doctor/blue, -/obj/item/clothing/under/f13/ncr/ncr_officer, -/obj/item/pda/medical, -/obj/item/folder/white{ - pixel_x = 8; - pixel_y = -8 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = -10 - }, -/obj/effect/decal/cleanable/cobweb{ - dir = 1; - icon_state = "cobweb2" - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "qOY" = ( /obj/effect/decal/cleanable/blood{ icon_state = "tracks" @@ -56897,8 +57234,15 @@ /turf/open/floor/wood_common, /area/f13/wasteland) "qPa" = ( -/turf/open/floor/carpet, -/area/f13/ncr) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "qPb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light, @@ -56916,9 +57260,6 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/low, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) -"qPh" = ( -/turf/closed/mineral/random/low_chance, -/area/f13/ncr) "qPo" = ( /obj/item/flag/legion, /turf/open/indestructible/ground/outside/desert, @@ -56962,15 +57303,6 @@ "qPR" = ( /turf/open/indestructible/ground/outside/water, /area/f13/underground/cave) -"qPS" = ( -/obj/structure/bookcase/manuals/medical, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken3" - }, -/area/f13/ncr) "qPW" = ( /obj/structure/obstacle/barbedwire/end{ dir = 1; @@ -56999,6 +57331,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"qQM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "qQN" = ( /obj/structure/table/wood/bar, /turf/open/indestructible/ground/outside/sidewalk{ @@ -57051,6 +57392,13 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"qRH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden/planks/pregame, +/obj/effect/decal/cleanable/glass, +/obj/structure/simple_door/brokenglass, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "qRI" = ( /obj/item/crowbar, /obj/effect/decal/cleanable/dirt, @@ -57260,11 +57608,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "qUT" = ( -/obj/structure/table, -/obj/item/kitchen/knife/butcher, -/obj/effect/spawner/lootdrop/f13/crafting, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/item/rack_parts, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "qUU" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 1; @@ -57382,6 +57728,10 @@ /obj/structure/tires/five, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"qWI" = ( +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "qWJ" = ( /obj/effect/overlay/desert_side{ dir = 8 @@ -57398,12 +57748,14 @@ }, /area/f13/ambientlighting/building/q) "qWN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/window/fulltile/house{ - icon_state = "housewindowvertical" +/obj/effect/turf_decal/weather/dirt{ + dir = 5 }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "qWW" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/stone/rugged, @@ -57592,8 +57944,23 @@ }, /area/f13/followers) "qZF" = ( -/turf/closed/indestructible/f13/matrix, -/area/f13/ncr) +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/structure/fluff/rails{ + icon_state = "rails-r" + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +"raf" = ( +/obj/structure/table/wood/club, +/obj/item/clothing/shoes/f13/jamrock, +/obj/item/clothing/shoes/f13/jamrock, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "rag" = ( /obj/structure/girder/reinforced, /obj/effect/decal/cleanable/dirt{ @@ -57621,6 +57988,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +"rav" = ( +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/high, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "raw" = ( /obj/machinery/light{ dir = 1; @@ -57664,12 +58035,12 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland/town) "rbl" = ( -/obj/structure/flora/twig2, -/obj/effect/landmark/start/f13/ncroffduty, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow3" +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2"; + pixel_y = 4 }, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "rbm" = ( /obj/machinery/deepfryer, /obj/effect/decal/cleanable/dirt, @@ -57684,14 +58055,6 @@ icon_state = "horizontalinnermain2" }, /area/f13/ambientlighting/building/y) -"rbr" = ( -/obj/structure/flora/twig{ - pixel_y = 23; - pixel_x = -8 - }, -/obj/structure/flora/grass/brown, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "rbP" = ( /obj/effect/turf_decal/box/white, /obj/structure/reagent_dispensers/barrel/explosive, @@ -57704,6 +58067,19 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"rbV" = ( +/obj/item/radio{ + name = "walkie talkie" + }, +/obj/item/radio{ + name = "walkie talkie" + }, +/obj/item/radio{ + name = "walkie talkie" + }, +/obj/structure/shelf_wood, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "rcc" = ( /obj/machinery/workbench/forge, /obj/effect/decal/cleanable/dirt{ @@ -57731,6 +58107,12 @@ /obj/structure/decoration/rag, /turf/closed/wall/f13/tentwall, /area/f13/building/tribal) +"rcq" = ( +/obj/structure/car/rubbish4, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "rcv" = ( /mob/living/simple_animal/hostile/eyebot, /turf/open/indestructible/ground/outside/road{ @@ -57786,6 +58168,10 @@ icon_state = "verticalinnermain0" }, /area/f13/ambientlighting/building/i) +"rdc" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/m) "rdf" = ( /obj/structure/car/rubbish4{ desc = "A rusty Pre-War Fire Engine carcass.. or at least you think that's what this is.
This carcass is damaged beyond repair."; @@ -57807,9 +58193,14 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "rdk" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/oil{ + icon_state = "floor5"; + pixel_x = -19 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerturn" + }, +/area/f13/wasteland) "rdo" = ( /obj/structure/table{ layer = 2.9 @@ -57905,13 +58296,6 @@ }, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) -"reP" = ( -/obj/structure/flora/burnedlog{ - pixel_x = 15; - pixel_y = 9 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "reU" = ( /obj/effect/decal/cleanable/generic, /mob/living/simple_animal/hostile/ghoul/reaver, @@ -57945,6 +58329,10 @@ }, /turf/closed/wall/f13/tentwall, /area/f13/building/tribal) +"rfg" = ( +/obj/machinery/hydroponics/soil/pot, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "rfj" = ( /obj/structure/barricade/wooden, /obj/structure/decoration/rag, @@ -57997,9 +58385,15 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "rfW" = ( -/obj/structure/barricade/wooden/planks, -/turf/closed/wall/f13/wood, -/area/f13/wasteland) +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/structure/flora/rock/jungle{ + icon_state = "rock3"; + pixel_x = -3 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "rfX" = ( /turf/open/indestructible/ground/inside/mountain, /area/f13/bunker) @@ -58116,11 +58510,10 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "rhA" = ( -/obj/structure/table/wood, -/obj/item/clothing/head/fluff/bandit, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/junk/arcade, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "rhE" = ( /obj/structure/lattice, /obj/structure/reagent_dispensers/barrel/three, @@ -58156,13 +58549,11 @@ }, /area/f13/wasteland) "rhY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/junk/locker, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 +/obj/item/trash/candy, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2" }, -/turf/open/floor/plating/rust, -/area/f13/caves) +/area/f13/wasteland) "rhZ" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop1" @@ -58182,26 +58573,14 @@ }, /area/f13/building/abandoned/h) "rie" = ( -/obj/structure/closet/fridge, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/milk{ - pixel_x = -9; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/condiment/milk{ - pixel_x = -9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8; - light_color = "#ff4747" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "rih" = ( /obj/machinery/smartfridge/bottlerack/lootshelf/cans, /obj/effect/decal/cleanable/dirt, @@ -58260,11 +58639,9 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) "rjg" = ( -/mob/living/simple_animal/hostile/radroach, -/turf/open/floor/plasteel/f13/vault_floor/floor{ - icon_state = "floordirty" - }, -/area/f13/ambientlighting/building/p) +/obj/structure/table/glass, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "rjm" = ( /turf/open/floor/wood_common, /area/f13/ambientlighting/building/r) @@ -58272,11 +58649,11 @@ /turf/closed/wall/mineral/concrete/blastproof, /area/f13/wasteland) "rjo" = ( -/obj/effect/spawner/lootdrop/trash, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/indestructible/ground/outside/road, -/area/f13/ambientlighting/building/g) +/obj/structure/filingcabinet/chestdrawer, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "rjJ" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/toolsbasic, @@ -58350,6 +58727,13 @@ }, /turf/open/floor/wood_common, /area/f13/wasteland) +"rlm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/restraints/legcuffs/bola, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "rlq" = ( /obj/machinery/computer/operating/followers, /obj/machinery/defibrillator_mount/loaded{ @@ -58492,11 +58876,10 @@ /turf/closed/wall/f13/wood/interior, /area/f13/building/abandoned/z) "rnE" = ( -/obj/structure/rack, -/obj/item/clothing/under/assistantformal, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/simple_door/metal/dirtystore, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "rnH" = ( /obj/machinery/light{ dir = 8; @@ -58524,9 +58907,13 @@ }, /area/f13/building/abandoned/t) "rnV" = ( -/obj/effect/spawner/lootdrop/f13/junkspawners, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "rnX" = ( /obj/structure/window/plasma/reinforced/fulltile, /obj/structure/grille, @@ -58538,13 +58925,19 @@ }, /area/f13/building/powered) "rnY" = ( -/obj/structure/window/fulltile/wood, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "rnZ" = ( /obj/structure/wreck/trash/one_barrel, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"rod" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/wood_common{ + icon_state = "common-broken4" + }, +/area/f13/ambientlighting/building/m) "roe" = ( /obj/structure/car/rubbish3{ icon_state = "car_rubish2" @@ -58662,10 +59055,11 @@ }, /area/f13/ambientlighting/building/o) "rpZ" = ( -/obj/structure/mirror, -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/f13/wood/house, -/area/f13/ambientlighting/building/h) +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outercorner" + }, +/area/f13/wasteland) "rqd" = ( /obj/structure/table/wood/bar, /obj/item/reagent_containers/food/snacks/f13/fire_ant_fricassee, @@ -58746,11 +59140,11 @@ }, /area/f13/wasteland) "rqP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/obj/effect/turf_decal/weather/dirt{ + dir = 10 }, -/area/f13/caves) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "rqR" = ( /obj/structure/car/rubbish3{ icon_state = "car_rubish2" @@ -58831,6 +59225,10 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +"rrL" = ( +/obj/item/restraints/legcuffs/beartrap, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "rrO" = ( /obj/machinery/door/unpowered/secure_NCR{ name = "Medical" @@ -58897,8 +59295,21 @@ icon_state = "verticalleftborderright0" }, /area/f13/wasteland/city) +"rsU" = ( +/obj/item/trash/f13/mre, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2" + }, +/area/f13/wasteland) +"rtg" = ( +/obj/structure/reagent_dispensers/watertank/high, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "rtj" = ( -/turf/closed/mineral/snowmountain/cavern, +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6" + }, +/turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "rtk" = ( /obj/effect/gibspawner/human, @@ -58933,15 +59344,12 @@ /turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) "rtI" = ( -/obj/structure/rack/shelf_metal, -/obj/item/clothing/mask/gas/enclave, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/fo13colored/Red{ + dir = 1 }, -/area/f13/caves) +/turf/open/floor/plating/rust, +/area/f13/sewer/powered) "rtV" = ( /obj/effect/decal/cleanable/blood/old{ pixel_x = 12 @@ -58968,11 +59376,15 @@ }, /area/f13/building/abandoned/h) "rup" = ( -/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/f13/weapon/melee/tier1, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/displaycase/trophy, +/obj/item/toy/plush/beeplushie, +/obj/structure/fluff/railing{ + dir = 1 + }, +/obj/structure/fluff/railing, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "ruv" = ( /obj/structure/closet/crate/secure/gear{ anchored = 1; @@ -59005,14 +59417,11 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "rvi" = ( -/obj/effect/turf_decal/weather/snow/corner{ +/obj/effect/overlay/desert/sonora/edge{ dir = 8 }, -/obj/machinery/light/small{ - dir = 8; - light_color = "#ff4747" - }, -/turf/open/indestructible/ground/outside/graveldirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, /area/f13/wasteland) "rvn" = ( /obj/structure/flora/tree/oak_five, @@ -59070,6 +59479,11 @@ /obj/structure/closet/cabinet, /turf/open/floor/carpet/black, /area/f13/building/abandoned/b) +"rwc" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/poster/prewar/poster69, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "rwd" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -59130,11 +59544,6 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) -"rxJ" = ( -/turf/open/floor/wood_wide{ - icon_state = "wide-broken6" - }, -/area/f13/ncr) "rxL" = ( /obj/machinery/light/small{ dir = 8 @@ -59165,7 +59574,7 @@ dir = 9 }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/area/f13/caves) "ryn" = ( /turf/open/floor/f13{ color = "#ffe9de"; @@ -59199,11 +59608,13 @@ /turf/open/floor/carpet/airless, /area/f13/ambientlighting/building/c) "rzh" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor3-broken" +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" }, -/area/f13/ncr) +/mob/living/simple_animal/hostile/radscorpion/black, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "rzo" = ( /obj/machinery/vending/nukacolavend{ default_price = 0; @@ -59359,6 +59770,13 @@ /obj/structure/simple_door/house, /turf/open/floor/carpet, /area/f13/building/abandoned/z) +"rBH" = ( +/obj/item/mine/shrapnel, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outercorner" + }, +/area/f13/wasteland) "rBR" = ( /obj/structure/rack/large/shelf, /obj/item/radio/headset/headset_ncr{ @@ -59435,15 +59853,6 @@ icon_state = "verticaloutermain1" }, /area/f13/ambientlighting/building/m) -"rCl" = ( -/obj/structure/flora/ausbushes/fullgrass{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow5" - }, -/area/f13/wasteland) "rCq" = ( /turf/open/indestructible/ground/outside/road{ dir = 8; @@ -59466,11 +59875,11 @@ }, /area/f13/wasteland) "rCC" = ( -/obj/structure/table/booth, -/obj/item/seeds/coffee, -/obj/item/seeds/coffee/robusta, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/structure/chair/stool/retro/backed{ + dir = 1 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "rCE" = ( /obj/effect/overlay/desert_side{ dir = 8 @@ -59501,6 +59910,20 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/open/indestructible/ground/outside/grass/dirtpath, /area/f13/wasteland) +"rCU" = ( +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18; + desc = s + }, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/mineral/limestone/ten, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "rCY" = ( /obj/structure/barricade/tentclothcorner{ dir = 4 @@ -59549,6 +59972,25 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"rDJ" = ( +/obj/machinery/light/small{ + dir = 8; + pixel_y = -7 + }, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +"rDL" = ( +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18 + }, +/obj/item/stack/sheet/hay/twenty, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/metal/ten, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "rDM" = ( /obj/structure/wreck/trash/five_tires, /turf/open/indestructible/ground/outside/desert, @@ -59557,12 +59999,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"rDQ" = ( -/obj/effect/landmark/start/f13/ncrcorporal, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/wasteland) "rDU" = ( /obj/structure/destructible/tribal_torch/wall/lit, /obj/effect/decal/cleanable/dirt, @@ -59597,6 +60033,16 @@ icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) +"rEg" = ( +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft1" + }, +/area/f13/wasteland) "rEi" = ( /turf/open/floor/f13{ color = "#ffe9de"; @@ -59659,6 +60105,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"rEV" = ( +/obj/machinery/light{ + dir = 4; + pixel_y = -16 + }, +/obj/structure/bed/mattress/pregame{ + icon_state = "bedroll_unrolled" + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "rEX" = ( /obj/structure/window/fulltile/house/broken, /obj/structure/barricade/bars, @@ -59708,10 +60164,6 @@ /obj/structure/barricade/wooden/planks, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"rFQ" = ( -/obj/structure/reagent_dispensers/rainwater_tank, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "rFY" = ( /obj/effect/turf_decal/bot_white, /turf/open/floor/f13{ @@ -59749,6 +60201,10 @@ /obj/structure/table/wood, /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) +"rGU" = ( +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) "rHb" = ( /obj/machinery/door/poddoor/gate/preopen{ id = "town_south" @@ -59770,8 +60226,9 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "rHn" = ( -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "rHt" = ( /obj/structure/destructible/tribal_torch/wall/lit{ pixel_y = 25 @@ -59807,8 +60264,12 @@ /obj/item/bedsheet/blanket, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"rIb" = ( +/obj/structure/table/booth, +/obj/item/reagent_containers/food/drinks/coffee, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "rIq" = ( -/obj/effect/spawner/lootdrop/trash, /obj/structure/closet/crate/bin, /obj/machinery/light/small{ dir = 1 @@ -59855,15 +60316,21 @@ icon_state = "outerpavement" }, /area/f13/wasteland) -"rIY" = ( -/obj/structure/barricade/sandbags, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow3" - }, -/area/f13/wasteland) "rJc" = ( -/obj/structure/wreck/trash/machinepiletwo, -/turf/open/indestructible/ground/outside/snow, +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/obj/structure/sign/do_not_enter, +/obj/effect/turf_decal/siding/wood, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, /area/f13/wasteland) "rJp" = ( /obj/effect/decal/cleanable/ash, @@ -60139,14 +60606,11 @@ }, /area/f13/brotherhood) "rMP" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/obj/structure/fence/wooden{ - dir = 4; - icon_state = "post_wood" +/obj/item/storage/trash_stack, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" }, -/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "rMR" = ( /obj/effect/turf_decal/delivery, @@ -60163,10 +60627,13 @@ }, /area/f13/ambientlighting/building/j) "rNa" = ( -/mob/living/simple_animal/hostile/ghoul/reaver, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/glass, +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "rNb" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, @@ -60213,10 +60680,13 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) "rNx" = ( -/obj/item/storage/trash_stack, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/rust, -/area/f13/caves) +/obj/structure/chair/stool{ + icon_state = "bench" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "rNV" = ( /obj/machinery/door/poddoor/shutters/preopen, /turf/open/indestructible/ground/outside/road{ @@ -60244,8 +60714,11 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) "rOv" = ( -/turf/open/floor/plating/rust, -/area/f13/caves) +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) "rOB" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/power/smes/engineering, @@ -60261,6 +60734,12 @@ /obj/item/reagent_containers/food/snacks/meatsalted, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"rOQ" = ( +/obj/structure/table/wood/club, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "rOR" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -60307,24 +60786,23 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "rPw" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/item/reagent_containers/pill/bitterdrink, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "rPC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13, /area/f13/ambientlighting/building/o) "rPH" = ( -/obj/structure/rack, -/obj/item/clothing/shoes/combat{ - pixel_y = -5 - }, -/obj/item/clothing/shoes/f13/military/leather, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/table/booth, +/obj/item/storage/box/dice, +/obj/item/storage/box/dice, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "rPK" = ( /obj/structure/sign/painting/library_secure{ persistence_id = "brotherhood_secure"; @@ -60360,13 +60838,6 @@ "rQh" = ( /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/maintenance/bar) -"rQn" = ( -/obj/structure/fence/wooden{ - dir = 1; - icon_state = "post_wood" - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "rQw" = ( /obj/structure/fence{ dir = 4 @@ -60450,6 +60921,12 @@ "rRz" = ( /turf/closed/mineral/random/low_chance, /area/f13/wasteland) +"rRE" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "rRG" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/f13/store{ @@ -60574,15 +61051,24 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"rTp" = ( +/obj/item/storage/trash_stack, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "rTq" = ( /obj/structure/window/fulltile/ruins, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) -"rTC" = ( -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" +"rTE" = ( +/obj/structure/guncase{ + anchored = 1; + pixel_y = 25 }, -/area/f13/ncr) +/obj/item/gun/ballistic/rifle/hunting, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "rTM" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" @@ -60696,6 +61182,10 @@ icon_state = "horizontaloutermain0" }, /area/f13/ambientlighting/building/o) +"rVi" = ( +/obj/effect/spawner/lootdrop/f13/advcrafting, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "rVx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood/bar, @@ -60707,14 +61197,6 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) -"rVG" = ( -/obj/structure/table/wood, -/obj/item/taperecorder/empty, -/obj/item/tape/random, -/obj/item/tape/random, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/red, -/area/f13/ncr) "rVI" = ( /obj/structure/stairs/west, /turf/open/floor/f13/wood, @@ -60790,10 +61272,10 @@ /turf/closed/mineral/random/low_chance, /area/f13/caves) "rWU" = ( -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow5" - }, -/area/f13/wasteland) +/obj/structure/flora/rock/pile/largejungle, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "rXd" = ( /obj/structure/lamp_post/quadra, /turf/open/indestructible/ground/outside/sidewalk{ @@ -60934,12 +61416,6 @@ icon_state = "verticalleftborderleftbottom" }, /area/f13/wasteland) -"rZz" = ( -/obj/structure/closet/crate/footlocker, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/ncr) "rZK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -60984,14 +61460,12 @@ /area/f13/wasteland) "sbc" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable/outdoors{ - icon_state = "1-2" - }, -/obj/structure/cable/outdoors{ - icon_state = "2-4" +/obj/structure/flora/rock/jungle{ + icon_state = "rock3"; + pixel_x = -3 }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/area/f13/caves) "sbh" = ( /mob/living/simple_animal/hostile/raider/ranged, /obj/effect/decal/cleanable/blood{ @@ -61053,13 +61527,6 @@ /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/maintenance/bar) -"scf" = ( -/obj/structure/bed/wooden, -/obj/item/bedsheet/brown, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken4" - }, -/area/f13/ncr) "scn" = ( /obj/effect/decal/cleanable/robot_debris, /turf/open/indestructible/ground/outside/sidewalk{ @@ -61169,18 +61636,18 @@ icon_state = "bluedirtychess2" }, /area/f13/followers) -"sdP" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/obj/structure/destructible/tribal_torch/lit, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "sdS" = ( /obj/effect/decal/cleanable/robot_debris, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +"sdV" = ( +/obj/item/mine/shrapnel, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerouter" + }, +/area/f13/wasteland) "sdX" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -61199,24 +61666,6 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) -"sed" = ( -/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/cleanable/dirt/dust, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "set" = ( /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/indestructible/ground/outside/desert, @@ -61240,26 +61689,6 @@ /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) -"seT" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/siding/wood, -/obj/item/stack/sheet/metal/ten{ - pixel_x = -6 - }, -/obj/item/stack/sheet/metal/ten{ - pixel_x = -6 - }, -/obj/item/stack/ore/blackpowder/five, -/obj/item/stack/ore/blackpowder/five, -/obj/item/stack/ore/blackpowder/five, -/obj/item/stack/ore/blackpowder/five, -/obj/structure/extinguisher_cabinet{ - pixel_x = 31 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/ncr) "sfg" = ( /obj/structure/decoration/vent, /obj/effect/decal/cleanable/dirt{ @@ -61332,11 +61761,10 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/caves) "sgi" = ( -/obj/machinery/door/unpowered/secure_NCR{ - name = "Armoury" - }, -/turf/open/floor/wood_wide, -/area/f13/ncr) +/obj/effect/decal/cleanable/generic, +/obj/structure/flora/rock/jungle, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "sgk" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/supermutant/nightkin/elitemutant, @@ -61364,11 +61792,6 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland/town) -"sgz" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/start/f13/ncrlogisticsofficer, -/turf/open/floor/wood_wide, -/area/f13/ncr) "sgB" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -61411,6 +61834,12 @@ icon_state = "bar" }, /area/f13/building/abandoned/j) +"shg" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) "shi" = ( /obj/structure/flora/brushwoodalt, /turf/open/indestructible/ground/outside/desert, @@ -61459,9 +61888,10 @@ }, /area/f13/wasteland) "shL" = ( -/obj/structure/sign/poster/ncr/keep_to_myself, -/turf/closed/wall/f13/ruins, -/area/f13/ambientlighting/building/h) +/obj/structure/simple_door/brokenglass, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "shQ" = ( /obj/structure/fence{ dir = 8 @@ -61472,10 +61902,14 @@ }, /area/f13/wasteland) "shY" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/structure/car/rubbish1, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" }, -/turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "sid" = ( /obj/structure/railing/corner{ @@ -61611,6 +62045,10 @@ /obj/effect/mob_spawn/human/corpse/legion, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) +"sjM" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/m) "skg" = ( /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/g) @@ -61619,9 +62057,13 @@ /turf/open/floor/carpet/black, /area/f13/building/abandoned/b) "sks" = ( -/obj/structure/junk/machinery, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/structure/flora/rock/jungle, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "skw" = ( /obj/structure/table/wood, /obj/structure/barricade/bars, @@ -61647,11 +62089,12 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "skZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" +/obj/structure/chair/wood{ + pixel_x = 2; + pixel_y = 3 }, -/area/f13/ambientlighting/building/h) +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "slf" = ( /obj/machinery/light/fo13colored/Aqua{ desc = "A lighting fixture with cold blue lighting."; @@ -61718,13 +62161,10 @@ }, /area/f13/wasteland) "slD" = ( +/obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/booth, -/obj/item/reagent_containers/food/condiment/pack/coffee, -/obj/item/reagent_containers/food/condiment/pack/coffee, -/obj/item/reagent_containers/food/condiment/pack/coffee, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "slN" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt/dust, @@ -61827,6 +62267,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"smV" = ( +/obj/structure/table/snooker{ + dir = 10 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "smY" = ( /obj/effect/overlay/desert_side{ dir = 8 @@ -61844,6 +62290,11 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"snc" = ( +/obj/structure/table, +/obj/item/radio, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "snd" = ( /turf/open/floor/f13{ icon_state = "whiteyellowrustychess" @@ -61924,17 +62375,19 @@ }, /area/f13/ambientlighting/building/f) "soo" = ( -/obj/structure/table/wood, -/obj/item/binoculars{ - pixel_x = 2; - pixel_y = 6 +/obj/structure/cable/outdoors{ + icon_state = "4-8" }, -/obj/machinery/light/small{ - dir = 4; - light_color = "#ff4747" +/obj/structure/sign/basic{ + pixel_y = 31; + layer = 1000; + name = "threatening sign"; + desc = "A simple sign that reads--If you're not LD or going to pass out, you can stand. NCOs and above may use the benches during formation only." }, -/turf/open/floor/wood_wide, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "sot" = ( /obj/structure/flora/grass/jungle/b{ icon_state = "grassa4" @@ -61976,6 +62429,19 @@ icon_state = "dark" }, /area/f13/brotherhood) +"soN" = ( +/obj/effect/turf_decal/weather, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/item/kirbyplants/dead{ + desc = "A mummified potted plant."; + name = "very dead potted plant"; + pixel_x = -1; + pixel_y = 11 + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "sps" = ( /obj/structure/closet, /obj/effect/decal/cleanable/dirt{ @@ -62016,6 +62482,13 @@ name = "dirty floor" }, /area/f13/brotherhood) +"spP" = ( +/obj/item/melee/onehanded/slavewhip, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) "sqd" = ( /obj/structure/fence/wooden{ pixel_x = -15 @@ -62082,9 +62555,9 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) "sra" = ( -/obj/structure/closet/fridge/meat, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/structure/table/snooker, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "srd" = ( /obj/structure/railing{ color = "#A47449"; @@ -62107,15 +62580,16 @@ icon_state = "horizontaloutermain2left" }, /area/f13/wasteland) -"srr" = ( -/obj/structure/reagent_dispensers/compostbin, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "srv" = ( /obj/structure/decoration/rag, /obj/structure/barricade/tentleatheredge, /turf/closed/wall/f13/wood, /area/f13/building/tribal) +"sry" = ( +/obj/effect/decal/cleanable/generic, +/obj/item/reagent_containers/pill/patch/healpoultice, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "srS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -62134,17 +62608,18 @@ }, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +"ssr" = ( +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/highmid, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermainright" + }, +/area/f13/wasteland) "ssu" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom3" }, /area/f13/wasteland) -"ssJ" = ( -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" - }, -/area/f13/ncr) "ssX" = ( /obj/structure/railing{ dir = 4 @@ -62213,11 +62688,11 @@ }, /area/f13/building/abandoned/h) "stT" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/f13/weapon/melee/tier3, -/obj/effect/spawner/lootdrop/low_tools, -/turf/open/floor/plating/f13/outside/road, -/area/f13/ambientlighting/building/w) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/structure/simple_door/metal/dirtystore, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "stU" = ( /obj/effect/overlay/desert_side, /obj/effect/overlay/desert_side{ @@ -62258,10 +62733,10 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "suy" = ( -/obj/structure/rack, -/obj/item/clothing/mask/balaclava, +/obj/structure/table/booth, +/obj/item/trash/f13/electronic/toaster, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/area/f13/ambientlighting/building/m) "suz" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, @@ -62323,9 +62798,10 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "svH" = ( -/obj/effect/spawner/lootdrop/trash, -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/ruins, +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, /area/f13/wasteland) "svK" = ( /obj/structure/simple_door/tent, @@ -62378,18 +62854,6 @@ dir = 6 }, /area/f13/wasteland/town) -"swt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood{ - plane = -14; - layer = 3.7; - icon_state = "drip4" - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "sww" = ( /obj/structure/reagent_dispensers/barrel/four, /turf/open/indestructible/ground/outside/grass, @@ -62403,11 +62867,10 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "swK" = ( -/obj/structure/rack, -/obj/item/clothing/mask/rat/tribal, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/item/restraints/handcuffs, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "swO" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 6 @@ -62530,6 +62993,9 @@ pixel_y = 28; id = 983 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) "syC" = ( @@ -62552,6 +63018,14 @@ "syK" = ( /turf/open/indestructible/ground/outside/road, /area/engine/workshop) +"syM" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/blood{ + dir = 6; + icon_state = "tracks" + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "syR" = ( /obj/effect/decal/cleanable/blood/gibs/human/body, /turf/open/indestructible/ground/outside/graveldirt, @@ -62606,6 +63080,13 @@ /obj/machinery/workbench, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/d) +"szP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/booth{ + dir = 1 + }, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) "szY" = ( /obj/structure/barricade/sandbags, /obj/structure/barricade/sandbags, @@ -62696,14 +63177,6 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/j) -"sBk" = ( -/obj/structure/flora/grass/brown, -/obj/structure/flora/grass/brown{ - pixel_x = 9; - pixel_y = 11 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "sBl" = ( /obj/structure/fence{ dir = 4 @@ -62758,6 +63231,12 @@ /obj/structure/simple_door/tent, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/b) +"sCa" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "sCd" = ( /obj/structure/simple_door/metal/fence, /turf/open/indestructible/ground/outside/dirt, @@ -62877,16 +63356,6 @@ icon_state = "horizontalbottombordertop3" }, /area/f13/wasteland) -"sDy" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/item/trash/f13/steak{ - pixel_x = -6; - pixel_y = 5 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "sDB" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/effect/turf_decal/weather/dirt{ @@ -62928,15 +63397,19 @@ }, /area/f13/ambientlighting/building/o) "sEs" = ( -/obj/structure/flora/tree/dead, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow5" +/obj/item/storage/backpack/legionr, +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" }, -/area/f13/wasteland) -"sEv" = ( -/obj/structure/flora/bush, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"sEz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/simple_door/brokenglass, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "sEJ" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/sidewalk{ @@ -62947,14 +63420,6 @@ /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/carpet/green, /area/maintenance/bar) -"sEN" = ( -/obj/structure/easel, -/obj/machinery/light/small{ - dir = 8; - light_color = "#ff4747" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "sEU" = ( /obj/effect/overlay/desert_side, /turf/open/indestructible/ground/outside/dirt, @@ -63016,10 +63481,14 @@ }, /area/f13/wasteland/city) "sFB" = ( -/obj/structure/closet, -/obj/item/reagent_containers/pill/patch/jet, -/obj/item/reagent_containers/pill/patch/jet, -/turf/open/floor/f13/wood, +/obj/effect/decal/cleanable/robot_debris, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland) "sFI" = ( /mob/living/simple_animal/hostile/raider/ranged, @@ -63046,12 +63515,14 @@ }, /area/f13/ambientlighting/building/m) "sFX" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 }, -/obj/effect/landmark/start/f13/ncrspecialist, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/area/f13/caves) "sGa" = ( /obj/machinery/computer/operating, /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, @@ -63161,8 +63632,10 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "sHC" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/graveldirt, +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, /area/f13/wasteland) "sHF" = ( /obj/structure/rack, @@ -63248,9 +63721,11 @@ /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) "sJu" = ( -/obj/structure/barricade/wooden/strong, -/turf/closed/wall/f13/wood, -/area/f13/ncr) +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "sJy" = ( /obj/structure/rack/shelf_metal, /obj/item/clothing/glasses/welding, @@ -63269,19 +63744,10 @@ /turf/open/floor/plating, /area/f13/bar) "sJE" = ( -/obj/structure/cable/outdoors{ - icon_state = "4-8" - }, -/mob/living/simple_animal/hostile/handy/protectron{ - faction = list("NCR"); - enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); - name = "National Guard Protectron"; - desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain0" - }, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "sJK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old{ @@ -63315,6 +63781,12 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite, /area/maintenance/bar) +"sKj" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +/area/f13/wasteland) "sKu" = ( /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ icon_state = "whitedirtysolid" @@ -63376,11 +63848,11 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "sLe" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain2right" - }, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/obj/structure/simple_door/room/dirty, +/obj/structure/barricade/wooden/planks, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "sLh" = ( /obj/item/melee/onehanded/machete/spatha, /turf/open/indestructible/ground/outside/desert, @@ -63409,6 +63881,11 @@ icon_state = "housewood1-broken" }, /area/f13/ambientlighting/building/s) +"sLw" = ( +/obj/structure/flora/twig3, +/obj/structure/barricade/wooden, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "sLA" = ( /obj/structure/table/wood{ pixel_x = -2 @@ -63428,6 +63905,12 @@ /obj/item/stack/f13Cash/caps/onefivezero, /turf/open/floor/carpet/purple, /area/f13/bar) +"sLD" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerouter" + }, +/area/f13/wasteland) "sLI" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 1; @@ -63549,19 +64032,20 @@ name = "rusted floor" }, /area/f13/ncr) +"sNl" = ( +/obj/machinery/light/fo13colored/Red{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "sNu" = ( /obj/structure/simple_door/interior, /turf/open/floor/f13/wood{ icon_state = "housewood2-broken" }, /area/f13/building/abandoned/j) -"sNv" = ( -/obj/structure/flora/timber{ - pixel_x = 10 - }, -/obj/structure/flora/stump, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "sNA" = ( /obj/structure/table/glass, /obj/effect/decal/cleanable/dirt, @@ -63573,6 +64057,14 @@ icon_state = "floorrusty" }, /area/f13/followers) +"sNB" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "sNJ" = ( /obj/effect/turf_decal/huge{ dir = 4 @@ -63628,6 +64120,12 @@ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/f) +"sOK" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2left" + }, +/area/f13/wasteland) "sOQ" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -63669,6 +64167,12 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"sPx" = ( +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner" + }, +/area/f13/wasteland) "sPF" = ( /obj/structure/barricade/sandbags, /obj/effect/decal/cleanable/dirt{ @@ -63737,7 +64241,7 @@ dir = 10 }, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/area/f13/caves) "sQJ" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate, @@ -63761,20 +64265,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"sQT" = ( -/obj/item/trash/f13/instamash{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/trash/f13/c_ration_1{ - pixel_y = 10; - pixel_x = -8 - }, -/obj/item/trash/f13/k_ration{ - pixel_y = -4 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "sQV" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/armor/costumes, @@ -63898,6 +64388,11 @@ }, /turf/open/floor/plating/dirt, /area/f13/ambientlighting/building/j) +"sSf" = ( +/obj/machinery/atmospherics/components/unary/tank/toxins, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "sSl" = ( /obj/structure/barricade/wooden, /turf/closed/mineral/random/no_caves, @@ -63991,25 +64486,14 @@ }, /area/f13/building/abandoned/h) "sTR" = ( -/obj/structure/table/wood, -/obj/item/crafting/coffee_pot{ - pixel_x = 6; - pixel_y = 11 - }, -/obj/item/reagent_containers/food/drinks/mug{ - pixel_x = 8; - pixel_y = -1 - }, -/obj/item/reagent_containers/food/drinks/bottle/instatea{ - pixel_x = -7; - pixel_y = 13 +/obj/effect/turf_decal/weather/dirt{ + dir = 8 }, -/obj/item/reagent_containers/food/drinks/bottle/instacoffee{ - pixel_x = -7; - pixel_y = 4 +/obj/effect/turf_decal/weather/dirt{ + dir = 5 }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "sTS" = ( /obj/structure/railing{ color = "#A47449"; @@ -64103,10 +64587,24 @@ }, /turf/open/floor/wood_common/wood_common_light, /area/f13/ncr) +"sVy" = ( +/obj/effect/decal/remains{ + icon_state = "remains" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "sVG" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"sVO" = ( +/obj/structure/simple_door/brokenglass, +/obj/structure/barricade/wooden/planks/pregame, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "sWh" = ( /mob/living/simple_animal/hostile/raider, /obj/structure/chair/folding{ @@ -64251,6 +64749,12 @@ /obj/structure/wreck/trash/two_barrels, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"sXC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/cards/deck, +/obj/item/toy/cards/deck, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "sXJ" = ( /obj/effect/turf_decal/huge{ dir = 1 @@ -64278,13 +64782,6 @@ icon_state = "dirt" }, /area/f13/wasteland/legion) -"sXY" = ( -/obj/item/storage/bag/plants{ - pixel_y = 6; - pixel_x = 3 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "sYf" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -64409,10 +64906,12 @@ icon_state = "bluedirtychess2" }, /area/f13/followers) -"sZZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood_wide, -/area/f13/ncr) +"sZP" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "taa" = ( /obj/structure/bed, /obj/machinery/light/small{ @@ -64522,11 +65021,8 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) "tbh" = ( -/obj/structure/cable/outdoors{ - icon_state = "1-2" - }, -/turf/open/floor/plating/dirt, -/area/f13/ncr) +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "tbk" = ( /obj/structure/fence{ dir = 8 @@ -64599,6 +65095,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/f13/ambientlighting/building/q) +"tcc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/freezer, +/obj/item/reagent_containers/food/snacks/icecream, +/obj/item/reagent_containers/food/snacks/icecream, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/turf/open/floor/plasteel/rockvault/alien, +/area/f13/ambientlighting/building/m) +"tcf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/icecream_vat, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "tcn" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/dirt{ @@ -64718,9 +65228,18 @@ }, /area/f13/ambientlighting/building/e) "tdR" = ( -/obj/structure/sign/plaques/kiddie/library, -/turf/closed/wall/f13/wood/house, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) +"tec" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/bag/chemistry, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "teh" = ( /obj/structure/cable/outdoors{ icon_state = "1-4" @@ -64774,13 +65293,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) -"tfe" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/obj/effect/turf_decal/weather/snow/corner, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "tff" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_2"; @@ -64881,17 +65393,20 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "tgI" = ( -/obj/structure/flora/grass/both{ - icon_state = "snowgrass_esw" - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow3" - }, -/area/f13/wasteland) +/obj/structure/junk/small/table, +/obj/item/stack/sheet/mineral/wood, +/obj/structure/flora/twig3, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "tgJ" = ( /obj/effect/spawner/lootdrop/f13/armor/tier4, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"tgU" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "tgV" = ( /obj/machinery/smartfridge/bottlerack/lootshelf/cans, /obj/effect/decal/cleanable/dirt, @@ -64942,7 +65457,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/outside/sidewalk{ dir = 1; icon_state = "horizontaloutermain1" @@ -64955,6 +65469,15 @@ }, /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/c) +"thF" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop3" + }, +/area/f13/wasteland) "thH" = ( /obj/structure/table/wood, /turf/open/indestructible/ground/outside/sidewalk{ @@ -65006,6 +65529,11 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/o) +"tiL" = ( +/obj/effect/decal/cleanable/robot_debris, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "tiO" = ( /obj/structure/flora/junglebush/large, /obj/effect/overlay/fog/fog2, @@ -65179,13 +65707,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"tkT" = ( -/obj/effect/turf_decal/siding/wood, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/ncr) "tkX" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/effect/decal/cleanable/greenglow, @@ -65238,20 +65759,20 @@ "tlA" = ( /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) -"tlP" = ( -/obj/structure/bed/mattress{ - pixel_x = 7; - pixel_y = 12 - }, -/obj/item/bedsheet/blanket{ - pixel_y = 13; - pixel_x = 6 +"tlK" = ( +/obj/effect/decal/cleanable/generic, +/obj/item/storage/trash_stack{ + pixel_y = 17 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +"tlP" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 }, -/area/f13/ncr) +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "tlW" = ( /obj/structure/fence/corner/wooden, /obj/effect/turf_decal/weather/dirt{ @@ -65273,9 +65794,10 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) "tlY" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3, -/turf/open/floor/f13/wood, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "tmc" = ( /obj/effect/decal/cleanable/dirt, @@ -65547,40 +66069,38 @@ /area/f13/bar) "tqr" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "tqs" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/effect/spawner/lootdrop/trash, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2top" }, -/turf/open/floor/carpet/purple, -/area/f13/bar) +/area/f13/wasteland) "tqv" = ( /obj/structure/wreck/trash/three_barrels, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"tqF" = ( -/obj/structure/punching_bag, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood_wide, -/area/f13/ncr) "tqM" = ( -/mob/living/simple_animal/hostile/stalker, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 +/obj/structure/chair/wood{ + dir = 1 }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "tqQ" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" }, /turf/closed/wall/mineral/concrete, /area/f13/ambientlighting/building/j) +"tra" = ( +/obj/structure/table/booth, +/obj/item/camera{ + pixel_x = 3; + pixel_y = 11 + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "trd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -65645,13 +66165,6 @@ /obj/structure/bed/mattress, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) -"tsn" = ( -/obj/structure/closet/crate/large, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/rods/fifty, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "tsv" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/greenglow{ @@ -65680,22 +66193,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"tts" = ( -/obj/structure/chair/folding{ - dir = 4 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) -"tty" = ( -/obj/structure/flora/brushwoodalt{ - pixel_x = -11; - pixel_y = 1 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "ttF" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/desert, @@ -65710,6 +66207,12 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +"ttM" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/porta_turret/f13/turret_shotgun/burstfire/robot, +/turf/open/floor/plating/rust, +/area/f13/sewer/powered) "ttO" = ( /obj/machinery/smartfridge, /turf/closed/indestructible/rock{ @@ -65741,9 +66244,10 @@ /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) "tum" = ( -/obj/structure/fluff/hedge, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/decal/cleanable/generic, +/obj/structure/cross, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "tuI" = ( /mob/living/simple_animal/hostile/supermutant/rangedmutant, /turf/open/indestructible/ground/outside/graveldirt, @@ -65791,6 +66295,16 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"tvQ" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "tvW" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_common, @@ -65821,6 +66335,12 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) +"twv" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "twz" = ( /obj/structure/simple_door/metal/fence, /turf/open/indestructible/ground/outside/dirt, @@ -65860,7 +66380,8 @@ /area/f13/followers) "txc" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1 + dir = 1; + layer = 1000 }, /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -65939,10 +66460,17 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "tyt" = ( -/obj/structure/simple_door/house, -/obj/structure/barricade/wooden/planks/pregame, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/glass, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +"tyz" = ( +/obj/machinery/smartfridge/bottlerack, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "tyF" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/structure/sign/poster/official/safety_eye_protection{ @@ -66063,22 +66591,18 @@ icon_state = "verticalinnermain0" }, /area/f13/building/abandoned/t) +"tzE" = ( +/obj/item/stack/sheet/mineral/sandbags, +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) "tzF" = ( /obj/structure/railing/dancing_pole/top, /obj/effect/mob_spawn/human/corpse, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) -"tzN" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/wasteland) "tzP" = ( /obj/machinery/door/locked/hard, /turf/open/floor/wood_common, @@ -66246,11 +66770,9 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) "tCm" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "tCy" = ( /obj/structure/spacevine, /turf/closed/wall/f13/wood/house, @@ -66283,6 +66805,12 @@ /obj/structure/simple_door/repaired, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/p) +"tCQ" = ( +/obj/structure/chair/wood/wings{ + pixel_y = 23 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "tCV" = ( /obj/machinery/light/fo13colored/Red{ dir = 1 @@ -66294,24 +66822,11 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "tDd" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/structure/closet/crate/large, -/obj/item/mop, -/obj/item/broom{ - pixel_y = -8 - }, -/obj/item/soap, -/obj/item/reagent_containers/spray/cleaner{ - pixel_y = -9; - pixel_x = 7 - }, -/obj/item/storage/bag/trash{ - pixel_y = -6 +/obj/effect/turf_decal/weather/dirt{ + dir = 6 }, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/area/f13/caves) "tDe" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -66419,11 +66934,9 @@ }, /area/maintenance/bar) "tEu" = ( -/obj/structure/table/booth, -/turf/open/floor/f13/wood{ - icon_state = "housewood1-broken" - }, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/dirt, +/turf/closed/mineral/random/high_chance, +/area/f13/wasteland) "tEA" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -66526,6 +67039,10 @@ /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"tGc" = ( +/obj/effect/decal/remains/human, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "tGe" = ( /obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt{ @@ -66606,11 +67123,9 @@ }, /area/f13/wasteland/town) "tHX" = ( -/obj/structure/flora/tree/cactus, -/turf/open/indestructible/ground/outside/desert{ - icon_state = "wasteland33" - }, -/area/f13/wasteland) +/obj/effect/decal/cleanable/crayon, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "tHZ" = ( /obj/structure/campfire{ pixel_y = 12 @@ -66675,21 +67190,15 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) "tJl" = ( -/obj/structure/railing/corner{ - color = "#A47449"; - dir = 4 - }, -/obj/effect/decal/cleanable/oil{ - icon_state = "floor6"; - pixel_x = -15; - pixel_y = 13 - }, -/obj/effect/decal/cleanable/blood{ - dir = 8; - icon_state = "tracks" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/structure/flora/wasteplant/wild_fungus, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "tJo" = ( /obj/machinery/light{ dir = 4 @@ -66705,7 +67214,6 @@ /area/f13/ncr) "tJC" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/trash, /obj/effect/spawner/lootdrop/clothing_low, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier1, /obj/effect/decal/cleanable/dirt{ @@ -66735,22 +67243,21 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/m) -"tJZ" = ( -/obj/structure/guncase{ - anchored = 1 - }, -/obj/item/gun/ballistic/automatic/service, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/gun/ballistic/automatic/pistol/ninemil, -/obj/item/gun/ballistic/automatic/pistol/ninemil, -/turf/open/floor/wood_wide, -/area/f13/ncr) "tKd" = ( /obj/structure/simple_door/dirtyglass, /turf/open/floor/f13/wood{ icon_state = "housewood2" }, /area/f13/building/abandoned/t) +"tKw" = ( +/obj/structure/chair/wood{ + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "tKC" = ( /obj/structure/window/reinforced/spawner, /obj/structure/rack, @@ -66833,14 +67340,6 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) -"tMB" = ( -/obj/structure/table/wood, -/obj/item/documents{ - desc = "Documents and maps concerning the local NCR presence."; - pixel_y = 4 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "tME" = ( /obj/structure/flora/tree/oak_five, /turf/open/indestructible/ground/inside/dirt, @@ -66962,12 +67461,9 @@ }, /area/f13/ambientlighting/building/b) "tOD" = ( -/obj/effect/decal/cleanable/oil{ - icon_state = "floor5"; - pixel_x = -19 - }, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland) +/obj/item/clothing/under/pants/mustangjeans, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "tOF" = ( /turf/open/indestructible/ground/outside/dirt{ dir = 4; @@ -66980,10 +67476,6 @@ icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) -"tOK" = ( -/obj/structure/sign/warning/electricshock, -/turf/closed/wall/f13/wood/house, -/area/f13/ncr) "tON" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/indestructible/ground/inside/mountain, @@ -67019,6 +67511,15 @@ icon_state = "dark" }, /area/f13/brotherhood) +"tPk" = ( +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "tPl" = ( /obj/item/reagent_containers/food/snacks/f13/deathclawegg, /obj/item/reagent_containers/food/snacks/meat/slab/human, @@ -67094,10 +67595,14 @@ /turf/closed/wall/f13/wood, /area/f13/building/tribal) "tQx" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/indestructible/ground/outside/road, -/area/f13/building/abandoned/k) +/obj/structure/fluff/paper/stack, +/obj/effect/decal/remains/human, +/obj/item/gun/ballistic/revolver/hobo/piperifle, +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6" + }, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "tQE" = ( /obj/structure/cable/outdoors{ icon_state = "4-8" @@ -67115,13 +67620,6 @@ }, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) -"tQM" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/start/f13/ncrcombatengineer, -/turf/open/floor/wood_wide{ - icon_state = "wide-broken1" - }, -/area/f13/ncr) "tQR" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/dirt{ @@ -67234,7 +67732,6 @@ "tRA" = ( /obj/structure/junk/small/bed, /obj/structure/wreck/trash/five_tires, -/obj/effect/spawner/lootdrop/trash, /obj/effect/overlay/desert/sonora/edge, /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -67365,10 +67862,6 @@ icon_state = "horizontalbottombordertop2" }, /area/f13/wasteland) -"tTi" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/red, -/area/f13/ncr) "tTu" = ( /obj/effect/turf_decal/huge{ dir = 1 @@ -67424,6 +67917,12 @@ icon_state = "dark" }, /area/f13/casino) +"tTU" = ( +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "tTX" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/handy/assaultron/laser, @@ -67433,13 +67932,9 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "tUc" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/caves) +/obj/structure/debris/v4, +/turf/closed/indestructible/rock, +/area/f13/wasteland) "tUd" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 4 @@ -67457,15 +67952,6 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) -"tUw" = ( -/obj/structure/flora/grass/brown{ - pixel_x = 9; - pixel_y = 11 - }, -/obj/item/trash/f13/bubblegum_large, -/obj/effect/spawner/lootdrop/f13/junkspawners, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "tUz" = ( /obj/machinery/vending/coffee, /obj/effect/decal/cleanable/dirt, @@ -67473,6 +67959,12 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/y) +"tUB" = ( +/obj/structure/junk/machinery, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "tUC" = ( /obj/structure/debris/v2, /turf/open/indestructible/ground/outside/desert{ @@ -67525,9 +68017,12 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "tVb" = ( -/mob/living/simple_animal/hostile/ghoul, -/turf/open/indestructible/ground/outside/road, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "tVc" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood/settler, @@ -67770,14 +68265,6 @@ name = "rusted floor" }, /area/f13/bunker) -"tZz" = ( -/obj/item/storage/trash_stack, -/obj/structure/flora/grass/brown{ - pixel_x = 9; - pixel_y = 11 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "tZA" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/ammo/civilian, @@ -67856,17 +68343,6 @@ icon_state = "bluerustysolid" }, /area/f13/followers) -"ubI" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) -"ubK" = ( -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) "ubM" = ( /obj/structure/junk/small/table, /turf/open/indestructible/ground/outside/sidewalk{ @@ -67973,12 +68449,11 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "ucV" = ( -/obj/structure/window/fulltile/house{ - icon_state = "housewindowbroken" +/obj/structure/stairs/south{ + color = "#A47449" }, -/obj/structure/barricade/wooden/planks/pregame, /turf/open/floor/f13/wood, -/area/f13/wasteland) +/area/f13/ambientlighting/building/m) "udl" = ( /obj/structure/closet/cabinet, /obj/effect/spawner/lootdrop/f13/armor/tier2, @@ -68001,11 +68476,15 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) "udz" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken6" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 }, -/area/f13/ncr) +/obj/structure/flora/rock/jungle, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "udB" = ( /obj/structure/table, /obj/item/trash/f13/porknbeans, @@ -68060,12 +68539,9 @@ }, /area/f13/wasteland) "udU" = ( -/mob/living/simple_animal/hostile/radroach, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/f13/vault_floor/floor{ - icon_state = "floordirty" - }, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "udW" = ( /obj/structure/railing/corner{ color = "#A47449" @@ -68124,11 +68600,9 @@ }, /area/f13/wasteland) "ueJ" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/caves) +/obj/structure/sign/flag_america, +/turf/closed/wall/f13/wood/house, +/area/f13/building/abandoned/k) "ueL" = ( /obj/structure/table/wood, /turf/open/floor/f13/wood, @@ -68172,13 +68646,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "ufz" = ( -/obj/effect/spawner/lootdrop/trash, -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/k) +/obj/effect/decal/cleanable/glass, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "ufC" = ( /obj/item/radio/off, /obj/structure/table, @@ -68196,18 +68667,20 @@ }, /area/f13/wasteland) "ufJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood{ - plane = -14; - layer = 3.7; - icon_state = "drip4" - }, -/obj/effect/decal/cleanable/blood{ - dir = 6; - icon_state = "tracks" +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18 }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/item/stack/sheet/leather/ten, +/obj/item/stack/sheet/leather/ten, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/mineral/limestone/ten, +/obj/item/stack/sheet/mineral/limestone, +/obj/item/stack/sheet/mineral/limestone, +/obj/item/stack/sheet/mineral/limestone, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "ufK" = ( /obj/machinery/light{ dir = 4; @@ -68232,12 +68705,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/purple, /area/f13/bar) -"ufV" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/turf/open/floor/plating/dirt, -/area/f13/wasteland) "ufX" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -68306,11 +68773,6 @@ icon_state = "verticalinnermain2bottom" }, /area/f13/ambientlighting/building/b) -"ugZ" = ( -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1-broken" - }, -/area/f13/wasteland) "uhb" = ( /obj/structure/reagent_dispensers/barrel/three, /obj/structure/lattice, @@ -68379,16 +68841,9 @@ }, /area/f13/wasteland) "uhs" = ( -/mob/living/simple_animal/hostile/handy/protectron{ - faction = list("NCR"); - enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); - name = "National Guard Protectron"; - desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." - }, -/turf/open/indestructible/ground/outside/road{ - icon_state = "verticalinnermain0" - }, -/area/f13/wasteland) +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "uhv" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 6 @@ -68403,6 +68858,18 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/o) +"uhE" = ( +/obj/machinery/power/port_gen/pacman/diesel{ + anchored = 1; + pixel_y = 24 + }, +/obj/machinery/power/port_gen/pacman/diesel{ + anchored = 1; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "uhI" = ( /obj/structure/billboard/radiationking, /turf/open/indestructible/ground/outside/desert, @@ -68481,6 +68948,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) +"uiB" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "uiN" = ( /obj/structure/barricade/wooden, /obj/structure/decoration/rag{ @@ -68536,6 +69010,12 @@ icon_state = "floorrusty" }, /area/f13/followers) +"ujy" = ( +/obj/structure/table/snooker{ + dir = 9 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "ujD" = ( /obj/structure/table, /obj/item/dnainjector/acidflesh{ @@ -68609,19 +69089,6 @@ /obj/item/storage/trash_stack, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) -"ukT" = ( -/obj/structure/barricade/concrete, -/obj/item/flashlight/lantern{ - on = 1; - light_on = 1; - icon_state = "lantern-on"; - pixel_x = -14; - pixel_y = 20 - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow5" - }, -/area/f13/wasteland) "ukX" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -68669,9 +69136,19 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "ulJ" = ( -/obj/machinery/door/poddoor/shutters, -/turf/open/indestructible/ground/outside/road, -/area/f13/building/abandoned/k) +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/ambientlighting/building/m) +"ume" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "umg" = ( /obj/structure/simple_door/room/dirty, /turf/open/floor/wood_common{ @@ -68695,10 +69172,6 @@ icon_state = "bluedirtychess2" }, /area/f13/followers) -"umH" = ( -/obj/structure/simple_door/metal/fence/wooden, -/turf/open/indestructible/ground/outside/snow, -/area/f13/ncr) "umQ" = ( /obj/item/target/clown, /turf/open/floor/f13{ @@ -68762,6 +69235,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"unz" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom3" + }, +/area/f13/wasteland) "unA" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/reagent_dispensers/foamtank, @@ -68779,11 +69258,6 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) -"unT" = ( -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow4" - }, -/area/f13/wasteland) "unU" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /obj/machinery/microwave/stove, @@ -68810,20 +69284,12 @@ }, /area/f13/wasteland) "uou" = ( -/obj/structure/railing/wood/post{ - desc = "A wooden stanchion."; - name = "wooden stanchion"; - pixel_y = 24; - pixel_x = 16 - }, -/mob/living/simple_animal/hostile/handy/protectron{ - faction = list("NCR"); - enemy_factions = list("Legion","supermutant","scorched","hostile","ant","radscorpion","raider","wastebot","tunneler","trog","deathclaw","china","gecko"); - name = "National Guard Protectron"; - desc = "A pre-war security robot that's been repurposed by the NCR Engineering corps following the reestablishment of the pre-war national guard armory." +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" }, -/turf/open/floor/wood_common, -/area/f13/wasteland) +/area/f13/ambientlighting/building/m) "uow" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/inside/dirt, @@ -68864,6 +69330,15 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/j) +"uoK" = ( +/obj/structure/fluff/railing/corner{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) "uoO" = ( /turf/closed/wall/mineral/concrete/blastproof, /area/f13/building/abandoned/l) @@ -69038,12 +69513,16 @@ }, /area/f13/building/abandoned/t) "urR" = ( -/obj/machinery/door/unpowered/secure_NCR{ - color = "#e8e4ca"; - name = "Captain's Office" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +"ush" = ( +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/metal/ten, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "usB" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -69174,25 +69653,6 @@ /obj/structure/closet/crate/secure/engineering, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"uuN" = ( -/obj/item/reagent_containers/glass/bucket/wood{ - pixel_x = -8; - pixel_y = 13 - }, -/obj/item/reagent_containers/glass/bucket/wood{ - pixel_x = -8; - pixel_y = 3 - }, -/obj/item/reagent_containers/glass/bucket/wood{ - pixel_x = 5; - pixel_y = 10 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "uuR" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" @@ -69214,10 +69674,12 @@ }, /area/f13/wasteland) "uvn" = ( -/mob/living/simple_animal/hostile/handy/protectron, /obj/effect/decal/cleanable/dirt{ color = "000000" }, +/mob/living/simple_animal/hostile/handy/protectron{ + faction = list("raider") + }, /turf/open/floor/f13{ icon_state = "floorrusty" }, @@ -69302,11 +69764,9 @@ }, /area/f13/wasteland) "uwq" = ( -/obj/structure/decoration/rag{ - icon_state = "skulls" - }, -/obj/structure/barricade/wooden, -/turf/open/indestructible/ground/outside/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) "uws" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -69421,13 +69881,9 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "uyr" = ( -/obj/structure/campfire/barrel{ - pixel_x = -8; - pixel_y = -1 - }, -/turf/open/indestructible/ground/outside/dirt{ - dir = 5; - icon_state = "dirt" +/obj/structure/closet/crate/trashcart, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" }, /area/f13/wasteland) "uyw" = ( @@ -69440,12 +69896,6 @@ /obj/structure/chair/left, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/lower_firetower) -"uyA" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken5" - }, -/area/f13/ncr) "uyC" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 4 @@ -69479,11 +69929,22 @@ }, /area/f13/ambientlighting/building/y) "uyU" = ( -/obj/effect/decal/cleanable/robot_debris, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/obj/structure/rack/large/shelf_rust{ + dir = 8 }, -/area/f13/caves) +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) +"uyX" = ( +/obj/structure/table, +/obj/item/electronic_assembly/medium/radio, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "uza" = ( /obj/machinery/chem_master, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -69535,20 +69996,6 @@ /obj/structure/wreck/trash/machinepiletwo, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) -"uzR" = ( -/obj/structure/filingcabinet{ - pixel_x = -12 - }, -/obj/structure/filingcabinet{ - pixel_x = -2 - }, -/obj/item/kirbyplants{ - icon_state = "plant-22"; - pixel_x = 10; - pixel_y = 1 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "uzY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/overlay/junk/sink{ @@ -69573,6 +70020,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/t) +"uAs" = ( +/obj/item/chair/stool/brass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "uAt" = ( /obj/structure/car/rubbish3{ pixel_x = -17 @@ -69592,13 +70044,6 @@ footstep = "wood" }, /area/f13/ambientlighting/building/e) -"uAI" = ( -/obj/structure/barricade/bars, -/obj/structure/table/wood, -/obj/structure/barricade/wooden, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ncr) "uAL" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/dirt, @@ -69622,11 +70067,12 @@ /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "uAZ" = ( -/obj/effect/spawner/lootdrop/trash, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/obj/effect/spawner/lootdrop/f13/crafting, /turf/open/indestructible/ground/outside/road{ - icon_state = "horizontalinnermain1" + icon_state = "horizontalinnermain0" }, -/area/f13/building/powered) +/area/f13/wasteland) "uBn" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" @@ -69639,22 +70085,9 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) "uBz" = ( -/obj/structure/table/wood, -/obj/item/radio/tribal{ - pixel_x = 3; - pixel_y = 17 - }, -/obj/item/reagent_containers/medspray/synthflesh{ - pixel_y = 4; - pixel_x = -8 - }, -/obj/structure/decoration/rag{ - icon_state = "flag_ncr"; - name = "NCR banner"; - pixel_y = 32 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "uBG" = ( /obj/structure/wreck/trash/machinepiletwo, /turf/open/indestructible/ground/outside/dirt, @@ -69672,9 +70105,15 @@ dir = 1 }, /obj/structure/closet/crate/bin, -/obj/effect/spawner/lootdrop/trash, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) +"uBL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "uBP" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -69840,10 +70279,6 @@ }, /turf/open/indestructible/ground/outside/dirt/harsh, /area/f13/followers) -"uEr" = ( -/obj/machinery/door/unpowered/secure_NCR, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "uEH" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 6 @@ -70172,20 +70607,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) -"uIB" = ( -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 9; - pixel_y = 9 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/outdoors{ - icon_state = "1-2" - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "uIF" = ( /obj/structure/reagent_dispensers/rainwater_tank, /turf/open/indestructible/ground/inside/dirt, @@ -70217,10 +70638,18 @@ /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) "uJq" = ( -/turf/open/floor/plasteel/f13/vault_floor/floor{ - icon_state = "floordirty" +/obj/effect/turf_decal/siding/wood{ + dir = 1; + layer = 1000 }, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/generic, +/obj/machinery/light{ + dir = 4; + pixel_y = -16 + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "uJs" = ( /obj/structure/cable/outdoors{ icon_state = "2-4" @@ -70251,9 +70680,8 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "uJV" = ( -/obj/effect/spawner/lootdrop/trash, -/mob/living/simple_animal/hostile/supermutant, -/turf/open/indestructible/ground/outside/graveldirt, +/obj/structure/flora/grass/coyote/twentyeight, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "uJZ" = ( /obj/effect/decal/cleanable/dirt, @@ -70266,34 +70694,14 @@ icon_state = "horizontalinnermain2" }, /area/f13/building/powered) -"uKw" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/siding/wood, -/obj/effect/spawner/lootdrop/f13/resourcespawner, -/obj/effect/spawner/lootdrop/f13/advcrafting, -/obj/effect/spawner/lootdrop/f13/advcrafting, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/ncr) -"uKy" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "uKC" = ( /obj/machinery/door/unpowered/securedoor/khandoor, /turf/open/floor/carpet/purple, /area/f13/bar) "uKD" = ( -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/obj/structure/sign/poster/prewar/poster66, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "uKE" = ( /obj/structure/fence{ dir = 8 @@ -70433,6 +70841,15 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"uME" = ( +/obj/effect/decal/marking{ + pixel_x = -14 + }, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "uMG" = ( /obj/structure/curtain{ color = "#845f58"; @@ -70468,14 +70885,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/blue, /area/f13/building/abandoned/m) -"uMY" = ( -/obj/structure/bed/mattress{ - icon_state = "mattress4"; - pixel_x = -1; - pixel_y = -1 - }, -/turf/open/floor/f13/wood, -/area/f13/ncr) "uNd" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -70587,10 +70996,10 @@ }, /area/f13/ambientlighting/building/m) "uOD" = ( -/obj/structure/simple_door/brokenglass, -/obj/structure/barricade/wooden/planks/pregame, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/structure/table/booth, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "uOH" = ( /obj/machinery/door/unpowered/securedoor/legion, /turf/open/floor/carpet/red, @@ -70687,6 +71096,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/u) +"uQg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/booth, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) "uQj" = ( /obj/effect/decal/marking, /turf/open/indestructible/ground/outside/road, @@ -70744,12 +71158,9 @@ }, /area/f13/brotherhood) "uQU" = ( -/obj/machinery/light/small/broken{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/turf_decal/vg_decals/numbers/two, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "uQV" = ( /obj/structure/toilet{ pixel_y = 13 @@ -70836,13 +71247,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/ncr) "uSv" = ( -/obj/structure/rack, -/obj/item/clothing/head/caphat/formal/fedcover{ - pixel_x = -6 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/sign/poster/prewar/poster82, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "uSB" = ( /obj/structure/ladder/unbreakable{ height = 2; @@ -70971,11 +71378,19 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) "uTy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood_wide{ - icon_state = "wide-broken3" +/obj/structure/closet/crate/large{ + layer = 4.9; + name = "large crate wall"; + anchored = 1 }, -/area/f13/ncr) +/obj/structure/closet/crate/large{ + pixel_y = 17; + layer = 5.1; + name = "large crate wall"; + anchored = 1 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "uTO" = ( /obj/structure/decoration/rag, /turf/closed/wall/mineral/wood, @@ -71052,6 +71467,12 @@ }, /turf/open/floor/carpet/red, /area/f13/ambientlighting/building/e) +"uVi" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "uVn" = ( /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) @@ -71183,6 +71604,11 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +"uXs" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "uXt" = ( /obj/structure/lattice, /obj/structure/debris/v2, @@ -71224,6 +71650,16 @@ /obj/structure/car/rubbish1, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"uXK" = ( +/obj/structure/junk/locker, +/obj/item/storage/backpack/enclave, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "uXO" = ( /obj/effect/decal/cleanable/robot_debris/gib, /turf/open/floor/f13{ @@ -71244,6 +71680,12 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) +"uYb" = ( +/obj/item/card/id/rusted/brokenholodog/enclave, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "uYh" = ( /turf/open/indestructible/ground/outside/road, /area/f13/tunnel/southwest) @@ -71277,6 +71719,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +"uYC" = ( +/obj/structure/reagent_dispensers/barrel/four, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "uYI" = ( /obj/structure/chair/wood{ dir = 8 @@ -71319,6 +71765,10 @@ icon_state = "dirt" }, /area/f13/wasteland) +"uZz" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "uZC" = ( /obj/effect/overlay/desert_side{ dir = 1 @@ -71381,12 +71831,6 @@ icon_state = "horizontaltopbordertop2" }, /area/f13/wasteland) -"vaH" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "vaI" = ( /obj/structure/fence{ dir = 1 @@ -71395,18 +71839,15 @@ /obj/item/flag/khan, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) -"vaL" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" +"vaS" = ( +/obj/item/stack/sheet/mineral/wood, +/obj/effect/decal/cleanable/blood{ + dir = 5; + icon_state = "tracks" }, -/area/f13/wasteland) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "vaU" = ( /obj/structure/chair, /obj/effect/decal/remains/human, @@ -71625,6 +72066,16 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) +"vdw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/booth, +/obj/structure/fluff/beach_umbrella/security{ + pixel_y = 17; + layer = 50000; + pixel_x = -6 + }, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) "vdx" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 5 @@ -71801,22 +72252,29 @@ }, /area/f13/wasteland) "vfF" = ( -/obj/structure/chair/sofa/left{ - dir = 8 +/obj/structure/closet/crate/miningcar, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) -"vfL" = ( -/obj/effect/landmark/start/f13/ncrspecialist, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor4-broken" +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"vfR" = ( +/obj/structure/wreck/trash/two_barrels, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" }, /area/f13/wasteland) "vfS" = ( -/obj/structure/chair/stool, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/item/clockwork/alloy_shards{ + name = "rocks"; + desc = "Rocks. Mindblowing."; + anchored = 1 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "vfW" = ( /obj/structure/curtain{ pixel_x = 32 @@ -71824,10 +72282,14 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/bluechess, /area/f13/legioncamp) "vfX" = ( -/obj/structure/nest/nightstalker, -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/obj/machinery/smartfridge/bottlerack{ + pixel_x = 3 + }, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "vfZ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/junk/small/table, @@ -71878,11 +72340,12 @@ }, /area/f13/ambientlighting/building/o) "vgK" = ( -/obj/structure/window/fulltile/house{ - icon_state = "housewindowvertical" +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "vgM" = ( /obj/structure/window/fulltile/house{ dir = 2; @@ -72009,6 +72472,10 @@ }, /turf/open/floor/wood_common/wood_common_light, /area/f13/ncr) +"vjz" = ( +/obj/item/twohanded/spear, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "vjA" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/indestructible/ground/outside/dirt{ @@ -72029,12 +72496,6 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) -"vjP" = ( -/obj/structure/obstacle/barbedwire/end{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "vjQ" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright2bottom" @@ -72109,11 +72570,15 @@ }, /area/f13/building/lower_firetower) "vkI" = ( -/obj/structure/bed/wooden, -/obj/machinery/iv_drip, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "vkP" = ( /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/g) @@ -72133,12 +72598,24 @@ }, /area/f13/followers) "vle" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/ammo/civilian, -/turf/open/floor/plasteel/f13/vault_floor/floor{ - icon_state = "floordirty" +/obj/effect/overlay/desert_side{ + pixel_x = -15 }, -/area/f13/ambientlighting/building/p) +/obj/effect/overlay/desert_side{ + dir = 1; + pixel_x = -11 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 9; + icon_state = "outerpavement" + }, +/area/f13/wasteland) +"vlf" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "vlg" = ( /obj/machinery/workbench, /obj/item/storage/toolbox/mechanical, @@ -72202,24 +72679,9 @@ }, /area/f13/wasteland) "vmi" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/enzyme{ - pixel_x = -5; - pixel_y = 14 - }, -/obj/item/reagent_containers/food/condiment/soysauce{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/item/kitchen/knife{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/kitchen/rollingpin{ - pixel_y = 1 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "vmp" = ( /obj/structure/simple_door/house, /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, @@ -72233,6 +72695,10 @@ "vmH" = ( /turf/open/indestructible/ground/outside/sidewalkdirt, /area/f13/wasteland/followers) +"vmR" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "vmU" = ( /obj/effect/decal/cleanable/robot_debris, /turf/open/indestructible/ground/outside/sidewalk{ @@ -72279,11 +72745,22 @@ /turf/open/floor/f13, /area/f13/ambientlighting/building/y) "vnO" = ( -/mob/living/simple_animal/cow/brahmin, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow5" +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 }, -/area/f13/wasteland) +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 48; + pixel_x = -16 + }, +/obj/effect/decal/cleanable/blood, +/obj/structure/closet/crate/wicker, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "vnW" = ( /obj/structure/rack/shelf_metal, /obj/item/multitool, @@ -72303,12 +72780,6 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/f) -"voo" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/ncr) "voA" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/raider/sulphite, @@ -72339,16 +72810,6 @@ /obj/structure/dresser, /turf/open/floor/wood_common, /area/f13/building/abandoned/z) -"voS" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/obj/structure/chair/bench{ - dir = 8; - pixel_x = 14 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "voU" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/desert, @@ -72368,11 +72829,9 @@ }, /area/f13/brotherhood) "vpp" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/item/reagent_containers/pill/healingpowder, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "vps" = ( /obj/structure/barricade/tentleatheredge{ dir = 8 @@ -72429,9 +72888,10 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "vqD" = ( -/obj/effect/spawner/lootdrop/f13/junkspawners, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/item/reagent_containers/pill/patch/healpoultice, +/obj/effect/decal/cleanable/blood, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "vqS" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -72456,9 +72916,10 @@ }, /area/f13/building/powered) "vri" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/plasteel/f13/stone/rugged, -/area/f13/building/abandoned/g) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "vrm" = ( /obj/structure/beebox, /obj/effect/turf_decal/weather/dirt{ @@ -72607,22 +73068,18 @@ /obj/structure/flora/ausbushes/reedbush, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +"vtA" = ( +/obj/structure/sign/poster/prewar/poster94, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "vtI" = ( /obj/structure/barricade/wooden/strong, /turf/closed/wall/r_wall/rust, /area/f13/wasteland/town) -"vtQ" = ( -/obj/machinery/light/small{ - dir = 4; - light_color = "#ff4747" - }, -/obj/structure/sign/poster/contraband/free_tonto{ - pixel_x = 32 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) +"vtL" = ( +/obj/structure/flora/grass/coyote/twentysix, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "vtS" = ( /obj/structure/reagent_dispensers/compostbin, /turf/open/indestructible/ground/outside/desert, @@ -72682,15 +73139,13 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "vur" = ( -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -12 - }, /obj/effect/turf_decal/weather/dirt{ dir = 8 }, /obj/effect/turf_decal/weather/dirt, +/obj/structure/cross, /turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/area/f13/caves) "vut" = ( /obj/structure/flora/tree/oak_three, /obj/structure/fence/corner/wooden{ @@ -72714,6 +73169,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"vuy" = ( +/obj/structure/sign/poster/prewar/vault_tec, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "vuz" = ( /obj/machinery/vending/cigarette{ default_price = 0; @@ -72875,9 +73334,12 @@ }, /area/f13/wasteland) "vwC" = ( -/obj/effect/landmark/start/f13/ncrspecialist, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/area/f13/caves) "vwD" = ( /obj/structure/cable/outdoors{ icon_state = "1-2" @@ -72905,11 +73367,10 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "vxq" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood{ - icon_state = "housewood3-broken" - }, -/area/f13/ambientlighting/building/h) +/obj/structure/table/wood/junk, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "vxu" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -72994,12 +73455,13 @@ }, /area/f13/ambientlighting/building/i) "vyT" = ( -/obj/structure/ore_box, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6"; + pixel_x = -18; + pixel_y = 15 }, /turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/area/f13/caves) "vzn" = ( /obj/structure/rack/shelf_metal, /obj/item/flashlight/flare/torch, @@ -73116,14 +73578,23 @@ /obj/structure/table/booth, /turf/open/floor/carpet/purple, /area/f13/bar) +"vAN" = ( +/obj/item/kirbyplants/dead{ + desc = "A mummified potted plant."; + name = "very dead potted plant"; + pixel_x = -1; + pixel_y = 11 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "vAO" = ( /turf/open/floor/wood_common/wood_common_light, /area/maintenance/bar) "vAW" = ( -/obj/structure/table/booth, -/obj/effect/decal/cleanable/glass, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/area/f13/ambientlighting/building/m) "vBa" = ( /turf/open/indestructible/ground/outside/ruins{ dir = 4; @@ -73217,10 +73688,19 @@ /area/f13/wasteland) "vCm" = ( /obj/effect/turf_decal/weather/dirt{ - dir = 8 + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -13 }, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) +/area/f13/caves) "vCA" = ( /obj/structure/table/reinforced, /obj/item/storage/box/emptysandbags, @@ -73349,7 +73829,6 @@ /area/f13/building/abandoned/g) "vEs" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/trash, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, @@ -73430,8 +73909,8 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) "vFU" = ( -/turf/closed/wall/r_wall/rust, -/area/f13/caves) +/turf/closed/mineral/random/high_chance, +/area/f13/wasteland) "vFW" = ( /obj/machinery/seed_extractor, /obj/effect/decal/cleanable/dirt/dust, @@ -73473,6 +73952,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +"vGg" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "vGi" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4"; @@ -73483,6 +73967,13 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"vGk" = ( +/obj/structure/flora/tree/cactus, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) "vGp" = ( /obj/structure/window/fulltile/ruins, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -73506,10 +73997,10 @@ }, /area/f13/ambientlighting/building/p) "vGz" = ( -/turf/open/floor/f13/wood{ - icon_state = "oakfloor3-broken" - }, -/area/f13/wasteland) +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/desert, +/area/f13/caves) "vGG" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/waste, @@ -73606,16 +74097,9 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "vIm" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/obj/machinery/hydroponics/soil{ - mutmod = 0; - name = "ancient fertile soil"; - yieldmod = 1.3 - }, -/turf/open/indestructible/ground/inside/dirt, -/area/f13/wasteland) +/obj/structure/grille, +/turf/open/indestructible/ground/outside/water/running, +/area/f13/caves) "vIu" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/inside/dirt, @@ -73693,7 +74177,6 @@ anchored = 1 }, /obj/structure/tires/five, -/obj/effect/spawner/lootdrop/trash, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "vJF" = ( @@ -73753,15 +74236,6 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"vKH" = ( -/obj/structure/fireplace{ - dir = 4; - pixel_x = -7 - }, -/turf/open/indestructible/ground/outside/ruins{ - name = "cobblestone floor" - }, -/area/f13/ncr) "vKM" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3, @@ -73870,17 +74344,6 @@ icon_state = "dark" }, /area/f13/brotherhood) -"vMM" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22"; - pixel_x = -9; - pixel_y = 20 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" - }, -/area/f13/ncr) "vMO" = ( /obj/structure/chair/bench, /turf/open/floor/f13/wood, @@ -73902,6 +74365,13 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"vNq" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 8 + }, +/area/f13/wasteland) "vNr" = ( /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -73972,13 +74442,15 @@ }, /area/f13/caves) "vOh" = ( -/obj/structure/chair/stool, -/obj/machinery/light{ - dir = 1; - pixel_x = 16 +/obj/structure/table/booth, +/obj/item/crafting/coffee_pot{ + pixel_x = 8; + pixel_y = 6 }, +/obj/item/reagent_containers/food/drinks/bottle/instacoffee, +/obj/effect/decal/cleanable/glass, /turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/area/f13/ambientlighting/building/m) "vOi" = ( /obj/structure/fence/wooden{ dir = 1 @@ -74211,6 +74683,13 @@ /obj/structure/chair/folding, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"vSr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "vSI" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" @@ -74242,9 +74721,11 @@ }, /area/f13/ambientlighting/building/s) "vSX" = ( -/obj/effect/turf_decal/weather/snow/corner, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/item/storage/belt/army/assault/legion, +/obj/effect/decal/cleanable/blood/gibs/human/torso, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "vTo" = ( /obj/structure/table/wood, /obj/item/smelling_salts, @@ -74271,12 +74752,6 @@ name = "dirty floor" }, /area/f13/brotherhood) -"vTF" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/f13/seedspawner, -/obj/effect/spawner/lootdrop/f13/seedspawner, -/turf/open/floor/plating/dirt, -/area/f13/ncr) "vTH" = ( /obj/structure/simple_door/interior, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, @@ -74433,6 +74908,15 @@ /obj/machinery/light/floor, /turf/open/floor/plating/rust, /area/f13/building/powered) +"vXj" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded"; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop3" + }, +/area/f13/wasteland) "vXl" = ( /obj/structure/barricade/wooden/strong, /obj/structure/barricade/wooden/planks, @@ -74520,14 +75004,11 @@ /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "vZc" = ( -/obj/item/clothing/under/lawyer/female{ - pixel_x = -5; - pixel_y = -5 +/obj/item/storage/trash_stack{ + pixel_y = 17 }, -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "vZd" = ( /obj/structure/table/wood, /obj/machinery/microwave, @@ -74581,12 +75062,10 @@ /obj/effect/turf_decal/weather/dirt{ dir = 9 }, -/obj/machinery/power/apc/fusebox/north, -/obj/structure/cable/outdoors{ - icon_state = "0-2" - }, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/radscorpion/black, /turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) +/area/f13/caves) "waj" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -74599,11 +75078,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) -"was" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/f13/foodspawner, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "waA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -74666,10 +75140,6 @@ /obj/structure/barricade/wooden/planks, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) -"wby" = ( -/obj/effect/landmark/start/f13/ncrconscript, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "wbz" = ( /obj/structure/fence{ dir = 8 @@ -74778,6 +75248,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) +"wde" = ( +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "wdq" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 10 @@ -74800,20 +75274,9 @@ }, /area/f13/ambientlighting/building/b) "wdx" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/item/reagent_containers/glass/bucket{ - pixel_x = -12; - pixel_y = 17 - }, -/obj/structure/decoration/rag{ - icon_state = "flag_ncr"; - name = "NCR banner"; - pixel_y = 32 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/structure/flora/twig4, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "wdG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood/fancy/red, @@ -74856,11 +75319,21 @@ /obj/structure/table/wood, /turf/open/indestructible/ground/inside/dirt, /area/f13/building/abandoned/q) +"wep" = ( +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" + }, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "wer" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/simple_door/bunker, -/turf/open/floor/plating/rust, -/area/f13/caves) +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood/club, +/obj/item/clothing/suit/armor/outfit/vest, +/obj/item/clothing/suit/armor/outfit/vest, +/obj/item/clothing/suit/armor/outfit/vest, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "wes" = ( /obj/machinery/door/poddoor/shutters{ id = "hospitalgarage1"; @@ -74895,10 +75368,14 @@ }, /area/f13/wasteland) "weQ" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/rust, -/area/f13/caves) +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirt" + }, +/area/f13/wasteland) "weR" = ( /obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt{ @@ -75073,17 +75550,26 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) "wid" = ( -/obj/structure/flora/tree/tall, -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 4; - light_color = "#f4e3b0" +/obj/effect/decal/cleanable/generic, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, -/turf/open/indestructible/ground/outside/snow, /area/f13/wasteland) "wie" = ( /obj/structure/closet/locker, /turf/open/floor/plasteel/vault, /area/f13/building/abandoned/m) +"wig" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/structure/car/rubbish3, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "win" = ( /obj/item/trash/f13/sugarbombs, /turf/open/indestructible/ground/outside/dirt, @@ -75099,17 +75585,6 @@ smooth = 1 }, /area/f13/ambientlighting/building/o) -"wiE" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/obj/effect/turf_decal/weather/snow/corner, -/obj/structure/obstacle/barbedwire/end{ - dir = 1; - pixel_x = 5 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "wiN" = ( /obj/structure/sink/greyscale{ pixel_y = 20 @@ -75164,11 +75639,10 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "wjo" = ( -/obj/effect/overlay/desert/sonora/edge/corner{ - dir = 8 +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outermaincornerouter" }, -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "wjs" = ( /turf/open/indestructible/ground/outside/road{ @@ -75205,9 +75679,9 @@ }, /area/f13/building/abandoned/p) "wjC" = ( -/obj/structure/barricade/wooden, -/turf/closed/wall/f13/wood, -/area/f13/ncr) +/obj/machinery/workbench/advanced, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "wjD" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /obj/effect/decal/cleanable/dirt, @@ -75281,11 +75755,14 @@ }, /area/f13/ambientlighting/building/i) "wkQ" = ( -/obj/structure/stairs/south{ - color = "#A47449" +/obj/effect/turf_decal/weather/dirt{ + dir = 10 }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "wkX" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowvertical" @@ -75410,10 +75887,6 @@ icon_state = "outercorner" }, /area/f13/wasteland) -"wmc" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "wmi" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -75423,15 +75896,10 @@ /turf/open/floor/carpet, /area/f13/ambientlighting/building/d) "wmm" = ( -/obj/structure/stalkeregg, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) +/area/f13/ambientlighting/building/m) "wmn" = ( /obj/structure/rack/large/shelf_rust, /obj/effect/spawner/lootdrop/ammo/fiftypercent, @@ -75474,6 +75942,10 @@ /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"wnm" = ( +/obj/effect/decal/cleanable/shreds, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "wnn" = ( /obj/item/storage/trash_stack, /obj/effect/decal/cleanable/dirt{ @@ -75502,12 +75974,14 @@ /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/clinic) "wnP" = ( -/obj/structure/rack, -/obj/item/clothing/head/nun_hood, -/obj/item/clothing/suit/chaplain/nun, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/fence/corner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 7; + icon_state = "outerpavement" + }, +/area/f13/wasteland) "wnU" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -75534,10 +76008,6 @@ /obj/structure/sign/warning/nosmoking/circle, /turf/closed/wall/f13/wood/house, /area/maintenance/bar) -"wob" = ( -/obj/structure/simple_door/wood, -/turf/open/floor/f13/wood, -/area/f13/ncr) "wom" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain2top" @@ -75646,24 +76116,14 @@ }, /area/f13/ambientlighting/building/m) "wpV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/grown/log{ - pixel_x = -4; - pixel_y = -1 - }, -/obj/item/grown/log{ - pixel_x = -1; - pixel_y = 3 - }, -/obj/item/grown/log{ - pixel_x = 5; - pixel_y = -2 +/obj/structure/cable/outdoors{ + icon_state = "4-8" }, -/obj/structure/sign/poster/ncr/democracy{ - pixel_y = -32 +/obj/structure/sign/brotherhoodcardboard, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/area/f13/wasteland) "wqa" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -75733,6 +76193,16 @@ /obj/item/electropack/shockcollar/shimsusa_shackles, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"wqV" = ( +/obj/machinery/smartfridge/bottlerack{ + pixel_x = -3 + }, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "wrc" = ( /obj/structure/fence/corner{ dir = 4; @@ -75845,18 +76315,9 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) "wsn" = ( -/obj/structure/rack, -/obj/item/clothing/under/pants/jeans{ - icon_state = "blackpants"; - pixel_y = 10 - }, -/obj/item/clothing/under/pants/mustangjeans, -/obj/item/clothing/under/pants/youngfolksjeans{ - pixel_y = -10 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/table, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "wsp" = ( /obj/structure/curtain{ color = "#5c131b"; @@ -75931,6 +76392,11 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/indestructible/ground/outside/grass, /area/f13/ambientlighting/building/c) +"wsX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "wta" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/dirt{ @@ -75950,6 +76416,10 @@ /obj/structure/legion_extractor, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"wtn" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "wtu" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 9 @@ -76039,6 +76509,10 @@ /obj/structure/table/wood/bar, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"wuE" = ( +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "wuM" = ( /obj/structure/simple_door/house, /turf/open/floor/f13{ @@ -76165,11 +76639,13 @@ }, /area/f13/ambientlighting/building/b) "wwj" = ( -/mob/living/simple_animal/hostile/radscorpion/blue, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/booth, +/obj/structure/fluff/beach_umbrella/security{ + pixel_y = 22 }, -/area/f13/caves) +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) "wwx" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -76198,13 +76674,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +"wwK" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "wwR" = ( /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/j) -"wwS" = ( -/obj/effect/turf_decal/weather/snow/corner, -/turf/open/floor/plating/dirt, -/area/f13/wasteland) "wxc" = ( /obj/structure/flora/wasteplant/wild_xander, /turf/open/indestructible/ground/outside/dirt{ @@ -76472,22 +76949,6 @@ "wAl" = ( /turf/open/floor/f13/wood, /area/f13/building/abandoned/m) -"wAn" = ( -/obj/structure/table/reinforced, -/obj/effect/spawner/lootdrop/f13/resourcespawner, -/obj/effect/spawner/lootdrop/f13/resourcespawner, -/obj/machinery/light/small{ - dir = 4; - light_color = "#ff4747" - }, -/obj/structure/sign/poster/prewar/poster94{ - icon_state = "poster82"; - pixel_x = 32 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" - }, -/area/f13/ncr) "wAr" = ( /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, /obj/structure/table/reinforced, @@ -76517,19 +76978,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) -"wAK" = ( -/obj/item/reagent_containers/glass/bucket/wood{ - pixel_y = 14; - pixel_x = 8 - }, -/obj/effect/decal/cleanable/flour, -/obj/effect/decal/cleanable/greenglow, -/obj/item/reagent_containers/glass/rag{ - pixel_x = -6; - pixel_y = 8 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "wAU" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/dirt{ @@ -76636,15 +77084,18 @@ /turf/closed/mineral/random, /area/f13/wasteland) "wCM" = ( -/obj/structure/flora/twig{ - pixel_y = 23; - pixel_x = -8 - }, -/obj/structure/flora/grass/both{ - icon_state = "snowgrass_esw" +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/trash_stack{ + icon_state = "trash_3" }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +"wCT" = ( +/obj/item/storage/belt/military/alt, +/obj/item/storage/belt/military/alt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "wCV" = ( /obj/structure/fence/pole_t, /obj/structure/railing{ @@ -76737,16 +77188,6 @@ icon_state = "horizontaloutermain0" }, /area/f13/casino) -"wDP" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/structure/chair/bench{ - dir = 4; - pixel_x = -16 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "wDT" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/mineral/wasteland_vendor/advcomponents, @@ -76781,8 +77222,15 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "wEh" = ( -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/marking{ + icon_state = "dottedvertical"; + pixel_x = -14 + }, +/obj/structure/car/rubbish3, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "wEq" = ( /obj/structure/reagent_dispensers/barrel/three, /turf/open/indestructible/ground/outside/graveldirt, @@ -76816,12 +77264,6 @@ icon_state = "bluedirtychess2" }, /area/f13/brotherhood) -"wEO" = ( -/obj/structure/flora/stump, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow5" - }, -/area/f13/wasteland) "wEU" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /obj/structure/railing{ @@ -76829,6 +77271,16 @@ }, /turf/open/floor/wood_common, /area/maintenance/bar) +"wFa" = ( +/obj/structure/rack/shelf_metal, +/obj/item/clothing/mask/gas/enclave, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "wFd" = ( /obj/structure/fence/wooden{ dir = 4; @@ -76856,6 +77308,17 @@ icon_state = "dirt" }, /area/f13/wasteland) +"wFs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/human, +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" + }, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "wFz" = ( /obj/structure/reagent_dispensers/barrel/explosive, /turf/open/indestructible/ground/outside/dirt{ @@ -76930,12 +77393,14 @@ /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/powered) "wGw" = ( -/obj/structure/rack, -/obj/item/clothing/head/rice_hat, -/obj/item/clothing/under/geisha, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerborder" + }, +/area/f13/wasteland) "wGF" = ( /obj/structure/barricade/tentclothcorner{ color = "#7c0A02"; @@ -76971,17 +77436,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, /area/f13/legioncamp) +"wHc" = ( +/obj/structure/chair/stool{ + dir = 8; + icon_state = "bench" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "wHd" = ( /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/low, /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) -"wHk" = ( -/obj/structure/decoration/rag{ - icon_state = "skin"; - pixel_y = 2 - }, -/turf/closed/wall/f13/wood, -/area/f13/ncr) "wHl" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" @@ -77004,15 +77469,6 @@ icon_state = "horizontalinnermainleft" }, /area/f13/wasteland) -"wHC" = ( -/obj/structure/wreck/trash/three_barrels{ - pixel_y = 9; - pixel_x = 9 - }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow3" - }, -/area/f13/wasteland) "wHH" = ( /obj/machinery/smartfridge/bottlerack/lootshelf, /turf/open/floor/f13{ @@ -77087,9 +77543,9 @@ /turf/open/floor/wood_mosaic, /area/f13/building/abandoned/x) "wIC" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/floor/f13/wood, -/area/f13/building/abandoned/b) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "wIN" = ( /obj/machinery/hydroponics/soil, /turf/open/indestructible/ground/outside/dirt, @@ -77131,7 +77587,7 @@ }, /area/f13/ambientlighting/building/w) "wJq" = ( -/obj/effect/turf_decal/vg_decals/numbers/five, +/obj/effect/turf_decal/vg_decals/numbers/six, /turf/closed/wall/mineral/brick, /area/f13/ncr) "wJw" = ( @@ -77179,13 +77635,6 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/y) -"wKv" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/structure/junk/small, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "wKA" = ( /obj/machinery/light/small{ dir = 8 @@ -77237,6 +77686,11 @@ name = "rusted floor" }, /area/f13/building/powered) +"wLE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) "wLL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc/fusebox/west, @@ -77421,17 +77875,8 @@ }, /area/f13/ambientlighting/building/y) "wOi" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 4 - }, /turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/area/f13/caves) "wOB" = ( /obj/structure/flora/tree/oak_one, /turf/open/indestructible/ground/outside/grass, @@ -77477,6 +77922,16 @@ /obj/structure/window/fulltile/house, /turf/open/floor/plating/rust, /area/f13/brotherhood) +"wPz" = ( +/obj/structure/chair/stool{ + dir = 8; + icon_state = "bench" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "wPB" = ( /obj/structure/closet/crate/large, /obj/item/clothing/head/helmet/f13/legion/recruit, @@ -77503,14 +77958,6 @@ /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) -"wPK" = ( -/obj/effect/decal/cleanable/blood{ - plane = -14; - layer = 3.7; - icon_state = "drip4" - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "wPL" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/indestructible/ground/outside/grass/dirtpath{ @@ -77543,24 +77990,6 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) -"wQl" = ( -/obj/structure/closet/anchored, -/obj/item/clothing/shoes/f13/brownie, -/obj/item/clothing/shoes/f13/brownie, -/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/item/clothing/shoes/f13/brownie, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) "wQp" = ( /obj/structure/car/rubbish4{ desc = "A rusty Pre-War Fire Engine carcass.. or at least you think that's what this is.
This carcass is damaged beyond repair."; @@ -77577,10 +78006,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/maintenance/bar) -"wQF" = ( -/obj/machinery/gear_painter, -/turf/open/floor/wood_wide, -/area/f13/ncr) "wQI" = ( /obj/structure/debris/v2, /turf/open/floor/f13{ @@ -77746,13 +78171,18 @@ }, /area/f13/wasteland) "wSu" = ( -/obj/structure/flora/branch, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 +/obj/effect/turf_decal/weather/dirt{ + dir = 9 }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" +/obj/item/electropack/shockcollar/explosive, +/obj/item/paper/crumpled{ + pixel_y = 33; + name = "tied crude paper"; + desc = "A piece of paper with a hole near the top, tied to the wooden fence using a leather strip."; + info = "I can't believe it! I can't believe my luck! My collar didn't go off! I'm scot free, the fuckers already left! If you're reading this, my name is Noh Effert. Do NOT go in this place! We dug too deep, horrible things lurk past the large crate wall."; + anchored = 1 }, +/turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "wSB" = ( /obj/structure/car/rubbish1, @@ -77767,6 +78197,13 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/m) +"wSO" = ( +/turf/open/floor/plasteel/stairs{ + barefootstep = "woodbarefoot"; + color = "#A47449"; + footstep = "wood" + }, +/area/f13/caves) "wSQ" = ( /obj/structure/obstacle/barbedwire{ dir = 4 @@ -77852,13 +78289,9 @@ }, /area/f13/brotherhood) "wUg" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/window/fulltile/house{ - dir = 2; - icon_state = "housewindowbrokenvertical" - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/greenglow, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "wUi" = ( /obj/effect/decal/fakelattice, /obj/structure/barricade/wooden, @@ -78015,12 +78448,9 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "wWn" = ( -/obj/structure/window/fulltile/house{ - dir = 2; - icon_state = "housewindowbroken" - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/turf_decal/vg_decals/numbers/zero, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "wWy" = ( /obj/structure/chair{ dir = 8 @@ -78032,9 +78462,9 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) "wWz" = ( -/obj/structure/flora/tree/pine, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/machinery/workbench/forge, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "wWC" = ( /obj/structure/table/booth, /obj/effect/decal/cleanable/dirt, @@ -78087,6 +78517,11 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/o) +"wXk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/human, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "wXm" = ( /mob/living/simple_animal/hostile/raider/ranged/boss, /obj/effect/decal/cleanable/dirt, @@ -78098,13 +78533,12 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "wXr" = ( -/obj/structure/reagent_dispensers/rainwater_tank, -/obj/structure/grille/broken, -/obj/item/flag/ncr{ - pixel_y = 22 +/obj/structure/flora/wasteplant/wild_fungus, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "wXs" = ( /obj/structure/table/reinforced, /turf/open/indestructible/ground/outside/ruins, @@ -78140,12 +78574,6 @@ icon_state = "dirt" }, /area/f13/wasteland/legion) -"wYD" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) "wYM" = ( /obj/structure/window/fulltile/house{ dir = 2 @@ -78218,9 +78646,9 @@ /turf/open/floor/wood_common, /area/f13/clinic) "xae" = ( -/mob/living/simple_animal/hostile/stalker, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) +/obj/structure/flora/grass/coyote/twentytwo, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "xag" = ( /mob/living/simple_animal/hostile/ghoul/reaver, /obj/effect/decal/cleanable/dirt, @@ -78277,9 +78705,9 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/q) "xaK" = ( -/obj/structure/window/fulltile/house, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "xaT" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6"; @@ -78332,6 +78760,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/blue, /area/f13/building/abandoned/m) +"xbC" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "xbN" = ( /obj/structure/barricade/wooden/strong, /turf/open/floor/f13{ @@ -78407,11 +78839,11 @@ }, /area/f13/wasteland) "xdg" = ( -/obj/item/clothing/head/f13/enclave, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/obj/effect/turf_decal/weather/dirt{ + dir = 1 }, -/area/f13/caves) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "xdm" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/trash_stack, @@ -78502,6 +78934,11 @@ icon_state = "bluedirtychess2" }, /area/f13/brotherhood) +"xew" = ( +/turf/open/floor/f13/wood{ + icon_state = "housewood3-broken" + }, +/area/f13/ambientlighting/building/m) "xeI" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/road, @@ -78571,11 +79008,16 @@ }, /area/f13/wasteland/legion) "xfJ" = ( -/obj/item/storage/trash_stack{ - icon_state = "trash_3" +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge{ + pixel_y = -14; + layer = 5 + }, +/obj/structure/railing/wood/underlayer{ + layer = 6 }, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow3" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" }, /area/f13/wasteland) "xfK" = ( @@ -78638,6 +79080,13 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland/city) +"xgL" = ( +/obj/structure/table/snooker{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "xgP" = ( /obj/item/gun/ballistic/automatic/toy/pistol/riot, /obj/effect/decal/cleanable/dirt{ @@ -78671,10 +79120,6 @@ /obj/structure/flora/tree/jungle, /turf/open/indestructible/ground/outside/grass, /area/f13/ambientlighting/building/c) -"xhh" = ( -/obj/effect/landmark/start/f13/ncrcolonel, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "xhl" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/grown/pungafruit, @@ -78705,6 +79150,15 @@ /obj/effect/spawner/lootdrop/toolsbasic, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"xhy" = ( +/obj/structure/statue/petrified, +/obj/item/clothing/under/dress/wedding, +/obj/item/clothing/head/helmet/f13/vaquerohat{ + pixel_y = 13 + }, +/obj/item/clothing/accessory/waistcoat, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "xhz" = ( /obj/machinery/light{ dir = 8 @@ -78764,12 +79218,6 @@ }, /turf/open/indestructible/ground/outside/dirthole, /area/f13/wasteland) -"xiF" = ( -/obj/structure/stairs/west{ - color = "#A47449" - }, -/turf/open/indestructible/ground/outside/desert, -/area/f13/wasteland) "xiG" = ( /obj/structure/chair/bench{ dir = 1 @@ -78840,6 +79288,12 @@ /obj/item/clothing/under/pants/f13/ghoul, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +"xjI" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul/reaver, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "xjJ" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" @@ -78888,6 +79342,13 @@ smooth = 1 }, /area/f13/building/powered) +"xjZ" = ( +/obj/structure/wreck/trash/machinepiletwo, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "xkb" = ( /obj/structure/fluff/railing{ dir = 1 @@ -78954,17 +79415,6 @@ dir = 4 }, /area/f13/wasteland) -"xln" = ( -/obj/structure/flora/grass/wasteland{ - layer = 4.2; - pixel_x = 6; - pixel_y = 9 - }, -/obj/effect/spawner/lootdrop/f13/junkspawners, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow5" - }, -/area/f13/wasteland) "xlp" = ( /obj/structure/grille/ratvar{ name = "radio antenna" @@ -79088,11 +79538,9 @@ }, /area/f13/building/powered) "xmD" = ( -/obj/structure/simple_door/tent, -/turf/open/indestructible/ground/outside/snow{ - icon_state = "snow_dug" - }, -/area/f13/ncr) +/obj/item/twohanded/legionaxe, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "xmR" = ( /obj/structure/toilet{ pixel_y = 11 @@ -79144,10 +79592,13 @@ }, /area/f13/ambientlighting/building/u) "xnp" = ( -/obj/machinery/vending/clothing, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/table/snooker{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "xnG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack/large/shelf_rust, @@ -79158,6 +79609,11 @@ name = "dirty floor" }, /area/f13/building/powered) +"xnM" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "xnV" = ( /obj/structure/barricade/wooden, /turf/closed/mineral/random/low_chance, @@ -79174,23 +79630,11 @@ /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) "xom" = ( -/obj/structure/rack, -/obj/item/clothing/head/beret/black{ - pixel_x = 4; - pixel_y = 7 - }, -/obj/item/clothing/head/beanie/black{ - pixel_x = -5; - pixel_y = -10 - }, -/obj/item/clothing/head/f13/gambler, -/obj/item/clothing/head/f13/hairband{ - pixel_x = 7; - pixel_y = -7 - }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/table/booth, +/obj/item/dice/d100, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "xoA" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -79281,17 +79725,11 @@ /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) "xpW" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, -/obj/item/cigbutt{ - pixel_x = -6 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) +/obj/structure/table/wood/club, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "xpX" = ( /obj/machinery/door/airlock/engineering, /obj/effect/decal/cleanable/dirt, @@ -79377,6 +79815,20 @@ icon_state = "bluedirtychess2" }, /area/f13/brotherhood) +"xri" = ( +/obj/structure/chair/stool{ + dir = 8; + icon_state = "bench" + }, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +"xrs" = ( +/obj/structure/chair/stool, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "xrt" = ( /obj/machinery/light/fo13colored/Red{ dir = 1 @@ -79533,12 +79985,14 @@ }, /area/f13/building/abandoned/h) "xty" = ( -/obj/structure/car/rubbish3, -/turf/open/indestructible/ground/outside/dirt{ - dir = 1; - icon_state = "dirt" +/obj/structure/chair/comfy{ + dir = 4; + pixel_x = -12 }, -/area/f13/wasteland) +/turf/open/floor/wood_common{ + icon_state = "common-broken3" + }, +/area/f13/ambientlighting/building/m) "xtD" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -79587,7 +80041,6 @@ /obj/effect/decal/cleanable/dirt{ color = "#363636" }, -/obj/effect/spawner/lootdrop/trash, /turf/open/floor/carpet/purple, /area/f13/bar) "xut" = ( @@ -79599,10 +80052,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common/wood_common_light, /area/maintenance/bar) -"xuQ" = ( -/obj/structure/flora/grass/wasteland, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) "xvb" = ( /obj/structure/barricade/bars{ max_integrity = 800; @@ -79621,11 +80070,9 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) "xvq" = ( -/obj/structure/rack, -/obj/item/clothing/under/f13/greendress, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/reagent_dispensers/fueltank, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "xvu" = ( /obj/structure/bodycontainer/morgue, /obj/machinery/light/small{ @@ -79651,25 +80098,6 @@ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/f) -"xvT" = ( -/obj/structure/table/wood, -/obj/item/stack/medical/bruise_pack{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/item/reagent_containers/blood/radaway{ - pixel_x = 7; - pixel_y = 12 - }, -/obj/item/reagent_containers/blood/radaway{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "xwa" = ( /obj/structure/chair/sofa/right{ dir = 1 @@ -79806,6 +80234,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +"xxW" = ( +/obj/item/chair/wood/modern, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "xye" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -79838,7 +80272,6 @@ /obj/effect/decal/cleanable/dirt{ color = "000000" }, -/obj/effect/spawner/lootdrop/trash, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) "xys" = ( @@ -79872,14 +80305,6 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating/rust, /area/f13/building/powered) -"xyS" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ncr) "xyU" = ( /obj/structure/rack, /obj/item/stack/sheet/metal/ten, @@ -79985,13 +80410,20 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"xAG" = ( +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "xAJ" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 +/obj/structure/cargocrate, +/obj/structure/sign/poster/ncr/keep_to_myself{ + desc = "The man. The myth. The unknown NCR Corporal who's photo was taken years ago and is still used today in various NCR camps to encourage proper behavior."; + name = "Satisfactory NCR Poster"; + layer = 100 }, -/obj/effect/landmark/start/f13/ncrheavytrooper, -/turf/open/floor/f13/wood{ - icon_state = "oakfloor1" +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" }, /area/f13/wasteland) "xBd" = ( @@ -80113,6 +80545,13 @@ "xCm" = ( /turf/closed/wall/f13/wood/house, /area/f13/followers) +"xCw" = ( +/obj/machinery/door/locked/easy/trapped, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "xCx" = ( /obj/structure/rack/shelf_metal, /obj/item/storage/belt/utility/full/engi, @@ -80158,6 +80597,12 @@ icon_state = "tunnelrusty" }, /area/f13/building/powered) +"xDd" = ( +/obj/structure/table/booth, +/turf/open/floor/f13/wood{ + icon_state = "housewood1-broken" + }, +/area/f13/ambientlighting/building/m) "xDh" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/dirt{ @@ -80238,24 +80683,6 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/caves) -"xDO" = ( -/obj/item/storage/firstaid/brute{ - pixel_x = 9; - pixel_y = 16 - }, -/obj/item/storage/firstaid/fire{ - pixel_x = 9; - pixel_y = 7 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/greenglow, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken3" - }, -/area/f13/ncr) "xDP" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/greenglow, @@ -80286,6 +80713,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"xEs" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/ambientlighting/building/m) "xEu" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalbottombordertopleft" @@ -80354,6 +80787,12 @@ "xFH" = ( /turf/open/indestructible/ground/outside/desert, /area/f13/underground/cave) +"xFO" = ( +/obj/effect/decal/remains/human, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "xFU" = ( /obj/effect/landmark/start/f13/villager, /turf/open/indestructible/ground/outside/dirt, @@ -80366,20 +80805,14 @@ }, /area/f13/building/powered) "xGn" = ( -/obj/structure/chair/office/dark, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/vomit/old{ - pixel_x = 6; - pixel_y = -10 - }, -/obj/effect/landmark/start/f13/ncrcombatmedic, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken2" - }, -/area/f13/ncr) +/obj/structure/rack/large/shelf_rust, +/obj/item/stack/sheet/cloth/thirty, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth, +/obj/item/stack/sheet/cloth, +/obj/item/stack/sheet/cloth/three, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "xGx" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt, @@ -80395,13 +80828,20 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) "xGA" = ( -/obj/structure/campfire/stove{ - pixel_y = 14 +/obj/structure/rack/large/shelf_rust{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +/obj/item/clothing/under/shorts/jeanbshorts, +/obj/item/clothing/under/shorts/jeanbshorts, +/obj/item/clothing/under/shorts/jeanbshorts, +/obj/item/clothing/suit/suspenders{ + pixel_y = 6 + }, +/obj/item/clothing/suit/suspenders{ + pixel_y = 6 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "xGD" = ( /obj/structure/table/wood, /obj/item/lock, @@ -80485,12 +80925,17 @@ }, /area/f13/brotherhood) "xHX" = ( -/obj/structure/window/fulltile/wood, -/obj/structure/curtain{ - color = "#808080" +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 }, -/turf/open/floor/f13/wood, -/area/f13/ncr) +/obj/structure/car/rubbish3{ + icon_state = "car_rubish2" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "xIf" = ( /obj/machinery/porta_turret/f13/turret_22lr/burstfire/raider, /turf/open/indestructible/ground/outside/desert, @@ -80522,12 +80967,16 @@ }, /area/f13/ambientlighting/building/b) "xIz" = ( -/obj/effect/turf_decal/siding/wood, -/obj/structure/fluff/rug/rug_rubber, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ - name = "rusted floor" +/obj/effect/decal/cleanable/blood{ + icon_state = "gib1"; + pixel_y = -6 }, -/area/f13/ncr) +/obj/effect/gibspawner/human/bodypartless, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirt" + }, +/area/f13/wasteland) "xIC" = ( /obj/effect/turf_decal/delivery/red, /obj/effect/decal/cleanable/dirt/dust, @@ -80577,15 +81026,6 @@ icon_state = "verticalinnermain2" }, /area/f13/wasteland) -"xJn" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/wasteland) "xJB" = ( /obj/structure/obstacle/jammed_door, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -80771,6 +81211,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/purple, /area/f13/bar) +"xMY" = ( +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common{ + icon_state = "common-broken3" + }, +/area/f13/ambientlighting/building/m) "xNb" = ( /obj/structure/window/fulltile/house{ dir = 2; @@ -80797,6 +81244,12 @@ /obj/item/twohanded/sledgehammer/simple, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"xNB" = ( +/obj/structure/wreck/trash/autoshaft, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "xNG" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -80820,16 +81273,9 @@ }, /area/f13/wasteland) "xNV" = ( -/obj/structure/rack, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/glass/fifty, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, -/area/f13/wasteland) +/area/f13/ambientlighting/building/m) "xNY" = ( /obj/structure/chair/bench{ dir = 1; @@ -80850,11 +81296,9 @@ }, /area/f13/brotherhood) "xOi" = ( -/obj/structure/rack, -/obj/item/clothing/under/f13/shiny, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/flora/grass/coyote/twentyseven, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "xOl" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -80909,11 +81353,9 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "xPY" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low, -/turf/open/indestructible/ground/outside/road, -/area/f13/building/abandoned/k) +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "xQb" = ( /obj/structure/wreck/trash/halftire, /obj/structure/wreck/trash/autoshaft, @@ -81052,6 +81494,14 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland/town) +"xRG" = ( +/obj/structure/car/rubbish3{ + icon_state = "car_rubish2" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "xRJ" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -81090,12 +81540,6 @@ /obj/effect/overlay/desert_side, /turf/open/indestructible/ground/outside/gravel, /area/f13/wasteland/town) -"xRW" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/turf/open/indestructible/ground/outside/graveldirt, -/area/f13/ncr) "xRZ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -81104,13 +81548,15 @@ icon_state = "horizontaloutermain2" }, /area/f13/wasteland) -"xSm" = ( -/obj/structure/chair/wood{ - dir = 8 - }, -/obj/effect/landmark/start/f13/ncrcombatmedic, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/ncr) +"xSc" = ( +/obj/structure/rack/large/shelf_rust, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "xSr" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /obj/machinery/vending/snack, @@ -81143,6 +81589,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) +"xSM" = ( +/obj/machinery/food_cart, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "xSN" = ( /obj/structure/car/rubbish2{ pixel_x = -18; @@ -81283,6 +81733,12 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) +"xVr" = ( +/obj/structure/chair/stool/retro/backed{ + dir = 4 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "xVs" = ( /obj/machinery/light/small{ dir = 4; @@ -81641,8 +82097,9 @@ }, /area/f13/ambientlighting/building/i) "yaS" = ( -/obj/structure/flora/grass/brown, -/turf/open/indestructible/ground/outside/snow, +/obj/effect/decal/cleanable/dirt, +/obj/item/broken_bottle, +/turf/open/floor/plasteel/bar, /area/f13/wasteland) "yaW" = ( /obj/structure/table/wood, @@ -81662,10 +82119,11 @@ }, /area/f13/ambientlighting/building/t) "yba" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/plating/f13/inside/gravel, +/area/f13/wasteland) "ybd" = ( /obj/structure/rack/shelf_metal, /obj/effect/spawner/lootdrop/crafts, @@ -81720,16 +82178,13 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/u) "ybL" = ( -/obj/structure/rack, -/obj/item/clothing/shoes/f13/diesel/alt, -/obj/item/clothing/shoes/winterboots{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/clothing/shoes/f13/diesel, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/shelf_metal, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "ybN" = ( /obj/machinery/rnd/server/followers, /turf/open/floor/f13{ @@ -82176,15 +82631,9 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) "yiF" = ( -/obj/structure/wreck/trash/five_tires{ - pixel_y = 11 - }, -/obj/item/stack/sheet/mineral/sandbags{ - pixel_x = 15; - pixel_y = -13 - }, -/turf/open/indestructible/ground/outside/snow, -/area/f13/wasteland) +/obj/structure/barricade/wooden, +/turf/closed/indestructible/rock, +/area/f13/caves) "yiG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/hacking_guide{ @@ -82206,16 +82655,6 @@ /obj/structure/table/wood, /turf/open/floor/carpet, /area/f13/ambientlighting/building/d) -"yjb" = ( -/obj/structure/railing/corner{ - color = "#A47449"; - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common/wood_common_dark{ - icon_state = "common_dark-broken4" - }, -/area/f13/ncr) "yjc" = ( /obj/machinery/microwave/stove, /obj/effect/decal/cleanable/dirt/dust, @@ -82241,16 +82680,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "yjr" = ( -/obj/structure/rack, -/obj/item/clothing/head/fedora, -/obj/item/clothing/head/frenchberet, -/obj/item/clothing/head/flatcap, -/obj/item/clothing/under/shorts/black, -/obj/item/clothing/under/shorts/red, -/obj/item/clothing/under/shorts/blue, -/obj/item/clothing/mask/fakemoustache/italian, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "yjy" = ( /turf/closed/wall/f13/wood/house, /area/f13/bar) @@ -82260,8 +82693,9 @@ /area/f13/wasteland) "yjK" = ( /obj/effect/decal/cleanable/glass, -/turf/open/floor/plasteel/f13/vault_floor/floor, -/area/f13/ambientlighting/building/p) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "yjQ" = ( /obj/structure/rack, /obj/item/storage/toolbox/mechanical/old, @@ -82273,13 +82707,22 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "yka" = ( -/obj/effect/spawner/lootdrop/trash, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/building/abandoned/g) +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "ykj" = ( /obj/structure/wreck/trash/two_barrels, /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) +"ykk" = ( +/obj/machinery/atmospherics/components/unary/tank/carbon_dioxide, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "ykt" = ( /obj/structure/barricade/tentclothcorner, /turf/open/indestructible/ground/inside/dirt, @@ -82387,22 +82830,9 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/j) "ymf" = ( -/obj/structure/rack, -/obj/item/clothing/head/fedora{ - pixel_x = -3; - pixel_y = 10 - }, -/obj/machinery/light/small/broken{ - dir = 8 - }, -/obj/item/clothing/head/f13/det_hat_alt{ - pixel_x = 3; - pixel_y = -12 - }, -/obj/item/clothing/head/fedora/det_hat, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/h) +/obj/structure/debris/v4, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "ymg" = ( /obj/structure/chair/middle{ dir = 4 @@ -82622,8 +83052,6 @@ rkv rkv rkv rkv -gXH -gXH rkv rkv rkv @@ -82641,6 +83069,8 @@ rkv rkv rkv rkv +gXH +gXH rkv rkv rkv @@ -82901,57 +83331,57 @@ nrU eyn eyn eyn -aHq -aHq eyn eyn eyn eyn -rtj -rtj -rtj -rtj -rtj -rtj -rtj -rtj -rtj -rtj -rtj -rtj -rtj -rtj -rtj -lFO -hyP -kcF -ghi -sDy -lGW -bqb -kVV -bqb -bqb -bqb -sJu -qZF -bqb -qZF -bqb -bqb -rRz -rRz -kIF -lsU -vnO -rtj -rtj -rtj -rtj -rtj -rtj -rtj -aHq +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eFC +eFC +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn eyn eyn eyn @@ -83202,59 +83632,10 @@ eyn eyn eyn eyn -aHq -aHq eyn eyn eyn eyn -rtj -rtj -rtj -rtj -rtj -rtj -sQT -bUo -rtj -rtj -bqb -bqb -bqb -nyh -bqb -bqb -bqb -wWz -rbl -pkU -vSX -dhi -sJu -nKO -hNm -jtd -bqb -ibC -afq -uAI -ssJ -ibC -sJu -rRz -chQ -qHu -krJ -lAb -yaS -rtj -rtj -rtj -rtj -rtj -rtj -aHq -aHq eyn eyn eyn @@ -83266,12 +83647,61 @@ eyn eyn eyn eyn -vFU -vFU -vFU -vFU -vFU -vFU +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eFC +eFC +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn eyn eyn eyn @@ -83425,13 +83855,13 @@ rkv rkv aTW neZ -bwE +taO taO taO vwf taO taO -bwE +taO neZ aTW aTW @@ -83502,62 +83932,11 @@ eyn eyn eyn eyn -aHq -aHq -aHq eyn eyn eyn eyn eyn -rtj -rtj -rtj -rtj -rtj -lsU -wWz -mTP -tUw -bqb -bqb -xGA -mDZ -qhm -fOL -tum -bqb -cDN -bHF -wby -odS -fNL -jxc -pnq -mZg -vMM -bqb -qlk -dbw -uAI -afq -uMY -bqb -lsU -wWz -sdP -vaH -kXs -eME -nQx -lsU -bCH -lsU -obz -rtj -rtj -aHq -aHq eyn eyn eyn @@ -83568,12 +83947,63 @@ eyn eyn eyn eyn -vFU -htm -rOv -xdg -mjH -vFU +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eFC +eFC +eFC +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn eyn eyn eyn @@ -83585,7 +84015,7 @@ eyn eyn eyn rRz -rRz +azA azA azA azA @@ -83703,7 +84133,7 @@ azA azA xic azA -uou +hZK iOE jwS kyD @@ -83771,7 +84201,7 @@ yfv xjs slS qWW -gQn +qWW slS slS oyh @@ -83804,62 +84234,12 @@ eyn eyn eyn eyn -aHq eyn eyn eyn eyn eyn eyn -rtj -rtj -rtj -uuN -dTy -bqb -cPG -vqD -lsU -wWz -xHX -iOG -gfq -nYQ -qEv -pkq -fOW -eWg -hnJ -wby -wby -xhh -cDz -ipq -rTC -rzh -rTC -wHk -uAI -dGb -uAI -dGb -uAI -bqb -wWz -obz -evg -kXs -gOW -nFZ -txi -ufV -lsU -wWz -lsU -rtj -rtj -rtj -aHq eyn eyn eyn @@ -83870,12 +84250,6 @@ eyn eyn eyn eyn -vFU -qMo -pDW -qMo -bDA -vFU eyn eyn eyn @@ -83886,8 +84260,64 @@ eyn eyn eyn eyn -rRz -rRz +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eFC +eFC +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +azA +azA azA azA azA @@ -84043,11 +84473,11 @@ lFj dJF pjw neZ -bwE taO taO taO -bwE +taO +taO neZ aHq aHq @@ -84105,64 +84535,29 @@ eyn eyn eyn eyn -aHq -aHq eyn eyn eyn eyn eyn eyn -rtj -rtj -rtj -wAK -oJi -qrf -lbC -lsU -xln -sks -bqb -cpw -qnM -nYQ +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +lxh +jeL +fOf +rie +qoT +taO fOW -aUl -pEx -xHX -ejU -odS -odS -vSX -pFP -nyh -cad -voo -bMp -bqb -okx -ubK -ubK -fDG -gWU -bqb -wHC -lsU -bvB -cso -cfj -gOW -gYJ -wwS -iTM -pxT -rtj -rtj -rtj -rtj -aHq -aHq eyn eyn eyn @@ -84172,12 +84567,6 @@ eyn eyn eyn eyn -vFU -hxj -qMo -kYn -oZf -vFU eyn eyn eyn @@ -84188,9 +84577,50 @@ eyn eyn eyn eyn -rRz -rRz -rRz +eyn +eyn +eyn +eFC +eFC +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +azA +azA +uhI +azA +azA azA azA azA @@ -84330,7 +84760,7 @@ hkO rkv pjw pjw -cEy +vwf taO vwf vwf @@ -84407,79 +84837,64 @@ eyn eyn eyn eyn -aHq eyn eyn +nzO sQD ryj eyn eyn eyn -rtj -rtj -rtj -oxJ -rFQ -kVV -gBE -xfJ -bqb -bqb -sJu -bqb -qav -jdp -oLn -was -sJu -bqb -ukT -tDd -odS -vSX -hvs -bqb -bqb -aTG +eyn +lxh +eyn +eyn +eyn +eyn +eyn +lxh bqb -sJu -beU -fDG -fDG -fDG -xyS -jxc -rWU -krJ -vaH -cso +mhi +taO +cfW +taO +taO +taO +taO +lxh +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +vIm vIm -gOW -nFZ -mTs -lsU -lsU -rtj -rtj -rtj -rtj -rtj -rtj -aHq eyn eyn eyn eyn eyn eyn +eGa +taO +vqD eyn eyn -mLN -aqx -rqP -lJh -qMo -vFU eyn eyn eyn @@ -84490,17 +84905,32 @@ eyn eyn eyn eyn -rRz -rRz -rRz -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +cyW +ayt azA azA azA azA +qmk +qmk +qmk +qmk +qmk +qmk +glZ +glZ +glZ azA azA azA @@ -84684,7 +85114,7 @@ hqn qBg isk eVf -gQn +qWW qWW npx wUj @@ -84714,61 +85144,26 @@ eyn oHx hRb cHT -jMc eyn -bqb -rtj -rtj -sJu -oxJ -oxJ -bqb -vpp -bNV -nyh -bpa -vmi -bqb -xHX +eyn +cfW +lAR +qoT +taO +taO +taO +taO +taO +taO +taO +taO +lbU +imc +taO bBb -xHX -bqb -bqb -rJc -yaS -shY -odS -vSX -oHL -bqb -hvT -ubK -bVN -iWX -fDG -fDG -vtQ -eLn -dia -bqb -pcH -evg -fpI -flZ -gOW -gOW -nFZ -mij -lsU -wWz -rtj -rtj -rtj -rtj -rtj -rtj -aHq -aHq +lbU +taO +lxh eyn eyn eyn @@ -84776,12 +85171,6 @@ eyn eyn eyn eyn -vFU -rqP -ueJ -uyU -wwj -vFU eyn eyn eyn @@ -84792,17 +85181,58 @@ eyn eyn eyn eyn -rRz -rRz -rRz -rRz -azA -azA -azA +kex +eyn +eyn +eFC +eFC +eyn +eyn +eyn +eyn +eyn +taO +taO +eFC +eFC +eFC +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +cyW +cyW +cyW +cyW azA azA azA azA +qmk +nLc +swK +rfg +qmk +pAK +hMS +xSc +glZ azA azA azA @@ -85010,80 +85440,70 @@ eyn eyn eyn eyn -eyn -kVV +nzO +kIF lbU -ubI +bFn ryj -xXA +fDK jeF vur -oWh +taO vCm -nxr -gXB -vyT -tOK -tZz -vpp -vSX -xHX +urR +mhi +taO +bBb +taO +taO +taO +oJW iLM -qnM +tDd rie -pKu -cYL -hKK -bqb -wXr -imc -esJ -iFv -vpp -vSX -qCJ -wjC -wQl +taO +taO +sJu +wOi +taO +lxh +eyn +eyn +eyn +eyn +eyn +eyn +eyn cAe -bLC +dDN bdX -fDG -hbU -bqb -kVV -sJu -bqb +eGa +fOW +wXr +cDz +cDz +cDz lCb -vaH -hSf -gOW -dnw -mFd -nFZ -mij -lsU -ikE -rtj -rtj -rtj -rtj -rtj -rtj +rnY +taO +eFC +eFC eyn -aHq eyn eyn eyn +taO +fOW +eFC +eFC +eFC +eFC +eFC +taO eyn eyn eyn eyn -vFU -bsp -rqP -oZf -oZf -vFU eyn eyn eyn @@ -85093,18 +85513,28 @@ eyn eyn eyn eyn -rRz -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA +eyn +eyn +rav +dzm +cyW +cyW +cyW +glZ +glZ +glZ +qmk +qmk +glZ +glZ +hMS +jAK +aaJ +qmk +lIs +aFU +cEy +qjd azA azA azA @@ -85224,7 +85654,7 @@ sVj cdT jwS rOj -dOD +hxD iZh jwS jwS @@ -85282,7 +85712,7 @@ xjs slS spB slS -vri +slS slS slS swY @@ -85313,100 +85743,100 @@ eyn eyn eyn eyn -dsU +dof kgK itB -nei -eEd -xXA -cDX -aOz -fOf +dof +taO +dof +cvT +taO +taO fiz -jeF -uaE -qrf -krJ -odS -vSX -xHX -kNV -nYQ -lAR -yjb -ldV -mpv -bqb +urR +taO +taO +taO +taO +taO +cfW +taO +taO +lxh +taO +qoT +taO +sJu bFn -pBl -lsU -fMZ -vpp -odS -lbC -wjC -wjC -mCj -ddE -ddE -dpi -oxQ -bqb +taO +rie +eyn +eyn +eyn +taO +taO +taO +cAe +bdX +bdX +bdX +rDO +cDz daT -fdE -qHE -uKy -fpI -fpI -fow -bcQ -gOW -hTU -wwS -obz -rtj -rtj -rtj -rtj -rtj rtj +qHE +taO +taO +taO +eGa +eFC +eFC +eFC eyn eyn -aHq -aHq +rnY +eFC +eFC +rtj +lKN eyn +eFC +taO +rnY eyn eyn eyn eyn eyn -vFU -oEK -cuA -weQ -qMo -vFU eyn -dgW -pkS eyn eyn eyn eyn eyn eyn -rRz -rRz -rRz -rRz -rRz -uhS -azA -azA -azA -azA -azA +eyn +onB +gmU azA +rls +cyW +cyW +glZ +tOD +xGA +gMb +hMS +iNn +qmk +hMS +hMS +hMS +glZ +xGn +nQN +vkI +qjd azA azA azA @@ -85615,100 +86045,100 @@ eyn eyn eyn eyn -oTg +dof wai -iiA +dof sbc -iIa -mmm -uIB +taO +taO +whm iXz -tbh +lAR lbd -bHY -xXA -nhC +urR +taO +eGa wdx -cDz -vSX -sJu -bgn +taO +taO +taO +eyn lxh -nYQ +eyn tum -nEL -nEL -bqb -mTQ -klZ -krJ -hnJ -odS -odS -vSX -gFK -bqb -bqb -kVV -jxc -jxc -bqb -wjC +taO +eGa +taO +taO +taO +fOW +taO +taO +mhi +lbU +taO +taO +cAe +uTy +dDN +aHq +aHq +aHq hYg cDz -rMP -lsU +cDz +dUo mTa -txi -txi -lwL -oHW -fpI -pMr -lsU -rtj -rtj -rtj -rtj -rtj +cfW +taO +taO +eFC +eFC +eFC +eFC +eFC +eFC eyn +qoT eyn eyn +eFC +eFC +qoT eyn -aHq -aHq eyn eyn eyn eyn eyn -vFU -oZf -qMo -oZf -oZf -wer -tyk -cKR -uKD -fTI -wmm eyn eyn eyn eyn eyn -pis -pmV -cBf -cBf -nrq -azA -ndZ -rDi -rDi -uhS +uYC +gZe +jKr azA +jzy +dzm +cyW +cyW +glZ +hMS +pkq +pkq +pkq +uZz +qmk +hMS +ckA +ePf +glZ +oSt +nQN +awS +qmk azA azA azA @@ -85846,7 +86276,7 @@ vwf vwf taO taO -bwE +taO pjw pjw pjw @@ -85916,101 +86346,101 @@ azA eyn eyn eyn -eyn +nzO oTg -edX -pJs -aoD +dof +dof +whm eyn -mtT +fOW dhI -cjZ +taO pgi -qPh -bqb -cQi -oxJ -aTY -rbr +nYQ +nEL +taO +lAR +taO +taO ivX -bqb -bqb -xHX -wob -xHX -sJu -nyh -bqb -yiF -qjb -vpp -odS -tsn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +mhi +taO +rie +rnY +taO oJW -odS -lbC -dXO -lsU -wWz -yaS -lsU -lsU -wWz -mqN -wjC +tDd +taO +rnY +taO +uTy +aHq +eyn +eyn +aHq +eyn +eyn kex -wjC -bOc -bLC +eyn +eyn +eyn ijh -bqb -iFf -wwS -tgI -ofg -qOs -rtj -rtj -rtj +taO +eFC +eFC +eFC +eFC +eFC eyn eyn eyn eyn eyn +eFC +eFC eyn -aHq eyn eyn eyn eyn eyn -vFU -tUc -qMo -rNx -qMo -hfR -tyk -qoT -taO -rDO -aPP eyn eyn -qzy -tqM +eyn +eyn +eyn +cyW +voU +dzm +myC +iRo +dzm +sHC +cyW +cyW +qmk +pyY +pkq +jmW +jmW hMS -kuV -qfO -qfO -qfO -nIX -cjq -ndZ -qfO -qfO -nrq -azA +qmk +pVs +qmk +glZ +glZ +bLf +hMS +aoB +qmk azA azA azA @@ -86219,100 +86649,100 @@ eyn eyn eyn eyn -aHq +nzO +nzO eyn -kVV eyn eyn eyn -oxJ -nhC -oxJ -dGM -oxJ +lSV +taO +eGa +taO +vwC fDK -voS -lbC -mER -vpp -plu -hnJ -odS -odS -vSX -rIY -lsU -okQ -qen -hnJ -odS -mDw -mhe -mcv -odS -vSX -xuQ -tgI -lsU -rWU -qHu -gzM -lsU -mqN -bqb -srr -cRj -cRj -pXQ -vTF -eDc -fpI -wwS -wWz -lsU -nkI -rtj -rtj -rtj -eyn +taO +taO +taO +taO eyn eyn eyn eyn eyn -aHq eyn eyn eyn eyn eyn -vFU -lLC -rhY -rhY -rtI -vFU -eyn -muq -whm -xae taO -tyk +eGa +qoT taO +lxh +cfW taO -aPP -knH -mTb -fyN -aiJ -cBf -ciV -cBf -jJJ -pVs -qfO -nrq +rnY +yiF +aHq +bRy +qIr +kex +aHq +aHq +aHq +eyn +eyn +eyn +eyn +eyn +eyn +eFC +eyn +eyn +eyn +eyn +cDz +fMZ +qKE +eyn +eyn +eFC +eFC +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +cyW +sHC +sHC azA +ttF +dzm +cyW +cyW +cyW +xPY +uSv +hMS +jmW +gbF +nSW +nQN +wer +hMS +bHY +hMS +hMS +hMS +hMS +hwJ +qmk azA azA azA @@ -86521,60 +86951,48 @@ azA eyn eyn eyn -aHq -aHq eyn eyn eyn eyn eyn eyn -oMD +eyn +oHW +taO +bBb +eME +taO +rnY +taO +fOW +lxh +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +lxh eyn eyn -oWZ -hct -ges -hnJ -wmc -odS -hhY -hPF -odS -qmg -lAH -krJ -hnJ -odS -odS -odS -odS -odS -odS -fyd -vwC sFX -lbC -unT -lsU +taO +aHq +aHq wWz iTe -krJ -rPw -bqb -qeM -cRj -sXY -cRj -vCm -pXQ -qJO -pMr -lsU -krJ -cXi -rtj -rtj +hLN +vpp +kqJ +aHq eyn eyn eyn @@ -86582,39 +87000,51 @@ eyn eyn eyn eyn -aHq -aHq +eyn +eyn +eyn +eFC +eFC +eFC +eFC +eFC +eFC +eyn +eFC +eFC eyn eyn eyn eyn -vFU -vFU -vFU -vFU -vFU -vFU eyn eyn -pVI -gBQ -qoT -tyk -jfb -rDO -xae -paG -mTb -fyN -cBf -cBf -uSL -cBf -cBf -nFD -qfO -nrq azA +cyW +cyW +qmk +qmk +qmk +qmk +qmk +qmk +ayt +wde +azA +glZ +hMS +oAB +nQN +nQN +czh +gYw +avs +raf +iva +hMS +hMS +hMS +fWM +qjd azA azA azA @@ -86754,10 +87184,10 @@ pjw neZ taO taO -cEy +vwf vwf hAb -cEy +vwf vwf mkQ pjw @@ -86824,67 +87254,46 @@ eyn eyn eyn eyn -aHq eyn eyn eyn eyn -xvT -qIr -fVy eyn eyn -wDP +mhi +lAR +taO +ddn +taO mAQ -fAj -odS -cDz -cDz -odS -odS -cDz -odS -hnJ -eGk -odS -odS -cDz -nZP -odS -odS -edn -rDQ -adi -adi -odS -hnJ -lbC -lsU -wWz -mqN -qHu -wjC -kbo -gTS -cRj -cRj -cRj -hWU -fUm -yaS -unT -kqJ -rtj -rtj -rtj +taO +lxh +eyn +eyn +eyn +eyn +eyn eyn eyn eyn eyn eyn +lxh +ezC +taO +eyn eyn eyn eyn +rnY +taO +uTy +aHq +taO +vpp +mqN +qHu +wjC aHq eyn eyn @@ -86895,29 +87304,50 @@ eyn eyn eyn eyn +eFC +eFC +eFC eyn eyn eyn +eFC +eyn +eyn +eFC +eyn +eyn eyn -nNE eyn eyn -iva -gBQ -vfX -aXd -kuV -qfO -jVw -cBf -oWA -cBf -cBf -qfO -qfO -nrq azA azA +dzm +sHC +qmk +hBs +bnO +ucV +qmk +qmk +jxn +dzm +wlS +glZ +ngc +ngc +qmk +xhy +hMS +hMS +hMS +hMS +hMS +hMS +hMS +hMS +hwJ +qjd +azA azA azA gAg @@ -87126,58 +87556,19 @@ eyn eyn eyn eyn -aHq -aHq eyn eyn -wjC -qOX -xGn -ayt -neZ eyn -wKv +eyn +eyn +eyn +eyn +lAR +rnY +taO +taO fDt -hya -rPw -pxT -fDn -vpp -vSX -sEv -shY -cDz -odS -cDz -vSX -wWz -wCM -vpp -hak -qKf -mca -iap -pDb -mca -odS -odS -ewE -ewE -vSX -sEs -wjC -bqb -bqb -cml -cRj -dUo -bqb -bZG -bqb -kVV -bqb -bqb -rtj +lxh eyn eyn eyn @@ -87187,38 +87578,77 @@ eyn eyn eyn eyn -aHq -aHq +lxh +taO +mhi +taO +cwT +dof eyn eyn eyn eyn +kjr +bdX +aHq +aHq +ewE +vSX +sEs +kbo +aHq eyn eyn +taO +taO +taO eyn eyn eyn +eFC +eFC +eFC eyn eyn eyn eyn +eFC +eyn +taO +eFC +taO +eyn eyn eyn eyn -aaJ -caI -mTb -kuV -qfO -jLT -nvF -qfO -bYd -cBf -uwq -cBf -kiP -uhS +azA +azA +azA +azA +glZ +cym +lQS +qmk +qmk +qmk +vNq +sLD +rBH +sPx +aSp +eww +iSc +kiH +hMS +hMS +nQN +nQN +rGU +iFi +hMS +hMS +aFU +qmk azA azA azA @@ -87315,7 +87745,7 @@ azA wBl wsd wsd -xKp +wpV wsd wsd wsd @@ -87429,100 +87859,100 @@ eyn eyn eyn eyn -aHq -aHq eyn -qPh -qPh -qrK -kHo eyn eyn eyn -wid -xpW -fGd -tzN -krJ -iBL -nXi -wEO -fGd -reP -ivX -fGd -shY -lbC -sBk -vpp -ugZ -bzD -vGz -iap -iap -vGz -odS -vSX -qHu -hbo -vpp -hnJ -hnJ -lbC -bqb +eyn +eyn +kHo +lxh +taO +taO kVV -aZg -wjC -bqb -rQn -bqb -tts -dZa -bqb -bqb -bqb +lxh eyn -nzO -vKH -eFC -bqb eyn eyn eyn eyn -aHq eyn eyn eyn +lxh +qoT +pRi +taO +rWU +rPw eyn eyn eyn eyn eyn +vGz +taO +taO +aHq eyn +vpp +gBE eyn eyn eyn +taO +taO +taO +uPc +taO eyn +iTe +eFC +eFC +eyn +eyn +eyn +eyn +eFC +eFC +eyn +eGa +eFC +taO eyn eyn eyn -rRz -rRz -mTb -kuV -qfO -qfO -qfO -qfO -cBf -cBf -cBf -cBf -cBf -nrq azA azA +azA +azA +azA +glZ +bUW +vAW +qcJ +lQS +glZ +sKj +kaU +sLD +kaf +aLq +jKr +wWn +qmk +dZQ +qgV +niG +wCT +uyU +nsL +rGU +glZ +qmk +qmk +cyW +azA foz azA mpc @@ -87615,7 +88045,7 @@ azA azA ljW ahs -izU +qmg ioi rma eDX @@ -87732,101 +88162,101 @@ eyn eyn eyn eyn -aHq eyn -bqb -aeY -amC -bRy -psL eyn eyn -bqb -aeY -lKN -gqS -gqS -lKN +eyn +eyn +eyn +eyn +nYQ +taO +kVV aeY -fGd -lsU -wWz -ivX -lsU -gai -vpp -hnJ -cDz -cDz -mca -fCP -adi -adi -odS -bpn -cDz -exm -cRc -odS -odS -odS -odS -rvi +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +lbU +tDd +dof hnJ -odS hnJ -plu -tty -cXi -hox -fIO -sTR -lKN -hqC -fIO -fIO -udz -wpV -bqb -bqb eyn eyn eyn +bdR +wSO +dof +dof +cRJ aHq eyn +uTy +uTy eyn eyn +eGa +fOW +lKN eyn +taO +eGa +taO +taO +fOW eyn eyn eyn eyn eyn +eFC eyn eyn +vyT +eFC +taO eyn eyn eyn -eyn -rRz -rRz -rRz -rRz -pis -qfO -avw -jJJ -pis -cBf -cBf -pis -cBf -nDt -ctN azA azA azA azA +azA +bnJ +vOh +xNV +ijZ +oWA +glZ +sKj +sKj +hrf +sLD +fXZ +jKr +uKD +qmk +qmk +qmk +qmk +qmk +glZ +bFY +nsL +glZ +cyW +cyW +cyW +azA +azA +azA mpc dry bfj @@ -87924,7 +88354,7 @@ arq tPS tPS tPS -uhs +tPS tPS tPS tPS @@ -87953,7 +88383,7 @@ pEl aTW aTW pjw -cEy +vwf taO vwf vwf @@ -87964,13 +88394,13 @@ khZ taO taO taO -bwE +taO vwf vwf vwf vwf vwf -bwE +taO neZ iPb mEB @@ -88034,100 +88464,100 @@ eyn eyn eyn eyn -aHq eyn -bqb -pXt -oKZ -kTQ -fvm +eyn +eyn +eyn +eyn +eyn +eyn mVp +taO +kVV +taO eyn -bqb -uBz -vkI -wPK -pkq -jcO -bqb -eDU -nMC -bki -xmD -bki -qwC -shY -vSX -lsU -fop -shY -xAJ -vfL -vwC -odS -vSX -lsU -wWz -qHu -shY -bpn -cDz -cDz -odS -cDz -cDz -odS -odS -rPw -wYD -fOW -fIO -udz -nTz -fSZ -fIO -qPa -qob -qob -dzd -bqb eyn eyn eyn -aHq +lxh eyn eyn +cRj +tNM +sJu +rDO +fop eyn eyn eyn eyn eyn +ggj +wSO +dof +dof +dof +aHq eyn +taO +qoT +fOW eyn +iTe +sJu +taO eyn eyn +taO +qoT +taO +taO eyn eyn eyn eyn -rRz -rRz -rRz -rRz -wTQ -ucV -nAV -jJJ -jJJ -cBf -cBf -rjL -rjL -nrq +eFC +eFC +eyn +taO +eFC +eFC +eyn +eyn +eyn +qHy +goG azA azA azA azA +bnJ +ixw +jsI +suy +lQS +glZ +glZ +qmk +ehF +kaU +jOa +jOa +diG +qmk +lSG +mLN +bGS +qQM +glZ +bFY +bFY +glZ +cyW +cyW +azA +azA +azA azA qIV iZj @@ -88220,7 +88650,7 @@ azA azA xxH lmd -rts +xAJ xxN eJc eJc @@ -88236,7 +88666,7 @@ xxN tPS tPS tPS -fEU +qtr qtr nrn tPS @@ -88251,7 +88681,7 @@ dan vDH dOD aZK -jwS +uQU aTW rjL taO @@ -88336,99 +88766,99 @@ azA eyn eyn eyn -aHq -aHq -bqb -pYD -cMJ -mLX -gMf -swt -nYQ -mDT -nuS -tJl -nYQ +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn nYQ -dHZ -lKN -lcv -bki -hVn -nJY -eOv -bki -lsU -ivX -lsU -wWz -yaS -lsU -vpp -odS -odS -odS -lbC -yaS -rWU -chQ -wOi -bqb kVV -sgi -lgB -wjC -dJC -rPw -iox -sJu -gbB -fIO -fIO -sJu -iEJ eGa -qob -qob -qPa -jeL +tJl eyn eyn +taO +sry eyn eyn -aHq +rnY +taO +taO +taO eyn eyn eyn eyn +noM eyn eyn eyn +eoK +dof +eyn +aHq eyn +rnY +wOi +taO eyn +sgi +taO +eGa eyn eyn +taO +eGa +gbB +fIO +rnY eyn eyn +eGa +eFC +eFC +eFC +eFC +eFC +eFC eyn eyn -rRz -rRz -rRz azA azA -ucV -tlY -jJJ -jJJ -jJJ -cBf -tCm -rjL -nrq +jpl +azA azA azA azA +qmk +qmk +jeT +kSD +lQS +xNV +jRZ +qmk +ern +gXS +ssr +aSp +wjo +glZ +wIC +xjI +wIC +wIC +jLb +cKD +gwk +bFY +mZc +cyW +azA +azA azA azA lzo @@ -88452,7 +88882,7 @@ azA azA azA azA -azA +eyn eyn eyn eyn @@ -88520,11 +88950,11 @@ wRi ljW azA azA -ahs +bpa lmd tPS -xxN -tPS +soo +hsU eJc eJc tPS @@ -88553,7 +88983,7 @@ dOD dOD dOD dOD -jwS +wJq aTW taO taO @@ -88639,95 +89069,95 @@ azA azA eyn eyn -aHq -qPh -cET -xDO -jrB -bNa -qPS eyn -bqb -myg -ufJ -aJw -bHu -ddn -lKN -dqU -bki -dqP -nSW -nSW -kWq -icM -ivX -nMC -bki -bki -qwC -kAL -odS -odS -mzf -nZE -tfe -wjC -wjC -wjC -bqb -iWu -qqz -oiL -bqb -ndW -rCl -nQN -sJu -sJu -urR -rnY -bqb -sJu -bqb -gMH -scf -tMB eyn eyn eyn eyn eyn -aHq -eyn eyn +tum +kVV +taO +taO eyn +taO +cwT +vjz +lYi +lbU +dqP +taO +dof +taO +iXz +rie +taO +fDK +iXz +rie +taO +dof +dof +taO eyn +aHq eyn +wOi +wOi +taO eyn eyn +taO +cfW eyn eyn eyn +taO +sJu +urR +rnY eyn eyn +cfW +eFC +eFC +eFC +eFC +eFC +fOW eyn eyn -rRz -rRz -rRz -rRz -uhS azA -qfO -jsI -jJJ -jJJ -qfO -aZV -rjL -rjL -nrq +azA +jpl +azA +azA +azA +azA +azA +eTC +tyt +pev +dJs +cIs +lQS +eTC +gXS +wjo +mag +jKr +mQG +glZ +jAz +wwK +tVb +tVb +pkU +pqV +lqA +hpZ +mZc azA azA azA @@ -88754,7 +89184,7 @@ azA azA azA azA -azA +eyn eyn eyn eyn @@ -88824,7 +89254,7 @@ azA qhE ahs lmd -mbi +kdY eJl kdY tPS @@ -88855,7 +89285,7 @@ lbu vnW sWI nDB -jwS +kBR aTW taO jhX @@ -88941,95 +89371,95 @@ azA azA azA eyn -aHq -aHq -sJu -mCS -meN -lyQ -bqb -eyn -kVV -myg -efb -emw -nYQ -xSm -kVV -cNI -bki -lSG -ggj -bXa -bki -fUm -ivX -xmD -nJY -ktB -bki -dln -uEr -uEr -mzf -mzf -rfW -bqb -cfW -uKw -bqb -bFX -jiV -tJZ -bqb -sJu -rnY -rnY -bqb -tum -fIO -cYT -sEN -qPh -bqb -kVV -bqb eyn eyn eyn eyn eyn eyn -aHq +lxh +taO +kVV +taO +rnY eyn +tNM +kST +dof +cgQ +tDd +taO +dof +dof +taO +taO +qoT +taO +taO +taO +iXz +taO +taO +taO eyn eyn +aHq eyn +cfW +taO +tyk eyn +taO +taO +taO eyn eyn eyn +cfW +taO +euK +taO eyn eyn +rnY +eFC +eFC +eFC eyn +rbl eyn eyn -rRz -rRz -rRz -cBf -cBf -nrq -ndZ -qfO -qfO -qfO -qfO -qfO -jJJ -cBf -nDt -ctN +azA +azA +azA +jpl +azA +azA +azA +azA +azA +mrl +caI +xrs +lQS +kSD +mfx +eTC +kkF +sdV +azA +nPV +glZ +glZ +wwK +wIC +qhG +sNB +pkU +tec +jLb +glZ +azA azA azA azA @@ -89056,8 +89486,8 @@ azA azA azA azA -azA -azA +eyn +eyn eyn eyn eyn @@ -89125,10 +89555,10 @@ azA aUc azA ahs -kyc -eJc +oiL +btN kaI -tPS +oKZ rVM tPS luk @@ -89244,56 +89674,30 @@ azA azA eyn eyn -aHq -aHq -bqb eyn eyn eyn eyn -bqb -bqb -bqb -qiE -gLH -bGB -bqb -lsU +eyn +eyn +taO +mLX +lbU +fDK +eyn +cce +taO +etj +cQJ cwT -bki +taO xmD -bki -nMC -lIl -rPw -bki -kmB -dwn -bki -hDp -odS -odS -kjr -fcs -wiE -ocb -mGU -xIz -sgz -sZZ -rxJ -aXo -wQF -bqb -bqI -qMR -qlb -lWa -fIO -cIW -fIO -euK -bqb +eyn +eyn +noM +eyn +eyn +eyn eyn eyn eyn @@ -89301,36 +89705,62 @@ eyn eyn eyn eyn -aHq aHq eyn eyn +tyk +tyk +uTy +taO +taO eyn eyn eyn eyn eyn +taO +taO eyn eyn eyn +dGM +iTe +taO eyn eyn -rRz -rRz -rRz -xIk -cBf -cBf -nrq -snR -qfO -sFB -jJJ -jJJ -xNV -jJJ -cBf -nrq +eyn +eyn +jpl +azA +azA +azA +jpl +azA +azA +azA +azA +hay +qmk +fhl +xDd +tyt +rIb +kKl +qmk +ndw +vNq +nqp +dzm +glZ +pwi +wIC +bGH +fwZ +tVb +oEK +sNB +pdF +qmk azA azA azA @@ -89358,8 +89788,8 @@ azA azA azA azA -azA -azA +eyn +eyn eyn eyn eyn @@ -89426,11 +89856,11 @@ wRi azA jUr aci -ahs -lmd +myg +lJf bjo kaI -tPS +nZE tPS tPS luk @@ -89544,58 +89974,33 @@ azA azA azA azA -azA eyn eyn -aHq -aHq -aHq -aHq -aHq eyn eyn eyn -bqb -bqb -nyh -wjC -bqb -tgI -oPU -fGd -rWU -krJ -odS -vSX -lsU -cwT -bki -bki -nMC -chQ -vpp -odS -rPw -lsU -wWz -jxc -bYu -tkT -uTy -tqF -sZZ -aXo -brU -wjC -kAA -tTi -blR -fBA -fIO -fIO -qnM -fOW -qPh +eyn +eyn +eyn +taO +kVV +tDd +taO +lxh +pRi +taO +lxh +eyn +eyn +ktB +taO +taO +eyn +eyn +eyn +eyn +eyn +eyn eyn eyn eyn @@ -89605,11 +90010,20 @@ eyn aHq aHq eyn +tyk +uTy +taO +taO +taO eyn eyn eyn eyn eyn +rnY +eGa +eyn +eyn eyn eyn eyn @@ -89617,39 +90031,52 @@ eyn eyn eyn eyn -rRz -rRz -rRz -xIk -cBf -nDt -cIs -snR -qfO -jJJ -cBf -cBf -jJJ -jJJ -cBf -kiP -uhS azA -ndZ -uhS +jpl azA azA azA +jpl +azA azA azA +hay +dhC +qmk +bxu +qmk +shL +qmk +bxu +qmk +sZP +rOv +aso +sLD +glZ +bsp +cHW +wIC +yka +iwk +pkU +fLP +ikE +qmk +azA +azA +ndZ +uhS azA azA -hKk azA azA azA azA azA +hKk +azA +azA azA azA azA @@ -89667,6 +90094,9 @@ eyn eyn eyn eyn +eyn +eyn +eyn rkv "} (25,1,1) = {" @@ -89729,10 +90159,10 @@ qhE azA azA ahs -lmd -kdY +pMr +bVN ikh -kdY +pxT tPS eJc eJc @@ -89764,7 +90194,7 @@ aZK jwS pjw lSV -jYM +aRK aRK aRK lSV @@ -89847,56 +90277,33 @@ azA azA azA azA -azA eyn eyn eyn eyn eyn -aHq -aHq -aHq +eyn +lxh +udz +mDT +taO +qlZ +lxh +vwC +taO +eyn +eyn +eyn +eyn +iTe +taO +qoT +taO eyn eyn eyn eyn eyn -foE -krJ -odS -hnJ -ewE -cDz -cDz -vSX -fGd -umH -akT -xRW -bqb -wWz -vpp -vSX -sNv -lsU -vaL -wjC -wAn -seT -aZA -tQM -eYQ -pQD -soo -kVV -uzR -tTi -rVG -tTi -mrF -fOW -tum -wjC eyn eyn eyn @@ -89906,6 +90313,10 @@ eyn aHq aHq eyn +taO +taO +taO +taO eyn eyn eyn @@ -89918,24 +90329,43 @@ eyn eyn eyn eyn -rRz -rRz -rRz -xIk -xIk -cBf -nrq +qmk +qmk +qmk +mwN +mwN +mwN +mwN azA -gAg -hDi -jbl -cBf -cBf -cBf -cBf -cBf -qfO -nrq +azA +jpl +azA +azA +laH +mUB +fKQ +axO +fRi +fyC +xNr +qZA +fRi +kmD +fKQ +dDq +sZP +iqu +qmk +pcQ +wwK +wIC +pMS +cFz +pkU +fwp +psg +glZ +cyW azA snR kiP @@ -89962,10 +90392,10 @@ azA azA azA azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn eyn eyn eyn @@ -90032,9 +90462,9 @@ azA ljW ahs lJf -hsU -xxN tPS +xxN +nZE tPS eJc eJc @@ -90067,8 +90497,8 @@ jwS pjw lSV aRK -jYM -jYM +aRK +aRK lSV aTW aTW @@ -90080,7 +90510,7 @@ eqB vwf vwf vwf -bwE +taO hIl aTW aTW @@ -90150,66 +90580,45 @@ mDq mDq upl azA -azA -eyn -eyn eyn eyn eyn eyn -aHq -aHq -aHq -eyn eyn +lxh +qoT +taO +taO +cfW eyn -lsU -shY -cDz -rPw -wWz -nMC -bki -xmD -bki -qwC -xRW -cRj -bgw -dMZ -vpp -vSX -rWU -qlZ -wSu -bqb -bqb -bqb -aHg -qBX -eZS -wjC -bqb -bqb -hMj -uyA -fIO -fOW -lxW -vfF -qPh -qPh +aJw +qoT eyn eyn eyn eyn eyn -aHq -aHq +taO +cvT +taO +taO eyn eyn +bgw +bgw +bgw +bgw +bgw +bgw eyn eyn +fOW +qlZ +taO +taO +taO +taO +taO eyn eyn eyn @@ -90220,28 +90629,49 @@ eyn eyn eyn eyn -rRz -rRz -rRz -xIk -xIk -cBf -nrq -azA -azA -shl -gAg -wTQ -wTQ -jbl -qfO -qfO -qfO -nrq -azA +qmk +qmk +qmk +rjo +rjo +mwN +aaz +snc +mwN +mwN +mwN +mwN +mwN +mwN +mwN +sZP +fKQ +peg +tZf +pAh +fwi +psn +tZf +nCG +fKQ +fKQ +kJH +qmk +qmk +gjz +wIC +wIC +dJl +qhG +pkU +gTE +dQI +glZ +cyW +cyW snR cBf -cBf +nAU cBf kiP uhS @@ -90264,10 +90694,10 @@ azA azA azA azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn eyn eyn eyn @@ -90332,11 +90762,11 @@ wRi azA azA azA -kIx -lmd -opg +ahs +lJf +bjo xxN -tPS +nZE tPS eJc tPS @@ -90363,7 +90793,7 @@ bRO dOD dOD dOD -pBr +gFQ jwS jwS pjw @@ -90452,64 +90882,44 @@ azA azA oZJ upl -azA -azA -azA eyn eyn eyn eyn eyn eyn -aHq -aHq -eyn -eyn -noM -yaS -fso -lsU -pxT -bki +fOW tlP -nSW -djf -bki -aaO -nDc -bgw -xJn -cvy -vSX -lsU -jlb -eyn -eyn -eyn -wjC -bqb -bqb -wjC -wjC -eyn +kVV +taO +lxh eyn +taO eyn -gfx -sed -fIO -sJu -qPh eyn eyn -aHq -aHq -aHq -aHq -aHq -aHq eyn +cRj +bki +rnY +taO +bFX +iTe eyn +bgw +tUB +uXK +kxz +kxz +bgw eyn +rnY +taO +taO +taO +taO +fOW +rnY eyn eyn eyn @@ -90520,27 +90930,47 @@ eyn eyn eyn eyn -rRz -rRz -rRz -rRz -rRz -qpU -qpU -wTQ -ctN -cyW +azA +qmk +xxW +sCa +wmm +wmm +mwN +nlw +gnq +xCw +iJF +wtn +oTk +hox +rbV +mwN +bwE +kib +fKQ +cKR +fKQ +fKQ +fKQ +fKQ +fKQ +rMP +fKQ +fKQ +sEz +wIC +wwK +wIC +wIC +wIC +fYb +qmk +qmk +glZ +glZ cyW cyW -azA -azA -azA -gAg -wTQ -wTQ -wTQ -ctN -gDr bce cBf cBf @@ -90566,10 +90996,10 @@ azA azA azA azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn eyn eyn eyn @@ -90635,12 +91065,12 @@ ljW azA azA qzA -izU -kdY +xfJ +pQD dfc -kdY -tPS +rJc tPS +uVv tPS ioi bGL @@ -90755,56 +91185,44 @@ azA azA oZJ upl -azA -azA -azA -eyn -eyn -eyn -eyn -eyn -eyn -aHq -aHq -eyn -eyn -eyn -lsU -lsU -ikE -bki -rZz -nUf -gLl -bki -nHo -eSh -wjC -btN -mTa -lxr -aVc -jwu -eyn eyn eyn eyn eyn eyn +taO +tlP +kVV +taO +lxh eyn eyn eyn eyn eyn -bqb eyn -bqb -bqb eyn eyn +iNy +dof +eRb +dof eyn +bgw +rtI +lQf +lQf +nmA +bgw +taO +taO +taO +qwC +taO aHq eyn +aHq +aHq eyn eyn eyn @@ -90813,39 +91231,51 @@ eyn eyn eyn eyn -eyn -eyn -eyn -eyn -eyn -eyn -rRz -rRz -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA azA azA -azA -azA -azA -iHx -azA +qmk +qnM +pfL +xFO +uVi +mwN +uyX +bTn +mwN +gHY +fow +jJZ +uXs +xnM +mwN +cuA +fKQ +fKQ +fKQ +fKQ +aEq +fKQ +fKQ +fwi +fKQ +fKQ +fKQ +qRH +wIC +edf +oJc +cHW +qmk +glZ +glZ +cyW +cyW +cyW +cyW azA gAg wTQ -oeo +jbl nDt wTQ ctN @@ -90868,11 +91298,11 @@ azA azA azA azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn eyn eyn rkv @@ -90953,7 +91383,7 @@ hql pFU rhc rhc -kBR +uQU kEe pCa tPS @@ -91057,44 +91487,15 @@ wfv wfv uhS hKk -azA -azA -azA -eyn -eyn -eyn -eyn -eyn -eyn -eyn -aHq -aHq -aHq -eyn -eyn -gzM -rWU -cwT -bki -bki -bki -nMC -eyn -eyn -eyn -vjP -mTa -aMQ -eyn -eyn -eyn -eyn -eyn eyn eyn eyn eyn eyn +vfF +taO +mAQ +qlZ eyn eyn eyn @@ -91102,10 +91503,27 @@ eyn eyn eyn eyn +taO +taO +nDc +dof +taO +taO eyn +bgw +xjZ +lQf +oxb +msO +krJ +taO +taO +rnY +noM eyn aHq aHq +aHq eyn eyn eyn @@ -91114,34 +91532,46 @@ eyn eyn eyn eyn -eyn -eyn -eyn -eyn -eyn -eyn -rRz -rRz -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA azA azA azA +qmk +qmk +qmk +oml +wmm +mwN +hOi +pcH +mwN +jfx +qOp +hox +vaS +iJF +hBL +pDW +fKQ +tKw +qAP +izU +qZA +izU +fKQ +fKQ +mLW +fwi +glZ +glZ +glZ +glZ +glZ +qmk +qmk +cyW +cyW +cyW +cyW iHx azA azA @@ -91170,13 +91600,13 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn +eyn +eyn rkv "} (30,1,1) = {" @@ -91238,7 +91668,7 @@ sqv azA aUc azA -ahs +aOz lmd wvE xxN @@ -91276,7 +91706,7 @@ fiR hze olU uYQ -rjo +uYQ vkP jZQ oDd @@ -91359,51 +91789,37 @@ cBf cBf dEl hKk -azA -azA -azA -azA -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -aHq -aHq -eyn -eyn -yaS -lsU -lsU -lsU -wWz -eyn -eyn -eyn -eyn -jwu -nHb -jgl -eyn -eyn -eyn -eyn eyn eyn eyn eyn eyn +iOG +taO +taO +taO eyn eyn eyn eyn eyn eyn +tNM +vpp +dMZ +jwh +taO +lxh eyn eyn +dvR +jfg +hmi +qiI +lQf +bgw +cfW +taO aHq aHq aHq @@ -91415,38 +91831,52 @@ eyn eyn eyn eyn -eyn -eyn -eyn -eyn -eyn -eyn -rRz -rRz -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA azA azA azA azA azA azA +qmk +nhC +cFH +rlm +gCl +mwN +mwN +dWa +mwN +qMC +hiz +peM +rTp +hox +sLw +dJH +kck +fKQ +fyN +qZA +qZA +hwA +fKQ +fKQ +niA +fUa +glZ +bzD +izz +lVc +rHn +hxm +glZ azA +jFD azA azA iHx azA -tHX +jKr azA azA azA @@ -91472,13 +91902,13 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn +eyn +eyn rkv "} (31,1,1) = {" @@ -91662,54 +92092,37 @@ cBf nrq hKk azA -azA -ljW -azA -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -aHq -aHq -eyn -eyn -eyn -eyn -eyn eyn eyn eyn eyn eyn eyn +rzh +rnY +cfW eyn eyn eyn eyn eyn eyn +rnY +mhi +qoT eyn eyn eyn eyn +bgw +wFa +kWO +vlf +msO +bgw aHq aHq aHq -aHq -aHq -aHq -aHq -aHq -aHq -aHq -eyn -eyn -eyn eyn eyn eyn @@ -91717,34 +92130,51 @@ eyn eyn eyn eyn -eyn -eyn -eyn -rRz -rRz -rRz -rRz -rRz -vuq -rRz -azA -azA -azA -azA -jKr -jKr -azA -azA -azA azA azA azA +pCk azA azA azA azA azA +qmk +wmm +nLJ +wmm +sCa +ojq +mwN +iAm +mwN +uiB +tgI +sNl +jiN +cFZ +mwN +fKQ +kJH +fKQ +kib +bgH +fKQ +qAP +iid +fwi +qzA +ofG +qpU +avq +bqM +mOF +mOF +tPk +glZ +pbH azA +uJV azA iHx jKr @@ -91774,13 +92204,13 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn +eyn +eyn rkv "} (32,1,1) = {" @@ -91847,7 +92277,7 @@ lmd tPS tPS pRE -cNV +rfM xhr gTs ahs @@ -91966,46 +92396,17 @@ hKk azA azA azA -azA -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -aHq -aHq -aHq -aHq -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -aHq -aHq -eyn eyn eyn eyn eyn eyn +taO +taO +taO +taO +mhi +eGa eyn eyn eyn @@ -92015,28 +92416,23 @@ eyn eyn eyn eyn +bgw +iDY +hmi +qOb +sVy +bgw eyn eyn eyn eyn eyn eyn -rRz -rRz -rRz -rRz -azA -snR -cBf -nrq azA azA azA azA azA -jKr -jKr -azA azA azA azA @@ -92045,6 +92441,40 @@ azA azA azA azA +qmk +hfm +nYW +wmm +uou +wPz +mwN +mwN +mwN +mwN +mwN +mwN +mwN +mwN +eYU +lps +fKQ +kib +fKQ +fKQ +fKQ +cKR +fKQ +sgn +oDA +bGD +qmk +vAN +rHn +wsX +mOF +rtg +qmk +vfS azA azA azA @@ -92077,12 +92507,12 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn +eyn rkv "} (33,1,1) = {" @@ -92205,7 +92635,7 @@ dCA wYW xDo dCA -ufz +dCA wYW qZA qZA @@ -92269,70 +92699,34 @@ azA azA azA azA -azA -azA -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -aHq -aHq -aHq -aHq -aHq -aHq -aHq -aHq -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -aHq -aHq -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn eyn eyn eyn eyn +taO +taO +taO +cDN +taO +taO +taO +lxh +lxh eyn eyn +mDZ +mDZ +mDZ eyn +bgw +bfU +fnD +ttM +uYb +bgw eyn eyn eyn -rRz -rRz -rRz -rRz -azA -gAg -wTQ -ctN -azA -azA azA azA azA @@ -92340,12 +92734,48 @@ azA azA azA azA +qmk +qmk +glZ +glZ +glZ azA azA -azA -dzm -azA -azA +epF +oPg +qmk +wmm +hWz +sCa +wmm +oCf +qmk +uhE +rDJ +lQS +ciq +lQS +hRY +lQS +qmk +fKQ +fwi +izU +evm +fKQ +bro +sgn +qMB +nqZ +jUV +iUj +oPU +gai +bDA +avq +mOF +iLb +qmk azA azA azA @@ -92379,12 +92809,12 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn +eyn rkv "} (34,1,1) = {" @@ -92461,7 +92891,7 @@ hhn pjo jwS jwS -bGS +slq fYh jwS cpS @@ -92473,7 +92903,7 @@ ahs uVn jwS eHh -gaq +bgK mra tSg ffy @@ -92571,87 +93001,87 @@ azA azA azA azA -azA -azA -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -aHq -aHq -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -aHq -aHq -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn eyn eyn eyn eyn eyn +lxh +rnY +qlZ +lbU +iWu +qoT +taO +qPa +lxh eyn +gMH +taO +taO eyn +bgw +bgw +bgw +bgw +bgw +bgw eyn eyn -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA azA azA azA azA azA +glZ +glZ +qmk +qmk +rhA +rhA +sjM +glZ azA azA +mUB +aeE +qmk +nhC +cFH +wFs +jeh +xri +qmk +iZS +lQS +aAo +lQS +qEl +lQS +ptj +dGb +fKQ +uVn +uVn +nVz +qmk +qmk +glZ azA azA -dzm -jKr -dzm -azA -azA -azA -azA +ovN +lnQ +oPU +soN +fnW +rHn +mOF +npm +qmk azA +boK +lbp +pbH iHx azA azA @@ -92681,12 +93111,12 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn +eyn rkv "} (35,1,1) = {" @@ -92763,7 +93193,7 @@ jTw uRi uRi jwS -slq +mDw rhc jwS uVn @@ -92873,42 +93303,6 @@ azA azA azA azA -azA -azA -azA -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -aHq -aHq -aHq -eyn -eyn -eyn -eyn -aHq -aHq -aHq -eyn -eyn -eyn -eyn -eyn -eyn eyn eyn eyn @@ -92917,40 +93311,76 @@ eyn eyn eyn eyn +mVp +kVV +sTR +taO +fDK +fOW eyn eyn +mGU +taO eyn eyn eyn eyn eyn eyn +bLZ eyn -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA -ndZ -rDi -rDi -rDi -rDi -rDi -rDi -uhS -jKr -dzm -azA azA azA +qmk +qmk +qmk +glZ +glZ +rhA +hWP +kHO +aPP +aPP +rup +jLT +ufz +epF +vle azA +qmk +qmk +qmk +qmk +jHg +aoO +qmk +gem +lQS +lUY +xNV +pev +dhS +qDl +qmk +fKQ +wuE +lFV +nVz +qmk +glZ +glZ +glZ +glZ +glZ +glZ +qmk +qmk +qmk +bqM +mKb +xpW +qmk +xae azA azA azA @@ -92960,7 +93390,7 @@ azA oMd olu dPr -cBf +hYR nrq azA azA @@ -92983,12 +93413,12 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn +eyn rkv "} (36,1,1) = {" @@ -93072,7 +93502,7 @@ uVn lmd tPS tPS -bqM +eJc qtr uXT nEj @@ -93101,7 +93531,7 @@ bRM nVH bRM wYW -ufz +dCA aQC dCA wYW @@ -93175,43 +93605,6 @@ azA azA azA azA -azA -azA -azA -azA -azA -rRz -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -aHq -aHq -aHq -aHq -aHq -aHq -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn eyn eyn eyn @@ -93221,37 +93614,74 @@ eyn eyn eyn eyn +akT +taO +taO +rie +taO +taO +qKf +vnO +rfW +jcO eyn eyn eyn eyn eyn eyn -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA -snR -qfO -qfO -qfO -qfO -qfO -qfO -nrq -azA -jKr +nZP azA azA +qmk +nUb +xaK +fjU +vtA +rhA +aPP +aPP +neu +fzU +hDi +nvF +nfh +oeF +aeE azA +quf +tyG +tyG +hwE +hfm +wmm +qmk +rTE +lQS +laY +blR +lQS +lQS +xew +qmk +jfT +uVn +uVn +weO +qmk +knm +lJh +mBp +ihM +aBR +tbh +tQx +tbh +qmk +mOF +rHn +avq +qmk azA azA azA @@ -93285,12 +93715,12 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn +eyn rkv "} (37,1,1) = {" @@ -93380,7 +93810,7 @@ cNV qzA ioi hpE -eAw +nXi eAw eAw mVY @@ -93443,7 +93873,7 @@ pNe wDv wDv lSy -yka +wDv kHg cBf cBf @@ -93477,36 +93907,6 @@ azA azA azA azA -azA -azA -azA -azA -azA -rRz -rRz -rRz -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn eyn eyn eyn @@ -93516,48 +93916,78 @@ eyn eyn eyn eyn -eyn -eyn -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -snR -qfO -nDt -eJw -iHH -wHI -fbI -nrq -azA -azA +sks +rnY +oJW +qZF +jtd +itr +cDz +qJO +dHZ +cBf +cBf +cBf +cBf +fKM +ush +cBf +nZP azA azA +qmk +sXC +sJE +nSG +hKw +rhA +aPP +neu +aPP +aPP +qzy +glZ azA +epF +jOa +bbF azA +quf +rrL +hwE +wmm +sCa +qmk +rTE +wep +gfa +eZL +qDl +ftu +iQV +qmk +aQE +uVn +uVn +sOK +qmk +pgO +ulJ +mBp +ulJ +qmk +pxq +tHX +piS +qmk +mOF +avq +mic +qmk azA azA azA +ljW iHx azA gAg @@ -93587,12 +94017,12 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn +eyn rkv "} (38,1,1) = {" @@ -93658,7 +94088,7 @@ ahs ioi myt myt -sJE +xxN eJc lRB cJB @@ -93780,32 +94210,6 @@ azA azA azA azA -azA -azA -azA -azA -rRz -rRz -rRz -rRz -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn eyn eyn eyn @@ -93815,57 +94219,83 @@ eyn eyn eyn eyn +lxh eyn eyn eyn eyn -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -snR -qfO -nrq -azA -wNx -aWT -fbI -nrq -azA -azA -azA +gOW +wSu +oWZ +cBf +cBf +cBf +cBf +dwn +cBf +cBf +jrB azA azA +qmk +gDS +vGg +tCm +mxW +rhA +aPP +aPP +aPP +neu +qrg +avw +oMd +dIL +ioi +gXS azA azA +quf +vuy +qmk +qmk +qmk +qmk +qmk +qmk +qmk +qmk +qmk +qmk +qmk +kmB +uVn +uVn +jVw +qmk +get +mBp +lIQ +oqo +glZ +dfA +hgn +jwi +qmk +hdM +rHn +mic +glZ +jUr azA +nLA azA iHx azA dzm azA azA -gAg +vGk wTQ ctN isX @@ -93889,12 +94319,12 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn +eyn rkv "} (39,1,1) = {" @@ -94084,21 +94514,6 @@ azA azA azA azA -azA -azA -azA -rRz -rRz -rRz -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn eyn eyn eyn @@ -94109,58 +94524,73 @@ eyn eyn eyn eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -snR -qfO -xkl -azA -azA -tsU -qfO -nrq -azA -azA -azA -azA +cBf +cBf +hKK +bUo +cBf +cBf +cBf +kFh +cBf +cBf +cBf +cBf +nZP azA azA +qmk +tCm +tCm +cbK +qmk +kAH +slD +cVI +aPP +aPP +pzq +jLT +oMd +unz +mjG +aeE +jFO +tqs +rOi +wsd +rNx +cGe +iAe +wsd +wsd +rNx +eqx +iAe +kYn +ckK +twv +jQw +uVn +uVn +ioi +sVO +xAG +vmi +iqM +pMC +glZ +bNp +lKJ +qsV +qmk +hdM +kXc +glZ +glZ azA azA +qhE azA iHx azA @@ -94191,12 +94621,12 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn +eyn rkv "} (40,1,1) = {" @@ -94286,7 +94716,7 @@ fcu fqh srf hpE -wsd +fSZ wsd dDM ixI @@ -94388,81 +94818,81 @@ azA azA azA azA -azA -azA -rRz -rRz -rRz -rRz -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn eyn eyn eyn eyn eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA azA azA +fdE +jbl +fYG +bHu +cBf +rDL +cBf +cBf +cBf +cBf +cBf +bHu +cBf +nZP azA azA +glZ +oRn +xaK +tCm +azN +syM +hdr +xom +bgM +aPP +rwc +qmk azA -snR -qfO -qfO -cyW -azA -qfO -qfO -nrq -azA -azA -azA -azA +xxH +fCk azA +ydp +fye +asH +uVn +uVn +uVn +uVn +kdx +yae +ioi +ioi +ehF +ioi +ioi +izU +uVn +uVn +uVn +xNr +sVO +xEs +mBp +tra +lam +glZ +glZ +qmk +qmk +qmk +qmk +qmk +glZ azA azA azA +ljW azA lPN lPN @@ -94494,11 +94924,11 @@ azA azA azA azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn rkv "} (41,1,1) = {" @@ -94692,80 +95122,80 @@ azA azA azA azA -rRz -rRz -rRz -rRz -rRz -rRz -rRz -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn eyn eyn eyn -eyn -eyn -eyn -eyn -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -azA azA azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -snR -cBx -nrq -azA -azA -uzn +aoD gAg -ctN -azA -azA -azA -azA +jbl +cBf +cBf +cBf +aUl +cBf +cBf +cBf +cBf +cBf +nDt +cvJ azA azA +glZ +glZ +sLe +qmk +vuy +aPP +aPP +rPH +aPP +wCM +qmk +qmk +vfS +jUV +aso +rpZ +yho +agf +nEj +uVn +fKQ +xSM +fwi +fKQ +shg +ioi +gXS +aSp +aeE +yho +fSs +nEj +uVn +yae +gQn +qmk +qmk +qmk +qmk +qmk +qmk +drA +foo +ihu +pXt +vfS +vtL azA +pbH azA +iRT azA +vfS lPN cdo isQ @@ -94796,11 +95226,11 @@ azA azA azA azA -azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn +eyn rkv "} (42,1,1) = {" @@ -94994,79 +95424,79 @@ azA azA azA azA -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -eyn -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA azA +eyn azA azA azA +iHx azA -gAg +spP wTQ +jbl +ufJ +cBf +cBf +cBf +xcD +cBf +nDt ctN +aoD +kXs azA +jBq +kjL +cKC +uyr +qmk +bgM +aPP +kHN +aPP +gng +qmk +fZZ +wsd +jQw +uVn +aso +xae +vfS +ahs +eAw +eAw +eAw +eAw +eAw +hoH +rlA +rZy azA +bbF +paN +bLE +ahs +uVn +weO +dsH +nqY +foo +drA +axO +uVn +uVn +uVn +mUY +arq +huE +pbH +voU azA +nLA azA azA -azA -azA -azA -azA -azA -azA -azA -azA +pbH azA jDe pav @@ -95099,10 +95529,10 @@ azA azA azA azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn rkv "} (43,1,1) = {" @@ -95166,7 +95596,7 @@ azA azA eQj juY -czG +cjq sRv ufp jpl @@ -95181,12 +95611,12 @@ wPF dQz slq rhc -uRi -uRi -uRi +hso +neN +neN gAE jwS -erZ +azA pCk chp dLJ @@ -95289,65 +95719,6 @@ azA azA azA azA -azA -azA -azA -azA -azA -azA -azA -azA -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA ieA ieA ieA @@ -95361,15 +95732,74 @@ aFL klm aFL lbW +dxK +fAj +rzH +gAg +wTQ +wTQ +xIz +jbl +cBf +xcD +kcw azA +bOC azA azA +iZi +rhY +rsU +aDt +qmk +iAH +aPP +fzU +bgM +neu +rnE +izU +izU +kdx +izU +bfO +nLA +qhE +ahs +tfP +bTA +jqt +jqt +bqo +jqt +jqt +gTs +xEu +kyc azA +nLA +ahs +uVn +sqF +ckK +jQw +uVn +uVn +qMo +uVn +uVn +uVn +isS +fBy +ckK +ckK +eSw +elf azA +ljW azA azA -azA -azA +dsH jDe pav pAA @@ -95401,10 +95831,10 @@ azA azA azA azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn rkv "} (44,1,1) = {" @@ -95483,7 +95913,7 @@ qxp uRi slq rhc -bSi +oxJ eKW eUG uKK @@ -95492,7 +95922,7 @@ wYZ kxf azA aUc -erZ +azA mBX rLN cyW @@ -95587,65 +96017,6 @@ azA azA azA hKk -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA ieA ieA rRG @@ -95663,12 +96034,71 @@ jQV cDB jrq gon +rCU +aTG azA azA +nyh azA +puQ +gAg +jbl +cBf +kiP +tzE +vZc azA -dzm azA +paG +kOU +nZL +bLv +qmk +qmk +qmk +qmk +glZ +glZ +glZ +rlA +fhJ +nEj +ioi +lmd +vfS +azA +ahs +tfP +jqt +jqt +xNB +jqt +jqt +jqt +luk +ybl +kyc +egT +lbC +ahs +mUY +uVn +uVn +uVn +uVn +uVn +uVn +oWi +uVn +uVn +uVn +bDg +yae +ioi +gXS +aeE +nLA +gwE azA azA azA @@ -95687,7 +96117,7 @@ uZd uZd lxE lPN -uZd +gzM ruw uZd glX @@ -95703,10 +96133,10 @@ azA azA azA azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn rkv "} (45,1,1) = {" @@ -95779,7 +96209,7 @@ kKP gGH oah rOZ -cBO +rhc rhc rhc rhc @@ -95889,65 +96319,6 @@ azA azA azA hKk -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -rRz -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA rRG pqv wSD @@ -95965,15 +96336,74 @@ dDG tgG cIT gon +iWX +mkG +mkG +mkG +mkG +mkG +mkG +bXa +ehh +eSe +eSe +nrq azA azA +hQx +pkS +gDb +iYw +nwK +iVB +dUJ +ayd +lCr +lCr +fGa +qmk +vgK +vgK +ahs +ioi +lmd azA -dzm -jKr +aUc +ahs +cpq +shY +jGd +jqt +acP +jqt +daY +vXj +thF +arq +qhE azA +ahs +hle +uVn +uVn +uVn +uVn +mUY +uVn +uVn +uVn +uVn +uVn +isS +uVn +ajU +vSR +rpZ azA azA azA +ljW +azA lPN alq aGA @@ -95989,7 +96419,7 @@ rKu kNn lxE lPN -uZd +anA uZd uZd bxC @@ -96005,10 +96435,10 @@ azA azA azA azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn rkv "} (46,1,1) = {" @@ -96093,7 +96523,7 @@ cMW ivI jwS bra -erZ +azA qbB cJw azA @@ -96191,65 +96621,6 @@ azA azA azA hKk -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -hrQ -xiF -xiF -hrQ -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA rRG mnC ieA @@ -96272,10 +96643,69 @@ azA azA azA azA +gwF +azA +azA +azA +ecE +cBf +ctN +azA +azA +qmk +knH +knH +qmk +qmk +glZ +nFD +lCr +xgL +xnp +lCr +qmk +oLn +lpb +ahs +yae +lmd +pbH +xOi +ahs +tfP +jqt +rcq +jqt +jqt +jqt +jqt +kds +gqz +lcl azA +oUX +ahs +bDg +uVn +lfS +daW +eAw +nEj +eDX +cPp +iWm +lsU +uVn +lsU +cPp +rEg +cPp +pCP +ePc azA azA azA +laZ jDe ouF jns @@ -96291,7 +96721,7 @@ kNn mGO lxE lPN -uZd +fOJ til uZd bxC @@ -96307,10 +96737,10 @@ azA azA azA azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn rkv "} (47,1,1) = {" @@ -96493,65 +96923,6 @@ azA azA azA hKk -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -ecE -pka -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -hay -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -fZR -azA -azA -azA -azA -azA -azA rRG ieA ieA @@ -96569,14 +96940,73 @@ nSu cBf iWE gon +gwF azA +ldt azA +gwF +gwF azA +kXs azA +ecE +pka +gwF azA azA +glZ +fOT +jkv +xbC +nFD +pNV +qcL +lCr +sra +aXd +yjr +rnV +gcP +lpb +ahs +uVn +lmd +nLA azA +ahs +cpq +wEh +jBW +uAZ +jqt +jqt +jGd +jGd +shY +lmd +azA +laZ +jBl +uVn +pFP +azA +voU +rwf +hkd +lFq +dlI +mJm +wLE +hxj +hxj +hxj +hxj +hxj +cCw +tlY +peH azA +jOt azA jDe pav @@ -96609,10 +97039,10 @@ azA azA azA azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn rkv "} (48,1,1) = {" @@ -96797,65 +97227,6 @@ azA hKk azA azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -ecE -pka -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -dzm -azA -azA -azA -azA -ner -uVn -uVn -uVn -uVn -uVn -uVn -uVn -uVn -sLI -aUc -azA -azA -azA -azA -azA -azA -azA ieA oUb odq @@ -96871,15 +97242,74 @@ vNZ uMf cBf tBb +kXs +azA +azA +azA azA azA azA azA azA +ecE +pka +gwF +azA +azA +qmk +tyz +ayd +nFD +oQd +qzi +kji +nFD +smV +ujy +mgR +rnV +grh +ciV +ahs +axO +lmd +xOi +len +ahs +tfP +jqt +jqt +jqt +jqt +jqt +acP +jqt +jqt +lmd azA azA +ahs +uVn +pFP +voU azA +pZJ +stT +mca +pZJ +qmk +hRe +vdw +szP +htm +uQg +vdw +jlb +tlY +iRT +fZL azA +xTy lPN xYN lxE @@ -96911,10 +97341,10 @@ azA azA azA azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn rkv "} (49,1,1) = {" @@ -96994,14 +97424,14 @@ uRi rhc rhc jwS -osB +qen gaq gaq gaq osB jwS urs -erZ +azA hqe azA nBj @@ -97097,65 +97527,6 @@ azA azA azA hKk -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -ecE -pka -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -ner -uVn -egT -egT -egT -egT -egT -egT -uVn -sLI -azA -azA -azA -azA -azA -azA jvv uUr ieA @@ -97177,8 +97548,67 @@ azA azA azA azA +kXs +azA +azA +azA +azA +ecE +pka +azA +azA +oMd +knH +wqV +nFD +nFD +avt +rCC +jkv +jXk +nFD +nFD +mgR +rnV +rNa +lpb +ahs +uVn +lmd +azA +egT +ahs +cpq +tvQ +oLo +jqt +jqt +jqt +aaC +uME +hiN +lmd +afB azA +ahs +oWi +sqF +ohj +ohj +mca +uBz +uBz +hPz +qmk +qmk +qmk +qmk +glZ +glZ +glZ +glZ azA +pbH azA azA azA @@ -97213,10 +97643,10 @@ azA azA azA azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn rkv "} (50,1,1) = {" @@ -97399,65 +97829,6 @@ ipk uhS azA hKk -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -ecE -pka -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -ner -uVn -egT -cRC -wEh -wkQ -egT -egT -uVn -sLI -azA -azA -azA -azA -azA -azA qgq gJN qlf @@ -97482,8 +97853,67 @@ azA azA azA azA +ldt +azA +ecE +pka +azA +azA +oMd +knH +ggF +lCr +lCr +oQd +rCC +ayd +nFD +skZ +nJi +tqM +iwR +pQd +coT +jQw +uVn +lmd azA +afB +ahs +tfP +jqt +jqt +jqt +jqt +jqt +svH +jqt +fhs +lmd +lbC +mUU +nxr +uVn +eDX +uVn +vmR +mBh +jYM +uBz +eOv +qmk +nVY +lsr +aIa +qmk +eSh +tcc +glZ +pXt +vfS +egT azA +afB azA azA azA @@ -97515,10 +97945,10 @@ azA azA azA azA -azA -azA -azA -azA +eyn +eyn +eyn +eyn rkv "} (51,1,1) = {" @@ -97580,7 +98010,7 @@ bvo bvo azA qhE -erZ +azA azA azA azA @@ -97701,65 +98131,6 @@ cBf nrq azA hKk -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -ecE -pka -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -ner -uVn -egT -oky -wEh -egT -egT -egT -uVn -sLI -azA -azA -azA -ndZ -uhS -azA qgq pCM xqW @@ -97786,9 +98157,68 @@ azA azA azA azA +ecE +pka +azA +azA +oMd +knH +vfX +lCr +nFD +nNE +xVr +nFD +nFD +gTM +uOD +tqM +mBm +ciV +lpb +nEj +hMU +lmd azA +mUU +ahs +cpq +wig +qyX +jqt +jyj +piH +jGd +aaC +jBW +lmd azA azA +ahs +uVn +lLC +hxj +hxj +pZJ +uBz +uBz +hak +qmk +lCr +dFN +wXk +eCW +eIL +ecx +kAC +ndZ +rDi +rDi +rDi +rDi +rDi +rDi +uhS azA azA azA @@ -97818,9 +98248,9 @@ azA azA azA azA -azA -azA -azA +eyn +eyn +eyn rkv "} (52,1,1) = {" @@ -97896,7 +98326,7 @@ smK gDP smK piZ -kBR +uQU rhc rhc vPt @@ -98003,65 +98433,6 @@ cBf nrq azA hKk -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -ljW -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -azA -ecE -pka -azA -azA -azA -azA -azA -hay -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -uQH -mUB -qZA -egT -bUW -nAU -nml -wEh -egT -uVn -kAJ -uQH -fZR -azA -gAg -ctN -azA qgq tVQ hLk @@ -98088,9 +98459,68 @@ azA azA azA azA +ecE +pka +azA +azA azA -dzm +qmk +cSH +nFD +nHo +vxq +iBY +lCr +lCr +lCr +lCr +ayd +muq +lpb +lpb +ahs +uVn +lmd +bLE +aQq +ahs +tfP +jqt +jqt +jqt +xRG +jqt +jqt +jqt +etD +lmd azA +nLA +jZF +uVn +jVw +hxj +hxj +nUf +bcP +uBz +fEU +glZ +aPG +lQZ +dFN +qmk +qMM +eIL +qmk +snR +qfO +qfO +qfO +qfO +qfO +qfO +nrq azA azA azA @@ -98120,9 +98550,9 @@ azA azA azA azA -azA -azA -azA +eyn +eyn +eyn rkv "} (53,1,1) = {" @@ -98305,65 +98735,6 @@ wTQ ctN azA hKk -azA -azA -azA -axO -axO -axO -axO -axO -axO -axO -shL -axO -hUC -uGc -uyr -lpb -azA -azA -azA -dzm -azA -dzm -azA -azA -azA -azA -ecE -pka -azA -azA -azA -azA -azA -ner -uVn -uVn -uVn -qZA -qZA -qZA -uVn -uVn -uVn -uVn -qZA -egT -iwR -iJF -cVI -qyx -egT -uVn -uVn -uVn -aDt -azA -azA -azA -azA rTn pBX hLk @@ -98390,9 +98761,68 @@ azA azA azA azA +ecE +pka +azA azA azA +glZ +lxq +jkv +dzY +mIi +jYR +lCr +lCr +aIc +nrR +tqM +glZ +mvC +enj +jBl +uVn +sqF +nLA +lbC +ahs +cpq +khv +jBW +jqt +lXj +jqt +jGd +wig +hpp +lmd +mUU azA +jZF +isS +lLC +hxj +yaS +nUf +hPz +vri +uBz +glZ +qmk +qmk +ois +qmk +ecx +nTz +glZ +snR +qfO +nDt +eJw +iHH +wHI +fbI +nrq azA azA azA @@ -98422,9 +98852,9 @@ azA azA azA azA -azA -azA -azA +eyn +eyn +eyn rkv "} (54,1,1) = {" @@ -98607,72 +99037,13 @@ gwF azA azA hKk -azA -azA -azA -axO -wGw -rdk -rdk -rdk -rdk -rdk -kjL -axO -cBf -avm -cBf -nrq -azA -qtW -azA -azA -azA -azA -azA -slm -azA -azA -ecE -pka -azA -azA -azA -azA -azA -ner -uVn -qZA -qZA -qZA -gXS -egT -egT -egT -glZ -egT -fKQ -egT -slD -rCC -mwN -wEh -egT -egT -egT -uVn -sLI -azA -azA -azA -azA qgq mWm kYf aZm lLM ine -tOD +rdk cNV aZm smK @@ -98692,12 +99063,71 @@ azA azA azA azA -lPN -lPN -lPN -lPN -lPN -lPN +ecE +pka +azA +azA +glZ +glZ +glZ +qmk +qmk +qmk +glZ +qmk +qmk +qmk +glZ +glZ +glZ +mZc +mcI +jBl +isS +eDX +jKr +voU +jBl +tfP +brQ +jqt +jqt +jqt +jqt +jqt +jqt +jqt +lmd +azA +lbC +jZF +uVn +weO +hxj +wwj +eOR +eOv +uBz +cBO +mGu +uBz +nFm +oCk +qmk +qmk +glZ +glZ +snR +qfO +nrq +azA +wNx +aWT +fbI +nrq +azA +azA +azA lPN tOk rin @@ -98724,9 +99154,9 @@ azA azA azA azA -azA -azA -azA +eyn +eyn +eyn rkv "} (55,1,1) = {" @@ -98909,65 +99339,6 @@ gwF azA azA hKk -azA -azA -azA -tdR -yjr -rdk -dZQ -nLc -qjd -bBF -yba -axO -axO -axO -axO -axO -axO -vgK -ijk -axO -axO -vgK -ijk -axO -azA -azA -ecE -pka -azA -azA -azA -azA -azA -ner -uVn -egT -egT -egT -egT -egT -sra -uJq -uJq -egT -kge -egT -egT -ncc -ncc -wEh -iJF -lki -egT -uVn -sLI -azA -azA -azA -azA qgq gLK cNV @@ -98987,19 +99358,78 @@ ieA azA azA azA -dzm azA +azA +azA +azA +azA +azA +azA +ecE +pka +azA +azA +glZ +adR +olg +xty +mOk +mOF +qmk +mOF +uhs +qWI +nUe +rHn +tlK +mZc +azA +ahs +uVn +lmd +mUU dzm -dzm +ahs +bDm +hpp +cgG +acP +jqt +jqt +jGd +jBW +jBW +lmd +nLA +azA +jZF +uVn +lLC +hxj +hxj +qmk +hak +uBz +uBz +mGu +uBz +uBz +uBz +qmk +azA +azA +azA +snR +qfO +xkl +azA +azA +tsU +qfO +nrq azA azA azA -lPN -nmA -fwp -fwp -fwp -cRJ lPN alA rin @@ -99026,9 +99456,9 @@ azA azA azA azA -azA -azA -azA +eyn +eyn +eyn rkv "} (56,1,1) = {" @@ -99043,11 +99473,11 @@ azA azA azA eXq -hfc rFk -eIL rFk -hKe +rFk +rFk +rFk eXq azA azA @@ -99211,65 +99641,6 @@ gwF azA azA hKk -azA -axO -axO -axO -iNn -rdk -suy -jBW -ngc -fGa -yba -rdk -qAP -ggF -xvq -aeE -eco -vxq -cSH -ymf -qrg -mBm -xom -eTC -axO -azA -ecE -pka -azA -azA -azA -azA -azA -ner -qZA -egT -ixw -nUb -mOF -tqr -mNW -uJq -oQd -egT -kHN -lQf -egT -wEh -avt -rnV -jUl -wEh -egT -uVn -sLI -ndZ -rDi -rDi -uhS qgq pBX smK @@ -99292,16 +99663,75 @@ azA azA azA azA -dzm azA azA azA -lPN -stT -fwp +azA +ecE +pka +azA +azA +glZ +bqM +rHn +udU +mOF +hQM +qmk +rEV +tGc +qil +kVy +avq +rHn +mZc +jJH +ahs +uVn +lmd +azA +nLA +ahs +tfP +jqt +jqt +jqt +jqt +nmF +jqt +jqt +jqt +lmd +azA +azA +jZF +isS +weO +hxj +hxj +nUf hPz -fwp -fwp +hPz +uBz +rOQ +mGu +uBz +tcf +qmk +azA +azA +ndZ +dPr +qfO +qfO +cyW +azA +qfO +qfO +nrq +azA +azA +azA lPN uZd rin @@ -99328,9 +99758,9 @@ azA azA azA azA -azA -azA -azA +eyn +eyn +eyn rkv "} (57,1,1) = {" @@ -99345,11 +99775,11 @@ azA azA azA eXq -aaz rFk rFk rFk -hKe +rFk +rFk eXq azA azA @@ -99513,65 +99943,6 @@ gwF azA azA hKk -azA -axO -mfx -jRZ -wnP -rdk -rdk -nNR -yba -rdk -rdk -rdk -rdk -rdk -rdk -rdk -pyY -ozC -rdk -rdk -rdk -vxq -rdk -rPH -axO -axO -ecE -pka -azA -azA -azA -azA -azA -ner -qZA -egT -fhl -rHn -rHn -tqr -hpp -egT -tyt -egT -egT -ioi -egT -vOh -vfS -wEh -ncc -cpq -egT -qZA -sLI -snR -hYR -cBf -nrq qgq fKR smK @@ -99590,20 +99961,79 @@ xhq rRG azA azA +azA +azA +azA +azA +azA +azA +azA +azA +ecE +pka +azA +azA +qmk +euC +rjg +mNW +wsn +uhs +glZ +rdc +tqr +tqr +hIG +mOF +bqM +sqv +hbn +mzb +uVn +lmd +iEF +bLE +ahs +cpq +jBW +jBW +nmF +jqt +fYd +jGd +tvQ +jGd +lmd +dzm +fdS +ahs +uVn +lLC +hxj +wwj +nUf +tTU +eOv +oCk +bcP +mGu +uBz +uBz +glZ +azA ndZ -rDi -rDi -rDi -uhS +dPr +cBf +cBx +nrq +azA +azA +uzn +gAg +ctN azA azA azA -lPN -nVz -fwp -fwp -dhC -fwp lPN azq rin @@ -99630,9 +100060,9 @@ azA azA azA azA -azA -azA -azA +eyn +eyn +eyn rkv "} (58,1,1) = {" @@ -99647,11 +100077,11 @@ jKr azA azA eXq -kib rFk rFk rFk -tQx +rFk +rFk eXq azA azA @@ -99815,72 +100245,13 @@ gwF azA azA hKk -azA -axO -pyY -rdk -ozC -rdk -jCV -jZF -swK -mOk -vxq -rdk -mOk -wsn -gMb -mOk -gtb -rdk -rup -flS -fpo -rdk -jkv -rdk -nvC -wWn -ecE -pka -azA -azA -azA -azA -azA -ner -qZA -egT -enA -mNW -ijZ -qUT -vle -egT -nrR -tqr -egT -ioi -egT -qgV -tEu -lCr -biF -vAW -egT -fKQ -sLI -gAg -wTQ -wTQ -ctN qgq lcl kYf smK ktq bZO -uup +jCV smK smK smK @@ -99892,20 +100263,79 @@ tWk ieA azA azA -snR +azA +azA +azA +azA +azA +azA +azA +azA +ecE +pka +azA +oMd +laF +idu +rHn +uAs +rHn +mOF +rod +rHn +mOF +qUT +mOF +mOF +mOF +sqv +wHc +ahs +uVn +lmd +aUc +pbH +ahs +tfP +svH +jqt +vfR +jqt +jqt +jqt +uAZ +jqt +lmd +azA +mUU +mzb +uVn +weO +hxj +hxj +glZ +hak +hak +uBz +uBz +uBz +uBz +oCk +glZ +ndZ +dPr cBf cBf cBf -kJH +nrq +azA +ndZ +wfv +uhS +azA azA azA azA -lPN -fwp -fwp -bFY -fwp -fwp lPN xRp uZd @@ -99932,9 +100362,9 @@ azA azA azA azA -azA -azA -azA +eyn +eyn +eyn rkv "} (59,1,1) = {" @@ -99949,11 +100379,11 @@ dzm azA azA eXq -oCy rFk rFk rFk -xPY +rFk +rFk eXq azA jWe @@ -99997,7 +100427,7 @@ mWz mWz hYq ner -erZ +azA qhE azA azA @@ -100117,65 +100547,6 @@ gwF azA azA hKk -azA -axO -rdk -laF -iBY -rdk -qzi -mvC -fBy -uSv -rdk -rdk -vZc -mOk -hHP -enj -xOi -iSc -rhA -xnp -rdk -rdk -rdk -rdk -ybL -xaK -ecE -pka -azA -azA -azA -azA -azA -ner -dwV -egT -rHn -uJq -rHn -uJq -uJq -egT -udU -bYA -egT -sLe -egT -bDm -egT -uOD -egT -bDm -egT -fKQ -sLI -azA -azA -azA -azA qgq lcl waD @@ -100194,21 +100565,80 @@ mlw ieA azA azA +azA +azA +azA +azA +azA +azA +azA +azA +ecE +pka +azA +oMd +laF +xMY +gyr +udU +dwV +rHn +bqM +mOF +oHa +mOF +mKb +mKb +qmk +bYA +wGw +ahs +uVn +lmd +cbD +lbC +ahs +qhy +let +jBW +hct +jqt +jqt +jGd +aaC +jGd +lmd +azA +jXH +qzA +izU +lLC +rvi +rvi +glZ +glZ +glZ +qmk +qmk +qmk +glZ +glZ +glZ snR -pMm cBf cBf -xty -azA +cBf +jMn +ctN +ndZ +hUC +cBf +kiP +wfv +uhS azA azA lPN -fwp -dhC -fwp -fwp -fwp -rLk uZd uZd uZd @@ -100234,9 +100664,9 @@ azA azA azA azA -azA -azA -azA +eyn +eyn +eyn rkv "} (60,1,1) = {" @@ -100250,12 +100680,12 @@ azA azA azA azA -eXq -tQx +ueJ +rFk +rFk rFk rFk rFk -oCy eXq azA jXc @@ -100301,7 +100731,7 @@ xUy ner aUc mEj -erZ +azA azA qhE ahs @@ -100419,65 +100849,6 @@ azA azA azA hKk -azA -axO -fnx -qjq -laY -rdk -rdk -yba -rdk -rNa -rdk -rdk -rdk -vxq -rdk -rdk -rdk -rdk -rdk -ozC -rdk -kjL -pyY -fOT -axO -axO -ecE -pka -azA -azA -azA -azA -azA -ner -uVn -egT -hot -rHn -mNW -mNW -ajU -egT -eDa -rjg -egT -fKQ -uVn -fRi -ioi -xNr -qZA -fRi -qZA -fKQ -sLI -azA -azA -azA -azA qgq ght smK @@ -100496,21 +100867,80 @@ bmV ieA azA azA +azA +azA +azA +azA +azA +azA +azA +azA +ecE +pka +azA +azA +qmk +tCQ +wsX +mOF +mOF +mOF +hot +piG +rHn +rHn +enA +uhs +eDa +vmR +uVn +wid +uVn +sqF +bpA +grJ +jQw +hfR +erZ +acP +jqt +jqt +jqt +jqt +jqt +dnB +uVn +bpA +grJ +apx +ioi +uoK +hKX +hKX +prA +azA +voU +azA +azA +azA +azA +azA +azA snR +pMm cBf cBf -cBf -qDl +nrq azA +gAg +jbl +cBf +cBf +cBf +dEl azA azA lPN -fwp -fwp -fwp -fwp -fwp -lPN jkt lxE lxE @@ -100536,9 +100966,9 @@ azA azA azA azA -azA -azA -azA +eyn +eyn +eyn rkv "} (61,1,1) = {" @@ -100554,9 +100984,9 @@ azA azA eXq eXq -ulJ -ulJ -ulJ +rFk +rFk +rFk eXq eXq lhS @@ -100602,7 +101032,7 @@ uQH uQH mUB cXl -erZ +azA azA azA aUc @@ -100720,66 +101150,7 @@ azA azA azA azA -hKk -azA -axO -jGd -kMT -gcP -cSH -rdk -ozC -skZ -rdk -rdk -rdk -kKl -rnE -aaC -nkV -ayd -qil -uQU -aso -rdk -uQU -kSD -axO -axO -qOr -ecE -pka -azA -azA -azA -azA -azA -ner -uVn -egT -mKb -rHn -uJq -rHn -yjK -egT -lfS -lfS -egT -uVn -peg -tZf -pAh -fKQ -psn -tZf -nCG -fKQ -sLI -azA -azA -azA -azA +hKk qgq fLc jzv @@ -100798,20 +101169,79 @@ cGb ieA azA azA +azA +azA +azA +azA +azA +azA +azA +azA +ecE +pka +azA +azA +qmk +gpT +nIl +isM +pVI +jUl +mKb +mKb +uJq +rHn +yjK +eWg +qmk +lfS +kbY +ahs +uVn +eDX +nAH +gBo +nEj +cpq +xHX +jGd +mjp +mjp +jqt +jBW +jGd +jlT +uVn +nAH +gBo +nEj +ioi +eDX +azA +azA +azA +azA +azA +azA +voU +azA +eyc +azA +azA +snR +cBf +cBf +cBf +nrq +bKN +azA gAg -wTQ -wTQ -wTQ +jbl +cBf +nDt ctN azA azA -azA -lPN -iEF -iEF -iEF -iEF -iEF lPN lPN lPN @@ -100838,9 +101268,9 @@ azA azA azA azA -azA -azA -azA +eyn +eyn +eyn rkv "} (62,1,1) = {" @@ -100853,13 +101283,13 @@ azA azA azA azA -azA -ner -lmd -wMG -tVb +hay +mUB +uVn smK -ahs +smK +smK +uVn ilA uQH uQH @@ -101023,66 +101453,7 @@ azA azA azA hKk -azA -axO -axO -axO -axO -axO -axO -rpZ -eTC -wUg -qWN -wUg -vgK -axO -axO -axO -vgK -ijk -axO -cym -cym -axO -vgK -axO -qOr -gzB -ecE -pka -azA -azA -azA -azA -azA -mUB -uVn -egT -egT -ebh -pzF -egT -cbK -egT -egT -egT -egT -uVn -uVn -uVn -uVn -fKQ -fKQ -uYI -fKQ -fKQ -kAJ -uQH -uQH -uQH -uQH -olg +wnP xVJ xVJ xVJ @@ -101091,7 +101462,7 @@ wVI nlf jqt bzf -qzA +aOB rRG rRG ieA @@ -101108,12 +101479,71 @@ azA azA azA azA +ecE +pka azA +uVn +qmk +glZ +ebh +ebh +qmk +qmk +ebh +ebh +qmk +qmk +ebh +qmk +qmk +lfU +lfU ahs -dGA -dGA -dGA -sJc +uVn +sqF +tMH +bff +jQw +tfP +jqt +mjp +cKE +dkV +mjp +jqt +rcq +jqt +uVn +tMH +bff +jQw +yae +sqF +azA +azA +voU +azA +azA +azA +azA +azA +azA +azA +azA +gAg +wTQ +wTQ +wTQ +ctN +wKh +azA +azA +gAg +wTQ +ctN +azA +azA +azA azA azA azA @@ -101140,9 +101570,9 @@ azA azA azA azA -azA -azA -azA +eyn +eyn +eyn rkv "} (63,1,1) = {" @@ -101155,13 +101585,13 @@ uQH uQH uQH uQH -uQH mUB -lmd -wMG +eAw +eAw +smK smK smK -uXT +eAw eAw eAw eAw @@ -101330,10 +101760,10 @@ moC moC moC moC -aDJ -moC -moC -moC +byK +smK +smK +smK bNO moC moC @@ -101354,39 +101784,54 @@ moC moC moC moC -aDJ -moC -moC -moC -moC -moC -moC -moC -moC -moC -moC -moC -moC -moC -moC moC moC moC +dgW +dgW moC moC +dgW +dgW moC moC moC -aDJ moC moC moC moC +jQw +uVn +isS +sqF +jQw +uVn moC moC +cKE +cNV +cKE +cKE +cKE moC moC +uVn +sqF +jQw +uVn +uVn +uVn +bDg +uVn +uVn +uVn moC +fBy +xcL +xcL +ckK +ckK +rOi moC moC moC @@ -101404,21 +101849,6 @@ moC moC moC moC -moC -moC -moC -moC -moC -aDJ -moC -dGA -dGA -dGA -dGA -dGA -moC -moC -moC uXW nMj nMj @@ -101677,14 +102107,14 @@ smK smK smK smK -cNV -smK -smK -smK -smK -smK +cNV smK smK +cNV +cNV +cKE +cKE +cKE smK smK smK @@ -101763,9 +102193,9 @@ smK smK smK smK -xeI smK -cNV +smK +smK smK smK smK @@ -101982,10 +102412,10 @@ lxu cNV cNV cNV -smK -smK -smK -smK +cNV +cKE +cKE +cKE cNV cNV smK @@ -102066,8 +102496,8 @@ smK smK smK smK -lxu -cNV +smK +smK cNV smK smK @@ -102287,7 +102717,7 @@ smK cNV cNV smK -smK +kds smK smK smK @@ -102364,12 +102794,12 @@ cNV smK cNV cNV -oAa -gnk -gnk -lXj -nFK -obF +smK +smK +smK +smK +smK +smK smK smK smK @@ -104556,7 +104986,7 @@ efV hAK hAK hAK -ihu +hAK efV efV efV @@ -105166,7 +105596,7 @@ hWa fQd hAK hAK -ihu +hAK hAK dgF hmV @@ -105333,7 +105763,7 @@ azA azA azA azA -dzm +azA azA azA azA @@ -105474,7 +105904,7 @@ xYk ivH xoR rSs -hMU +efV vrB cJU azA @@ -106536,11 +106966,11 @@ azA azA azA azA -ndZ -rDi -rDi -rDi -uhS +azA +azA +azA +azA +azA azA azA azA @@ -106839,7 +107269,7 @@ azA azA azA snR -hjd +cBf cBf cBf nrq @@ -107574,7 +108004,7 @@ sBd jCe jCe yhi -pwi +qVq hAK efV hEG @@ -107583,7 +108013,7 @@ iaE voC mzq efV -ihu +hAK qVq oWl ksz @@ -107791,39 +108221,39 @@ rkv "} (85,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ azA azA igE @@ -107999,7 +108429,7 @@ azA azA azA eTU -hfm +tlA pwX qVm tMl @@ -108093,39 +108523,39 @@ rkv "} (86,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +vFU +vFU +vFU +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ azA azA igE @@ -108395,39 +108825,39 @@ rkv "} (87,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +tDJ +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +rRz +rRz +rRz +rRz +rRz +rRz +rRz +vFU +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ +tDJ azA azA igE @@ -108697,38 +109127,38 @@ rkv "} (88,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +tDJ +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +kMT +fnx +kMT +eco +hWU +rRz +rRz +rRz +rRz +rRz +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ azA azA azA @@ -108905,7 +109335,7 @@ azA azA azA lyR -dUJ +icG pwX fZC nrD @@ -108999,38 +109429,38 @@ rkv "} (89,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +fnx +fnx +fnx +nNR +ijk +yba +xvq +eSX +rRz +rRz +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ azA azA azA @@ -109301,38 +109731,38 @@ rkv "} (90,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +tdR +fnx +fnx +kMT +rRz +fTI +rRE +ume +kMT +rRz +rRz +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ azA azA azA @@ -109509,7 +109939,7 @@ azA azA azA nnU -svH +tlA pwX pwX pRT @@ -109603,38 +110033,38 @@ rkv "} (91,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +vFU +vFU +vFU +vFU +vFU +vFU +vFU +hWU +kMT +kMT +kMT +rRz +rRz +fTI +hWU +biF +kMT +qjq +rRz +vFU +vFU +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ +tDJ azA vLk vLk @@ -109812,7 +110242,7 @@ azA azA rmL tRA -fhs +dcB vHT jjj iQM @@ -109905,38 +110335,38 @@ rkv "} (92,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +vFU +vFU +vFU +vFU +vFU +vFU +cRC +hWU +kMT +nkV +rRz +rRz +rRz +rRz +sSf +kMT +nkV +ybL +rRz +vFU +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ +tDJ +tDJ azA vLk tML @@ -110207,36 +110637,36 @@ rkv "} (93,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +vFU +vFU +vFU +vFU +vFU +vFU +hHP +flS +oZf +rRz +rRz +rRz +rRz +rRz +rRz +ykk +egv +kMT +rRz +vFU +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ azA azA azA @@ -110509,36 +110939,36 @@ rkv "} (94,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +vFU +vFU +vFU +vFU +vFU +vFU +cRC +hWU +hWU +oky +oky +oky +nIX +rRz +rRz +rRz +rRz +sSf +rRz +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ +tDJ azA azA azA @@ -110597,7 +111027,7 @@ qaQ idG hAK hAK -fUa +imq efV efV imq @@ -110811,36 +111241,36 @@ rkv "} (95,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +vFU +vFU +vFU +vFU +rRz +rRz +vFU +hWU +gBQ +fIM +ume +hWU +kMT +lUg +rRz +rRz +rRz +rRz +rRz +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ +tDJ azA azA azA @@ -111113,36 +111543,36 @@ rkv "} (96,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +vFU +vFU +vFU +vFU +vFU +rRz +rRz +vFU +tgU +hWU +hWU +hWU +hWU +qyx +kMT +kMT +kMT +rRz +rRz +rRz +rRz +rRz +rRz +vFU +vFU +vFU +vFU +tDJ +tDJ azA azA azA @@ -111415,36 +111845,36 @@ rkv "} (97,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +vFU +vFU +vFU +vFU +rRz +rRz +vFU +vFU +vFU +vFU +vFU +eWG +hWU +jBi +nkV +kMT +fnx +fnx +tdR +rRz +rRz +rRz +rRz +rRz +rRz +vFU +tDJ +tDJ azA azA azA @@ -111717,36 +112147,36 @@ rkv "} (98,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +vFU +vFU +vFU +vFU +rRz +rRz +rRz +rRz +rRz +vFU +vFU +vFU +hWU +hWU +hWU +tdR +fnx +tdR +flS +hWU +hWU +rRz +rRz +rRz +rRz +rRz +tDJ +tDJ azA azA azA @@ -112019,36 +112449,36 @@ rkv "} (99,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +vFU +vFU +vFU +vFU +vFU +vFU +rRz +rRz +rRz +rRz +rRz +vFU +vFU +vFU +vFU +vFU +vFU +rRz +rRz +xvq +sFB +bRU +hWU +hWU +rRz +rRz +rRz +tDJ azA azA azA @@ -112113,7 +112543,7 @@ rtC rtC ggY hAK -hMU +efV qVq fwA hAK @@ -112321,36 +112751,36 @@ rkv "} (100,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +vFU +vFU +bzw +tdR +hWU +vFU +vFU +vFU +rRz +rRz +rRz +rRz +rRz +rRz +vFU +vFU +vFU +rRz +rRz +rRz +uwq +kMT +kMT +kMT +kMT +nkV +rRz +tDJ azA azA azA @@ -112623,36 +113053,36 @@ rkv "} (101,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +tdR +tdR +flS +hWU +hWU +vFU +vFU +rRz +rRz +rRz +rRz +rRz +rRz +rRz +rRz +rRz +rRz +rRz +rRz +rRz +rRz +nNR +kMT +tdR +tdR +xvq +tDJ azA azA azA @@ -112925,36 +113355,36 @@ rkv "} (102,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +tdR +vFU +vFU +hWU +hWU +hWU +vFU +vFU +vFU +rRz +vFU +rRz +rRz +rRz +rRz +rRz +rRz +rRz +rRz +hWU +kMT +kMT +tdR +tdR +lki +vFU +tDJ azA azA azA @@ -113073,7 +113503,7 @@ cAZ oUO vYt nLx -psg +nLx cAZ azA azA @@ -113227,36 +113657,36 @@ rkv "} (103,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +aZV +vFU +vFU +vFU +tgU +gBQ +oky +oky +oky +nvC +vFU +rRz +rRz +rRz +rRz +rRz +rRz +hWU +ymf +vSr +uBL +kMT +hWU +hWU +vFU +tDJ +tDJ azA azA azA @@ -113529,35 +113959,35 @@ rkv "} (104,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +vFU +rRz +rRz +vFU +hWU +ncc +wnm +tdR +tdR +wUg +hWU +kMT +rRz +rRz +rRz +rRz +wUg +hWU +hWU +fpo +hWU +wUg +vFU +vFU +vFU +tDJ azA azA azA @@ -113831,35 +114261,35 @@ rkv "} (105,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +rRz +rRz +vFU +vFU +hWU +hWU +hWU +vFU +tdR +tdR +hWU +kMT +kMT +hWU +hWU +rRz +tdR +hWU +kMT +rVi +gBQ +vFU +vFU +vFU +tDJ +tDJ azA azA azA @@ -114133,35 +114563,35 @@ rkv "} (106,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +rRz +vFU +vFU +hWU +hWU +kMT +vFU +vFU +vFU +tdR +hWU +hWU +nml +hWU +fnx +tdR +nAV +nAV +myO +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ azA azA azA @@ -114222,7 +114652,7 @@ qVq rrR hAK hAK -ihu +hAK hAK hAK efV @@ -114435,36 +114865,36 @@ rkv "} (107,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +rRz +vFU +hWU +hWU +kMT +tEu +vFU +rRz +rRz +vFU +vFU +vFU +vFU +kMT +kMT +fnx +vFU +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ +tDJ +tDJ azA azA azA @@ -114737,36 +115167,36 @@ rkv "} (108,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +vFU +vFU +hWU +hWU +kMT +hWU +vFU +vFU +rRz +rRz +rRz +vFU +vFU +tiL +lUg +bBF +vFU +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ +tDJ +tDJ azA azA azA @@ -114819,7 +115249,7 @@ eUj aZt wzW qVq -let +oPv jle pOi qVq @@ -114831,7 +115261,7 @@ hAK hWa tqQ iFu -ihu +hAK efV rrR rrR @@ -115039,36 +115469,36 @@ gXH "} (109,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +vFU +hWU +hWU +kMT +hWU +hWU +hWU +hWU +vFU +vFU +rRz +rRz +vFU +eWG +qyx +wkQ +vFU +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ +tDJ +tDJ azA azA azA @@ -115123,7 +115553,7 @@ wzW qVq sQJ oPv -let +oPv qVq rrR eTF @@ -115341,35 +115771,35 @@ gXH "} (110,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +ymf +wUg +kMT +hWU +qWN +yba +hWU +hWU +hWU +vFU +vFU +rRz +vFU +vFU +xdg +pzF +vFU +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ +tDJ azA azA azA @@ -115643,35 +116073,35 @@ gXH "} (111,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +hWU +hWU +flS +hWU +tdR +bZd +acf +hWU +hWU +gBQ +vFU +rRz +vFU +vFU +byR +hWU +ozC +vFU +vFU +vFU +vFU +vFU +vFU +tDJ +tDJ +tDJ azA azA azA @@ -115726,7 +116156,7 @@ aZt wzW qVq oPv -let +oPv xav adp rrR @@ -115945,36 +116375,36 @@ rkv "} (112,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +lki +hWU +tdR +tdR +wUg +hWU +hWU +ncc +hWU +hWU +vFU +rRz +vFU +ntH +hWU +gBQ +ncc +rqP +vFU +vFU +vFU +vFU +tDJ +tDJ +tDJ +tDJ +tDJ azA azA azA @@ -116247,37 +116677,37 @@ rkv "} (113,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +hWU +hWU +gBQ +rRz +rRz +hWU +bFS +biF +hWU +flS +vFU +rRz +vFU +vFU +mjH +gtb +kMT +aZi +vFU +vFU +vFU +vFU +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ azA azA azA @@ -116331,7 +116761,7 @@ wzW qVq oPv oPv -let +oPv qVq ptJ qVq @@ -116549,37 +116979,37 @@ rkv "} (114,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +hWU +hWU +rRz +rRz +rRz +rRz +hWU +hWU +lgi +hWU +vFU +rRz +rRz +vFU +vFU +jfb +hWU +qOr +vFU +vFU +vFU +tDJ +tDJ +tDJ azA azA -yfv -yfv +tDJ +tDJ azA azA dzm @@ -116851,38 +117281,38 @@ rkv "} (115,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +hWU +lUG +rRz +rRz +tDJ +tDJ +rRz +hWU +hWU +vFU +vFU +rRz +rRz +rRz +rRz +vFU +mTb +oZf +vFU +vFU +tDJ +tDJ +tDJ azA azA azA -yfv -yfv -yfv +tDJ +tDJ +tDJ azA azA dzm @@ -117153,37 +117583,37 @@ rkv "} (116,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +tDJ +rRz +rRz +tDJ +tDJ +tDJ +tDJ +vFU +vFU +rRz +rRz +tDJ +tDJ +tDJ +rRz +vFU +mjH +oZf +vFU +tDJ +tDJ +tDJ +tDJ azA azA azA -yfv -yfv +tDJ +tDJ azA azA azA @@ -117455,30 +117885,30 @@ rkv "} (117,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +aMe +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +xdg +oZf +tDJ +tDJ azA azA azA @@ -117544,7 +117974,7 @@ qVq rrR kGP qVq -uvn +cAP ddY bJW uhh @@ -117757,30 +118187,30 @@ rkv "} (118,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ azA azA -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv -yfv +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tDJ +tUc +aqx +xdg +oZf +aqx +tDJ azA azA azA @@ -117842,7 +118272,7 @@ tYG qVq qVq tYG -uvn +kBU rrR nbO idZ @@ -118059,17 +118489,12 @@ rkv "} (119,1,1) = {" rkv -yfv -yfv -yfv -yfv -yfv -yfv -azA -azA -azA -azA -azA +tDJ +tDJ +tDJ +tDJ +tUc +tDJ azA azA azA @@ -118083,6 +118508,11 @@ azA azA azA azA +igE +mjH +hWU +rqP +nuY azA azA azA @@ -118361,15 +118791,10 @@ rkv "} (120,1,1) = {" rkv -yfv -yfv -yfv -yfv -azA -azA -azA -azA -azA +tDJ +tDJ +tDJ +tDJ azA azA azA @@ -118386,6 +118811,11 @@ azA azA azA azA +hHA +mjH +hWU +hWU +yky azA azA azA @@ -118663,13 +119093,9 @@ rkv "} (121,1,1) = {" rkv -yfv -rRz -rRz -azA -azA -azA -azA +tDJ +tDJ +tDJ azA azA azA @@ -118688,6 +119114,10 @@ azA azA azA azA +waj +hHA +hfc +yky azA azA azA @@ -118965,9 +119395,8 @@ rkv "} (122,1,1) = {" rkv -rRz -rRz -rDi +tDJ +tDJ rDi rDi rDi @@ -118989,6 +119418,7 @@ rDi rDi rDi rDi +weQ rDi rDi rDi @@ -119267,8 +119697,8 @@ rkv "} (123,1,1) = {" rkv -rRz -cBf +tDJ +nPH cBf cBf cBf @@ -124021,7 +124451,7 @@ rRq uOQ fRo hAE -jJH +oJa rRq mvc azA @@ -124318,7 +124748,7 @@ azA azA azA mvc -nPV +uOQ rRq dYT rRq @@ -124925,7 +125355,7 @@ vBQ cBf cBf nDt -aFU +wTQ wTQ wTQ wTQ @@ -125204,7 +125634,7 @@ dzm xOE sJc mUx -wjo +eIF pxi azA azA @@ -127019,7 +127449,7 @@ jio nqd vFX vFX -hfm +tlA pxi azA azA @@ -129855,7 +130285,7 @@ xXx yjy cUl pgM -mzb +nre wMd ttG jDh @@ -131666,13 +132096,13 @@ xXx xXx yjy qFp -tqs +dyZ fyb haU haU nre nre -bpA +jUa jUa hcr yjy @@ -132278,7 +132708,7 @@ bxj fyb hZa hZa -bpA +jUa nre uTh yjy @@ -132586,7 +133016,7 @@ nre vsz dyZ fyb -dsH +fyb dyZ idX nNa @@ -133186,7 +133616,7 @@ quR ymg xMi mOc -bpA +jUa ekf lxe fyb @@ -133785,9 +134215,9 @@ fyb dyZ qXD dcR -mzb +nre +pol pol -cKD pol pol nre @@ -133795,7 +134225,7 @@ ekf sXf dyZ fyb -dsH +fyb cGO yjy arq @@ -139300,7 +139730,7 @@ hWJ hWJ jde dtR -fwi +rlV svq aJr rlV @@ -142888,7 +143318,7 @@ omK jVM xXx hrk -fwi +rlV uVo ykH xrw @@ -143190,7 +143620,7 @@ vBZ jVM xXx hrk -fwi +rlV wQf fYB flI @@ -149579,7 +150009,7 @@ yfv lmd snK eUj -jBl +lwj eUj eUj cKE @@ -150189,7 +150619,7 @@ nYw nYw jGh jOI -uAZ +ihh cKE cKE xnd @@ -150850,7 +151280,7 @@ iWl nNb fKj qRs -jMn +qRs iWl nNb fKj @@ -150860,7 +151290,7 @@ iWl nNb fKj qRs -jMn +qRs iWl uVn uVn @@ -151389,7 +151819,7 @@ azA azA azA lmd -iUj +wMG uKr akf wfe @@ -152262,7 +152692,7 @@ cBf cBf cBf cBf -bGH +cBf cBf nDt fMj @@ -152369,7 +152799,7 @@ smK smK smK smK -dJl +smK uVn aQW uVn @@ -152607,7 +153037,7 @@ xdb xdb ihh ahG -niA +eUj eUj cKE ahs @@ -152667,7 +153097,7 @@ eUj smK smK smK -hfm +tlA uVn uVn uVn @@ -153018,7 +153448,7 @@ avG avG avG avG -hiN +pYn dAV avG avG @@ -153171,7 +153601,7 @@ azA azA azA azA -erZ +azA azA azA azA @@ -153505,7 +153935,7 @@ azA lmd snK bNL -hbn +jYA sWz bEl ahG @@ -153573,7 +154003,7 @@ smK smK tlA tlA -lKJ +pdJ qRs xRN qRs @@ -153618,9 +154048,9 @@ rvE dAV rvE rvE -hiN +pYn ppb -hiN +pYn rvE rvE dAV @@ -154181,7 +154611,7 @@ uUG iWl iJW pIe -jMn +qRs qRs iWl uVn @@ -154231,7 +154661,7 @@ qUI rvE rvE rvE -hiN +pYn gsh uKY guM @@ -155080,7 +155510,7 @@ qRs qRs iWl qRs -jMn +qRs qRs iWl tNu @@ -155383,7 +155813,7 @@ wqz iWl qRs qRs -jMn +qRs iWl fKO tNu @@ -155730,7 +156160,7 @@ azA gsh rvE rvE -jLb +rvE rvE xhZ avG @@ -155959,7 +156389,7 @@ ahs qoc izU izO -eqx +uyr eCG koU foe @@ -156283,7 +156713,7 @@ wTQ ctN azA iWl -mcI +tNu qlh uxg qRs @@ -156295,7 +156725,7 @@ tNu uxg pGz cnS -niG +cnS kdI iWl uVn @@ -157495,7 +157925,7 @@ cnS cnS huo qza -gHY +lYp nnK cnS ikv @@ -157569,10 +157999,10 @@ azA azA hAI odS -uJV +qTg +odS odS odS -sHC sVG odS odS @@ -158175,7 +158605,7 @@ hAI odS odS ciI -sHC +odS fap odS odS @@ -159382,11 +159812,11 @@ rRz hAI lNo odS -sHC +odS pCb odS odS -sHC +odS raj azA gcH @@ -159919,7 +160349,7 @@ cnS cnS atI cnS -niG +cnS fYN iWl uVn @@ -159989,7 +160419,7 @@ odS odS odS odS -sHC +odS odS raj azA @@ -160825,7 +161255,7 @@ nNb hJa iJb sFI -oTk +ikv cyj cei uVn @@ -164129,10 +164559,10 @@ azA azA opY mSO -drA pJS pJS -drA +pJS +pJS iPu opY azA @@ -165038,7 +165468,7 @@ qqW ski pJS jgc -wIC +jgc jgc opY fag @@ -165942,7 +166372,7 @@ azA opY jgc jgc -wIC +jgc jgc opY opY From 1662ab519d63fe76503c38670fe122bf247e0f61 Mon Sep 17 00:00:00 2001 From: Defaulterrama <136886118+Defaulterrama@users.noreply.github.com> Date: Fri, 6 Mar 2026 00:02:38 -0500 Subject: [PATCH 4/6] Update Vegas_Valley_Surface.dmm --- .../Vegas Valley/Vegas_Valley_Surface.dmm | 77 ++++--------------- 1 file changed, 14 insertions(+), 63 deletions(-) diff --git a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm index b39c0b3f23..3dcb8a0ccd 100644 --- a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm +++ b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm @@ -11152,9 +11152,6 @@ pixel_y = 24; pixel_x = 16 }, -/obj/effect/decal/cleanable/blood{ - icon_state = "floor6" - }, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "dqb" = ( @@ -25093,7 +25090,7 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "hql" = ( -/obj/structure/sign/flag_texas, +/obj/structure/sign/poster/ncr/irradiated_food, /turf/closed/wall/f13/wood/interior, /area/f13/ncr) "hqn" = ( @@ -30502,10 +30499,6 @@ pixel_y = -4; pixel_x = -16 }, -/obj/effect/decal/cleanable/blood{ - icon_state = "gib2"; - pixel_y = 4 - }, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "iUB" = ( @@ -38829,8 +38822,6 @@ dir = 1; pixel_x = -16 }, -/obj/effect/decal/cleanable/blood, -/obj/item/reagent_containers/spray/pepper, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "ltA" = ( @@ -41349,10 +41340,6 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/building/abandoned/q) -"mgt" = ( -/obj/item/wirecutters, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "mgC" = ( /obj/structure/table/wood, /turf/open/indestructible/ground/outside/dirt, @@ -48138,12 +48125,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) -"ohJ" = ( -/obj/structure/table/wood/junk, -/obj/item/melee/baton/cattleprod, -/obj/item/melee/classic_baton/militarypolice, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "ohO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/wood{ @@ -56286,10 +56267,6 @@ }, /turf/open/floor/wood_common, /area/maintenance/bar) -"qAq" = ( -/obj/item/defibrillator/primitive, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "qAu" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -59406,8 +59383,10 @@ }, /area/f13/wasteland/legion) "ruJ" = ( -/obj/structure/sign/poster/official/ion_rifle, -/turf/closed/wall/mineral/brick, +/obj/structure/rack/shelf_metal, +/obj/item/melee/classic_baton/militarypolice, +/obj/item/melee/classic_baton/militarypolice, +/turf/open/floor/wood_common/wood_common_light, /area/f13/ncr) "ruW" = ( /obj/structure/chair/wood{ @@ -59591,10 +59570,6 @@ }, /turf/closed/wall/f13/tentwall, /area/f13/wasteland) -"ryS" = ( -/obj/item/reagent_containers/spray/pepper/empty, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "rzf" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -63762,10 +63737,6 @@ /obj/structure/cable/outdoors{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/blood{ - dir = 8; - icon_state = "tracks" - }, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "sJV" = ( @@ -63967,26 +63938,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"sMw" = ( -/obj/structure/cable/outdoors{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/blood{ - dir = 8; - icon_state = "tracks" - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) -"sMA" = ( -/obj/structure/cable/outdoors{ - icon_state = "1-4" - }, -/obj/effect/decal/cleanable/blood{ - dir = 8; - icon_state = "tracks" - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/ncr) "sMD" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalbottombordertop0" @@ -84452,7 +84403,7 @@ mmm ned ned mmm -sMA +rdi dpi hkO rkv @@ -85048,15 +84999,15 @@ cjF hdP rVP rVP -mnl +ruJ jwS fwg ffB uaE hkO hkO -mgt -sMw +uaE +ffB iUu hkO rkv @@ -85356,8 +85307,8 @@ nwb qmJ jwS hkO -qAq -ryS +uaE +uaE pnz uaE hkO @@ -85659,7 +85610,7 @@ iZh jwS jwS uaE -ohJ +bIP bIP uaE hkO @@ -90779,7 +90730,7 @@ rhc jPb rhc rhc -pEl +jwS uVn lmd cNV @@ -92289,7 +92240,7 @@ jZl vcb rhc rhc -ruJ +pEl uVn vyg nrn From e0542bd091f217245cfa786365f3e30fb30b1b05 Mon Sep 17 00:00:00 2001 From: Defaulterrama <136886118+Defaulterrama@users.noreply.github.com> Date: Wed, 11 Mar 2026 20:05:25 -0400 Subject: [PATCH 5/6] agonizing agony -Fixes some bugs I disliked about the NCR base that I discovered during testing. -Decreases amount of materials the NCR gets on round start because I remembered the NCR deserves nothing -Replaces the old mall with a U-store it taken over by renegades. -Fixed a few floors being sand under doors that I forgot to do earlier, zhoops. --- .../Vegas Valley/Vegas_Valley_Sky.dmm | 3176 ++++---- .../Vegas Valley/Vegas_Valley_Surface.dmm | 6840 +++++++---------- 2 files changed, 4501 insertions(+), 5515 deletions(-) diff --git a/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm b/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm index f7ead1f70f..39c00d068c 100644 --- a/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm +++ b/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm @@ -124,6 +124,9 @@ name = "dirty floor" }, /area/f13/building/powered) +"ar" = ( +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/j) "as" = ( /obj/structure/railing{ dir = 10 @@ -243,6 +246,11 @@ }, /turf/open/floor/wood_wide, /area/f13/followers) +"aP" = ( +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/ambientlighting/building/j) "aQ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 6 @@ -779,6 +787,12 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"cB" = ( +/obj/effect/decal/cleanable/generic{ + name = "scratch marks" + }, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "cC" = ( /obj/structure/railing{ layer = 4.1 @@ -965,6 +979,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"dm" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "dn" = ( /mob/living/simple_animal/hostile/supermutant/nightkin, /obj/effect/decal/cleanable/dirt, @@ -1087,6 +1105,14 @@ }, /turf/open/floor/wood_wide, /area/f13/followers) +"dL" = ( +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks"; + pixel_y = 5 + }, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "dM" = ( /obj/structure/simple_door/bunker, /turf/open/floor/f13{ @@ -1254,6 +1280,12 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) +"eo" = ( +/obj/structure/barricade/wooden, +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "eq" = ( /obj/structure/closet/crate/large, /obj/structure/closet/crate/large{ @@ -1345,6 +1377,10 @@ /obj/structure/reagent_dispensers/rainwater_tank, /turf/open/floor/plasteel/f13, /area/f13/wasteland) +"eE" = ( +/obj/effect/decal/fakelattice, +/turf/open/transparent/openspace, +/area/f13/wasteland) "eF" = ( /obj/structure/simple_door/house, /obj/effect/decal/cleanable/dirt{ @@ -1600,6 +1636,9 @@ /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/carpet, /area/f13/ambientlighting/building/c) +"fq" = ( +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/j) "fr" = ( /obj/item/clothing/head/welding/weldingjapan, /obj/effect/decal/cleanable/dirt{ @@ -1725,6 +1764,12 @@ /obj/item/reagent_containers/food/snacks/f13/fancylads, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) +"fM" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/wasteland) "fN" = ( /turf/closed/wall/rust, /area/f13/brotherhood/offices1st) @@ -1948,6 +1993,10 @@ dir = 8 }, /area/f13/building/powered) +"gA" = ( +/obj/effect/spawner/lootdrop/f13/weapon/melee/tier4, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "gB" = ( /obj/structure/flora/wasteplant/wild_yucca, /turf/open/indestructible/ground/outside/desert, @@ -2004,6 +2053,14 @@ /obj/item/clothing/head/cowboyhat/black, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) +"gH" = ( +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/obj/item/soap/homemade, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "gI" = ( /obj/machinery/light/small{ dir = 4; @@ -2088,6 +2145,14 @@ }, /turf/open/transparent/openspace, /area/f13/building/powered) +"gU" = ( +/obj/structure/lattice/catwalk, +/obj/item/grenade/syndieminibomb/concussion/frag, +/obj/structure/obstacle/barbedwire{ + dir = 8 + }, +/turf/open/transparent/openspace, +/area/f13/wasteland) "gV" = ( /obj/effect/turf_decal/loading_area, /obj/effect/decal/cleanable/oil, @@ -2592,6 +2657,16 @@ /obj/structure/barricade/wooden/planks/pregame, /turf/open/floor/plating/rust, /area/f13/brotherhood/offices1st) +"iQ" = ( +/obj/effect/decal/cleanable/blood{ + dir = 9; + icon_state = "tracks"; + pixel_y = 8 + }, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken1" + }, +/area/f13/wasteland) "iR" = ( /obj/structure/lattice, /turf/open/floor/plating/rust, @@ -2704,6 +2779,9 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +"jm" = ( +/turf/closed/wall/f13/store, +/area/f13/wasteland) "jn" = ( /obj/structure/rack/shelf_metal, /obj/item/ammo_box/magazine/m10mm/smg, @@ -2803,6 +2881,12 @@ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/m) +"jA" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken1" + }, +/area/f13/wasteland) "jB" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/big{ @@ -3090,6 +3174,12 @@ /obj/item/stack/sheet/prewar/five, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) +"ku" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress5" + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "kv" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/effect/decal/cleanable/dirt, @@ -3655,6 +3745,11 @@ name = "dirty floor" }, /area/f13/building/powered) +"mg" = ( +/turf/open/floor/wood_wide{ + icon_state = "wide-broken1" + }, +/area/f13/wasteland) "mh" = ( /obj/machinery/door/window{ dir = 1 @@ -3935,6 +4030,13 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +"nb" = ( +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "ne" = ( /obj/structure/flora/branch, /turf/open/indestructible/ground/outside/desert, @@ -4033,6 +4135,9 @@ }, /turf/open/floor/wood_fancy, /area/f13/bar) +"ny" = ( +/turf/open/floor/wood_wide, +/area/f13/wasteland) "nA" = ( /obj/structure/fence/wooden{ dir = 4; @@ -4066,6 +4171,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +"nF" = ( +/obj/item/restraints/legcuffs/bola/tactical, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/wasteland) "nG" = ( /turf/open/floor/carpet/royalblack, /area/f13/clinic) @@ -4158,6 +4270,11 @@ /obj/structure/simple_door/metal/dirtystore, /turf/open/floor/plating/rust, /area/f13/brotherhood/offices1st) +"oa" = ( +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/wasteland) "ob" = ( /obj/structure/curtain{ color = "#845f58"; @@ -4355,6 +4472,12 @@ }, /turf/open/floor/wood_common/wood_common_light, /area/f13/followers) +"oE" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/wasteland) "oF" = ( /obj/item/clothing/head/hardhat/red, /obj/effect/decal/cleanable/dirt, @@ -4401,6 +4524,12 @@ dir = 6 }, /area/f13/building/powered) +"oL" = ( +/obj/structure/bed/old, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken1" + }, +/area/f13/ambientlighting/building/j) "oM" = ( /obj/structure/wreck/trash/machinepile, /obj/machinery/light/fo13colored/Red{ @@ -4682,6 +4811,15 @@ /obj/structure/sign/poster/official/cleanliness, /turf/closed/wall/f13/wood/house, /area/maintenance/bar) +"pB" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress4"; + pixel_y = -2 + }, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken1" + }, +/area/f13/ambientlighting/building/j) "pC" = ( /obj/structure/simple_door/bunker, /turf/open/floor/f13{ @@ -5966,6 +6104,11 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) +"tB" = ( +/obj/structure/table/wood/junk, +/obj/structure/bedsheetbin/empty, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "tC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/sofa/left, @@ -6337,6 +6480,11 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +"uG" = ( +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/wasteland) "uH" = ( /obj/structure/table, /obj/machinery/computer/terminal{ @@ -6598,6 +6746,14 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +"vu" = ( +/obj/structure/barricade/wooden, +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/ambientlighting/building/j) "vv" = ( /obj/machinery/light/fo13colored/Red{ dir = 8 @@ -6701,6 +6857,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"vJ" = ( +/obj/item/cane, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/ambientlighting/building/j) "vK" = ( /obj/structure/window/fulltile/house/broken, /obj/structure/barricade/wooden/planks/pregame, @@ -7056,6 +7218,10 @@ "wJ" = ( /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"wL" = ( +/obj/structure/barricade/concrete, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland) "wM" = ( /obj/structure/table/booth, /turf/open/floor/f13/wood{ @@ -7320,6 +7486,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"xB" = ( +/obj/structure/simple_door/tent, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "xC" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 1; @@ -8142,6 +8312,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, /area/maintenance/bar) +"Ak" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress3" + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "Al" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ @@ -8214,6 +8390,13 @@ name = "dirty floor" }, /area/f13/building/powered) +"Aw" = ( +/obj/effect/decal/cleanable/generic{ + name = "scratch marks" + }, +/obj/machinery/light, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "Ax" = ( /turf/closed/wall/f13/wood/interior, /area/maintenance/bar) @@ -8224,6 +8407,10 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +"Az" = ( +/obj/item/clothing/under/f13/housewifedress50s, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "AA" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/supermutant/nightkin, @@ -8268,6 +8455,14 @@ /obj/effect/spawner/lootdrop/f13/weapon/melee/random_high, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"AG" = ( +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/obj/item/grenade/smokebomb, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "AH" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/f13{ @@ -9018,10 +9213,21 @@ /obj/item/clothing/mask/cigarette, /turf/open/floor/plating/f13/outside/roof/metal/corrugated/green, /area/f13/wasteland) +"CV" = ( +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) "CW" = ( /obj/structure/barricade/wooden/strong, /turf/closed/wall/f13/wood/house, /area/f13/legioncamp) +"CX" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/wasteland) "CY" = ( /obj/structure/table/wood/settler, /obj/item/storage/belt/fannypack/pink, @@ -9513,6 +9719,11 @@ /obj/structure/window/fulltile/wood_window, /turf/open/floor/plating/f13/outside/roof, /area/f13/followers) +"EA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/f13/ncrspecialist, +/turf/open/floor/f13/wood, +/area/f13/ncr) "EB" = ( /obj/structure/rack/shelf_metal, /obj/item/storage/toolbox/electrical, @@ -9548,6 +9759,10 @@ icon_state = "housebase" }, /area/f13/legioncamp) +"EF" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "EG" = ( /obj/structure/table/wood, /obj/item/clothing/shoes/f13/jamrock, @@ -9916,6 +10131,13 @@ /obj/item/bedsheet/centcom, /turf/open/floor/wood_fancy, /area/f13/clinic) +"FO" = ( +/obj/structure/obstacle/barbedwire{ + dir = 1 + }, +/obj/structure/barricade/sandbags, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "FP" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3, @@ -10064,6 +10286,12 @@ }, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/wasteland) +"Gm" = ( +/obj/structure/junk/small/bed, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) "Gn" = ( /obj/machinery/vending/snack, /turf/open/floor/plating/rust, @@ -10130,6 +10358,11 @@ }, /turf/open/floor/wood_fancy, /area/f13/bar) +"Gv" = ( +/obj/structure/rack, +/obj/item/binoculars, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "Gw" = ( /obj/structure/tires/five, /obj/item/clothing/head/welding, @@ -10255,6 +10488,13 @@ dir = 4 }, /area/f13/building/powered) +"GQ" = ( +/obj/structure/table/wood/junk, +/obj/item/clothing/glasses/fakeblindfold, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) "GR" = ( /obj/machinery/light/fo13colored/Red{ dir = 8 @@ -10292,6 +10532,10 @@ }, /turf/open/floor/plating/f13/outside/roof/wood/old, /area/f13/wasteland) +"GV" = ( +/obj/effect/landmark/start/f13/ncrspecialist, +/turf/open/floor/f13/wood, +/area/f13/ncr) "GW" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -10672,6 +10916,9 @@ name = "dirty floor" }, /area/f13/building/powered) +"Ib" = ( +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "Ic" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/drip, @@ -10790,6 +11037,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"Ix" = ( +/obj/structure/obstacle/barbedwire{ + dir = 1 + }, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "Iy" = ( /obj/machinery/door/poddoor/shutters, /obj/structure/simple_door/bunker, @@ -11214,6 +11467,11 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +"JQ" = ( +/obj/structure/lattice/catwalk, +/obj/item/mine/stun, +/turf/open/transparent/openspace, +/area/f13/wasteland) "JR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/gibs, @@ -11448,6 +11706,12 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +"KJ" = ( +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "KK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -11467,6 +11731,12 @@ }, /turf/open/floor/mineral/titanium/white, /area/f13/clinic) +"KN" = ( +/obj/structure/barricade/wooden, +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "KO" = ( /turf/open/floor/f13{ icon_state = "greenrustyfull" @@ -11916,6 +12186,11 @@ /obj/structure/fluff/railing/corner, /turf/open/floor/plating/f13/outside/roof/metal/corrugated/green, /area/f13/wasteland) +"Ml" = ( +/obj/structure/table/wood/junk, +/obj/item/pizzabox/bomb, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "Mn" = ( /obj/structure/table/reinforced, /obj/item/locked_box/weapon/melee/tier3, @@ -12000,6 +12275,10 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +"MD" = ( +/obj/effect/spawner/lootdrop/f13/weapon/gun/energy/mid, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "ME" = ( /obj/machinery/autolathe, /turf/open/floor/f13{ @@ -12518,6 +12797,10 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +"Ot" = ( +/mob/living/simple_animal/hostile/renegade/drifter, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "Ou" = ( /obj/structure/window/fulltile/house, /obj/structure/curtain{ @@ -13880,6 +14163,16 @@ }, /turf/open/floor/wood_common, /area/f13/followers) +"SC" = ( +/obj/item/mine/stun, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/wasteland) +"SD" = ( +/obj/structure/chair/stool/retro/tan, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "SF" = ( /obj/structure/sign/poster/official/fruit_bowl, /turf/closed/wall/f13/wood/house, @@ -14103,6 +14396,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"Tm" = ( +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "Tn" = ( /obj/structure/sign/flag_enclave{ pixel_y = 34 @@ -14268,6 +14567,12 @@ }, /turf/open/floor/plating, /area/f13/bar) +"TN" = ( +/obj/structure/barricade/concrete, +/turf/open/indestructible/ground/outside/ruins{ + icon_state = "rubblepillar" + }, +/area/f13/wasteland) "TO" = ( /obj/machinery/light/fo13colored/Red{ dir = 1 @@ -14436,6 +14741,12 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +"Ur" = ( +/obj/structure/campfire/barrel, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) "Ut" = ( /obj/structure/window/fulltile/house, /obj/structure/curtain{ @@ -14565,6 +14876,10 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +"UP" = ( +/obj/structure/chair/stool/retro/black, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "UQ" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/handy, @@ -15315,6 +15630,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"Xq" = ( +/obj/item/mine/stun, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "Xr" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -15326,6 +15645,10 @@ "Xs" = ( /turf/closed/wall/f13/wood/house, /area/maintenance/bar) +"Xt" = ( +/mob/living/simple_animal/hostile/renegade/soldier, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "Xu" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/grown/harebell, @@ -15506,6 +15829,9 @@ }, /turf/open/floor/plating/rust, /area/f13/brotherhood/offices1st) +"XW" = ( +/turf/open/transparent/openspace, +/area/f13/ambientlighting/building/j) "XX" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/mug{ @@ -21317,7 +21643,7 @@ fR zi iL Vs -Fz +EA XI vo rt @@ -22223,7 +22549,7 @@ cw zi WC vo -XI +GV XI vo am @@ -23129,7 +23455,7 @@ cw zi rt vo -XI +GV XI vo rt @@ -37619,27 +37945,27 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -37920,29 +38246,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm zi zi @@ -38222,29 +38548,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm zi zi @@ -38524,29 +38850,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +fq +fq +fq +fq +fq +fq +fq +fq +xm +xm xm zi zi @@ -38826,29 +39152,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +fq +ku +Ur +oL +fq +fq +fq +fq +xm +xm xm zi zi @@ -39128,29 +39454,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +fq +CV +Ib +Ib +fq +XW +ar +ar +xm +xm xm zi zi @@ -39430,109 +39756,109 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -yi -Oh -Gz -Gz -Gz -Gz -Gz -Gz -Oh -RJ -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +eo +Ak +vJ +Ib +Ib +Ib +EF +ar +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +yi +Oh +Gz +Gz +Gz +Gz +Gz +Gz +Oh +RJ +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -39732,29 +40058,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +KJ +Gm +CV +aP +SD +Ib +Ib +ar +xm +xm xm zi zi @@ -40034,29 +40360,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +eo +Gv +CV +tB +Ml +Xt +Ib +ar +xm +xm xm zi zi @@ -40336,29 +40662,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +fq +pB +Ib +GQ +UP +Ib +Aw +ar +xm +xm xm zi zi @@ -40638,29 +40964,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +KN +KN +vu +Ib +Ib +Ib +fq +xm +xm xm zi zi @@ -40940,6 +41266,30 @@ xm xm xm xm +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +ar +xB +xB +fq +xm +xm +xm zi zi zi @@ -40964,30 +41314,6 @@ zi zi zi xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -xm xm xm xm @@ -41242,29 +41568,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +ny +ny +ny +Vo +xm +xm xm zi zi @@ -41544,29 +41870,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +cB +uG +oa +jm +xm +xm xm zi zi @@ -41846,29 +42172,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +dm +Ix +SC +jm +xm +xm xm zi zi @@ -42148,112 +42474,112 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -Kt -Th -Bg -Th -Th -Th -Th -Th -Th -SK -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +Vo +xm +xm +xm +Vo +ny +ny +jm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Kt +Th +Bg +Th +Th +Th +Th +Th +Th +SK +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -42450,29 +42776,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +Vo +Vo +Vo +ny +ny +Vo +xm +xm xm zi zi @@ -42752,127 +43078,127 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -Th -rW -rW -jS -rW -rW -ft -Th -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Vo +Xq +dm +Vo +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Th +rW +rW +jS +rW +rW +ft +Th +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -43054,29 +43380,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +jA +uG +jm +xm +xm xm zi zi @@ -43356,29 +43682,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Vo +ny +ny +jm +xm +xm xm zi zi @@ -43658,29 +43984,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +ny +ny +ny +jm +xm +xm xm zi zi @@ -43960,6 +44286,30 @@ xm xm xm xm +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +ny +ny +cB +Vo +xm +xm +xm zi zi zi @@ -43980,30 +44330,6 @@ zi zi zi zi -zi -zi -zi -xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi xm xm xm @@ -44262,29 +44588,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +fM +ny +ny +ny +Vo +xm +xm xm zi zi @@ -44564,29 +44890,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +jm +ny +oa +jm +xm +xm xm zi zi @@ -44866,29 +45192,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Tm +ny +ny +jm +xm +xm xm zi zi @@ -45168,29 +45494,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Tm +Ix +Xq +jm +xm +xm xm xm xm @@ -45470,78 +45796,78 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm -xm +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +dm +ny +ny +jm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -45772,29 +46098,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +Vo +xm +xm +xm +Vo +oa +ny +wL +xm +xm xm xm xm @@ -46074,29 +46400,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +Vo +Vo +gU +JQ +dm +ny +dm +xm +xm +xm xm xm xm @@ -46376,29 +46702,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +Vo +wT +wT +xm +cB +ny +eE +xm +xm +xm xm xm xm @@ -46678,29 +47004,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +jm +JQ +xm +xm +Az +ny +eE +xm +xm +xm xm xm xm @@ -46980,29 +47306,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +jm +wT +xm +xm +jm +eE +eE +xm +xm +xm xm xm xm @@ -47282,29 +47608,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +jm +mg +xm +xm +uG +CX +iQ +xm +xm +xm xm xm xm @@ -47584,29 +47910,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Vo +uG +oE +uG +dm +ny +dL +Vo +xm +xm xm xm xm @@ -47886,29 +48212,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Vo +Vo +jm +jm +Vo +FO +FO +Vo +xm +xm xm xm xm @@ -48188,29 +48514,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Vo +Ot +ny +Vo +xm +xm xm xm xm @@ -48490,29 +48816,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +jm +ny +ny +Vo +Vo +xm xm xm xm @@ -48792,29 +49118,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +jm +cB +ny +ny +Vo +xm xm xm xm @@ -49094,29 +49420,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Vo +nF +gH +oa +Vo +xm xm xm xm @@ -49396,29 +49722,29 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Vo +Vo +AG +ny +jm +xm xm xm xm @@ -49698,30 +50024,30 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Vo +nb +ny +jm +xm +xm xm xm xm @@ -50000,30 +50326,30 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Vo +gA +mg +Vo +xm +xm xm xm xm @@ -50302,30 +50628,30 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Vo +MD +uG +Vo +xm +xm xm xm xm @@ -50604,30 +50930,30 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +LY +LY +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +jm +Vo +Vo +TN +Vo +xm +xm xm xm xm @@ -50906,30 +51232,30 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +LY +LY +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -51208,30 +51534,30 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +LY +LY +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -51510,30 +51836,30 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +LY +LY +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm xm xm @@ -51812,30 +52138,30 @@ xm xm xm xm -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi -zi +xm +xm +xm +LY +LY +LY +LY +LY +LY +LY +LY +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm xm SU SU diff --git a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm index 3dcb8a0ccd..abe23afc61 100644 --- a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm +++ b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm @@ -223,21 +223,15 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "adp" = ( -/obj/effect/decal/cleanable/oil/streak, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, +/obj/structure/barricade/concrete, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) -"adz" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +"ady" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2top" }, -/turf/open/floor/plasteel/f13/vault_floor/red/white, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "adR" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/wood_common{ @@ -698,26 +692,18 @@ /obj/structure/sign/warning/nosmoking/circle, /turf/closed/wall/mineral/concrete, /area/engine/workshop) -"amw" = ( -/obj/structure/simple_door, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "amQ" = ( -/obj/structure/chair/office/dark{ - dir = 4 +/obj/structure/fence/corner{ + dir = 4; + icon_state = "end" }, -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gibmid1" +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" }, -/turf/open/floor/plasteel/f13/vault_floor/red/whiteredfull, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "amS" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/dirt{ @@ -732,6 +718,18 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"anp" = ( +/obj/effect/decal/cleanable/glass, +/obj/machinery/power/port_gen/pacman/diesel{ + anchored = 1 + }, +/obj/structure/cable/outdoors{ + icon_state = "0-4" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "anA" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/melee/tier3, @@ -1713,6 +1711,12 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"aBg" = ( +/obj/structure/wreck/trash/machinepile, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "aBk" = ( /obj/item/flag/legion, /turf/open/indestructible/ground/outside/desert, @@ -2069,6 +2073,14 @@ /mob/living/simple_animal/hostile/eyebot, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) +"aGP" = ( +/obj/effect/decal/remains/human, +/obj/machinery/light{ + dir = 1; + layer = 2.9 + }, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) "aHk" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/f13/wood, @@ -2243,6 +2255,7 @@ /obj/effect/landmark/start/f13/ncroffduty, /obj/effect/landmark/start/f13/ncroffduty, /obj/effect/landmark/start/f13/ncrrearechelon, +/obj/effect/overlay/desert/sonora/edge, /turf/open/floor/wood_common, /area/f13/wasteland) "aJY" = ( @@ -2617,20 +2630,6 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) -"aPL" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/rack, -/obj/structure/closet/cardboard, -/obj/item/crafting/lunchbox, -/obj/item/crafting/lunchbox, -/obj/item/crafting/lunchbox, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "aPM" = ( /obj/structure/rack, /obj/item/reagent_containers/food/snacks/kebab/human, @@ -2654,15 +2653,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/m) -"aPS" = ( -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "aPY" = ( /obj/structure/flora/grass/both, /obj/structure/flora/ausbushes/brflowers, @@ -2691,6 +2681,9 @@ /area/f13/wasteland) "aQs" = ( /obj/machinery/autolathe/ammo, +/obj/item/book/granter/crafting_recipe/gunsmith_one, +/obj/item/book/granter/crafting_recipe/gunsmith_two, +/obj/item/book/granter/crafting_recipe/gunsmith_three, /turf/open/floor/wood_common/wood_common_light, /area/f13/ncr) "aQw" = ( @@ -2853,15 +2846,8 @@ }, /area/f13/wasteland) "aSu" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/window/reinforced/spawner/west, -/obj/structure/rack, -/obj/item/reagent_containers/food/snacks/f13/blamco/large, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, +/obj/structure/simple_door/house, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "aSO" = ( /obj/structure/toilet{ @@ -2946,17 +2932,6 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/m) -"aTP" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/washing_machine, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 5 - }, -/area/f13/ambientlighting/building/j) "aTU" = ( /obj/machinery/vending/tool, /obj/effect/decal/cleanable/dirt{ @@ -2981,16 +2956,6 @@ /obj/item/reagent_containers/food/condiment/quality_oil, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/maintenance/bar) -"aUi" = ( -/obj/structure/reagent_dispensers/water_cooler, -/obj/item/storage/box/cups, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "aUl" = ( /obj/structure/closet/crate/large, /obj/item/stack/sheet/cloth/ten, @@ -3139,6 +3104,12 @@ /obj/item/reagent_containers/glass/bucket, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"aWH" = ( +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "aWO" = ( /obj/structure/decoration/rag, /obj/structure/destructible/tribal_torch/wall/lit{ @@ -3146,14 +3117,6 @@ }, /turf/closed/wall/mineral/wood, /area/f13/wasteland/legion) -"aWQ" = ( -/obj/structure/table/reinforced, -/obj/item/flashlight/lamp, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/white, -/area/f13/ambientlighting/building/j) "aWT" = ( /obj/machinery/autolathe, /turf/open/indestructible/ground/outside/dirt{ @@ -3367,22 +3330,14 @@ }, /area/f13/ambientlighting/building/i) "aZt" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters{ - id = "MallStorage"; - name = "Mall Storage" +/obj/structure/fence/corner{ + dir = 4 }, -/turf/open/floor/plasteel/f13/vault_floor/plating, -/area/f13/ambientlighting/building/j) -"aZv" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerturn" }, -/obj/structure/wreck/trash/one_tire, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "aZz" = ( /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ambientlighting/building/x) @@ -3962,16 +3917,6 @@ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/f) -"biB" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "bluerustysolid" - }, -/area/f13/ambientlighting/building/j) "biC" = ( /obj/structure/cable/outdoors{ icon_state = "2-8" @@ -4042,19 +3987,6 @@ dir = 4 }, /area/f13/building/powered) -"bjZ" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/raider/ranged, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "bki" = ( /obj/effect/decal/cleanable/glass, /turf/open/indestructible/ground/inside/mountain, @@ -4175,16 +4107,10 @@ /area/f13/wasteland) "blT" = ( /obj/structure/rack, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/landmark/questing/item{ - location_description = "in that mall south of the khans." - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/item/clothing/neck/jamrock, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/clothing/glasses/heat, +/turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) "blV" = ( /obj/structure/table, @@ -4304,6 +4230,14 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +"bnW" = ( +/obj/machinery/light/broken{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/junk/small, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "bof" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/curtain{ @@ -4629,21 +4563,6 @@ name = "dirty floor" }, /area/f13/brotherhood) -"btx" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/planks/pregame, -/obj/effect/decal/cleanable/glass, -/obj/structure/debris/v3{ - pixel_x = -15; - pixel_y = 6 - }, -/obj/machinery/door/poddoor/shutters{ - id = "ElectronicDick"; - layer = 1; - name = "Dick's Electronic Goods" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, -/area/f13/ambientlighting/building/j) "btB" = ( /obj/structure/chair/folding{ dir = 4 @@ -4689,6 +4608,13 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/t) +"btY" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) "bud" = ( /obj/structure/shelf_wood, /obj/item/twohanded/spear/bonespear, @@ -4721,20 +4647,6 @@ color = "00FFFF" }, /area/maintenance/bar) -"bve" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/terminal{ - dir = 8 - }, -/obj/machinery/light/small{ - brightness = 7; - dir = 4 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/white, -/area/f13/ambientlighting/building/j) "bvj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -5000,6 +4912,12 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +"bzq" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 10 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "bzs" = ( /obj/effect/decal/marking{ pixel_x = -14 @@ -5181,6 +5099,13 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/maintenance/bar) +"bCu" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2_flesh" + }, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) "bCK" = ( /turf/closed/wall/f13/tunnel, /area/f13/building/abandoned/h) @@ -5231,6 +5156,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/black, /area/f13/ambientlighting/building/w) +"bDr" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2top" + }, +/area/f13/wasteland) "bDu" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -5514,14 +5450,6 @@ /obj/effect/landmark/poster_spawner/pinup, /turf/closed/wall/f13/wood, /area/f13/building/abandoned/g) -"bHs" = ( -/obj/machinery/recharge_station, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/item/reagent_containers/food/snacks/fudgedice, -/turf/open/floor/plasteel/f13/vault_floor/red/white, -/area/f13/ambientlighting/building/j) "bHt" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/indestructible/ground/outside/dirt, @@ -5637,13 +5565,8 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "bJW" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "bJX" = ( /obj/structure/table/reinforced, @@ -5728,12 +5651,11 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "bLe" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" }, -/turf/open/floor/carpet/arcade, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "bLf" = ( /obj/structure/statue/petrified, /obj/item/clothing/under/f13/ravenharness, @@ -5814,7 +5736,9 @@ /area/f13/building/powered) "bMQ" = ( /obj/structure/rack/shelf_metal, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ + loot = s + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) @@ -6300,15 +6224,6 @@ icon_state = "verticalleftborderright2" }, /area/f13/ambientlighting/building/o) -"bSY" = ( -/obj/structure/rack, -/obj/item/restraints/handcuffs, -/obj/item/restraints/handcuffs, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/white, -/area/f13/ambientlighting/building/j) "bSZ" = ( /obj/structure/cable/outdoors{ icon_state = "1-8" @@ -6321,12 +6236,13 @@ }, /area/f13/wasteland) "bTn" = ( -/obj/machinery/light_switch{ - pixel_y = -26 +/obj/structure/table, +/obj/machinery/computer/terminal/stored_password{ + dir = 4; + door_id = "evilassdoor" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/pod/dark, -/area/f13/building/powered) +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "bTs" = ( /obj/structure/barricade/tentleathercorner{ dir = 8 @@ -6373,14 +6289,6 @@ /obj/effect/landmark/start/f13/recleg, /turf/open/floor/f13/wood, /area/f13/legioncamp) -"bTU" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "bUf" = ( /obj/structure/car/rubbish1, /turf/open/indestructible/ground/outside/road{ @@ -6762,6 +6670,12 @@ /obj/structure/decoration/rads, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"caq" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "cat" = ( /obj/effect/gibspawner/human, /obj/effect/decal/cleanable/dirt/dust, @@ -7084,16 +6998,8 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "cgg" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "UBuild"; - layer = 11; - name = "Gabriel's U-Build" - }, -/turf/closed/wall/f13/tentwall, +/obj/structure/sign/gunshop, +/turf/closed/wall/f13/store, /area/f13/ambientlighting/building/j) "cgo" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -7114,11 +7020,6 @@ name = "rusted floor" }, /area/f13/ncr) -"cgv" = ( -/obj/structure/simple_door, -/obj/structure/closet/cardboard, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "cgG" = ( /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded"; @@ -7411,14 +7312,13 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "clg" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fence/corner{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "cli" = ( /obj/structure/table/wood/settler, /turf/open/floor/carpet, @@ -7633,6 +7533,11 @@ /obj/effect/landmark/start/f13/wastelander, /turf/open/indestructible/ground/outside/road, /area/f13/tunnel/southwest) +"cpn" = ( +/obj/effect/decal/fakelattice, +/obj/structure/wreck/trash/engine, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) "cpq" = ( /obj/effect/decal/marking{ pixel_x = -14 @@ -7679,6 +7584,14 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) +"cqy" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light{ + dir = 1; + layer = 2.9 + }, +/turf/open/floor/plasteel/vaporwave, +/area/f13/ambientlighting/building/j) "cqC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/smartfridge/bottlerack/seedbin, @@ -7789,6 +7702,11 @@ /obj/structure/reagent_dispensers/barrel/explosive, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"csd" = ( +/turf/open/floor/plasteel/f13{ + icon_state = "rampdowntop" + }, +/area/f13/ambientlighting/building/j) "cse" = ( /obj/machinery/microwave/stove, /turf/open/floor/wood_common, @@ -7853,7 +7771,9 @@ /obj/machinery/shower{ pixel_y = 27 }, -/obj/effect/overlay/junk/curtain, +/obj/effect/overlay/junk/curtain{ + layer = 100 + }, /obj/machinery/pool/drain, /turf/open/floor/plasteel/f13{ icon_state = "bluedirtychess" @@ -8436,14 +8356,6 @@ dir = 5 }, /area/f13/wasteland) -"cAP" = ( -/mob/living/simple_animal/hostile/handy/protectron{ - faction = list("raider") - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "cAZ" = ( /turf/closed/wall/f13/wood, /area/f13/building/abandoned/g) @@ -8563,15 +8475,13 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "cCJ" = ( -/obj/structure/bed/mattress{ - icon_state = "mattress2"; - pixel_y = 7 +/obj/effect/turf_decal/weather/dirt{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" }, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "cCL" = ( /obj/effect/spawner/lootdrop/f13/weapon/melee/tier4, /turf/open/indestructible/ground/inside/mountain, @@ -8609,13 +8519,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) -"cDp" = ( -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/dirt, -/area/f13/ambientlighting/building/j) "cDr" = ( /obj/structure/sign/directions/security{ dir = 4 @@ -8665,6 +8568,15 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"cDQ" = ( +/obj/effect/decal/cleanable/blood{ + dir = 13; + icon_state = "tracks"; + pixel_y = 8 + }, +/obj/item/camera, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "cDU" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -9129,6 +9041,11 @@ /obj/item/stack/sheet/glass/five, /turf/open/floor/plasteel, /area/engine/workshop) +"cJj" = ( +/obj/item/crowbar/smithed, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) "cJl" = ( /obj/structure/simple_door/metal/store{ icon_state = "brokenstore" @@ -9158,10 +9075,9 @@ }, /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/large, -/obj/item/stack/sheet/metal/twenty, +/obj/structure/closet/crate/large, /obj/item/stack/sheet/leather/twenty, -/obj/item/stack/sheet/mineral/concrete/ten, -/obj/item/stack/sheet/mineral/limestone/ten, +/obj/item/stack/sheet/metal/twenty, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalbottombordertop2" }, @@ -9171,23 +9087,6 @@ /obj/structure/barricade/tentclothedge, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) -"cJU" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/structure/barricade/sandbags, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "MallFront"; - layer = 11; - name = "Mall Front" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "cJX" = ( /obj/structure/obstacle/barbedwire/end{ dir = 8 @@ -9452,6 +9351,12 @@ /obj/effect/spawner/lootdrop/gambling, /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) +"cPG" = ( +/obj/item/tele_iv, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) "cPH" = ( /obj/effect/overlay/desert_side{ dir = 4 @@ -9513,13 +9418,6 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/g) -"cQx" = ( -/obj/structure/closet/crate/bin/trashbin{ - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/f13/wood, -/area/f13/ambientlighting/building/e) "cQy" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/grass/corner, @@ -9544,6 +9442,10 @@ /obj/structure/flora/wasteplant/wild_fungus, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"cQL" = ( +/obj/structure/junk/small, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "cQV" = ( /obj/structure/junk/locker, /turf/open/indestructible/ground/outside/ruins, @@ -9614,12 +9516,9 @@ }, /area/f13/wasteland) "cSa" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "bluerustysolid" - }, +/obj/effect/decal/fakelattice, +/obj/item/electropack/shockcollar/explosive, +/turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) "cSc" = ( /obj/structure/reagent_dispensers/barrel/three, @@ -9969,6 +9868,10 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) +"cXt" = ( +/obj/structure/closet/crate/trashcart, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "cXy" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -10087,12 +9990,13 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/o) "cZx" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowbrokenvertical" }, -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/f13/doctorbag, -/turf/open/floor/plasteel/f13/vault_floor/yellow, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/bars, +/turf/open/indestructible/ground/outside/desert, /area/f13/ambientlighting/building/j) "cZD" = ( /obj/structure/rack, @@ -10399,14 +10303,13 @@ }, /area/f13/ncr) "ddY" = ( -/obj/structure/chair, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/turf_decal/weather/dirt{ + dir = 1 }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "ddZ" = ( /obj/structure/debris/v1, /turf/open/indestructible/ground/outside/desert, @@ -10416,6 +10319,13 @@ /obj/structure/flora/twig2, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"dee" = ( +/obj/effect/decal/fakelattice, +/obj/item/melee/onehanded/machete/scrapsabre, +/obj/item/clothing/under/f13/raiderrags, +/obj/item/clothing/gloves/f13/handwraps, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) "dej" = ( /obj/machinery/light/small{ dir = 1; @@ -10448,12 +10358,14 @@ }, /area/f13/wasteland) "deN" = ( -/obj/structure/nest/molerat, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/chair/stool/retro/tan, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 17 }, -/turf/open/floor/plating/dirt, -/area/f13/ambientlighting/building/j) +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "dfc" = ( /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded" @@ -10543,12 +10455,8 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) "dgF" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/structure/chair/bench, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/structure/table, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "dgM" = ( /obj/effect/overlay/desert/sonora/edge{ @@ -10900,6 +10808,12 @@ icon_state = "tunnelrusty" }, /area/f13/building/powered) +"dmf" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 5 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "dmh" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -10949,15 +10863,6 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/i) -"dnM" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "dnQ" = ( /obj/structure/table/reinforced, /obj/structure/barricade/bars, @@ -11005,6 +10910,11 @@ /obj/structure/rack/shelf_metal, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) +"doy" = ( +/obj/item/stack/sheet/bone, +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "doz" = ( /obj/machinery/sleeper, /obj/effect/decal/cleanable/dirt{ @@ -11083,19 +10993,6 @@ icon_state = "floorrusty" }, /area/f13/ncr) -"dpm" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/structure/rack, -/obj/item/kitchen/knife/butcher, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 6 - }, -/area/f13/ambientlighting/building/j) "dpq" = ( /turf/open/floor/f13{ icon_state = "bar" @@ -11436,14 +11333,6 @@ icon_state = "whiteyellowrustychess" }, /area/f13/ambientlighting/building/m) -"dvp" = ( -/obj/structure/junk/small/bed2, -/obj/effect/turf_decal/box/white, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/yellow/white/whiteyellowchess, -/area/f13/ambientlighting/building/j) "dvr" = ( /mob/living/simple_animal/hostile/supermutant/rangedmutant/varmint, /turf/open/indestructible/ground/outside/dirt{ @@ -11470,17 +11359,6 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) -"dvN" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gibmid1" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "dvR" = ( /obj/structure/sign/flag_america, /turf/closed/wall/r_wall/rust, @@ -11617,11 +11495,10 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "dyA" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, -/area/f13/ambientlighting/building/j) +/obj/effect/overlay/desert/sonora/edge, +/obj/structure/wreck/trash/three_barrels, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "dyL" = ( /obj/structure/table/booth, /obj/machinery/light{ @@ -12092,11 +11969,8 @@ }, /area/f13/ambientlighting/building/o) "dGq" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/ranged, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/effect/decal/fakelattice, +/turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) "dGA" = ( /turf/open/floor/plating/f13/outside/road, @@ -12120,12 +11994,7 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "dGQ" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/sulphite, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "dGT" = ( /obj/effect/turf_decal/weather/dirt, @@ -12134,6 +12003,16 @@ icon_state = "horizontaloutermain2" }, /area/f13/wasteland) +"dHc" = ( +/obj/effect/spawner/lootdrop/glowstick, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" + }, +/obj/structure/closet/crate/bin/trashbin, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "dHg" = ( /obj/effect/decal/cleanable/dirt/dust{ dir = 4 @@ -12343,6 +12222,11 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"dJX" = ( +/obj/effect/decal/fakelattice, +/obj/structure/bookcase, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "dJZ" = ( /obj/structure/flora/ausbushes/brflowers, /turf/open/indestructible/ground/outside/dirt, @@ -12795,11 +12679,7 @@ }, /area/f13/building/powered) "dPJ" = ( -/obj/item/stock_parts/cell/computer/micro, -/obj/effect/decal/cleanable/robot_debris, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, +/obj/structure/table/wood/junk, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "dPK" = ( @@ -13320,10 +13200,10 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "dXR" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/f13/weapon/gun/energy/mid, +/turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) "dYy" = ( /obj/structure/billboard/hubris2, @@ -13510,7 +13390,9 @@ "eca" = ( /obj/structure/rack/shelf_metal, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ + loot = s + }, /obj/item/clothing/suit/toggle/labcoat/khan_jacket/armored, /obj/item/clothing/under/f13/khan/shorts, /obj/structure/sign/poster/contraband/smoke{ @@ -13577,16 +13459,12 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/t) "ecK" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris2" }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "edf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/greenglow, @@ -13654,16 +13532,6 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) -"een" = ( -/obj/structure/chair/bench, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "eeo" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertopright" @@ -13746,12 +13614,11 @@ }, /area/f13/wasteland) "efV" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "efZ" = ( /obj/structure/window/fulltile/house/broken, /obj/structure/barricade/wooden/planks/pregame, @@ -13885,20 +13752,6 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/y) -"ein" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gibmid1" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/item/storage/trash_stack{ - icon_state = "trash_3" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "eit" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontaltopborderbottom0" @@ -14107,20 +13960,6 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"emi" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/curtain{ - color = "#5c131b" - }, -/obj/structure/chair/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/cum, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "emk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/sofa/left{ @@ -14155,6 +13994,12 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"emX" = ( +/obj/structure/wreck/trash/secway, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "end" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/ammo, @@ -14591,14 +14436,11 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "ete" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/decal/cleanable/shreds, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "eti" = ( /obj/structure/simple_door/metal/fence/wooden, /turf/open/indestructible/ground/outside/dirt, @@ -14775,11 +14617,10 @@ /turf/closed/wall/f13/wood/house/broken, /area/f13/legioncamp) "evI" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/structure/wreck/trash/two_tire, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/structure/window/fulltile/house, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/bars, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "evM" = ( /turf/open/indestructible/ground/outside/ruins{ @@ -14800,6 +14641,13 @@ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland/city) +"evZ" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris3" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "ewh" = ( /obj/structure/decoration/rag{ desc = "A string of bones and skulls.
A common warning from tribals and raiders to outsiders."; @@ -14876,17 +14724,10 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) "exB" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/structure/fluff/railing{ - dir = 1; - layer = 0.5 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fluff/paper/stack{ + dir = 6 }, -/turf/open/floor/plating/dirt, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "eya" = ( /obj/effect/landmark/legion_attack{ @@ -14906,12 +14747,11 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "eyd" = ( -/obj/item/ammo_casing/c10mm, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/wreck/trash/machinepiletwo, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "eyh" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/reagent_dispensers/barrel/dangerous, @@ -15452,10 +15292,14 @@ }, /area/f13/wasteland) "eGT" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 4; + light_color = "#f4e3b0" }, -/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess, +/turf/open/indestructible/ground/outside/sidewalk, /area/f13/ambientlighting/building/j) "eGU" = ( /obj/structure/rack, @@ -15548,15 +15392,11 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "eIx" = ( -/obj/structure/rack, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/obj/structure/table/wood/junk, +/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "eIA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -15641,11 +15481,13 @@ }, /area/f13/wasteland) "eJx" = ( -/obj/structure/campfire/barrel, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowbroken" }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/bars, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "eJA" = ( /obj/machinery/chem_dispenser/drinks/beer{ @@ -15672,6 +15514,21 @@ /obj/item/reagent_containers/rag, /turf/open/indestructible/ground/outside/desert, /area/f13/building/abandoned/g) +"eJV" = ( +/obj/effect/spawner/lootdrop/f13/cash_random_med, +/obj/structure/table/wood/junk, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = -8; + pixel_y = 7 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "eKd" = ( /obj/item/fishingrod, /turf/open/indestructible/ground/outside/dirt, @@ -15772,6 +15629,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +"eLv" = ( +/obj/structure/table, +/obj/machinery/light{ + dir = 4; + light_color = "#228B22" + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "eLw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood/bar, @@ -16024,17 +15889,6 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/s) -"eQh" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "MikoStiff"; - layer = 11; - name = "Miko's Stiff Beds" - }, -/turf/open/floor/plasteel/f13/vault_floor/yellow, -/area/f13/ambientlighting/building/j) "eQj" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/power/port_gen/pacman/diesel{ @@ -16094,12 +15948,10 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) "eRc" = ( -/obj/machinery/light{ +/obj/structure/destructible/tribal_torch/wall/lit{ dir = 8 }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, +/turf/open/indestructible/ground/outside/sidewalk, /area/f13/ambientlighting/building/j) "eRi" = ( /obj/effect/overlay/desert_side{ @@ -16266,13 +16118,12 @@ /turf/open/floor/carpet/black, /area/f13/ambientlighting/building/w) "eTF" = ( -/obj/effect/decal/cleanable/robot_debris/gib, -/obj/effect/decal/cleanable/oil/streak, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/barricade/wooden/strong, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "eTJ" = ( /obj/machinery/light/small{ brightness = 7; @@ -16310,12 +16161,16 @@ }, /area/f13/wasteland) "eUm" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/planks/pregame, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fluff/paper{ + dir = 5 }, -/turf/open/floor/plating/rust, +/obj/structure/table{ + layer = 10 + }, +/obj/item/warpaint_bowl, +/obj/item/paint/anycolor, +/obj/item/paint/anycolor, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "eUu" = ( /obj/structure/fluff/fokoff_sign, @@ -16740,6 +16595,13 @@ /mob/living/simple_animal/hostile/centaur/strong, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"faq" = ( +/obj/structure/closet/crate/grave, +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "fas" = ( /obj/effect/decal/cleanable/blood/old{ icon_state = "floor6-old" @@ -16990,6 +16852,11 @@ /obj/structure/cable/outdoors{ icon_state = "0-2" }, +/obj/machinery/light_switch{ + pixel_y = 26; + name = "Base Lighting"; + pixel_x = 10 + }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) "fdC" = ( @@ -17181,19 +17048,6 @@ dir = 8 }, /area/f13/wasteland) -"fgw" = ( -/obj/structure/rack, -/obj/item/clothing/head/f13/cowboy, -/obj/item/clothing/head/f13/cowboy, -/obj/item/clothing/head/f13/cowboy, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "fgN" = ( /obj/structure/bus_door, /turf/open/indestructible/ground/outside/grass/corner, @@ -17399,14 +17253,6 @@ /obj/structure/flora/wasteplant/wild_punga, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"fjo" = ( -/obj/structure/rack, -/obj/item/gun/ballistic/shotgun/toy, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/carpet/arcade, -/area/f13/ambientlighting/building/j) "fjp" = ( /obj/structure/fence/wooden{ dir = 1 @@ -17470,14 +17316,8 @@ /turf/open/floor/plasteel/f13/stone, /area/f13/ambientlighting/building/m) "fjV" = ( -/obj/structure/rack, -/obj/item/clothing/under/f13/raiderharness, -/obj/item/clothing/under/f13/raiderharness, -/obj/item/clothing/under/f13/raiderharness, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/structure/cargocrate, +/turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) "fjZ" = ( /obj/effect/decal/cleanable/greenglow{ @@ -17776,6 +17616,9 @@ /obj/item/stack/sheet/metal/twenty, /obj/item/stack/sheet/mineral/concrete/ten, /obj/item/stack/sheet/mineral/limestone/five, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, /turf/open/floor/wood_common, /area/f13/wasteland) "foC" = ( @@ -17942,16 +17785,8 @@ /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) "frc" = ( -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/landmark/questing/item{ - location_description = "in that mall south of the khans." - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) "fri" = ( /obj/structure/barricade/tentclothedge, @@ -18007,20 +17842,6 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) -"frP" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/button/door{ - id = "IsebelAttire"; - name = "Isebel's Modern Attire shutters"; - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "frY" = ( /obj/structure/reagent_dispensers/barrel/explosive, /turf/open/indestructible/ground/outside/dirt{ @@ -18299,15 +18120,8 @@ }, /area/f13/building/lower_firetower) "fwA" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters{ - id = "RicketyRick"; - layer = 11; - name = "Rickety Rick's Camping Supplies" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/structure/simple_door/house, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "fwC" = ( /obj/structure/fence/wooden, @@ -18593,6 +18407,11 @@ icon_state = "horizontaltopbordertop0" }, /area/f13/wasteland) +"fAD" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) "fAE" = ( /obj/structure/toilet{ dir = 8 @@ -18791,6 +18610,18 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"fDM" = ( +/obj/machinery/light, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +"fDO" = ( +/obj/effect/decal/fakelattice, +/obj/structure/car/rubbish2{ + pixel_x = 1; + pixel_y = 18 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "fDR" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt{ @@ -18799,21 +18630,15 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) "fDS" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/effect/decal/fakelattice, +/obj/machinery/workbench, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) "fEe" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, +/obj/structure/campfire/barrel, +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "fEs" = ( /obj/structure/window/fulltile/store{ @@ -18892,19 +18717,6 @@ /mob/living/simple_animal/hostile/raider/baseball, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"fFk" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/terminal{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "fFq" = ( /obj/structure/flora/junglebush/c, /turf/open/indestructible/ground/outside/dirt, @@ -19053,6 +18865,13 @@ dir = 4 }, /area/f13/brotherhood) +"fJj" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris2" + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "fJl" = ( /obj/effect/decal/cleanable/oil{ icon_state = "floor2"; @@ -19064,15 +18883,6 @@ /obj/effect/decal/cleanable/blood/gibs/human/body, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"fJE" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "fJI" = ( /obj/effect/decal/remains{ icon_state = "remains" @@ -19461,11 +19271,9 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "fOj" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/structure/fluff/railing{ - dir = 4 - }, -/turf/open/water, +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/cobweb, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "fOk" = ( /obj/structure/fence, @@ -19573,15 +19381,6 @@ }, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) -"fQd" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "fQs" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -19785,20 +19584,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/grimy, /area/f13/ncr) -"fTt" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/structure/rack, -/obj/machinery/cell_charger, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/landmark/questing/item{ - location_description = "in that mall south of the khans." - }, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 4 - }, -/area/f13/ambientlighting/building/j) "fTw" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -19946,9 +19731,13 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "fVP" = ( -/obj/effect/decal/cleanable/generic, -/turf/closed/wall/mineral/concrete, -/area/f13/ambientlighting/building/j) +/obj/structure/car/rubbish2{ + icon_state = "car_rubish3" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "fVQ" = ( /obj/structure/cable/outdoors{ icon_state = "1-8" @@ -19984,13 +19773,6 @@ /obj/item/bedsheet/blanket, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/t) -"fWw" = ( -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/yellow, -/area/f13/ambientlighting/building/j) "fWK" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, @@ -20028,9 +19810,6 @@ "fXb" = ( /obj/effect/spawner/lootdrop/bedsheet, /obj/structure/bed/wooden, -/obj/machinery/light_switch{ - pixel_y = 29 - }, /obj/effect/landmark/start/f13/ncrcaptain, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) @@ -20044,6 +19823,14 @@ icon_state = "horizontaltopbordertop0" }, /area/f13/wasteland) +"fXu" = ( +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/ruins{ + icon_state = "rubblepillar" + }, +/area/f13/ambientlighting/building/j) "fXx" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -20340,6 +20127,13 @@ /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"gbA" = ( +/obj/effect/decal/cleanable/glass, +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "gbB" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -20781,17 +20575,11 @@ /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "ggY" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/rack, -/obj/item/stock_parts/micro_laser/ultra, -/obj/item/stock_parts/micro_laser/ultra, -/obj/item/stock_parts/micro_laser/ultra, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 10 +/obj/structure/chair/sofa/left{ + dir = 8 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "ghc" = ( /obj/effect/decal/cleanable/blood/drip, @@ -21195,7 +20983,9 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "god" = ( -/obj/effect/overlay/junk/curtain, +/obj/effect/overlay/junk/curtain{ + layer = 100 + }, /obj/machinery/shower{ dir = 1; pixel_y = -2 @@ -21239,6 +21029,11 @@ /obj/item/twohanded/baseball/spiked, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +"gox" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "goG" = ( /obj/structure/cable/outdoors{ icon_state = "1-4" @@ -21335,17 +21130,15 @@ /turf/open/floor/plating/wooden, /area/f13/building/abandoned/x) "gqh" = ( -/obj/structure/table/reinforced, -/obj/item/trash/f13/blamco, -/obj/item/reagent_containers/food/drinks/flask/survival, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 8 }, -/obj/effect/landmark/questing/item{ - location_description = "in that mall south of the khans." +/obj/structure/destructible/tribal_torch/wall/lit, +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/floor/plasteel/f13/vault_floor/red/white, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "gqt" = ( /obj/effect/decal/cleanable/blood/gibs/down{ icon_state = "gib3-old" @@ -21369,19 +21162,14 @@ }, /area/f13/wasteland) "gqA" = ( -/obj/structure/window/fulltile/house{ - dir = 2; - icon_state = "housewindowbrokenvertical" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fence{ + dir = 4 }, -/obj/machinery/door/poddoor/shutters/preopen{ - layer = 11; - name = "Toys for the Middle-Aged" +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 }, -/turf/open/floor/carpet/arcade, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "gqE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/barrel/dangerous, @@ -21410,6 +21198,11 @@ icon_state = "whitebluechess" }, /area/f13/building/abandoned/j) +"gqX" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "grb" = ( /obj/structure/flora/tree/tall, /obj/effect/decal/remains/human{ @@ -21749,19 +21542,9 @@ }, /area/f13/wasteland) "gxH" = ( -/obj/structure/window/fulltile/house{ - dir = 2; - icon_state = "housewindowbrokenvertical" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters{ - id = "RicketyRick"; - layer = 11; - name = "Rickety Rick's Camping Supplies" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/effect/decal/fakelattice, +/obj/structure/girder, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "gxQ" = ( /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/mid, @@ -21928,14 +21711,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) "gzV" = ( -/obj/structure/rack, -/obj/item/clothing/under/f13/raider_leather, -/obj/item/clothing/under/f13/raider_leather, -/obj/item/clothing/under/f13/raider_leather, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/effect/decal/fakelattice, +/obj/structure/anvil, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) "gzX" = ( /obj/structure/table/wood/bar, @@ -22002,13 +21781,8 @@ /turf/open/indestructible/ground/outside/road, /area/f13/building/abandoned/n) "gAX" = ( -/obj/effect/decal/fakelattice, -/obj/item/trash/sosjerky, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, +/obj/structure/obstacle/old_locked_door, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "gBf" = ( /obj/structure/flora/tree/tall{ @@ -22059,15 +21833,8 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "gBO" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "IsebelAttire"; - layer = 11; - name = "Isebel's Modern Attire" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) "gBQ" = ( /obj/effect/decal/cleanable/generic, @@ -22097,21 +21864,6 @@ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/m) -"gCo" = ( -/obj/machinery/light/small{ - brightness = 7 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/decal/cleanable/blood/old{ - pixel_x = 12 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/neutral/white/whitepurplechess, -/area/f13/ambientlighting/building/j) "gCp" = ( /obj/structure/table, /obj/machinery/computer/terminal{ @@ -22230,7 +21982,9 @@ /area/f13/wasteland/town) "gDO" = ( /obj/structure/table/wood, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ + loot = s + }, /turf/open/indestructible/ground/outside/dirt, /area/f13/ambientlighting/building/k) "gDP" = ( @@ -22280,14 +22034,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"gEl" = ( -/obj/effect/decal/fakelattice, -/obj/item/trash/semki, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "gEp" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/sidewalk{ @@ -22492,17 +22238,6 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland/town) -"gHE" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/structure/rack, -/obj/item/lightreplacer, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 8 - }, -/area/f13/ambientlighting/building/j) "gHN" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -22544,9 +22279,6 @@ }, /area/f13/building/powered) "gHY" = ( -/obj/machinery/light_switch{ - pixel_y = 29 - }, /obj/effect/spawner/lootdrop/f13/crafting, /turf/open/floor/wood_common/wood_common_light, /area/f13/building/powered) @@ -22615,6 +22347,12 @@ icon_state = "greenrustyfull" }, /area/f13/ambientlighting/building/o) +"gIY" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/simple_door/tent, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "gJk" = ( /obj/machinery/microwave/stove, /turf/open/floor/f13{ @@ -22984,16 +22722,12 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "gNZ" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light{ +/obj/effect/turf_decal/weather/dirt{ dir = 8 }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "gOk" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/midhigh, @@ -23064,19 +22798,8 @@ }, /area/f13/wasteland) "gPd" = ( -/obj/structure/rack, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/item/stack/sheet/metal/fifty, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, +/obj/effect/decal/fakelattice, +/turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) "gPj" = ( /obj/structure/lamp_post/quadra, @@ -23220,7 +22943,9 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "gQT" = ( -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ + loot = s + }, /turf/open/indestructible/ground/outside/dirt, /area/f13/underground/cave) "gRd" = ( @@ -23236,15 +22961,6 @@ /obj/structure/decoration/rag, /turf/closed/wall/f13/tentwall, /area/f13/ambientlighting/building/b) -"gRu" = ( -/obj/machinery/light/small{ - brightness = 7 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess, -/area/f13/ambientlighting/building/j) "gRw" = ( /obj/structure/decoration/rag, /obj/effect/decal/cleanable/dirt, @@ -23354,12 +23070,6 @@ icon_state = "innermaincornerinner" }, /area/f13/wasteland) -"gTy" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/yellow/whiteyellowfull, -/area/f13/ambientlighting/building/j) "gTD" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 5 @@ -23464,6 +23174,10 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +"gUF" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "gUH" = ( /obj/effect/overlay/desert_side{ dir = 1 @@ -23570,11 +23284,7 @@ }, /area/f13/building/abandoned/a) "gWG" = ( -/obj/machinery/vending/clothing, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) "gWT" = ( /obj/structure/car/rubbish2, @@ -24231,10 +23941,6 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/b) -"hfw" = ( -/obj/structure/sign/departments/security, -/turf/closed/wall/mineral/concrete, -/area/f13/ambientlighting/building/j) "hfH" = ( /obj/structure/fence{ dir = 4 @@ -24717,14 +24423,6 @@ "hlO" = ( /turf/open/floor/carpet/royalblue, /area/f13/building/abandoned/s) -"hlS" = ( -/obj/machinery/computer/terminal, -/obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/yellow, -/area/f13/ambientlighting/building/j) "hlV" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, @@ -24841,16 +24539,12 @@ /turf/open/indestructible/ground/outside/sidewalkdirt, /area/f13/wasteland/followers) "hmV" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/structure/fluff/railing{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/closet/crate/bin/trashbin{ + pixel_y = -2; + pixel_x = -3 }, -/turf/open/floor/plating/dirt, +/obj/item/trash/f13/sugarbombs, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "hmW" = ( /obj/effect/landmark/start/f13/shaman, @@ -24953,15 +24647,7 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) "hoq" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/f13{ - icon_state = "bluerustysolid" - }, +/turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) "hot" = ( /obj/effect/turf_decal/siding/wood{ @@ -25052,27 +24738,10 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) -"hpR" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/rack, -/obj/structure/closet/crate, -/obj/item/stack/rods/twentyfive, -/obj/item/stack/rods/twentyfive, -/obj/item/stack/rods/twentyfive, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/item/stack/sheet/leather/five, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "hpV" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/sulphite, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, +/obj/effect/decal/cleanable/glass, +/obj/structure/closet/crate/bin/trashbin, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "hpZ" = ( /obj/effect/decal/fakelattice, @@ -25131,17 +24800,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/wasteland) -"hqE" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/planks/pregame, -/obj/effect/decal/cleanable/glass, -/obj/machinery/door/poddoor/shutters{ - id = "ElectronicDick"; - layer = 1; - name = "Dick's Electronic Goods" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, -/area/f13/ambientlighting/building/j) "hqH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/tentclothedge, @@ -25274,17 +24932,6 @@ /obj/item/pickaxe, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) -"hsI" = ( -/obj/structure/table/reinforced, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/item/reagent_containers/food/snacks/breadhard, -/obj/item/reagent_containers/food/snacks/breadhard, -/obj/item/reagent_containers/food/snacks/breadhard, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "hsO" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -25816,13 +25463,12 @@ }, /area/f13/ambientlighting/building/m) "hAD" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/overlay/rockfloor_side, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "hAE" = ( /obj/structure/bed/mattress{ icon_state = "mattress2"; @@ -25852,11 +25498,13 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "hAK" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris1" }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/obj/effect/overlay/desert/sonora/edge/corner, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "hAM" = ( /obj/structure/wreck/trash/three_barrels, /turf/open/indestructible/ground/inside/dirt, @@ -25929,12 +25577,11 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "hBx" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/decal/fakelattice, +/obj/machinery/light/broken{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/chair, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "hBG" = ( /turf/open/floor/f13{ @@ -26014,6 +25661,11 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating/rust, /area/f13/building/powered) +"hCp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/mineral/concrete, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "hCF" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -26056,17 +25708,6 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/p) -"hDe" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = 16 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/ranged, -/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess, -/area/f13/ambientlighting/building/j) "hDi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/displaycase/trophy, @@ -26163,19 +25804,6 @@ }, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/building/abandoned/l) -"hEG" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/landmark/questing/item{ - location_description = "in that mall south of the khans." - }, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 5 - }, -/area/f13/ambientlighting/building/j) "hEJ" = ( /turf/open/indestructible/ground/outside/desert{ icon_state = "wasteland32" @@ -26242,12 +25870,15 @@ }, /area/f13/ambientlighting/building/w) "hFm" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, +/obj/structure/rack/shelf_metal, +/obj/effect/spawner/lootdrop/f13/armor/tier3, +/obj/effect/spawner/lootdrop/f13/armor/tier3, +/obj/effect/decal/fakelattice, +/obj/item/book/granter/crafting_recipe/gunsmith_one, +/obj/item/book/granter/crafting_recipe/gunsmith_two, +/obj/item/book/granter/crafting_recipe/gunsmith_three, +/obj/item/book/granter/crafting_recipe/gunsmith_four, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "hFx" = ( /obj/structure/wreck/trash/one_tire, @@ -26294,16 +25925,6 @@ /obj/structure/barricade/wooden, /turf/closed/wall/f13/tentwall, /area/f13/wasteland) -"hGq" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/structure/window/reinforced/spawner/north, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/neutral/white/whitepurplechess, -/area/f13/ambientlighting/building/j) "hGw" = ( /obj/structure/fence/wooden, /turf/open/indestructible/ground/inside/dirt, @@ -26345,13 +25966,7 @@ }, /area/f13/ambientlighting/building/b) "hGZ" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/turf/closed/wall/f13/ruins, /area/f13/ambientlighting/building/j) "hHf" = ( /obj/structure/flora/tree/tall, @@ -26440,15 +26055,8 @@ /turf/closed/wall/f13/wood/house/broken, /area/f13/legioncamp) "hIh" = ( -/obj/structure/bed/mattress{ - icon_state = "mattress2"; - pixel_y = 7 - }, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/white, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) "hIi" = ( /obj/effect/spawner/lootdrop/f13/advcrafting, @@ -26588,21 +26196,6 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) -"hKn" = ( -/obj/effect/decal/cleanable/glass, -/obj/structure/window/reinforced/spawner/east, -/obj/structure/rack, -/obj/item/reagent_containers/glass/bowl, -/obj/item/reagent_containers/glass/bowl, -/obj/item/reagent_containers/glass/bowl, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 5 - }, -/area/f13/ambientlighting/building/j) "hKo" = ( /obj/structure/car/rubbish2, /obj/effect/decal/waste{ @@ -26753,16 +26346,16 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "hNt" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced/spawner/east, -/obj/structure/rack, -/obj/item/construction/rcd, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 5 +/obj/structure/closet/fridge{ + anchored = 1 }, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "hNu" = ( /obj/structure/chair/bench{ @@ -26807,6 +26400,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"hNV" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) "hOi" = ( /obj/machinery/computer/camera_advanced{ id = "veryevilnetwork" @@ -26884,6 +26483,18 @@ /obj/machinery/smartfridge/bottlerack/lootshelf/condiment, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) +"hPh" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "hPo" = ( /obj/structure/rack, /obj/item/storage/box/gloves, @@ -27229,21 +26840,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"hTd" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/glass, -/obj/item/shard, -/obj/effect/decal/cleanable/blood/old{ - pixel_x = 12 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "hTi" = ( /obj/structure/destructible/tribal_torch/wall/lit, /obj/structure/wreck/trash/three_barrels, @@ -27342,12 +26938,11 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) "hWa" = ( -/obj/structure/wreck/trash/brokenvendor, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/mob/living/simple_animal/hostile/renegade/soldier, +/obj/structure/chair/stool/retro/tan, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "hWq" = ( /obj/structure/car/rubbish4{ pixel_y = -9; @@ -27441,12 +27036,6 @@ icon_state = "verticalrightborderright2bottom" }, /area/f13/ambientlighting/building/y) -"hXB" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/white, -/area/f13/ambientlighting/building/j) "hXV" = ( /obj/machinery/conveyor/auto{ dir = 4; @@ -27500,13 +27089,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/o) -"hYY" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/structure/fluff/railing{ - dir = 8 - }, -/turf/open/water, -/area/f13/ambientlighting/building/j) "hZa" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -27517,14 +27099,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) -"hZw" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/structure/rack, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +"hZy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/bin/trashbin, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" }, -/turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) "hZG" = ( /obj/effect/overlay/desert/sonora/edge{ @@ -27542,6 +27122,7 @@ pixel_y = 24; pixel_x = 16 }, +/obj/effect/overlay/desert/sonora/edge, /turf/open/floor/wood_common, /area/f13/wasteland) "hZL" = ( @@ -27634,15 +27215,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"iaE" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/tribal{ - name = "Cannibal Chef" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "iaF" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt, @@ -27804,14 +27376,20 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) "idG" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/item/megaphone, +/obj/structure/table/wood/junk, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 9; + pixel_y = 9 }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = -8; + pixel_y = 7 }, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) "idX" = ( /obj/structure/curtain{ color = "#845f58"; @@ -27824,9 +27402,12 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "idZ" = ( -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/window/fulltile/house{ + icon_state = "housewindowbrokenvertical" }, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/bars, +/turf/open/indestructible/ground/outside/desert, /area/f13/ambientlighting/building/j) "iea" = ( /turf/open/indestructible/ground/outside/sidewalk{ @@ -27906,14 +27487,12 @@ }, /area/f13/building/powered) "ifN" = ( -/obj/structure/barricade/sandbags, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/mob/living/simple_animal/hostile/renegade/guardian, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "ifQ" = ( /obj/structure/cable/outdoors{ icon_state = "2-8" @@ -28090,6 +27669,13 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +"ihE" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris1" + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "ihM" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/wood_wide, @@ -28248,13 +27834,12 @@ }, /area/f13/building/abandoned/t) "ijH" = ( -/obj/structure/chair/bench, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/item/storage/trash_stack, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/mob/living/simple_animal/hostile/raider/thief, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "ijL" = ( /obj/structure/car/rubbish2, /turf/open/indestructible/ground/outside/road{ @@ -28355,6 +27940,11 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"ikU" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "ilg" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -28458,11 +28048,11 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "imq" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/girder, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "imu" = ( /obj/structure/dresser, @@ -28685,6 +28275,10 @@ /obj/machinery/vending/cola/starkist, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/t) +"irl" = ( +/obj/structure/junk/locker, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "irs" = ( /obj/structure/wreck/trash/machinepile, /turf/open/indestructible/ground/outside/dirt, @@ -28960,17 +28554,9 @@ }, /area/f13/building/abandoned/h) "ivH" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/structure/fluff/railing{ - dir = 1 - }, -/obj/structure/flora/stump, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/dirt, +/obj/effect/decal/fakelattice, +/obj/machinery/autolathe, +/turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) "ivI" = ( /obj/structure/cable/outdoors{ @@ -29193,22 +28779,9 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) "izB" = ( -/obj/structure/bed/mattress{ - icon_state = "mattress4" - }, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/button/door{ - id = "ElectronicDick"; - name = "Dick's Electronic Goods shutters"; - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, +/obj/structure/rack/large/shelf, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) "izO" = ( /obj/item/storage/trash_stack{ @@ -29279,7 +28852,6 @@ /obj/structure/rack/shelf_metal, /obj/item/clothing/head/helmet/f13/combat/mk2, /obj/item/clothing/suit/armor/tiered/medium/combat/mk2, -/obj/effect/spawner/bundle/f13/assault_carbine, /obj/item/clothing/gloves/combat, /obj/item/clothing/shoes/combat, /obj/machinery/light/fo13colored/Red{ @@ -29289,6 +28861,7 @@ /obj/effect/spawner/lootdrop/f13/blueprintVHighBallistics, /obj/effect/spawner/lootdrop/f13/blueprintVHigh, /obj/effect/spawner/lootdrop/f13/blueprintMid, +/obj/effect/spawner/bundle/f13/plasmapistol, /turf/open/floor/pod/dark, /area/f13/building/powered) "iAt" = ( @@ -29357,6 +28930,12 @@ icon_state = "horizontalbottombordertop0" }, /area/f13/wasteland) +"iBz" = ( +/turf/open/indestructible/ground/outside/ruins{ + dir = 5; + icon_state = "rubbleplate" + }, +/area/f13/ambientlighting/building/j) "iBC" = ( /obj/structure/chair/booth{ icon_state = "booth_east_north" @@ -29525,21 +29104,6 @@ name = "rusted floor" }, /area/f13/ncr) -"iDS" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light/small{ - brightness = 7; - dir = 4 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "iDV" = ( /obj/effect/landmark/questing/people{ location_description = "somewhere to the south of the old town, in one of them houses." @@ -29602,11 +29166,11 @@ /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) "iEK" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/wreck/bus/rusted, -/turf/open/indestructible/ground/outside/road, -/area/f13/wasteland) +/obj/structure/nest/ghoul, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, +/area/f13/ambientlighting/building/j) "iEQ" = ( /obj/effect/overlay/fog, /turf/open/indestructible/ground/outside/water/running, @@ -29621,7 +29185,9 @@ /area/f13/ambientlighting/building/m) "iFj" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ + loot = s + }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3, /turf/open/floor/wood_wide, @@ -29632,16 +29198,6 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) -"iFu" = ( -/obj/machinery/vending/cigarette{ - default_price = 0; - extra_price = 0 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "iFx" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/ghoul/glowing, @@ -29956,18 +29512,6 @@ /obj/structure/debris/v1, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) -"iKX" = ( -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "MikoStiff"; - layer = 11; - name = "Miko's Stiff Beds" - }, -/turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, -/area/f13/ambientlighting/building/j) "iLb" = ( /obj/effect/spawner/lootdrop/f13/seedspawner, /obj/effect/spawner/lootdrop/f13/seedspawner, @@ -30020,6 +29564,10 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/t) +"iLG" = ( +/obj/item/stack/sheet/mineral/concrete, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "iLH" = ( /obj/structure/table/wood, /obj/item/reagent_containers/glass/beaker/waterbottle/large, @@ -30192,6 +29740,9 @@ pixel_y = -4; pixel_x = 16 }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, /turf/open/floor/wood_common, /area/f13/wasteland) "iOG" = ( @@ -30421,9 +29972,13 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) "iSM" = ( -/obj/machinery/autolathe, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/rack/shelf_metal, +/obj/effect/spawner/lootdrop/f13/resourcespawner, +/obj/effect/spawner/lootdrop/f13/resourcespawner, +/obj/effect/spawner/lootdrop/f13/resourcespawner, +/obj/machinery/light{ + dir = 1; + layer = 2.9 }, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) @@ -30560,6 +30115,15 @@ /obj/structure/simple_door/metal/dirtystore, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +"iVJ" = ( +/obj/effect/decal/fakelattice, +/obj/structure/junk/small/bed, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +"iVL" = ( +/obj/machinery/recycler/deathtrap, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) "iVU" = ( /obj/structure/chair/bench{ dir = 4; @@ -30640,6 +30204,10 @@ icon_state = "verticaloutermain1" }, /area/f13/followers) +"iWK" = ( +/obj/item/stack/sheet/bone, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "iWV" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, @@ -30777,16 +30345,6 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) -"iYV" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gibmid1" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "iZh" = ( /obj/structure/cable/outdoors{ icon_state = "4-8" @@ -31193,14 +30751,13 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "jeV" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/cards/deck, +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "jfb" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -31477,15 +31034,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) -"jiW" = ( -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/structure/junk/small/bed2, -/obj/item/bedsheet/medical, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plasteel/f13/vault_floor/yellow, +"jja" = ( +/obj/effect/spawner/lootdrop/glowstick, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "jjd" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -31593,6 +31145,14 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +"jkI" = ( +/obj/item/chair/wood, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "jkK" = ( /obj/machinery/power/apc/fusebox/north, /obj/structure/cable{ @@ -31633,18 +31193,6 @@ }, /turf/open/floor/plasteel/bar, /area/f13/wasteland) -"jle" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/item/storage/trash_stack{ - icon_state = "trash_2" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "jlj" = ( /obj/structure/table/reinforced, /obj/item/book/granter/crafting_recipe/gunsmith_one, @@ -31756,10 +31304,9 @@ /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/city) "jmU" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/dirt, +/obj/item/trash/f13/steak, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "jmW" = ( /obj/effect/decal/cleanable/dirt, @@ -31951,20 +31498,14 @@ }, /area/f13/building/abandoned/h) "jqz" = ( -/obj/structure/closet/cardboard, -/obj/item/trash/f13/porknbeans, -/obj/item/trash/f13/porknbeans, -/obj/item/trash/f13/porknbeans, -/obj/item/trash/f13/cram, -/obj/item/trash/f13/cram, -/obj/item/trash/f13/cram, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fence/corner{ + dir = 1 }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerturn" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "jqJ" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/melee/tier2, @@ -32295,17 +31836,6 @@ icon_state = "stagestairs" }, /area/f13/building/powered) -"jvX" = ( -/obj/structure/debris/v3{ - pixel_x = -15; - pixel_y = -12 - }, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "jwc" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, @@ -32394,14 +31924,9 @@ /turf/closed/wall/mineral/brick, /area/f13/ncr) "jxe" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/structure/closet/crate/bin{ - layer = 0.5 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/structure/fluff/rug/rug_rubber, +/obj/item/paperslip, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "jxg" = ( /obj/machinery/photocopier, @@ -32802,14 +32327,6 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/m) -"jCe" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/j) "jCg" = ( /obj/structure/chair/bench, /turf/open/indestructible/ground/outside/dirt, @@ -32832,14 +32349,10 @@ }, /area/f13/building/powered) "jCl" = ( -/mob/living/simple_animal/hostile/handy/nsb, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) +/obj/structure/wreck/trash/machinepiletwo, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "jCt" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -32875,14 +32388,6 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/w) -"jDg" = ( -/obj/structure/rack, -/obj/item/toy/plush/beeplushie, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/carpet/arcade, -/area/f13/ambientlighting/building/j) "jDh" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt{ @@ -33099,16 +32604,6 @@ "jGQ" = ( /turf/closed/mineral/random/no_caves, /area/f13/wasteland/town) -"jGR" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "jGT" = ( /obj/effect/turf_decal/big{ dir = 8 @@ -33225,14 +32720,11 @@ /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/e) "jJo" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/closet/crate/trashcart, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "jJC" = ( /obj/structure/sign/painting/library_secure{ persistence_id = "brotherhood_secure"; @@ -33291,6 +32783,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common/wood_common_light, /area/f13/building/powered) +"jKa" = ( +/obj/structure/junk/small/bed2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "jKo" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/outside/dirt{ @@ -33389,11 +32886,15 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/x) "jMh" = ( -/obj/structure/simple_door, -/obj/structure/barricade/wooden/strong, -/obj/structure/barricade/wooden/planks, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/obj/effect/overlay/rockfloor_side{ + dir = 1 + }, +/obj/structure/kitchenspike, +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/gibspawner/human, +/obj/structure/destructible/tribal_torch/wall/lit, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "jMk" = ( /obj/structure/junk/drawer{ pixel_y = 10 @@ -33623,6 +33124,10 @@ name = "rusted floor" }, /area/f13/building/powered) +"jQt" = ( +/obj/effect/overlay/desert/sonora/edge, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "jQw" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 1; @@ -33892,19 +33397,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) -"jUe" = ( -/obj/structure/rack, -/obj/item/clothing/under/suit/white_on_white/skirt, -/obj/item/clothing/under/suit/white_on_white/skirt, -/obj/item/clothing/under/suit/white_on_white/skirt, -/obj/item/clothing/under/suit/white, -/obj/item/clothing/under/suit/white, -/obj/item/clothing/under/suit/white, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "jUl" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood_common{ @@ -33946,16 +33438,10 @@ }, /area/f13/wasteland/followers) "jUO" = ( -/obj/effect/decal/fakelattice, -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/planks/pregame, -/obj/effect/decal/cleanable/glass, -/obj/machinery/door/poddoor/shutters{ - id = "ElectronicDick"; - layer = 1; - name = "Dick's Electronic Goods" +/obj/machinery/door/password{ + door_id = "evilassdoor" }, -/turf/open/floor/plating/rust, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "jUV" = ( /turf/open/indestructible/ground/outside/sidewalk{ @@ -34045,6 +33531,10 @@ /obj/machinery/power/floodlight, /turf/open/floor/plating/f13, /area/f13/wasteland) +"jWa" = ( +/obj/structure/closet/bus, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) "jWe" = ( /obj/structure/flora/tree/cactus, /turf/open/indestructible/ground/outside/desert, @@ -34139,13 +33629,14 @@ /turf/open/floor/f13, /area/f13/ambientlighting/building/o) "jYg" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/easel, +/obj/structure/fluff/paper/corner{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/glass, -/obj/item/shard, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/item/canvas/twentythreeXnineteen{ + pixel_x = 3 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "jYr" = ( /obj/effect/decal/marking{ @@ -34567,15 +34058,6 @@ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/f) -"keO" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/structure/simple_door, -/obj/structure/barricade/wooden/planks, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "keX" = ( /turf/closed/wall/f13/wood/interior, /area/f13/ambientlighting/building/p) @@ -34586,17 +34068,6 @@ name = "rusted floor" }, /area/f13/building/powered) -"kfy" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/processor, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 9 - }, -/area/f13/ambientlighting/building/j) "kfF" = ( /obj/structure/chair/pew/left{ dir = 1 @@ -35078,12 +34549,11 @@ /turf/closed/wall/mineral/wood, /area/f13/legioncamp) "klW" = ( -/obj/structure/chair/bench, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/hobo, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "kme" = ( /turf/open/floor/f13{ icon_state = "floorrusty" @@ -35387,20 +34857,6 @@ /obj/structure/closet/fridge/standard, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) -"krt" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = 16 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "kru" = ( /obj/structure/wreck/trash/two_barrels, /turf/open/indestructible/ground/outside/graveldirt, @@ -35438,14 +34894,6 @@ }, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland/town) -"ksz" = ( -/obj/effect/decal/cleanable/glass, -/obj/item/shard, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/carpet/arcade, -/area/f13/ambientlighting/building/j) "ksS" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/indestructible/ground/outside/dirt, @@ -35591,21 +35039,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13, /area/f13/ambientlighting/building/o) -"kuS" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light/small{ - brightness = 7; - dir = 8 - }, -/mob/living/simple_animal/hostile/handy/protectron{ - faction = list("raider") - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "kuV" = ( /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) @@ -36005,20 +35438,11 @@ /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) "kBR" = ( -/obj/effect/turf_decal/vg_decals/numbers/nine, +/obj/effect/turf_decal/vg_decals/numbers/nine{ + layer = 5 + }, /turf/closed/wall/mineral/brick, /area/f13/ncr) -"kBU" = ( -/mob/living/simple_animal/hostile/handy/protectron{ - faction = list("raider") - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "kBZ" = ( /obj/structure/obstacle/barbedwire/end{ dir = 8 @@ -36295,19 +35719,6 @@ "kGJ" = ( /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) -"kGP" = ( -/obj/structure/table, -/obj/machinery/microwave, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "kGR" = ( /obj/machinery/smartfridge/bottlerack/grownbin, /obj/structure/cable/outdoors{ @@ -36462,17 +35873,12 @@ }, /area/f13/wasteland) "kIO" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/structure/rack, -/obj/item/clothing/neck/apron/chef, -/obj/item/clothing/head/chefhat, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 4 +/obj/structure/barricade/wooden, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "kIQ" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -36648,21 +36054,6 @@ icon_state = "bluerustysolid" }, /area/f13/ambientlighting/building/o) -"kLc" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/terminal{ - dir = 4; - termtag = "Secret" - }, -/obj/item/stack/cable_coil, -/obj/item/screwdriver, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/j) "kLg" = ( /obj/structure/chair/sofa/left, /turf/open/floor/f13{ @@ -36787,6 +36178,11 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"kNa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "kNb" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowbroken" @@ -36869,17 +36265,6 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) -"kNu" = ( -/obj/structure/junk/small/bed, -/obj/effect/turf_decal/box/white, -/obj/effect/turf_decal/box/white, -/obj/item/bedsheet/pirate, -/obj/item/toy/plush/mr_buckety, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/yellow/white/whiteyellowchess/whiteyellowchess2, -/area/f13/ambientlighting/building/j) "kNy" = ( /obj/effect/decal/cleanable/greenglow{ pixel_x = 19; @@ -37019,6 +36404,10 @@ icon_state = "catwalk" }, /area/f13/ambientlighting/building/o) +"kPr" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "kPz" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/sidewalk{ @@ -37448,15 +36837,14 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "kWV" = ( -/obj/structure/rack, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" +/obj/structure/closet/crate/footlocker{ + anchored = 1 }, +/obj/item/storage/crayons, +/obj/item/paint/anycolor, +/obj/item/paint/anycolor, +/obj/item/paint/anycolor, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "kWW" = ( /obj/structure/car/rubbish2, @@ -37608,9 +36996,9 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "kZz" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, +/obj/structure/rack/shelf_metal, +/obj/effect/spawner/lootdrop/f13/resourcespawner, +/obj/effect/spawner/lootdrop/f13/resourcespawner, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "kZC" = ( @@ -37634,12 +37022,11 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "kZV" = ( -/obj/machinery/autolathe/ammo, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/car/rubbish2{ + pixel_x = 7; + pixel_y = -16 }, -/obj/item/book/granter/crafting_recipe/gunsmith_two, -/obj/item/book/granter/crafting_recipe/gunsmith_one, +/obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "kZW" = ( @@ -37782,6 +37169,11 @@ /obj/structure/flora/twig, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"lbs" = ( +/obj/item/blacksmith/chain, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) "lbu" = ( /obj/structure/rack/shelf_metal, /obj/item/weldingtool, @@ -37905,12 +37297,11 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) "ldI" = ( -/obj/structure/campfire/barrel, -/obj/item/reagent_containers/food/snacks/meatbun, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, +/obj/structure/rack/shelf_metal, +/obj/effect/spawner/lootdrop/f13/blueprintHigh, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/high, +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "ldS" = ( /obj/structure/fence/wooden{ @@ -38093,13 +37484,15 @@ /obj/structure/flora/grass/wasteland, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"lhV" = ( -/obj/structure/junk/small/bed, -/obj/effect/turf_decal/box/white, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +"lhX" = ( +/obj/effect/decal/fakelattice, +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 8 + }, +/obj/machinery/light/broken{ + dir = 4 }, -/turf/open/floor/plasteel/f13/vault_floor/yellow/white/whiteyellowchess/whiteyellowchess2, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "lia" = ( /obj/structure/table, @@ -38157,18 +37550,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) -"ljx" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light/small{ - brightness = 7; - dir = 8 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "ljz" = ( /obj/structure/barricade/tentclothedge{ dir = 8; @@ -38191,14 +37572,6 @@ }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) -"lkc" = ( -/obj/structure/chair, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/thief, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "lki" = ( /obj/structure/reagent_dispensers/barrel/dangerous{ pixel_y = -5; @@ -38393,10 +37766,11 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) "lnd" = ( -/obj/structure/chair/bench, -/mob/living/simple_animal/hostile/raider/thief, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "lnD" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/road, @@ -38638,20 +38012,6 @@ /obj/structure/simple_door/wood, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) -"lqJ" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "IsebelAttire"; - layer = 11; - name = "Isebel's Modern Attire" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "lqZ" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, @@ -38735,6 +38095,15 @@ /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) +"lsm" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/blood{ + dir = 13; + icon_state = "tracks"; + pixel_y = 8 + }, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) "lsp" = ( /obj/structure/debris/v3, /turf/open/indestructible/ground/outside/desert, @@ -38825,16 +38194,14 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "ltA" = ( -/obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fence/corner{ + dir = 4 }, -/obj/machinery/button{ - id = "MallFront"; - name = "Mall Front shutters" +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 }, -/turf/open/floor/plasteel/f13/vault_floor/red/white, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "ltG" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -38956,6 +38323,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"lvw" = ( +/obj/structure/barricade/concrete, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "lvx" = ( /obj/machinery/door/locked/hard/maybe_trapped, /turf/open/floor/wood_wide, @@ -39203,18 +38574,14 @@ /turf/open/indestructible/ground/outside/dirt/harsh, /area/f13/followers) "lzH" = ( -/obj/structure/bed/mattress{ - icon_state = "mattress2"; - pixel_y = 7 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gibmid1" +/obj/structure/chair/stool/retro/tan, +/mob/living/simple_animal/hostile/renegade/grunt, +/obj/item/storage/trash_stack{ + icon_state = "trash_3" }, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, -/area/f13/ambientlighting/building/j) +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "lzL" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8; @@ -39389,23 +38756,6 @@ /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) -"lCJ" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light/small{ - brightness = 7 - }, -/obj/machinery/button/door{ - id = "RicketyRick"; - name = "Rickety Rick's Camping Supplies shutters"; - pixel_y = -32 - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "lCR" = ( /turf/open/floor/f13{ icon_state = "whitegreenrustychess" @@ -39611,6 +38961,18 @@ /obj/structure/reagent_dispensers/keg/milk, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"lGm" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "lGC" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/roaddirt{ @@ -39724,14 +39086,13 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "lIE" = ( -/obj/effect/decal/cleanable/glass, -/obj/item/shard, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "lIM" = ( /obj/effect/overlay/desert/sonora/edge, /obj/effect/overlay/desert/sonora/edge{ @@ -40035,21 +39396,13 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "lMg" = ( -/obj/structure/window/fulltile/house{ - dir = 2; - icon_state = "housewindowbrokenvertical" - }, -/obj/structure/barricade/wooden/planks/pregame, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/car/rubbish2{ + icon_state = "car_rubish3" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "MallFront"; - layer = 11; - name = "Mall Front" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "lMm" = ( /obj/machinery/autolathe, /obj/effect/decal/cleanable/dirt, @@ -40356,9 +39709,6 @@ "lRB" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/large, -/obj/item/stack/sheet/metal/twenty, -/obj/item/stack/sheet/mineral/concrete/ten, -/obj/item/stack/sheet/mineral/limestone/five, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain1" }, @@ -40379,6 +39729,17 @@ /obj/structure/flora/tree/oak_two, /turf/open/indestructible/ground/outside/grass/dirtpath, /area/f13/wasteland) +"lSi" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris1" + }, +/obj/effect/decal/fakelattice, +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "lSt" = ( /obj/effect/spawner/lootdrop/weapon_parts, /turf/open/indestructible/ground/outside/dirt, @@ -40427,17 +39788,6 @@ "lSV" = ( /turf/closed/wall/f13/wood/house, /area/f13/caves) -"lSW" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/structure/table/wood, -/obj/machinery/microwave, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 8 - }, -/area/f13/ambientlighting/building/j) "lSZ" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -40567,17 +39917,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) "lUM" = ( -/obj/effect/decal/fakelattice, -/obj/structure/barricade/wooden/planks/pregame, -/obj/structure/barricade/wooden, -/obj/structure/debris/v3{ - pixel_x = -15; - pixel_y = -12 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fluff/paper/stack{ + dir = 1 }, -/turf/open/floor/plating/rust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "lUU" = ( /obj/effect/spawner/lootdrop/armylootbasic, @@ -40724,6 +40067,11 @@ /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/wood_common, /area/maintenance/bar) +"lXA" = ( +/obj/item/storage/belt/utility/full/engi, +/obj/structure/closet/crate/engineering, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "lXC" = ( /obj/structure/obstacle/barbedwire{ dir = 4 @@ -40770,17 +40118,6 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) -"lYf" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/item/storage/trash_stack, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "lYi" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -40856,20 +40193,6 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/building/abandoned/m) -"lZM" = ( -/obj/effect/decal/cleanable/blood/old{ - pixel_x = 12 - }, -/obj/item/ammo_casing/c10mm, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/head/helmet/skull{ - name = "reliquary" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "lZX" = ( /obj/machinery/dna_scannernew, /obj/effect/decal/cleanable/dirt/dust, @@ -41020,12 +40343,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"mcC" = ( -/obj/structure/fluff/railing{ - dir = 4 - }, -/turf/open/water, -/area/f13/ambientlighting/building/j) "mcI" = ( /obj/structure/billboard/nukagirl2, /turf/open/indestructible/ground/outside/desert, @@ -41257,10 +40574,13 @@ }, /area/f13/ambientlighting/building/i) "mfw" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowvertical" }, -/turf/open/floor/plasteel/f13/vault_floor/red/white, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/bars, +/turf/open/indestructible/ground/outside/desert, /area/f13/ambientlighting/building/j) "mfx" = ( /obj/structure/chair/stool, @@ -41354,6 +40674,7 @@ pixel_y = 24; pixel_x = 16 }, +/obj/effect/overlay/desert/sonora/edge, /turf/open/floor/wood_common, /area/f13/wasteland) "mgI" = ( @@ -41498,11 +40819,11 @@ }, /area/f13/brotherhood) "miU" = ( -/obj/structure/fluff/railing{ - dir = 9 +/mob/living/simple_animal/hostile/renegade/guardian, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/water, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "mji" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, @@ -41595,6 +40916,10 @@ color = "#c5bab2" }, /area/f13/building/abandoned/p) +"mlF" = ( +/obj/structure/girder, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "mlG" = ( /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/outside/sidewalk{ @@ -41691,12 +41016,8 @@ }, /area/f13/building/abandoned/t) "mmI" = ( -/obj/structure/junk/small/bed, -/obj/effect/turf_decal/box/white, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/yellow/white/whiteyellowchess, +/obj/item/trash/f13/porknbeans, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "mmL" = ( /obj/structure/bed/mattress/pregame{ @@ -42211,22 +41532,6 @@ /obj/item/reagent_containers/glass/bucket/wood, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) -"mvy" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/button/door{ - id = "UBuild"; - name = "Gabriel's U-Build shutters"; - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/f13{ - icon_state = "bluerustysolid" - }, -/area/f13/ambientlighting/building/j) "mvA" = ( /obj/structure/filingcabinet, /obj/structure/filingcabinet{ @@ -42489,16 +41794,6 @@ icon_state = "rubble" }, /area/f13/wasteland) -"mzq" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/rack, -/obj/item/trash/f13/instamash, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "mzJ" = ( /obj/structure/reagent_dispensers/barrel/three, /turf/open/indestructible/ground/outside/dirt{ @@ -43126,15 +42421,16 @@ /obj/structure/reagent_dispensers/compostbin, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) -"mIK" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +"mIS" = ( +/obj/structure/chair/wood{ + dir = 4 }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/obj/effect/decal/cleanable/blood, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "mJa" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -43157,15 +42453,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"mJL" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/baseball, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "mJM" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "innermaincornerinner" @@ -43258,6 +42545,10 @@ /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, /area/f13/ambientlighting/building/m) +"mLQ" = ( +/obj/effect/decal/fakelattice, +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/j) "mLW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -43324,6 +42615,11 @@ /obj/structure/barricade/wooden/planks/pregame, /turf/closed/wall/f13/ruins, /area/f13/wasteland/town) +"mNN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/junk/small, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "mNO" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/dirt{ @@ -43378,6 +42674,10 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) +"mOh" = ( +/obj/structure/stairs/east, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "mOk" = ( /obj/structure/chair/comfy/green{ dir = 4; @@ -43405,6 +42705,10 @@ "mOF" = ( /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +"mOQ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "mOV" = ( /obj/machinery/light/fo13colored/Red{ dir = 1 @@ -43514,11 +42818,11 @@ }, /area/f13/wasteland) "mQK" = ( -/obj/structure/fluff/railing{ - dir = 8 +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 }, -/turf/open/water, -/area/f13/ambientlighting/building/j) +/turf/open/floor/wood_common, +/area/f13/wasteland) "mQR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -43576,6 +42880,10 @@ }, /turf/open/floor/plating/f13, /area/f13/wasteland) +"mRm" = ( +/obj/item/chair/wood/modern, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "mRx" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/graveldirt, @@ -43768,19 +43076,10 @@ /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "mUz" = ( -/obj/structure/debris/v3{ - pixel_x = -15; - pixel_y = -12 - }, -/obj/structure/debris/v3{ - pixel_x = -12; - pixel_y = 13 - }, +/obj/structure/rack/shelf_metal, /obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, +/obj/item/melee/smith/hammer, +/turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) "mUB" = ( /turf/open/indestructible/ground/outside/sidewalk{ @@ -44008,6 +43307,12 @@ }, /turf/closed/wall/r_wall/rust, /area/f13/building/abandoned/n) +"mYq" = ( +/obj/structure/obstacle/tanktrap, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "mYS" = ( /obj/structure/closet/crate/bin/trashbin, /obj/effect/overlay/desert/sonora/edge{ @@ -44220,12 +43525,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"nbB" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/whiteredfull, -/area/f13/ambientlighting/building/j) "nbJ" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/ghoul/reaver, @@ -44233,18 +43532,6 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/f) -"nbO" = ( -/obj/machinery/vending/cigarette{ - default_price = 0; - extra_price = 0 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "nbU" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/sidewalk{ @@ -44308,15 +43595,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"ncO" = ( -/obj/structure/barricade/wooden/strong, -/obj/structure/barricade/wooden/strong, -/obj/structure/barricade/wooden/planks, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "ndc" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/light/small{ @@ -44562,17 +43840,11 @@ }, /area/f13/building/powered) "nfN" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/glass, -/obj/item/chair, -/obj/item/fishingrod, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/decal/cleanable/robot_debris, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/mob/living/simple_animal/hostile/raider/tribal, -/obj/item/fishy/carp, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "nfO" = ( /obj/structure/simple_door/brokenglass, /turf/open/floor/wood_common/wood_common_dark, @@ -44852,6 +44124,15 @@ smooth = 1 }, /area/f13/casino) +"njU" = ( +/obj/structure/wreck/car/bike{ + dir = 8; + icon_state = "bike_rust_med_no_wheels" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "njW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood, @@ -45127,17 +44408,6 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) -"nnl" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "MikoStiff"; - layer = 11; - name = "Miko's Stiff Beds" - }, -/turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, -/area/f13/ambientlighting/building/j) "nnz" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -45246,7 +44516,9 @@ "npB" = ( /obj/effect/decal/cleanable/robot_debris/gib, /obj/structure/rack/shelf_metal, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ + loot = s + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) @@ -45293,15 +44565,10 @@ }, /area/f13/wasteland) "nqo" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, +/obj/item/melee/onehanded/machete/scrapsabre, +/obj/item/clothing/under/f13/raiderrags, +/obj/item/clothing/gloves/f13/handwraps, +/turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) "nqp" = ( /obj/item/storage/trash_stack{ @@ -45508,16 +44775,10 @@ }, /area/f13/wasteland) "nsX" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/structure/fluff/railing{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/dirt, +/obj/item/trash/f13/specialapples, +/obj/item/paperplane, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "nti" = ( /obj/effect/decal/cleanable/blood/old, @@ -45841,6 +45102,11 @@ name = "dirty floor" }, /area/f13/building/powered) +"nyg" = ( +/turf/open/indestructible/ground/outside/ruins{ + icon_state = "rubblepillar" + }, +/area/f13/ambientlighting/building/j) "nyh" = ( /obj/item/clothing/shoes/ballandchain, /turf/open/indestructible/ground/outside/desert, @@ -45893,7 +45159,9 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier1, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier1, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ + loot = s + }, /obj/effect/spawner/lootdrop/f13/armor/tier1, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) @@ -45917,17 +45185,11 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "nzH" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/item/storage/trash_stack{ - icon_state = "trash_3" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/mob/living/simple_animal/hostile/renegade/soldier, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "nzO" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks, @@ -46081,6 +45343,10 @@ /obj/structure/disposalpipe/segment, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +"nBs" = ( +/obj/structure/weightmachine/weightlifter, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "nBI" = ( /obj/structure/chair/wood{ dir = 4 @@ -46133,17 +45399,6 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/f13/wood/house, /area/f13/legioncamp) -"nCx" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced/spawner/west, -/obj/structure/rack, -/obj/effect/decal/fakelattice, -/obj/machinery/reagentgrinder, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "nCG" = ( /obj/item/chair/wood/modern, /turf/open/indestructible/ground/outside/sidewalk{ @@ -46607,6 +45862,13 @@ /obj/item/chair/stool/retro, /turf/open/floor/carpet/purple, /area/f13/bar) +"nJY" = ( +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) "nKg" = ( /turf/open/floor/f13/wood{ icon_state = "housewood2-broken" @@ -46847,16 +46109,10 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "nNx" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/obj/structure/barricade/wooden, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "nNB" = ( /obj/structure/fermenting_barrel, /turf/open/indestructible/ground/outside/dirt{ @@ -46900,7 +46156,9 @@ }, /area/f13/wasteland) "nOm" = ( -/obj/effect/overlay/junk/curtain, +/obj/effect/overlay/junk/curtain{ + layer = 100 + }, /obj/machinery/shower{ pixel_y = 27 }, @@ -47129,16 +46387,6 @@ /obj/structure/bed/old, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/t) -"nSn" = ( -/obj/structure/rack, -/obj/item/trash/f13/cram, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "nSu" = ( /obj/structure/chair/folding{ dir = 4 @@ -47367,17 +46615,14 @@ }, /area/f13/building/powered) "nWo" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/structure/fluff/railing{ - dir = 6 +/obj/structure/car/rubbish2{ + pixel_x = 7; + pixel_y = -16 }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/floor/plating/dirt, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "nWy" = ( /turf/open/indestructible/ground/outside/road{ dir = 8; @@ -47706,6 +46951,14 @@ /obj/structure/barricade/sandbags, /turf/open/floor/f13/wood, /area/f13/wasteland/legion) +"ocL" = ( +/obj/effect/decal/fakelattice, +/obj/structure/junk/cabinet, +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "ocN" = ( /obj/machinery/light{ dir = 8; @@ -47933,6 +47186,15 @@ "oeG" = ( /turf/open/indestructible/ground/outside/desert, /area/f13/caves) +"oeN" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 17 + }, +/obj/effect/decal/cleanable/blood, +/obj/structure/wreck/trash/machinepile, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "oeO" = ( /obj/structure/table, /obj/machinery/button/door{ @@ -47989,6 +47251,21 @@ icon_state = "verticalrightborderleft0" }, /area/f13/ambientlighting/building/i) +"ofR" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 10 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "ofT" = ( /obj/effect/decal/marking{ icon_state = "dottedhorizontalcorroded" @@ -48093,13 +47370,6 @@ /obj/structure/table, /turf/open/floor/plating/rust, /area/f13/building/powered) -"ohg" = ( -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/carpet/arcade, -/area/f13/ambientlighting/building/j) "ohj" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -48219,6 +47489,14 @@ /obj/item/stack/f13Cash/caps/onefivezero, /turf/open/floor/f13/wood, /area/f13/building/abandoned/g) +"oje" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) "ojn" = ( /obj/structure/sign/crosswalk{ name = "trail" @@ -48368,20 +47646,14 @@ }, /area/f13/building/abandoned/t) "okR" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/firefighter, -/obj/machinery/light/small{ - brightness = 7 +/mob/living/simple_animal/hostile/renegade/soldier, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 }, -/obj/machinery/button/door{ - id = "MikoStiff"; - name = "Miko's Stiff Beds shutters"; - pixel_y = -32 +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "okX" = ( /obj/structure/wreck/trash/five_tires, /turf/open/indestructible/ground/outside/dirt, @@ -48459,6 +47731,12 @@ /obj/item/bedsheet/blanket, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"omc" = ( +/mob/living/simple_animal/hostile/renegade/soldier, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "omf" = ( /turf/closed/wall/f13/tentwall{ color = "#777777" @@ -49326,15 +48604,11 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "oBZ" = ( -/obj/machinery/door/poddoor/shutters{ - id = "MallStorage"; - name = "Mall Storage" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/floor/plasteel/f13/vault_floor/plating, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "oCe" = ( /obj/machinery/light{ dir = 4 @@ -49492,7 +48766,9 @@ /obj/effect/decal/cleanable/dirt{ color = "#363636" }, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ + loot = s + }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) "oEb" = ( @@ -49810,6 +49086,13 @@ }, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, /area/f13/ambientlighting/building/m) +"oJh" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris1" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "oJl" = ( /obj/structure/table/wood, /obj/structure/decoration/clock{ @@ -50253,6 +49536,11 @@ icon_state = "dirt" }, /area/f13/wasteland) +"oNY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/simple_door/metal/barred, +/turf/open/floor/plasteel/vaporwave, +/area/f13/ambientlighting/building/j) "oOf" = ( /turf/open/floor/f13/wood{ icon_state = "oakfloor1" @@ -50329,13 +49617,10 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "oPv" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 }, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "oPz" = ( /obj/effect/decal/cleanable/dirt{ @@ -50756,16 +50041,6 @@ /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) -"oWl" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - layer = 11; - name = "Toys for the Middle-Aged" - }, -/turf/open/floor/carpet/arcade, -/area/f13/ambientlighting/building/j) "oWn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, @@ -51131,6 +50406,14 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) +"pbR" = ( +/obj/effect/decal/fakelattice, +/obj/structure/junk/small, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "pbS" = ( /obj/structure/table, /obj/structure/window/reinforced{ @@ -51143,6 +50426,12 @@ icon_state = "floorrusty" }, /area/f13/followers) +"pcb" = ( +/obj/effect/overlay/rockfloor_side, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "pch" = ( /obj/structure/flora/tree/cactus_alt, /turf/open/indestructible/ground/outside/dirt, @@ -51283,13 +50572,8 @@ }, /area/f13/ambientlighting/building/m) "peC" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/item/storage/trash_stack, -/turf/open/floor/plating/rust, +/obj/structure/chair/stool/retro/black, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "peG" = ( /obj/structure/junk/small/table, @@ -51465,11 +50749,7 @@ }, /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/large, -/obj/item/stack/sheet/metal/twenty, -/obj/item/stack/sheet/leatherstrips, -/obj/item/stack/sheet/mineral/concrete/ten, -/obj/item/stack/sheet/mineral/limestone/twenty, -/obj/item/stack/sheet/mineral/limestone/five, +/obj/item/stack/sheet/mineral/plasma/twentyfive, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalbottombordertop2" }, @@ -51694,16 +50974,9 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "pjC" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/structure/rack, -/obj/item/stock_parts/cell/high/empty, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/item/storage/part_replacer, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 4 - }, +/obj/effect/decal/cleanable/glass, +/obj/effect/overlay/junk/curtain, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "pjF" = ( /obj/effect/decal/cleanable/dirt, @@ -51795,6 +51068,12 @@ }, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/building/abandoned/l) +"pli" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 10 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "plm" = ( /obj/effect/gibspawner/human, /turf/open/indestructible/ground/outside/dirt, @@ -51834,6 +51113,13 @@ }, /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/y) +"plM" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "plS" = ( /obj/structure/ore_box, /obj/effect/overlay/desert_side{ @@ -52024,17 +51310,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) -"ppH" = ( -/obj/structure/rack, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/landmark/questing/item{ - location_description = "in that mall south of the khans." - }, -/turf/open/floor/carpet/arcade, -/area/f13/ambientlighting/building/j) "ppM" = ( /obj/structure/closet/locker, /obj/item/clothing/under/f13/mechanic, @@ -52144,14 +51419,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"pre" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/structure/window/reinforced/spawner, -/obj/structure/fluff/railing{ - dir = 10 - }, -/turf/open/water, -/area/f13/ambientlighting/building/j) "prt" = ( /obj/structure/table/booth, /obj/effect/decal/cleanable/dirt{ @@ -52207,23 +51474,9 @@ }, /area/f13/ambientlighting/building/m) "psk" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/closet/cardboard, -/obj/item/stock_parts/manipulator/pico, -/obj/item/stock_parts/manipulator/pico, -/obj/item/stock_parts/manipulator/pico, -/obj/item/bodypart/l_arm/robot, -/obj/item/bodypart/l_arm/robot, -/obj/item/bodypart/l_arm/robot, -/obj/item/bodypart/r_arm/robot, -/obj/item/bodypart/r_arm/robot, -/obj/item/bodypart/r_arm/robot, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, +/obj/structure/junk/small/disco, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) "psn" = ( /obj/structure/chair/wood, @@ -52330,10 +51583,15 @@ }, /area/f13/brotherhood) "ptJ" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" +/obj/structure/curtain{ + color = "#363636"; + pixel_x = -32 }, -/turf/closed/wall/mineral/concrete, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "ptT" = ( /obj/structure/table/wood, @@ -52831,7 +52089,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/generic, -/turf/open/indestructible/ground/outside/sidewalk, +/turf/closed/wall/mineral/brick, /area/f13/ncr) "pBE" = ( /obj/structure/chair/office/dark{ @@ -52890,15 +52148,6 @@ name = "dirty floor" }, /area/f13/building/powered) -"pCD" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, -/area/f13/ambientlighting/building/j) "pCM" = ( /obj/item/storage/trash_stack, /obj/effect/decal/cleanable/dirt, @@ -53013,17 +52262,7 @@ }, /area/f13/ambientlighting/building/b) "pFb" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/landmark/questing/item{ - location_description = "in that mall south of the khans." - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, +/turf/open/indestructible/ground/outside/desert, /area/f13/ambientlighting/building/j) "pFi" = ( /obj/effect/overlay/desert/sonora/edge{ @@ -53175,12 +52414,12 @@ /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) "pHY" = ( -/obj/structure/chair/bench, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/firefighter, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/clothing/under/suit_jacket/tan, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/glasses/hud/diagnostic/sunglasses, +/turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) "pHZ" = ( /obj/structure/reagent_dispensers/barrel/three, @@ -53618,15 +52857,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"pMM" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "pMS" = ( /obj/structure/table/booth, /obj/effect/decal/cleanable/dirt, @@ -53699,14 +52929,6 @@ }, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) -"pOa" = ( -/obj/structure/rack, -/obj/structure/reagent_dispensers/barrel/explosive, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "pOe" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -53715,40 +52937,10 @@ /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) -"pOi" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/closet/cardboard, -/obj/item/clothing/under/rank/civilian/lawyer/black/alt/skirt, -/obj/item/clothing/under/rank/civilian/lawyer/black/alt/skirt, -/obj/item/clothing/under/rank/civilian/lawyer/black/alt/skirt, -/obj/item/clothing/under/suit/black/skirt, -/obj/item/clothing/under/suit/black/skirt, -/obj/item/clothing/under/suit/black/skirt, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) -"pOj" = ( -/obj/item/chair, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "pOm" = ( -/obj/effect/decal/cleanable/blood/old{ - pixel_x = 12 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/item/storage/trash_stack{ - icon_state = "trash_3" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/effect/decal/fakelattice, +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "pOy" = ( /obj/effect/decal/cleanable/dirt, @@ -53902,6 +53094,11 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +"pRo" = ( +/obj/effect/decal/fakelattice, +/obj/structure/table_frame/wood, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "pRs" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/simple_door/tent, @@ -54139,6 +53336,15 @@ /obj/item/reagent_containers/pill/patch/jet, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +"pVA" = ( +/obj/structure/junk/cabinet, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +"pVH" = ( +/obj/structure/closet/cardboard, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "pVI" = ( /obj/effect/turf_decal/siding/wood{ dir = 1; @@ -54300,19 +53506,6 @@ icon_state = "outerborder" }, /area/f13/wasteland) -"pXy" = ( -/obj/effect/decal/cleanable/glass, -/obj/item/shard, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - layer = 11; - name = "Toys for the Middle-Aged" - }, -/turf/open/floor/carpet/arcade, -/area/f13/ambientlighting/building/j) "pXA" = ( /obj/machinery/door/unpowered/secure_NCR, /obj/structure/cable/outdoors{ @@ -54545,15 +53738,10 @@ /turf/open/floor/plating/rust, /area/f13/followers) "qaQ" = ( +/obj/effect/decal/cleanable/dirt/dust, /obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/planks/pregame, -/obj/effect/decal/cleanable/glass, -/obj/machinery/door/poddoor/shutters{ - id = "ElectronicDick"; - layer = 1; - name = "Dick's Electronic Goods" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/white, +/obj/structure/barricade/bars, +/turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) "qaS" = ( /obj/structure/chair/office{ @@ -55351,14 +54539,16 @@ /turf/closed/wall/rust, /area/f13/clinic) "qmb" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fence{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/overlay/desert/sonora/edge{ + dir = 9 }, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "qmc" = ( /obj/item/storage/trash_stack{ icon_state = "Junk_3" @@ -55417,7 +54607,7 @@ /obj/structure/cable/outdoors{ icon_state = "4-8" }, -/turf/open/indestructible/ground/inside/mountain, +/turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) "qmQ" = ( /obj/structure/fence{ @@ -55509,16 +54699,11 @@ }, /area/f13/building/abandoned/h) "qoG" = ( -/obj/item/storage/bag/trash/cyborg, -/obj/item/mop, -/obj/structure/mopbucket, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/decal/remains/deadeyebot, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "qoM" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/poppy/broc, @@ -55627,7 +54812,9 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) "qqy" = ( -/obj/effect/overlay/junk/curtain, +/obj/effect/overlay/junk/curtain{ + layer = 100 + }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) "qqM" = ( @@ -56110,17 +55297,13 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "qyt" = ( -/obj/structure/simple_door/metal/dirtystore, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/car/rubbish2{ + icon_state = "car_rubish3" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "MallFront"; - layer = 11; - name = "Mall Front" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "qyu" = ( /obj/effect/turf_decal/stripes/white/line, /turf/open/indestructible/ground/outside/road{ @@ -56395,15 +55578,16 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "qCk" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fence{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/storage/trash_stack{ - icon_state = "trash_2" +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "qCl" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -56435,14 +55619,6 @@ /obj/structure/chair/pew/left, /turf/open/floor/wood_common/wood_common_dark, /area/f13/building/abandoned/m) -"qCz" = ( -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "qCH" = ( /obj/structure/fence{ dir = 4 @@ -56520,17 +55696,13 @@ /turf/open/floor/plasteel/neutral, /area/f13/clinic) "qDT" = ( -/obj/effect/decal/cleanable/glass, -/obj/structure/table/wood, -/obj/effect/decal/fakelattice, -/obj/item/reagent_containers/food/snacks/meat/slab/human, -/obj/item/reagent_containers/food/snacks/meat/slab/human, -/obj/item/reagent_containers/food/snacks/meat/slab/human, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) "qEb" = ( /obj/structure/spacevine, /turf/closed/wall/rust, @@ -56547,21 +55719,6 @@ /mob/living/simple_animal/cow/brahmin, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) -"qEp" = ( -/obj/structure/barricade/sandbags, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "MallFront"; - layer = 11; - name = "Mall Front" - }, -/turf/open/floor/plating/rust, -/area/f13/wasteland) "qEt" = ( /turf/closed/wall/f13/wood/house, /area/maintenance/bar) @@ -56631,12 +55788,11 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "qFu" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/ranged, -/turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, -/area/f13/ambientlighting/building/j) +/obj/structure/kitchenspike, +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "qFA" = ( /obj/structure/closet/crate/large, /obj/item/ammo_box/a308box/improvised, @@ -56901,15 +56057,6 @@ }, /turf/closed/mineral/random/low_chance, /area/f13/caves) -"qKm" = ( -/obj/effect/decal/cleanable/robot_debris/gib, -/obj/effect/decal/cleanable/oil/streak, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "qKt" = ( /obj/effect/landmark/start/f13/tribal, /turf/open/indestructible/ground/outside/dirt, @@ -57208,6 +56355,7 @@ pixel_y = 24; pixel_x = 16 }, +/obj/effect/overlay/desert/sonora/edge, /turf/open/floor/wood_common, /area/f13/wasteland) "qPa" = ( @@ -57335,6 +56483,12 @@ /obj/effect/overlay/fog, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"qQY" = ( +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) "qRa" = ( /obj/structure/sign/yield, /turf/open/indestructible/ground/outside/sidewalk{ @@ -57410,6 +56564,14 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"qRZ" = ( +/obj/structure/filingcabinet, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "qSf" = ( /obj/item/storage/trash_stack{ icon_state = "Junk_10" @@ -57444,15 +56606,11 @@ }, /area/f13/wasteland/city) "qSB" = ( -/obj/structure/barricade/sandbags, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fence/corner{ + dir = 5 }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "qSG" = ( /obj/structure/flora/brushwoodalt, /turf/closed/wall/mineral/brick, @@ -57508,18 +56666,10 @@ /turf/open/transparent/openspace, /area/f13/bunker) "qTP" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/rack, -/obj/structure/closet/crate, -/obj/item/twohanded/fireaxe, -/obj/item/pickaxe/drill, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/robot_debris, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "qTX" = ( /obj/machinery/conveyor/auto{ dir = 4; @@ -57614,13 +56764,14 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "qVq" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerturn" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "qVs" = ( /obj/machinery/light{ dir = 8 @@ -57831,18 +56982,6 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) -"qYd" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/effect/decal/fakelattice, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "qYq" = ( /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/u) @@ -57939,11 +57078,13 @@ /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) "rag" = ( -/obj/structure/girder/reinforced, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fluff/paper/corner{ + dir = 1 }, -/turf/open/indestructible/ground/outside/ruins, +/obj/structure/chair/sofa/right{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "raj" = ( /obj/structure/barricade/tentleatheredge, @@ -58026,6 +57167,10 @@ icon_state = "bar" }, /area/f13/building/abandoned/j) +"rbn" = ( +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "rbq" = ( /obj/effect/decal/cleanable/oil, /turf/open/indestructible/ground/outside/road{ @@ -58286,17 +57431,16 @@ }, /area/f13/wasteland) "reW" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = 16 +/obj/structure/car/rubbish2{ + icon_state = "car_rubish3" }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "rfa" = ( /obj/structure/decoration/rag, /obj/structure/decoration/rag{ @@ -58333,12 +57477,11 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) "rfB" = ( -/obj/item/ammo_casing/c10mm, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/rack/large/shelf{ + dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) "rfC" = ( /obj/structure/bedsheetbin/color, @@ -58615,6 +57758,14 @@ /obj/structure/closet/fridge/cannibal, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +"rjf" = ( +/obj/effect/decal/fakelattice, +/obj/structure/fence/corner{ + dir = 4; + icon_state = "end" + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "rjg" = ( /obj/structure/table/glass, /turf/open/floor/wood_common, @@ -58702,6 +57853,7 @@ pixel_y = 24; pixel_x = 16 }, +/obj/effect/overlay/desert/sonora/edge, /turf/open/floor/wood_common, /area/f13/wasteland) "rlm" = ( @@ -58730,13 +57882,19 @@ }, /area/f13/wasteland) "rlB" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced/spawner/east, -/obj/structure/fluff/railing{ - dir = 5 +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 17 }, -/turf/open/water, -/area/f13/ambientlighting/building/j) +/obj/structure/table/wood/junk, +/obj/item/assembly/signaler, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/effect/spawner/lootdrop/f13/cash_random_med, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "rlN" = ( /obj/structure/barricade/sandbags, /turf/open/floor/plating/f13/outside/road{ @@ -58938,6 +58096,12 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"roC" = ( +/turf/open/floor/plasteel/f13{ + dir = 4; + icon_state = "rampdowntop" + }, +/area/f13/ambientlighting/building/j) "roD" = ( /obj/machinery/mineral/wasteland_vendor/attachments{ icon_state = "weapon_idle" @@ -58993,6 +58157,14 @@ icon_state = "dirt" }, /area/f13/wasteland) +"rpw" = ( +/obj/structure/table/wood/club, +/obj/effect/spawner/lootdrop/three_course_meal, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) "rpy" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -59167,12 +58339,14 @@ /turf/open/floor/carpet/airless, /area/f13/ambientlighting/building/c) "rrE" = ( -/obj/structure/barricade/sandbags, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "rrH" = ( /obj/machinery/light{ dir = 1 @@ -59213,7 +58387,11 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "rrR" = ( -/turf/closed/wall/mineral/concrete, +/obj/structure/window/fulltile/house/broken, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "rrY" = ( /obj/structure/flora/wasteplant/wild_feracactus, @@ -59314,12 +58492,11 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "rtC" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/destructible/tribal_torch/wall/lit, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "rtI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/fo13colored/Red{ @@ -59454,6 +58631,12 @@ icon_state = "horizontalbottombordertopright" }, /area/f13/wasteland) +"rvZ" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "rwb" = ( /obj/structure/closet/cabinet, /turf/open/floor/carpet/black, @@ -59510,6 +58693,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +"rxq" = ( +/obj/structure/junk/drawer, +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "rxD" = ( /obj/structure/window/fulltile/ruins{ icon_state = "ruinswindowbrokenvertical" @@ -59682,18 +58872,6 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/ambientlighting/building/u) -"rAT" = ( -/obj/structure/barricade/sandbags, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "MikoStiff"; - layer = 11; - name = "Miko's Stiff Beds" - }, -/turf/open/floor/plasteel/f13/vault_floor/yellow, -/area/f13/ambientlighting/building/j) "rAW" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt{ @@ -59809,19 +58987,18 @@ }, /area/f13/ambientlighting/building/b) "rCg" = ( -/obj/structure/barricade/wooden/planks/pregame, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/car/rubbish2{ + pixel_x = 7; + pixel_y = -16 }, -/obj/structure/barricade/wooden, -/obj/effect/decal/cleanable/glass, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "MallFront"; - layer = 11; - name = "Mall Front" +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 1 }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) "rCk" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/sidewalk{ @@ -60160,12 +59337,6 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) -"rGf" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/carpet/arcade, -/area/f13/ambientlighting/building/j) "rGB" = ( /obj/effect/decal/cleanable/robot_debris/gib, /obj/effect/decal/cleanable/dirt, @@ -60399,17 +59570,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"rKh" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "rKn" = ( /obj/item/melee/onehanded/club/ncrflag{ pixel_x = -10; @@ -60490,17 +59650,6 @@ /obj/structure/barricade/wooden/planks/pregame, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"rLQ" = ( -/obj/structure/rack, -/obj/item/crafting/campfirekit, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "rLZ" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/f13, @@ -60588,19 +59737,13 @@ }, /area/f13/wasteland) "rMR" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/rack, -/obj/structure/closet/cardboard, -/obj/item/stack/tile/carpet/black/twenty, -/obj/item/stack/tile/carpet/blackred/twenty, -/obj/item/stack/tile/carpet/cyan/twenty, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/overlay/rockfloor_side{ + dir = 1 }, -/area/f13/ambientlighting/building/j) +/obj/item/melee/onehanded/knife/bayonet, +/obj/item/gun/ballistic/automatic/assault_carbine/policerifle, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "rNa" = ( /obj/effect/decal/cleanable/glass, /obj/structure/chair/wood{ @@ -60740,6 +59883,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/item/tele_iv, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, @@ -60794,16 +59938,6 @@ /obj/effect/landmark/start/f13/tribal_new, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"rPS" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "rQf" = ( /obj/structure/simple_door/room, /turf/open/floor/f13/wood{ @@ -60955,16 +60089,6 @@ /obj/structure/car/rubbish2, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) -"rSs" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/structure/closet/crate/bin, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "rSx" = ( /obj/structure/table/wood/settler, /obj/item/storage/book/bible/booze, @@ -61040,7 +60164,9 @@ pixel_y = 25 }, /obj/item/gun/ballistic/rifle/hunting, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ + loot = s + }, /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) @@ -61127,18 +60253,6 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/town) -"rUE" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced/spawner/west, -/obj/structure/rack, -/obj/item/trash/f13/sugarbombs, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 9 - }, -/area/f13/ambientlighting/building/j) "rUM" = ( /obj/structure/fence{ dir = 4 @@ -61623,14 +60737,6 @@ icon_state = "outermaincornerouter" }, /area/f13/wasteland) -"sdX" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/storage/trash_stack, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "sdY" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -61700,6 +60806,16 @@ "sfw" = ( /turf/closed/mineral/random/no_caves, /area/f13/underground/cave) +"sfz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 8; + pixel_y = -16 + }, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/ambientlighting/building/j) "sfM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -61796,6 +60912,9 @@ /obj/structure/cable/outdoors{ icon_state = "1-2" }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, /turf/open/floor/wood_common, /area/f13/wasteland) "shf" = ( @@ -61978,23 +61097,6 @@ name = "dirty floor" }, /area/f13/brotherhood) -"sjp" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/rack, -/obj/structure/closet/cardboard, -/obj/item/crafting/wonderglue, -/obj/item/crafting/wonderglue, -/obj/item/crafting/wonderglue, -/obj/item/crafting/duct_tape, -/obj/item/crafting/duct_tape, -/obj/item/crafting/duct_tape, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "sjt" = ( /obj/effect/overlay/fog, /turf/open/indestructible/ground/outside/water, @@ -62565,6 +61667,11 @@ /obj/item/reagent_containers/pill/patch/healpoultice, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"srQ" = ( +/obj/effect/overlay/desert/sonora/edge, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/floor/wood_common, +/area/f13/wasteland) "srS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -62713,15 +61820,12 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "suz" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/planks/pregame, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris3" }, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "suG" = ( /obj/structure/toilet{ dir = 8 @@ -63143,15 +62247,6 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) -"sBd" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/ranged/boss, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/j) "sBl" = ( /obj/structure/fence{ dir = 4 @@ -63362,7 +62457,7 @@ /obj/structure/cable/outdoors{ icon_state = "2-8" }, -/turf/open/indestructible/ground/outside/sidewalk, +/turf/closed/wall/mineral/brick, /area/f13/ncr) "sEr" = ( /obj/structure/bed/old, @@ -63430,19 +62525,6 @@ icon_state = "verticalinnermain0" }, /area/f13/ncr) -"sFi" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/north, -/obj/effect/decal/cleanable/cum, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess, -/area/f13/ambientlighting/building/j) "sFx" = ( /obj/structure/bed/old, /turf/open/floor/wood_common{ @@ -63472,6 +62554,9 @@ /area/f13/building/abandoned/a) "sFL" = ( /obj/item/crowbar, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, /turf/open/floor/wood_common, /area/f13/wasteland) "sFR" = ( @@ -63635,8 +62720,11 @@ }, /area/f13/wasteland) "sIp" = ( -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/obj/structure/barricade/wooden/strong, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "sIv" = ( /obj/structure/chair/comfy/beige{ dir = 4 @@ -63763,13 +62851,6 @@ icon_state = "whitedirtysolid" }, /area/f13/followers) -"sKv" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/mineral/concrete, -/area/f13/ambientlighting/building/j) "sKA" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/dirt{ @@ -64060,6 +63141,9 @@ /obj/effect/landmark/start/f13/ncroffduty, /obj/effect/landmark/start/f13/ncrrearechelon, /obj/effect/landmark/start/f13/ncrrearechelon, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, /turf/open/floor/wood_common, /area/f13/wasteland) "sOC" = ( @@ -64078,10 +63162,9 @@ }, /area/f13/wasteland) "sOQ" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/yellow, +/mob/living/simple_animal/hostile/renegade/meister, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "sPe" = ( /obj/effect/decal/cleanable/blood{ @@ -64125,15 +63208,13 @@ }, /area/f13/wasteland) "sPF" = ( -/obj/structure/barricade/sandbags, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fence{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "sPT" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /turf/open/indestructible/ground/outside/dirt, @@ -64155,6 +63236,11 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) +"sQf" = ( +/obj/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "sQn" = ( /obj/machinery/smartfridge/bottlerack, /obj/item/reagent_containers/food/drinks/bottle/whiskey, @@ -64194,17 +63280,11 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) "sQJ" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/closet/crate, -/obj/item/stack/sheet/plastic/twenty, -/obj/item/stack/sheet/plasteel/twenty, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 }, -/area/f13/ambientlighting/building/j) +/turf/open/floor/wood_common, +/area/f13/wasteland) "sQS" = ( /obj/effect/decal/cleanable/blood/old{ icon_state = "gibbearcore" @@ -64249,14 +63329,6 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) -"sRm" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "sRs" = ( /obj/effect/spawner/lootdrop/weapons/experimental, /obj/structure/table, @@ -64328,17 +63400,12 @@ /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) "sSb" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/structure/fluff/railing{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/barricade/wooden/strong, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerturn" }, -/turf/open/floor/plating/dirt, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "sSf" = ( /obj/machinery/atmospherics/components/unary/tank/toxins, /obj/effect/decal/cleanable/dirt, @@ -64490,14 +63557,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/road, /area/f13/building/abandoned/k) -"sUt" = ( -/obj/effect/decal/cleanable/glass, -/obj/item/shard, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "sUF" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/f13{ @@ -64957,6 +64016,10 @@ "taO" = ( /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"tba" = ( +/obj/structure/junk/small/tv, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "tbe" = ( /obj/structure/cable/outdoors{ icon_state = "4-8" @@ -65491,10 +64554,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "tjb" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/sulphite, +/obj/effect/decal/fakelattice, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "tji" = ( @@ -65658,6 +64718,12 @@ icon_state = "dirt" }, /area/f13/wasteland) +"tkV" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 6 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "tkX" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/effect/decal/cleanable/greenglow, @@ -65672,17 +64738,14 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "tlh" = ( -/obj/structure/rack, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/glass, -/obj/item/circuitboard/machine/chem_dispenser, -/obj/item/circuitboard/machine/chem_heater, -/obj/item/circuitboard/machine/chem_master, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris2" }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "tli" = ( /obj/item/storage/trash_stack{ icon_state = "Junk_8" @@ -65854,6 +64917,14 @@ }, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess/neutralchess2, /area/f13/building/abandoned/h) +"toc" = ( +/obj/structure/table/wood/club, +/obj/effect/spawner/lootdrop/wastelootgood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/ambientlighting/building/j) "toh" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -65912,13 +64983,7 @@ }, /area/f13/building/powered) "toH" = ( -/obj/effect/decal/fakelattice, -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/planks/pregame, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, +/turf/closed/wall/f13/store, /area/f13/ambientlighting/building/j) "toK" = ( /obj/structure/chair{ @@ -65968,34 +65033,17 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/t) "tpE" = ( -/obj/structure/rack, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/glass, -/obj/item/stock_parts/capacitor/super, -/obj/item/stock_parts/capacitor/super, -/obj/item/stock_parts/capacitor/super, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/bonfire/prelit, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "tpK" = ( /mob/living/simple_animal/hostile/ghoul, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13, /area/f13/ambientlighting/building/o) -"tqe" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/rack, -/obj/effect/decal/fakelattice, -/obj/machinery/microwave, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "tqk" = ( /obj/structure/railing/corner{ color = "#A47449"; @@ -66039,11 +65087,11 @@ /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) "tqQ" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/wreck/trash/machinepiletwo, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, -/turf/closed/wall/mineral/concrete, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "tra" = ( /obj/structure/table/booth, /obj/item/camera{ @@ -66570,16 +65618,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) -"tAd" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/north, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess, -/area/f13/ambientlighting/building/j) "tAs" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "innermaincornerouter" @@ -66710,16 +65748,6 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/i) -"tCj" = ( -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "tCm" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/floor/plasteel/f13/stone, @@ -66809,12 +65837,9 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/p) "tDB" = ( -/obj/structure/chair, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/obj/structure/fence/cut/large, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "tDE" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" @@ -66954,14 +65979,11 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "tFr" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/turf_decal/weather/dirt{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/storage/trash_stack, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "tFt" = ( /obj/structure/barricade/tentleatheredge, /turf/open/indestructible/ground/outside/dirt, @@ -67023,16 +66045,6 @@ /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) -"tGl" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/planks/pregame, -/obj/machinery/door/poddoor/shutters{ - id = "ElectronicDick"; - layer = 1; - name = "Dick's Electronic Goods" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, -/area/f13/ambientlighting/building/j) "tGT" = ( /mob/living/simple_animal/cow/brahmin, /turf/open/indestructible/ground/outside/grass, @@ -67084,14 +66096,9 @@ /turf/open/floor/plating/asteroid/basalt, /area/f13/building/abandoned/x) "tIa" = ( -/obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/landmark/questing/item{ - location_description = "in that mall south of the khans." - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/structure/chair/stool/retro/black, +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "tIc" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -67117,7 +66124,8 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) "tIH" = ( -/obj/structure/girder/reinforced, +/obj/item/construction/rcd, +/obj/structure/rack/shelf_metal, /obj/effect/decal/fakelattice, /turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) @@ -67210,19 +66218,13 @@ }, /area/f13/wasteland) "tKC" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/rack, -/obj/item/storage/toolbox/electrical, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/landmark/questing/item{ - location_description = "in that mall south of the khans." - }, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 6 +/mob/living/simple_animal/hostile/renegade/defender, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" }, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "tKI" = ( /obj/machinery/light{ dir = 4 @@ -67532,6 +66534,12 @@ icon_state = "verticalinnermainbottom" }, /area/f13/building/lower_firetower) +"tQf" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 9 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "tQj" = ( /obj/structure/chair/wood{ pixel_x = 2; @@ -67756,15 +66764,6 @@ /obj/structure/debris/v2, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) -"tSv" = ( -/obj/structure/simple_door, -/obj/structure/barricade/wooden/strong, -/obj/structure/barricade/wooden/planks, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "tSA" = ( /obj/effect/overlay/desert/sonora/edge/corner, /turf/open/indestructible/ground/outside/sidewalk, @@ -67797,15 +66796,6 @@ /obj/structure/table, /turf/open/floor/plating/rust, /area/f13/building/powered) -"tSO" = ( -/obj/structure/table_frame, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "bluerustysolid" - }, -/area/f13/ambientlighting/building/j) "tST" = ( /obj/structure/table, /obj/item/book/granter/trait/techno, @@ -67940,14 +66930,13 @@ }, /area/f13/ambientlighting/building/o) "tUK" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/table/wood/junk, +/obj/item/reagent_containers/food/snacks/soup/hotchili{ + pixel_y = 11 }, -/turf/closed/wall/mineral/concrete, -/area/f13/ambientlighting/building/j) +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "tUU" = ( /obj/item/blacksmith/chain, /turf/open/indestructible/ground/outside/desert, @@ -67983,23 +66972,13 @@ }, /area/f13/ambientlighting/building/w) "tVf" = ( -/obj/structure/window/fulltile/house{ - dir = 2; - icon_state = "housewindowbrokenvertical" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "IsebelAttire"; - layer = 11; - name = "Isebel's Modern Attire" +/obj/structure/kitchenspike, +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "tVt" = ( /obj/structure/decoration/clock/old/active{ layer = 3 @@ -68057,7 +67036,9 @@ /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier1, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier1, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ + loot = s + }, /obj/machinery/light/small{ dir = 4 }, @@ -68148,16 +67129,11 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "tYG" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/machinery/grill, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "tYL" = ( /obj/structure/closet/crate/freezer/blood, /obj/machinery/light/small{ @@ -68265,6 +67241,11 @@ "uaE" = ( /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) +"uaM" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "uaR" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8; @@ -68436,17 +67417,6 @@ /obj/structure/flora/rock/jungle, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"udB" = ( -/obj/structure/table, -/obj/item/trash/f13/porknbeans, -/obj/item/reagent_containers/glass/beaker/waterbottle/large/empty, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "udH" = ( /obj/structure/fence{ dir = 4 @@ -68656,13 +67626,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/purple, /area/f13/bar) -"ufX" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/raider/ranged, -/turf/open/floor/plasteel/f13/vault_floor/yellow, -/area/f13/ambientlighting/building/j) "uga" = ( /obj/machinery/chem_dispenser/drinks/beer{ pixel_y = 17 @@ -68738,20 +67701,6 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/f) -"uhh" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light/small{ - brightness = 7 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "uhi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -69143,17 +68092,11 @@ /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/y) "umY" = ( -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/fence/cut/medium{ + dir = 4 }, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "unh" = ( /obj/structure/lamp_post, /turf/open/indestructible/ground/outside/sidewalk{ @@ -69201,10 +68144,7 @@ "unH" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/large, -/obj/item/stack/sheet/metal/twenty, -/obj/item/stack/sheet/leather/twenty, /obj/item/stack/sheet/mineral/concrete/ten, -/obj/item/stack/sheet/mineral/plasma/twentyfive, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, @@ -69323,6 +68263,14 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/b) +"upA" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris2" + }, +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "upH" = ( /obj/structure/cable/outdoors{ icon_state = "2-4" @@ -69403,6 +68351,14 @@ name = "dirty floor" }, /area/f13/building/powered) +"ure" = ( +/obj/machinery/power/apc/fusebox/south, +/obj/structure/table/wood/club, +/obj/item/paper_bin, +/obj/structure/cable/outdoors, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "urm" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright1" @@ -69625,27 +68581,17 @@ }, /area/f13/wasteland) "uvn" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/handy/protectron{ - faction = list("raider") - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/decal/cleanable/blood/tracks{ + dir = 6 }, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "uvq" = ( -/obj/structure/closet/cardboard, -/obj/item/seeds/coffee/robusta, -/obj/item/crafting/coffee_pot, -/obj/item/reagent_containers/food/drinks/bottle/instacoffee, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/window/fulltile/house, +/obj/effect/overlay/junk/curtain{ + layer = 100 }, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "uvr" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -69672,13 +68618,13 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "uvL" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "uvN" = ( /obj/effect/landmark/start/f13/tribal_new, /obj/structure/bed/mattress{ @@ -69903,18 +68849,13 @@ }, /area/f13/ncr) "uzc" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/button/door{ - id = "MallStorage"; - name = "Mall Storage shutters"; - pixel_y = 32 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/lamp_post/doubles{ + dir = 4; + pixel_y = -25 }, -/area/f13/ambientlighting/building/j) +/obj/structure/barricade/wooden/strong, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "uzn" = ( /obj/structure/wreck/trash/machinepiletwo, /turf/open/indestructible/ground/outside/desert, @@ -70052,11 +68993,7 @@ /turf/open/floor/plating, /area/f13/bar) "uBI" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/structure/closet/crate/bin, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/turf/open/indestructible/ground/outside/sidewalk, /area/f13/ambientlighting/building/j) "uBL" = ( /obj/effect/decal/cleanable/dirt, @@ -70087,6 +69024,9 @@ pixel_y = 24; pixel_x = 16 }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, /turf/open/floor/wood_common, /area/f13/wasteland) "uCe" = ( @@ -70356,15 +69296,6 @@ /obj/structure/flora/wasteplant/wild_broc, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"uGd" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/planks/pregame, -/obj/structure/debris/v3, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "uGf" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -70619,7 +69550,7 @@ /area/f13/wasteland) "uJz" = ( /obj/structure/simple_door/interior, -/turf/open/indestructible/ground/outside/desert, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) "uJH" = ( /obj/structure/sign/warning/securearea, @@ -70691,17 +69622,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) -"uLw" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/rack, -/obj/item/crafting/lunchbox, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 10 - }, -/area/f13/ambientlighting/building/j) "uLz" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/f13{ @@ -70717,19 +69637,6 @@ /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) -"uLE" = ( -/obj/machinery/vending/cigarette{ - default_price = 0; - extra_price = 0 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "uLJ" = ( /obj/structure/chair/office{ dir = 1 @@ -71063,16 +69970,6 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) -"uQv" = ( -/obj/structure/chair/wood{ - dir = 4 - }, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "uQx" = ( /obj/structure/cable{ icon_state = "0-4" @@ -71081,18 +69978,6 @@ icon_state = "bluedirtychess2" }, /area/f13/brotherhood) -"uQB" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light/small{ - brightness = 7 - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "uQH" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 4; @@ -71109,7 +69994,9 @@ }, /area/f13/brotherhood) "uQU" = ( -/obj/effect/turf_decal/vg_decals/numbers/two, +/obj/effect/turf_decal/vg_decals/numbers/two{ + layer = 5 + }, /turf/closed/wall/mineral/brick, /area/f13/ncr) "uQV" = ( @@ -71119,15 +70006,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13, /area/f13/ambientlighting/building/y) -"uRd" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "uRi" = ( /turf/open/floor/plasteel/grimy, /area/f13/ncr) @@ -71163,6 +70041,9 @@ /obj/item/stack/sheet/leather/twenty, /obj/item/stack/sheet/mineral/concrete/ten, /obj/item/stack/sheet/mineral/limestone/ten, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, /turf/open/floor/wood_common, /area/f13/wasteland) "uSd" = ( @@ -71799,19 +70680,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common/wood_common_light, /area/f13/building/powered) -"vaU" = ( -/obj/structure/chair, -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gibmid1" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "vaW" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, @@ -72315,14 +71183,12 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "vgW" = ( -/obj/item/chair, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light/small{ - brightness = 7 +/obj/effect/decal/fakelattice, +/obj/machinery/light{ + dir = 4; + flickering = 1 }, -/turf/open/floor/plasteel/f13/vault_floor/yellow, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "vgX" = ( /obj/effect/spawner/lootdrop/ammo/fiftypercent, @@ -72736,16 +71602,6 @@ /mob/living/simple_animal/hostile/raider/sulphite, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) -"voC" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gibbear1" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "voL" = ( /obj/structure/simple_door/metal/fence, /obj/structure/decoration/rag, @@ -72885,12 +71741,10 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) "vrB" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fluff/paper/stack{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/rust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "vrI" = ( /obj/structure/flora/grass/wasteland{ @@ -73063,16 +71917,6 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/p) -"vui" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/structure/wreck/trash/two_tire, -/obj/structure/wreck/trash/five_tires, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "vuk" = ( /turf/open/indestructible/ground/outside/dirthole, /area/f13/wasteland) @@ -73322,25 +72166,13 @@ /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) -"vxu" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gibmid1" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "vxC" = ( -/obj/effect/decal/cleanable/glass, -/obj/structure/wreck/trash/brokenvendor, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/remains/human, +/obj/item/clothing/under/f13/jamrock, +/obj/item/clothing/shoes/f13/jamrock, +/obj/item/clothing/suit/armor/outfit/jacket/jamrock, +/turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) "vxP" = ( /obj/structure/simple_door/house{ @@ -73500,13 +72332,8 @@ }, /area/f13/building/abandoned/h) "vAd" = ( -/obj/effect/decal/cleanable/glass, -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/planks/pregame, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/white, +/obj/item/stack/sheet/mineral/plasma/twentyfive, +/turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "vAf" = ( /obj/structure/curtain{ @@ -73541,6 +72368,12 @@ "vAO" = ( /turf/open/floor/wood_common/wood_common_light, /area/maintenance/bar) +"vAU" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 5 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "vAW" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /obj/effect/decal/cleanable/dirt, @@ -73652,15 +72485,6 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) -"vCA" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/emptysandbags, -/obj/item/shovel, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/yellow, -/area/f13/ambientlighting/building/j) "vCN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -73735,16 +72559,15 @@ }, /area/f13/legioncamp) "vDy" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 4; + light_color = "#f4e3b0" }, -/obj/machinery/door/poddoor/shutters/preopen{ - layer = 11; - name = "Toys for the Middle-Aged" +/obj/item/storage/trash_stack, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" }, -/turf/open/floor/carpet/arcade, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "vDH" = ( /obj/effect/turf_decal/big{ dir = 6 @@ -74150,17 +72973,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/engine/workshop) -"vJN" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/planks/pregame, -/obj/structure/barricade/wooden, -/obj/machinery/door/poddoor/shutters{ - id = "ElectronicDick"; - layer = 1; - name = "Dick's Electronic Goods" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2, -/area/f13/ambientlighting/building/j) "vJU" = ( /obj/structure/chair{ dir = 4 @@ -74462,6 +73274,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13, /area/f13/ambientlighting/building/y) +"vPH" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "vPI" = ( /obj/effect/overlay/desert/sonora/edge, /turf/open/indestructible/ground/outside/desert, @@ -74486,12 +73305,16 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) "vQc" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "UBuild"; - layer = 11; - name = "Gabriel's U-Build" +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2" }, -/turf/closed/wall/f13/tentwall, +/obj/structure/simple_door/metal/fence, +/obj/effect/decal/cleanable/blood{ + dir = 13; + icon_state = "tracks"; + pixel_y = 8 + }, +/turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) "vQj" = ( /obj/structure/displaycase{ @@ -74707,6 +73530,17 @@ /obj/structure/simple_door/interior, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/l) +"vTP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/wood{ + dir = 8 + }, +/mob/living/simple_animal/hostile/renegade/soldier, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "vTV" = ( /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded" @@ -74909,6 +73743,11 @@ /obj/structure/barricade/bars, /turf/open/floor/plasteel/f13/vault_floor/red/whiteredfull, /area/f13/brotherhood) +"vXQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/mineral/concrete, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "vXX" = ( /obj/structure/table/reinforced, /obj/structure/barricade/bars, @@ -75070,6 +73909,11 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/w) +"waN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/broom, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "waO" = ( /obj/structure/flora/tree/wasteland, /turf/open/indestructible/ground/outside/sidewalk{ @@ -75410,6 +74254,11 @@ icon_state = "outerborder" }, /area/f13/wasteland) +"wfR" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/barricade/wooden, +/turf/open/floor/plasteel/vaporwave, +/area/f13/ambientlighting/building/j) "wfT" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -75733,14 +74582,12 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "wlf" = ( -/obj/machinery/door/window, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "rampdowntop" +/obj/structure/barricade/wooden/strong, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "wlg" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /obj/machinery/door/airlock/virology/glass{ @@ -75752,19 +74599,17 @@ /turf/closed/wall/f13/wood/interior, /area/f13/ambientlighting/building/q) "wlq" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/window/reinforced/spawner/west, -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/car/rubbish2{ + pixel_x = 7; + pixel_y = -16 }, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 10 +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 4 }, -/area/f13/ambientlighting/building/j) +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "wlt" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 4 @@ -75942,7 +74787,7 @@ }, /mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop0" + icon_state = "horizontaloutermain2" }, /area/f13/wasteland) "wnZ" = ( @@ -75978,17 +74823,6 @@ "wot" = ( /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/b) -"woy" = ( -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/glass, -/obj/structure/table/wood, -/obj/machinery/processor/chopping_block, -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "woz" = ( /obj/structure/flora/tree/wasteland, /turf/open/indestructible/ground/outside/dirt{ @@ -76048,14 +74882,10 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "wpI" = ( -/obj/structure/rack, -/obj/item/reagent_containers/food/drinks/flask/survival, -/obj/item/reagent_containers/food/drinks/flask/survival, -/obj/item/reagent_containers/food/drinks/flask/survival, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/fluff/paper/stack{ + dir = 5 }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "wpN" = ( /obj/effect/decal/cleanable/dirt{ @@ -76284,6 +75114,10 @@ /obj/structure/railing/wood/underlayer, /turf/closed/wall/f13/wood/interior, /area/f13/ncr) +"wsu" = ( +/obj/structure/closet/body_bag, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "wsv" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -76355,14 +75189,6 @@ icon_state = "dirt" }, /area/f13/wasteland) -"wtd" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "wtj" = ( /obj/structure/legion_extractor, /turf/open/indestructible/ground/inside/dirt, @@ -76716,13 +75542,6 @@ /obj/effect/landmark/start/f13/tribal_new, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"wxY" = ( -/obj/structure/fluff/railing{ - dir = 6 - }, -/obj/item/shard, -/turf/open/water, -/area/f13/ambientlighting/building/j) "wyh" = ( /obj/structure/fence{ dir = 4 @@ -76853,12 +75672,11 @@ }, /area/f13/wasteland) "wzW" = ( -/obj/effect/turf_decal/loading_area, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/mob/living/simple_animal/hostile/renegade/defender, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/floor/plasteel/f13/vault_floor/plating, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "wzZ" = ( /obj/structure/decoration/clock/old/active{ pixel_y = 28 @@ -76917,27 +75735,15 @@ }, /area/f13/building/powered) "wAz" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/terminal{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/clothing/suit/toggle/labcoat/depjacket/sup/qm, +/turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) "wAU" = ( -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) +/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "wBa" = ( /obj/structure/simple_door/tent{ color = "#7c0A02" @@ -77187,13 +75993,12 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "wED" = ( -/obj/effect/decal/cleanable/glass, -/obj/item/shard, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/window/fulltile/house{ + icon_state = "housewindowbrokenvertical" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/bars, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "wEK" = ( /obj/effect/decal/cleanable/dirt, @@ -77319,6 +76124,12 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) +"wGk" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6" + }, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) "wGl" = ( /obj/structure/campfire/barrel{ pixel_x = -8; @@ -77522,6 +76333,9 @@ /area/f13/wasteland/legion) "wIT" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, /turf/open/floor/wood_common, /area/f13/wasteland) "wJe" = ( @@ -77538,7 +76352,9 @@ }, /area/f13/ambientlighting/building/w) "wJq" = ( -/obj/effect/turf_decal/vg_decals/numbers/six, +/obj/effect/turf_decal/vg_decals/numbers/six{ + layer = 5 + }, /turf/closed/wall/mineral/brick, /area/f13/ncr) "wJw" = ( @@ -77915,18 +76731,6 @@ dir = 8 }, /area/f13/wasteland) -"wPM" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/mob/living/simple_animal/hostile/ghoul/legendary{ - name = "Rickety Rick" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "wPP" = ( /obj/machinery/light/small{ dir = 8 @@ -78078,21 +76882,6 @@ "wSd" = ( /turf/closed/wall/f13/wood, /area/f13/building/abandoned) -"wSe" = ( -/obj/effect/decal/cleanable/cobweb{ - icon_state = "cobweb2" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/structure/decoration/clock/old{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) "wSh" = ( /obj/structure/flora/grass/coyote/eighteen, /turf/open/indestructible/ground/outside/desert, @@ -78243,19 +77032,6 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) -"wUi" = ( -/obj/effect/decal/fakelattice, -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/planks/pregame, -/obj/structure/debris/v3{ - pixel_x = -15; - pixel_y = -12 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/rust, -/area/f13/ambientlighting/building/j) "wUj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/storage/box/drinkingglasses, @@ -78363,6 +77139,11 @@ /obj/item/broom, /turf/open/floor/plating, /area/f13/bar) +"wVz" = ( +/obj/effect/spawner/lootdrop/glowstick, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "wVI" = ( /obj/structure/tires/two{ pixel_x = 2; @@ -78620,21 +77401,14 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) "xav" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/closet/cardboard, -/obj/item/clothing/under/pants/youngfolksjeans, -/obj/item/clothing/under/pants/youngfolksjeans, -/obj/item/clothing/under/pants/youngfolksjeans, -/obj/item/clothing/under/pants/jeans, -/obj/item/clothing/under/pants/jeans, -/obj/item/clothing/under/pants/jeans, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris1" }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "xax" = ( /obj/structure/barricade/sandbags, /obj/structure/obstacle/barbedwire/end{ @@ -79038,13 +77812,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) -"xgP" = ( -/obj/item/gun/ballistic/automatic/toy/pistol/riot, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/carpet/arcade, -/area/f13/ambientlighting/building/j) "xgS" = ( /obj/structure/closet/locker, /obj/effect/decal/cleanable/dirt/dust, @@ -79375,20 +78142,6 @@ }, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/building/abandoned/l) -"xlt" = ( -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/ambientlighting/building/j) "xlu" = ( /obj/structure/filingcabinet, /obj/structure/filingcabinet{ @@ -79420,7 +78173,7 @@ icon_state = "Junk_9" }, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticaloutermain1" + icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) "xmj" = ( @@ -79452,30 +78205,11 @@ }, /area/f13/wasteland) "xms" = ( -/obj/machinery/door/window{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - dir = 1; - icon_state = "rampdowntop" - }, -/area/f13/ambientlighting/building/j) -"xmv" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/structure/campfire/barrel, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "xmx" = ( /obj/effect/decal/cleanable/blood/old{ icon_state = "gibbear1" @@ -79587,15 +78321,9 @@ /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/m) "xoA" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/item/storage/trash_stack{ - icon_state = "trash_2" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, +/obj/structure/table, +/obj/effect/spawner/lootdrop/cigars_cases, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "xoL" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -79609,14 +78337,7 @@ /turf/closed/wall/f13/tentwall, /area/f13/wasteland/legion) "xoR" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/structure/fluff/railing, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plating/dirt, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "xoT" = ( /obj/structure/table/greyscale, @@ -79702,17 +78423,8 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "xqi" = ( -/obj/effect/decal/cleanable/dirt{ - color = "#363636" - }, -/obj/structure/fluff/railing, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/structure/flora/tree/tall{ - layer = 1 - }, -/turf/open/floor/plating/dirt, +/obj/structure/barricade/wooden, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "xqk" = ( /obj/structure/fence/wooden{ @@ -79738,6 +78450,12 @@ /mob/living/simple_animal/hostile/mirelurk/hunter, /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) +"xqH" = ( +/obj/structure/fence/corner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "xqI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/apc/fusebox/south, @@ -79898,18 +78616,6 @@ /obj/structure/fence/corner, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"xtj" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/terminal{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/red/side{ - dir = 8 - }, -/area/f13/ambientlighting/building/j) "xtm" = ( /mob/living/simple_animal/hostile/ghoul, /obj/effect/decal/cleanable/dirt, @@ -80219,12 +78925,9 @@ }, /area/f13/building/powered) "xyq" = ( -/obj/structure/closet/crate/bin, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/obj/structure/barricade/wooden/strong, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "xys" = ( /turf/open/indestructible/ground/outside/road{ dir = 1; @@ -80290,17 +78993,6 @@ icon_state = "floorrusty" }, /area/f13/followers) -"xzj" = ( -/obj/item/storage/part_replacer, -/obj/structure/rack, -/obj/effect/decal/cleanable/cobweb{ - icon_state = "cobweb2" - }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/plasteel/f13/vault_floor/green/white, -/area/f13/ambientlighting/building/j) "xzB" = ( /obj/structure/table/wood, /turf/open/indestructible/ground/outside/sidewalk{ @@ -80694,12 +79386,13 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) "xEY" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/machinery/microwave, +/obj/structure/table, +/obj/machinery/light{ + dir = 1; + pixel_x = 16 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/glass, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "xFe" = ( /obj/effect/decal/cleanable/dirt{ @@ -80999,17 +79692,6 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) -"xKg" = ( -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "UBuild"; - layer = 11; - name = "Gabriel's U-Build" - }, -/turf/closed/wall/f13/tentwall, -/area/f13/ambientlighting/building/j) "xKk" = ( /obj/structure/table/wood, /turf/open/floor/f13/wood{ @@ -81113,18 +79795,15 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "xLF" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/curtain{ - color = "#5c131b" - }, -/obj/structure/chair/wood{ - dir = 8 +/obj/effect/decal/fakelattice, +/obj/machinery/workbench/forge{ + pixel_x = 4 }, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/machinery/light{ + dir = 1; + layer = 2.9 }, -/mob/living/simple_animal/hostile/raider/tribal, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, +/turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) "xLO" = ( /obj/effect/overlay/desert/sonora/edge{ @@ -81303,6 +79982,10 @@ /obj/structure/barricade/bars, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) +"xPE" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "xPY" = ( /obj/effect/spawner/lootdrop/f13/crafting, /turf/open/indestructible/ground/outside/desert, @@ -81531,14 +80214,10 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "xSF" = ( -/obj/effect/decal/fakelattice, -/obj/item/binoculars, -/obj/structure/table/wood, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/rust, +/obj/machinery/light, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/bone, +/turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "xSM" = ( /obj/machinery/food_cart, @@ -81852,6 +80531,7 @@ /obj/structure/cable/outdoors{ icon_state = "4-8" }, +/obj/effect/overlay/desert/sonora/edge, /turf/open/floor/wood_common, /area/f13/wasteland) "xXx" = ( @@ -81904,13 +80584,11 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) "xYk" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/structure/closet/crate/bin, -/obj/effect/decal/cleanable/dirt{ - color = "000000" +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" }, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/area/f13/wasteland) "xYn" = ( /obj/effect/overlay/desert_side{ dir = 4 @@ -82124,7 +80802,9 @@ "ybH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, -/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ + loot = s + }, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/u) @@ -82470,20 +81150,6 @@ icon_state = "oakfloor1" }, /area/f13/followers) -"yhi" = ( -/obj/structure/simple_door/tent, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "UBuild"; - layer = 11; - name = "Gabriel's U-Build" - }, -/turf/open/floor/f13{ - icon_state = "bluedirtychess2" - }, -/area/f13/ambientlighting/building/j) "yhn" = ( /obj/structure/barricade/tentclothcorner, /turf/open/indestructible/ground/inside/dirt, @@ -82759,10 +81425,6 @@ }, /area/f13/caves) "ylL" = ( -/obj/machinery/light_switch{ - pixel_y = -6; - pixel_x = -23 - }, /obj/item/melee/onehanded/club/ncrflag{ pixel_x = -10; pixel_y = 16; @@ -82775,11 +81437,9 @@ /turf/closed/mineral/random/no_caves, /area/f13/ncr) "ylX" = ( -/obj/structure/simple_door, -/obj/structure/barricade/wooden/planks, -/obj/structure/barricade/wooden/strong, -/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, -/area/f13/ambientlighting/building/j) +/obj/structure/simple_door/metal/fence, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "ymf" = ( /obj/structure/debris/v4, /turf/open/indestructible/ground/inside/mountain, @@ -83480,8 +82140,8 @@ aTW aTW aTW ufo -gvD -gvD +akv +mQK ufo aTW aTW @@ -83782,8 +82442,8 @@ xic gZW xic thS -gvD -gvD +srQ +mQK jwS jwS jwS @@ -84386,8 +83046,8 @@ xic xic xic xic -gvD -gvD +akv +mQK jwS jwS rBR @@ -84396,7 +83056,7 @@ rVP rVP rVP mnl -jwS +uQU uaE uhL mmm @@ -84688,8 +83348,8 @@ azA azA dWL azA -gvD -gvD +akv +mQK xic jwS vju @@ -84698,7 +83358,7 @@ uMS rVP wXb mnl -jwS +wJq lWz ffB lWz @@ -85000,7 +83660,7 @@ hdP rVP rVP ruJ -jwS +kBR fwg ffB uaE @@ -85293,7 +83953,7 @@ jwS jwS xic xXr -gvD +mQK flK jwS sYW @@ -85595,7 +84255,7 @@ iph jwS xic xXr -gvD +mQK xic jwS igd @@ -85891,13 +84551,13 @@ qhU iDN qhU jwS -qhU +cPG coK vbI jwS xic mgD -gvD +mQK xic jwS eYx @@ -86199,7 +84859,7 @@ qwi jwS jwS xXr -gvD +mQK jRD jwS mnl @@ -86501,7 +85161,7 @@ qhU qhU jwS mgD -gvD +mQK azA jwS dVp @@ -86803,7 +85463,7 @@ dku ddQ lee qOY -gvD +mQK jRD jwS jwS @@ -87105,8 +85765,8 @@ qsE cKM qha xXr -gvD -mab +qGg +hPh tXn gvD gvD @@ -87406,11 +86066,11 @@ jwS jwS jwS jwS -mgD -gvD -gvD -hZK -gvD +ofR +sQJ +sQJ +lGm +sQJ wIT uCa sFL @@ -89524,7 +88184,7 @@ lLc jwS jwS rkr -fPf +bDr nrn qtr eJc @@ -89826,7 +88486,7 @@ tKO fYh jwS qBe -lmd +ady nrn nrn tPS @@ -91191,7 +89851,7 @@ xFO uVi mwN uyX -bTn +pcH mwN gHY fow @@ -93450,7 +92110,7 @@ slq rhc qEK uVn -lmd +izU tPS tPS eJc @@ -93752,7 +92412,7 @@ slq rhc qEK uVn -lmd +yae tPS tPS nrn @@ -95582,7 +94242,7 @@ azA ahs lcl kqU -iEK +eLo smK yky azA @@ -96488,7 +95148,7 @@ azA ahs nbU smK -smK +jWa smK yky mUU @@ -104030,12 +102690,12 @@ urm urm urm urm +tMH +eUj +eUj urm -urm -urm -urm -qac -urm +eUj +eUj jAp urm urm @@ -104326,27 +102986,27 @@ eUj eUj ahs xmb -rrR -rrR -lMg -lMg -rCg +eAw +eAw +eAw +eAw +lfS rCg lMg -rrR -rrR -qyt -rrR +nWo +wKj qyt -rrR -rrR -lMg -qEp -qEp -qEp -lMg -rrR -rrR +fVP +wlq +lfS +eAw +eAw +eAw +eAw +eAw +eAw +eAw +eAw iQz eAw eAw @@ -104627,29 +103287,29 @@ eUj eUj eUj ahs -rrR -tqQ -mUz -vrB -jYg -xEY -efV -hAK -hAK -efV -fDS -efV -efV +azA +azA +azA +azA +azA +nQM +nNx +bLe efV -hAK efV -clg -vrB +eUj jJo efV -vrB -rrR -rrR +nvv +azA +azA +azA +azA +azA +azA +azA +azA +azA azA myG nmO @@ -104929,29 +103589,29 @@ vVz vVz qHK ahs -rrR -jvX -tFr -efV -efV -hAK -hAK -hAK -hAK -efV -efV +azA +azA +azA +azA +azA +loW +dyA +bLe +jJo efV efV efV efV -clg -xSF -bjZ -fDS -aPS -jJo -vrB -rrR +loW +azA +azA +azA +azA +azA +azA +azA +azA +azA azA myG aIi @@ -105231,29 +103891,29 @@ vVz vVz qHK ahs -lMg -vrB -efV -efV -rPS -fJE -hAK -hAK -hAK -hAK -hAK -hAK -efV -efV -hAK +hGZ +hGZ +hGZ +toH +toH +toH hAK +qQY +eUj efV -rKh -rPS -qCk +eUj efV -vrB -lMg +gqh +toH +idZ +cZx +mfw +hGZ +hGZ +hGZ +toH +toH +kcn fyv myG skL @@ -105533,29 +104193,29 @@ eUj eUj eUj ahs -lMg -efV -efV -dgF -hmV -sSb -lnd -hAK -hAK -hAK -hWa -fQd -hAK -hAK -hAK -hAK -dgF +hGZ +hNt +jmU +wpI hmV -sSb -een +toH +uVn +qDT +eUj +eUj +eUj +oBZ efV -vrB -cJU +evI +gqX +bTn +dgF +hGZ +bJW +csd +bJW +toH +azA azA myG wHL @@ -105835,29 +104495,29 @@ mZo eUj eUj ahs -rCg +hGZ xEY -efV +lUM jxe exB xqi -uBI -hAK -hAK -hAK -tUK -tqQ -rrR +gbA +qDT +emX +eUj +eUj +eUj +mIS evI -hAK -hAK -xYk -ivH -xoR -rSs -efV -vrB -cJU +tba +jja +mRm +hGZ +mOh +toH +roC +toH +azA azA myG skL @@ -106137,29 +104797,29 @@ eUj eUj eUj ahs -rCg +toH jYg -xEY -dgF +mmI +vrB nsX -nWo -klW -hAK -hAK -hAK -uLE +xqi +lFV +qDT +eUj +eUj +eUj +eUj jeV -hWa -hAK -hAK -hAK -dgF -nsX -nWo -een -efV -vrB -cJU +eJx +irl +bJW +bJW +toH +toH +toH +bJW +hGZ +azA azA myG hhB @@ -106439,30 +105099,30 @@ eUj eUj ybl ahs -rCg -efV -hAK -hAK -hGZ -hGZ -hAK -hAK -hAK -hAK -hAK -hAK -hAK -hAK -hAK -hAK -hAK +toH +eUm +rag +ggY +kWV hGZ +qFu +lmd +qoG +qUA +rrE +eUj +vTP +pjC +xoR +bJW +bJW +bJW +cXt +xoR +bJW hGZ -hAK -hAK -sdX -lMg -kcn +azA +azA myG aIi uhB @@ -106741,29 +105401,29 @@ eUj eUj eUj ahs -tqQ -hAK -hAK -fQd -hAK -hAK -hAK -hAK -rrE -qSB +toH +toH +toH +hGZ +hGZ +hGZ +lFV +bLe +eUj +eUj rrE -hAK +eUj ijH -eJx -pHY -hAK -hAK -hAK -hAK -fQd -hAK -aZv -tqQ +pjC +hpV +xoR +bJW +toH +iWK +bJW +bJW +hGZ +azA azA myG myG @@ -107043,29 +105703,29 @@ eUj eUj eUj ahs -rrR -rrR -rrR -rrR -rrR -rrR -qVq -qVq -ifN +toH +dee +gPd +hoq +gPd +hGZ +rlB +bLe +efV +eUj +rrE +efV +kIO +wED +qRZ +eLv xoA -qVq -qVq -qVq -qVq -qVq -qVq -qVq -rrR -rrR -rrR -rrR -rrR -rrR +hGZ +bJW +bJW +bJW +toH +azA azA myG hCF @@ -107344,30 +106004,30 @@ lmd eUj lxu eUj -ahs -rrR +klW +toH +gPd gPd -kWV frc -jCe -rrR -idZ -hAK -hAK -hAK -hAK -hAK +gPd +hNV +lnd +oje +plM +eUj +qUA +efV hAD -sUt -hAK -hAK -qVq -tqQ -bLe -rGf -gAX -wUi -rrR +toH +toH +toH +hGZ +hGZ +bJW +bJW +kPr +toH +azA azA myG tGe @@ -107647,29 +106307,29 @@ eUj eUj eUj ahs -rrR -hoq -cSa -cSa -cSa +toH +aGP +gPd +gPd +lsm vQc -qVq -hAK -hAK -rUE -lSW -qDT -woy -aSu -efV -hAK -qVq -oWl -ohg -xgP -rtC +cDQ +lmd +eUj +eUj +ete +eUj +qUA toH -eUm +fOj +tjb +nyg +toH +bJW +xoR +xoR +toH +azA azA myG jkq @@ -107949,29 +106609,29 @@ eUj eUj eUj ahs -rrR -jCe -sBd -jCe -jCe -yhi -qVq -hAK -efV -hEG -vxu -iaE -voC -mzq -efV -hAK -qVq -oWl -ksz -rGf -rtC -rtC -eUm +toH +frc +wGk +cSa +hoq +hNV +lnd +oje +omc +eUj +eUj +eUj +eUj +xqH +tjb +dGQ +iBz +toH +adp +bJW +fDM +toH +azA azA myG aIi @@ -108251,29 +106911,29 @@ eUj eUj eUj ahs -rrR -jCe -kLc -jCe -jCe -xKg -qVq -hAK -uvL -xms -efV -sKv -hAK -wlf -efV -hAK -qVq -vDy -ppH -rtC -sRm toH -uGd +iVL +bCu +gPd +nqo +toH +oeN +idG +eJV +eUj +eUj +eUj +eUj +tjb +tjb +dGQ +dGQ +toH +xPE +bJW +lvw +toH +azA azA myG jkq @@ -108553,29 +107213,29 @@ eUj eUj eUj ahs -rrR -mvy -tSO -wtd -biB -xKg -idG -hAK -wED -nSn -dvN -efV -iYV -uLw -efV -hAK -idG -pXy -fjo -gEl -rtC -lUM -rrR +toH +toH +toH +toH +toH +toH +rMR +lmd +eUj +eUj +eUj +eUj +eUj +rjf +tjb +tjb +dGQ +fwA +gUF +bJW +xoR +toH +azA azA myG tGe @@ -108855,29 +107515,29 @@ eUj ybl eUj ahs -rrR -rtC -rtC +toH +vAd +tIa dPJ peC cgg -idG -imq -pMM -hKn -hZw -hsI -kIO -dpm -uvL +tKC +lmd +eUj +eUj +eUj +eUj efV -idG -gqA -jDg -rGf -rtC +hGZ +tjb +vgW +upA +hGZ +dGQ +xoR +xoR toH -rrR +azA azA myG hCF @@ -109157,29 +107817,29 @@ eUj eUj eUj ahs -rrR -kZz -tjb +toH kZz -rag -rrR -suz -hAK -efV -efV -hAK -efV -efV -efV -hAK +uaM +dGQ +mOQ +toH +qTP +lmd +eUj +qUA +eUj efV -idZ -rrR -rrR -rrR -rrR -rrR -rrR +tVf +mlF +mlF +hGZ +hGZ +hGZ +cQL +dGQ +rbn +toH +azA azA myG gGA @@ -109459,29 +108119,29 @@ eUj rru eUj ahs -rrR +toH iSM -rtC -rtC -rtC -jUO -suz -idG -hAK -efV -efV -hAK -hAK -hAK -hAK -efV -qVq -rAT -jiW -sOQ -vCA +tjb sOQ -rrR +dGQ +jUO +uVn +lmd +eUj +eUj +qUA +eUj +okR +dGQ +lXA +dGQ +pRo +hGZ +hGZ +dGQ +dGQ +toH +azA azA myG uhB @@ -109761,29 +108421,29 @@ eUj eUj eUj ahs -rrR +hGZ kZV -rtC +tjb fEe dGQ -hqE -idG -imq -lIE -bTU -pOj -ete -ete -hAK -hAK -hAK -qVq -rAT -cZx -sOQ -hlS -vgW -rrR +toH +oJh +lmd +eUj +eUj +eUj +eUj +uvL +dGQ +dGQ +pOm +fDO +toH +tjb +tjb +dGQ +toH +azA azA myG uhB @@ -110063,29 +108723,29 @@ eUj eUj eUj ahs -rrR -rtC -lzH +hGZ +tjb +tjb ldI hFm -tGl -qVq -imq -miU -mQK -hYY -hYY -hYY -hYY -pre -hAK -qVq -eQh -sOQ -ufX -sOQ -fWw -rrR +toH +ecK +lmd +eUj +eUj +qUA +eUj +uvL +dGQ +tjb +tjb +fJj +toH +tjb +nyg +iBz +toH +azA azA myG uhB @@ -110365,29 +109025,29 @@ eUj eUj mZo ahs -rrR -dXR -hpV -pCD -cCJ -vJN +hGZ +hGZ +hGZ +hGZ +toH +toH suz -hAK -rlB -fOj -fOj -mcC -mcC -mcC -wxY -bTU -qVq -nnl -mmI -dvp -mmI -qFu -rrR +lmd +ete +eUj +qUA +eUj +uvL +gxH +tjb +dGQ +dGQ +cQL +ihE +dGQ +dGQ +toH +kcn azA myG uhB @@ -110667,29 +109327,29 @@ eUj eUj eUj ahs -rrR +toH izB +hIh +blT dXR -dXR -dXR -btx -qVq -hAK -hAK -hAK -hAK -imq +toH +uVn +lmd +eUj +eUj +eUj +eUj nfN -vxC -ein -bTU -qVq -nnl -gTy -gTy -gTy -okR -rrR +mlF +nBs +nyg +dGQ +hGZ +dGQ +wVz +bJW +toH +azA azA myG uhB @@ -110969,29 +109629,29 @@ eUj eUj eUj ahs -rrR -xzj -hXB +toH hIh -vAd +hIh +hIh +wfR qaQ -idG -hAK -hAK -imq -efV -efV -imq -hAK -bTU -hAK -qVq -iKX -lhV -kNu -lhV -dyA -rrR +uVn +lmd +eUj +eUj +eUj +qUA +eUj +dGQ +dGQ +mlF +hGZ +hGZ +dGQ +bJW +bJW +toH +azA azA myG uhB @@ -111271,29 +109931,29 @@ eUj eUj eUj ahs -rrR -rrR -rrR -rrR -rrR -rrR -mJL -hAK -efV -efV -uvL -pMM -efV -hAK -hAK -hAK -qVq -rrR -rrR -rrR -rrR -rrR -rrR +toH +cqy +psk +hIh +hIh +oNY +uup +lmd +eUj +tYG +xms +qUA +eUj +dGQ +dGQ +dGQ +tjb +hGZ +pVH +bJW +sQf +hGZ +azA azA myG msj @@ -111573,30 +110233,30 @@ eUj eUj ybl ahs -rrR -uQv -hAK -dGq -hAK -tVf -qVq -hAK -efV -nCx +toH +hIh +vxC +hIh +hIh +qaQ +uup +vyg +eUj +eUj tpE -xtj -gHE -wlq -hAK -hAK -qVq -gxH -tCj -fgw -eIx -uRd -rrR -kcn +eUj +eUj +dGQ +dGQ +dGQ +dGQ +toH +adp +bJW +bJW +hGZ +azA +azA myG myG myG @@ -111875,29 +110535,29 @@ eUj eUj eUj ahs -rrR +hGZ wAz -tIa -hAK -hAK -tVf -qVq -efV -hAK -aTP -mIK -rtC -hAK -tKC -aZv -hAK -qVq -gxH -uRd -hAK -hAK -uQB -rrR +hIh +rfB +pHY +hGZ +deN +vyg +eUj +eUj +eUj +eUj +eUj +dGQ +dGQ +dGQ +dGQ +toH +bJW +bJW +bJW +hGZ +azA azA snR cBf @@ -112177,29 +110837,29 @@ eUj eUj eUj ahs -rrR -hAK -hAK -hAK -hAK -lqJ -qVq -efV -hAK +hGZ +toH +toH +toH +hGZ +toH +eIx +nJY +eUj xms -hAK -tqQ -hAK -wlf -efV -efV -qVq +eUj +eUj +eUj +dGQ +dGQ +dGQ +dGQ fwA -wpI -pOa -rLQ -uRd -rrR +bJW +bJW +xPE +toH +azA azA gAg wTQ @@ -112479,29 +111139,29 @@ vVz qHK vVz ahs -rrR -jUe +hGZ +fjV fjV gzV -hAK -lqJ -qVq -efV -hAK -kfy -rtC -rtC +fDS +hGZ +jCl +vyg +eUj +eUj +omc +eUj rtC -ggY -hAK -efV -qVq -fwA -hAK -uRd -uRd -hAK -rrR +hGZ +dJX +hBx +tjb +toH +vXQ +xoR +xoR +toH +kkM azA azA azA @@ -112781,29 +111441,29 @@ vVz qHK vVz ahs -rrR -frP +toH dGq -hAK -hAK +dGq +fAD +cJj gBO -qVq -hAK -efV -hNt -pjC -fTt +uup +lmd +eUj +eUj +eUj +eUj tlh -tqe -hAK -efV -qVq -fwA -uRd -blT -fFk -lCJ -rrR +hGZ +hGZ +mLQ +hGZ +toH +kNa +xoR +dGQ +imq +azA azA azA ndZ @@ -113083,29 +111743,29 @@ eUj eUj eUj ahs -rrR +toH xLF -emi -gWG -hAK -rrR -vui -hAK -hAK -hAK -hAK -hAK -hAK +dGq +gBO +gBO +gBO +uup +lmd +njU +eUj +eUj +eUj +pcb +hGZ +ocL +pbR +rxq +toH +xPE +doy +iLG imq -hAD -efV -qVq -rrR -wSe -hAK -wPM -uRd -rrR +azA azA ndZ dPr @@ -113384,30 +112044,30 @@ eUj eUj eUj eUj -ahs -rrR -rrR -rrR -rrR -rrR -rrR -qVq -qVq -qVq -qVq -qVq -qVq -qVq -qVq -qVq -sPF -qmb -rrR -rrR -rrR -rrR -rrR -rrR +xav +toH +gWG +lbs +gBO +dGq +gWG +uVn +lNB +eUj +eUj +qUA +qUA +eUj +aWH +oPv +iEK +jQt +toH +dGQ +tjb +ikU +oPv +azA azA snR cBf @@ -113687,29 +112347,29 @@ eUj eUj eUj ahs -rrR -tIH -tIH -rrR +hGZ tIH -rrR -xyq +cpn +ivH +mUz +toH xyq -hAK -hAK -hAK -efV -efV -rrE -rrE -rrE -efV -rrR -tIH -tIH -rrR -tIH -rrR +lmd +eUj +eUj +qUA +eUj +eUj +aWH +oPv +pFb +bzq +hGZ +wsu +dGQ +tjb +oPv +azA azA gAg rRz @@ -113987,31 +112647,31 @@ eUj lxu eUj mZo -eUj +uvL ahs -rrR -rrR -rrR -rrR -rrR -rrR -rrR -tqQ -hAK -tDB -eJx -dnM -efV -efV -hAK -hAK -efV -rrR -rrR -rrR -rrR -rrR -rrR +hGZ +hGZ +toH +toH +toH +hGZ +jMh +lmd +eUj +qUA +eUj +eUj +eUj +fXu +iBz +vAU +pFb +gIY +dGQ +dGQ +tjb +imq +azA azA azA azA @@ -114289,32 +112949,32 @@ qNZ eUj eUj eUj -eUj +uvL ahs -rrR -qVq -eRc -qVq -qVq +ylX +uVn +caq +tFr +gNZ gNZ uvn -rrR -hAK -hAK -hAK -hAK -hAK -efV -hAK -hAK -hAK -rrR -hDe -tAd -sFi -eGT -rrR -ndZ +lmd +eUj +eUj +eUj +eUj +eUj +hGZ +iVJ +lhX +lSi +hGZ +hCp +mOQ +mOQ +hGZ +evZ +azA rDi rDi rDi @@ -114593,30 +113253,30 @@ eUj eUj eUj rzw -rrR -uvn -qVq -qVq -qVq -adp -qVq -rrR -hAK -hAK -hAK -hAK -hAK -efV -hAK -hAK -hAK -rrR -eGT -eGT -eGT -eGT -rrR -snR +clg +eAw +eAw +eAw +eAw +eAw +eAw +qwL +eUj +eUj +qoG +eUj +eUj +hGZ +hGZ +toH +toH +hGZ +waN +vXQ +xSF +hGZ +azA +azA avm rRz cBf @@ -114894,31 +113554,31 @@ eUj tjL eUj eUj -eUj +mYq oBZ -wzW -qVq -psk -oPv -nzH -jCl -rrR -pOj -hAK -hAK -hAK -sIp +xYk +ifN +eUj +mYq +eUj +eUj +eUj +eUj +eUj +eUj +eUj +eUj tqQ hWa -hAK -efV -amw -eGT -eGT -eGT -gRu -rrR -snR +tUK +lzH +toH +bJW +bJW +bJW +hGZ +azA +azA tey rRz rRz @@ -115197,30 +113857,30 @@ eUj eUj eUj eUj -aZt +eUj wzW -qVq -oPv -jle -pOi -qVq -rrR -lkc -hAK -lZM -hAK -hWa -tqQ -iFu -hAK -efV -rrR -rrR -rrR -rrR -rrR -rrR -snR +mYq +eUj +eUj +eUj +eUj +eUj +eUj +eUj +eUj +eUj +eUj +ahs +uVn +uup +uup +hGZ +dHc +bJW +kNa +hGZ +hGZ +azA cBf rRz cBf @@ -115499,30 +114159,30 @@ eUj eUj eUj eUj -aZt -wzW -qVq -sQJ -oPv -oPv -qVq -rrR +jqz +wsd +wsd +tMH +qUA +qUA +qUA +sSb eTF -eyd -hBx -hAK -hAK -tqQ -hAK -efV -efV -keO -cDp -ecK -deN -gCo -rrR -gAg +wsd +tMH +eUj +eUj +ahs +uVn +wAU +uup +hGZ +hGZ +bJW +bJW +adp +hGZ +azA wTQ wTQ wTQ @@ -115801,29 +114461,29 @@ eUj mjp eUj eUj -rrR +sPF uzc -jCl -qVq -qVq -qVq -qVq -rrR -ncO -pOm -qKm -rfB -hAK -hAK -hAK -efV -hAK -rrR -jmU -hTd -qYd -rtC -rrR +uVn +lmd +qUA +fkX +qUA +ahs +uzc +uVn +lmd +eUj +eUj +ahs +uVn +uVn +wuE +hGZ +hGZ +xoR +bJW +bJW +hGZ azA azA azA @@ -116104,28 +114764,28 @@ smK eUj eUj aZt -wzW -qVq -oPv -oPv -xav -adp -rrR -ncO -ncO -ncO -qCk -hAK -hAK -hAK -hAK -hAK -rrR -krt -nNx -hGq -sRm -rrR +wlf +sIp +nAH +eUj +eUj +eUj +rzw +eAw +eAw +nAH +eUj +eUj +rzw +eAw +nEj +uVn +hGZ +hGZ +pVH +xoR +xoR +toH azA azA wNx @@ -116404,31 +115064,31 @@ qNZ eUj mZo eUj +mYq eUj -aZt wzW -qVq -nzH -oPv -oPv -jCl -ptJ -tqQ -ylX -rrR -tqQ -tqQ -fVP -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR +eUj +mYq +qUA +qUA +qUA +qUA +qUA +eUj +eUj +qUA +qUA +qUA +eUj +ahs +uVn +eRc +toH +xoR +xoR +bJW +toH +azA azA ndZ rRz @@ -116707,30 +115367,30 @@ eUj eUj eUj eUj -aZt -wzW -qVq -oPv -oPv -oPv -qVq -ptJ -qVq -qVq -qVq -jqz -xoA -wAU -qVq -qVq -kuS -qVq -qVq -qVq -qVq -ljx -qVq -rrR +oBZ +mYq +miU +eUj +eUj +eUj +eUj +nfN +eUj +eUj +eUj +eUj +eUj +qUA +eUj +ahs +uVn +uBI +gAX +bJW +bJW +bJW +toH +azA azA snR cBf @@ -117009,30 +115669,30 @@ eUj eUj eUj bff -rrR -qVq -qVq -uvn -qVq -qVq -qVq -cgv -qVq -qVq -qVq -qVq -qVq -qVq -qVq -qVq -qVq -qVq -qVq -qVq -qVq -qVq +amQ +lIE +lIE +cCJ +cCJ +nzH +vDy +anp +eyd +aBg +tMH +eUj +eUj +prC +prC qVq -jMh +lfS +eGT +toH +mNN +bnW +mNN +toH +azA azA snR bnn @@ -117311,30 +115971,30 @@ wKj eUj uGQ ahs -rrR -qVq -adp -qVq -qVq -qVq -qVq +gqA +azA +igE +toH +aSu +toH +toH rrR uvq -qVq -qVq -qVq -jCl -qVq -rrR -hfw -tSv -hfw -rrR -rrR -rrR -amw -rrR -rrR +toH +toH +eUj +gGf +aUc +azA +azA +gvU +toH +hGZ +toH +toH +toH +toH +azA azA gAg jbl @@ -117613,30 +116273,30 @@ pKJ eUj jfW ahs -rrR -qVq -pFb -jGR -rMR -qTP -qVq +gqA +azA +azA +toH +bJW +sfz +bJW ptJ -aUi -wAU -qVq +bJW +rpw +toH ddY -udB -xmv -rrR -adz -mfw -mfw -bSY -rrR -qVq -qVq +gGf +azA +tkV +rvZ +dmf +azA +azA +azA +azA +lhS umY -rrR +azA azA azA gAg @@ -117915,30 +116575,30 @@ eUj eUj uGQ ahs -rrR -qVq -sjp -hpR -lYf -aPL -qVq -rrR -kGP -qVq -cAP -ddY +gqA +azA +azA +toH bJW -uhh -rrR -gqh -amQ -nbB -mfw -rrR +bJW +jja +vPH +jkI +ure +toH +ddY reW -nqo -nqo -rrR +azA +pli +faq +pka +azA +azA +aUc +boK +azA +shl +azA azA vNp vNp @@ -118217,30 +116877,30 @@ eUj eUj jfW ahs -rrR -qVq -tYG -qVq -qVq -tYG -kBU -rrR -nbO -idZ -qVq -vaU -bJW -qCz -rrR -aWQ -bve -ltA -bHs -rrR -xlt -iDS -qoG -rrR +gqA +azA +azA +toH +btY +gox +pVA +jKa +hZy +toc +toH +ddY +gGf +azA +azA +pli +tQf +azA +jXc +azA +pbH +azA +aVw +azA azA azA azA @@ -118519,30 +117179,30 @@ wsd wsd wsd jQw -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR -rrR +ltA +lNW +lNW +toH +toH +toH +toH +toH +toH +toH +toH +qCk +qmb +lNW +lNW +lNW +lNW +lNW +lNW +lNW +lNW +tDB +qSB +azA azA oND oND @@ -145350,7 +144010,7 @@ jJf cXo vBY arn -cQx +jmq jJf hrk lmd From 9baf7766fb00548580ceee043d9fffb2a8d5f2bb Mon Sep 17 00:00:00 2001 From: Defaulterrama <136886118+Defaulterrama@users.noreply.github.com> Date: Wed, 11 Mar 2026 21:13:20 -0400 Subject: [PATCH 6/6] kill --- .../Vegas Valley/Vegas_Valley_Sky.dmm | 6830 ++++- .../Vegas Valley/Vegas_Valley_Surface.dmm | 21627 +++++++++++++++- 2 files changed, 28336 insertions(+), 121 deletions(-) diff --git a/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm b/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm index 39c00d068c..123b3fa3aa 100644 --- a/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm +++ b/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm @@ -12,6 +12,20 @@ }, /turf/open/floor/wood_common, /area/f13/clinic) +<<<<<<< Updated upstream +======= +"ac" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/floor/f13/wood{ + icon_state = "housebase4-broken" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ad" = ( /obj/structure/railing{ layer = 4.1; @@ -80,6 +94,7 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +<<<<<<< Updated upstream "ak" = ( /obj/structure/sign/flag_america, /turf/closed/indestructible/rock{ @@ -96,6 +111,14 @@ /obj/structure/barricade/wooden/planks/pregame, /turf/open/indestructible/ground/outside/desert, /area/f13/ncr) +======= +"al" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "an" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/medical/ancientfirstaid, @@ -124,9 +147,18 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "ar" = ( /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/j) +======= +"aq" = ( +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt"; + dir = 6 + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "as" = ( /obj/structure/railing{ dir = 10 @@ -184,6 +216,13 @@ /obj/structure/barricade/bars, /turf/open/floor/plasteel/dark, /area/f13/building/abandoned/l) +<<<<<<< Updated upstream +======= +"aA" = ( +/obj/effect/spawner/lootdrop/f13/weapon/gun/energy/mid, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "aB" = ( /obj/structure/table, /obj/item/storage/crayons, @@ -196,6 +235,12 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"aD" = ( +/turf/closed/mineral/random, +/area/f13/wasteland) +>>>>>>> Stashed changes "aG" = ( /obj/item/weldingtool, /obj/effect/decal/cleanable/dirt, @@ -247,6 +292,7 @@ /turf/open/floor/wood_wide, /area/f13/followers) "aP" = ( +<<<<<<< Updated upstream /turf/open/floor/wood_wide{ icon_state = "wide-broken3" }, @@ -256,6 +302,19 @@ dir = 6 }, /turf/open/indestructible/ground/outside/desert, +======= +/obj/item/mine/stun, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/wasteland) +"aR" = ( +/obj/item/restraints/legcuffs/bola/tactical, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "aT" = ( /obj/structure/bed/double, @@ -281,6 +340,14 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"aW" = ( +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "aX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -288,6 +355,20 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"aY" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor3-broken" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ba" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -338,6 +419,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/showroomfloor, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"bi" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "bj" = ( /obj/structure/rack, /obj/item/reagent_containers/food/snacks/f13/fancylads, @@ -373,8 +463,13 @@ }, /area/f13/building/powered) "bo" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, +======= +/obj/effect/decal/fakelattice, +/obj/structure/closet/crate/footlocker, +>>>>>>> Stashed changes /turf/open/floor/f13/wood, /area/f13/ncr) "bp" = ( @@ -558,6 +653,7 @@ /turf/open/floor/wood_wide, /area/f13/legioncamp) "bQ" = ( +<<<<<<< Updated upstream /obj/item/bedsheet/blanket, /obj/structure/bed, /obj/effect/landmark/start/f13/ncrcorporal, @@ -569,6 +665,17 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +/obj/structure/campfire, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +"bR" = ( +/turf/open/indestructible/ground/outside/dirt{ + dir = 5; + icon_state = "dirt" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "bS" = ( /obj/structure/table, /obj/item/blueprint/research, @@ -639,12 +746,15 @@ /obj/structure/table, /turf/open/floor/holofloor/carpet, /area/f13/ambientlighting/building/e) +<<<<<<< Updated upstream "cc" = ( /obj/structure/simple_door/tentflap_cloth{ pixel_y = -3 }, /turf/open/indestructible/ground/outside/dirt, /area/f13/ambientlighting/building/u) +======= +>>>>>>> Stashed changes "ce" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -653,8 +763,14 @@ /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) "cf" = ( +<<<<<<< Updated upstream /obj/structure/flora/big_bush, /turf/open/indestructible/ground/outside/dirt, +======= +/turf/open/floor/wood_wide{ + icon_state = "wide-broken1" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "cg" = ( /obj/structure/closet/firecloset/full, @@ -739,8 +855,13 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "cr" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +======= +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "cs" = ( /obj/structure/sign/legion/veteran, /turf/closed/wall/f13/wood/house, @@ -752,9 +873,15 @@ }, /area/f13/building/abandoned/z) "cu" = ( +<<<<<<< Updated upstream /obj/machinery/door/unpowered/secure_NCR, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland) +>>>>>>> Stashed changes "cw" = ( /obj/structure/fluff/railing, /turf/open/transparent/openspace, @@ -788,11 +915,19 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "cB" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/generic{ name = "scratch marks" }, /turf/open/floor/wood_wide, /area/f13/wasteland) +======= +/obj/item/cane, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "cC" = ( /obj/structure/railing{ layer = 4.1 @@ -837,6 +972,7 @@ }, /turf/open/transparent/openspace, /area/f13/building/powered) +<<<<<<< Updated upstream "cO" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -848,6 +984,24 @@ icon_state = "oakfloor1-broken" }, /area/f13/wasteland) +======= +"cN" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) +"cO" = ( +/obj/structure/flora/twig3, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "cP" = ( /obj/structure/chair/comfy/shuttle, /turf/open/floor/carpet/royalblack, @@ -914,9 +1068,30 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream "db" = ( /turf/open/floor/holofloor/carpet, /area/f13/ambientlighting/building/e) +======= +"da" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirtcorner" + }, +/area/f13/wasteland) +"db" = ( +/turf/open/floor/holofloor/carpet, +/area/f13/ambientlighting/building/e) +"dc" = ( +/obj/structure/chair/stool/retro/black, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "dd" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -929,6 +1104,15 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"de" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/tentclothedge, +/turf/open/floor/plating/f13/outside/roof/metal/corrugated, +/area/f13/ncr) +>>>>>>> Stashed changes "df" = ( /obj/structure/simple_door/bunker, /obj/structure/barricade/wooden/planks, @@ -958,10 +1142,17 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "dj" = ( /obj/structure/lattice/catwalk, /obj/structure/campfire/barrel, /turf/open/transparent/openspace, +======= +"di" = ( +/turf/open/floor/f13/wood{ + icon_state = "housebase" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "dk" = ( /obj/machinery/light, @@ -980,9 +1171,15 @@ }, /area/f13/building/powered) "dm" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /turf/open/floor/wood_wide, /area/f13/wasteland) +======= +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "dn" = ( /mob/living/simple_animal/hostile/supermutant/nightkin, /obj/effect/decal/cleanable/dirt, @@ -1016,6 +1213,7 @@ }, /turf/open/floor/plasteel/f13/vault_floor/red/white/whiteredchess, /area/f13/building/abandoned/z) +<<<<<<< Updated upstream "ds" = ( /obj/structure/junk/small/table, /obj/structure/junk/small/tv, @@ -1034,6 +1232,16 @@ /obj/effect/landmark/start/f13/ncrtrooper, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +"dv" = ( +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/obj/item/soap/homemade, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "dx" = ( /obj/structure/rack/large/shelf_rust, /obj/effect/turf_decal/bot_white, @@ -1049,6 +1257,15 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"dy" = ( +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins{ + icon_state = "rubbleplate" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "dz" = ( /obj/machinery/pool/drain, /obj/machinery/shower{ @@ -1070,6 +1287,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/purple, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"dD" = ( +/obj/structure/table/booth, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "dE" = ( /obj/structure/table/wood/junk, /obj/item/radio/old, @@ -1105,6 +1331,7 @@ }, /turf/open/floor/wood_wide, /area/f13/followers) +<<<<<<< Updated upstream "dL" = ( /obj/effect/decal/cleanable/blood{ dir = 8; @@ -1121,6 +1348,8 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +>>>>>>> Stashed changes "dN" = ( /obj/structure/closet/cabinet, /obj/effect/spawner/lootdrop/f13/armor/costumes, @@ -1163,6 +1392,16 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"dU" = ( +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrtrooper, +/obj/effect/landmark/start/f13/ncrtrooper, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "dV" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -1175,9 +1414,16 @@ /turf/open/floor/plating/f13/outside/roof/metal/corrugated/green, /area/f13/wasteland) "dX" = ( +<<<<<<< Updated upstream /turf/open/floor/f13/wood{ icon_state = "housebase" }, +======= +/obj/structure/obstacle/barbedwire{ + dir = 1 + }, +/turf/open/floor/wood_wide, +>>>>>>> Stashed changes /area/f13/wasteland) "dY" = ( /obj/structure/railing{ @@ -1206,8 +1452,16 @@ /turf/open/floor/carpet/blue, /area/f13/followers) "ec" = ( +<<<<<<< Updated upstream /turf/open/floor/plating/f13/outside/roof/red, /area/f13/wasteland) +======= +/obj/structure/closet/locker, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "ee" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/weapon/melee/random_mid, @@ -1287,6 +1541,7 @@ /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "eq" = ( +<<<<<<< Updated upstream /obj/structure/closet/crate/large, /obj/structure/closet/crate/large{ layer = 5; @@ -1294,6 +1549,11 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/effect/landmark/start/f13/ncrspecialist, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "er" = ( /turf/open/floor/wood_common/wood_common_light, /area/f13/wasteland) @@ -1449,11 +1709,17 @@ }, /area/f13/building/powered) "eO" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/dirt{ dir = 5; icon_state = "dirt" }, /area/f13/wasteland) +======= +/obj/machinery/workbench, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "eP" = ( /turf/closed/wall/mineral/wood, /area/f13/ambientlighting/building/d) @@ -1531,8 +1797,20 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "fb" = ( +<<<<<<< Updated upstream /obj/structure/fluff/railing/corner, /turf/open/transparent/openspace, +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "fc" = ( /obj/structure/simple_door/bunker/glass, @@ -1543,6 +1821,7 @@ }, /area/f13/building/powered) "fd" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -1552,6 +1831,11 @@ /obj/structure/closet/crate/large, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "fe" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -1636,6 +1920,7 @@ /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/carpet, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream "fq" = ( /turf/closed/wall/f13/ruins, /area/f13/ambientlighting/building/j) @@ -1650,6 +1935,8 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +>>>>>>> Stashed changes "fs" = ( /obj/machinery/shower{ dir = 4 @@ -1765,6 +2052,7 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) "fM" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /turf/open/floor/wood_wide{ icon_state = "wide-broken5" @@ -1773,6 +2061,11 @@ "fN" = ( /turf/closed/wall/rust, /area/f13/brotherhood/offices1st) +======= +/obj/structure/legion_extractor, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "fO" = ( /obj/structure/window/fulltile/wood_window, /turf/open/floor/f13{ @@ -1791,11 +2084,17 @@ /turf/open/floor/wood_wide, /area/f13/legioncamp) "fR" = ( +<<<<<<< Updated upstream /obj/structure/fluff/railing{ dir = 10 }, /turf/open/transparent/openspace, /area/f13/wasteland) +======= +/obj/machinery/autolathe/ammo/unlocked_basic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "fS" = ( /obj/structure/window/fulltile/house, /turf/open/indestructible/ground/outside/desert, @@ -1818,6 +2117,19 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"fX" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/structure/closet/crate/large, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "fY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table_frame, @@ -1956,6 +2268,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/purple, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"gs" = ( +/obj/structure/flora/big_bush, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "gt" = ( /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/z) @@ -2010,6 +2329,7 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +<<<<<<< Updated upstream "gD" = ( /obj/structure/wreck/trash/machinepiletwo, /obj/effect/decal/cleanable/dirt{ @@ -2025,6 +2345,27 @@ /obj/effect/landmark/start/f13/ncrsergeant, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +"gE" = ( +/obj/structure/barricade/tentclothcorner, +/obj/effect/overlay/desert/sonora/edge{ + dir = 9 + }, +/obj/structure/barricade/tentclothedge{ + dir = 4; + pixel_x = 15; + pixel_y = 12; + layer = 5 + }, +/obj/item/paper/crumpled{ + name = "tied crude paper"; + desc = "A piece of paper with a hole near the top, tied to the wooden fence using a leather strip."; + info = "It's been days since they dug in and we blew the tunnel, trapping ourselves up here. We were finally forced to feed on horse. We'll last a while like this but--When the horses run out? I have no idea what happens."; + anchored = 1 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "gF" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/bottle/instacoffee{ @@ -2053,6 +2394,7 @@ /obj/item/clothing/head/cowboyhat/black, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) +<<<<<<< Updated upstream "gH" = ( /obj/effect/decal/cleanable/blood{ dir = 8; @@ -2061,6 +2403,8 @@ /obj/item/soap/homemade, /turf/open/floor/wood_wide, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "gI" = ( /obj/machinery/light/small{ dir = 4; @@ -2146,6 +2490,7 @@ /turf/open/transparent/openspace, /area/f13/building/powered) "gU" = ( +<<<<<<< Updated upstream /obj/structure/lattice/catwalk, /obj/item/grenade/syndieminibomb/concussion/frag, /obj/structure/obstacle/barbedwire{ @@ -2153,6 +2498,14 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +======= +/obj/structure/barricade/tentclothcorner, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirt" + }, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "gV" = ( /obj/effect/turf_decal/loading_area, /obj/effect/decal/cleanable/oil, @@ -2190,6 +2543,13 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"ha" = ( +/mob/living/simple_animal/hostile/renegade/soldier, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "hc" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, @@ -2218,6 +2578,7 @@ /obj/effect/overlay/desert/sonora/edge{ dir = 8 }, +<<<<<<< Updated upstream /obj/structure/barricade/tentclothedge{ dir = 4; pixel_x = 15; @@ -2226,15 +2587,34 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ambientlighting/building/u) +======= +/area/f13/legioncamp) +"hh" = ( +/obj/item/grown/log/tree, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "hj" = ( /obj/structure/table, /obj/item/book/granter/crafting_recipe/gunsmith_three, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream "hl" = ( /obj/effect/decal/remains/human, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"hk" = ( +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"hn" = ( +/obj/structure/barricade/concrete, +/turf/open/indestructible/ground/outside/ruins{ + icon_state = "rubblepillar" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ho" = ( /obj/structure/rack/large/shelf_rust, /obj/effect/spawner/lootdrop/clothing_middle, @@ -2278,6 +2658,7 @@ icon_state = "tunnelrusty" }, /area/f13/building/powered) +<<<<<<< Updated upstream "hw" = ( /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) @@ -2298,6 +2679,38 @@ /obj/effect/landmark/start/f13/ncrsergeant, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +"hv" = ( +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrsergeant, +/turf/open/floor/f13/wood, +/area/f13/ncr) +"hw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/f13/wood, +/area/f13/ncr) +"hx" = ( +/turf/open/indestructible/ground/outside/dirt{ + dir = 1; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) +"hy" = ( +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirt" + }, +/area/f13/wasteland) +"hz" = ( +/obj/item/reagent_containers/glass/beaker/waterbottle, +/obj/item/reagent_containers/glass/beaker/waterbottle{ + pixel_x = -12 + }, +/turf/open/floor/wood_common, +/area/f13/brotherhood) +>>>>>>> Stashed changes "hA" = ( /obj/machinery/light/fo13colored/Red{ dir = 1; @@ -2369,12 +2782,23 @@ /obj/effect/spawner/lootdrop/f13/attachments, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream "hM" = ( /obj/item/bedsheet/blanket/blanketalt{ layer = -7 }, /obj/structure/bed/wooden, /obj/effect/overlay/junk/curtain, +======= +"hL" = ( +/obj/structure/rack, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +"hM" = ( +/obj/structure/bookcase/random{ + icon_state = "bookempty" + }, +>>>>>>> Stashed changes /turf/open/floor/f13/wood{ color = "#c5bab2" }, @@ -2400,6 +2824,13 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"hP" = ( +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) +>>>>>>> Stashed changes "hQ" = ( /obj/structure/curtain{ color = "#845f58"; @@ -2510,6 +2941,7 @@ }, /area/f13/building/abandoned/l) "il" = ( +<<<<<<< Updated upstream /obj/machinery/door/unpowered/secure_NCR{ name = "Veteran Ranger's Lodging" }, @@ -2517,6 +2949,13 @@ color = "#c5bab2" }, /area/f13/ncr) +======= +/obj/structure/simple_door/tentflap_cloth{ + pixel_y = -3 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "im" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/supermutant/nightkin, @@ -2575,9 +3014,15 @@ dir = 1 }, /area/f13/building/powered) +<<<<<<< Updated upstream "iv" = ( /obj/structure/flora/grass/coyote/six, /turf/open/indestructible/ground/outside/desert, +======= +"iu" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide, +>>>>>>> Stashed changes /area/f13/wasteland) "iw" = ( /obj/effect/decal/cleanable/dirt, @@ -2613,6 +3058,24 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"iD" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "iE" = ( /turf/open/transparent/openspace, /area/f13/building/abandoned/j) @@ -2625,6 +3088,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"iI" = ( +/turf/closed/wall/f13/store, +/area/f13/wasteland) +>>>>>>> Stashed changes "iJ" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low, @@ -2641,11 +3110,22 @@ /obj/effect/decal/cleanable/robot_debris, /turf/open/floor/plasteel/f13/vault_floor/blue/side, /area/f13/building/powered) +<<<<<<< Updated upstream "iL" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/ncr) +======= +"iN" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -3 + }, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "iO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/simple_door/metal/store, @@ -2658,6 +3138,7 @@ /turf/open/floor/plating/rust, /area/f13/brotherhood/offices1st) "iQ" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood{ dir = 9; icon_state = "tracks"; @@ -2666,11 +3147,28 @@ /turf/open/floor/wood_wide{ icon_state = "wide-broken1" }, +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "iR" = ( /obj/structure/lattice, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"iS" = ( +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks"; + pixel_y = 5 + }, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "iT" = ( /obj/structure/fence/wooden{ dir = 4; @@ -2699,7 +3197,14 @@ /turf/open/floor/wood_common, /area/engine/workshop) "iX" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/inside/mountain, +======= +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirtcorner" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "iY" = ( /obj/effect/turf_decal, @@ -2725,6 +3230,7 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) "jc" = ( +<<<<<<< Updated upstream /obj/structure/railing/corner{ dir = 1 }, @@ -2742,6 +3248,12 @@ }, /turf/open/floor/plating/rust, /area/f13/brotherhood/offices1st) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/f13/decanvet, +/turf/open/floor/f13/wood, +/area/f13/legioncamp) +>>>>>>> Stashed changes "jf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/armor/tier2, @@ -2751,6 +3263,13 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"jg" = ( +/obj/structure/flora/tree/tall, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "ji" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, @@ -2882,9 +3401,19 @@ }, /area/f13/building/abandoned/m) "jA" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /turf/open/floor/wood_wide{ icon_state = "wide-broken1" +======= +/obj/structure/table/booth, +/obj/item/flashlight/lamp/green{ + pixel_x = -5; + pixel_y = 10 + }, +/turf/open/floor/f13/wood{ + color = "#c5bab2" +>>>>>>> Stashed changes }, /area/f13/wasteland) "jB" = ( @@ -2914,6 +3443,14 @@ }, /turf/open/transparent/openspace, /area/f13/building/abandoned/m) +<<<<<<< Updated upstream +======= +"jE" = ( +/obj/structure/closet/crate/footlocker, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "jF" = ( /obj/machinery/light{ dir = 8; @@ -2982,6 +3519,7 @@ }, /area/f13/building/powered) "jQ" = ( +<<<<<<< Updated upstream /obj/structure/barricade/tentclothcorner, /obj/effect/overlay/desert/sonora/edge{ dir = 9 @@ -3000,6 +3538,13 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ambientlighting/building/u) +======= +/obj/structure/campfire/barrel, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "jR" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 1; @@ -3137,6 +3682,7 @@ }, /area/f13/legioncamp) "ko" = ( +<<<<<<< Updated upstream /turf/open/floor/f13/wood{ icon_state = "housebase4-broken" }, @@ -3163,6 +3709,18 @@ icon_state = "oakfloor3-broken" }, /area/f13/wasteland) +======= +/obj/effect/spawner/lootdrop/f13/weapon/melee/tier4, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +"kq" = ( +/obj/structure/chair/stool/retro/black, +/obj/effect/landmark/start/f13/ncrveteranranger, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "kr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/armor/tier2, @@ -3351,6 +3909,7 @@ /obj/effect/decal/cleanable/dirt{ color = "000000" }, +<<<<<<< Updated upstream /obj/structure/table, /obj/item/ammo_box/magazine/m45/empty{ pixel_x = 3; @@ -3365,6 +3924,11 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +/obj/structure/barricade/sandbags, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/brotherhood) +>>>>>>> Stashed changes "kX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -3408,6 +3972,7 @@ icon_state = "darkdirtysolid" }, /area/f13/wasteland) +<<<<<<< Updated upstream "lf" = ( /obj/effect/decal/fakelattice, /obj/effect/turf_decal/weather/dirt, @@ -3416,6 +3981,8 @@ }, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +>>>>>>> Stashed changes "lg" = ( /obj/machinery/light/small{ dir = 4 @@ -3424,6 +3991,14 @@ color = "#c5bab2" }, /area/f13/building/abandoned/z) +<<<<<<< Updated upstream +======= +"lh" = ( +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "lj" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -3507,6 +4082,13 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +<<<<<<< Updated upstream +======= +"ls" = ( +/obj/structure/flora/wasteplant/wild_xander, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "lt" = ( /obj/machinery/light/fo13colored/Red{ dir = 4 @@ -3536,6 +4118,26 @@ "lw" = ( /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"lx" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor4-broken" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ly" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -3574,8 +4176,20 @@ /turf/open/transparent/openspace, /area/f13/wasteland) "lD" = ( +<<<<<<< Updated upstream /obj/machinery/space_heater, /turf/open/floor/f13/wood, +======= +/obj/effect/decal/fakelattice, +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrcorporal, +/turf/open/floor/f13/wood, +/area/f13/ncr) +"lE" = ( +/obj/structure/debris/v3, +/turf/closed/wall/mineral/brick, +>>>>>>> Stashed changes /area/f13/ncr) "lE" = ( /obj/effect/decal/fakelattice, @@ -3617,6 +4231,13 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"lJ" = ( +/obj/structure/flora/grass/coyote/thirteen, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "lK" = ( /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) @@ -3695,6 +4316,18 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"lY" = ( +/obj/structure/barricade/tentclothedge{ + dir = 8 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "lZ" = ( /obj/structure/falsewall/rust, /turf/open/floor/f13{ @@ -3746,10 +4379,17 @@ }, /area/f13/building/powered) "mg" = ( +<<<<<<< Updated upstream /turf/open/floor/wood_wide{ icon_state = "wide-broken1" }, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "mh" = ( /obj/machinery/door/window{ dir = 1 @@ -3760,10 +4400,30 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"mi" = ( +/obj/effect/decal/cleanable/generic, +/obj/item/book/granter/crafting_recipe/gunsmith_one, +/obj/item/book/granter/crafting_recipe/gunsmith_two, +/obj/item/book/granter/crafting_recipe/gunsmith_three, +/obj/item/book/granter/crafting_recipe/gunsmith_four, +/obj/structure/shelf_wood, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "mj" = ( /obj/machinery/vending/snack, /turf/open/floor/wood_common, /area/engine/workshop) +<<<<<<< Updated upstream +======= +"mk" = ( +/turf/open/floor/f13/wood{ + icon_state = "housebase4-broken" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ml" = ( /obj/effect/decal/remains/human, /obj/item/clothing/head/f13/enclave/peacekeeper, @@ -3791,6 +4451,15 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"mp" = ( +/turf/open/indestructible/ground/outside/dirt{ + dir = 9; + icon_state = "dirt" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "mq" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8 @@ -3828,6 +4497,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "mx" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "my" = ( @@ -3841,6 +4511,12 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +/obj/structure/table/wood/junk, +/obj/structure/bedsheetbin/empty, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "mz" = ( /obj/structure/curtain{ color = "#845f58"; @@ -3881,12 +4557,15 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +<<<<<<< Updated upstream "mD" = ( /turf/open/indestructible/ground/outside/dirt{ dir = 8; icon_state = "dirtcorner" }, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "mE" = ( /turf/open/transparent/openspace{ name = "air"; @@ -3904,6 +4583,7 @@ }, /turf/open/floor/carpet/red, /area/maintenance/bar) +<<<<<<< Updated upstream "mI" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -3928,6 +4608,8 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +>>>>>>> Stashed changes "mK" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/dirt, @@ -3963,11 +4645,20 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/brotherhood/offices1st) "mP" = ( +<<<<<<< Updated upstream /obj/structure/closet/locker, /turf/open/floor/f13/wood{ color = "#c5bab2" }, /area/f13/ncr) +======= +/obj/structure/obstacle/barbedwire{ + dir = 1 + }, +/obj/structure/barricade/sandbags, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "mQ" = ( /obj/structure/curtain{ color = "#845f58"; @@ -4004,10 +4695,17 @@ }, /area/f13/building/powered) "mW" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/dirt{ dir = 1; icon_state = "dirtcorner" }, +======= +/obj/structure/chair/bench{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/dirt, +>>>>>>> Stashed changes /area/f13/wasteland) "mX" = ( /obj/structure/weightmachine/stacklifter, @@ -4025,6 +4723,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite, /area/f13/ambientlighting/building/c) "mZ" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 1 }, @@ -4041,6 +4740,33 @@ /obj/structure/flora/branch, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -9 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirt" + }, +/area/f13/ambientlighting/building/u) +"nc" = ( +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/obj/item/grenade/smokebomb, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "nh" = ( /obj/effect/turf_decal/big{ dir = 1 @@ -4071,6 +4797,7 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "nm" = ( /obj/machinery/light/small/broken{ dir = 4 @@ -4084,6 +4811,22 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +"nl" = ( +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrtrooper, +/turf/open/floor/f13/wood, +/area/f13/ncr) +"nn" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/tentclothedge, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "no" = ( /obj/structure/fluff/railing{ dir = 4 @@ -4172,12 +4915,19 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "nF" = ( +<<<<<<< Updated upstream /obj/item/restraints/legcuffs/bola/tactical, /obj/effect/decal/cleanable/blood, /turf/open/floor/wood_wide{ icon_state = "wide-broken5" }, /area/f13/wasteland) +======= +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/plating/f13/outside/roof/metal/corrugated, +/area/f13/ncr) +>>>>>>> Stashed changes "nG" = ( /turf/open/floor/carpet/royalblack, /area/f13/clinic) @@ -4203,10 +4953,19 @@ /obj/structure/barricade/tentclothedge{ dir = 4 }, +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/dirt{ dir = 8; icon_state = "dirt" }, +======= +/turf/open/transparent/openspace, +/area/f13/wasteland) +"nL" = ( +/obj/structure/bed/wooden, +/obj/item/bedsheet/cult, +/turf/open/floor/wood_common/wood_common_dark, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/u) "nM" = ( /turf/closed/wall/f13/wood, @@ -4240,6 +4999,15 @@ }, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"nS" = ( +/obj/structure/fluff/railing{ + dir = 6 + }, +/turf/open/transparent/openspace, +/area/f13/wasteland) +>>>>>>> Stashed changes "nU" = ( /obj/effect/decal/cleanable/blood/gibs, /obj/structure/lattice, @@ -4265,6 +5033,7 @@ "nX" = ( /turf/open/indestructible, /area/f13/tcoms) +<<<<<<< Updated upstream "nZ" = ( /obj/structure/barricade/wooden, /obj/structure/simple_door/metal/dirtystore, @@ -4275,6 +5044,17 @@ icon_state = "wide-broken3" }, /area/f13/wasteland) +======= +"nY" = ( +/obj/structure/flora/ausbushes/grassybush, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +"nZ" = ( +/obj/structure/shelf_wood, +/obj/item/gun/ballistic/automatic/pistol/m1911/custom, +/turf/open/floor/wood_common, +/area/f13/brotherhood) +>>>>>>> Stashed changes "ob" = ( /obj/structure/curtain{ color = "#845f58"; @@ -4447,12 +5227,20 @@ /turf/open/floor/carpet/royalblack, /area/f13/clinic) "oA" = ( +<<<<<<< Updated upstream /obj/structure/closet/crate/footlocker, /obj/item/reagent_containers/hypospray/medipen/stimpak, /obj/item/reagent_containers/hypospray/medipen/stimpak, /obj/effect/spawner/lootdrop/f13/cash_random_med, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ambientlighting/building/u) +======= +/obj/structure/barricade/wooden, +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "oB" = ( /obj/machinery/autolathe, /obj/machinery/light{ @@ -4524,12 +5312,15 @@ dir = 6 }, /area/f13/building/powered) +<<<<<<< Updated upstream "oL" = ( /obj/structure/bed/old, /turf/open/floor/wood_wide{ icon_state = "wide-broken1" }, /area/f13/ambientlighting/building/j) +======= +>>>>>>> Stashed changes "oM" = ( /obj/structure/wreck/trash/machinepile, /obj/machinery/light/fo13colored/Red{ @@ -4582,6 +5373,12 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"oT" = ( +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) +>>>>>>> Stashed changes "oU" = ( /obj/structure/window/fulltile/house{ opacity = 1 @@ -4660,6 +5457,7 @@ /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland) "pg" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -4673,6 +5471,12 @@ pixel_x = 16 }, /turf/open/indestructible/ground/outside/desert, +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/indestructible/ground/inside/mountain, +>>>>>>> Stashed changes /area/f13/wasteland) "ph" = ( /obj/structure/table, @@ -4795,12 +5599,29 @@ /turf/open/floor/wood_wide/wood_wide_light, /area/engine/workshop) "px" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 4 }, /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1" + }, +/area/f13/wasteland) +"py" = ( +/obj/structure/simple_door/tent, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "pz" = ( /obj/item/kirbyplants/random, /turf/open/floor/f13{ @@ -5073,12 +5894,18 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "qo" = ( +<<<<<<< Updated upstream /obj/item/bedsheet/blanket, /obj/structure/bed, /obj/effect/landmark/start/f13/ncrtrooper, /obj/effect/landmark/start/f13/ncrtrooper, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +/obj/item/clothing/under/f13/housewifedress50s, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "qq" = ( /turf/open/floor/plating, /area/engine/workshop) @@ -5126,6 +5953,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite, /area/f13/building/powered) "qy" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -5135,6 +5963,12 @@ /turf/open/floor/f13/wood{ icon_state = "oakfloor1" }, +======= +/turf/open/indestructible/ground/outside/dirt{ + dir = 10; + icon_state = "dirt" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "qz" = ( /obj/structure/table/glass, @@ -5180,6 +6014,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"qG" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1-broken" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "qH" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -5193,6 +6041,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"qJ" = ( +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "qK" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -5218,9 +6072,14 @@ /turf/open/floor/carpet/purple, /area/f13/building/powered) "qN" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +/turf/open/floor/plating/f13/outside/roof/red, +/area/f13/wasteland) +>>>>>>> Stashed changes "qP" = ( /obj/structure/chair/comfy/black{ dir = 1 @@ -5251,10 +6110,13 @@ /obj/structure/wreck/trash/machinepiletwo, /turf/open/floor/wood_fancy, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream "qT" = ( /obj/effect/decal/fakelattice, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +>>>>>>> Stashed changes "qU" = ( /obj/structure/railing{ dir = 10 @@ -5446,6 +6308,13 @@ /obj/item/storage/toolbox/electrical, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"rw" = ( +/obj/item/reagent_containers/glass/bucket, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "rx" = ( /obj/structure/curtain{ color = "#845f58"; @@ -5504,6 +6373,7 @@ /obj/effect/decal/cleanable/dirt{ color = "000000" }, +<<<<<<< Updated upstream /turf/closed/indestructible/rock{ desc = "A pre-War wall made of solid concrete."; icon = 'icons/turf/walls/f13store.dmi'; @@ -5519,6 +6389,15 @@ }, /turf/open/transparent/openspace, /area/f13/brotherhood/offices1st) +======= +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/brotherhood) +"rJ" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/f13/weapon/melee/random_high, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "rK" = ( /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) @@ -5621,11 +6500,14 @@ "sa" = ( /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/underground/mountain) +<<<<<<< Updated upstream "sc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +>>>>>>> Stashed changes "sd" = ( /obj/structure/chair/office{ dir = 8 @@ -5666,6 +6548,7 @@ }, /turf/open/floor/plating, /area/engine/workshop) +<<<<<<< Updated upstream "sj" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -5679,6 +6562,12 @@ pixel_y = 18 }, /turf/open/indestructible/ground/outside/desert, +======= +"si" = ( +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "sl" = ( /obj/effect/spawner/lootdrop/trash, @@ -5744,6 +6633,13 @@ /obj/item/reagent_containers/hypospray/medipen/stimpak, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"su" = ( +/obj/structure/flora/grass/coyote/six, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "sv" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/supermutant/nightkin/rangedmutant, @@ -6006,10 +6902,17 @@ /turf/open/floor/plating/f13/outside/roof/metal/corrugated/green, /area/f13/wasteland) "tk" = ( +<<<<<<< Updated upstream /turf/open/floor/f13/wood{ color = "#c5bab2" }, /area/f13/ncr) +======= +/obj/structure/shelf_wood, +/obj/effect/spawner/lootdrop/f13/weapon/melee/random_high, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "tl" = ( /obj/structure/table/reinforced, /obj/item/locked_box/medical, @@ -6030,6 +6933,7 @@ /obj/structure/bed/old, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream "to" = ( /obj/structure/chair/stool/retro/black, /obj/effect/landmark/start/f13/ncrranger, @@ -6037,6 +6941,8 @@ color = "#c5bab2" }, /area/f13/ncr) +======= +>>>>>>> Stashed changes "tp" = ( /mob/living/simple_animal/hostile/securitron/sentrybot, /obj/machinery/light/fo13colored/Red{ @@ -6053,9 +6959,21 @@ /turf/closed/wall/f13/wood/house, /area/maintenance/bar) "ts" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/chair/bench{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +"tt" = ( +/obj/structure/flora/tree/joshua, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "tu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/destructible/tribal_torch/wall/lit{ @@ -6116,10 +7034,13 @@ icon_state = "floordirty" }, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream "tD" = ( /obj/structure/sink/puddle, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "tE" = ( /obj/effect/decal/cleanable/blood/splatter, /mob/living/simple_animal/hostile/radroach, @@ -6303,6 +7224,17 @@ icon_state = "greenrustyfull" }, /area/f13/followers) +<<<<<<< Updated upstream +======= +"ug" = ( +/obj/effect/decal/fakelattice, +/obj/effect/turf_decal/weather/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "uh" = ( /obj/machinery/pool/drain, /obj/effect/decal/cleanable/dirt, @@ -6498,6 +7430,21 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"uI" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/wasteland) +"uJ" = ( +/obj/structure/fluff/railing{ + dir = 10 + }, +/turf/open/transparent/openspace, +/area/f13/wasteland) +>>>>>>> Stashed changes "uK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/wood, @@ -6532,6 +7479,7 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "uQ" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -6552,6 +7500,11 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +/obj/structure/sink/puddle, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "uS" = ( /obj/item/storage/toolbox/mechanical/old, /obj/effect/decal/cleanable/dirt, @@ -6661,9 +7614,14 @@ /turf/open/floor/carpet/black, /area/maintenance/bar) "vd" = ( +<<<<<<< Updated upstream /turf/open/floor/f13/wood{ icon_state = "oakfloor4-broken" }, +======= +/obj/structure/closet/crate/large, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "ve" = ( /obj/structure/table/reinforced, @@ -6727,9 +7685,17 @@ }, /area/f13/bar) "vo" = ( +<<<<<<< Updated upstream /obj/structure/closet/crate/footlocker, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +/obj/effect/decal/cleanable/generic{ + name = "scratch marks" + }, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "vp" = ( /obj/structure/table, /obj/item/stack/crafting/electronicparts, @@ -6746,6 +7712,7 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +<<<<<<< Updated upstream "vu" = ( /obj/structure/barricade/wooden, /obj/structure/simple_door/tent, @@ -6753,6 +7720,15 @@ /turf/open/floor/wood_wide{ icon_state = "wide-broken3" }, +======= +"vt" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland) +"vu" = ( +/turf/open/transparent/openspace, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "vv" = ( /obj/machinery/light/fo13colored/Red{ @@ -6807,6 +7783,16 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) +<<<<<<< Updated upstream +======= +"vC" = ( +/obj/structure/table/wood/junk, +/obj/item/clothing/glasses/fakeblindfold, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "vD" = ( /obj/machinery/light/fo13colored/Red, /obj/effect/decal/cleanable/blood/old, @@ -6857,12 +7843,15 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "vJ" = ( /obj/item/cane, /turf/open/floor/wood_wide{ icon_state = "wide-broken3" }, /area/f13/ambientlighting/building/j) +======= +>>>>>>> Stashed changes "vK" = ( /obj/structure/window/fulltile/house/broken, /obj/structure/barricade/wooden/planks/pregame, @@ -6985,6 +7974,7 @@ }, /turf/open/floor/mineral/titanium/white, /area/f13/clinic) +<<<<<<< Updated upstream "wc" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -6995,6 +7985,8 @@ /obj/structure/flora/branch_broken, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "we" = ( /obj/structure/table, /obj/structure/railing/dancing_pole{ @@ -7219,6 +8211,7 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "wL" = ( +<<<<<<< Updated upstream /obj/structure/barricade/concrete, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) @@ -7236,6 +8229,11 @@ color = "#c5bab2" }, /area/f13/ncr) +======= +/obj/item/cultivator/rake, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "wO" = ( /obj/item/storage/trash_stack, /obj/effect/decal/cleanable/dirt, @@ -7246,6 +8244,24 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"wP" = ( +/obj/structure/barricade/tentclothedge{ + dir = 4 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/obj/structure/barricade/tentclothedge{ + dir = 4; + pixel_x = 15; + pixel_y = 12; + layer = 5 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "wQ" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -7348,6 +8364,7 @@ dir = 8 }, /area/f13/building/powered) +<<<<<<< Updated upstream "xg" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -7360,12 +8377,22 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +"xf" = ( +/obj/effect/decal/remains/xeno{ + desc = "They look like the remains of...A horse?"; + name = "animal remains" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "xh" = ( /obj/structure/railing{ dir = 5 }, /turf/open/transparent/openspace, /area/f13/ambientlighting/building/p) +<<<<<<< Updated upstream "xj" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -7381,6 +8408,12 @@ /obj/item/bedsheet/cult, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ambientlighting/building/u) +======= +"xk" = ( +/obj/structure/chair/stool/retro/tan, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "xl" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/advcrafting, @@ -7558,6 +8591,15 @@ icon_state = "bluerustysolid" }, /area/f13/followers) +<<<<<<< Updated upstream +======= +"xL" = ( +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirt" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "xM" = ( /turf/closed/wall/f13/wood/interior, /area/f13/clinic) @@ -7588,6 +8630,15 @@ }, /turf/open/floor/plating, /area/f13/bar) +<<<<<<< Updated upstream +======= +"xS" = ( +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrcorporal, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "xT" = ( /obj/structure/simple_door/house/clean, /turf/open/floor/wood_fancy, @@ -7609,9 +8660,19 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +<<<<<<< Updated upstream "xX" = ( /turf/closed/mineral/random/low_chance, /area/f13/caves) +======= +"xW" = ( +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "xY" = ( /obj/machinery/photocopier, /turf/open/floor/f13{ @@ -7626,6 +8687,12 @@ /obj/structure/barricade/bars, /turf/open/floor/f13/wood, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"yc" = ( +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland) +>>>>>>> Stashed changes "yd" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/handy/robobrain/nsb, @@ -7766,6 +8833,7 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +<<<<<<< Updated upstream "yA" = ( /obj/structure/chair/stool/retro/tan, /obj/effect/landmark/start/f13/ncrranger, @@ -7773,6 +8841,8 @@ color = "#c5bab2" }, /area/f13/ncr) +======= +>>>>>>> Stashed changes "yB" = ( /obj/machinery/light/small{ dir = 4; @@ -7861,6 +8931,21 @@ dir = 1 }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"yN" = ( +/turf/open/indestructible/ground/outside/ruins{ + icon_state = "rubbleplate" + }, +/area/f13/wasteland) +"yO" = ( +/obj/structure/chair/stool/retro/tan, +/obj/effect/landmark/start/f13/ncrranger, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "yP" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/remains/human, @@ -7973,6 +9058,15 @@ /obj/item/kirbyplants/random, /turf/open/floor/plasteel/f13, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"zf" = ( +/obj/structure/shelf_wood, +/obj/item/book/random, +/obj/item/book/random, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "zg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, @@ -8183,6 +9277,16 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"zQ" = ( +/obj/structure/flora/wasteplant/wild_broc, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"zR" = ( +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "zS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/sofa/corp{ @@ -8201,9 +9305,19 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) "zU" = ( +<<<<<<< Updated upstream /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/melee/random_high, /turf/open/floor/wood_common/wood_common_dark, +======= +/obj/structure/barricade/tentclothedge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt"; + dir = 4 + }, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/u) "zV" = ( /obj/structure/rack/shelf_metal, @@ -8312,12 +9426,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, /area/maintenance/bar) +<<<<<<< Updated upstream "Ak" = ( /obj/structure/bed/mattress{ icon_state = "mattress3" }, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +"Aj" = ( +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins{ + dir = 5; + icon_state = "rubbleplate" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Al" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ @@ -8354,9 +9478,16 @@ }, /area/f13/building/powered) "Aq" = ( +<<<<<<< Updated upstream /obj/structure/flora/ausbushes/ywflowers, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +======= +/obj/structure/rack, +/obj/item/binoculars, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "Ar" = ( /obj/structure/railing{ dir = 1 @@ -8368,6 +9499,7 @@ /turf/open/transparent/openspace, /area/f13/wasteland) "As" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -8377,10 +9509,24 @@ /turf/open/floor/f13/wood{ icon_state = "oakfloor3-broken" }, +======= +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "At" = ( /turf/open/floor/plasteel/f13, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"Au" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress3" + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "Av" = ( /obj/item/clothing/head/f13/enclave/peacekeeper, /obj/effect/decal/cleanable/dirt, @@ -8451,6 +9597,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite, /area/f13/brotherhood/offices1st) "AF" = ( +<<<<<<< Updated upstream /obj/structure/shelf_wood, /obj/effect/spawner/lootdrop/f13/weapon/melee/random_high, /turf/open/indestructible/ground/inside/mountain, @@ -8463,6 +9610,16 @@ /obj/item/grenade/smokebomb, /turf/open/floor/wood_wide, /area/f13/wasteland) +======= +/obj/structure/barricade/tentclothcorner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirt" + }, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "AH" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/f13{ @@ -8472,6 +9629,7 @@ }, /area/f13/building/powered) "AI" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -8482,6 +9640,12 @@ icon_state = "oakfloor1" }, /area/f13/wasteland) +======= +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "AK" = ( /turf/open/floor/wood_wide, /area/f13/legioncamp) @@ -8501,10 +9665,16 @@ }, /area/f13/followers) "AP" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +/obj/structure/flora/branch, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "AR" = ( /obj/structure/debris/v3, /obj/effect/decal/cleanable/blood/splatter, @@ -8537,8 +9707,13 @@ }, /area/f13/building/powered) "AV" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/cobweb, /turf/open/transparent/openspace, +======= +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/f13/wood, +>>>>>>> Stashed changes /area/f13/ncr) "AW" = ( /obj/structure/table, @@ -8550,11 +9725,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, /area/maintenance/bar) +<<<<<<< Updated upstream "AZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/ash, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +>>>>>>> Stashed changes "Ba" = ( /obj/structure/falsewall/rust, /turf/open/floor/plating/rust, @@ -8677,6 +9855,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, /area/f13/building/powered) +<<<<<<< Updated upstream "Bu" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -8688,6 +9867,8 @@ icon_state = "oakfloor1" }, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "Bv" = ( /obj/structure/table, /obj/machinery/cell_charger{ @@ -8743,6 +9924,7 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +<<<<<<< Updated upstream "BE" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -8754,6 +9936,14 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +"BD" = ( +/obj/effect/decal/fakelattice, +/obj/structure/closet/crate/footlocker, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "BF" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3, @@ -8881,11 +10071,14 @@ "BU" = ( /turf/open/floor/wood_common, /area/f13/building/abandoned/m) +<<<<<<< Updated upstream "BV" = ( /obj/structure/closet/crate/footlocker, /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +>>>>>>> Stashed changes "BW" = ( /obj/structure/barricade/wooden/planks/pregame, /turf/closed/wall/mineral/wood, @@ -8895,6 +10088,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream "BY" = ( /obj/effect/decal/cleanable/robot_debris, /obj/effect/decal/cleanable/dirt{ @@ -8919,6 +10113,8 @@ /obj/structure/railing, /turf/open/transparent/openspace, /area/f13/brotherhood/offices1st) +======= +>>>>>>> Stashed changes "Cb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -8970,6 +10166,7 @@ /obj/item/bedsheet/ce, /turf/open/floor/wood_wide/wood_wide_light, /area/engine/workshop) +<<<<<<< Updated upstream "Ci" = ( /obj/structure/railing/corner{ dir = 8 @@ -8982,6 +10179,8 @@ icon_state = "dirt" }, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "Ck" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/f13/wood/house, @@ -9223,11 +10422,17 @@ /turf/closed/wall/f13/wood/house, /area/f13/legioncamp) "CX" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /turf/open/floor/wood_wide{ icon_state = "wide-broken3" }, /area/f13/wasteland) +======= +/obj/structure/closet/crate/footlocker, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "CY" = ( /obj/structure/table/wood/settler, /obj/item/storage/belt/fannypack/pink, @@ -9250,6 +10455,20 @@ dir = 1 }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Db" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor4-broken" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Dc" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -9400,6 +10619,15 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Dx" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Dz" = ( /obj/machinery/light{ dir = 1; @@ -9421,12 +10649,20 @@ }, /area/f13/building/powered) "DD" = ( +<<<<<<< Updated upstream /obj/effect/decal/fakelattice, /obj/item/bedsheet/blanket, /obj/structure/bed, /obj/effect/landmark/start/f13/ncrcorporal, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +/obj/structure/fluff/railing{ + dir = 9 + }, +/turf/open/transparent/openspace, +/area/f13/wasteland) +>>>>>>> Stashed changes "DE" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/lattice, @@ -9521,6 +10757,7 @@ /obj/structure/sign/directions/security, /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) +<<<<<<< Updated upstream "DW" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -9532,6 +10769,8 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +>>>>>>> Stashed changes "DY" = ( /obj/structure/reagent_dispensers/barrel/four, /obj/effect/decal/cleanable/dirt, @@ -9559,6 +10798,7 @@ }, /turf/open/transparent/openspace, /area/f13/building/powered) +<<<<<<< Updated upstream "Ed" = ( /obj/structure/fluff/railing{ dir = 6 @@ -9576,6 +10816,8 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +>>>>>>> Stashed changes "Ef" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/low, @@ -9760,9 +11002,18 @@ }, /area/f13/legioncamp) "EF" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +/obj/structure/chair/stool/retro/black, +/obj/effect/landmark/start/f13/ncrranger, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "EG" = ( /obj/structure/table/wood, /obj/item/clothing/shoes/f13/jamrock, @@ -10093,6 +11344,14 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"FG" = ( +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "FH" = ( /obj/effect/landmark/poster_spawner/pinup, /turf/closed/indestructible/rock{ @@ -10122,10 +11381,17 @@ }, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream "FL" = ( /obj/item/grown/log/tree, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"FM" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/open/transparent/openspace, +/area/f13/ncr) +>>>>>>> Stashed changes "FN" = ( /obj/structure/bed, /obj/item/bedsheet/centcom, @@ -10197,6 +11463,29 @@ /obj/machinery/microwave/stove, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) +<<<<<<< Updated upstream +======= +"Ga" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"Gb" = ( +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirt" + }, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "Gc" = ( /obj/structure/mirror{ pixel_x = 32 @@ -10235,6 +11524,7 @@ }, /area/f13/brotherhood/offices1st) "Gf" = ( +<<<<<<< Updated upstream /turf/open/floor/f13/wood{ icon_state = "oakfloor1" }, @@ -10256,6 +11546,17 @@ dir = 5 }, /turf/open/indestructible/ground/outside/desert, +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/floor/f13/wood{ + icon_state = "housebase" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "Gj" = ( /obj/structure/table/wood, @@ -10263,6 +11564,7 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "Gk" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -10280,18 +11582,27 @@ icon_state = "dirt" }, /area/f13/ambientlighting/building/u) +======= +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "Gl" = ( /obj/structure/railing{ dir = 1 }, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/wasteland) +<<<<<<< Updated upstream "Gm" = ( /obj/structure/junk/small/bed, /turf/open/floor/wood_wide{ icon_state = "wide-broken5" }, /area/f13/ambientlighting/building/j) +======= +>>>>>>> Stashed changes "Gn" = ( /obj/machinery/vending/snack, /turf/open/floor/plating/rust, @@ -10313,6 +11624,14 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Gq" = ( +/turf/open/floor/f13/wood{ + icon_state = "oakfloor4-broken" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Gr" = ( /obj/effect/turf_decal/stripes/white/corner{ dir = 4 @@ -10439,6 +11758,18 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"GG" = ( +/obj/structure/barricade/tentclothedge{ + pixel_y = -4 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "GH" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/handy/gutsy/flamer, @@ -10489,12 +11820,18 @@ }, /area/f13/building/powered) "GQ" = ( +<<<<<<< Updated upstream /obj/structure/table/wood/junk, /obj/item/clothing/glasses/fakeblindfold, /turf/open/floor/wood_wide{ icon_state = "wide-broken5" }, /area/f13/ambientlighting/building/j) +======= +/obj/machinery/smartfridge/bottlerack/seedbin/primitive, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "GR" = ( /obj/machinery/light/fo13colored/Red{ dir = 8 @@ -10565,12 +11902,15 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +<<<<<<< Updated upstream "Ha" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 }, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +>>>>>>> Stashed changes "Hb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -10681,8 +12021,13 @@ }, /area/f13/building/powered) "Hs" = ( +<<<<<<< Updated upstream /obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/dirt, +======= +/obj/effect/decal/cleanable/dirt, +/obj/machinery/space_heater, +>>>>>>> Stashed changes /turf/open/floor/f13/wood, /area/f13/ncr) "Ht" = ( @@ -10888,10 +12233,21 @@ }, /area/f13/building/powered) "HX" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 6 }, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/obj/structure/flora/branch_broken, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "HY" = ( /obj/structure/closet/cabinet, @@ -10916,9 +12272,12 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "Ib" = ( /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +>>>>>>> Stashed changes "Ic" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/drip, @@ -10990,6 +12349,19 @@ /obj/item/gun/energy/laser/plasma/glock, /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Ip" = ( +/obj/effect/decal/cleanable/blood{ + dir = 9; + icon_state = "tracks"; + pixel_y = 8 + }, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Iq" = ( /obj/structure/reagent_dispensers/barrel/explosive, /obj/effect/decal/cleanable/greenglow, @@ -11016,10 +12388,17 @@ /obj/structure/dresser, /turf/open/floor/carpet/cyan, /area/maintenance/bar) +<<<<<<< Updated upstream "It" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, /turf/closed/mineral/random/low_chance, +======= +"Iu" = ( +/obj/structure/shelf_wood, +/obj/effect/spawner/lootdrop/f13/cash_random_high, +/turf/open/indestructible/ground/inside/mountain, +>>>>>>> Stashed changes /area/f13/caves) "Iv" = ( /obj/structure/lattice, @@ -11131,12 +12510,15 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "IM" = ( /turf/open/indestructible/ground/outside/dirt{ dir = 4; icon_state = "dirt" }, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "IN" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/securitron/sentrybot, @@ -11256,10 +12638,13 @@ }, /turf/open/floor/wood_wide, /area/f13/followers) +<<<<<<< Updated upstream "Je" = ( /obj/structure/debris/v3, /turf/closed/wall/mineral/brick, /area/f13/ncr) +======= +>>>>>>> Stashed changes "Jf" = ( /obj/item/card/id/rusted/brokenholodog/enclave, /obj/effect/decal/cleanable/dirt, @@ -11289,6 +12674,17 @@ /obj/structure/table, /turf/open/floor/wood_fancy, /area/f13/clinic) +<<<<<<< Updated upstream +======= +"Jl" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Veteran Ranger's Lodging" + }, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "Jm" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -11344,6 +12740,16 @@ icon_state = "floordirty" }, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream +======= +"Ju" = ( +/obj/structure/closet/crate/footlocker, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/effect/spawner/lootdrop/f13/cash_random_med, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "Jw" = ( /obj/item/storage/bag/money/small, /obj/effect/decal/cleanable/dirt, @@ -11390,8 +12796,14 @@ /turf/open/floor/carpet/royalblack, /area/f13/clinic) "JD" = ( +<<<<<<< Updated upstream /turf/open/floor/wood_common/wood_common_dark, /area/f13/ambientlighting/building/u) +======= +/obj/effect/landmark/start/f13/ncrsergeant, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "JF" = ( /obj/structure/closet/cabinet/anchored, /obj/item/clothing/under/f13/cowboyg, @@ -11510,6 +12922,15 @@ /obj/structure/window/fulltile/house, /turf/open/indestructible/ground/outside/desert, /area/f13/building/abandoned/m) +<<<<<<< Updated upstream +======= +"JW" = ( +/obj/structure/barricade/wooden, +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "JX" = ( /obj/item/pizzabox/meat, /obj/effect/decal/cleanable/dirt, @@ -11577,6 +12998,15 @@ dir = 1 }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Kj" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/twig4, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "Kk" = ( /obj/structure/decoration/clock/old/active{ pixel_y = 28 @@ -11616,6 +13046,13 @@ "Kq" = ( /turf/open/transparent/openspace, /area/f13/ambientlighting/building/d) +<<<<<<< Updated upstream +======= +"Kr" = ( +/mob/living/simple_animal/hostile/renegade/drifter, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "Ks" = ( /obj/structure/lattice/catwalk, /obj/structure/chair/stool{ @@ -11707,10 +13144,18 @@ }, /area/f13/building/powered) "KJ" = ( +<<<<<<< Updated upstream /obj/structure/simple_door/tent, /obj/structure/barricade/wooden/planks/pregame, /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/ruins, +======= +/obj/effect/decal/cleanable/generic{ + name = "scratch marks" + }, +/obj/machinery/light, +/turf/open/floor/wood_wide, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "KK" = ( /obj/effect/decal/cleanable/dirt, @@ -11732,11 +13177,17 @@ /turf/open/floor/mineral/titanium/white, /area/f13/clinic) "KN" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /obj/structure/simple_door/tent, /obj/structure/barricade/wooden/planks/pregame, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "KO" = ( /turf/open/floor/f13{ icon_state = "greenrustyfull" @@ -11807,6 +13258,7 @@ dir = 8 }, /area/f13/building/powered) +<<<<<<< Updated upstream "La" = ( /obj/structure/table/booth, /obj/item/flashlight/lamp/green{ @@ -11817,6 +13269,8 @@ color = "#c5bab2" }, /area/f13/ncr) +======= +>>>>>>> Stashed changes "Lb" = ( /obj/structure/simple_door/house, /turf/open/floor/wood_common/wood_common_light, @@ -11968,10 +13422,16 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "Lx" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/machinery/space_heater, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "Ly" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/effect/decal/cleanable/dirt, @@ -12005,6 +13465,17 @@ }, /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"LD" = ( +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "LE" = ( /turf/open/transparent/openspace, /area/f13/underground/cave) @@ -12073,6 +13544,15 @@ /obj/machinery/photocopier, /turf/open/floor/carpet/royalblack, /area/f13/clinic) +<<<<<<< Updated upstream +======= +"LO" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "LQ" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/splatter, @@ -12119,6 +13599,7 @@ icon_state = "bluerustysolid" }, /area/f13/followers) +<<<<<<< Updated upstream "LW" = ( /obj/structure/simple_door/tentflap_cloth{ pixel_y = -3 @@ -12128,6 +13609,8 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ambientlighting/building/u) +======= +>>>>>>> Stashed changes "LX" = ( /obj/structure/chair/booth{ icon_state = "booth_east_south" @@ -12137,6 +13620,13 @@ "LY" = ( /turf/open/floor/plating/f13/outside/roof, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"LZ" = ( +/obj/structure/flora/brushwood, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "Ma" = ( /obj/machinery/light, /turf/open/floor/plasteel/f13/vault_floor/red/white/whiteredchess, @@ -12167,6 +13657,14 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Mg" = ( +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Mh" = ( /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/food/drinks/bottle/fernet{ @@ -12186,11 +13684,21 @@ /obj/structure/fluff/railing/corner, /turf/open/floor/plating/f13/outside/roof/metal/corrugated/green, /area/f13/wasteland) +<<<<<<< Updated upstream "Ml" = ( /obj/structure/table/wood/junk, /obj/item/pizzabox/bomb, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +"Mk" = ( +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/j) +"Ml" = ( +/obj/structure/destructible/tribal_torch/wall/lit, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/brotherhood) +>>>>>>> Stashed changes "Mn" = ( /obj/structure/table/reinforced, /obj/item/locked_box/weapon/melee/tier3, @@ -12286,6 +13794,7 @@ }, /area/f13/building/powered) "MF" = ( +<<<<<<< Updated upstream /obj/structure/barricade/tentclothcorner{ dir = 4 }, @@ -12294,6 +13803,18 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ambientlighting/building/u) +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1-broken" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "MG" = ( /obj/structure/dresser, /turf/open/floor/carpet/black, @@ -12345,6 +13866,18 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"MP" = ( +/obj/structure/simple_door/tentflap_cloth{ + pixel_y = -3 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "MQ" = ( /obj/structure/railing{ color = "#A47449"; @@ -12391,6 +13924,7 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "MY" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -12402,6 +13936,8 @@ icon_state = "housebase" }, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "MZ" = ( /obj/structure/barricade/sandbags, /obj/effect/decal/cleanable/dirt, @@ -12425,6 +13961,7 @@ "Nd" = ( /turf/open/floor/carpet/blue, /area/f13/followers) +<<<<<<< Updated upstream "Ne" = ( /obj/structure/closet/crate/footlocker{ anchored = 1 @@ -12437,6 +13974,20 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +"Nf" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 10; + icon_state = "dirt" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Ng" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/simple_door/interior, @@ -12512,6 +14063,13 @@ }, /turf/open/floor/wood_common, /area/f13/followers) +<<<<<<< Updated upstream +======= +"Nt" = ( +/obj/structure/fluff/railing, +/turf/open/floor/plating/f13/outside/roof/metal/corrugated, +/area/f13/wasteland) +>>>>>>> Stashed changes "Nu" = ( /turf/open/floor/mineral/titanium/white, /area/f13/clinic) @@ -12538,10 +14096,21 @@ }, /area/f13/building/powered) "Ny" = ( +<<<<<<< Updated upstream /obj/item/bedsheet/blanket, /obj/structure/bed, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +/obj/structure/barricade/tentclothcorner{ + dir = 4 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 5 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "Nz" = ( /obj/effect/decal/cleanable/oil/streak, /obj/structure/simple_door/bunker, @@ -12552,8 +14121,16 @@ }, /area/f13/brotherhood/offices1st) "NA" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 4 +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 +>>>>>>> Stashed changes }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) @@ -12603,10 +14180,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/maintenance/bar) +<<<<<<< Updated upstream "NM" = ( /obj/structure/flora/wasteplant/wild_broc, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"NL" = ( +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "NN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite, @@ -12617,9 +14202,17 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "NP" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, /obj/structure/barricade/tentclothedge, +======= +/obj/item/bedsheet/blanket/blanketalt{ + layer = -7 + }, +/obj/structure/bed/wooden, +/obj/effect/overlay/junk/curtain, +>>>>>>> Stashed changes /turf/open/floor/f13/wood{ color = "#c5bab2" }, @@ -12670,6 +14263,7 @@ dir = 8 }, /area/f13/building/powered) +<<<<<<< Updated upstream "NY" = ( /obj/effect/decal/fakelattice, /obj/item/bedsheet/blanket, @@ -12678,6 +14272,8 @@ /obj/effect/landmark/start/f13/ncrtrooper, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +>>>>>>> Stashed changes "NZ" = ( /obj/machinery/light/broken{ dir = 8 @@ -12769,6 +14365,25 @@ icon_state = "common-broken3" }, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"Ol" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/f13/ncrspecialist, +/turf/open/floor/f13/wood, +/area/f13/ncr) +"On" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor3-broken" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Oo" = ( /obj/structure/railing{ color = "#A47449" @@ -12798,8 +14413,15 @@ }, /area/f13/building/powered) "Ot" = ( +<<<<<<< Updated upstream /mob/living/simple_animal/hostile/renegade/drifter, /turf/open/floor/wood_wide, +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "Ou" = ( /obj/structure/window/fulltile/house, @@ -12962,10 +14584,27 @@ /obj/machinery/hydroponics/soil/pot, /turf/open/floor/wood_common, /area/engine/workshop) +<<<<<<< Updated upstream +======= +"OS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "OT" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"OU" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "OV" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/brute, @@ -12979,10 +14618,14 @@ }, /area/f13/building/powered) "OW" = ( +<<<<<<< Updated upstream /obj/effect/decal/remains/xeno{ desc = "They look like the remains of...A horse?"; name = "animal remains" }, +======= +/obj/structure/flora/wasteplant/wild_yucca, +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "OX" = ( @@ -13001,6 +14644,14 @@ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream +======= +"Pb" = ( +/obj/structure/table/wood/junk, +/obj/item/pizzabox/bomb, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "Pc" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plasteel/f13/vault_floor/blue/side{ @@ -13059,12 +14710,29 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"Pl" = ( +/obj/structure/lattice/catwalk, +/obj/item/mine/stun, +/turf/open/transparent/openspace, +/area/f13/wasteland) +>>>>>>> Stashed changes "Pm" = ( /obj/structure/window/fulltile/store{ icon_state = "ruinswindowvertical" }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/p) +<<<<<<< Updated upstream +======= +"Po" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Pp" = ( /obj/machinery/vending/nukacolavendfull{ force_free = 1 @@ -13109,6 +14777,7 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "Pu" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -13129,6 +14798,19 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +"Pv" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/floor/f13/wood{ + icon_state = "oakfloor1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Pw" = ( /obj/effect/landmark/poster_spawner/pinup, /turf/closed/indestructible/f13vaultrusted, @@ -13194,6 +14876,17 @@ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/m) +<<<<<<< Updated upstream +======= +"PI" = ( +/obj/structure/lattice/catwalk, +/obj/item/grenade/syndieminibomb/concussion/frag, +/obj/structure/obstacle/barbedwire{ + dir = 8 + }, +/turf/open/transparent/openspace, +/area/f13/wasteland) +>>>>>>> Stashed changes "PJ" = ( /obj/structure/toilet{ pixel_y = 10 @@ -13307,6 +15000,17 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"PY" = ( +/obj/machinery/smartfridge/bottlerack, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/f13/wood{ + color = "#c5bab2" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "Qa" = ( /obj/machinery/light/fo13colored/Red, /obj/effect/decal/cleanable/dirt, @@ -13556,9 +15260,13 @@ }, /area/f13/building/powered) "QI" = ( +<<<<<<< Updated upstream /obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/dirt, /obj/structure/flora/twig4, +======= +/obj/machinery/space_heater, +>>>>>>> Stashed changes /turf/open/floor/f13/wood, /area/f13/ncr) "QJ" = ( @@ -13701,6 +15409,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"Rg" = ( +/obj/structure/reagent_dispensers/compostbin, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "Rh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, @@ -13777,6 +15492,7 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "Rt" = ( /obj/structure/debris/v3{ pixel_x = -15; @@ -13795,6 +15511,15 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +"Rs" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "Rv" = ( /obj/structure/simple_door/bunker, /turf/open/floor/carpet/royalblue, @@ -13825,6 +15550,13 @@ }, /turf/open/floor/f13/wood, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"RB" = ( +/obj/effect/decal/fakelattice, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "RC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/circuit/f13_blue, @@ -13845,9 +15577,19 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "RE" = ( +<<<<<<< Updated upstream /obj/structure/closet/crate/large, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/effect/decal/fakelattice, +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrtrooper, +/obj/effect/landmark/start/f13/ncrtrooper, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "RF" = ( /mob/living/simple_animal/hostile/handy, /turf/open/floor/f13{ @@ -13959,6 +15701,13 @@ /obj/structure/debris/v2, /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"RS" = ( +/obj/structure/flora/wasteplant/fever_blossom, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "RT" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/sweater/turtleskirt/blackpink, @@ -14054,6 +15803,15 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Sg" = ( +/obj/structure/junk/small/bed, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "Sh" = ( /obj/structure/fireplace, /obj/effect/decal/cleanable/dirt, @@ -14065,6 +15823,13 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/e) +<<<<<<< Updated upstream +======= +"Sj" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "Sk" = ( /obj/machinery/light/small{ dir = 4; @@ -14085,10 +15850,19 @@ /obj/machinery/light, /turf/open/floor/wood_wide/wood_wide_light, /area/engine/workshop) +<<<<<<< Updated upstream "Sn" = ( /obj/structure/fluff/railing, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/wasteland) +======= +"So" = ( +/obj/structure/simple_door/tentflap_cloth{ + pixel_y = -3 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "Sq" = ( /obj/structure/marker_beacon, /turf/open/floor/plasteel/f13, @@ -14137,6 +15911,7 @@ /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) "Sy" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -14152,6 +15927,9 @@ /turf/open/floor/f13/wood{ icon_state = "oakfloor4-broken" }, +======= +/turf/closed/wall/f13/ruins, +>>>>>>> Stashed changes /area/f13/wasteland) "Sz" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -14164,6 +15942,7 @@ /turf/open/floor/wood_common, /area/f13/followers) "SC" = ( +<<<<<<< Updated upstream /obj/item/mine/stun, /turf/open/floor/wood_wide{ icon_state = "wide-broken5" @@ -14173,6 +15952,13 @@ /obj/structure/chair/stool/retro/tan, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +/obj/structure/fluff/railing/corner{ + dir = 1 + }, +/turf/open/transparent/openspace, +/area/f13/wasteland) +>>>>>>> Stashed changes "SF" = ( /obj/structure/sign/poster/official/fruit_bowl, /turf/closed/wall/f13/wood/house, @@ -14203,6 +15989,7 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +<<<<<<< Updated upstream "SJ" = ( /obj/effect/decal/cleanable/generic, /obj/item/book/granter/crafting_recipe/gunsmith_one, @@ -14212,6 +15999,8 @@ /obj/structure/shelf_wood, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +>>>>>>> Stashed changes "SK" = ( /obj/structure/railing/corner{ color = "#A47449"; @@ -14219,6 +16008,15 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"SL" = ( +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "SM" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -14306,9 +16104,15 @@ /turf/open/floor/carpet/black, /area/f13/brotherhood/offices1st) "SY" = ( +<<<<<<< Updated upstream /obj/structure/flora/twig3, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +/obj/structure/barricade/concrete, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/wasteland) +>>>>>>> Stashed changes "SZ" = ( /obj/item/clothing/shoes/f13/enclave/serviceboots, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, @@ -14324,6 +16128,7 @@ }, /turf/open/floor/wood_wide, /area/f13/followers) +<<<<<<< Updated upstream "Tb" = ( /obj/structure/simple_door/bunker, /turf/open/floor/f13{ @@ -14338,6 +16143,8 @@ /obj/structure/barricade/tentclothedge, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/ncr) +======= +>>>>>>> Stashed changes "Td" = ( /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/x) @@ -14397,11 +16204,20 @@ }, /area/f13/building/powered) "Tm" = ( +<<<<<<< Updated upstream /obj/structure/simple_door/tent, /obj/structure/barricade/wooden/planks/pregame, /obj/structure/barricade/wooden, /turf/open/floor/wood_wide, /area/f13/wasteland) +======= +/obj/effect/decal/fakelattice, +/obj/item/bedsheet/blanket, +/obj/structure/bed, +/obj/effect/landmark/start/f13/ncrtrooper, +/turf/open/floor/f13/wood, +/area/f13/ncr) +>>>>>>> Stashed changes "Tn" = ( /obj/structure/sign/flag_enclave{ pixel_y = 34 @@ -14437,6 +16253,17 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Ts" = ( +/obj/structure/barricade/wooden, +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "Tt" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/remains/human, @@ -14568,10 +16395,15 @@ /turf/open/floor/plating, /area/f13/bar) "TN" = ( +<<<<<<< Updated upstream /obj/structure/barricade/concrete, /turf/open/indestructible/ground/outside/ruins{ icon_state = "rubblepillar" }, +======= +/obj/machinery/hydroponics/soil, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "TO" = ( /obj/machinery/light/fo13colored/Red{ @@ -14583,6 +16415,7 @@ /obj/item/reagent_containers/food/drinks/bottle/sunset, /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, /area/f13/building/abandoned/l) +<<<<<<< Updated upstream "TP" = ( /turf/open/floor/f13{ color = "#d9c4b9"; @@ -14590,6 +16423,8 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +>>>>>>> Stashed changes "TR" = ( /obj/item/flag/bos, /obj/effect/decal/cleanable/dirt{ @@ -14653,6 +16488,13 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Ua" = ( +/obj/item/mine/stun, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "Ub" = ( /obj/structure/railing{ dir = 4 @@ -14702,6 +16544,18 @@ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/m) +<<<<<<< Updated upstream +======= +"Uh" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress4"; + pixel_y = -2 + }, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken1" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "Ui" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -14735,6 +16589,7 @@ icon_state = "floordirtysolid" }, /area/f13/building/abandoned/n) +<<<<<<< Updated upstream "Uq" = ( /obj/structure/fluff/railing{ dir = 9 @@ -14747,6 +16602,8 @@ icon_state = "wide-broken5" }, /area/f13/ambientlighting/building/j) +======= +>>>>>>> Stashed changes "Ut" = ( /obj/structure/window/fulltile/house, /obj/structure/curtain{ @@ -14778,6 +16635,15 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Ux" = ( +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "Uy" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/f13/wood/house, @@ -14844,12 +16710,15 @@ /obj/item/radio/old, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream "UK" = ( /obj/structure/chair/bench{ dir = 1 }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "UL" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, @@ -14876,10 +16745,13 @@ icon_state = "bluedirtychess2" }, /area/f13/building/powered) +<<<<<<< Updated upstream "UP" = ( /obj/structure/chair/stool/retro/black, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +>>>>>>> Stashed changes "UQ" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/handy, @@ -14942,9 +16814,17 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "UZ" = ( +<<<<<<< Updated upstream /obj/structure/flora/wasteplant/fever_blossom, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/structure/bed/old, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken1" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "Va" = ( /obj/structure/bed/mattress{ icon_state = "mattress5" @@ -14959,6 +16839,15 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) +<<<<<<< Updated upstream +======= +"Vc" = ( +/turf/open/indestructible/ground/outside/ruins{ + dir = 5; + icon_state = "rubbleplate" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Vd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter, @@ -14971,6 +16860,14 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Ve" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) +>>>>>>> Stashed changes "Vf" = ( /obj/machinery/light{ dir = 1 @@ -15035,17 +16932,40 @@ }, /turf/open/floor/carpet/purple, /area/f13/building/powered) +<<<<<<< Updated upstream "Vs" = ( /obj/effect/decal/fakelattice, /obj/structure/closet/crate/footlocker, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +>>>>>>> Stashed changes "Vu" = ( /obj/structure/grille/ratvar{ name = "radio antenna" }, /turf/open/transparent/openspace, /area/f13/building/abandoned/l) +<<<<<<< Updated upstream +======= +"Vv" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -20; + pixel_x = -7 + }, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirtcorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Vw" = ( /turf/closed/wall/f13/wood/house, /area/f13/legioncamp) @@ -15106,6 +17026,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "VF" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -15116,6 +17037,16 @@ icon_state = "oakfloor4-broken" }, /area/f13/wasteland) +======= +/obj/structure/barricade/tentclothedge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirt" + }, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "VG" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt/dust, @@ -15213,12 +17144,18 @@ }, /area/f13/brotherhood/offices1st) "VW" = ( +<<<<<<< Updated upstream /obj/machinery/smartfridge/bottlerack, /obj/effect/spawner/lootdrop/f13/alcoholspawner, /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/floor/f13/wood{ color = "#c5bab2" }, +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/ash, +/turf/open/floor/f13/wood, +>>>>>>> Stashed changes /area/f13/ncr) "VX" = ( /obj/structure/rack/shelf_metal, @@ -15298,6 +17235,23 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Wn" = ( +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +"Wp" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/floor/f13/wood{ + icon_state = "housebase" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Wr" = ( /obj/structure/railing{ color = "#A47449" @@ -15326,6 +17280,24 @@ /obj/structure/sign/departments/science, /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"Wx" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 8 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 10 + }, +/obj/structure/barricade/tentclothedge{ + dir = 4; + pixel_x = 15; + pixel_y = 12; + layer = 5 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +>>>>>>> Stashed changes "Wy" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -15448,6 +17420,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "WQ" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -15457,6 +17430,12 @@ /turf/open/floor/f13/wood{ icon_state = "oakfloor3-broken" }, +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/indestructible/ground/inside/mountain, +>>>>>>> Stashed changes /area/f13/wasteland) "WR" = ( /obj/structure/simple_door/repaired, @@ -15645,15 +17624,27 @@ "Xs" = ( /turf/closed/wall/f13/wood/house, /area/maintenance/bar) +<<<<<<< Updated upstream "Xt" = ( /mob/living/simple_animal/hostile/renegade/soldier, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +>>>>>>> Stashed changes "Xu" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/grown/harebell, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream +======= +"Xw" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress5" + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "Xx" = ( /obj/machinery/light/small{ dir = 1; @@ -15695,12 +17686,18 @@ }, /area/f13/building/abandoned/m) "XD" = ( +<<<<<<< Updated upstream /obj/structure/chair/stool/retro/black, /obj/effect/landmark/start/f13/ncrveteranranger, /turf/open/floor/f13/wood{ color = "#c5bab2" }, /area/f13/ncr) +======= +/obj/structure/fluff/railing/corner, +/turf/open/transparent/openspace, +/area/f13/wasteland) +>>>>>>> Stashed changes "XE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/destructible/tribal_torch/wall/lit{ @@ -15761,6 +17758,16 @@ /obj/item/bedsheet/brown, /turf/open/floor/carpet/red, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"XM" = ( +/obj/structure/debris/v3{ + pixel_x = -15; + pixel_y = 6 + }, +/turf/closed/wall/f13/ruins, +/area/f13/ncr) +>>>>>>> Stashed changes "XN" = ( /obj/machinery/vending/clothing{ force_free = 1 @@ -16061,9 +18068,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream "YI" = ( /obj/machinery/smartfridge/bottlerack/seedbin/primitive, /turf/open/indestructible/ground/outside/desert, +======= +"YH" = ( +/obj/structure/fluff/railing/corner{ + dir = 8 + }, +/turf/open/transparent/openspace, +>>>>>>> Stashed changes /area/f13/wasteland) "YJ" = ( /obj/effect/decal/cleanable/blood/drip, @@ -16087,6 +18102,7 @@ dir = 8 }, /area/f13/building/powered) +<<<<<<< Updated upstream "YN" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -16098,6 +18114,8 @@ icon_state = "housebase4-broken" }, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "YO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/fo13colored/Red{ @@ -16130,6 +18148,14 @@ }, /turf/open/floor/wood_wide, /area/f13/followers) +<<<<<<< Updated upstream +======= +"YT" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/desert, +/area/f13/ncr) +>>>>>>> Stashed changes "YU" = ( /obj/structure/bed, /turf/open/floor/carpet/vault, @@ -16280,16 +18306,22 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) "Zs" = ( +<<<<<<< Updated upstream /obj/effect/decal/fakelattice, /obj/item/bedsheet/blanket, /obj/structure/bed, /obj/effect/landmark/start/f13/ncrtrooper, /turf/open/floor/f13/wood, /area/f13/ncr) +======= +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "Zt" = ( /turf/closed/mineral/random/low_chance, /area/f13/wasteland) "Zu" = ( +<<<<<<< Updated upstream /obj/structure/barricade/tentclothedge{ pixel_y = -4 }, @@ -16298,6 +18330,12 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/ambientlighting/building/u) +======= +/turf/open/floor/f13/wood{ + icon_state = "oakfloor3-broken" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "Zw" = ( /obj/item/storage/trash_stack{ icon_state = "trash_2" @@ -16318,8 +18356,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, /area/f13/legioncamp) +<<<<<<< Updated upstream "ZA" = ( /turf/closed/mineral/random, +======= +"ZB" = ( +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "ZC" = ( /obj/structure/railing{ @@ -16367,6 +18411,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream "ZN" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -16380,12 +18425,18 @@ name = "dirty floor" }, /area/f13/brotherhood/offices1st) +======= +"ZM" = ( +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "ZO" = ( /mob/living/simple_animal/hostile/supermutant/nightkin, /obj/effect/gibspawner/human, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream "ZP" = ( /obj/structure/fluff/railing/corner{ dir = 8 @@ -16403,6 +18454,8 @@ smooth = 1 }, /area/f13/brotherhood/offices1st) +======= +>>>>>>> Stashed changes "ZW" = ( /obj/structure/closet/wardrobe/cargotech, /turf/open/floor/f13{ @@ -16779,6 +18832,7 @@ xm xm xm EI +<<<<<<< Updated upstream ZA ZA ZA @@ -16819,6 +18873,48 @@ ZA ZA ZA ZA +======= +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +>>>>>>> Stashed changes xm xm xm @@ -16885,6 +18981,7 @@ yT yT yT yT +<<<<<<< Updated upstream xX xX xX @@ -16982,6 +19079,105 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -17081,6 +19277,7 @@ xm xm xm EI +<<<<<<< Updated upstream ZA ZA ZA @@ -17121,6 +19318,48 @@ ZA ZA ZA ZA +======= +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +>>>>>>> Stashed changes xm xm xm @@ -17187,6 +19426,7 @@ yT yT yT yT +<<<<<<< Updated upstream xX xX xX @@ -17284,6 +19524,105 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -17383,6 +19722,7 @@ xm xm xm EI +<<<<<<< Updated upstream ZA ZA iX @@ -17397,6 +19737,22 @@ ZA ZA iX iX +======= +aD +aD +oT +oT +aD +aD +aD +aD +aD +aD +aD +aD +oT +oT +>>>>>>> Stashed changes xm xm xm @@ -17411,6 +19767,7 @@ WC WC WC zi +<<<<<<< Updated upstream ZA ZA ZA @@ -17422,6 +19779,19 @@ ZA ZA ZA ZA +======= +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +>>>>>>> Stashed changes xm xm xm @@ -17489,6 +19859,7 @@ yT yT yT yT +<<<<<<< Updated upstream xX xX xX @@ -17585,6 +19956,104 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -17688,6 +20157,7 @@ xm xm xm xm +<<<<<<< Updated upstream iX iX ZA @@ -17698,6 +20168,18 @@ ZA iX iX iX +======= +oT +oT +aD +aD +aD +aD +aD +oT +oT +oT +>>>>>>> Stashed changes xm xm xm @@ -17705,6 +20187,7 @@ xm xm xm xm +<<<<<<< Updated upstream NP hM tk @@ -17724,6 +20207,27 @@ ZA ZA ZA ZA +======= +nn +NP +aW +aW +aW +aW +nn +zi +oT +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +>>>>>>> Stashed changes xm xm xm @@ -17791,6 +20295,7 @@ yT yT yT yT +<<<<<<< Updated upstream xX xX xX @@ -17886,6 +20391,103 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -17991,6 +20593,7 @@ xm xm xm xm +<<<<<<< Updated upstream iX iX iX @@ -17998,6 +20601,15 @@ ZA ZA iX iX +======= +oT +oT +oT +aD +aD +oT +oT +>>>>>>> Stashed changes xm xm xm @@ -18009,6 +20621,7 @@ xm xm WC rt +<<<<<<< Updated upstream VW tk XD @@ -18026,6 +20639,25 @@ ZA ZA ZA ZA +======= +PY +aW +kq +aW +nn +zi +oT +oT +aD +aD +aD +aD +aD +aD +aD +aD +aD +>>>>>>> Stashed changes xm xm xm @@ -18093,6 +20725,7 @@ yT yT yT yT +<<<<<<< Updated upstream xX xX xX @@ -18186,6 +20819,101 @@ xX xX xX xX +======= +FO +FO +FO +FO +xm +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -18295,11 +21023,19 @@ xm xm xm xm +<<<<<<< Updated upstream iX iX iX iX iX +======= +oT +oT +oT +oT +oT +>>>>>>> Stashed changes xm xm xm @@ -18311,6 +21047,7 @@ xm xm xm WC +<<<<<<< Updated upstream wM tk La @@ -18328,6 +21065,25 @@ ZA ZA ZA ZA +======= +dD +aW +jA +dD +rt +zi +oT +oT +oT +aD +aD +aD +aD +aD +aD +aD +aD +>>>>>>> Stashed changes xm xm xm @@ -18338,6 +21094,7 @@ xm xm xm xm +<<<<<<< Updated upstream xm xm xm @@ -18501,6 +21258,171 @@ Bs Bs Bs Bs +======= +>>>>>>> Stashed changes +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +FO +FO +FO +xm +xm +xm +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +xm +xm +xm +xm +xm +xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -18613,6 +21535,7 @@ xm xm xm WC +<<<<<<< Updated upstream wM tk yA @@ -18786,6 +21709,190 @@ xX xX xX xX +======= +dD +aW +yO +EF +rt +zi +oT +oT +oT +oT +aD +aD +aD +aD +aD +aD +aD +xm +xm +>>>>>>> Stashed changes +xm +xm +xm +xm +xm +xm +xm +xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +yT +xm +xm +xm +xm +xm +xm +xm +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO xm xm xm @@ -18913,18 +22020,28 @@ zi xm xm xm +<<<<<<< Updated upstream fb rt wM tk tk tk +======= +XD +rt +dD +aW +aW +aW +>>>>>>> Stashed changes rt zi zi zi zi zi +<<<<<<< Updated upstream iX iX ZA @@ -18932,6 +22049,15 @@ ZA ZA ZA ZA +======= +oT +oT +aD +aD +aD +aD +aD +>>>>>>> Stashed changes xm xm xm @@ -19005,6 +22131,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -19085,6 +22212,88 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -19217,23 +22426,40 @@ xm xm cw zi +<<<<<<< Updated upstream NP tk tk tk il +======= +nn +aW +aW +aW +Jl +>>>>>>> Stashed changes zi zi zi zi zi zi +<<<<<<< Updated upstream iX iX ZA ZA ZA ZA +======= +oT +oT +aD +aD +aD +aD +>>>>>>> Stashed changes xm xm xm @@ -19308,6 +22534,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -19386,6 +22613,86 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -19521,8 +22828,13 @@ cw zi rt Oy +<<<<<<< Updated upstream wN mP +======= +hM +ec +>>>>>>> Stashed changes rt zi zi @@ -19530,12 +22842,21 @@ zi zi zi zi +<<<<<<< Updated upstream iX iX ZA ZA ZA ZA +======= +oT +oT +aD +aD +aD +aD +>>>>>>> Stashed changes xm xm xm @@ -19611,6 +22932,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -19686,6 +23008,83 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -19832,12 +23231,21 @@ zi zi zi zi +<<<<<<< Updated upstream iX iX ZA ZA ZA ZA +======= +oT +oT +aD +aD +aD +aD +>>>>>>> Stashed changes xm xm xm @@ -19913,6 +23321,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -19987,6 +23396,82 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -20119,9 +23604,15 @@ zi zi zi zi +<<<<<<< Updated upstream WQ Gf AI +======= +aY +As +fb +>>>>>>> Stashed changes zi zi zi @@ -20134,11 +23625,19 @@ zi zi zi zi +<<<<<<< Updated upstream iX iX iX ZA ZA +======= +oT +oT +oT +aD +aD +>>>>>>> Stashed changes xm xm xm @@ -20215,6 +23714,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -20288,6 +23788,81 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -20421,9 +23996,15 @@ zi zi zi zi +<<<<<<< Updated upstream qy vd uQ +======= +Pv +Gq +qG +>>>>>>> Stashed changes zi zi zi @@ -20518,6 +24099,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -20588,6 +24170,78 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -20722,25 +24376,43 @@ zi zi zi zi +<<<<<<< Updated upstream Sn xm xm ZP +======= +Nt +xm +xm +YH +>>>>>>> Stashed changes BC BC BC BC BC BC +<<<<<<< Updated upstream fR +======= +uJ +>>>>>>> Stashed changes zi rt WC rt +<<<<<<< Updated upstream cu rt WC Je +======= +AV +rt +WC +lE +>>>>>>> Stashed changes zi lC xm @@ -20820,6 +24492,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -20889,6 +24562,77 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -21024,7 +24768,11 @@ zi zi zi zi +<<<<<<< Updated upstream Sn +======= +Nt +>>>>>>> Stashed changes xm xm xm @@ -21037,11 +24785,19 @@ xm cw zi WC +<<<<<<< Updated upstream AV qT XI Ha lf +======= +FM +RB +XI +bi +ug +>>>>>>> Stashed changes WC zi lC @@ -21122,6 +24878,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -21191,6 +24948,77 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +HX +iN +rJ +Wn +Ju +GG +NA +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -21325,7 +25153,11 @@ xm xm xm Zk +<<<<<<< Updated upstream MY +======= +Gf +>>>>>>> Stashed changes xm xm xm @@ -21340,10 +25172,17 @@ cw zi zi rt +<<<<<<< Updated upstream QI Hs XI qN +======= +Kj +AI +XI +dm +>>>>>>> Stashed changes rt zi lC @@ -21424,6 +25263,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -21492,6 +25332,76 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +hk +jg +iN +nL +Wn +Wn +MP +hk +tt +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -21626,8 +25536,13 @@ xm xm xm xm +<<<<<<< Updated upstream kq Gf +======= +Zu +As +>>>>>>> Stashed changes xm xm xm @@ -21638,6 +25553,7 @@ xm xm xm xm +<<<<<<< Updated upstream ZP fR zi @@ -21646,6 +25562,16 @@ Vs EA XI vo +======= +YH +uJ +zi +nF +bo +Ol +XI +CX +>>>>>>> Stashed changes rt zi lC @@ -21727,6 +25653,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -21794,6 +25721,75 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +LD +xf +lJ +Wx +wP +wP +wP +gE +hk +xm +hk +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -21928,8 +25924,13 @@ xm xm xm xm +<<<<<<< Updated upstream ko Gf +======= +mk +As +>>>>>>> Stashed changes xm xm xm @@ -21944,10 +25945,17 @@ xm cw zi rt +<<<<<<< Updated upstream Ny XI XI hy +======= +NL +XI +XI +hv +>>>>>>> Stashed changes WC zi lC @@ -22030,6 +26038,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -22095,6 +26104,73 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +fL +FO +FO +LD +vd +hh +Vv +Gb +Gb +Gb +Gb +mZ +xL +xm +hk +hk +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -22230,8 +26306,13 @@ xm xm xm xm +<<<<<<< Updated upstream Gf Gf +======= +As +As +>>>>>>> Stashed changes xm xm xm @@ -22246,10 +26327,17 @@ xm cw zi WC +<<<<<<< Updated upstream gE XI XI lD +======= +JD +XI +XI +QI +>>>>>>> Stashed changes WC zi lC @@ -22333,6 +26421,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -22396,6 +26485,71 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +fL +fd +FO +Ga +hk +hk +da +aq +nY +zR +zR +KN +zR +zR +bR +hk +hk +hk +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -22532,7 +26686,11 @@ xm xm xm xm +<<<<<<< Updated upstream vd +======= +Gq +>>>>>>> Stashed changes Ql xm xm @@ -22548,11 +26706,19 @@ xm cw zi WC +<<<<<<< Updated upstream vo GV XI vo am +======= +CX +eq +XI +CX +YT +>>>>>>> Stashed changes zi lC xm @@ -22637,6 +26803,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -22698,6 +26865,69 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +fR +fL +fL +FO +zU +zU +AF +aq +zR +zR +zR +zR +zR +zR +zR +mp +xf +hk +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -22834,8 +27064,113 @@ xm xm xm xm -qy -YN +<<<<<<< Updated upstream +qy +YN +======= +Pv +ac +>>>>>>> Stashed changes +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +cw +zi +WC +<<<<<<< Updated upstream +bQ +XI +Fz +bQ +am +======= +xS +XI +Fz +xS +YT +>>>>>>> Stashed changes +zi +lC +xm +xm +<<<<<<< Updated upstream +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +lw +lw +lw +lw +lw +lw +lw +lw +xm +xm xm xm xm @@ -22847,18 +27182,69 @@ xm xm xm xm -cw -zi -WC -bQ -XI -Fz -bQ -am -zi -lC xm xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +sy +wJ +wJ +kU +UR +UR +cc +Aq +mx +mx +mx +mx +mx +cf +aK +mW +hw +ie +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +======= +>>>>>>> Stashed changes xm xm xm @@ -22868,10 +27254,27 @@ xm xm xm xm +Ao +UC +gm +eU +ZY +DP +en xm xm xm xm +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs +Bs xm xm xm @@ -22940,65 +27343,65 @@ xm xm xm xm -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -sy -wJ -wJ -kU -UR -UR -cc -Aq -mx -mx -mx -mx -mx -cf -aK -mW -hw -ie -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +eO +fL +fL +il +cr +cr +So +Lx +zR +zR +zR +zR +zR +gs +mp +hx +hk +jg +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO xm xm xm @@ -23155,7 +27558,11 @@ WC XI XI Fz +<<<<<<< Updated upstream AP +======= +OS +>>>>>>> Stashed changes rt zi lC @@ -23242,6 +27649,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -23300,6 +27708,66 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +mi +fL +fL +FO +VF +VF +gU +qy +zR +mW +bQ +zR +mp +hy +hx +hk +hk +hk +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -23439,9 +27907,15 @@ xm zi OE OE +<<<<<<< Updated upstream Vo Vo Vo +======= +Sy +Sy +Sy +>>>>>>> Stashed changes OE zi xm @@ -23454,10 +27928,17 @@ xm cw zi rt +<<<<<<< Updated upstream vo GV XI vo +======= +CX +eq +XI +CX +>>>>>>> Stashed changes rt zi lC @@ -23544,6 +28025,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -23601,6 +28083,65 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +Ve +zf +fL +FO +FO +iD +tt +ZB +cN +Nf +zR +ts +mp +hk +hk +hk +AP +hk +hk +Rg +Rg +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -23740,10 +28281,17 @@ xm xm zi OE +<<<<<<< Updated upstream cr cr cr cr +======= +yc +yc +yc +yc +>>>>>>> Stashed changes OE zi xm @@ -23755,11 +28303,19 @@ xm xm cw zi +<<<<<<< Updated upstream Tc bQ Fz XI DD +======= +de +xS +Fz +XI +lD +>>>>>>> Stashed changes WC zi lC @@ -23847,6 +28403,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -23899,6 +28456,60 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +Ve +Iu +fL +FO +FO +lY +lY +lY +Ny +Mg +zR +mp +hx +hk +hk +hk +hk +hk +hk +wL +hk +TN +TN +TN +TN +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes zi zi zi @@ -24042,10 +28653,17 @@ xm xm zi OE +<<<<<<< Updated upstream cr cr cr cr +======= +yc +yc +yc +yc +>>>>>>> Stashed changes OE zi xm @@ -24053,6 +28671,7 @@ xm xm xm xm +<<<<<<< Updated upstream fb no Ed @@ -24061,6 +28680,16 @@ iL XI Fz SY +======= +XD +no +nS +zi +nF +XI +Fz +cO +>>>>>>> Stashed changes WC WC zi @@ -24150,6 +28779,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -24199,6 +28829,57 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +tk +fL +FO +FO +Ju +Wn +Wn +MP +iX +hy +hx +hk +hk +hk +hk +hk +tt +hk +hk +rw +hk +hk +hk +hk +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes zi zi zi @@ -24343,11 +29024,19 @@ xm xm xm zi +<<<<<<< Updated upstream Vo lE Ie cr cr +======= +Sy +cu +Aj +yc +yc +>>>>>>> Stashed changes OE zi xm @@ -24360,9 +29049,15 @@ zi zi zi WC +<<<<<<< Updated upstream BV Fz vo +======= +jE +Fz +CX +>>>>>>> Stashed changes rt zi zi @@ -24452,6 +29147,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -24500,6 +29196,56 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +Ve +FO +fL +FO +FO +Ju +Wn +Wn +GG +jg +hk +LZ +hk +tt +hk +hk +hk +hk +hk +uQ +hk +TN +TN +TN +TN +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm zi zi @@ -24645,12 +29391,21 @@ xm xm xm zi +<<<<<<< Updated upstream Vo cr lE lE cr Vo +======= +Sy +yc +cu +cu +yc +Sy +>>>>>>> Stashed changes zi xm xm @@ -24661,6 +29416,7 @@ cw zi zi WC +<<<<<<< Updated upstream Rt Zs XI @@ -24669,6 +29425,16 @@ rt zi Uq yK +======= +XM +Tm +XI +nl +rt +zi +DD +SC +>>>>>>> Stashed changes xm xm xm @@ -24755,6 +29521,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -24801,6 +29568,54 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +Ve +FO +FO +FO +FO +Wn +Wn +Wn +GG +hk +uQ +hk +hh +hk +hk +hk +hk +hk +hk +fM +GQ +hk +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm zi @@ -24948,6 +29763,7 @@ xm xm zi OE +<<<<<<< Updated upstream cr cr lE @@ -24965,6 +29781,25 @@ zi rt bR qT +======= +yc +yc +cu +yc +Sy +zi +Zk +Gf +As +As +MF +fb +zi +zi +rt +BD +RB +>>>>>>> Stashed changes XI XI rt @@ -25057,6 +29892,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -25102,6 +29938,53 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +nL +hL +nL +GG +fX +su +xf +hk +hk +hk +hk +zQ +hk +hk +hk +hk +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -25250,6 +30133,7 @@ xm xm zi OE +<<<<<<< Updated upstream cr cr cr @@ -25269,6 +30153,27 @@ NY XI XI vo +======= +yc +yc +yc +yc +Sy +zi +Pv +On +Gq +di +Pv +px +zi +zi +rt +RE +XI +XI +CX +>>>>>>> Stashed changes rt zi lC @@ -25359,6 +30264,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -25401,6 +30307,50 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +LD +vd +hk +hk +hk +hk +tt +hk +ls +hk +hk +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -25552,10 +30502,17 @@ xm xm zi OE +<<<<<<< Updated upstream cr cr cr cr +======= +yc +yc +yc +yc +>>>>>>> Stashed changes OE zi xm @@ -25567,11 +30524,19 @@ cw zi zi WC +<<<<<<< Updated upstream Lx sc XI qo iL +======= +Hs +mg +XI +dU +nF +>>>>>>> Stashed changes zi lC xm @@ -25662,6 +30627,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -25700,6 +30666,46 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +LO +tt +hk +hk +OW +hk +hk +hk +hk +Ot +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -25853,11 +30859,19 @@ xm xm xm zi +<<<<<<< Updated upstream Vo cr cr cr lE +======= +Sy +yc +yc +yc +cu +>>>>>>> Stashed changes OE zi xm @@ -25865,6 +30879,7 @@ xm xm xm xm +<<<<<<< Updated upstream ZP fR zi @@ -25874,6 +30889,17 @@ Fz bo iL Tc +======= +YH +uJ +zi +nF +VW +Fz +hw +nF +de +>>>>>>> Stashed changes zi lC xm @@ -25966,6 +30992,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -25998,6 +31025,40 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +al +RS +hk +tt +hk +hk +hk +iQ +Ot +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -26155,11 +31216,19 @@ xm xm xm zi +<<<<<<< Updated upstream Vo cr cr lE lE +======= +Sy +yc +yc +cu +cu +>>>>>>> Stashed changes OE zi xm @@ -26170,7 +31239,11 @@ xm xm cw zi +<<<<<<< Updated upstream iL +======= +nF +>>>>>>> Stashed changes XI jo SV @@ -26269,6 +31342,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -26297,6 +31371,36 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +al +hk +hk +iQ +iQ +Rs +hP +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -26304,11 +31408,19 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec ec ec +======= +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -26457,11 +31569,19 @@ xm zi zi zi +<<<<<<< Updated upstream Vo cr Xc lE lE +======= +Sy +yc +yN +cu +cu +>>>>>>> Stashed changes OE zi xm @@ -26473,13 +31593,22 @@ xm cw zi rt +<<<<<<< Updated upstream cu +======= +AV +>>>>>>> Stashed changes rt WC rt zi +<<<<<<< Updated upstream Uq yK +======= +DD +SC +>>>>>>> Stashed changes xm xm xm @@ -26571,6 +31700,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -26598,11 +31728,41 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +al +Ot +oT +oT +oT +WQ +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -26611,6 +31771,16 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -26757,6 +31927,7 @@ xm xm xm zi +<<<<<<< Updated upstream Vo Vo Vo @@ -26764,6 +31935,15 @@ cr lE lE lE +======= +Sy +Sy +Sy +yc +cu +cu +cu +>>>>>>> Stashed changes OE zi xm @@ -26786,6 +31966,136 @@ xm xm xm xm +<<<<<<< Updated upstream +xm +xm +xm +xm +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +zi +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +Rk +Rk +Rk +Rk +Rk +Rk +xm +xm +lw +lw +lw +lw +lw +lw +lw +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +mZ +iX +iX +ts +xX +xX +xX +xX +xX +xm +xm +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +======= +>>>>>>> Stashed changes xm xm xm @@ -26805,6 +32115,8 @@ zi zi zi zi +<<<<<<< Updated upstream +======= zi zi zi @@ -26873,46 +32185,46 @@ xm xm xm xm -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -xX -mZ -iX -iX -ts -xX -xX -xX -xX -xX +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +pg +oT +oT +hP +FO +FO +FO +FO +FO xm xm -ec -ec -ec -ec -ec -ec -ec -ec -ec -ec -ec -ec +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN xm xm xm @@ -26932,6 +32244,7 @@ zi zi zi zi +>>>>>>> Stashed changes xm xm xm @@ -27059,6 +32372,7 @@ xm xm xm zi +<<<<<<< Updated upstream Vo cr cr @@ -27067,6 +32381,16 @@ cr lE lE Vo +======= +Sy +yc +yc +yc +yc +cu +cu +Sy +>>>>>>> Stashed changes zi xm xm @@ -27075,14 +32399,23 @@ xm xm xm xm +<<<<<<< Updated upstream hx AI +======= +Wp +fb +>>>>>>> Stashed changes OE BC BC BC BC +<<<<<<< Updated upstream yK +======= +SC +>>>>>>> Stashed changes xm xm xm @@ -27175,6 +32508,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -27215,6 +32549,48 @@ ec ec ec ec +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +pg +oT +oT +hP +FO +FO +FO +FO +xm +xm +xm +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -27361,6 +32737,7 @@ xm xm xm zi +<<<<<<< Updated upstream Vo cr cr @@ -27369,6 +32746,16 @@ lE lE lE Vo +======= +Sy +yc +yc +yc +cu +cu +cu +Sy +>>>>>>> Stashed changes zi xm xm @@ -27378,7 +32765,11 @@ xm xm xm Ql +<<<<<<< Updated upstream VF +======= +Db +>>>>>>> Stashed changes OE xm xm @@ -27477,6 +32868,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -27494,6 +32886,25 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -27505,6 +32916,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -27517,6 +32929,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -27664,6 +33090,7 @@ xm xm zi OE +<<<<<<< Updated upstream cr cr lE @@ -27671,6 +33098,15 @@ lE lE lE Vo +======= +yc +yc +cu +cu +cu +cu +Sy +>>>>>>> Stashed changes zi xm xm @@ -27680,7 +33116,11 @@ xm xm xm Zk +<<<<<<< Updated upstream Gf +======= +As +>>>>>>> Stashed changes xm xm xm @@ -27780,6 +33220,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -27795,6 +33236,23 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -27807,6 +33265,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -27819,6 +33278,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -27966,6 +33439,7 @@ xm xm zi OE +<<<<<<< Updated upstream cr cr cr @@ -27973,6 +33447,15 @@ lE lE lE Vo +======= +yc +yc +yc +cu +cu +cu +Sy +>>>>>>> Stashed changes zi xm xm @@ -27982,7 +33465,11 @@ xm xm xm sr +<<<<<<< Updated upstream Gf +======= +As +>>>>>>> Stashed changes xm xm xm @@ -28084,6 +33571,7 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX @@ -28094,6 +33582,18 @@ xX xX xX xX +======= +FO +FO +FO +FO +FO +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -28109,6 +33609,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -28121,6 +33622,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -28268,23 +33783,41 @@ xm xm zi OE +<<<<<<< Updated upstream cr cr cr cr lE lE +======= +yc +yc +yc +yc +cu +cu +>>>>>>> Stashed changes OE zi zi zi zi +<<<<<<< Updated upstream Sy Gf MY Gf kq AI +======= +lx +As +Gf +As +Zu +fb +>>>>>>> Stashed changes OE xm xm @@ -28388,11 +33921,19 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX xX xX +======= +FO +FO +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -28411,6 +33952,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -28423,6 +33965,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -28570,6 +34126,7 @@ xm zi zi OE +<<<<<<< Updated upstream cr cr cr @@ -28580,13 +34137,31 @@ OE OE Vo Vo +======= +yc +yc +yc +yc +cu +cu +OE +OE +Sy +Sy +>>>>>>> Stashed changes zi zi SQ +On As +<<<<<<< Updated upstream Gf Bu YN +======= +px +ac +>>>>>>> Stashed changes OE xm xm @@ -28692,9 +34267,15 @@ xm xm xm xm +<<<<<<< Updated upstream xX xX xX +======= +FO +FO +FO +>>>>>>> Stashed changes xm xm xm @@ -28713,6 +34294,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -28725,6 +34307,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -28872,6 +34468,7 @@ xm zi OE OE +<<<<<<< Updated upstream cr cr cr @@ -28881,6 +34478,17 @@ lE lE lE lE +======= +yc +yc +yc +Vc +yc +cu +cu +cu +cu +>>>>>>> Stashed changes OE zi zi @@ -28995,7 +34603,11 @@ xm xm xm xm +<<<<<<< Updated upstream xX +======= +FO +>>>>>>> Stashed changes xm xm xm @@ -29019,6 +34631,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -29026,6 +34639,15 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -29172,6 +34794,7 @@ xm xm xm zi +<<<<<<< Updated upstream Vo lE Xc @@ -29185,6 +34808,21 @@ lE lE Vo Vo +======= +Sy +cu +yN +yc +yc +yc +yc +yc +cu +cu +cu +Sy +Sy +>>>>>>> Stashed changes zi xm xm @@ -29321,6 +34959,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -29328,6 +34967,15 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -29474,6 +35122,7 @@ xm xm xm zi +<<<<<<< Updated upstream Vo lE lE @@ -29486,6 +35135,20 @@ cr lE lE lE +======= +Sy +cu +cu +yc +yc +yc +yc +yc +yc +cu +cu +cu +>>>>>>> Stashed changes OE zi xm @@ -29623,6 +35286,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -29630,6 +35294,15 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -29777,6 +35450,7 @@ xm xm zi OE +<<<<<<< Updated upstream lE lE lE @@ -29788,6 +35462,19 @@ cr cr lE lE +======= +cu +cu +cu +yc +yc +yc +yc +yc +yc +cu +cu +>>>>>>> Stashed changes OE zi xm @@ -29925,6 +35612,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -29932,6 +35620,15 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -30079,6 +35776,7 @@ xm xm zi OE +<<<<<<< Updated upstream lE lE lE @@ -30090,6 +35788,19 @@ Xc cr cr lE +======= +cu +cu +cu +yc +yc +yc +yc +yN +yc +yc +cu +>>>>>>> Stashed changes OE zi xm @@ -30222,6 +35933,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -30234,6 +35946,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -30375,9 +36101,34 @@ xm xm xm xm +<<<<<<< Updated upstream +======= +xm +xm +xm +xm +zi +OE +vt +dy +cu +yc +yc +yc +yc +yc +yc +yc +yc +OE +zi +zi +zi +>>>>>>> Stashed changes xm xm xm +OE xm zi OE @@ -30397,6 +36148,7 @@ zi zi zi xm +OE xm xm OE @@ -30524,6 +36276,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -30536,6 +36289,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -30683,6 +36450,7 @@ xm xm zi OE +<<<<<<< Updated upstream lE lE lE @@ -30697,6 +36465,22 @@ cr Vo Vo Vo +======= +cu +cu +cu +cu +cu +cu +yc +yc +yc +yc +yc +Sy +Sy +Sy +>>>>>>> Stashed changes zi xm xm @@ -30826,6 +36610,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -30838,6 +36623,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -30863,11 +36662,19 @@ xm xm xm xm +<<<<<<< Updated upstream Xz Xz Xz Xz Xz +======= +XE +XE +XE +XE +XE +>>>>>>> Stashed changes xm xm xm @@ -30985,6 +36792,7 @@ xm xm zi OE +<<<<<<< Updated upstream lE lE lE @@ -30998,6 +36806,21 @@ cr cr cr cr +======= +cu +cu +cu +cu +yc +yc +yc +yc +yc +yc +yc +yc +yc +>>>>>>> Stashed changes OE zi xm @@ -31128,6 +36951,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -31140,6 +36964,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -31165,6 +37003,7 @@ xm xm xm xm +<<<<<<< Updated upstream Xz Xz Xz @@ -31177,6 +37016,20 @@ Xz Xz Xz Xz +======= +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +>>>>>>> Stashed changes xm xm xm @@ -31290,6 +37143,7 @@ OE OE OE OE +<<<<<<< Updated upstream Vo Vo Vo @@ -31300,6 +37154,18 @@ cr cr cr cr +======= +Sy +Sy +Sy +Sy +yc +yc +yc +yc +yc +yc +>>>>>>> Stashed changes OE zi xm @@ -31430,6 +37296,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -31442,6 +37309,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -31467,6 +37348,7 @@ xm xm xm xm +<<<<<<< Updated upstream Xz Xz Xz @@ -31479,6 +37361,20 @@ Xz Xz Xz Xz +======= +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +>>>>>>> Stashed changes xm xm xm @@ -31595,6 +37491,7 @@ zi zi zi zi +<<<<<<< Updated upstream Vo cr cr @@ -31603,6 +37500,16 @@ cr cr lE Vo +======= +Sy +yc +yc +yc +yc +yc +cu +Sy +>>>>>>> Stashed changes zi xm xm @@ -31732,6 +37639,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -31744,6 +37652,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -31769,6 +37691,7 @@ xm xm xm xm +<<<<<<< Updated upstream Xz Xz Xz @@ -31781,6 +37704,20 @@ Xz Xz Xz Xz +======= +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +>>>>>>> Stashed changes xm xm xm @@ -31885,6 +37822,30 @@ xm xm xm xm +<<<<<<< Updated upstream +======= +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +xm +zi +Sy +yc +yc +yc +yc +dy +cu +Sy +zi +>>>>>>> Stashed changes xm xm xm @@ -32034,6 +37995,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -32046,6 +38008,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -32071,6 +38047,7 @@ xm xm xm xm +<<<<<<< Updated upstream Xz Xz Xz @@ -32083,6 +38060,20 @@ Xz Xz Xz Xz +======= +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +>>>>>>> Stashed changes xm xm xm @@ -32199,6 +38190,7 @@ xm xm xm zi +<<<<<<< Updated upstream Vo cr cr @@ -32207,6 +38199,16 @@ lE lE lE Vo +======= +Sy +yc +yc +yc +cu +cu +cu +Sy +>>>>>>> Stashed changes zi xm xm @@ -32336,6 +38338,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -32348,6 +38351,20 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -32373,6 +38390,7 @@ xm xm xm xm +<<<<<<< Updated upstream Xz Xz Xz @@ -32385,6 +38403,20 @@ Xz Xz Xz Xz +======= +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +>>>>>>> Stashed changes xm xm xm @@ -32637,6 +38669,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -32651,6 +38684,22 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -32675,6 +38724,7 @@ xm xm xm xm +<<<<<<< Updated upstream Xz Xz Xz @@ -32687,6 +38737,20 @@ Xz Xz Xz Xz +======= +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +XE +>>>>>>> Stashed changes xm xm xm @@ -32939,6 +39003,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -32953,6 +39018,22 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -32977,6 +39058,7 @@ xm xm xm xm +<<<<<<< Updated upstream Xz Xz Xz @@ -32986,6 +39068,17 @@ Xz Xz Xz Xz +======= +XE +XE +XE +XE +XE +XE +XE +XE +XE +>>>>>>> Stashed changes xm xm xm @@ -33241,6 +39334,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -33255,6 +39349,22 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -33279,6 +39389,7 @@ xm xm xm xm +<<<<<<< Updated upstream Xz Xz Xz @@ -33288,6 +39399,17 @@ Xz Xz Xz Xz +======= +XE +XE +XE +XE +XE +XE +XE +XE +XE +>>>>>>> Stashed changes xm xm xm @@ -33543,6 +39665,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -33557,6 +39680,22 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -33581,6 +39720,7 @@ xm xm xm xm +<<<<<<< Updated upstream Xz Xz Xz @@ -33590,6 +39730,17 @@ Xz Xz Xz Xz +======= +XE +XE +XE +XE +XE +XE +XE +XE +XE +>>>>>>> Stashed changes xm xm xm @@ -33845,6 +39996,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -33859,6 +40011,22 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -33883,6 +40051,7 @@ xm xm xm xm +<<<<<<< Updated upstream Xz Xz Xz @@ -33892,6 +40061,17 @@ Xz Xz Xz Xz +======= +XE +XE +XE +XE +XE +XE +XE +XE +XE +>>>>>>> Stashed changes xm xm xm @@ -34147,6 +40327,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -34160,6 +40341,21 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -34185,6 +40381,7 @@ xm xm xm xm +<<<<<<< Updated upstream Xz Xz Xz @@ -34194,6 +40391,17 @@ Xz Xz Xz Xz +======= +XE +XE +XE +XE +XE +XE +XE +XE +XE +>>>>>>> Stashed changes xm xm xm @@ -34449,6 +40657,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -34462,6 +40671,21 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -34751,6 +40975,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -34764,6 +40989,21 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -35053,6 +41293,7 @@ xm xm xm xm +<<<<<<< Updated upstream ec ec ec @@ -35066,6 +41307,21 @@ ec ec ec ec +======= +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +qN +>>>>>>> Stashed changes xm xm xm @@ -38863,6 +45119,7 @@ xm xm xm xm +<<<<<<< Updated upstream fq fq fq @@ -38871,6 +45128,16 @@ fq fq fq fq +======= +Mk +Mk +Mk +Mk +Mk +Mk +Mk +Mk +>>>>>>> Stashed changes xm xm xm @@ -39165,6 +45432,7 @@ xm xm xm xm +<<<<<<< Updated upstream fq ku Ur @@ -39173,6 +45441,16 @@ fq fq fq fq +======= +Mk +Xw +jQ +UZ +Mk +Mk +Mk +Mk +>>>>>>> Stashed changes xm xm xm @@ -39467,6 +45745,7 @@ xm xm xm xm +<<<<<<< Updated upstream fq CV Ib @@ -39475,6 +45754,16 @@ fq XW ar ar +======= +Mk +FG +Zs +Zs +Mk +vu +ZM +ZM +>>>>>>> Stashed changes xm xm xm @@ -39769,6 +46058,7 @@ xm xm xm xm +<<<<<<< Updated upstream eo Ak vJ @@ -39777,6 +46067,16 @@ Ib Ib EF ar +======= +JW +Au +cB +Zs +Zs +Zs +Sj +ZM +>>>>>>> Stashed changes xm xm xm @@ -40071,6 +46371,7 @@ xm xm xm xm +<<<<<<< Updated upstream KJ Gm CV @@ -40079,6 +46380,16 @@ SD Ib Ib ar +======= +SL +Sg +FG +Gk +xk +Zs +Zs +ZM +>>>>>>> Stashed changes xm xm xm @@ -40373,6 +46684,7 @@ xm xm xm xm +<<<<<<< Updated upstream eo Gv CV @@ -40381,6 +46693,16 @@ Ml Xt Ib ar +======= +JW +Aq +FG +mx +Pb +ha +Zs +ZM +>>>>>>> Stashed changes xm xm xm @@ -40675,6 +46997,7 @@ xm xm xm xm +<<<<<<< Updated upstream fq pB Ib @@ -40683,6 +47006,16 @@ UP Ib Aw ar +======= +Mk +Uh +Zs +vC +dc +Zs +KJ +ZM +>>>>>>> Stashed changes xm xm xm @@ -40978,6 +47311,7 @@ xm xm xm xm +<<<<<<< Updated upstream KN KN vu @@ -40985,6 +47319,15 @@ Ib Ib Ib fq +======= +oA +oA +Ts +Zs +Zs +Zs +Mk +>>>>>>> Stashed changes xm xm xm @@ -41283,10 +47626,17 @@ xm xm xm xm +<<<<<<< Updated upstream ar xB xB fq +======= +ZM +py +py +Mk +>>>>>>> Stashed changes xm xm xm @@ -41585,10 +47935,17 @@ xm xm xm xm +<<<<<<< Updated upstream ny ny ny Vo +======= +qJ +qJ +qJ +Sy +>>>>>>> Stashed changes xm xm xm @@ -41887,10 +48244,17 @@ xm xm xm xm +<<<<<<< Updated upstream cB uG oa jm +======= +vo +lh +si +iI +>>>>>>> Stashed changes xm xm xm @@ -42189,10 +48553,17 @@ xm xm xm xm +<<<<<<< Updated upstream dm Ix SC jm +======= +iu +dX +aP +iI +>>>>>>> Stashed changes xm xm xm @@ -42487,6 +48858,7 @@ xm xm xm xm +<<<<<<< Updated upstream Vo xm xm @@ -42495,6 +48867,16 @@ Vo ny ny jm +======= +Sy +xm +xm +xm +Sy +qJ +qJ +iI +>>>>>>> Stashed changes xm xm xm @@ -42791,12 +49173,21 @@ xm xm xm xm +<<<<<<< Updated upstream Vo Vo Vo ny ny Vo +======= +Sy +Sy +Sy +qJ +qJ +Sy +>>>>>>> Stashed changes xm xm xm @@ -43095,10 +49486,17 @@ xm xm xm xm +<<<<<<< Updated upstream Vo Xq dm Vo +======= +Sy +Ua +iu +Sy +>>>>>>> Stashed changes xm xm xm @@ -43398,9 +49796,15 @@ xm xm xm xm +<<<<<<< Updated upstream jA uG jm +======= +Po +lh +iI +>>>>>>> Stashed changes xm xm xm @@ -43699,10 +50103,17 @@ xm xm xm xm +<<<<<<< Updated upstream Vo ny ny jm +======= +Sy +qJ +qJ +iI +>>>>>>> Stashed changes xm xm xm @@ -44001,10 +50412,17 @@ xm xm xm xm +<<<<<<< Updated upstream ny ny ny jm +======= +qJ +qJ +qJ +iI +>>>>>>> Stashed changes xm xm xm @@ -44303,10 +50721,17 @@ xm xm xm xm +<<<<<<< Updated upstream ny ny cB Vo +======= +qJ +qJ +vo +Sy +>>>>>>> Stashed changes xm xm xm @@ -44604,11 +51029,19 @@ xm xm xm xm +<<<<<<< Updated upstream fM ny ny ny Vo +======= +uI +qJ +qJ +qJ +Sy +>>>>>>> Stashed changes xm xm xm @@ -44907,10 +51340,17 @@ xm xm xm xm +<<<<<<< Updated upstream jm ny oa jm +======= +iI +qJ +si +iI +>>>>>>> Stashed changes xm xm xm @@ -45209,10 +51649,17 @@ xm xm xm xm +<<<<<<< Updated upstream Tm ny ny jm +======= +Ux +qJ +qJ +iI +>>>>>>> Stashed changes xm xm xm @@ -45511,10 +51958,17 @@ xm xm xm xm +<<<<<<< Updated upstream Tm Ix Xq jm +======= +Ux +dX +Ua +iI +>>>>>>> Stashed changes xm xm xm @@ -45813,10 +52267,17 @@ xm xm xm xm +<<<<<<< Updated upstream dm ny ny jm +======= +iu +qJ +qJ +iI +>>>>>>> Stashed changes xm xm xm @@ -46111,6 +52572,7 @@ xm xm xm xm +<<<<<<< Updated upstream Vo xm xm @@ -46119,6 +52581,16 @@ Vo oa ny wL +======= +Sy +xm +xm +xm +Sy +si +qJ +SY +>>>>>>> Stashed changes xm xm xm @@ -46413,6 +52885,7 @@ xm xm xm xm +<<<<<<< Updated upstream Vo Vo gU @@ -46420,6 +52893,15 @@ JQ dm ny dm +======= +Sy +Sy +PI +Pl +iu +qJ +iu +>>>>>>> Stashed changes xm xm xm @@ -46715,6 +53197,7 @@ xm xm xm xm +<<<<<<< Updated upstream Vo wT wT @@ -46722,6 +53205,15 @@ xm cB ny eE +======= +Sy +wT +wT +xm +vo +qJ +qf +>>>>>>> Stashed changes xm xm xm @@ -47017,6 +53509,7 @@ xm xm xm xm +<<<<<<< Updated upstream jm JQ xm @@ -47024,6 +53517,15 @@ xm Az ny eE +======= +iI +Pl +xm +xm +qo +qJ +qf +>>>>>>> Stashed changes xm xm xm @@ -47319,6 +53821,7 @@ xm xm xm xm +<<<<<<< Updated upstream jm wT xm @@ -47326,6 +53829,15 @@ xm jm eE eE +======= +iI +wT +xm +xm +iI +qf +qf +>>>>>>> Stashed changes xm xm xm @@ -47621,6 +54133,7 @@ xm xm xm xm +<<<<<<< Updated upstream jm mg xm @@ -47628,6 +54141,15 @@ xm uG CX iQ +======= +iI +cf +xm +xm +lh +Dx +Ip +>>>>>>> Stashed changes xm xm xm @@ -47923,6 +54445,7 @@ xm xm xm xm +<<<<<<< Updated upstream Vo uG oE @@ -47931,6 +54454,16 @@ dm ny dL Vo +======= +Sy +lh +OU +lh +iu +qJ +iS +Sy +>>>>>>> Stashed changes xm xm xm @@ -48225,6 +54758,7 @@ xm xm xm xm +<<<<<<< Updated upstream Vo Vo jm @@ -48233,6 +54767,16 @@ Vo FO FO Vo +======= +Sy +Sy +iI +iI +Sy +mP +mP +Sy +>>>>>>> Stashed changes xm xm xm @@ -48531,10 +55075,17 @@ xm xm xm xm +<<<<<<< Updated upstream Vo Ot ny Vo +======= +Sy +Kr +qJ +Sy +>>>>>>> Stashed changes xm xm xm @@ -48833,11 +55384,19 @@ xm xm xm xm +<<<<<<< Updated upstream jm ny ny Vo Vo +======= +iI +qJ +qJ +Sy +Sy +>>>>>>> Stashed changes xm xm xm @@ -49135,11 +55694,19 @@ xm xm xm xm +<<<<<<< Updated upstream jm cB ny ny Vo +======= +iI +vo +qJ +qJ +Sy +>>>>>>> Stashed changes xm xm xm @@ -49437,11 +56004,19 @@ xm xm xm xm +<<<<<<< Updated upstream Vo nF gH oa Vo +======= +Sy +aR +dv +si +Sy +>>>>>>> Stashed changes xm xm xm @@ -49739,11 +56314,19 @@ xm xm xm xm +<<<<<<< Updated upstream Vo Vo AG ny jm +======= +Sy +Sy +nc +qJ +iI +>>>>>>> Stashed changes xm xm xm @@ -50042,10 +56625,17 @@ xm xm xm xm +<<<<<<< Updated upstream Vo nb ny jm +======= +Sy +xW +qJ +iI +>>>>>>> Stashed changes xm xm xm @@ -50344,10 +56934,17 @@ xm xm xm xm +<<<<<<< Updated upstream Vo gA mg Vo +======= +Sy +ko +cf +Sy +>>>>>>> Stashed changes xm xm xm @@ -50646,10 +57243,17 @@ xm xm xm xm +<<<<<<< Updated upstream Vo MD uG Vo +======= +Sy +aA +lh +Sy +>>>>>>> Stashed changes xm xm xm @@ -50947,11 +57551,19 @@ xm xm xm xm +<<<<<<< Updated upstream jm Vo Vo TN Vo +======= +iI +Sy +Sy +hn +Sy +>>>>>>> Stashed changes xm xm xm diff --git a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm index abe23afc61..43f09fbac2 100644 --- a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm +++ b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm @@ -26,6 +26,7 @@ /turf/open/floor/pod/dark, /area/f13/building/powered) "aaC" = ( +<<<<<<< Updated upstream /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded"; pixel_x = -14 @@ -33,12 +34,17 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" }, +======= +/obj/structure/flora/grass/coyote/nineteen, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "aaG" = ( /obj/machinery/hydroponics/soil, /obj/machinery/light, /turf/open/indestructible/ground/outside/desert, /area/maintenance/bar) +<<<<<<< Updated upstream "aaJ" = ( /obj/structure/table/wood/junk, /obj/item/clothing/mask/cigarette/rollie/cannabis{ @@ -52,6 +58,16 @@ }, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +"aaI" = ( +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) +"aaJ" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermainright" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "aaL" = ( /obj/structure/stairs/north{ color = "#A47449" @@ -72,6 +88,7 @@ /obj/machinery/vending/cola, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/t) +<<<<<<< Updated upstream "aaR" = ( /obj/item/ammo_box/magazine/m556/rifle/empty{ pixel_x = 6; @@ -105,6 +122,20 @@ /obj/item/gun/ballistic/automatic/service/carbine, /turf/open/floor/wood_common/wood_common_light, /area/f13/ncr) +======= +"aaO" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "aaT" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/sofa{ @@ -153,6 +184,12 @@ icon_state = "horizontalinnermain2" }, /area/f13/wasteland) +"abO" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "abS" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -222,6 +259,7 @@ /obj/item/ingot/uranium, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream "adp" = ( /obj/structure/barricade/concrete, /obj/effect/decal/cleanable/dirt, @@ -256,6 +294,38 @@ /turf/open/indestructible/ground/outside/sidewalk{ dir = 1; icon_state = "outercorner" +======= +"adi" = ( +/obj/structure/stairs/north{ + color = "#A47449" + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1; + layer = 10000 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/caves) +"adp" = ( +/obj/machinery/chem_master, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +"adz" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +"aeE" = ( +/obj/structure/barricade/wooden/planks, +/obj/structure/simple_door/metal/dirtystore, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"aeH" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 +>>>>>>> Stashed changes }, /area/f13/wasteland) "aeX" = ( @@ -272,6 +342,22 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream +======= +"afe" = ( +/obj/structure/barricade/wooden, +/obj/structure/decoration/rag, +/obj/structure/destructible/tribal_torch/wall/lit{ + pixel_y = 25 + }, +/obj/structure/barricade/wooden/planks/pregame, +/turf/closed/wall/mineral/wood, +/area/f13/wasteland/legion) +"afq" = ( +/obj/item/cultivator/rake, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "aft" = ( /obj/item/stack/sheet/animalhide/human, /turf/open/indestructible/ground/outside/graveldirt, @@ -295,6 +381,14 @@ dir = 4 }, /area/f13/wasteland/city) +"afL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "afM" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -517,11 +611,18 @@ }, /area/f13/ambientlighting/building/y) "ajU" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain2right" }, /area/f13/wasteland) +======= +/turf/open/floor/wood_common{ + icon_state = "common-broken4" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ajV" = ( /obj/structure/simple_door/metal/store{ icon_state = "brokenstore" @@ -555,6 +656,7 @@ "akw" = ( /turf/closed/wall/mineral/wood, /area/f13/ambientlighting/building/d) +<<<<<<< Updated upstream "akN" = ( /obj/structure/cable/outdoors{ icon_state = "2-8" @@ -573,6 +675,18 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +"akT" = ( +/obj/structure/table, +/obj/machinery/computer/terminal{ + dir = 4; + termtag = "Public" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "akU" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -692,6 +806,7 @@ /obj/structure/sign/warning/nosmoking/circle, /turf/closed/wall/mineral/concrete, /area/engine/workshop) +<<<<<<< Updated upstream "amQ" = ( /obj/structure/fence/corner{ dir = 4; @@ -704,6 +819,27 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) +======= +"amw" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) +"amC" = ( +/obj/effect/decal/cleanable/greenglow{ + pixel_x = -8; + pixel_y = 12 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"amQ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/port_gen/pacman/diesel, +/obj/item/stack/sheet/mineral/plasma/fifty, +/turf/open/floor/f13{ + icon_state = "floorrusty" + }, +/area/f13/ambientlighting/building/f) +>>>>>>> Stashed changes "amS" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/dirt{ @@ -764,6 +900,10 @@ /obj/structure/nest/gecko, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) +"aov" = ( +/obj/structure/closet/crate/footlocker, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "aow" = ( /obj/structure/billboard/nukagirl2, /turf/open/indestructible/ground/outside/dirt, @@ -790,6 +930,7 @@ /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) "aoD" = ( +<<<<<<< Updated upstream /obj/structure/fence/wooden{ dir = 8 }, @@ -801,6 +942,13 @@ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/m) +======= +/obj/structure/chair/sofa/right{ + dir = 8 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "aoV" = ( /obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt{ @@ -921,9 +1069,21 @@ }, /area/f13/building/powered) "aqx" = ( +<<<<<<< Updated upstream /obj/structure/sign/warning/radiation, /turf/closed/indestructible/rock, /area/f13/wasteland) +======= +/obj/structure/barricade/bars, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "aqy" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/sidewalk{ @@ -1017,6 +1177,18 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"asc" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "ase" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -1032,11 +1204,26 @@ }, /area/f13/wasteland) "aso" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outermaincornerinner"; dir = 8 }, /area/f13/wasteland) +======= +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/f13/building/powered) +"asz" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/cigars_cases, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "asD" = ( /mob/living/simple_animal/hostile/raider/thief, /turf/open/indestructible/ground/outside/dirt, @@ -1105,9 +1292,17 @@ icon_state = "horizontalbottombordertop0" }, /area/f13/wasteland) +<<<<<<< Updated upstream "atA" = ( /obj/machinery/vending/coffee, /turf/open/floor/wood_fancy/wood_fancy_light, +======= +"atw" = ( +/obj/item/reagent_containers/glass/rag/towel, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/ash, +/turf/open/floor/plasteel/grimy, +>>>>>>> Stashed changes /area/f13/ncr) "atE" = ( /obj/machinery/power/port_gen/pacman/diesel{ @@ -1162,11 +1357,22 @@ name = "dirty floor" }, /area/f13/building/powered) +"aui" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "auj" = ( /obj/machinery/autolathe/ammo/unlocked_basic, /obj/effect/decal/cleanable/ash, /turf/open/floor/plating/rust, /area/f13/followers) +"aus" = ( +/obj/structure/wreck/trash/machinepiletwo, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "auu" = ( /obj/structure/closet, /obj/item/coin/iron, @@ -1247,6 +1453,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream "avq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -1261,6 +1468,12 @@ /obj/structure/table/wood/junk, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, +======= +"avt" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ghoul, +/turf/open/floor/carpet/arcade, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "avu" = ( /obj/machinery/light/small{ @@ -1279,12 +1492,19 @@ }, /area/f13/wasteland/followers) "avw" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/ruins{ icon_state = "ruinswindowbroken" }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/glass, /turf/open/floor/carpet/arcade, +======= +/obj/structure/table/snooker{ + dir = 1 + }, +/turf/open/floor/wood_fancy, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "avz" = ( /obj/structure/chair/wood{ @@ -1292,6 +1512,11 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/town) +"avA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/cards/deck/unum, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "avE" = ( /obj/effect/turf_decal, /obj/machinery/conveyor, @@ -1478,8 +1703,19 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "axO" = ( +<<<<<<< Updated upstream /obj/effect/spawner/lootdrop/wastelootgood, /turf/open/indestructible/ground/outside/sidewalk, +======= +/obj/effect/decal/marking{ + icon_state = "dottedhorizontalcorroded"; + pixel_y = -17 + }, +/obj/structure/car/rubbish4{ + pixel_x = -20 + }, +/turf/open/indestructible/ground/outside/road, +>>>>>>> Stashed changes /area/f13/wasteland) "axR" = ( /obj/effect/decal/cleanable/glass, @@ -1507,8 +1743,15 @@ }, /area/f13/building/abandoned/h) "ayd" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/vomit/old, /turf/open/floor/wood_fancy, +======= +/obj/structure/table/booth, +/turf/open/floor/f13/wood{ + icon_state = "housewood1-broken" + }, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "aye" = ( /obj/effect/decal/cleanable/dirt, @@ -1534,11 +1777,26 @@ }, /area/f13/building/powered) "ayt" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/desert{ icon_state = "wasteland32" }, /area/f13/wasteland) +======= +/obj/machinery/recycler/deathtrap, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) +"ayG" = ( +/obj/item/kirbyplants/dead{ + desc = "A mummified potted plant."; + name = "very dead potted plant"; + pixel_x = -1; + pixel_y = 11 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ayH" = ( /obj/structure/chair/middle{ dir = 8 @@ -1676,12 +1934,24 @@ /obj/structure/sign/yield, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream "aAo" = ( /obj/effect/spawner/lootdrop/druggie_pill, /turf/open/floor/f13/wood{ icon_state = "housebase4-broken" }, /area/f13/ambientlighting/building/m) +======= +"aAm" = ( +/obj/structure/target_stake, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +"aAo" = ( +/obj/item/reagent_containers/pill/patch/healpoultice, +/obj/effect/decal/cleanable/blood, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "aAE" = ( /obj/effect/decal/cleanable/oil, /turf/open/indestructible/ground/outside/sidewalk, @@ -1727,10 +1997,27 @@ /obj/effect/decal/cleanable/dirt{ color = "#363636" }, +<<<<<<< Updated upstream /obj/item/clothing/suit/armor/tiered/light/legion/recruit, /obj/item/clothing/suit/armor/tiered/light/legion/recruit, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/legion) +"aBw" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/obj/item/trash/can, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "aBF" = ( /obj/structure/car/rubbish4{ desc = "A rusty Pre-War Fire Engine carcass.. or at least you think that's what this is.
This carcass is damaged beyond repair."; @@ -1752,6 +2039,20 @@ icon_state = "bluerustysolid" }, /area/f13/followers) +<<<<<<< Updated upstream +======= +"aCp" = ( +/obj/structure/cargocrate, +/obj/structure/sign/poster/ncr/keep_to_myself{ + desc = "The man. The myth. The unknown NCR Corporal who's photo was taken years ago and is still used today in various NCR camps to encourage proper behavior."; + name = "Satisfactory NCR Poster"; + layer = 100 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "aCs" = ( /obj/structure/reagent_dispensers/compostbin, /obj/effect/turf_decal/weather/dirt{ @@ -1803,6 +2104,12 @@ /obj/structure/junk/small/bed, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/t) +"aCT" = ( +/obj/structure/table/booth, +/obj/item/stack/wrapping_paper, +/obj/item/stack/wrapping_paper, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "aCZ" = ( /obj/machinery/light, /obj/effect/decal/cleanable/dirt{ @@ -1822,12 +2129,18 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/building/tribal) "aDt" = ( +<<<<<<< Updated upstream /obj/structure/closet/crate/trashcart, /obj/item/trash/f13/rotten, /obj/item/trash/f13/rotten, /obj/item/trash/f13/rotten, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain2" +======= +/obj/effect/decal/cleanable/oil, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" +>>>>>>> Stashed changes }, /area/f13/wasteland) "aDA" = ( @@ -1915,9 +2228,22 @@ color = "#5c131b"; pixel_y = 32 }, +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, /area/f13/legioncamp) +======= +/turf/open/indestructible/ground/outside/dirt{ + dir = 6; + icon_state = "dirt" + }, +/area/f13/wasteland/legion) +"aEE" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/machinery/light, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "aEF" = ( /obj/item/pickaxe, /obj/effect/decal/cleanable/dirt, @@ -1996,6 +2322,13 @@ }, /turf/open/floor/carpet/purple, /area/maintenance/bar) +"aFA" = ( +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbrokenvertical" + }, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "aFL" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/dirt{ @@ -2080,7 +2413,22 @@ layer = 2.9 }, /turf/open/floor/plating/rust, +<<<<<<< Updated upstream /area/f13/ambientlighting/building/j) +======= +/area/f13/wasteland) +"aHg" = ( +/obj/structure/table, +/obj/machinery/computer/terminal/stored_password{ + door_id = "veryevilroom"; + proj_pass_rate = 25 + }, +/obj/machinery/light/fo13colored/Red{ + dir = 1 + }, +/turf/open/floor/pod/dark, +/area/f13/building/powered) +>>>>>>> Stashed changes "aHk" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/f13/wood, @@ -2122,6 +2470,7 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream "aHV" = ( /obj/machinery/door/unpowered/secure_bos, /obj/effect/turf_decal/weather/dirt{ @@ -2141,6 +2490,9 @@ pixel_x = 2; pixel_y = 3 }, +======= +"aIb" = ( +>>>>>>> Stashed changes /obj/machinery/light{ dir = 4; pixel_y = -16 @@ -2223,6 +2575,7 @@ }, /area/f13/wasteland) "aJw" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/cobweb{ dir = 1; @@ -2230,6 +2583,14 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/item/mine/shrapnel, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outercorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "aJx" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -2245,6 +2606,7 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream "aJV" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -2257,6 +2619,13 @@ /obj/effect/landmark/start/f13/ncrrearechelon, /obj/effect/overlay/desert/sonora/edge, /turf/open/floor/wood_common, +======= +"aJW" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "aJY" = ( /obj/machinery/light{ @@ -2333,6 +2702,12 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/building/abandoned/m) +"aKT" = ( +/obj/item/mine/shrapnel, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) "aLc" = ( /obj/structure/table/wood, /obj/item/paper, @@ -2469,6 +2844,7 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "aMD" = ( /obj/item/gun/energy/laser/pistol, /obj/item/gun/energy/laser/pistol, @@ -2481,6 +2857,19 @@ icon_state = "reddirtyfull" }, /area/f13/brotherhood) +======= +"aMQ" = ( +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) +"aMR" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "aMZ" = ( /obj/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -2522,6 +2911,11 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/o) +"aNu" = ( +/obj/structure/chair/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "aNG" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -2568,11 +2962,18 @@ /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) "aOz" = ( +<<<<<<< Updated upstream /obj/structure/wreck/trash/five_tires, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "aOB" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerborder"; @@ -2630,6 +3031,15 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"aPL" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "aPM" = ( /obj/structure/rack, /obj/item/reagent_containers/food/snacks/kebab/human, @@ -2650,9 +3060,27 @@ }, /area/f13/building/abandoned/h) "aPP" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/m) +======= +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +"aPS" = ( +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" + }, +/mob/living/simple_animal/hostile/radscorpion/black, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "aPY" = ( /obj/structure/flora/grass/both, /obj/structure/flora/ausbushes/brflowers, @@ -2697,6 +3125,14 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/d) +<<<<<<< Updated upstream +======= +"aQx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_worn, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "aQC" = ( /mob/living/simple_animal/hostile/ghoul, /obj/effect/decal/cleanable/dirt{ @@ -2732,6 +3168,7 @@ "aQW" = ( /turf/closed/wall/f13/wood, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream "aRk" = ( /obj/item/toy/cards/deck, /obj/structure/table/booth, @@ -2743,6 +3180,23 @@ icon_state = "dark" }, /area/f13/brotherhood) +======= +"aRb" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress1"; + pixel_y = 9 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +"aRk" = ( +/obj/structure/fence{ + dir = 4 + }, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "aRp" = ( /obj/structure/wreck/trash/autoshaft{ pixel_x = -8 @@ -2840,6 +3294,7 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +<<<<<<< Updated upstream "aSp" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermainright" @@ -2848,6 +3303,10 @@ "aSu" = ( /obj/structure/simple_door/house, /turf/open/floor/wood_wide, +======= +"aSu" = ( +/turf/closed/wall/f13/store, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "aSO" = ( /obj/structure/toilet{ @@ -2909,6 +3368,7 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "aTG" = ( +<<<<<<< Updated upstream /obj/structure/closet/crate/large, /obj/item/stack/sheet/cloth/ten, /obj/item/stack/sheet/glass/ten, @@ -2916,6 +3376,11 @@ /obj/item/stack/sheet/mineral/limestone/five, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/machinery/gear_painter, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "aTK" = ( /obj/structure/toilet, /obj/effect/decal/cleanable/dirt, @@ -2932,6 +3397,15 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"aTP" = ( +/obj/machinery/grill, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "aTU" = ( /obj/machinery/vending/tool, /obj/effect/decal/cleanable/dirt{ @@ -2944,6 +3418,14 @@ "aTW" = ( /turf/closed/mineral/random, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"aTY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/broken_bottle, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) +>>>>>>> Stashed changes "aUc" = ( /obj/structure/flora/tree/wasteland, /turf/open/indestructible/ground/outside/desert, @@ -2956,6 +3438,7 @@ /obj/item/reagent_containers/food/condiment/quality_oil, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/maintenance/bar) +<<<<<<< Updated upstream "aUl" = ( /obj/structure/closet/crate/large, /obj/item/stack/sheet/cloth/ten, @@ -2971,6 +3454,41 @@ dir = 4 }, /turf/open/indestructible/ground/outside/desert, +======= +"aUi" = ( +/obj/structure/table, +/obj/machinery/button/door{ + pixel_y = 28; + id = 980 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +"aUl" = ( +/obj/structure/flora/brushwoodalt, +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) +"aUn" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +"aUD" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 4; + light_color = "#f4e3b0" + }, +/obj/effect/decal/cleanable/dirt{ + color = "#363636" + }, +/obj/machinery/gear_painter, +/turf/open/floor/plasteel/f13/stone/rugged, +>>>>>>> Stashed changes /area/f13/legioncamp) "aUS" = ( /obj/structure/barricade/wooden, @@ -2983,6 +3501,7 @@ }, /turf/closed/mineral/random/low_chance, /area/f13/building/tribal) +<<<<<<< Updated upstream "aUY" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -2992,6 +3511,11 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) +======= +"aVc" = ( +/turf/closed/wall/r_wall/rust, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "aVe" = ( /obj/effect/spawner/lootdrop/f13/alcoholspawner, /obj/structure/table/wood/fancy, @@ -3117,6 +3641,7 @@ }, /turf/closed/wall/mineral/wood, /area/f13/wasteland/legion) +<<<<<<< Updated upstream "aWT" = ( /obj/machinery/autolathe, /turf/open/indestructible/ground/outside/dirt{ @@ -3129,6 +3654,52 @@ }, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +"aWQ" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 10 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +"aWT" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 48; + pixel_x = -16 + }, +/obj/effect/decal/cleanable/blood, +/obj/structure/closet/crate/wicker, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"aXb" = ( +/obj/structure/car/rubbish2{ + pixel_x = 7; + pixel_y = -16 + }, +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) +"aXd" = ( +/obj/structure/table, +/obj/structure/barricade/bars, +/obj/machinery/door/poddoor/shutters{ + id = 980 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "aXh" = ( /obj/structure/fence, /obj/effect/overlay/desert_side{ @@ -3165,6 +3736,16 @@ /obj/effect/mapping_helpers/network_builder/power_cable/cyan, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) +<<<<<<< Updated upstream +======= +"aXo" = ( +/obj/machinery/vending/hydronutrients{ + force_free = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "aXw" = ( /obj/effect/turf_decal/huge{ dir = 4 @@ -3307,11 +3888,25 @@ /obj/item/reagent_containers/food/snacks/grown/poppy, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream "aZi" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/ghoul, /turf/open/indestructible/ground/inside/mountain, +======= +"aZg" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/chalkboard{ + icon_state = "board_text1"; + desc = "A classic chalkboard. Seems to have a graph down of the NCR's current inventory, or rather their past inventory." + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "aZj" = ( /turf/open/floor/plasteel/dark, @@ -3331,6 +3926,7 @@ /area/f13/ambientlighting/building/i) "aZt" = ( /obj/structure/fence/corner{ +<<<<<<< Updated upstream dir = 4 }, /turf/open/indestructible/ground/outside/sidewalk{ @@ -3345,15 +3941,50 @@ /obj/structure/rack/large/shelf_rust, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +======= + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerturn" + }, +/area/f13/wasteland) +"aZv" = ( +/obj/machinery/door/unpowered/secure_NCR, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +"aZz" = ( +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ambientlighting/building/x) +"aZA" = ( +/obj/structure/kitchenspike, +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "aZR" = ( /obj/structure/wreck/trash/two_tire, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "aZV" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/oil/slippery, /obj/effect/decal/cleanable/glass, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/obj/item/chair/wood/modern, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "aZY" = ( /obj/machinery/light{ dir = 4 @@ -3537,6 +4168,11 @@ icon_state = "dirt" }, /area/f13/wasteland) +"bck" = ( +/obj/effect/decal/fakelattice, +/obj/structure/table_frame/wood, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "bcl" = ( /obj/machinery/light/small{ dir = 4 @@ -3570,11 +4206,22 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +<<<<<<< Updated upstream "bcP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, /turf/open/floor/plasteel/bar, /area/f13/ambientlighting/building/m) +======= +"bcQ" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "bdc" = ( /obj/structure/debris/v4, /turf/open/indestructible/ground/outside/sidewalk, @@ -3626,10 +4273,23 @@ /turf/open/floor/wood_common, /area/f13/building/abandoned/x) "bdX" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/structure/rack/large/shelf_rust, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ber" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/dirt{ @@ -3665,12 +4325,21 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +<<<<<<< Updated upstream "beK" = ( /obj/structure/cable/outdoors{ icon_state = "2-8" }, /turf/open/floor/wood_common/wood_common_light, /area/f13/ncr) +======= +"beU" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/porta_turret/f13/turret_shotgun/burstfire/robot, +/turf/open/floor/plating/rust, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "bfb" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -3727,6 +4396,7 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +<<<<<<< Updated upstream "bfO" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/sidewalk{ @@ -3739,10 +4409,19 @@ name = "rusted floor" }, /area/f13/sewer/powered) +======= +"bfY" = ( +/obj/machinery/light/fo13colored/Red{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "bgd" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/caves) +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "bge" = ( /obj/machinery/autolathe/constructionlathe, /obj/effect/decal/cleanable/dirt{ @@ -3756,6 +4435,7 @@ /obj/structure/wreck/trash/one_barrel, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +<<<<<<< Updated upstream "bgm" = ( /turf/open/floor/plating/f13/inside/gravel/edge{ dir = 5 @@ -3763,6 +4443,21 @@ /area/f13/wasteland) "bgw" = ( /turf/closed/wall/r_wall/rust, +======= +"bgn" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/plating/f13/inside/gravel/edge{ + dir = 1 + }, +/area/f13/wasteland) +"bgw" = ( +/obj/structure/junk/machinery, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +>>>>>>> Stashed changes /area/f13/sewer/powered) "bgC" = ( /obj/effect/overlay/desert_side{ @@ -3784,8 +4479,21 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) "bgH" = ( +<<<<<<< Updated upstream /obj/item/storage/trash_stack{ icon_state = "Junk_3" +======= +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/glass/ten, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/mineral/plasma/twentyfive, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +"bgO" = ( +/obj/machinery/light{ + dir = 8; + pixel_y = -15 +>>>>>>> Stashed changes }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain0" @@ -3839,6 +4547,17 @@ icon_state = "outerborder" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"bhz" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "bhD" = ( /obj/structure/chair/wood{ dir = 8 @@ -3917,6 +4636,18 @@ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/f) +<<<<<<< Updated upstream +======= +"biB" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/blood{ + dir = 13; + icon_state = "tracks"; + pixel_y = 8 + }, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "biC" = ( /obj/structure/cable/outdoors{ icon_state = "2-8" @@ -3924,9 +4655,15 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "biF" = ( +<<<<<<< Updated upstream /obj/effect/mob_spawn/human/corpse/enclavescientist, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/simple_door/metal/dirtystore, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "biH" = ( /obj/structure/closet/locker/fridge, /obj/item/reagent_containers/food/snacks/f13/gecko_kebab, @@ -3982,11 +4719,32 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +<<<<<<< Updated upstream "bjT" = ( /turf/open/floor/plasteel/stairs{ dir = 4 }, /area/f13/building/powered) +======= +"bjI" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +"bjZ" = ( +/obj/effect/turf_decal/big{ + dir = 4 + }, +/obj/effect/decal/cleanable/oil{ + icon_state = "floor2"; + pixel_x = -12 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "bki" = ( /obj/effect/decal/cleanable/glass, /turf/open/indestructible/ground/inside/mountain, @@ -4009,6 +4767,17 @@ icon_state = "floorrusty" }, /area/f13/building/abandoned/h) +"bkV" = ( +/obj/structure/chair/bench{ + dir = 1 + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "bkW" = ( /obj/effect/decal/fakelattice, /turf/open/floor/plating/tunnel{ @@ -4092,8 +4861,15 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/ambientlighting/building/c) "blR" = ( +<<<<<<< Updated upstream /obj/effect/spawner/lootdrop/wastelootgood, /obj/effect/decal/cleanable/dirt, +======= +/obj/machinery/light/small{ + dir = 8; + pixel_y = -7 + }, +>>>>>>> Stashed changes /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "blS" = ( @@ -4106,11 +4882,15 @@ }, /area/f13/wasteland) "blT" = ( +<<<<<<< Updated upstream /obj/structure/rack, /obj/item/clothing/neck/jamrock, /obj/effect/decal/cleanable/dirt/dust, /obj/item/clothing/glasses/heat, /turf/open/floor/plasteel/vaporwave, +======= +/turf/open/floor/wood_wide, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "blV" = ( /obj/structure/table, @@ -4168,6 +4948,33 @@ /obj/structure/wreck/trash/halftire, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"bnr" = ( +/obj/item/radio/headset/headset_ncr{ + pixel_y = 24; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 12; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = -2; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = -2; + pixel_x = -14 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 12; + pixel_x = -14 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 24; + pixel_x = -14 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "bnw" = ( /obj/structure/simple_door/metal/store{ icon_state = "brokenstore" @@ -4282,10 +5089,19 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "bpa" = ( +<<<<<<< Updated upstream /obj/structure/wreck/trash/machinepile, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, +======= +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "bph" = ( /obj/machinery/door/airlock/virology/glass{ @@ -4299,6 +5115,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"bpn" = ( +/obj/structure/closet/crate/miningcar, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "bpo" = ( /turf/open/indestructible/ground/outside/road, /area/f13/ambientlighting/building/o) @@ -4367,9 +5196,29 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) "bqb" = ( +<<<<<<< Updated upstream /mob/living/simple_animal/hostile/radscorpion/black, /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -13 + }, +/turf/open/indestructible/ground/outside/graveldirt, +>>>>>>> Stashed changes /area/f13/caves) "bqj" = ( /mob/living/simple_animal/hostile/ghoul/legendary, @@ -4400,10 +5249,17 @@ icon_state = "verticaloutermain2" }, /area/f13/wasteland) +<<<<<<< Updated upstream "bqM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/wastelootgood, /turf/open/floor/wood_common, +======= +"bqI" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/carpet/arcade, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "bqN" = ( /obj/effect/turf_decal/huge, @@ -4418,6 +5274,12 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +"bqR" = ( +/obj/structure/table/reinforced, +/obj/structure/barricade/bars, +/obj/effect/spawner/structure/window/reinforced/indestructable, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "bqV" = ( /obj/effect/overlay/desert_side{ dir = 4 @@ -4488,6 +5350,7 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +<<<<<<< Updated upstream "bsi" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/bottle/blackpowder, @@ -4510,6 +5373,21 @@ }, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, /area/f13/ambientlighting/building/m) +======= +"brU" = ( +/obj/structure/table, +/obj/item/storage/box/ration, +/obj/item/storage/box/ration, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +"bsp" = ( +/obj/structure/rack/shelf_metal, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "bsA" = ( /obj/structure/rack, /obj/item/flashlight{ @@ -4563,6 +5441,22 @@ name = "dirty floor" }, /area/f13/brotherhood) +<<<<<<< Updated upstream +======= +"btv" = ( +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowbroken" + }, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/bars, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +"btx" = ( +/obj/structure/sign/poster/prewar/poster70, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +>>>>>>> Stashed changes "btB" = ( /obj/structure/chair/folding{ dir = 4 @@ -4582,6 +5476,7 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "btN" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -4600,6 +5495,11 @@ /obj/structure/chair/bench, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain1" +======= +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2" +>>>>>>> Stashed changes }, /area/f13/wasteland) "btS" = ( @@ -4608,6 +5508,7 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/t) +<<<<<<< Updated upstream "btY" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/dirt, @@ -4615,6 +5516,14 @@ icon_state = "wide-broken5" }, /area/f13/ambientlighting/building/j) +======= +"btW" = ( +/obj/item/crafting/campfirekit, +/obj/item/crafting/campfirekit, +/obj/structure/shelf_wood, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "bud" = ( /obj/structure/shelf_wood, /obj/item/twohanded/spear/bonespear, @@ -4629,6 +5538,11 @@ /obj/effect/decal/cleanable/blood/gibs/human/body, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) +"buK" = ( +/obj/structure/flora/twig3, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "buQ" = ( /turf/open/indestructible/ground/outside/water, /area/f13/ambientlighting/building/c) @@ -4647,6 +5561,15 @@ color = "00FFFF" }, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"bve" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 9 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "bvj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -4684,6 +5607,25 @@ icon_state = "verticalleftborderleft1" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"bvx" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/booth, +/obj/item/clothing/suit/armor/tiered/hooded/techpriest, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +"bvB" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerborder" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "bvI" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13, @@ -4734,6 +5676,7 @@ /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/powered) "bwE" = ( +<<<<<<< Updated upstream /obj/effect/spawner/lootdrop/f13/junkspawners, /obj/structure/chair/stool{ dir = 4; @@ -4742,6 +5685,12 @@ }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain0" +======= +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" +>>>>>>> Stashed changes }, /area/f13/wasteland) "bwK" = ( @@ -4856,6 +5805,15 @@ icon_state = "floorrusty" }, /area/f13/followers) +"byn" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "byu" = ( /obj/structure/fluff/beach_umbrella/engine, /turf/open/indestructible/ground/outside/dirt, @@ -4933,6 +5891,7 @@ /obj/effect/overlay/desert_side, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +<<<<<<< Updated upstream "bzw" = ( /obj/effect/decal/cleanable/glass, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, @@ -4959,6 +5918,15 @@ icon_state = "dark" }, /area/f13/brotherhood) +======= +"bzD" = ( +/obj/structure/table/booth, +/obj/item/storage/box/papersack, +/obj/item/storage/box/papersack, +/obj/item/storage/box/papersack, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "bzS" = ( /obj/structure/flora/grass/jungle, /obj/effect/turf_decal/weather/dirt{ @@ -5009,6 +5977,15 @@ icon_state = "floorrusty" }, /area/f13/followers) +<<<<<<< Updated upstream +======= +"bAG" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "bAR" = ( /obj/structure/lamp_post/doubles/bent{ dir = 8 @@ -5023,9 +6000,15 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "bBb" = ( +<<<<<<< Updated upstream /obj/structure/flora/rock/pile/largejungle, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/reagent_dispensers/watertank/high, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "bBi" = ( /obj/structure/car, /turf/open/indestructible/ground/outside/road{ @@ -5062,9 +6045,15 @@ }, /area/f13/building/powered) "bBF" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/oil, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/fluff/hedge, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "bBR" = ( /obj/structure/debris/v3, /turf/open/indestructible/ground/outside/dirt{ @@ -5099,6 +6088,7 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/maintenance/bar) +<<<<<<< Updated upstream "bCu" = ( /obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/blood{ @@ -5106,6 +6096,14 @@ }, /turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) +======= +"bCH" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outercorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "bCK" = ( /turf/closed/wall/f13/tunnel, /area/f13/building/abandoned/h) @@ -5137,6 +6135,10 @@ icon_state = "dottedverticalcorroded"; pixel_x = -14 }, +<<<<<<< Updated upstream +======= +/obj/structure/junk/locker, +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/road{ dir = 1; icon_state = "horizontaltopborderbottom0" @@ -5176,8 +6178,14 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "bDA" = ( +<<<<<<< Updated upstream /obj/machinery/seed_extractor, /turf/open/floor/wood_common, +======= +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "bDG" = ( /obj/structure/reagent_dispensers/barrel/dangerous, @@ -5203,6 +6211,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"bDQ" = ( +/obj/machinery/smartfridge/bottlerack{ + pixel_x = -3 + }, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "bDS" = ( /obj/structure/debris/v1, /turf/open/indestructible/ground/outside/sidewalk, @@ -5214,6 +6232,7 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream "bEf" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -5223,6 +6242,17 @@ }, /turf/closed/wall/mineral/brick, /area/f13/ncr) +======= +"bEh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/bag/chemistry, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "bEl" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -5334,6 +6364,13 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"bFD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "bFJ" = ( /obj/structure/pondlily_big, /obj/effect/turf_decal/weather/dirt, @@ -5350,6 +6387,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "bFX" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 9 }, @@ -5361,6 +6399,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +"bFY" = ( +/obj/effect/decal/fakelattice, +/obj/structure/junk/small/bed, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "bGd" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/barricade/sandbags, @@ -5383,12 +6431,18 @@ icon_state = "dirt" }, /area/f13/wasteland) +"bGr" = ( +/obj/structure/rack/shelf_metal, +/obj/item/multitool, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "bGw" = ( /obj/structure/destructible/tribal_torch/wall/lit{ pixel_y = 25 }, /turf/closed/wall/mineral/wood, /area/f13/wasteland/legion) +<<<<<<< Updated upstream "bGD" = ( /obj/item/storage/trash_stack{ icon_state = "trash_2" @@ -5396,6 +6450,13 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop3" }, +======= +"bGB" = ( +/mob/living/simple_animal/hostile/renegade/guardian, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "bGH" = ( /obj/effect/decal/cleanable/dirt, @@ -5450,14 +6511,37 @@ /obj/effect/landmark/poster_spawner/pinup, /turf/closed/wall/f13/wood, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"bHs" = ( +/obj/structure/car/rubbish2{ + pixel_x = 7; + pixel_y = -16 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "bHt" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/indestructible/ground/outside/dirt, /area/f13/underground/cave) "bHu" = ( +<<<<<<< Updated upstream /obj/structure/flora/rock/jungle, /turf/open/indestructible/ground/outside/dirt, +======= +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +>>>>>>> Stashed changes /area/f13/wasteland) +"bHF" = ( +/obj/structure/sign/poster/prewar/poster79, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) "bHH" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/darkbrown/corner{ @@ -5500,12 +6584,24 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "bHY" = ( +<<<<<<< Updated upstream /obj/machinery/light{ dir = 8; light_color = "#e8eaff" }, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/structure/junk/small, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "bHZ" = ( /turf/open/floor/wood_common/wood_common_dark, /area/f13/building/abandoned/m) @@ -5529,9 +6625,20 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) "bIP" = ( +<<<<<<< Updated upstream /obj/structure/table/wood/junk, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) +======= +/obj/structure/fluff/paper/corner{ + dir = 1 + }, +/obj/structure/chair/sofa/right{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "bJc" = ( /obj/structure/railing/corner{ color = "#A47449" @@ -5565,9 +6672,19 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "bJW" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "bJX" = ( /obj/structure/table/reinforced, /obj/structure/barricade/bars, @@ -5653,6 +6770,7 @@ "bLe" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/sidewalk{ +<<<<<<< Updated upstream icon_state = "horizontaltopbordertop0" }, /area/f13/wasteland) @@ -5686,6 +6804,24 @@ /obj/structure/flora/grass/coyote/twentynine, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +"bLo" = ( +/obj/structure/lattice, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/u) +"bLC" = ( +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "bLH" = ( /mob/living/simple_animal/hostile/ghoul, /obj/effect/decal/cleanable/dirt/dust, @@ -5722,6 +6858,16 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream +======= +"bMp" = ( +/obj/effect/overlay/rockfloor_side, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "bMJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old{ @@ -5734,6 +6880,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"bMM" = ( +/obj/structure/decoration/vent, +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/m) "bMQ" = ( /obj/structure/rack/shelf_metal, /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ @@ -5756,6 +6906,16 @@ /obj/machinery/computer/slot_machine, /turf/open/floor/carpet/purple, /area/f13/bar) +<<<<<<< Updated upstream +======= +"bNa" = ( +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "bNc" = ( /obj/structure/chair/booth{ icon_state = "booth_west_south" @@ -5789,11 +6949,18 @@ icon_state = "floordirtysolid" }, /area/f13/wasteland) +<<<<<<< Updated upstream "bNp" = ( /obj/structure/table/wood/junk, /obj/item/melee/onehanded/knife/ritualdagger, /turf/open/floor/carpet/black, /area/f13/ambientlighting/building/m) +======= +"bNr" = ( +/obj/structure/flora/grass/coyote/twentysix, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "bNw" = ( /obj/effect/turf_decal/huge{ dir = 4 @@ -5811,10 +6978,25 @@ /area/f13/building/powered) "bNx" = ( /mob/living/simple_animal/hostile/supermutant/nightkin/rangedmutant, +<<<<<<< Updated upstream /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, /area/f13/building/powered) +======= +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/building/powered) +"bNB" = ( +/obj/structure/junk/small/table, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +"bNC" = ( +/obj/effect/decal/remains/human, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "bNK" = ( /obj/structure/car/rubbish4{ pixel_x = -11; @@ -5846,6 +7028,25 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"bNP" = ( +/obj/structure/destructible/tribal_torch/lit{ + pixel_x = 13; + pixel_y = 9 + }, +/obj/structure/fence/corner/wooden{ + dir = 4 + }, +/obj/item/flag/legion, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/legioncamp) +"bNV" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "bNY" = ( /obj/effect/decal/remains{ icon_state = "remains" @@ -5855,6 +7056,13 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"bOc" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "bOd" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/dirt{ @@ -6069,6 +7277,13 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/ambientlighting/building/u) +"bQF" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/obj/item/stack/sheet/mineral/wood/five, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "bQJ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/kirbyplants{ @@ -6125,12 +7340,26 @@ /turf/open/floor/plating, /area/f13/bar) "bRy" = ( +<<<<<<< Updated upstream /obj/item/stack/f13Cash/random/denarius/high, /obj/item/stack/f13Cash/random/aureus/low, /obj/structure/rack/shelf_metal, /obj/item/reagent_containers/pill/patch/healpoultice, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) +>>>>>>> Stashed changes "bRz" = ( /obj/machinery/hydroponics/soil, /obj/structure/flora/bush, @@ -6235,6 +7464,7 @@ icon_state = "horizontaloutermain2" }, /area/f13/wasteland) +<<<<<<< Updated upstream "bTn" = ( /obj/structure/table, /obj/machinery/computer/terminal/stored_password{ @@ -6243,6 +7473,12 @@ }, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +"bSY" = ( +/obj/structure/billboard/nukagirl2, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "bTs" = ( /obj/structure/barricade/tentleathercorner{ dir = 8 @@ -6289,6 +7525,14 @@ /obj/effect/landmark/start/f13/recleg, /turf/open/floor/f13/wood, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"bTU" = ( +/turf/open/indestructible/ground/outside/ruins{ + icon_state = "rubblepillar" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "bUf" = ( /obj/structure/car/rubbish1, /turf/open/indestructible/ground/outside/road{ @@ -6308,6 +7552,7 @@ }, /area/f13/followers) "bUo" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -6322,6 +7567,11 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +======= +/obj/effect/decal/fakelattice, +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "bUt" = ( /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/floor/plating/f13/inside/gravel, @@ -6346,8 +7596,15 @@ /turf/open/floor/wood_fancy, /area/f13/building/abandoned/x) "bUW" = ( +<<<<<<< Updated upstream /obj/machinery/vending/coffee, /turf/open/floor/f13/wood, +======= +/obj/structure/simple_door/brokenglass, +/obj/structure/barricade/wooden/planks/pregame, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_wide, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "bVk" = ( /obj/structure/barricade/tentclothcorner{ @@ -6362,6 +7619,7 @@ }, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) +<<<<<<< Updated upstream "bVN" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" @@ -6374,6 +7632,22 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) +======= +"bVH" = ( +/obj/item/stack/sheet/mineral/sandbags, +/turf/open/indestructible/ground/outside/dirt{ + dir = 4; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) +"bVN" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "bVR" = ( /obj/machinery/door/poddoor/gate/preopen{ id = 334; @@ -6404,6 +7678,17 @@ /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"bWJ" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "bWM" = ( /obj/structure/table/wood, /obj/structure/destructible/tribal_torch/wall/lit, @@ -6431,12 +7716,22 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/bluechess, /area/f13/legioncamp) "bXa" = ( +<<<<<<< Updated upstream /obj/structure/fence/wooden, /obj/item/flag/legion{ pixel_y = 28; pixel_x = 1 }, /turf/open/indestructible/ground/outside/desert, +======= +/obj/structure/chair/stool/retro/tan, +/mob/living/simple_animal/hostile/renegade/grunt, +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/wasteland) "bXd" = ( /obj/structure/tires/five, @@ -6470,6 +7765,24 @@ /obj/effect/spawner/lootdrop/clothing_low, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +"bXx" = ( +/obj/item/flag/legion{ + pixel_y = 28; + pixel_x = 1 + }, +/obj/structure/fence/wooden{ + dir = 1; + icon_state = "post_wood" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"bXz" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 8 + }, +/area/f13/wasteland) "bXB" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/grass, @@ -6517,12 +7830,21 @@ }, /turf/open/floor/f13/wood, /area/f13/building/abandoned/m) +<<<<<<< Updated upstream "bYl" = ( /obj/structure/chair/wood/wings{ dir = 4 }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +======= +"bYm" = ( +/obj/structure/wreck/trash/machinepile, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "bYo" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/floor/f13{ @@ -6539,8 +7861,26 @@ /obj/effect/overlay/desert_side{ dir = 1 }, +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +======= +/obj/structure/destructible/tribal_torch/lit{ + pixel_y = -18 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 6; + icon_state = "dirt" + }, +/area/f13/legioncamp) +"bYu" = ( +/obj/structure/window/fulltile/house, +/obj/structure/curtain{ + color = "#363636" + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "bYz" = ( /obj/structure/chair/left{ dir = 1 @@ -6611,6 +7951,15 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +<<<<<<< Updated upstream +======= +"bZG" = ( +/obj/structure/flora/branch_broken, +/obj/structure/flora/twig3, +/obj/structure/flora/twig4, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "bZN" = ( /obj/structure/simple_door/house, /obj/effect/decal/cleanable/dirt/dust, @@ -6652,6 +8001,18 @@ /obj/item/clothing/glasses/sunglasses, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"cad" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "cag" = ( /obj/structure/stairs/south, /obj/effect/decal/cleanable/dirt{ @@ -6685,10 +8046,19 @@ /turf/closed/wall/f13/tentwall, /area/f13/wasteland/legion) "caI" = ( +<<<<<<< Updated upstream /obj/structure/chair/stool, /obj/effect/decal/cleanable/glass, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +======= +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerinner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "caM" = ( /obj/structure/car/rubbish1{ pixel_y = -16 @@ -6750,8 +8120,16 @@ }, /area/f13/ambientlighting/building/f) "cbK" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood, /turf/open/floor/plasteel/f13/stone, +======= +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbrokenvertical" + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "cbM" = ( /obj/machinery/hydroponics/soil, @@ -6953,6 +8331,13 @@ name = "rusted floor" }, /area/f13/bunker) +<<<<<<< Updated upstream +======= +"cfj" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "cfk" = ( /obj/item/reagent_containers/glass/bucket/wood, /turf/open/indestructible/ground/outside/desert, @@ -6985,6 +8370,18 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream +======= +"cfY" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "cga" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -7010,6 +8407,7 @@ icon_state = "redrustyfull" }, /area/f13/building/abandoned/t) +<<<<<<< Updated upstream "cgu" = ( /obj/structure/shelf_wood, /obj/item/roller, @@ -7030,6 +8428,39 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +======= +"cgs" = ( +/obj/structure/fence{ + dir = 4 + }, +/obj/structure/barricade/wooden/planks, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/legioncamp) +"cgt" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"cgu" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood{ + icon_state = "housewood4-broken" + }, +/area/f13/ambientlighting/building/m) +"cgv" = ( +/obj/effect/decal/cleanable/glass, +/obj/machinery/power/port_gen/pacman/diesel{ + anchored = 1 + }, +/obj/structure/cable/outdoors{ + icon_state = "0-4" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "cgI" = ( /obj/structure/table/wood, /turf/open/floor/wood_common/wood_common_dark, @@ -7083,6 +8514,18 @@ icon_state = "horizontalinnermain2left" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"chQ" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/ncr) +>>>>>>> Stashed changes "chT" = ( /obj/structure/wreck/trash/machinepile, /turf/open/floor/plating/f13/inside/gravel, @@ -7122,10 +8565,19 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "ciV" = ( +<<<<<<< Updated upstream /obj/item/chair/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_wide, /area/f13/wasteland) +======= +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "cjb" = ( /obj/structure/simple_door/house, /obj/structure/barricade/wooden/planks/pregame, @@ -7145,6 +8597,7 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "cjq" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/sand/plating, /obj/effect/decal/fakelattice, /obj/effect/overlay/junk/toilet{ @@ -7152,6 +8605,12 @@ }, /turf/open/floor/plating/f13, /area/f13/wasteland) +======= +/obj/structure/weightlifter, +/obj/machinery/light/small, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "cjt" = ( /obj/structure/rack, /obj/item/crafting/bulb, @@ -7184,10 +8643,19 @@ /obj/effect/turf_decal/weather/dirt{ dir = 1 }, +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +======= +/area/f13/brotherhood) +"cjZ" = ( +/obj/structure/table/wood/club, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ckc" = ( /obj/machinery/power/smes/engineering, /obj/structure/cable, @@ -7221,6 +8689,17 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +"ckl" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress1"; + pixel_y = 9 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "ckv" = ( /obj/structure/barricade/bars, /obj/structure/barricade/sandbags, @@ -7279,6 +8758,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/dirt, /area/f13/building/abandoned/q) +"ckR" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "ckT" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -7312,11 +8800,19 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "clg" = ( +<<<<<<< Updated upstream /obj/structure/fence/corner{ dir = 4 }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft0" +======= +/obj/structure/chair/stool{ + icon_state = "bench" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" +>>>>>>> Stashed changes }, /area/f13/wasteland) "cli" = ( @@ -7353,6 +8849,15 @@ /obj/effect/decal/cleanable/blood/gibs/human/limb, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"cml" = ( +/obj/structure/wreck/trash/two_barrels, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "cmp" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -7472,6 +8977,16 @@ /obj/item/clothing/mask/bandana/legion/legrecruit, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"cof" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/flora/rock/jungle, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "com" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8 @@ -7479,12 +8994,19 @@ /obj/effect/overlay/desert/sonora/edge/corner, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +<<<<<<< Updated upstream "coK" = ( /obj/effect/decal/cleanable/vomit/old, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, /area/f13/ncr) +======= +"cos" = ( +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "coL" = ( /obj/item/paper/crumpled, /turf/open/floor/wood_common, @@ -7550,6 +9072,16 @@ "cpt" = ( /turf/closed/wall/f13/wood/house/broken, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"cpw" = ( +/obj/structure/chair/stool/retro/black, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "cpK" = ( /obj/structure/toilet{ pixel_y = 13 @@ -7584,6 +9116,7 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/d) +<<<<<<< Updated upstream "cqy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light{ @@ -7592,6 +9125,22 @@ }, /turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) +======= +"cqs" = ( +/obj/structure/railing/wood/underlayer{ + layer = 6 + }, +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge{ + pixel_y = -14; + layer = 5 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "cqC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/smartfridge/bottlerack/seedbin, @@ -7618,6 +9167,14 @@ icon_state = "verticalinnermain2" }, /area/f13/building/abandoned/t) +"cqU" = ( +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/ruins{ + icon_state = "rubblepillar" + }, +/area/f13/ambientlighting/building/j) "cqX" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13{ @@ -7718,6 +9275,13 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/s) +<<<<<<< Updated upstream +======= +"cso" = ( +/obj/structure/grille, +/turf/open/indestructible/ground/outside/water/running, +/area/f13/caves) +>>>>>>> Stashed changes "csq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -7788,6 +9352,13 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"ctC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "ctI" = ( /obj/structure/rack/shelf_metal, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier4, @@ -7875,6 +9446,7 @@ }, /area/f13/wasteland) "cuA" = ( +<<<<<<< Updated upstream /obj/effect/decal/remains/human, /obj/structure/chair/stool{ dir = 8; @@ -7884,6 +9456,12 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain0" }, +======= +/obj/structure/railing{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "cuI" = ( /turf/closed/wall/f13/tunnel, @@ -7898,6 +9476,16 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +<<<<<<< Updated upstream +======= +"cva" = ( +/obj/machinery/food_cart, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "cvk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/spacevine, @@ -7916,6 +9504,17 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream +======= +"cvy" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/junk/locker, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "cvF" = ( /obj/structure/chair/sofa/right{ dir = 4 @@ -8161,9 +9760,17 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "cym" = ( +<<<<<<< Updated upstream /obj/item/vending_refill/coffee, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +======= +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "cyp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/car/rubbish2, @@ -8304,6 +9911,7 @@ }, /area/f13/wasteland) "cAe" = ( +<<<<<<< Updated upstream /obj/structure/closet/crate/large{ pixel_y = 17; layer = 5.1; @@ -8317,6 +9925,11 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "cAm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/remains/human, @@ -8475,6 +10088,7 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "cCJ" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 4 }, @@ -8482,6 +10096,19 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) +======= +/obj/structure/rack/large/shelf, +/obj/item/storage/toolbox/ammo{ + pixel_x = 6; + pixel_y = 29 + }, +/obj/item/storage/toolbox/ammo{ + pixel_x = 6; + pixel_y = 2 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "cCL" = ( /obj/effect/spawner/lootdrop/f13/weapon/melee/tier4, /turf/open/indestructible/ground/inside/mountain, @@ -8519,6 +10146,15 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"cDp" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) +>>>>>>> Stashed changes "cDr" = ( /obj/structure/sign/directions/security{ dir = 4 @@ -8533,9 +10169,16 @@ /turf/closed/mineral/random, /area/f13/wasteland) "cDz" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood{ icon_state = "tracks" }, +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +>>>>>>> Stashed changes /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "cDB" = ( @@ -8559,6 +10202,7 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) "cDN" = ( +<<<<<<< Updated upstream /obj/structure/flora/rock/pile/largejungle, /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -8576,7 +10220,18 @@ }, /obj/item/camera, /turf/open/indestructible/ground/outside/sidewalk, +======= +/obj/item/stack/sheet/mineral/sandbags, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirtcorner" + }, +>>>>>>> Stashed changes /area/f13/wasteland) +"cDS" = ( +/obj/structure/flora/twig2, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "cDU" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -8586,6 +10241,24 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"cDX" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "cDZ" = ( /mob/living/simple_animal/hostile/raider, /obj/structure/campfire/barrel{ @@ -8615,6 +10288,7 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/p) "cEy" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/armor/clothes, /obj/effect/spawner/lootdrop/f13/armor/clothes, @@ -8623,6 +10297,17 @@ /obj/effect/spawner/lootdrop/f13/armor/clothes, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/oil, +/obj/structure/extinguisher_cabinet{ + pixel_y = 28 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "cEA" = ( /obj/structure/rack, /obj/item/multitool, @@ -8641,6 +10326,7 @@ /obj/machinery/vending/cigarette/syndicate, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/l) +<<<<<<< Updated upstream "cEN" = ( /obj/item/ammo_box/magazine/m556/rifle/assault{ pixel_x = 2 @@ -8657,6 +10343,18 @@ }, /turf/open/floor/wood_common/wood_common_light, /area/f13/ncr) +======= +"cET" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "cEY" = ( /obj/structure/fence/corner{ dir = 4 @@ -8839,6 +10537,16 @@ /obj/effect/spawner/lootdrop/f13/weapon/melee/tier3, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +"cGR" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/cross, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "cGT" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -8884,6 +10592,12 @@ icon_state = "dirt" }, /area/f13/wasteland) +"cHi" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "cHF" = ( /obj/effect/overlay/desert_side, /obj/effect/overlay/desert_side{ @@ -8891,6 +10605,13 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +"cHI" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "cHL" = ( /obj/structure/shelf_wood, /obj/effect/decal/cleanable/dirt, @@ -8930,11 +10651,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream "cHW" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/ghoul/reaver, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, /area/f13/ambientlighting/building/m) +======= +>>>>>>> Stashed changes "cIa" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/inside/mountain, @@ -8955,10 +10679,14 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) "cIs" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ icon_state = "housewood2-broken" }, +======= +/turf/closed/wall/f13/ruins, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "cIu" = ( /obj/structure/sink{ @@ -9041,11 +10769,20 @@ /obj/item/stack/sheet/glass/five, /turf/open/floor/plasteel, /area/engine/workshop) +<<<<<<< Updated upstream "cJj" = ( /obj/item/crowbar/smithed, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) +======= +"cIW" = ( +/mob/living/simple_animal/hostile/renegade/soldier, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "cJl" = ( /obj/structure/simple_door/metal/store{ icon_state = "brokenstore" @@ -9087,6 +10824,16 @@ /obj/structure/barricade/tentclothedge, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"cJU" = ( +/obj/structure/table/snooker{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "cJX" = ( /obj/structure/obstacle/barbedwire/end{ dir = 8 @@ -9096,6 +10843,15 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"cJZ" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul, +/obj/structure/destructible/tribal_torch/lit, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "cKa" = ( /obj/structure/barricade/wooden/strong, /obj/structure/decoration/rag{ @@ -9136,6 +10892,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/f13/building/abandoned/z) "cKM" = ( +<<<<<<< Updated upstream /obj/structure/chair{ dir = 8 }, @@ -9150,6 +10907,22 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain0" }, +======= +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) +"cKR" = ( +/obj/effect/decal/fakelattice, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "cKW" = ( /obj/structure/simple_door/metal/fence/wooden, @@ -9237,12 +11010,22 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "cMj" = ( +<<<<<<< Updated upstream /obj/structure/table/booth, /obj/item/flag/ncr{ pixel_y = 22 }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/machinery/light/broken{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/junk/small, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "cMu" = ( /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded" @@ -9258,6 +11041,13 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/r) +<<<<<<< Updated upstream +======= +"cMJ" = ( +/obj/machinery/light, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "cMK" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -9272,11 +11062,31 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "cMW" = ( +<<<<<<< Updated upstream /obj/structure/cable/outdoors{ icon_state = "1-2" }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/ncr) +======= +/obj/effect/turf_decal/big{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +"cNq" = ( +/obj/effect/decal/cleanable/oil{ + icon_state = "floor5"; + pixel_x = -19 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerturn" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "cNt" = ( /obj/structure/flora/ausbushes/brflowers, /turf/open/indestructible/ground/outside/desert, @@ -9297,6 +11107,19 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"cNI" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +>>>>>>> Stashed changes "cNV" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain2" @@ -9334,6 +11157,19 @@ /obj/effect/spawner/lootdrop/f13/weapon/melee/tier1, /turf/open/indestructible/ground/outside/dirt, /area/f13/ambientlighting/building/k) +"cPo" = ( +/obj/effect/overlay/desert_side{ + pixel_x = -15 + }, +/obj/effect/overlay/desert_side{ + dir = 1; + pixel_x = -11 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 9; + icon_state = "outerpavement" + }, +/area/f13/wasteland) "cPp" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft1" @@ -9352,10 +11188,17 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) "cPG" = ( +<<<<<<< Updated upstream /obj/item/tele_iv, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, +======= +/obj/structure/chair/office/dark{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/ncr) "cPH" = ( /obj/effect/overlay/desert_side{ @@ -9418,6 +11261,24 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/g) +<<<<<<< Updated upstream +======= +"cQi" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +"cQx" = ( +/obj/structure/closet/crate/bin/trashbin{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/e) +>>>>>>> Stashed changes "cQy" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/grass/corner, @@ -9461,11 +11322,23 @@ /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream "cRj" = ( /obj/structure/barricade/wooden/planks/pregame, /obj/structure/barricade/wooden, /turf/closed/mineral/random/low_chance, /area/f13/caves) +======= +"cRc" = ( +/obj/effect/decal/cleanable/generic, +/obj/item/reagent_containers/pill/patch/healpoultice, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"cRj" = ( +/obj/structure/sign/poster/ncr/irradiated_food, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) +>>>>>>> Stashed changes "cRm" = ( /obj/structure/fence{ dir = 8 @@ -9493,6 +11366,7 @@ }, /area/f13/wasteland) "cRC" = ( +<<<<<<< Updated upstream /obj/machinery/porta_turret/f13/turret_shotgun/burstfire/robot, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) @@ -9502,6 +11376,24 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/landmark/start/f13/ncrrearechelon, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/floor/wood_common, +/area/f13/wasteland) +"cRJ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/indestructible/ground/outside/graveldirt, +>>>>>>> Stashed changes /area/f13/caves) "cRT" = ( /obj/structure/flora/timber, @@ -9517,7 +11409,10 @@ /area/f13/wasteland) "cSa" = ( /obj/effect/decal/fakelattice, +<<<<<<< Updated upstream /obj/item/electropack/shockcollar/explosive, +======= +>>>>>>> Stashed changes /turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) "cSc" = ( @@ -9554,10 +11449,16 @@ /turf/open/floor/plasteel/dark, /area/f13/building/abandoned/l) "cSH" = ( +<<<<<<< Updated upstream /obj/machinery/smartfridge/bottlerack, /obj/effect/spawner/lootdrop/f13/alcoholspawner, /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/floor/wood_fancy, +======= +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood/club, +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "cSI" = ( /obj/effect/turf_decal/weather/dirt, @@ -9617,6 +11518,15 @@ /obj/machinery/smartfridge/bottlerack/grownbin, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"cTr" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "cTt" = ( /obj/effect/overlay/desert_side{ dir = 1; @@ -9732,12 +11642,26 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "cVI" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/booth, /obj/item/clothing/suit/armor/tiered/hooded/techpriest, /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/m) +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "cVP" = ( /obj/structure/barricade/wooden/strong, /turf/closed/wall/mineral/wood, @@ -9839,6 +11763,14 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"cXi" = ( +/obj/item/restraints/handcuffs, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "cXj" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 1; @@ -9945,6 +11877,17 @@ /obj/machinery/vending/coffee, /turf/open/floor/wood_common, /area/f13/clinic) +<<<<<<< Updated upstream +======= +"cYL" = ( +/obj/structure/window/fulltile/house{ + icon_state = "housewindowbrokenvertical" + }, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/bars, +/turf/open/indestructible/ground/outside/desert, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "cYQ" = ( /obj/machinery/vending/nukacolavend, /obj/effect/decal/cleanable/dirt{ @@ -9960,6 +11903,16 @@ /obj/structure/simple_door/tent, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"cYT" = ( +/obj/item/stack/f13Cash/random/denarius/high, +/obj/item/stack/f13Cash/random/aureus/low, +/obj/structure/rack/shelf_metal, +/obj/item/reagent_containers/pill/patch/healpoultice, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "cYW" = ( /obj/structure/table/reinforced, /obj/structure/barricade/bars{ @@ -9990,6 +11943,7 @@ /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/o) "cZx" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/house{ dir = 2; icon_state = "housewindowbrokenvertical" @@ -9997,6 +11951,10 @@ /obj/structure/barricade/wooden/planks/pregame, /obj/structure/barricade/bars, /turf/open/indestructible/ground/outside/desert, +======= +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "cZD" = ( /obj/structure/rack, @@ -10110,6 +12068,7 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream "daW" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -10129,6 +12088,8 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "dbb" = ( /obj/effect/turf_decal/huge{ dir = 1 @@ -10150,6 +12111,28 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +<<<<<<< Updated upstream +======= +"dbv" = ( +/obj/item/flag/legion, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, +/area/f13/wasteland) +"dbw" = ( +/obj/machinery/smartfridge/bottlerack{ + pixel_x = -3 + }, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 8; + pixel_y = -30; + pixel_x = 17 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "dbB" = ( /obj/structure/closet/crate/secure/gear{ anchored = 1; @@ -10170,6 +12153,27 @@ /obj/structure/table/greyscale, /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/f13/building/abandoned/z) +<<<<<<< Updated upstream +======= +"dcd" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress2" + }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +"dci" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + light_color = "red" + }, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "dcs" = ( /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, @@ -10242,12 +12246,18 @@ }, /area/f13/wasteland) "ddn" = ( +<<<<<<< Updated upstream /obj/structure/flora/twig3{ pixel_x = -7; pixel_y = -14 }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/closet/body_bag, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "ddq" = ( /obj/effect/landmark/start/f13/venator, /obj/effect/overlay/desert_side{ @@ -10277,6 +12287,7 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream "ddL" = ( /obj/structure/chair/west_middle, /obj/effect/decal/cleanable/dirt{ @@ -10286,6 +12297,13 @@ icon_state = "dark" }, /area/f13/brotherhood) +======= +"ddE" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "ddO" = ( /obj/structure/chair/sofa/right, /obj/effect/decal/cleanable/dirt, @@ -10303,6 +12321,7 @@ }, /area/f13/ncr) "ddY" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 1 }, @@ -10310,6 +12329,13 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +======= +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "ddZ" = ( /obj/structure/debris/v1, /turf/open/indestructible/ground/outside/desert, @@ -10358,6 +12384,7 @@ }, /area/f13/wasteland) "deN" = ( +<<<<<<< Updated upstream /obj/structure/chair/stool/retro/tan, /obj/structure/destructible/tribal_torch/wall/lit{ dir = 1; @@ -10377,6 +12404,12 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) +======= +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "dfk" = ( /obj/structure/fence{ dir = 1 @@ -10487,9 +12520,27 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/building/tribal) "dgW" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/f13/outside/road{ icon_state = "verticalrightborderright0" +======= +/obj/structure/fluff/hedge, +/obj/structure/decoration/rag{ + icon_state = "flag_ncr"; + name = "NCR banner"; + pixel_y = 32 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +"dhi" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" +>>>>>>> Stashed changes }, /area/f13/wasteland) "dhl" = ( @@ -10525,11 +12576,16 @@ }, /area/f13/wasteland) "dhC" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/sidewalk{ dir = 6; icon_state = "outerpavement" }, +======= +/obj/structure/flora/grass/coyote/eighteen, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "dhD" = ( /obj/structure/campfire/barrel{ @@ -10544,6 +12600,7 @@ /obj/item/storage/trash_stack, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream "dhM" = ( /obj/item/clothing/under/f13/recon/outcast, /turf/open/indestructible/ground/inside/mountain, @@ -10554,6 +12611,8 @@ /obj/structure/shelf_wood, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +======= +>>>>>>> Stashed changes "dhW" = ( /obj/machinery/light{ dir = 8; @@ -10579,6 +12638,14 @@ }, /turf/closed/mineral/random, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"dia" = ( +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "dij" = ( /obj/structure/fence/corner/wooden, /obj/structure/destructible/tribal_torch/lit, @@ -10638,6 +12705,16 @@ /obj/structure/junk/small/bed, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"djf" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +>>>>>>> Stashed changes "djm" = ( /turf/open/indestructible/ground/outside/grass/dirtpath{ dir = 10 @@ -10697,6 +12774,16 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"dkg" = ( +/obj/effect/decal/cleanable/oil{ + icon_state = "floor6"; + pixel_y = 9; + pixel_x = -10 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "dkj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/f13/orator, @@ -10751,12 +12838,22 @@ "dkX" = ( /turf/open/floor/f13/wood, /area/f13/building/abandoned/n) +<<<<<<< Updated upstream "dlb" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/fakelattice, /obj/machinery/power/smes/engineering, /turf/open/floor/plating/f13, /area/f13/wasteland) +======= +"dln" = ( +/obj/structure/rack/shelf_metal, +/obj/effect/spawner/lootdrop/tool_box, +/obj/effect/spawner/lootdrop/tool_box, +/obj/item/salvage/tool, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "dlp" = ( /obj/structure/railing{ color = "#A47449"; @@ -10848,6 +12945,7 @@ "dnm" = ( /turf/closed/indestructible/riveted, /area/f13/tcoms) +<<<<<<< Updated upstream "dnB" = ( /obj/effect/decal/cleanable/oil{ pixel_x = -8 @@ -10855,6 +12953,15 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" }, +======= +"dnw" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/m) +"dnA" = ( +/obj/structure/flora/grass/coyote/twentythree, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "dnI" = ( /obj/structure/rack, @@ -10863,6 +12970,18 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/i) +<<<<<<< Updated upstream +======= +"dnM" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerouter" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "dnQ" = ( /obj/structure/table/reinforced, /obj/structure/barricade/bars, @@ -10993,6 +13112,13 @@ icon_state = "floorrusty" }, /area/f13/ncr) +<<<<<<< Updated upstream +======= +"dpm" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "dpq" = ( /turf/open/floor/f13{ icon_state = "bar" @@ -11079,12 +13205,33 @@ /obj/item/radio/headset, /turf/open/floor/carpet/royalblack, /area/f13/building/abandoned/l) +<<<<<<< Updated upstream +======= +"dqu" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "dqv" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/town) +<<<<<<< Updated upstream +======= +"dqC" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/machinery/light{ + pixel_x = 16 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "dqK" = ( /obj/structure/toilet{ dir = 8 @@ -11111,9 +13258,29 @@ }, /obj/effect/turf_decal/weather/dirt{ dir = 4 +<<<<<<< Updated upstream + }, +/turf/open/indestructible/ground/outside/graveldirt, +======= }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +"dqU" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/inside/mountain, +>>>>>>> Stashed changes +/area/f13/caves) "dqV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -11184,6 +13351,7 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +<<<<<<< Updated upstream "drQ" = ( /obj/structure/fence{ dir = 4 @@ -11192,6 +13360,10 @@ /obj/structure/decoration/rag{ icon_state = "skin" }, +======= +"drR" = ( +/obj/structure/flora/grass/coyote/six, +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "drU" = ( @@ -11243,6 +13415,16 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"dsU" = ( +/obj/machinery/light/small{ + dir = 4; + light_color = "red" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "dsY" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -11279,6 +13461,30 @@ icon_state = "common-broken5" }, /area/f13/ambientlighting/building/p) +<<<<<<< Updated upstream +======= +"dtv" = ( +/obj/structure/curtain{ + color = "#845f58"; + pixel_x = 32 + }, +/obj/effect/decal/cleanable/dirt{ + color = "000000" + }, +/obj/machinery/autolathe/manual, +/obj/effect/decal/cleanable/generic{ + pixel_x = -8; + pixel_y = 12 + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/f13/legioncamp) +"dtH" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "dtR" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood, @@ -11333,6 +13539,13 @@ icon_state = "whiteyellowrustychess" }, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"dvp" = ( +/obj/structure/simple_door/house, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "dvr" = ( /mob/living/simple_animal/hostile/supermutant/rangedmutant/varmint, /turf/open/indestructible/ground/outside/dirt{ @@ -11359,6 +13572,7 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) +<<<<<<< Updated upstream "dvR" = ( /obj/structure/sign/flag_america, /turf/closed/wall/r_wall/rust, @@ -11369,6 +13583,29 @@ /obj/item/stack/sheet/metal/ten, /obj/item/stack/sheet/mineral/plasma/twentyfive, /turf/open/indestructible/ground/outside/dirt, +======= +"dvN" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +"dwg" = ( +/obj/structure/rack/shelf_metal, +/obj/item/melee/classic_baton/militarypolice, +/obj/item/melee/classic_baton/militarypolice, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +"dwn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "dwo" = ( /obj/structure/bed, @@ -11495,9 +13732,17 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "dyA" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge, /obj/structure/wreck/trash/three_barrels, /turf/open/indestructible/ground/outside/sidewalk, +======= +/obj/structure/fence/door/opened, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerinner" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "dyL" = ( /obj/structure/table/booth, @@ -11516,6 +13761,18 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +<<<<<<< Updated upstream +======= +"dzd" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Armoury" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "dzh" = ( /obj/machinery/computer/security/bos, /obj/structure/table/reinforced, @@ -11945,11 +14202,16 @@ /turf/open/floor/wood_common, /area/f13/clinic) "dGb" = ( +<<<<<<< Updated upstream /obj/structure/flora/branch_broken, /obj/structure/flora/twig3, /obj/structure/flora/twig4, /obj/item/stack/sheet/mineral/wood/five, /turf/open/floor/f13/wood, +======= +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "dGd" = ( /obj/structure/decoration/clock/old{ @@ -11969,8 +14231,13 @@ }, /area/f13/ambientlighting/building/o) "dGq" = ( +<<<<<<< Updated upstream /obj/effect/decal/fakelattice, /turf/open/floor/plasteel/f13/vault_floor/plating, +======= +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/vaporwave, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "dGA" = ( /turf/open/floor/plating/f13/outside/road, @@ -11989,6 +14256,7 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "dGM" = ( +<<<<<<< Updated upstream /obj/structure/flora/wasteplant/wild_fungus, /obj/effect/decal/cleanable/blood, /turf/open/indestructible/ground/inside/mountain, @@ -11996,6 +14264,24 @@ "dGQ" = ( /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +/obj/item/melee/onehanded/slavewhip, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) +"dGQ" = ( +/obj/structure/shelf_wood, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/obj/item/pen, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "dGT" = ( /obj/effect/turf_decal/weather/dirt, /obj/structure/lamp_post/triples, @@ -12057,11 +14343,18 @@ /turf/closed/wall/r_wall/rust, /area/f13/brotherhood) "dHZ" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 9 }, /obj/item/clothing/shoes/ballandchain, /turf/open/indestructible/ground/outside/dirt, +======= +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2top" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "dIa" = ( /obj/effect/decal/cleanable/dirt{ @@ -12175,6 +14468,13 @@ }, /turf/open/floor/carpet/red, /area/f13/ambientlighting/building/e) +<<<<<<< Updated upstream +======= +"dJC" = ( +/obj/structure/sign/flag_america, +/turf/closed/wall/r_wall/rust, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "dJF" = ( /obj/effect/decal/cleanable/greenglow, /turf/closed/mineral/random, @@ -12451,6 +14751,7 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) "dMZ" = ( +<<<<<<< Updated upstream /obj/structure/flora/rock/jungle{ icon_state = "rock3"; pixel_x = -3 @@ -12464,6 +14765,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +======= +/obj/structure/chair/stool{ + dir = 8; + icon_state = "bench" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "dNd" = ( /obj/effect/decal/cleanable/dirt/dust{ dir = 4 @@ -12501,6 +14810,10 @@ icon_state = "tunnelrusty" }, /area/f13/building/powered) +"dNo" = ( +/obj/structure/junk/jukebox, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "dNr" = ( /obj/structure/lamp_post{ dir = 4 @@ -12652,6 +14965,10 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/a) +"dPn" = ( +/obj/item/reagent_containers/food/drinks/soda_cans/starkist, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "dPr" = ( /turf/open/indestructible/ground/outside/dirt{ dir = 6; @@ -12902,6 +15219,10 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +"dTs" = ( +/obj/structure/flora/tree/joshua, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "dTu" = ( /obj/effect/turf_decal/weather/dirt{ dir = 6 @@ -12922,7 +15243,20 @@ name = "Concrete wall"; smooth = 1 }, +<<<<<<< Updated upstream /area/f13/casino) +======= +/area/f13/wasteland) +"dTy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "dTz" = ( /obj/structure/chair/bench{ dir = 8; @@ -12989,6 +15323,7 @@ /turf/closed/wall/mineral/concrete, /area/f13/clinic) "dUo" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 5 }, @@ -12997,6 +15332,13 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +======= +/obj/structure/chair/stool/retro/tan, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2left" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "dUy" = ( /obj/structure/fence/wooden{ dir = 8 @@ -13045,6 +15387,17 @@ icon_state = "bluedirtychess2" }, /area/f13/followers) +<<<<<<< Updated upstream +======= +"dUX" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "dUZ" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -13167,9 +15520,17 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +<<<<<<< Updated upstream "dWL" = ( /mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, /turf/open/indestructible/ground/outside/desert, +======= +"dWQ" = ( +/obj/machinery/door/poddoor/shutters{ + id = 984 + }, +/turf/open/indestructible/ground/outside/road, +>>>>>>> Stashed changes /area/f13/wasteland) "dXp" = ( /obj/structure/debris/v3, @@ -13195,9 +15556,23 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/r) +<<<<<<< Updated upstream "dXN" = ( /obj/structure/wreck/trash/two_barrels, /turf/open/indestructible/ground/outside/desert, +======= +"dXO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "dXR" = ( /obj/structure/rack, @@ -13231,6 +15606,17 @@ icon_state = "common-broken3" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"dZa" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "dZg" = ( /obj/structure/target_stake, /obj/item/target/clown, @@ -13304,12 +15690,26 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream +======= +"dZG" = ( +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +"dZH" = ( +/obj/structure/rack/shelf_metal, +/obj/item/salvage/low, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "dZM" = ( /turf/open/indestructible/ground/outside/grass/dirtpath{ dir = 5 }, /area/f13/wasteland/town) "dZQ" = ( +<<<<<<< Updated upstream /obj/item/clothing/mask/bandana/blue, /obj/item/clothing/mask/bandana/blue, /obj/item/clothing/mask/bandana/blue, @@ -13319,6 +15719,13 @@ }, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/effect/turf_decal/vg_decals/numbers/nine{ + layer = 5 + }, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +>>>>>>> Stashed changes "dZS" = ( /obj/structure/fence/corner/wooden{ dir = 8 @@ -13377,12 +15784,20 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) "ebh" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/ruins{ icon_state = "ruinswindowbrokenvertical" }, /obj/effect/decal/cleanable/glass, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ebU" = ( /obj/machinery/autolathe/ammo, /turf/open/floor/plasteel/f13/stone/rugged, @@ -13402,6 +15817,18 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream +======= +"ecc" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded"; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ech" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/f13/armor/tier2, @@ -13411,9 +15838,24 @@ }, /area/f13/building/abandoned/a) "eco" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/oil/slippery, /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "ecq" = ( /obj/structure/table/wood, @@ -13459,11 +15901,36 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/t) "ecK" = ( +<<<<<<< Updated upstream /obj/structure/car/rubbish4{ pixel_y = -9; icon_state = "debris2" }, /turf/open/indestructible/ground/outside/sidewalk, +======= +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"edn" = ( +/obj/structure/fence{ + dir = 1 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +"edo" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +>>>>>>> Stashed changes /area/f13/wasteland) "edf" = ( /obj/effect/decal/cleanable/dirt, @@ -13510,6 +15977,19 @@ icon_state = "verticalleftborderleft1" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"edX" = ( +/obj/machinery/hydroponics/soil, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "eea" = ( /obj/structure/fence/wooden{ dir = 4; @@ -13532,6 +16012,14 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +<<<<<<< Updated upstream +======= +"een" = ( +/turf/open/floor/plasteel/f13{ + icon_state = "rampdowntop" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "eeo" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertopright" @@ -13588,6 +16076,23 @@ /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/dirt, /area/f13/underground/cave) +<<<<<<< Updated upstream +======= +"efb" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +/area/f13/wasteland) +"efz" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "efI" = ( /obj/machinery/vending/coffee, /obj/effect/decal/cleanable/dirt{ @@ -13614,10 +16119,23 @@ }, /area/f13/wasteland) "efV" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, +======= +/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +"egg" = ( +/obj/structure/car/rubbish3, +/obj/structure/obstacle/barbedwire{ + dir = 4 + }, +/obj/structure/barricade/sandbags, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "efZ" = ( /obj/structure/window/fulltile/house/broken, @@ -13671,6 +16189,7 @@ icon_state = "tunnelrusty" }, /area/f13/building/powered) +<<<<<<< Updated upstream "egt" = ( /obj/structure/cable/outdoors{ icon_state = "1-2" @@ -13682,6 +16201,18 @@ /obj/machinery/atmospherics/components/unary/tank/stimulum, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, +======= +"egv" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/reagent_dispensers/rainwater_tank, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/floor/plating/f13, +>>>>>>> Stashed changes /area/f13/wasteland) "egC" = ( /obj/item/storage/trash_stack{ @@ -13705,8 +16236,15 @@ }, /area/f13/building/powered) "egT" = ( +<<<<<<< Updated upstream /obj/structure/flora/grass/coyote/twentyfive, /turf/open/indestructible/ground/outside/desert, +======= +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "egV" = ( /obj/effect/decal/cleanable/dirt, @@ -13722,6 +16260,7 @@ icon_state = "crossborder" }, /area/f13/building/powered) +<<<<<<< Updated upstream "ehh" = ( /obj/item/stack/sheet/mineral/sandbags, /turf/open/indestructible/ground/outside/dirt{ @@ -13729,6 +16268,15 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +======= +"ehv" = ( +/obj/structure/chair/sofa/left{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "ehy" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/effect/decal/cleanable/greenglow, @@ -13752,6 +16300,13 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/y) +<<<<<<< Updated upstream +======= +"ein" = ( +/obj/structure/weightmachine/weightlifter, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "eit" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontaltopborderbottom0" @@ -13784,6 +16339,15 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"eiU" = ( +/obj/effect/spawner/lootdrop/druggie_pill, +/turf/open/floor/f13/wood{ + icon_state = "housebase4-broken" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ejg" = ( /obj/machinery/porta_turret/f13/turret_shotgun/burstfire/robot, /obj/effect/decal/cleanable/dirt/dust{ @@ -13791,6 +16355,14 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"ejl" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/booth, +/obj/item/storage/box/dice, +/obj/item/storage/box/dice, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "ejm" = ( /obj/effect/mob_spawn/human/corpse/raider, /turf/open/floor/plating/rust, @@ -13804,6 +16376,14 @@ /obj/effect/landmark/start/f13/deputy, /turf/open/floor/f13/wood, /area/f13/building/abandoned/n) +<<<<<<< Updated upstream +======= +"ejo" = ( +/obj/structure/table/plasmaglass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ejr" = ( /obj/structure/curtain{ color = "#845f58"; @@ -13828,6 +16408,19 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream +======= +"ejU" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "eka" = ( /obj/structure/closet/fridge/standard, /turf/open/floor/f13{ @@ -13960,6 +16553,13 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream +======= +"emi" = ( +/obj/machinery/radioterminal/ncr, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "emk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/sofa/left{ @@ -13977,6 +16577,15 @@ dir = 4 }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"emw" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_common{ + icon_state = "common-broken2" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "emA" = ( /obj/item/chair/stool, /turf/open/indestructible/ground/outside/dirt, @@ -13985,6 +16594,15 @@ /obj/structure/closet/cabinet, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/t) +"emH" = ( +/obj/effect/decal/marking{ + pixel_x = -14 + }, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "emO" = ( /obj/structure/table, /obj/machinery/computer/terminal/stored_password{ @@ -14025,11 +16643,17 @@ }, /area/f13/building/abandoned/h) "enj" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_wide, +======= +/turf/open/floor/plating/f13/inside/gravel/edge{ + dir = 10 + }, +>>>>>>> Stashed changes /area/f13/wasteland) "enp" = ( /obj/item/storage/trash_stack, @@ -14052,6 +16676,10 @@ }, /area/f13/brotherhood/surface) "enA" = ( +<<<<<<< Updated upstream +======= +/obj/effect/spawner/lootdrop/wastelootgood, +>>>>>>> Stashed changes /turf/open/floor/wood_common{ icon_state = "common-broken4" }, @@ -14087,6 +16715,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"enJ" = ( +/obj/item/clothing/head/f13/enclave, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "enR" = ( /obj/structure/table, /obj/item/melee/onehanded/club/tireiron, @@ -14210,6 +16844,13 @@ /obj/machinery/reagentgrinder, /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"ept" = ( +/obj/structure/chair/wood/wings, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "epw" = ( /obj/structure/table/wood, /obj/item/stack/medical/poultice/ten, @@ -14416,6 +17057,21 @@ }, /turf/open/floor/wood_common, /area/f13/building/abandoned/x) +<<<<<<< Updated upstream +======= +"esJ" = ( +/obj/structure/chair/bench, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +"esM" = ( +/obj/structure/shelf_wood, +/obj/item/camera_film, +/obj/item/camera_film, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "esR" = ( /obj/structure/table/optable/abductor, /obj/effect/decal/cleanable/dirt, @@ -14436,10 +17092,20 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "ete" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/shreds, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, +======= +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft1" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "eti" = ( /obj/structure/simple_door/metal/fence/wooden, @@ -14564,6 +17230,7 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) "euK" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 6 }, @@ -14572,6 +17239,16 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +======= +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2_flesh" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "euT" = ( /obj/structure/barricade/wooden, /obj/structure/decoration/rag, @@ -14580,10 +17257,18 @@ "euU" = ( /turf/closed/wall/rust, /area/f13/bunker) +<<<<<<< Updated upstream "evm" = ( /obj/item/broom, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain0" +======= +"evg" = ( +/obj/structure/barricade/wooden/strong, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerturn" +>>>>>>> Stashed changes }, /area/f13/wasteland) "evp" = ( @@ -14685,6 +17370,17 @@ icon_state = "wasteland33" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"ewz" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain2bottom" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ewE" = ( /obj/item/twohanded/spear/bonespear/deathclaw, /obj/effect/decal/cleanable/blood, @@ -14696,7 +17392,20 @@ dir = 8; icon_state = "innermaincornerinner" }, +<<<<<<< Updated upstream /area/f13/caves) +======= +/obj/structure/wreck/trash/machinepile, +/turf/open/floor/plating/rust, +/area/f13/wasteland) +"ewS" = ( +/obj/item/kirbyplants{ + icon_state = "plant-22"; + pixel_x = -10 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "exl" = ( /obj/effect/turf_decal/stripes/white/line, /obj/effect/decal/cleanable/dirt{ @@ -14709,6 +17418,14 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"exm" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "exq" = ( /obj/structure/flora/grass/wasteland, /turf/open/indestructible/ground/outside/dirt{ @@ -14738,6 +17455,7 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +<<<<<<< Updated upstream "eyc" = ( /obj/machinery/vending/nukacolavend, /obj/structure/billboard/nukagirl{ @@ -14752,6 +17470,15 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) +======= +"eyd" = ( +/obj/structure/flora/twig3{ + pixel_x = -7; + pixel_y = -14 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "eyh" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/reagent_dispensers/barrel/dangerous, @@ -14812,6 +17539,13 @@ /obj/structure/chair/bench, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"ezz" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 6; + icon_state = "outerpavement" + }, +/area/f13/wasteland) "ezA" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt/dust, @@ -14940,6 +17674,12 @@ }, /turf/open/floor/wood_common, /area/f13/followers) +"eBB" = ( +/obj/structure/sign/parking, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "eBD" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -15035,6 +17775,15 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"eDc" = ( +/obj/item/restraints/legcuffs/bola, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "eDn" = ( /obj/structure/table/wood, /obj/item/paper, @@ -15071,6 +17820,16 @@ /obj/effect/overlay/fog, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"eDU" = ( +/obj/structure/simple_door/wood, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "eDW" = ( /obj/machinery/light{ dir = 8; @@ -15098,6 +17857,17 @@ /obj/item/reagent_containers/food/drinks/bottle/sunset, /turf/open/floor/f13/wood, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"eEd" = ( +/obj/structure/rack/shelf_metal, +/obj/item/wrench, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "eEe" = ( /turf/closed/indestructible/rock, /area/f13/underground/cave) @@ -15113,6 +17883,16 @@ }, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"eEx" = ( +/obj/structure/chair/booth{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "eEF" = ( /obj/structure/chair/stool{ dir = 4; @@ -15183,8 +17963,27 @@ }, /area/f13/wasteland) "eFC" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/water/running, /area/f13/caves) +======= +/obj/structure/bed/mattress{ + icon_state = "mattress1"; + pixel_y = 9 + }, +/obj/structure/bed/mattress{ + icon_state = "mattress2"; + pixel_y = -6 + }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/fancy/cigarettes/cigpack_greytort, +/obj/item/lighter/iconic, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "eFE" = ( /obj/structure/wreck/trash/four_barrels, /turf/open/indestructible/ground/outside/desert, @@ -15218,9 +18017,18 @@ }, /area/f13/wasteland) "eGa" = ( +<<<<<<< Updated upstream /mob/living/simple_animal/hostile/radscorpion/black, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/item/pen/fountain, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "eGd" = ( /obj/machinery/light/small{ dir = 8; @@ -15239,6 +18047,17 @@ icon_state = "outerborder" }, /area/f13/wasteland/city) +<<<<<<< Updated upstream +======= +"eGk" = ( +/obj/structure/shelf_wood, +/obj/item/storage/firstaid, +/obj/item/storage/firstaid, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "eGt" = ( /obj/item/chair/folding, /turf/open/indestructible/ground/outside/dirt, @@ -15292,6 +18111,7 @@ }, /area/f13/wasteland) "eGT" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ dir = 8 }, @@ -15300,6 +18120,11 @@ light_color = "#f4e3b0" }, /turf/open/indestructible/ground/outside/sidewalk, +======= +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/mineral/concrete, +/turf/open/floor/wood_wide, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "eGU" = ( /obj/structure/rack, @@ -15392,11 +18217,23 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "eIx" = ( +<<<<<<< Updated upstream /obj/structure/table/wood/junk, /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "eIA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -15404,6 +18241,12 @@ icon_state = "greenrustyfull" }, /area/f13/ambientlighting/building/o) +"eID" = ( +/obj/item/broom, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "eIE" = ( /obj/structure/reagent_dispensers/rainwater_tank, /turf/open/floor/plating/f13/inside/gravel, @@ -15454,6 +18297,7 @@ }, /area/f13/followers) "eJl" = ( +<<<<<<< Updated upstream /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" }, @@ -15464,6 +18308,16 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) +======= +/obj/structure/statue/petrified, +/obj/item/clothing/under/dress/wedding, +/obj/item/clothing/head/helmet/f13/vaquerohat{ + pixel_y = 13 + }, +/obj/item/clothing/accessory/waistcoat, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "eJn" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier4, @@ -15481,12 +18335,17 @@ }, /area/f13/wasteland) "eJx" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/house{ dir = 2; icon_state = "housewindowbroken" }, /obj/structure/barricade/wooden/planks/pregame, /obj/structure/barricade/bars, +======= +/obj/effect/decal/cleanable/glass, +/obj/effect/overlay/junk/curtain, +>>>>>>> Stashed changes /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "eJA" = ( @@ -15533,6 +18392,12 @@ /obj/item/fishingrod, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"eKg" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/ambientlighting/building/m) "eKl" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -15624,6 +18489,22 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/t) +<<<<<<< Updated upstream +======= +"eLn" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/floor/wood_common, +/area/f13/wasteland) +>>>>>>> Stashed changes "eLo" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -15705,6 +18586,7 @@ }, /area/f13/ambientlighting/building/o) "eME" = ( +<<<<<<< Updated upstream /obj/structure/fluff/rails{ icon_state = "rails-b1"; pixel_y = 11; @@ -15712,6 +18594,12 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/chair/stool, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "eMN" = ( /obj/machinery/door/poddoor/shutters/old, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -15766,6 +18654,7 @@ dir = 8; icon_state = "horizontalinnermain2left" }, +<<<<<<< Updated upstream /area/f13/wasteland) "eND" = ( /obj/structure/cable/outdoors{ @@ -15776,6 +18665,14 @@ icon_state = "outermaincornerinner" }, /area/f13/wasteland) +======= +/area/f13/brotherhood) +"eNM" = ( +/obj/machinery/icecream_vat, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/rockvault/alien, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "eNN" = ( /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, /area/f13/building/powered) @@ -15791,6 +18688,15 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"eOa" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small{ + brightness = 7; + dir = 8 + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "eOi" = ( /obj/machinery/camera/autoname{ name = "Secuirty Camera"; @@ -15810,11 +18716,27 @@ icon_state = "horizontaloutermain2left" }, /area/f13/wasteland) +"eOp" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "eOv" = ( +<<<<<<< Updated upstream /obj/structure/table/booth, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bar, /area/f13/ambientlighting/building/m) +======= +/obj/structure/fence{ + dir = 8 + }, +/obj/structure/obstacle/barbedwire{ + dir = 4; + pixel_y = 16 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "eOE" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8 @@ -15889,6 +18811,7 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/s) +<<<<<<< Updated upstream "eQj" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/power/port_gen/pacman/diesel{ @@ -15899,6 +18822,13 @@ icon_state = "0-2" }, /turf/open/floor/plating/f13, +======= +"eQh" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "eQp" = ( /obj/structure/junk/small/table, @@ -15952,7 +18882,11 @@ dir = 8 }, /turf/open/indestructible/ground/outside/sidewalk, +<<<<<<< Updated upstream /area/f13/ambientlighting/building/j) +======= +/area/f13/wasteland) +>>>>>>> Stashed changes "eRi" = ( /obj/effect/overlay/desert_side{ dir = 8 @@ -16023,12 +18957,21 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "eSh" = ( +<<<<<<< Updated upstream /obj/structure/closet/secure_closet/freezer, /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/food/drinks/soda_cans/cream, /obj/item/reagent_containers/food/drinks/soda_cans/cream, /obj/item/reagent_containers/food/drinks/bottle/cream, /turf/open/floor/plasteel/rockvault/alien, +======= +/obj/structure/chair/stool, +/obj/machinery/light{ + dir = 1; + light_color = "#706891" + }, +/turf/open/floor/f13/wood, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "eSr" = ( /obj/structure/chair/bench{ @@ -16099,12 +19042,20 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "eTC" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/ruins{ icon_state = "ruinswindowbroken" }, /obj/structure/barricade/wooden/planks/pregame, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/fakelattice, +/obj/machinery/workbench, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "eTD" = ( /obj/structure/barricade/tentleatheredge, /obj/structure/decoration/rag{ @@ -16161,6 +19112,7 @@ }, /area/f13/wasteland) "eUm" = ( +<<<<<<< Updated upstream /obj/structure/fluff/paper{ dir = 5 }, @@ -16172,6 +19124,15 @@ /obj/item/paint/anycolor, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) +======= +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/booth, +/obj/structure/fluff/beach_umbrella/security{ + pixel_y = 22 + }, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) +>>>>>>> Stashed changes "eUu" = ( /obj/structure/fluff/fokoff_sign, /turf/open/indestructible/ground/outside/dirt{ @@ -16192,10 +19153,18 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "eUG" = ( +<<<<<<< Updated upstream /obj/structure/table, /obj/machinery/microwave, /turf/open/floor/plasteel/grimy, /area/f13/ncr) +======= +/obj/effect/decal/fakelattice, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "eUI" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/effect/decal/cleanable/greenglow, @@ -16217,6 +19186,13 @@ icon_state = "verticalleftborderleft0" }, /area/f13/building/powered) +"eUM" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris2" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "eUT" = ( /obj/structure/railing{ color = "#A47449"; @@ -16318,11 +19294,21 @@ }, /area/f13/wasteland) "eWg" = ( +<<<<<<< Updated upstream /obj/item/storage/trash_stack{ icon_state = "Junk_10" }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "eWl" = ( /obj/structure/barricade/wooden/strong, /obj/structure/barricade/wooden/planks/pregame, @@ -16342,6 +19328,14 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) +"eWx" = ( +/obj/structure/table/wood/junk, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/item/toy/cards/deck, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "eWF" = ( /obj/structure/flora/branch, /turf/open/indestructible/ground/outside/desert{ @@ -16453,6 +19447,12 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +"eXP" = ( +/obj/item/melee/onehanded/knife/hunting, +/obj/item/melee/onehanded/knife/hunting, +/obj/structure/shelf_wood, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "eXR" = ( /mob/living/simple_animal/chicken, /turf/open/indestructible/ground/outside/desert, @@ -16515,6 +19515,16 @@ name = "rusted floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"eYQ" = ( +/obj/structure/chair/stool/retro/tan, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerborder" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "eYR" = ( /obj/structure/window/fulltile/wood, /obj/structure/curtain{ @@ -16580,6 +19590,16 @@ "eZQ" = ( /turf/open/indestructible/ground/outside/dirt, /area/f13/building/lower_firetower) +<<<<<<< Updated upstream +======= +"eZS" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 8 + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "fag" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -16648,12 +19668,29 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"faS" = ( +/obj/structure/chair/stool/retro/backed{ + dir = 4 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "faU" = ( /obj/structure/chair/booth{ dir = 8 }, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) +"faX" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/mineral/concrete/ten, +/obj/item/stack/sheet/mineral/limestone/five, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "fbb" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/sidewalk{ @@ -16760,6 +19797,7 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "fcu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing/wood/post{ @@ -16772,6 +19810,15 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) +======= +"fcs" = ( +/obj/structure/chair/booth{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "fcB" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -16867,6 +19914,7 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/c) "fdE" = ( +<<<<<<< Updated upstream /obj/structure/fence/wooden{ dir = 4; icon_state = "post_wood" @@ -16877,6 +19925,14 @@ }, /area/f13/wasteland) "fdS" = ( +======= +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"feg" = ( +>>>>>>> Stashed changes /obj/effect/overlay/desert/sonora/edge{ dir = 4 }, @@ -17022,6 +20078,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"ffZ" = ( +/obj/effect/decal/cleanable/generic, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "fgd" = ( /obj/structure/table, /obj/item/storage/box/cups, @@ -17048,6 +20112,20 @@ dir = 8 }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"fgw" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "fgN" = ( /obj/structure/bus_door, /turf/open/indestructible/ground/outside/grass/corner, @@ -17087,12 +20165,16 @@ /area/f13/followers) "fhl" = ( /obj/structure/table/booth, +<<<<<<< Updated upstream /obj/item/reagent_containers/food/drinks/coffee{ pixel_x = -6 }, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/glass, /turf/open/floor/f13/wood, +======= +/turf/open/floor/wood_fancy, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "fhs" = ( /obj/structure/table/wood/junk, @@ -17253,6 +20335,13 @@ /obj/structure/flora/wasteplant/wild_punga, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"fjo" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "fjp" = ( /obj/structure/fence/wooden{ dir = 1 @@ -17452,8 +20541,27 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "flS" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/oil/slippery, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) +"flZ" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "fmf" = ( /obj/structure/destructible/tribal_torch/wall/lit{ @@ -17484,6 +20592,16 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +<<<<<<< Updated upstream +======= +"fmr" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "fmy" = ( /turf/open/floor/wood_common, /area/f13/clinic) @@ -17509,6 +20627,16 @@ "fnb" = ( /turf/closed/wall/f13/tentwall, /area/f13/building/tribal) +"fne" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/effect/turf_decal/siding/wood, +/obj/structure/fluff/rug/rug_rubber, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "fnf" = ( /obj/structure/reagent_dispensers/barrel/old, /turf/open/indestructible/ground/outside/sidewalk{ @@ -17521,9 +20649,20 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "fnx" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/effect/overlay/rockfloor_side{ + dir = 1 + }, +/obj/structure/kitchenspike, +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/gibspawner/human, +/obj/structure/destructible/tribal_torch/wall/lit, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/wasteland) "fnz" = ( /obj/structure/bookcase/random/religion, @@ -17550,6 +20689,15 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +"fnF" = ( +/obj/structure/rack/large/shelf_rust, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "fnI" = ( /obj/structure/destructible/tribal_torch/wall/lit, /obj/effect/overlay/desert_side{ @@ -17593,6 +20741,7 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "fop" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/dirt, /obj/item/twohanded/legionaxe, @@ -17604,6 +20753,26 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common/wood_common_light, /area/f13/building/powered) +======= +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outercorner" + }, +/area/f13/wasteland) +"fov" = ( +/obj/structure/chair/sofa/left{ + dir = 8 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +"fow" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "foz" = ( /obj/effect/landmark/questing/animals{ location_description = "To the far southwest, behind the old farmhouse with that freaky basement in it." @@ -17624,10 +20793,19 @@ "foC" = ( /obj/structure/rack, /obj/item/reagent_containers/food/snacks/kebab/human, +<<<<<<< Updated upstream /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, /area/f13/building/powered) +======= +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/building/powered) +"foE" = ( +/obj/effect/turf_decal/vg_decals/numbers/zero, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "foG" = ( /obj/structure/barricade/tentclothedge{ color = "#7c0A02" @@ -17673,6 +20851,7 @@ }, /area/f13/casino) "fpo" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -17682,6 +20861,15 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland) +======= +/obj/structure/table/wood, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +"fpA" = ( +/obj/machinery/door/unpowered/secure_legion, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/legioncamp) +>>>>>>> Stashed changes "fpB" = ( /obj/structure/flora/tree_stump, /turf/open/indestructible/ground/outside/dirt, @@ -17716,6 +20904,19 @@ "fpI" = ( /turf/open/floor/plating/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"fpJ" = ( +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +"fpL" = ( +/obj/item/cultivator/rake, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "fpO" = ( /obj/structure/railing{ layer = 4.1 @@ -17757,10 +20958,16 @@ }, /area/f13/building/powered) "fqh" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ dir = 1; icon_state = "outerbordercorner" +======= +/obj/machinery/food_cart, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" +>>>>>>> Stashed changes }, /area/f13/wasteland) "fqz" = ( @@ -17784,6 +20991,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +"fqX" = ( +/obj/structure/table/wood/junk, +/obj/item/melee/onehanded/knife/ritualdagger, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "frc" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, @@ -17842,6 +21054,13 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"frP" = ( +/obj/effect/decal/fakelattice, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "frY" = ( /obj/structure/reagent_dispensers/barrel/explosive, /turf/open/indestructible/ground/outside/dirt{ @@ -17874,6 +21093,17 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) +<<<<<<< Updated upstream +======= +"fso" = ( +/obj/structure/grille/broken, +/obj/item/trash/f13/tin, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "fsq" = ( /obj/structure/flora/grass/wasteland{ layer = 4.2; @@ -17941,6 +21171,7 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/n) "ftu" = ( +<<<<<<< Updated upstream /obj/item/stack/sheet/mineral/wood/twenty, /obj/item/stack/sheet/mineral/wood/twenty, /obj/structure/shelf_wood, @@ -17951,6 +21182,12 @@ /turf/open/floor/f13/wood{ icon_state = "housewood1-broken" }, +======= +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker, +/turf/open/floor/wood_fancy, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "fty" = ( /obj/structure/car/rubbish1, @@ -18038,6 +21275,7 @@ /obj/item/flag/legion, /turf/closed/wall/mineral/wood, /area/f13/legioncamp) +<<<<<<< Updated upstream "fvg" = ( /obj/structure/cable{ icon_state = "0-4" @@ -18046,6 +21284,13 @@ dir = 8 }, /area/f13/brotherhood) +======= +"fvm" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/fakelattice, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +>>>>>>> Stashed changes "fvo" = ( /obj/structure/obstacle/barbedwire/end{ dir = 1; @@ -18100,6 +21345,7 @@ }, /area/f13/wasteland) "fwp" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/structure/chair/wood{ dir = 4 @@ -18109,6 +21355,11 @@ desc = "It's a floor. Wow." }, /area/f13/ambientlighting/building/m) +======= +/obj/structure/flora/branch_broken, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "fwv" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/indestructible/ground/outside/sidewalk, @@ -18120,9 +21371,22 @@ }, /area/f13/building/lower_firetower) "fwA" = ( +<<<<<<< Updated upstream /obj/structure/simple_door/house, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +/obj/structure/sign/basic{ + name = "sign backing" + }, +/obj/item/reagent_containers/food/snacks/icecreamsandwich{ + pixel_x = -1; + anchored = 1; + name = "ice cream sign" + }, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "fwC" = ( /obj/structure/fence/wooden, /turf/open/indestructible/ground/outside/dirt{ @@ -18155,6 +21419,7 @@ /obj/structure/frame/machine, /turf/open/floor/plasteel/dark, /area/engine/workshop) +<<<<<<< Updated upstream "fwZ" = ( /obj/structure/table/booth, /obj/effect/decal/cleanable/dirt, @@ -18162,6 +21427,20 @@ /turf/open/floor/plating/f13/outside/roof/wood{ name = "wooden floor"; desc = "It's a floor. Wow." +======= +"fwX" = ( +/obj/structure/curtain{ + color = "#363636" + }, +/obj/structure/window/fulltile/house, +/turf/open/indestructible/ground/outside/desert, +/area/f13/ncr) +"fxa" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/baconegg, +/obj/effect/decal/cleanable/dirt{ + color = "#363636" +>>>>>>> Stashed changes }, /area/f13/ambientlighting/building/m) "fxa" = ( @@ -18211,6 +21490,13 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +<<<<<<< Updated upstream +======= +"fyd" = ( +/obj/machinery/light/fo13colored/Red, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "fye" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain2" @@ -18249,6 +21535,7 @@ icon_state = "horizontalbottombordertop3" }, /area/f13/wasteland) +<<<<<<< Updated upstream "fyC" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/sidewalk{ @@ -18261,6 +21548,12 @@ icon_state = "horizontaloutermain0" }, /area/f13/wasteland) +======= +"fyN" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "fyP" = ( /turf/closed/mineral/random/low_chance, /area/f13/building/tribal) @@ -18287,6 +21580,15 @@ icon_state = "whitebluechess" }, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream +======= +"fze" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "fzl" = ( /obj/structure/fence/wooden{ dir = 1; @@ -18315,6 +21617,14 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"fzy" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris2" + }, +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "fzC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/robot_debris, @@ -18386,6 +21696,21 @@ "fAb" = ( /turf/closed/wall/f13/tunnel, /area/f13/building) +<<<<<<< Updated upstream +======= +"fAf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/ammo{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/storage/toolbox/ammo{ + pixel_x = -6; + pixel_y = 29 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "fAg" = ( /obj/item/flag/legion, /turf/open/indestructible/ground/outside/dirt{ @@ -18394,9 +21719,22 @@ }, /area/f13/wasteland/legion) "fAj" = ( +<<<<<<< Updated upstream /obj/item/electropack/shockcollar/explosive, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/structure/closet/locker/oldstyle{ + anchored = 1 + }, +/obj/item/storage/lockbox, +/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/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "fAw" = ( /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/water, @@ -18483,10 +21821,21 @@ }, /area/f13/ambientlighting/building/o) "fBy" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright2top" }, /area/f13/wasteland) +======= +/obj/structure/railing/wood/underlayer, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) +"fBA" = ( +/obj/structure/rack/shelf_metal, +/obj/item/weldingtool, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "fBM" = ( /obj/effect/decal/marking{ icon_state = "dottedhorizontalcorroded" @@ -18561,6 +21910,15 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +<<<<<<< Updated upstream +======= +"fCP" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "fCW" = ( /obj/structure/chair/office/dark, /turf/open/floor/f13/wood, @@ -18569,6 +21927,15 @@ /obj/structure/reagent_dispensers/barrel/three, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"fDn" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "fDs" = ( /obj/structure/shopping_cart, /turf/open/indestructible/ground/outside/sidewalk{ @@ -18602,6 +21969,14 @@ /obj/item/book/manual/wiki/security_space_law, /turf/open/floor/wood_common/wood_common_dark, /area/f13/building/abandoned/n) +<<<<<<< Updated upstream +======= +"fDG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "fDK" = ( /obj/structure/flora/rock/pile/largejungle{ icon_state = "bush2"; @@ -18610,6 +21985,7 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream "fDM" = ( /obj/machinery/light, /turf/open/floor/wood_wide, @@ -18622,6 +21998,8 @@ }, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +>>>>>>> Stashed changes "fDR" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt{ @@ -18630,11 +22008,18 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) "fDS" = ( +<<<<<<< Updated upstream /obj/effect/decal/fakelattice, /obj/machinery/workbench, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) +======= +/obj/structure/table/wood/club, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "fEe" = ( /obj/structure/campfire/barrel, /obj/effect/decal/fakelattice, @@ -18717,6 +22102,16 @@ /mob/living/simple_animal/hostile/raider/baseball, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"fFk" = ( +/obj/structure/grille/broken, +/obj/item/trash/f13/borscht, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "fFq" = ( /obj/structure/flora/junglebush/c, /turf/open/indestructible/ground/outside/dirt, @@ -18731,11 +22126,44 @@ icon_state = "dark" }, /area/f13/brotherhood) +<<<<<<< Updated upstream "fGa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +"fFQ" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/components/unary/tank/air, +/obj/effect/decal/fakelattice, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +"fGa" = ( +/obj/structure/sign/poster/ncr/democracy, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +"fGd" = ( +/obj/item/reagent_containers/pill/bitterdrink, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"fGj" = ( +/obj/machinery/power/apc/fusebox/north, +/obj/structure/cable/outdoors{ + icon_state = "0-2" + }, +/obj/machinery/light_switch{ + pixel_y = 26; + name = "Base Lighting"; + pixel_x = 10 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "fGs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/destructible/tribal_torch/wall/lit{ @@ -18883,6 +22311,12 @@ /obj/effect/decal/cleanable/blood/gibs/human/body, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"fJE" = ( +/turf/closed/mineral/random, +/area/f13/ncr) +>>>>>>> Stashed changes "fJI" = ( /obj/effect/decal/remains{ icon_state = "remains" @@ -18946,6 +22380,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +"fKd" = ( +/obj/structure/rack/large/shelf_rust{ + dir = 8 + }, +/obj/item/clothing/under/shorts/jeanbshorts, +/obj/item/clothing/under/shorts/jeanbshorts, +/obj/item/clothing/under/shorts/jeanbshorts, +/obj/item/clothing/suit/suspenders{ + pixel_y = 6 + }, +/obj/item/clothing/suit/suspenders{ + pixel_y = 6 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "fKj" = ( /obj/structure/simple_door/room, /turf/open/floor/f13{ @@ -18981,10 +22430,24 @@ dir = 4; light_color = "#c1caff" }, +<<<<<<< Updated upstream /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, /area/f13/building/powered) +======= +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/building/powered) +"fKH" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "fKI" = ( /obj/structure/closet/crate/footlocker{ pixel_x = -8; @@ -19067,6 +22530,7 @@ icon_state = "innercornerpieceleft" }, /area/f13/wasteland) +<<<<<<< Updated upstream "fLu" = ( /obj/machinery/button/door{ pixel_y = 28; @@ -19079,6 +22543,13 @@ dir = 1 }, /turf/open/indestructible/ground/outside/sidewalk, +======= +"fLH" = ( +/obj/effect/spawner/lootdrop/bedsheet, +/obj/structure/bed/wooden, +/obj/effect/landmark/start/f13/ncrcaptain, +/turf/open/floor/wood_fancy/wood_fancy_light, +>>>>>>> Stashed changes /area/f13/ncr) "fLL" = ( /obj/effect/turf_decal/weather/dirt, @@ -19181,12 +22652,19 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) "fMZ" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood{ icon_state = "tracks" }, /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/simple_door/brokenglass, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "fNl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, @@ -19232,6 +22710,15 @@ icon_state = "housewood2-broken" }, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream +======= +"fNL" = ( +/obj/structure/table/booth, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "fNN" = ( /obj/structure/car/rubbish4, /turf/open/indestructible/ground/outside/desert, @@ -19266,6 +22753,7 @@ /turf/open/floor/wood_common/wood_common_light, /area/maintenance/bar) "fOf" = ( +<<<<<<< Updated upstream /obj/effect/gibspawner/human/bodypartless, /obj/effect/decal/cleanable/blood/gibs, /turf/open/indestructible/ground/inside/mountain, @@ -19275,6 +22763,33 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +/obj/machinery/workbench/advanced, +/obj/machinery/light{ + dir = 8; + flickering = 1 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +"fOj" = ( +/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/cleanable/dirt/dust, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "fOk" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/grass/dirtpath{ @@ -19289,6 +22804,7 @@ dir = 4 }, /area/f13/wasteland) +<<<<<<< Updated upstream "fOJ" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/gloves, @@ -19304,6 +22820,31 @@ /obj/effect/spawner/lootdrop/f13/alcoholspawner, /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/floor/wood_fancy, +======= +"fOL" = ( +/obj/item/clothing/mask/bandana/blue, +/obj/item/clothing/mask/bandana/blue, +/obj/item/clothing/mask/bandana/blue, +/obj/machinery/light{ + dir = 4; + pixel_y = -16 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +"fOQ" = ( +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +"fOT" = ( +/obj/structure/table/booth, +/obj/item/crafting/coffee_pot{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/reagent_containers/food/drinks/bottle/instacoffee, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/f13/wood, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "fOW" = ( /obj/structure/flora/rock/jungle, @@ -19381,6 +22922,15 @@ }, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"fQd" = ( +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "fQs" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -19556,6 +23106,7 @@ }, /area/f13/wasteland) "fSZ" = ( +<<<<<<< Updated upstream /obj/structure/decoration/rag{ icon_state = "flag_ncr"; name = "NCR banner"; @@ -19565,6 +23116,10 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) +======= +/turf/closed/wall/f13/store, +/area/f13/building/powered) +>>>>>>> Stashed changes "fTl" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -19579,11 +23134,20 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +<<<<<<< Updated upstream "fTn" = ( /obj/item/reagent_containers/glass/rag/towel, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/grimy, /area/f13/ncr) +======= +"fTt" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2left" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "fTw" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -19603,8 +23167,17 @@ /turf/closed/wall/f13/wood/house, /area/f13/legioncamp) "fTI" = ( +<<<<<<< Updated upstream /obj/structure/reagent_dispensers/barrel/dangerous, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/structure/chair/bench{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "fTK" = ( /obj/effect/decal/cleanable/dirt, @@ -19612,12 +23185,31 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/u) +<<<<<<< Updated upstream "fUa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain0" }, +======= +"fTU" = ( +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +"fUa" = ( +/obj/structure/fence{ + dir = 4 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/wasteland) "fUf" = ( /turf/open/floor/wood_wide, @@ -19628,6 +23220,14 @@ icon_state = "horizontalinnermain2" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"fUm" = ( +/turf/open/floor/f13/wood{ + icon_state = "housewood3-broken" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "fUz" = ( /obj/effect/turf_decal/weather/dirt, /obj/machinery/mineral/wasteland_vendor/medical, @@ -19692,6 +23292,7 @@ /obj/structure/mirelurkegg, /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) +<<<<<<< Updated upstream "fVF" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light/small{ @@ -19700,6 +23301,17 @@ }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +======= +"fVy" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -13 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "fVH" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -19731,6 +23343,7 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "fVP" = ( +<<<<<<< Updated upstream /obj/structure/car/rubbish2{ icon_state = "car_rubish3" }, @@ -19744,6 +23357,13 @@ }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/ncr) +======= +/obj/structure/chair/folding, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "fVS" = ( /turf/closed/wall/f13/sunset/brick_small_dark, /area/f13/followers) @@ -19773,6 +23393,14 @@ /obj/item/bedsheet/blanket, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/t) +<<<<<<< Updated upstream +======= +"fWw" = ( +/obj/structure/rack/shelf_metal, +/obj/item/salvage/low, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "fWK" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, @@ -20026,6 +23654,7 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "gai" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather, /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -20038,6 +23667,13 @@ }, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/m) +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +>>>>>>> Stashed changes "gal" = ( /obj/structure/table/optable/primitive, /turf/open/floor/f13/wood{ @@ -20127,6 +23763,7 @@ /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +<<<<<<< Updated upstream "gbA" = ( /obj/effect/decal/cleanable/glass, /obj/item/storage/trash_stack{ @@ -20146,6 +23783,15 @@ /obj/item/stack/f13Cash/caps/twofive, /turf/open/floor/wood_worn, /area/f13/ambientlighting/building/m) +======= +"gbB" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/mob_spawn/human/corpse/legion, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +>>>>>>> Stashed changes "gbL" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -20224,6 +23870,7 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) "gcP" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/glass, /obj/structure/table/booth, /obj/effect/spawner/lootdrop/f13/alcoholspawner, @@ -20239,6 +23886,15 @@ /obj/structure/flora/grass/wasteland, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) +======= +/obj/effect/decal/cleanable/generic, +/obj/structure/table/booth, +/obj/item/flag/ncr{ + pixel_y = 22 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "gcX" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -20246,12 +23902,21 @@ /obj/effect/overlay/fog, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +<<<<<<< Updated upstream "gdm" = ( /obj/structure/table/reinforced, /obj/structure/barricade/bars, /obj/effect/spawner/structure/window/reinforced/indestructable, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +======= +"gdg" = ( +/obj/structure/wreck/trash/machinepile, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "gdo" = ( /obj/structure/debris/v1{ color = "#343a33"; @@ -20275,11 +23940,18 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/x) "gdH" = ( +<<<<<<< Updated upstream /obj/machinery/vending/nukacolavendfull, /turf/open/floor/f13{ icon_state = "dark" }, /area/f13/brotherhood) +======= +/obj/effect/decal/fakelattice, +/obj/structure/wreck/trash/engine, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "gdK" = ( /obj/structure/fence{ dir = 4 @@ -20355,6 +24027,7 @@ /obj/structure/obstacle/barbedwire, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +<<<<<<< Updated upstream "get" = ( /obj/item/statuebust{ anchored = 1; @@ -20362,6 +24035,24 @@ }, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/m) +======= +"ges" = ( +/obj/machinery/light/fo13colored/Aqua{ + desc = "A lighting fixture with cold blue lighting."; + name = "UV light" + }, +/obj/effect/landmark/start/f13/ncrcombatmedic, +/obj/effect/landmark/start/f13/ncrcombatmedic, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +"gev" = ( +/obj/item/chair/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "geG" = ( /obj/structure/chair/booth{ icon_state = "booth_west_north" @@ -20431,6 +24122,22 @@ dir = 8 }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"gfq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +"gfx" = ( +/obj/machinery/door/unpowered/secure_NCR, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "gfz" = ( /obj/structure/table, /obj/item/kitchen/knife, @@ -20519,6 +24226,7 @@ /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) "ggj" = ( +<<<<<<< Updated upstream /obj/structure/stairs/north{ color = "#A47449" }, @@ -20528,6 +24236,12 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ggr" = ( /obj/structure/bed/wooden{ pixel_y = 15 @@ -20545,9 +24259,18 @@ /turf/open/floor/carpet, /area/f13/legioncamp) "ggF" = ( +<<<<<<< Updated upstream /obj/structure/junk/jukebox, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +/obj/structure/rack/large/shelf{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/vaporwave, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "ggI" = ( /obj/structure/table/wood, /obj/structure/decoration/rag, @@ -20563,6 +24286,12 @@ /obj/item/reagent_containers/food/snacks/meatsalted, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"ggK" = ( +/obj/structure/simple_door/bunker, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "ggQ" = ( /mob/living/simple_animal/hostile/supermutant, /obj/effect/overlay/desert_side{ @@ -20575,6 +24304,7 @@ /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "ggY" = ( +<<<<<<< Updated upstream /obj/structure/chair/sofa/left{ dir = 8 }, @@ -20586,6 +24316,20 @@ /obj/effect/decal/remains/human, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +======= +/obj/structure/table/wood/junk, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"ghi" = ( +/obj/effect/decal/fakelattice, +/obj/structure/junk/small, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "gho" = ( /mob/living/simple_animal/hostile/supermutant/rangedmutant, /turf/open/floor/plating/rust, @@ -20596,6 +24340,10 @@ icon_state = "horizontaltopbordertop2right" }, /area/f13/wasteland) +"ghw" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "ghL" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/gibspawner/human, @@ -20763,6 +24511,20 @@ /obj/structure/flora/tree/oak_one, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"gkE" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/mineral/plasma/twentyfive, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop2" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "gkK" = ( /obj/structure/chair/wood/wings, /obj/effect/landmark/start/f13/family_head, @@ -20771,6 +24533,16 @@ }, /turf/open/floor/carpet/airless, /area/f13/ambientlighting/building/c) +"gkQ" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "gkS" = ( /obj/structure/wreck/trash/machinepile, /turf/open/indestructible/ground/inside/dirt, @@ -20855,8 +24627,14 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "glZ" = ( +<<<<<<< Updated upstream /turf/closed/wall/f13/ruins, /area/f13/ambientlighting/building/m) +======= +/obj/structure/simple_door/metal/fence/wooden, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "gmj" = ( /mob/living/simple_animal/hostile/ghoul/soldier/armored, /obj/effect/decal/cleanable/dirt, @@ -20994,6 +24772,13 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/t) +"goi" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/table/booth, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "gon" = ( /obj/structure/fence{ dir = 8 @@ -21097,6 +24882,7 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +<<<<<<< Updated upstream "gpT" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/chair/wood/wings{ @@ -21107,6 +24893,12 @@ icon_state = "common-broken4" }, /area/f13/ambientlighting/building/m) +======= +"gpX" = ( +/obj/structure/table/booth, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "gqa" = ( /obj/structure/car/rubbish3, /obj/structure/wreck/trash/halftire{ @@ -21130,6 +24922,7 @@ /turf/open/floor/plating/wooden, /area/f13/building/abandoned/x) "gqh" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge/corner{ dir = 8 }, @@ -21138,6 +24931,13 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, +======= +/obj/structure/closet/crate/grave, +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/dirt, +>>>>>>> Stashed changes /area/f13/wasteland) "gqt" = ( /obj/effect/decal/cleanable/blood/gibs/down{ @@ -21162,6 +24962,7 @@ }, /area/f13/wasteland) "gqA" = ( +<<<<<<< Updated upstream /obj/structure/fence{ dir = 4 }, @@ -21169,6 +24970,16 @@ dir = 1 }, /turf/open/indestructible/ground/outside/sidewalk, +======= +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/structure/car/rubbish1, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "gqE" = ( /obj/effect/decal/cleanable/dirt, @@ -21198,11 +25009,26 @@ icon_state = "whitebluechess" }, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream "gqX" = ( /obj/structure/table, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +"gqN" = ( +/obj/structure/table, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +"gqS" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "grb" = ( /obj/structure/flora/tree/tall, /obj/effect/decal/remains/human{ @@ -21306,6 +25132,13 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland/town) +"gsK" = ( +/mob/living/simple_animal/hostile/renegade/guardian, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "gsX" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/sidewalk{ @@ -21313,9 +25146,15 @@ }, /area/f13/wasteland) "gtb" = ( +<<<<<<< Updated upstream /mob/living/simple_animal/hostile/ghoul, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "gtc" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/road{ @@ -21378,6 +25217,17 @@ /obj/effect/landmark/start/f13/wastelander, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"guj" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) "gur" = ( /obj/effect/overlay/desert_side{ dir = 4 @@ -21542,6 +25392,7 @@ }, /area/f13/wasteland) "gxH" = ( +<<<<<<< Updated upstream /obj/effect/decal/fakelattice, /obj/structure/girder, /turf/open/indestructible/ground/outside/ruins, @@ -21550,6 +25401,11 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/mid, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "gxW" = ( /turf/open/floor/f13{ icon_state = "greenrustyfull" @@ -21574,11 +25430,22 @@ icon_state = "horizontalinnermain2right" }, /area/f13/wasteland) +<<<<<<< Updated upstream "gyr" = ( /obj/structure/table/plasmaglass, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +"gyi" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/fakelattice, +/obj/effect/overlay/junk/toilet{ + dir = 8 + }, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +>>>>>>> Stashed changes "gyt" = ( /obj/machinery/light{ bulb_colour = "#BC8F8F"; @@ -21702,10 +25569,23 @@ /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) "gzM" = ( +<<<<<<< Updated upstream /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) +======= +/obj/item/stack/f13Cash/random/denarius/high, +/obj/item/stack/f13Cash/random/aureus/low, +/obj/item/rack_parts, +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6"; + pixel_x = -18; + pixel_y = 15 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "gzU" = ( /obj/structure/weightmachine/weightlifter, /turf/open/indestructible/ground/outside/dirt, @@ -21781,7 +25661,11 @@ /turf/open/indestructible/ground/outside/road, /area/f13/building/abandoned/n) "gAX" = ( +<<<<<<< Updated upstream /obj/structure/obstacle/old_locked_door, +======= +/obj/effect/decal/cleanable/robot_debris, +>>>>>>> Stashed changes /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "gBf" = ( @@ -21824,6 +25708,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "gBE" = ( +<<<<<<< Updated upstream /obj/item/reagent_containers/pill/patch/healpoultice, /obj/item/reagent_containers/pill/patch/healpoultice, /obj/effect/decal/cleanable/blood{ @@ -21839,11 +25724,28 @@ "gBQ" = ( /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/machinery/light/fo13colored/Red{ + dir = 8 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +"gBO" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) +"gBQ" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "gCb" = ( /obj/structure/barricade/sandbags, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream "gCd" = ( /obj/structure/sign/flag_america, /turf/closed/indestructible/rock{ @@ -21863,6 +25765,12 @@ /turf/open/floor/f13{ icon_state = "yellowrustyfull" }, +======= +"gCo" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul, +/turf/open/floor/plasteel/f13/stone, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "gCp" = ( /obj/structure/table, @@ -21889,6 +25797,12 @@ icon_state = "horizontaltopborderbottom2" }, /area/f13/wasteland) +"gCO" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/ambientlighting/building/m) "gCP" = ( /obj/effect/turf_decal/weather/dirt{ color = "#a98c5d"; @@ -22034,6 +25948,20 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"gEl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth, +/obj/item/stack/sheet/cloth, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "gEp" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/sidewalk{ @@ -22121,6 +26049,7 @@ icon_state = "bluerustysolid" }, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream "gFQ" = ( /obj/structure/cable/outdoors{ icon_state = "4-8" @@ -22136,6 +26065,29 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +======= +"gFJ" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/leather/twenty, +/obj/item/stack/sheet/metal/twenty, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop2" + }, +/area/f13/wasteland) +"gFK" = ( +/obj/machinery/vending/nukacolavend, +/obj/structure/billboard/nukagirl{ + pixel_y = 20; + pixel_x = -17 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "gGf" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -22155,6 +26107,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream "gGr" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -22162,6 +26115,22 @@ /obj/structure/flora/wasteplant/wild_fungus, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) +======= +"gGn" = ( +/obj/structure/fence/wooden{ + dir = 4; + icon_state = "post_wood" + }, +/obj/item/flag/legion{ + pixel_y = 28; + pixel_x = 1 + }, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt"; + dir = 1 + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "gGw" = ( /mob/living/simple_animal/hostile/ghoul, /turf/open/indestructible/ground/outside/desert, @@ -22238,6 +26207,18 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland/town) +<<<<<<< Updated upstream +======= +"gHE" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/item/tele_iv, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "gHN" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -22517,6 +26498,21 @@ color = "#e4e4e4" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"gLl" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/twohanded/spear, +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +>>>>>>> Stashed changes "gLo" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -22536,6 +26532,7 @@ /turf/open/floor/plasteel/dark, /area/f13/ambientlighting/building/y) "gLz" = ( +<<<<<<< Updated upstream /obj/structure/fence{ dir = 4 }, @@ -22545,6 +26542,19 @@ icon_state = "dirt" }, /area/f13/wasteland) +======= +/obj/structure/table/reinforced, +/obj/structure/barricade/sandbags, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/brotherhood) +"gLH" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2" + }, +/obj/item/reagent_containers/pill/bitterdrink, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "gLK" = ( /obj/structure/billboard/poseidenenergy2, /turf/open/indestructible/ground/outside/sidewalk{ @@ -22593,6 +26603,7 @@ /turf/open/floor/engine/air, /area/engine/workshop) "gMb" = ( +<<<<<<< Updated upstream /obj/item/clothing/head/beret/headband, /obj/structure/statue/petrified, /obj/item/clothing/under/pants/mustangjeans{ @@ -22604,6 +26615,14 @@ }, /obj/item/clothing/suit/armor/outfit/jacket/ncrcfjacket, /turf/open/floor/plasteel/grimy, +======= +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/carpet/arcade, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "gMd" = ( /obj/effect/landmark/legion_attack{ @@ -22614,6 +26633,15 @@ icon_state = "horizontalinnermain2" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"gMf" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "gMh" = ( /obj/structure/table/wood, /obj/structure/decoration/rag, @@ -22661,10 +26689,23 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "gMH" = ( +<<<<<<< Updated upstream /obj/structure/table/wood/junk, /obj/item/assembly/signaler, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/statue/petrified, +/obj/item/clothing/under/f13/ravenharness, +/obj/item/gun/ballistic/automatic/assault_carbine/policerifle{ + layer = -3 + }, +/obj/item/clothing/head/cowboyhat{ + pixel_y = 15 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "gML" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/simple_door/tent, @@ -22707,6 +26748,15 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +"gNA" = ( +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowbrokenvertical" + }, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/bars, +/turf/open/indestructible/ground/outside/desert, +/area/f13/ambientlighting/building/j) "gNI" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder, @@ -22715,6 +26765,17 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) +"gNQ" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) "gNX" = ( /obj/structure/table/wood, /obj/item/clothing/glasses/legiongoggles, @@ -22772,6 +26833,7 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "gOW" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -22790,6 +26852,12 @@ }, /turf/closed/mineral/random/low_chance, /area/f13/caves) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/rockvault/alien, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "gOZ" = ( /obj/structure/flora/wasteplant/wild_broc, /turf/open/indestructible/ground/outside/dirt{ @@ -22798,8 +26866,14 @@ }, /area/f13/wasteland) "gPd" = ( +<<<<<<< Updated upstream /obj/effect/decal/fakelattice, /turf/open/floor/plating/rust, +======= +/obj/structure/junk/cabinet, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "gPj" = ( /obj/structure/lamp_post/quadra, @@ -22825,6 +26899,16 @@ icon_state = "common-broken4" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"gPB" = ( +/obj/machinery/door/unpowered/secure_NCR, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "gPC" = ( /obj/machinery/light/small{ dir = 4; @@ -22846,6 +26930,18 @@ /obj/structure/fence, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"gPN" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/trash/f13/rotten, +/obj/item/trash/f13/rotten, +/obj/item/trash/f13/rotten, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "gPV" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -22948,6 +27044,11 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/underground/cave) +"gQY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/simple_door/metal/dirtystore, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "gRd" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/f13/store{ @@ -22961,6 +27062,15 @@ /obj/structure/decoration/rag, /turf/closed/wall/f13/tentwall, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream +======= +"gRu" = ( +/obj/machinery/chem_heater, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "gRw" = ( /obj/structure/decoration/rag, /obj/effect/decal/cleanable/dirt, @@ -23023,6 +27133,12 @@ /obj/structure/flora/grass/jungle, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland/town) +"gSK" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "gSQ" = ( /obj/structure/dresser, /obj/effect/decal/cleanable/dirt/dust, @@ -23070,6 +27186,14 @@ icon_state = "innermaincornerinner" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"gTy" = ( +/obj/effect/spawner/lootdrop/glowstick, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "gTD" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 5 @@ -23105,6 +27229,16 @@ icon_state = "common-broken3" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"gTS" = ( +/obj/structure/table/booth, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "gTW" = ( /obj/structure/closet/crate/footlocker{ anchored = 1 @@ -23284,6 +27418,7 @@ }, /area/f13/building/abandoned/a) "gWG" = ( +<<<<<<< Updated upstream /turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) "gWT" = ( @@ -23294,7 +27429,28 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, +======= +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +>>>>>>> Stashed changes /area/f13/ncr) +"gWJ" = ( +/obj/structure/destructible/tribal_torch/wall/lit, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +"gWU" = ( +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "gXh" = ( /obj/structure/table/wood, /obj/item/kirbyplants{ @@ -23317,6 +27473,18 @@ }, /turf/open/floor/carpet/orange, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream +======= +"gXB" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Prison" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "gXD" = ( /obj/structure/wreck/car, /turf/open/indestructible/ground/outside/dirt{ @@ -23422,6 +27590,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/dirt, /area/f13/building/abandoned/q) +<<<<<<< Updated upstream +======= +"gYJ" = ( +/obj/item/trash/f13/steak, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "gYP" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -23481,8 +27657,19 @@ /obj/structure/fence/wooden{ dir = 1 }, +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) +======= +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland/legion) +"gZu" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "gZv" = ( /obj/structure/window/fulltile/house{ dir = 2; @@ -23520,10 +27707,18 @@ icon_state = "carpetstar" }, /area/f13/ambientlighting/building/z) +<<<<<<< Updated upstream "gZW" = ( /obj/machinery/workbench, /obj/item/reagent_containers/hypospray/medipen/stimpak, /turf/open/indestructible/ground/outside/desert, +======= +"gZY" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "hab" = ( /obj/structure/table/wood/junk, @@ -23550,17 +27745,42 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/t) "hak" = ( +<<<<<<< Updated upstream /obj/structure/chair/booth{ dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bar, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/marking{ + pixel_x = -14 + }, +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ham" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, /turf/closed/wall/mineral/wood, /area/f13/wasteland/legion) +"han" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/effect/decal/cleanable/oil{ + icon_state = "floor5"; + pixel_x = -19 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "hap" = ( /obj/structure/table/wood/poker, /obj/effect/spawner/lootdrop/gambling, @@ -23632,8 +27852,21 @@ dir = 1; icon_state = "bench_center" }, +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/effect/spawner/lootdrop/trash, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +"hbo" = ( +/obj/effect/decal/fakelattice, +/obj/machinery/autolathe, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "hbp" = ( /obj/machinery/power/apc/fusebox/north, /obj/structure/wreck/trash/machinepile, @@ -23678,6 +27911,15 @@ /mob/living/simple_animal/hostile/ghoul, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"hbU" = ( +/obj/item/kirbyplants{ + icon_state = "plant-17" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "hbV" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -23701,9 +27943,20 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "hct" = ( +<<<<<<< Updated upstream /obj/structure/wreck/trash/one_tire, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" +======= +/obj/machinery/light/lampost{ + dir = 4; + pixel_x = 27; + pixel_y = 27 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerturn" +>>>>>>> Stashed changes }, /area/f13/wasteland) "hcz" = ( @@ -23736,6 +27989,19 @@ /obj/effect/decal/cleanable/robot_debris/gib, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"hcZ" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress1"; + pixel_y = 9 + }, +/obj/item/blacksmith/chain{ + pixel_x = -8 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "hde" = ( /obj/structure/barricade/tentclothedge{ pixel_y = -4 @@ -23941,6 +28207,18 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream +======= +"hfw" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/vending/games, +/obj/machinery/light/small{ + brightness = 7; + dir = 4 + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "hfH" = ( /obj/structure/fence{ dir = 4 @@ -23951,12 +28229,20 @@ }, /area/f13/wasteland) "hfR" = ( +<<<<<<< Updated upstream /obj/structure/junk/machinery, /turf/open/indestructible/ground/outside/road{ dir = 1; icon_state = "horizontaltopborderbottom0" }, /area/f13/wasteland) +======= +/obj/structure/fluff/paper/stack{ + dir = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "hfT" = ( /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/u) @@ -23975,6 +28261,7 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream "hgt" = ( /obj/structure/barricade/sandbags, /obj/structure/cable/outdoors{ @@ -23984,6 +28271,14 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +======= +"hgr" = ( +/obj/structure/stairs/south{ + color = "#A47449" + }, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "hgu" = ( /obj/structure/rack/shelf_metal, /obj/item/book/granter/crafting_recipe/gunsmith_one, @@ -24122,6 +28417,13 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"hhY" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "hib" = ( /obj/item/trash/f13/instamash, /turf/open/indestructible/ground/outside/dirt, @@ -24423,6 +28725,12 @@ "hlO" = ( /turf/open/floor/carpet/royalblue, /area/f13/building/abandoned/s) +<<<<<<< Updated upstream +======= +"hlS" = ( +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "hlV" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, @@ -24606,8 +28914,17 @@ }, /area/f13/wasteland/town) "hnJ" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/pill/bitterdrink, +======= +/obj/item/reagent_containers/pill/patch/healpoultice, +/obj/item/reagent_containers/pill/patch/healpoultice, +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +>>>>>>> Stashed changes /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "hnL" = ( @@ -24633,6 +28950,42 @@ icon_state = "transition1" }, /area/f13/wasteland) +"hog" = ( +/obj/structure/rack/large/shelf, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 24; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 24; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 24; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 24; + pixel_x = 8 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = -2; + pixel_x = 8 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = -2; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 12; + pixel_x = -3 + }, +/obj/item/radio/headset/headset_ncr{ + pixel_y = 12; + pixel_x = 8 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "hoi" = ( /obj/machinery/autolathe/constructionlathe, /obj/effect/decal/cleanable/dirt/dust, @@ -24647,12 +29000,26 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) "hoq" = ( +<<<<<<< Updated upstream /turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) "hot" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 }, +======= +/obj/effect/decal/remains/human, +/obj/machinery/light{ + dir = 1; + layer = 2.9 + }, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) +"hot" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +>>>>>>> Stashed changes /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) "hou" = ( @@ -24675,8 +29042,18 @@ }, /area/f13/building/powered) "hox" = ( +<<<<<<< Updated upstream /turf/open/floor/wood_common/wood_common_light, /area/f13/building/powered) +======= +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_4"; + layer = 5 + }, +/obj/structure/flora/twig3, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "hoz" = ( /obj/effect/spawner/lootdrop/f13/armor/tier1, /turf/open/indestructible/ground/outside/dirt, @@ -24711,6 +29088,7 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "hpp" = ( +<<<<<<< Updated upstream /obj/effect/decal/marking{ pixel_x = -14 }, @@ -24724,6 +29102,22 @@ "hpE" = ( /turf/closed/wall/mineral/brick, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden, +/obj/structure/barricade/tentclothedge{ + dir = 8 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +"hpE" = ( +/obj/machinery/light{ + dir = 1; + layer = 2.9 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "hpH" = ( /obj/structure/lamp_post{ dir = 8 @@ -24738,6 +29132,7 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream "hpV" = ( /obj/effect/decal/cleanable/glass, /obj/structure/closet/crate/bin/trashbin, @@ -24762,6 +29157,20 @@ /obj/structure/sign/poster/ncr/irradiated_food, /turf/closed/wall/f13/wood/interior, /area/f13/ncr) +======= +"hpR" = ( +/obj/item/chair/wood, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +"hpV" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/fakelattice, +/obj/machinery/power/smes/engineering, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +>>>>>>> Stashed changes "hqn" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, @@ -24800,6 +29209,23 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"hqC" = ( +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +"hqE" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/generic, +/obj/machinery/light/small, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "hqH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/tentclothedge, @@ -24898,10 +29324,30 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +"hrM" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) "hrN" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"hrQ" = ( +/obj/structure/window/fulltile/ruins/broken, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks{ + icon_state = "board-2"; + desc = "This sps" + }, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "hrR" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -24928,9 +29374,15 @@ /obj/structure/table/reinforced, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream "hsD" = ( /obj/item/pickaxe, /turf/open/indestructible/ground/inside/mountain, +======= +"hsI" = ( +/obj/effect/spawner/lootdrop/toolsbasic, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/ncr) "hsO" = ( /obj/structure/table, @@ -24986,9 +29438,22 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland/town) "htm" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/item/storage/trash_stack, /turf/open/floor/plasteel/bar, +======= +/obj/structure/fence/corner{ + dir = 4; + icon_state = "end" + }, +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "htB" = ( /obj/machinery/light/small{ @@ -25065,9 +29530,21 @@ dir = 1 }, /area/f13/wasteland) +<<<<<<< Updated upstream "huE" = ( /obj/structure/flora/grass/coyote/three, /turf/open/indestructible/ground/outside/desert, +======= +"huJ" = ( +/obj/structure/decoration/rag{ + icon_state = "flag_ncr"; + name = "NCR banner"; + pixel_y = 32 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "huO" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -25139,12 +29616,35 @@ name = "rusted floor" }, /area/f13/bunker) +<<<<<<< Updated upstream "hvC" = ( /obj/structure/cable/outdoors{ icon_state = "2-8" }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +======= +"hvs" = ( +/obj/machinery/smartfridge/bottlerack{ + pixel_x = 3 + }, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"hvH" = ( +/obj/structure/reagent_dispensers/barrel/three{ + pixel_x = -14 + }, +/obj/effect/spawner/lootdrop/trash, +/turf/open/indestructible/ground/outside/dirt{ + dir = 1; + icon_state = "dirtcorner" + }, +/area/f13/wasteland/legion) +>>>>>>> Stashed changes "hvN" = ( /obj/effect/overlay/junk/oldpipes{ pixel_y = -3 @@ -25152,6 +29652,25 @@ /obj/machinery/atmospherics/components/unary/tank/water_vapor, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"hvO" = ( +/obj/structure/fence/wooden{ + dir = 4; + icon_state = "post_wood" + }, +/obj/effect/decal/cleanable/generic{ + pixel_x = -8; + pixel_y = 12 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/legioncamp) +"hvT" = ( +/obj/effect/spawner/lootdrop/glowstick, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "hvW" = ( /obj/structure/chair/left, /turf/open/floor/wood_common, @@ -25181,6 +29700,7 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream "hwn" = ( /obj/structure/noticeboard{ pixel_y = 32 @@ -25195,6 +29715,18 @@ dir = 1 }, /area/f13/brotherhood) +======= +"hwp" = ( +/obj/machinery/button/door{ + pixel_y = 28; + id = 983 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "hwy" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 1 @@ -25267,6 +29799,7 @@ }, /area/f13/building/abandoned/h) "hxj" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bar, /area/f13/wasteland) @@ -25281,6 +29814,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +/obj/structure/chair/wood/wings{ + dir = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +"hxl" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "hxr" = ( /turf/open/indestructible/ground/outside/road{ dir = 1; @@ -25328,6 +29876,17 @@ }, /turf/open/floor/wood_common, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"hya" = ( +/obj/structure/car/rubbish2{ + icon_state = "car_rubish3" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "hyb" = ( /turf/closed/indestructible/rock{ desc = "A pre-War wall made of solid concrete."; @@ -25351,16 +29910,37 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream "hyn" = ( /obj/structure/table, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/ncr) +======= +"hyp" = ( +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "hys" = ( /obj/effect/overlay/desert_side{ dir = 8 }, +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +======= +/area/f13/wasteland/legion) +"hyP" = ( +/obj/effect/turf_decal/big{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "hyZ" = ( /obj/structure/table/wood, /obj/structure/curtain{ @@ -25393,6 +29973,11 @@ /obj/item/melee/onehanded/machete/spatha, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/powered) +"hzu" = ( +/obj/item/blacksmith/chain, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) "hzx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -25463,12 +30048,22 @@ }, /area/f13/ambientlighting/building/m) "hAD" = ( +<<<<<<< Updated upstream /obj/effect/overlay/rockfloor_side, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +======= +/obj/effect/decal/fakelattice, +/obj/structure/junk/cabinet, +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "hAE" = ( /obj/structure/bed/mattress{ icon_state = "mattress2"; @@ -25498,11 +30093,19 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "hAK" = ( +<<<<<<< Updated upstream /obj/structure/car/rubbish4{ pixel_y = -9; icon_state = "debris1" }, /obj/effect/overlay/desert/sonora/edge/corner, +======= +/obj/structure/table/wood/junk, +/obj/item/reagent_containers/food/snacks/soup/hotchili{ + pixel_y = 11 + }, +/obj/effect/decal/cleanable/dirt, +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) "hAM" = ( @@ -25577,12 +30180,25 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "hBx" = ( +<<<<<<< Updated upstream /obj/effect/decal/fakelattice, /obj/machinery/light/broken{ dir = 4 }, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"hBy" = ( +/obj/structure/railing/corner, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "hBG" = ( /turf/open/floor/f13{ icon_state = "whitegreenrustychess" @@ -25708,6 +30324,7 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/p) +<<<<<<< Updated upstream "hDi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/displaycase/trophy, @@ -25717,6 +30334,24 @@ }, /obj/structure/fluff/railing, /turf/open/floor/carpet/arcade, +======= +"hDe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/mineral/concrete, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +"hDi" = ( +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/metal/ten, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +"hDp" = ( +/obj/structure/table/booth, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/f13/wood, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "hDq" = ( /obj/structure/window/reinforced/spawner{ @@ -25763,6 +30398,16 @@ }, /turf/open/floor/plating/rust, /area/f13/followers) +"hDE" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/floor/wood_common, +/area/f13/wasteland) "hDF" = ( /obj/effect/overlay/desert_side, /turf/open/indestructible/ground/outside/desert, @@ -25775,6 +30420,9 @@ icon_state = "verticalrightborderright3" }, /area/f13/wasteland) +"hDZ" = ( +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) "hEd" = ( /obj/structure/flora/wasteplant/wild_fungus, /turf/open/indestructible/ground/outside/dirt{ @@ -25804,6 +30452,15 @@ }, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/building/abandoned/l) +<<<<<<< Updated upstream +======= +"hEG" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "hEJ" = ( /turf/open/indestructible/ground/outside/desert{ icon_state = "wasteland32" @@ -25925,6 +30582,16 @@ /obj/structure/barricade/wooden, /turf/closed/wall/f13/tentwall, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"hGq" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "hGw" = ( /obj/structure/fence/wooden, /turf/open/indestructible/ground/inside/dirt, @@ -25953,6 +30620,10 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/a) +"hGN" = ( +/obj/machinery/hydroponics/soil/pot, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "hGQ" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontaltopborderbottomleft" @@ -25966,7 +30637,18 @@ }, /area/f13/ambientlighting/building/b) "hGZ" = ( +<<<<<<< Updated upstream /turf/closed/wall/f13/ruins, +======= +/obj/structure/closet/crate/footlocker{ + anchored = 1 + }, +/obj/item/storage/crayons, +/obj/item/paint/anycolor, +/obj/item/paint/anycolor, +/obj/item/paint/anycolor, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "hHf" = ( /obj/structure/flora/tree/tall, @@ -26036,9 +30718,16 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland/town) "hHP" = ( +<<<<<<< Updated upstream /obj/structure/decoration/vent/rusty, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/obj/structure/bookshelf, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "hHW" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/gecko, @@ -26055,9 +30744,19 @@ /turf/closed/wall/f13/wood/house/broken, /area/f13/legioncamp) "hIh" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) +======= +/obj/structure/table, +/obj/machinery/processor/chopping_block, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "hIi" = ( /obj/effect/spawner/lootdrop/f13/advcrafting, /obj/effect/spawner/lootdrop/f13/advcrafting, @@ -26087,6 +30786,7 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/low, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream "hIG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/wooden, @@ -26094,6 +30794,12 @@ dir = 8 }, /turf/open/floor/wood_common, +======= +"hIm" = ( +/obj/structure/chair/stool, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "hIH" = ( /obj/structure/bed/wooden{ @@ -26196,6 +30902,16 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +<<<<<<< Updated upstream +======= +"hKn" = ( +/obj/structure/closet/crate/miningcar{ + layer = 5 + }, +/obj/structure/fluff/rails, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "hKo" = ( /obj/structure/car/rubbish2, /obj/effect/decal/waste{ @@ -26215,6 +30931,7 @@ }, /area/f13/wasteland/city) "hKK" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -26223,6 +30940,13 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +>>>>>>> Stashed changes "hKN" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft2" @@ -26298,6 +31022,13 @@ icon_state = "redrustyfull" }, /area/f13/building/abandoned/t) +<<<<<<< Updated upstream +======= +"hMe" = ( +/obj/machinery/door/locked/easy/maybe_trapped, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "hMh" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/sidewalk{ @@ -26305,6 +31036,15 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"hMj" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/gloves, +/obj/item/wallframe/apc/fusebox, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/w) +>>>>>>> Stashed changes "hMm" = ( /obj/structure/table/wood, /obj/item/toy/cards/deck, @@ -26312,6 +31052,26 @@ icon_state = "verticaloutermain1" }, /area/f13/wasteland/followers) +"hMo" = ( +/obj/structure/railing/wood/post{ + name = "wooden flag pole" + }, +/obj/structure/railing/wood/post{ + name = "wooden flag pole"; + pixel_y = 20 + }, +/obj/structure/railing/wood/post{ + name = "wooden flag pole"; + pixel_y = 42 + }, +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = 11; + pixel_y = 58; + layer = 10; + anchored = 1 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "hME" = ( /obj/structure/table, /obj/item/ammo_box/m5mmbox, @@ -26320,6 +31080,7 @@ }, /area/f13/building/powered) "hMS" = ( +<<<<<<< Updated upstream /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) "hMU" = ( @@ -26332,6 +31093,17 @@ }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +======= +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_worn, +/area/f13/ambientlighting/building/m) +"hMU" = ( +/turf/open/floor/plasteel/f13{ + dir = 4; + icon_state = "rampdowntop" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "hNl" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -26340,12 +31112,20 @@ dir = 1 }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"hNm" = ( +/obj/structure/window/fulltile/wood/broken, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "hNq" = ( /obj/structure/car/rubbish3, /obj/effect/decal/cleanable/glass, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "hNt" = ( +<<<<<<< Updated upstream /obj/structure/closet/fridge{ anchored = 1 }, @@ -26357,6 +31137,13 @@ /obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) +======= +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "hNu" = ( /obj/structure/chair/bench{ dir = 8; @@ -26392,6 +31179,15 @@ name = "dirty floor" }, /area/f13/building/powered) +"hNN" = ( +/obj/machinery/microwave, +/obj/structure/table, +/obj/machinery/light{ + dir = 1; + pixel_x = 16 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ambientlighting/building/j) "hNO" = ( /obj/effect/turf_decal/huge{ dir = 8 @@ -26538,12 +31334,25 @@ }, /area/f13/followers) "hPz" = ( +<<<<<<< Updated upstream /obj/structure/chair/booth{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bar, /area/f13/ambientlighting/building/m) +======= +/obj/machinery/light{ + dir = 8; + pixel_y = -16 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +"hPF" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "hPN" = ( /obj/structure/car/rubbish1, /obj/effect/decal/cleanable/dirt, @@ -26568,6 +31377,12 @@ }, /turf/open/floor/f13, /area/f13/ambientlighting/building/o) +"hQq" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "hQt" = ( /obj/structure/chair/bench, /obj/effect/landmark/start/f13/explorer, @@ -26655,6 +31470,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +<<<<<<< Updated upstream "hRc" = ( /obj/effect/spawner/structure/window/reinforced/indestructable, /obj/structure/table, @@ -26667,6 +31483,8 @@ /obj/structure/chair/booth, /turf/open/floor/plasteel/bar, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "hRm" = ( /obj/structure/table/wood/junk, /obj/structure/fence{ @@ -26678,6 +31496,14 @@ /obj/effect/overlay/desert/sonora/edge, /turf/closed/wall/r_wall/rust, /area/f13/wasteland) +"hRn" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerborder" + }, +/area/f13/wasteland) "hRs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/wood{ @@ -26747,6 +31573,25 @@ name = "rusted floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"hSf" = ( +/obj/machinery/smartfridge/bottlerack/seedbin/primitive, +/obj/item/seeds/agave, +/obj/item/seeds/poppy/broc, +/obj/item/seeds/poppy/broc, +/obj/item/seeds/wheat, +/obj/item/seeds/tower, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/item/seeds/xander, +/obj/item/seeds/xander, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "hSg" = ( /obj/structure/reagent_dispensers/barrel/old, /turf/open/indestructible/ground/outside/desert, @@ -26840,6 +31685,14 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"hTd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "hTi" = ( /obj/structure/destructible/tribal_torch/wall/lit, /obj/structure/wreck/trash/three_barrels, @@ -26877,6 +31730,13 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ambientlighting/building/g) +<<<<<<< Updated upstream +======= +"hTU" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "hUb" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, @@ -26903,12 +31763,29 @@ dir = 6 }, /area/f13/wasteland) +<<<<<<< Updated upstream "hVm" = ( /obj/effect/decal/cleanable/glass, /turf/open/indestructible/ground/outside/dirt{ dir = 1; icon_state = "dirt" }, +======= +"hVf" = ( +/obj/structure/wreck/trash/machinepiletwo, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) +"hVn" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerbordercorner" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "hVs" = ( /obj/effect/decal/cleanable/dirt{ @@ -26937,12 +31814,38 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) +"hVY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/trash_stack, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) "hWa" = ( +<<<<<<< Updated upstream /mob/living/simple_animal/hostile/renegade/soldier, /obj/structure/chair/stool/retro/tan, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/cards/deck, +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +"hWc" = ( +/obj/structure/window/fulltile/house, +/obj/structure/curtain{ + color = "#363636" + }, +/obj/structure/barricade/wooden/planks{ + icon_state = "board-2"; + desc = "This sps" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "hWq" = ( /obj/structure/car/rubbish4{ pixel_y = -9; @@ -26984,6 +31887,7 @@ /obj/machinery/processor/chopping_block, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream "hWP" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/storage/trash_stack{ @@ -26994,6 +31898,14 @@ "hWU" = ( /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +"hWU" = ( +/obj/effect/spawner/bundle/f13/caravan_shotgun, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "hWZ" = ( /obj/structure/simple_door/metal/store{ icon_state = "brokenstore" @@ -27036,6 +31948,15 @@ icon_state = "verticalrightborderright2bottom" }, /area/f13/ambientlighting/building/y) +<<<<<<< Updated upstream +======= +"hXB" = ( +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/highmid, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermainright" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "hXV" = ( /obj/machinery/conveyor/auto{ dir = 4; @@ -27089,6 +32010,17 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream +======= +"hYY" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain2top" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "hZa" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -27099,6 +32031,7 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +<<<<<<< Updated upstream "hZy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/bin/trashbin, @@ -27106,6 +32039,24 @@ icon_state = "wide-broken5" }, /area/f13/ambientlighting/building/j) +======= +"hZw" = ( +/obj/structure/fence/corner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 7; + icon_state = "outerpavement" + }, +/area/f13/wasteland) +"hZE" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "hZG" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -27199,6 +32150,18 @@ icon_state = "horizontaltopbordertop0" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"iap" = ( +/obj/structure/chair/stool, +/obj/machinery/light/broken, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +"iaq" = ( +/obj/item/trash/chips, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "iat" = ( /obj/effect/decal/fakelattice, /obj/structure/lamp_post{ @@ -27207,6 +32170,13 @@ /obj/structure/barricade/wooden, /turf/closed/wall/f13/wood/house, /area/f13/wasteland) +"iav" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small{ + light_color = "#ff4747" + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "iaD" = ( /obj/effect/turf_decal/bot, /turf/open/floor/f13{ @@ -27215,6 +32185,18 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"iaE" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerinner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "iaF" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt, @@ -27262,6 +32244,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"ibg" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "ibi" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/indestructible/ground/outside/desert{ @@ -27272,6 +32262,15 @@ /obj/structure/fence, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"ibC" = ( +/obj/structure/junk/small/table, +/obj/item/stack/sheet/mineral/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "ibQ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -27305,9 +32304,18 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) +<<<<<<< Updated upstream "icG" = ( /obj/structure/debris/v2, /turf/open/indestructible/ground/outside/ruins, +======= +"icM" = ( +/obj/item/crowbar, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/wasteland) "icO" = ( /turf/open/indestructible/ground/outside/savannah, @@ -27354,6 +32362,15 @@ icon_state = "tealwhrusty_chess2" }, /area/f13/building/abandoned/z) +"idh" = ( +/obj/structure/rack/shelf_metal, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/crafting/armor_plate, +/obj/item/stack/crafting/armor_plate, +/obj/item/stack/crafting/armor_plate, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "idk" = ( /mob/living/simple_animal/cow/brahmin/horse, /turf/open/indestructible/ground/outside/desert, @@ -27371,6 +32388,7 @@ /obj/structure/closet/crate/freezer, /turf/open/indestructible/ground/outside/sidewalkdirt, /area/f13/wasteland/followers) +<<<<<<< Updated upstream "idu" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/wood_common, @@ -27389,6 +32407,14 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop0" }, +======= +"idG" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris1" + }, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/wasteland) "idX" = ( /obj/structure/curtain{ @@ -27402,8 +32428,16 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "idZ" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/house{ icon_state = "housewindowbrokenvertical" +======= +/obj/structure/table/wood/club, +/obj/effect/spawner/lootdrop/wastelootgood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" +>>>>>>> Stashed changes }, /obj/structure/barricade/wooden/planks/pregame, /obj/structure/barricade/bars, @@ -27487,6 +32521,7 @@ }, /area/f13/building/powered) "ifN" = ( +<<<<<<< Updated upstream /mob/living/simple_animal/hostile/renegade/guardian, /obj/effect/decal/cleanable/blood/tracks, /turf/open/indestructible/ground/outside/road{ @@ -27499,6 +32534,14 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +======= +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ifR" = ( /obj/structure/flora/grass/jungle/b, /obj/effect/turf_decal/weather/dirt{ @@ -27648,6 +32691,7 @@ icon_state = "horizontaloutermain2" }, /area/f13/wasteland) +<<<<<<< Updated upstream "iho" = ( /obj/machinery/light{ dir = 8; @@ -27660,6 +32704,13 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop2left" }, +======= +"ihu" = ( +/obj/effect/decal/remains/deadeyebot, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "ihw" = ( /obj/effect/turf_decal/bot, @@ -27669,6 +32720,7 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +<<<<<<< Updated upstream "ihE" = ( /obj/structure/car/rubbish4{ pixel_y = -9; @@ -27680,6 +32732,13 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/m) +======= +"ihO" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/power/smes/engineering, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +>>>>>>> Stashed changes "ihP" = ( /obj/structure/barricade/wooden/strong, /obj/structure/barricade/tentleatheredge, @@ -27745,6 +32804,15 @@ /obj/structure/obstacle/barbedwire, /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/desert, +<<<<<<< Updated upstream +======= +/area/f13/wasteland/legion) +"iiA" = ( +/obj/machinery/autolathe, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "iiG" = ( /obj/effect/decal/cleanable/dirt, @@ -27800,11 +32868,19 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "ijk" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/robot_debris, /obj/effect/turf_decal/weather/dirt{ dir = 9 }, /turf/open/floor/plating/f13/inside/gravel, +======= +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "car_rubish1" + }, +/turf/open/indestructible/ground/outside/road, +>>>>>>> Stashed changes /area/f13/wasteland) "ijl" = ( /obj/structure/simple_door/metal/fence, @@ -27820,6 +32896,14 @@ icon_state = "horizontalbottombordertop2" }, /area/f13/wasteland) +"ijs" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/fo13colored/Red{ + dir = 1 + }, +/turf/open/floor/plating/rust, +/area/f13/sewer/powered) "ijD" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/open/indestructible/ground/outside/grass/dirtpath{ @@ -27866,6 +32950,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "ijZ" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ icon_state = "housewood1-broken" @@ -27882,6 +32967,12 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) +======= +/obj/structure/table/wood/junk, +/obj/item/pen/fourcolor, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "ikk" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/medical/rnd/good, @@ -27914,6 +33005,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "ikE" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/item/fermichem/pHpaper, /obj/item/fermichem/pHpaper, @@ -27926,6 +33018,10 @@ name = "wooden floor"; desc = "It's a floor. Wow." }, +======= +/obj/structure/sign/poster/official/foam_force_ad, +/turf/closed/wall/f13/store, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "ikH" = ( /obj/structure/flora/tree/tall{ @@ -28035,11 +33131,16 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "imc" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 10 }, /obj/effect/decal/cleanable/blood/gibs, /turf/open/indestructible/ground/outside/graveldirt, +======= +/obj/structure/furnace, +/turf/open/indestructible/ground/inside/mountain, +>>>>>>> Stashed changes /area/f13/caves) "imf" = ( /obj/effect/overlay/desert/sonora/edge{ @@ -28048,12 +33149,18 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "imq" = ( +<<<<<<< Updated upstream /obj/structure/girder, /obj/effect/overlay/desert/sonora/edge{ dir = 1 }, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "imu" = ( /obj/structure/dresser, /turf/open/floor/carpet/black, @@ -28117,6 +33224,22 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/dirt/dark, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"iob" = ( +/obj/structure/flora/grass/coyote/twentyfour, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"ioh" = ( +/obj/structure/fence/corner/wooden{ + dir = 8 + }, +/obj/structure/fence/wooden{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/legioncamp) +>>>>>>> Stashed changes "ioi" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain2" @@ -28130,6 +33253,15 @@ /obj/item/stack/ore/iron, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream +======= +"iox" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/booth, +/obj/item/dice/d20, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ioy" = ( /obj/structure/table/wood, /obj/structure/table/wood, @@ -28154,6 +33286,25 @@ icon_state = "rubblepillar" }, /area/f13/ambientlighting/building/t) +<<<<<<< Updated upstream +======= +"ioR" = ( +/obj/item/ammo_box/magazine/m556/rifle/assault{ + pixel_x = 2 + }, +/obj/item/ammo_box/magazine/m556/rifle/assault{ + pixel_x = -4 + }, +/obj/structure/rack/shelf_metal, +/obj/item/ammo_box/magazine/m556/rifle/assault{ + pixel_x = -4 + }, +/obj/item/ammo_box/magazine/m556/rifle/assault{ + pixel_x = -4 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "ioY" = ( /obj/machinery/door/poddoor/gate{ id = "Workshop"; @@ -28196,6 +33347,17 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"ipq" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Medical" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "ipF" = ( /turf/open/floor/plating/rust, /area/f13/building/powered) @@ -28204,6 +33366,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) +"ipI" = ( +/turf/open/floor/plating/f13/inside/gravel/corner, +/area/f13/wasteland) "ipU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood/bar, @@ -28303,6 +33468,15 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"irI" = ( +/obj/machinery/door/password{ + door_id = "veryevilroom" + }, +/turf/open/floor/pod/dark, +/area/f13/building/powered) +>>>>>>> Stashed changes "irJ" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "innermaincornerinner" @@ -28320,6 +33494,13 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +"irY" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "isb" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/open/indestructible/ground/outside/desert, @@ -28346,6 +33527,7 @@ /mob/living/simple_animal/cow/brahmin/horse, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +<<<<<<< Updated upstream "isM" = ( /obj/structure/chair/sofa/right{ color = "#475340"; @@ -28358,6 +33540,14 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +"isI" = ( +/obj/structure/wreck/car/bike, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "isQ" = ( /obj/structure/closet/cabinet/anchored, /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, @@ -28483,9 +33673,17 @@ }, /area/f13/ambientlighting/building/b) "iva" = ( +<<<<<<< Updated upstream /obj/structure/table/wood/club, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "ivg" = ( /obj/structure/chair/wood, /obj/effect/landmark/start/f13/tribal, @@ -28554,6 +33752,7 @@ }, /area/f13/building/abandoned/h) "ivH" = ( +<<<<<<< Updated upstream /obj/effect/decal/fakelattice, /obj/machinery/autolathe, /turf/open/floor/plasteel/f13/vault_floor/plating, @@ -28574,6 +33773,12 @@ }, /turf/closed/wall/f13/wood/interior, /area/f13/ncr) +======= +/obj/structure/table/booth, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ivQ" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -28598,6 +33803,7 @@ name = "wooden stanchion"; pixel_y = -4; pixel_x = -16 +<<<<<<< Updated upstream }, /obj/structure/flora/rock/jungle, /turf/open/indestructible/ground/inside/mountain, @@ -28610,6 +33816,18 @@ desc = "It's a floor. Wow." }, /area/f13/ambientlighting/building/m) +======= + }, +/obj/structure/flora/rock/jungle, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"iwd" = ( +/obj/item/trash/f13/tin, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "iwp" = ( /obj/item/trash/f13/porknbeans, /turf/open/indestructible/ground/outside/dirt, @@ -28630,7 +33848,11 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "iwR" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/vg_decals/atmos/mix, +======= +/obj/structure/sign/poster/prewar/poster82, +>>>>>>> Stashed changes /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/m) "ixa" = ( @@ -28660,6 +33882,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) "ixw" = ( +<<<<<<< Updated upstream /obj/structure/table/booth, /obj/item/reagent_containers/food/condiment/pack/coffee, /obj/item/reagent_containers/food/condiment/pack/coffee, @@ -28667,6 +33890,16 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/glass, /turf/open/floor/f13/wood, +======= +/obj/structure/chair/stool{ + dir = 8; + icon_state = "bench" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "ixz" = ( /obj/structure/sign/legion/smithy, @@ -28677,6 +33910,17 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" }, +<<<<<<< Updated upstream +======= +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland/legion) +"ixI" = ( +/obj/structure/junk/machinery, +/turf/open/indestructible/ground/outside/road{ + dir = 1; + icon_state = "horizontaltopborderbottom0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "ixK" = ( /obj/effect/overlay/desert/sonora/edge{ @@ -28723,6 +33967,14 @@ /obj/structure/debris/v4, /turf/closed/mineral/random/low_chance, /area/f13/building/powered) +"iyM" = ( +/obj/structure/car/rubbish3{ + icon_state = "car_rubish2" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "iyV" = ( /obj/structure/fence/corner/wooden{ dir = 8 @@ -28947,6 +34199,16 @@ /obj/structure/janitorialcart, /turf/open/indestructible/ground/outside/sidewalkdirt, /area/f13/wasteland/followers) +<<<<<<< Updated upstream +======= +"iBL" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerborder" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "iBP" = ( /obj/machinery/door/poddoor/shutters{ id = "garage"; @@ -28962,11 +34224,27 @@ /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, /area/f13/clinic) "iBY" = ( +<<<<<<< Updated upstream /obj/structure/chair/stool/retro/backed{ dir = 8 }, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) +"iCd" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "iCt" = ( /obj/effect/turf_decal/huge{ dir = 8 @@ -29094,6 +34372,7 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "iDN" = ( /obj/effect/decal/cleanable/blood, /obj/effect/landmark/start/f13/ncrmedofficer, @@ -29104,6 +34383,12 @@ name = "rusted floor" }, /area/f13/ncr) +======= +"iDS" = ( +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "iDV" = ( /obj/effect/landmark/questing/people{ location_description = "somewhere to the south of the old town, in one of them houses." @@ -29125,11 +34410,41 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) "iEA" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/baconegg, /turf/open/floor/f13/wood, /area/f13/legioncamp) +======= +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_4"; + layer = 5 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland/legion) +"iED" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/chair/bench, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "iEE" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -29141,6 +34456,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "iEF" = ( +<<<<<<< Updated upstream /obj/item/clockwork/alloy_shards{ name = "rocks"; desc = "Rocks. Mindblowing."; @@ -29150,6 +34466,27 @@ icon_state = "wasteland33" }, /area/f13/wasteland) +======= +/obj/machinery/power/apc/fusebox/north, +/obj/structure/cable/outdoors{ + icon_state = "0-2" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +"iEH" = ( +/obj/machinery/light{ + dir = 8; + flickering = 1 + }, +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "iEI" = ( /obj/structure/fence{ dir = 4 @@ -29165,11 +34502,21 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +<<<<<<< Updated upstream "iEK" = ( /obj/structure/nest/ghoul, /turf/open/indestructible/ground/outside/desert{ icon_state = "wasteland33" }, +======= +"iEJ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light{ + dir = 1; + layer = 2.9 + }, +/turf/open/floor/plasteel/vaporwave, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "iEQ" = ( /obj/effect/overlay/fog, @@ -29180,8 +34527,23 @@ /obj/effect/overlay/desert/sonora/edge, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +<<<<<<< Updated upstream "iFi" = ( /turf/open/indestructible/ground/outside/ruins, +======= +"iFe" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/closet/locker/oldstyle, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/f13/legioncamp) +"iFf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_fancy, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "iFj" = ( /obj/structure/rack, @@ -29198,6 +34560,25 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) +<<<<<<< Updated upstream +======= +"iFu" = ( +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common{ + icon_state = "common-broken3" + }, +/area/f13/ambientlighting/building/m) +"iFv" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +>>>>>>> Stashed changes "iFx" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/ghoul/glowing, @@ -29253,6 +34634,10 @@ /obj/structure/simple_door/house, /turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite, /area/f13/ambientlighting/building/c) +"iGE" = ( +/obj/item/pickaxe, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "iGJ" = ( /obj/structure/rack/shelf_metal, /obj/item/stack/sheet/mineral/uranium/twentyfive, @@ -29302,6 +34687,12 @@ icon_state = "outerborder" }, /area/f13/wasteland) +"iHp" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "iHr" = ( /obj/structure/chair/office{ dir = 1 @@ -29353,6 +34744,22 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"iHQ" = ( +/obj/structure/barricade/wooden/strong, +/obj/structure/barricade/wooden/planks, +/turf/closed/wall/f13/wood/house, +/area/f13/legioncamp) +"iIa" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -3 + }, +/obj/structure/railing/wood/underlayer, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) +>>>>>>> Stashed changes "iIG" = ( /obj/machinery/telecomms/relay/preset/telecomms, /turf/open/indestructible, @@ -29404,8 +34811,14 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "iJF" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood{ icon_state = "tracks" +======= +/obj/effect/spawner/lootdrop/wastelootgood, +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" +>>>>>>> Stashed changes }, /turf/open/floor/wood_common/wood_common_light, /area/f13/building/powered) @@ -29460,6 +34873,11 @@ icon_state = "redmark" }, /area/f13/building/abandoned/h) +"iKz" = ( +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "iKE" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -29512,6 +34930,7 @@ /obj/structure/debris/v1, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +<<<<<<< Updated upstream "iLb" = ( /obj/effect/spawner/lootdrop/f13/seedspawner, /obj/effect/spawner/lootdrop/f13/seedspawner, @@ -29519,6 +34938,13 @@ /obj/structure/rack, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +"iKX" = ( +/obj/structure/flora/wasteplant/wild_fungus, +/obj/effect/decal/cleanable/blood, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "iLc" = ( /obj/structure/wreck/trash/two_barrels, /obj/effect/decal/fakelattice, @@ -29583,6 +35009,16 @@ "iLM" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 +<<<<<<< Updated upstream +======= + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +"iMa" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 17 +>>>>>>> Stashed changes }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) @@ -29602,6 +35038,11 @@ dir = 1 }, /area/f13/ambientlighting/building/t) +"iMj" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "iMm" = ( /obj/structure/barricade/tentclothcorner{ dir = 8 @@ -29666,6 +35107,14 @@ }, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +"iMI" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/mineral/concrete/ten, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "iMO" = ( /obj/structure/table, /obj/item/multitool, @@ -29685,6 +35134,7 @@ /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) "iNn" = ( +<<<<<<< Updated upstream /obj/structure/statue/petrified, /obj/item/clothing/suit/armor/outfit/jacket/police/lieutenant{ layer = 5 @@ -29692,6 +35142,14 @@ /obj/item/clothing/under/rank/civilian/victorianblackdress, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/mob/living/simple_animal/hostile/radscorpion/black, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "iNo" = ( /turf/open/indestructible/ground/outside/grass, /area/f13/ambientlighting/building/c) @@ -29733,6 +35191,7 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland/town) +<<<<<<< Updated upstream "iOE" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -29751,6 +35210,26 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +"iOp" = ( +/obj/structure/kitchenspike, +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +"iOE" = ( +/obj/structure/simple_door/metal/fence, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +"iOG" = ( +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "iOS" = ( /obj/structure/barricade/wooden, /obj/structure/decoration/rag{ @@ -29944,9 +35423,15 @@ }, /area/f13/wasteland) "iSc" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/vg_decals/department/hop, /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/m) +======= +/obj/machinery/vending/coffee, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "iSe" = ( /obj/effect/decal/marking{ icon_state = "singlehorizontal" @@ -30017,12 +35502,30 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"iTC" = ( +/obj/machinery/workbench/forge{ + pixel_x = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) "iTG" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13{ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/w) +<<<<<<< Updated upstream +======= +"iTM" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/floor/wood_common, +/area/f13/wasteland) +>>>>>>> Stashed changes "iTN" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, @@ -30047,6 +35550,7 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/f) +<<<<<<< Updated upstream "iUu" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -30056,6 +35560,18 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) +======= +"iUp" = ( +/obj/structure/chair/stool{ + dir = 8; + icon_state = "bench"; + pixel_y = 17 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "iUB" = ( /obj/structure/simple_door/metal/store, /turf/open/floor/plating, @@ -30082,6 +35598,7 @@ /turf/open/floor/plasteel/neutral, /area/f13/clinic) "iUZ" = ( +<<<<<<< Updated upstream /obj/machinery/autolathe/ammo, /obj/item/book/granter/crafting_recipe/gunsmith_two, /obj/item/book/granter/crafting_recipe/gunsmith_one, @@ -30090,6 +35607,40 @@ dir = 8 }, /area/f13/brotherhood) +======= +/obj/structure/table/wood, +/obj/item/binoculars, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/wasteland) +"iVe" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +"iVf" = ( +/obj/structure/closet/fridge{ + anchored = 1 + }, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ambientlighting/building/j) +"iVg" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/closed/mineral/random, +/area/f13/ncr) +>>>>>>> Stashed changes "iVk" = ( /obj/structure/flora/junglebush/b, /turf/open/indestructible/ground/outside/dirt, @@ -30111,6 +35662,7 @@ /obj/effect/decal/fakelattice, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +<<<<<<< Updated upstream "iVB" = ( /obj/structure/simple_door/metal/dirtystore, /turf/open/floor/wood_fancy, @@ -30124,6 +35676,24 @@ /obj/machinery/recycler/deathtrap, /turf/open/floor/plating/rust, /area/f13/ambientlighting/building/j) +======= +"iVA" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"iVM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/flora/wasteplant/wild_fungus, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "iVU" = ( /obj/structure/chair/bench{ dir = 4; @@ -30158,6 +35728,7 @@ "iWl" = ( /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream "iWm" = ( /obj/structure/railing/corner, /turf/open/indestructible/ground/outside/sidewalk{ @@ -30171,6 +35742,12 @@ /obj/structure/fluff/rails, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +======= +"iWu" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "iWy" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 28 @@ -30217,6 +35794,7 @@ }, /area/f13/building/powered) "iWX" = ( +<<<<<<< Updated upstream /obj/item/flag/legion{ pixel_y = 28; pixel_x = 1 @@ -30227,6 +35805,15 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/structure/table, +/obj/machinery/computer/terminal/stored_password{ + dir = 4; + door_id = "evilassdoor" + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "iXg" = ( /obj/structure/table/wood/bar, /turf/open/indestructible/ground/outside/grass/dirtpath, @@ -30238,10 +35825,26 @@ icon_state = "dirt" }, /area/f13/building/tribal) +<<<<<<< Updated upstream +"iXz" = ( +/obj/structure/flora/twig3, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +======= +"iXv" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib1"; + pixel_y = -6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/pill/bitterdrink, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "iXz" = ( /obj/structure/flora/twig3, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +>>>>>>> Stashed changes "iXD" = ( /obj/machinery/iv_drip, /obj/machinery/light{ @@ -30345,6 +35948,7 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +<<<<<<< Updated upstream "iZh" = ( /obj/structure/cable/outdoors{ icon_state = "4-8" @@ -30358,6 +35962,12 @@ icon_state = "outermaincornerinner" }, /area/f13/wasteland) +======= +"iYV" = ( +/obj/structure/fluff/hedge, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "iZj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/twig4, @@ -30512,6 +36122,13 @@ icon_state = "floorrusty" }, /area/f13/building/abandoned/h) +"jaO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) "jaU" = ( /obj/structure/table/wood/bar, /turf/open/indestructible/ground/outside/sidewalk{ @@ -30529,6 +36146,13 @@ icon_state = "dirt" }, /area/f13/wasteland) +"jbp" = ( +/obj/machinery/power/floodlight, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "jbq" = ( /turf/open/indestructible/ground/outside/ruins{ icon_state = "rubbleslab" @@ -30598,6 +36222,7 @@ icon_state = "verticalrightborderrightbottom" }, /area/f13/wasteland) +<<<<<<< Updated upstream "jcB" = ( /obj/machinery/vending/wallmed{ pixel_x = -32 @@ -30611,6 +36236,24 @@ dir = 1 }, /turf/open/indestructible/ground/outside/dirt, +======= +"jcu" = ( +/turf/open/floor/f13/wood{ + icon_state = "housewood4-broken" + }, +/area/f13/ambientlighting/building/m) +"jcO" = ( +/obj/structure/fluff/rails{ + icon_state = "rails-b1"; + pixel_y = 11; + pixel_x = -3 + }, +/obj/structure/fluff/rails{ + icon_state = "rails-r"; + dir = 8 + }, +/turf/open/indestructible/ground/inside/mountain, +>>>>>>> Stashed changes /area/f13/caves) "jcP" = ( /obj/structure/fence/end/wooden{ @@ -30656,6 +36299,15 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"jdp" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jdr" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/sofa/right{ @@ -30729,6 +36381,7 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "jeL" = ( +<<<<<<< Updated upstream /obj/item/blacksmith/chain{ pixel_y = -7; desc = "A length of chain hanging from an overhead support beam with cuffs at the bottom."; @@ -30773,6 +36426,36 @@ name = "rusted floor" }, /area/f13/sewer/powered) +======= +/obj/structure/table/wood/junk, +/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +"jeV" = ( +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18; + desc = s + }, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/mineral/limestone/ten, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"jfb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jfl" = ( /obj/structure/obstacle/barbedwire/end{ dir = 8 @@ -30795,6 +36478,12 @@ icon_state = "dirt" }, /area/f13/building/abandoned/g) +"jfz" = ( +/obj/structure/table/snooker{ + dir = 9 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "jfB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt{ @@ -30863,6 +36552,14 @@ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/f) +"jge" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6"; + pixel_x = -18; + pixel_y = 15 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "jgi" = ( /obj/structure/barricade/sandbags, /obj/machinery/light{ @@ -30882,6 +36579,18 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"jgl" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/obj/item/pen/fourcolor, +/obj/item/paper_bin, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jgs" = ( /obj/machinery/workbench, /turf/open/indestructible/ground/outside/desert{ @@ -30925,6 +36634,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/dirt, /area/f13/building/tribal) +"jhB" = ( +/obj/structure/shelf_wood, +/obj/item/seeds/cannabis, +/obj/item/seeds/cannabis, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "jhM" = ( /obj/machinery/smoke_machine{ name = "generator mechanism" @@ -30942,6 +36657,17 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"jhP" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2" + }, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "jhX" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -30967,11 +36693,17 @@ /turf/closed/wall/f13/ruins, /area/f13/wasteland) "jip" = ( +<<<<<<< Updated upstream /obj/structure/car/rubbish3, /turf/open/floor/plasteel/stairs{ dir = 4 }, /area/f13/building/powered) +======= +/obj/item/trash/f13/k_ration, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "jiu" = ( /obj/structure/flora/tree/wasteland, /obj/effect/turf_decal/weather/dirt{ @@ -31034,11 +36766,26 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +<<<<<<< Updated upstream "jja" = ( /obj/effect/spawner/lootdrop/glowstick, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +"jiV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/desert/sonora/edge, +/obj/structure/chair/booth, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) +"jiW" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerpavementcorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "jjd" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13{ @@ -31135,7 +36882,21 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "jkv" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/generic, +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/closed/mineral/random, +/area/f13/wasteland) +"jkw" = ( +/obj/structure/table/wood/junk, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +>>>>>>> Stashed changes /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) "jkH" = ( @@ -31184,6 +36945,7 @@ }, /area/f13/wasteland) "jlb" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -31193,6 +36955,21 @@ }, /turf/open/floor/plasteel/bar, /area/f13/wasteland) +======= +/obj/structure/rack/large/shelf_rust, +/obj/item/stack/sheet/cloth/thirty, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth, +/obj/item/stack/sheet/cloth, +/obj/item/stack/sheet/cloth/three, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +"jle" = ( +/obj/structure/simple_door/metal/dirtystore, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jlj" = ( /obj/structure/table/reinforced, /obj/item/book/granter/crafting_recipe/gunsmith_one, @@ -31232,6 +37009,7 @@ }, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) +<<<<<<< Updated upstream "jlT" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded"; @@ -31242,6 +37020,13 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +======= +"jlS" = ( +/obj/structure/table/wood/junk, +/obj/item/assembly/signaler, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "jlY" = ( /mob/living/simple_animal/hostile/supermutant/rangedmutant, /obj/effect/decal/cleanable/dirt, @@ -31304,6 +37089,7 @@ /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/city) "jmU" = ( +<<<<<<< Updated upstream /obj/item/trash/f13/steak, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, @@ -31312,6 +37098,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_worn, /area/f13/ambientlighting/building/m) +======= +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 17 + }, +/obj/structure/table/wood/junk, +/obj/item/assembly/signaler, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/effect/spawner/lootdrop/f13/cash_random_med, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "jmZ" = ( /obj/structure/fence/wooden{ dir = 4 @@ -31326,6 +37127,13 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"jnj" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jns" = ( /obj/structure/curtain{ color = "#c40e0e" @@ -31452,6 +37260,10 @@ /obj/structure/barricade/wooden, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"jpQ" = ( +/obj/item/electropack/shockcollar/explosive, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "jpV" = ( /obj/structure/decoration/train, /turf/closed/indestructible/f13vaultrusted, @@ -31471,6 +37283,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/royalblack, /area/f13/building/abandoned/l) +"jqg" = ( +/obj/effect/decal/remains/human, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "jqk" = ( /turf/open/floor/f13/wood{ icon_state = "housewood3-broken" @@ -31498,7 +37314,20 @@ }, /area/f13/building/abandoned/h) "jqz" = ( +<<<<<<< Updated upstream /obj/structure/fence/corner{ +======= +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench" + }, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +"jqB" = ( +/obj/structure/fence/wooden{ +>>>>>>> Stashed changes dir = 1 }, /turf/open/indestructible/ground/outside/sidewalk{ @@ -31541,6 +37370,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "jrB" = ( +<<<<<<< Updated upstream /obj/structure/fence/wooden{ dir = 4; icon_state = "post_wood" @@ -31553,6 +37383,10 @@ icon_state = "dirt"; dir = 1 }, +======= +/obj/item/restraints/legcuffs/beartrap, +/turf/open/floor/plating/f13/inside/gravel, +>>>>>>> Stashed changes /area/f13/wasteland) "jrJ" = ( /obj/effect/decal/cleanable/dirt{ @@ -31609,10 +37443,16 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "jsI" = ( +<<<<<<< Updated upstream /obj/structure/table/booth, /obj/item/seeds/coffee, /obj/item/seeds/coffee/robusta, /turf/open/floor/f13/wood, +======= +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "jsN" = ( /obj/structure/fence{ @@ -31653,6 +37493,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "jtd" = ( +<<<<<<< Updated upstream /obj/structure/fluff/rails{ dir = 1 }, @@ -31662,6 +37503,19 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/guncase{ + anchored = 1; + pixel_y = 25 + }, +/obj/item/gun/ballistic/rifle/hunting, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid{ + loot = s + }, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jtf" = ( /obj/structure/table/optable, /obj/effect/decal/cleanable/greenglow, @@ -31679,6 +37533,12 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +"jto" = ( +/obj/machinery/computer/operating, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) "jtt" = ( /turf/open/indestructible/ground/outside/ruins{ icon_state = "rubblepillar" @@ -31836,6 +37696,21 @@ icon_state = "stagestairs" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"jvU" = ( +/obj/structure/sign/legion/prison, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt" + }, +/area/f13/wasteland/legion) +"jvX" = ( +/obj/effect/turf_decal/delivery, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "jwc" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, @@ -31920,9 +37795,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/royalblack, /area/f13/ambientlighting/building/w) +<<<<<<< Updated upstream "jwS" = ( /turf/closed/wall/mineral/brick, /area/f13/ncr) +======= +"jxc" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain2top" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "jxe" = ( /obj/structure/fluff/rug/rug_rubber, /obj/item/paperslip, @@ -32063,6 +37952,13 @@ icon_state = "dirt" }, /area/f13/wasteland) +"jyw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "jyz" = ( /obj/effect/landmark/start/f13/tribal, /turf/open/indestructible/ground/outside/desert, @@ -32192,6 +38088,11 @@ icon_state = "verticalrightborderright1" }, /area/f13/wasteland) +"jAr" = ( +/obj/structure/table/wood/junk, +/obj/effect/spawner/lootdrop/f13/cash_random_med, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "jAx" = ( /obj/structure/table/wood, /obj/item/melee/onehanded/knife/bone, @@ -32274,6 +38175,7 @@ /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/wood_common, /area/maintenance/bar) +<<<<<<< Updated upstream "jBq" = ( /obj/structure/fence{ dir = 4 @@ -32283,6 +38185,19 @@ icon_state = "outermaincornerinner" }, /area/f13/wasteland) +======= +"jBp" = ( +/obj/item/kirbyplants/dead{ + desc = "A mummified potted plant."; + name = "very dead potted plant"; + pixel_x = -1; + pixel_y = 11 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jBy" = ( /obj/machinery/chem_heater, /turf/open/floor/plasteel/neutral, @@ -32296,6 +38211,10 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/a) +"jBI" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "jBP" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /obj/effect/decal/cleanable/dirt, @@ -32312,6 +38231,7 @@ }, /area/f13/building/powered) "jBW" = ( +<<<<<<< Updated upstream /obj/effect/decal/marking{ pixel_x = -14 }, @@ -32319,6 +38239,12 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +======= +/obj/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "jCb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/reagentgrinder, @@ -32327,6 +38253,15 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"jCe" = ( +/obj/item/melee/onehanded/machete/scrapsabre, +/obj/item/clothing/under/f13/raiderrags, +/obj/item/clothing/gloves/f13/handwraps, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "jCg" = ( /obj/structure/chair/bench, /turf/open/indestructible/ground/outside/dirt, @@ -32349,10 +38284,20 @@ }, /area/f13/building/powered) "jCl" = ( +<<<<<<< Updated upstream /obj/structure/wreck/trash/machinepiletwo, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +/obj/structure/window/fulltile/house, +/obj/structure/curtain{ + color = "#363636" + }, +/obj/structure/barricade/wooden/planks, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "jCt" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -32360,16 +38305,39 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/basalt/wasteland, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"jCz" = ( +/obj/structure/chair/wood{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/machinery/light{ + dir = 4; + pixel_y = -16 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jCC" = ( /obj/structure/table/wood, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) "jCV" = ( /obj/effect/decal/cleanable/dirt, +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerturn" }, /area/f13/wasteland) +======= +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jDc" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/mapping_helpers/network_builder/power_cable/auto, @@ -32388,6 +38356,13 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/w) +<<<<<<< Updated upstream +======= +"jDg" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/rockvault/alien, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jDh" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt{ @@ -32440,6 +38415,7 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "jEq" = ( +<<<<<<< Updated upstream /obj/machinery/door/poddoor/shutters{ id = 983 }, @@ -32447,6 +38423,12 @@ icon_state = "verticalinnermain0" }, /area/f13/ncr) +======= +/obj/effect/decal/cleanable/ash, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jEr" = ( /obj/structure/table/wood, /obj/item/storage/box/cups, @@ -32455,6 +38437,11 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) +"jED" = ( +/obj/structure/table/wood/junk, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "jEO" = ( /obj/structure/table, /obj/item/weldingtool/advanced, @@ -32486,6 +38473,17 @@ icon_state = "outerbordercorner" }, /area/f13/wasteland/town) +"jFe" = ( +/obj/item/trash/f13/c_ration_1, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"jFg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden/planks/pregame, +/obj/effect/decal/cleanable/glass, +/obj/structure/simple_door/brokenglass, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "jFh" = ( /obj/structure/fence{ dir = 4 @@ -32564,6 +38562,7 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "jGd" = ( +<<<<<<< Updated upstream /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded"; pixel_x = -14 @@ -32572,6 +38571,14 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +======= +/obj/structure/chair/comfy/green{ + dir = 4; + pixel_x = -12 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jGh" = ( /obj/machinery/light{ bulb_colour = "#BC8F8F"; @@ -32601,9 +38608,15 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +"jGK" = ( +/obj/effect/decal/cleanable/generic, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) "jGQ" = ( /turf/closed/mineral/random/no_caves, /area/f13/wasteland/town) +<<<<<<< Updated upstream "jGT" = ( /obj/effect/turf_decal/big{ dir = 8 @@ -32612,6 +38625,16 @@ icon_state = "verticalinnermain0" }, /area/f13/ncr) +======= +"jGR" = ( +/obj/effect/decal/marking{ + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "jHe" = ( /obj/structure/simple_door/wood, /turf/open/floor/wood_wide, @@ -32679,6 +38702,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/f13/ambientlighting/building/q) +<<<<<<< Updated upstream +======= +"jIl" = ( +/obj/structure/railing/handrail/rusty, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "jIx" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -32720,6 +38752,7 @@ /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/e) "jJo" = ( +<<<<<<< Updated upstream /obj/structure/closet/crate/trashcart, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" @@ -32756,6 +38789,12 @@ }, /turf/open/floor/plasteel/grimy, /area/f13/ncr) +======= +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalleftborderright2" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "jJG" = ( /obj/structure/barricade/wooden, /turf/closed/wall/f13/wood/house/broken, @@ -32874,17 +38913,24 @@ }, /area/f13/brotherhood) "jLT" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/structure/window/fulltile/ruins{ icon_state = "ruinswindowbroken" }, /obj/effect/decal/cleanable/glass, /turf/open/floor/carpet/arcade, +======= +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "jMa" = ( /obj/machinery/door/locked/easy/maybe_trapped, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/x) +<<<<<<< Updated upstream "jMh" = ( /obj/effect/overlay/rockfloor_side{ dir = 1 @@ -32895,6 +38941,18 @@ /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +"jMc" = ( +/obj/structure/sign/departments/medbay/alt{ + name = "TRIAGE" + }, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +"jMh" = ( +/obj/structure/table, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jMk" = ( /obj/structure/junk/drawer{ pixel_y = 10 @@ -32941,6 +38999,15 @@ /obj/structure/decoration/rag, /turf/closed/wall/f13/tentwall, /area/f13/wasteland) +"jMO" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/fakelattice, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/structure/grille/broken, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "jMU" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt{ @@ -32988,6 +39055,13 @@ }, /turf/closed/wall/mineral/wood, /area/f13/wasteland) +"jNX" = ( +/obj/structure/table/wood/junk, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "jOa" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermainleft" @@ -33000,6 +39074,15 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"jOn" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "jOt" = ( /obj/structure/flora/twig4, /turf/open/indestructible/ground/outside/desert, @@ -33100,6 +39183,13 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +"jPX" = ( +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/structure/rack, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "jQg" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -33144,6 +39234,13 @@ }, /turf/closed/wall/f13/tentwall, /area/f13/building/tribal) +"jQG" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerborder" + }, +/area/f13/wasteland) "jQH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/sofa{ @@ -33291,7 +39388,11 @@ }, /area/f13/building/powered) "jRZ" = ( +<<<<<<< Updated upstream /obj/item/trash/chips, +======= +/obj/machinery/light, +>>>>>>> Stashed changes /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "jSb" = ( @@ -33397,12 +39498,25 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +<<<<<<< Updated upstream "jUl" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood_common{ icon_state = "common-broken2" }, /area/f13/ambientlighting/building/m) +======= +"jUe" = ( +/obj/structure/table/wood/junk, +/obj/item/storage/box/gun/rifle/hunting, +/obj/effect/spawner/lootdrop/f13/attachments, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +"jUl" = ( +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "jUm" = ( /obj/structure/wreck/trash/autoshaft, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -33465,6 +39579,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"jVg" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 5 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "jVm" = ( /obj/structure/obstacle/barbedwire{ dir = 1 @@ -33473,6 +39593,16 @@ icon_state = "horizontaltopbordertop0" }, /area/f13/wasteland) +"jVn" = ( +/obj/effect/turf_decal/big{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/fluff/rug/rug_rubber, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) "jVo" = ( /obj/structure/junk/locker, /turf/open/indestructible/ground/outside/dirt, @@ -33497,6 +39627,7 @@ }, /area/f13/building/powered) "jVw" = ( +<<<<<<< Updated upstream /obj/effect/spawner/lootdrop/wastelootgood, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop2left" @@ -33511,6 +39642,10 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "jVF" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/mineral/random, @@ -33545,6 +39680,16 @@ }, /turf/open/floor/carpet, /area/f13/building/abandoned/p) +"jWs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "jWA" = ( /obj/effect/decal/cleanable/dirt, /obj/item/kirbyplants/random, @@ -33664,11 +39809,17 @@ }, /area/f13/wasteland) "jYM" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/floor/plasteel/bar, /area/f13/ambientlighting/building/m) +======= +/obj/structure/flora/rock/jungle, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "jYN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common/wood_common_dark, @@ -33726,11 +39877,18 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "jZF" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) +======= +/obj/effect/decal/fakelattice, +/obj/structure/girder, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "jZI" = ( /turf/closed/wall/f13/wood/house/broken, /area/f13/wasteland) @@ -33863,9 +40021,17 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "kbo" = ( +<<<<<<< Updated upstream /obj/structure/furnace, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "kbF" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -33902,12 +40068,18 @@ /obj/structure/flora/wasteplant/wild_prickly, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream "kcw" = ( /obj/item/stack/sheet/mineral/wood, /turf/open/indestructible/ground/outside/dirt{ icon_state = "dirt"; dir = 1 }, +======= +"kcF" = ( +/obj/structure/table/booth, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "kcN" = ( /obj/machinery/light{ @@ -34058,6 +40230,13 @@ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/f) +<<<<<<< Updated upstream +======= +"keO" = ( +/obj/structure/flora/brushwoodalt, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) +>>>>>>> Stashed changes "keX" = ( /turf/closed/wall/f13/wood/interior, /area/f13/ambientlighting/building/p) @@ -34068,6 +40247,13 @@ name = "rusted floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"kfy" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "kfF" = ( /obj/structure/chair/pew/left{ dir = 1 @@ -34082,6 +40268,13 @@ /obj/structure/table/wood, /turf/open/floor/carpet/orange, /area/f13/ambientlighting/building/c) +"kfT" = ( +/obj/structure/barricade/wooden/strong, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "kge" = ( /obj/structure/cable/outdoors{ icon_state = "1-2" @@ -34169,6 +40362,12 @@ icon_state = "horizontalinnermain0" }, /area/f13/ambientlighting/building/y) +"khi" = ( +/obj/structure/railing/handrail/rusty, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "khn" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -34180,6 +40379,7 @@ /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/carpet/airless, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream "khv" = ( /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded"; @@ -34189,6 +40389,16 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" }, +======= +"khs" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/closed/wall/f13/tunnel, +>>>>>>> Stashed changes /area/f13/wasteland) "khB" = ( /obj/effect/turf_decal/huge{ @@ -34315,6 +40525,7 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/f) +<<<<<<< Updated upstream "kiz" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/components/unary/tank, @@ -34330,6 +40541,14 @@ /obj/structure/sign/poster/official/cohiba_robusto_ad, /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/m) +======= +"kiK" = ( +/obj/structure/campfire, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "kiL" = ( /obj/structure/table, /obj/item/paper/fluff/awaymissions/academy/class/biology, @@ -34363,6 +40582,7 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "kjr" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 10 }, @@ -34379,6 +40599,12 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "kjH" = ( /obj/machinery/light/small{ dir = 8; @@ -34392,11 +40618,17 @@ }, /area/f13/ambientlighting/building/o) "kjL" = ( +<<<<<<< Updated upstream /obj/structure/grille/broken, /obj/item/trash/f13/tin, /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain2left" +======= +/obj/effect/overlay/desert/sonora/edge, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" +>>>>>>> Stashed changes }, /area/f13/wasteland) "kjM" = ( @@ -34549,11 +40781,27 @@ /turf/closed/wall/mineral/wood, /area/f13/legioncamp) "klW" = ( +<<<<<<< Updated upstream /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/hobo, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, +======= +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/wasteland) +"klZ" = ( +/obj/structure/chair/stool/retro/tan, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +"kma" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "kme" = ( /turf/open/floor/f13{ icon_state = "floorrusty" @@ -34592,6 +40840,7 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "kmB" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" @@ -34603,6 +40852,12 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "kmF" = ( /obj/structure/barricade/wooden/strong, /turf/closed/wall/f13/wood/house, @@ -34643,11 +40898,17 @@ /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) "knH" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/ruins{ icon_state = "ruinswindowbroken" }, /obj/effect/decal/cleanable/glass, /turf/open/floor/wood_fancy, +======= +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/f13Cash/caps/twofive, +/turf/open/floor/wood_worn, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "knK" = ( /obj/machinery/light/small/broken{ @@ -34825,6 +41086,7 @@ /turf/open/floor/wood_common/wood_common_light, /area/maintenance/bar) "kqB" = ( +<<<<<<< Updated upstream /obj/structure/table, /obj/machinery/button/door{ pixel_y = 28; @@ -34837,6 +41099,35 @@ /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/rack/shelf_metal, +/obj/item/salvage/low, +/obj/item/salvage/low, +/obj/item/salvage/low, +/obj/item/salvage/high, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +"kqG" = ( +/obj/structure/junk/micro, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"kqJ" = ( +/obj/effect/decal/fakelattice, +/obj/machinery/light/broken{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +"kqQ" = ( +/obj/effect/decal/cleanable/oil{ + icon_state = "floor5" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "kqU" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/road, @@ -34857,6 +41148,15 @@ /obj/structure/closet/fridge/standard, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"krt" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Medical" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "kru" = ( /obj/structure/wreck/trash/two_barrels, /turf/open/indestructible/ground/outside/graveldirt, @@ -34873,11 +41173,17 @@ }, /area/f13/ambientlighting/building/o) "krJ" = ( +<<<<<<< Updated upstream /obj/structure/simple_door/bunker, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, /area/f13/sewer/powered) +======= +/mob/living/simple_animal/hostile/deathclaw/legendary, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "krK" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/dirt{ @@ -34888,12 +41194,49 @@ /obj/structure/wreck/trash/five_tires, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +"krO" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 39; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "ksv" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 }, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland/town) +<<<<<<< Updated upstream +======= +"ksz" = ( +/obj/structure/barricade/concrete, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +"ksD" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -3 + }, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) +"ksO" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/structure/flora/ausbushes/brflowers, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "ksS" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/indestructible/ground/outside/dirt, @@ -34923,6 +41266,7 @@ /turf/open/floor/plating, /area/f13/building/powered) "ktw" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain2" @@ -34936,6 +41280,19 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/table/reinforced, +/obj/structure/barricade/sandbags, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +"ktB" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + layer = 1000 + }, +/turf/closed/wall/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ktE" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt/dust, @@ -35039,6 +41396,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream +======= +"kuS" = ( +/obj/structure/table/booth, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "kuV" = ( /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) @@ -35167,6 +41531,12 @@ icon_state = "plating" }, /area/f13/building/abandoned/h) +"kxu" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2left" + }, +/area/f13/wasteland) "kxv" = ( /obj/structure/window/fulltile/house/broken, /obj/structure/barricade/wooden/planks{ @@ -35286,6 +41656,20 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland/city) +"kyK" = ( +/obj/effect/decal/cleanable/ash, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +"kyN" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/dirt{ + dir = 1; + icon_state = "dirt" + }, +/area/f13/wasteland) "kzt" = ( /obj/structure/fence{ dir = 4 @@ -35310,6 +41694,14 @@ }, /turf/open/floor/wood_fancy, /area/f13/building/abandoned/x) +"kzR" = ( +/obj/structure/chair/wood{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "kzV" = ( /obj/structure/barricade/tentclothedge{ dir = 8 @@ -35366,6 +41758,7 @@ dir = 8 }, /area/f13/wasteland) +<<<<<<< Updated upstream "kAC" = ( /obj/structure/decoration/vent, /turf/closed/wall/f13/ruins, @@ -35378,6 +41771,10 @@ light_color = "#d8b1b1" }, /obj/effect/spawner/lootdrop/f13/junkspawners, +======= +"kAA" = ( +/obj/effect/decal/cleanable/dirt/dust, +>>>>>>> Stashed changes /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/m) "kAJ" = ( @@ -35386,6 +41783,13 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"kAL" = ( +/obj/structure/bed/mattress, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "kAY" = ( /obj/structure/table/wood, /obj/effect/overlay/desert_side{ @@ -35402,6 +41806,16 @@ /obj/item/reagent_containers/food/snacks/f13/deathclawegg, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream +======= +"kBr" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -3 + }, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) +>>>>>>> Stashed changes "kBw" = ( /obj/structure/simple_door/repaired, /obj/structure/barricade/wooden/planks, @@ -35426,6 +41840,7 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream "kBK" = ( /obj/structure/window/fulltile/house, /obj/structure/curtain{ @@ -35443,6 +41858,12 @@ }, /turf/closed/wall/mineral/brick, /area/f13/ncr) +======= +"kBW" = ( +/obj/structure/flora/grass/coyote/twentyeight, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "kBZ" = ( /obj/structure/obstacle/barbedwire/end{ dir = 8 @@ -35661,6 +42082,16 @@ /obj/effect/decal/remains/human, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"kFt" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded"; + pixel_x = -14 + }, +/obj/structure/car/rubbish1, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "kFH" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/road{ @@ -35719,6 +42150,7 @@ "kGJ" = ( /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +<<<<<<< Updated upstream "kGR" = ( /obj/machinery/smartfridge/bottlerack/grownbin, /obj/structure/cable/outdoors{ @@ -35726,6 +42158,16 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"kGP" = ( +/obj/item/chair/wood, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "kHa" = ( /obj/structure/debris/v3, /turf/open/indestructible/ground/outside/desert, @@ -35808,6 +42250,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "kHN" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/booth, /obj/item/dice/d20, @@ -35822,6 +42265,14 @@ /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/m) +======= +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "kHP" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -35848,9 +42299,13 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "kIF" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/structure/flora/rock/jungle, /turf/open/indestructible/ground/inside/mountain, +======= +/turf/open/indestructible/ground/outside/water/running, +>>>>>>> Stashed changes /area/f13/caves) "kIK" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -35874,7 +42329,10 @@ /area/f13/wasteland) "kIO" = ( /obj/structure/barricade/wooden, +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, +======= +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, @@ -35910,6 +42368,15 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/s) +"kJc" = ( +/obj/structure/wreck/car/bike{ + dir = 8; + icon_state = "bike_rust_med_no_wheels" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "kJh" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt, @@ -35933,11 +42400,17 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/t) "kJH" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/robot_debris, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain0" }, /area/f13/wasteland) +======= +/obj/machinery/vending/hydroseeds, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "kJN" = ( /obj/machinery/power/port_gen/pacman/diesel{ anchored = 1 @@ -35971,10 +42444,22 @@ /turf/open/floor/carpet/red, /area/f13/legioncamp) "kKl" = ( +<<<<<<< Updated upstream /obj/structure/table/booth, /obj/effect/decal/cleanable/glass, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +======= +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "kKp" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt/dust, @@ -36054,6 +42539,16 @@ icon_state = "bluerustysolid" }, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream +======= +"kLc" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2_flesh" + }, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "kLg" = ( /obj/structure/chair/sofa/left, /turf/open/floor/f13{ @@ -36168,8 +42663,15 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) "kMT" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/wasteland) "kMU" = ( /obj/effect/decal/cleanable/dirt, @@ -36264,7 +42766,15 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, +<<<<<<< Updated upstream /area/f13/wasteland) +======= +/area/f13/brotherhood) +"kNu" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "kNy" = ( /obj/effect/decal/cleanable/greenglow{ pixel_x = 19; @@ -36298,6 +42808,15 @@ /obj/structure/stairs/west, /turf/open/floor/f13/wood, /area/f13/building/abandoned/n) +"kNI" = ( +/obj/structure/rack/shelf_metal, +/obj/item/storage/bag/salvagestorage, +/obj/item/weldingtool, +/obj/effect/spawner/lootdrop/toolsbasic, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt" + }, +/area/f13/wasteland) "kNN" = ( /obj/effect/decal/cleanable/oil{ pixel_x = 15 @@ -36324,6 +42843,15 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +<<<<<<< Updated upstream +======= +"kNV" = ( +/obj/structure/fence{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "kOg" = ( /obj/item/storage/toolbox/ammo, /turf/open/indestructible/ground/outside/dirt, @@ -36379,6 +42907,17 @@ icon_state = "dirt" }, /area/f13/caves) +<<<<<<< Updated upstream +======= +"kOQ" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "kOT" = ( /obj/structure/toilet{ dir = 8 @@ -36486,6 +43025,13 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"kQC" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "kQD" = ( /turf/open/indestructible/ground/inside/dirt, /area/f13/building/abandoned/q) @@ -36573,6 +43119,14 @@ smooth = 1 }, /area/f13/building/abandoned/l) +"kRS" = ( +/obj/item/twohanded/required/kirbyplants/random, +/obj/machinery/light/small{ + dir = 8; + brightness = 9 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "kRW" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/cash_random_low, @@ -36605,8 +43159,14 @@ }, /area/f13/ambientlighting/building/b) "kSD" = ( +<<<<<<< Updated upstream /obj/structure/chair/stool, /turf/open/floor/f13/wood, +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "kSG" = ( /obj/structure/table/wood, @@ -36664,6 +43224,14 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"kTQ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/booth, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "kTR" = ( /obj/structure/chair/f13chair2{ dir = 4 @@ -36724,12 +43292,22 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/t) +<<<<<<< Updated upstream "kVy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/simple_door/tentflap_cloth, /turf/open/floor/wood_common{ icon_state = "common-broken4" }, +======= +"kVw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood/club, +/obj/item/clothing/suit/armor/outfit/vest, +/obj/item/clothing/suit/armor/outfit/vest, +/obj/item/clothing/suit/armor/outfit/vest, +/turf/open/floor/plasteel/grimy, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "kVC" = ( /obj/effect/decal/cleanable/glass, @@ -36770,7 +43348,12 @@ /turf/closed/wall/f13/wood/interior, /area/f13/ambientlighting/building/z) "kVV" = ( +<<<<<<< Updated upstream /obj/structure/fluff/rails, +======= +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rock/jungle, +>>>>>>> Stashed changes /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "kWj" = ( @@ -36785,6 +43368,13 @@ /obj/effect/turf_decal/vg_decals/radiation, /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"kWq" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "kWs" = ( /obj/structure/debris/v4, /obj/structure/debris/v2, @@ -36837,6 +43427,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "kWV" = ( +<<<<<<< Updated upstream /obj/structure/closet/crate/footlocker{ anchored = 1 }, @@ -36846,6 +43437,15 @@ /obj/item/paint/anycolor, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) +======= +/obj/structure/table/wood, +/obj/item/pen/fourcolor, +/obj/item/paper_bin, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "kWW" = ( /obj/structure/car/rubbish2, /turf/open/indestructible/ground/outside/sidewalk{ @@ -36887,9 +43487,25 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/maintenance/bar) "kXs" = ( +<<<<<<< Updated upstream /obj/structure/obstacle/tanktrap, /turf/open/indestructible/ground/outside/desert, +======= +/obj/structure/fence{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outermaincornerinner" + }, +>>>>>>> Stashed changes /area/f13/wasteland) +"kXt" = ( +/obj/structure/rack/shelf_metal, +/obj/item/salvage/high, +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "kXz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/white/line, @@ -36926,11 +43542,17 @@ }, /area/f13/building/powered) "kYn" = ( +<<<<<<< Updated upstream /obj/machinery/food_cart, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "kYq" = ( /obj/effect/overlay/desert_side{ dir = 8 @@ -37092,12 +43714,17 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "laF" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/ruins{ icon_state = "ruinswindowbroken" }, /obj/effect/decal/cleanable/glass, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "laG" = ( /obj/structure/closet/crate/bin/trashbin, /turf/open/floor/wood_common, @@ -37117,6 +43744,7 @@ }, /area/f13/ambientlighting/building/g) "laY" = ( +<<<<<<< Updated upstream /obj/structure/table/wood/junk, /obj/item/storage/box/gun/rifle/hunting, /obj/effect/spawner/lootdrop/f13/attachments, @@ -37128,6 +43756,13 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/structure/shelf_wood, +/obj/item/seeds/cannabis, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "lbc" = ( /obj/structure/table/wood/settler, /obj/effect/decal/cleanable/dirt{ @@ -37145,6 +43780,19 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +<<<<<<< Updated upstream +======= +"lbe" = ( +/obj/structure/table/wood/junk, +/obj/effect/spawner/lootdrop/f13/attachments, +/obj/effect/spawner/lootdrop/f13/attachments, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +"lbi" = ( +/obj/structure/fluff/hedge, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "lbj" = ( /obj/structure/fence/wooden{ dir = 1; @@ -37190,6 +43838,7 @@ /turf/open/floor/bronze, /area/f13/building/abandoned/m) "lbC" = ( +<<<<<<< Updated upstream /obj/item/clockwork/alloy_shards{ name = "rocks"; desc = "Rocks. Mindblowing."; @@ -37199,6 +43848,11 @@ icon_state = "wasteland32" }, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "lbG" = ( /obj/effect/spawner/lootdrop/f13/bomb/tier2, /turf/open/indestructible/ground/outside/dirt, @@ -37230,17 +43884,26 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "lbU" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 9 +/obj/structure/chair/wood/wings{ + pixel_y = 23 }, +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +======= +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "lbW" = ( /turf/closed/wall/f13/store{ desc = "A pre-War wall made of solid concrete."; name = "concrete wall" }, /area/f13/wasteland) +"lcg" = ( +/obj/structure/flora/grass/coyote/two, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "lcl" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop2right" @@ -37266,6 +43929,24 @@ /obj/structure/wreck/trash/two_barrels, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) +<<<<<<< Updated upstream +======= +"lcv" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +"lcI" = ( +/obj/item/statuebust{ + anchored = 1; + can_be_unanchored = 1 + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "lcO" = ( /obj/machinery/hydroponics/soil, /obj/effect/overlay/desert_side{ @@ -37286,6 +43967,12 @@ icon_state = "redrustyfull" }, /area/f13/building/abandoned/t) +"lcR" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "ldt" = ( /obj/structure/cross, /turf/open/indestructible/ground/outside/desert, @@ -37311,6 +43998,15 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) +<<<<<<< Updated upstream +======= +"ldV" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft2bottom" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ldX" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -37356,6 +44052,7 @@ }, /area/f13/wasteland) "let" = ( +<<<<<<< Updated upstream /obj/effect/decal/marking{ pixel_x = -14 }, @@ -37365,6 +44062,14 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +======= +/obj/structure/barricade/wooden/planks{ + icon_state = "board-2"; + desc = "This sps" + }, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) +>>>>>>> Stashed changes "leu" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -37373,6 +44078,12 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/w) +"lez" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) "lfg" = ( /obj/structure/railing/corner{ color = "#A47449"; @@ -37407,6 +44118,7 @@ /turf/open/floor/wood_common, /area/f13/clinic) "lfS" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ dir = 8 }, @@ -37420,6 +44132,14 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/structure/barricade/wooden, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "lfY" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/melee/tier3, @@ -37448,6 +44168,13 @@ dir = 1 }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"lgB" = ( +/obj/item/clothing/shoes/ballandchain, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "lgI" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -37457,6 +44184,12 @@ icon_state = "rubble" }, /area/f13/wasteland) +"lgJ" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 6 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "lgL" = ( /obj/structure/sign/departments/medbay, /turf/closed/wall/f13/supermart, @@ -37484,6 +44217,7 @@ /obj/structure/flora/grass/wasteland, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream "lhX" = ( /obj/effect/decal/fakelattice, /obj/effect/overlay/desert/sonora/edge/corner{ @@ -37494,6 +44228,14 @@ }, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +"lhV" = ( +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "lia" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier4, @@ -37518,6 +44260,24 @@ icon_state = "dirt" }, /area/f13/wasteland) +"liq" = ( +/obj/item/kirbyplants{ + icon_state = "plant-25"; + pixel_y = 18; + pixel_x = -6 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +"liv" = ( +/obj/effect/decal/marking{ + icon_state = "dottedvertical"; + pixel_x = -14 + }, +/obj/structure/car/rubbish3, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "liB" = ( /obj/machinery/door/unpowered/securedoor/legion, /turf/open/floor/f13/wood, @@ -37550,6 +44310,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream +======= +"ljx" = ( +/obj/structure/rack/large/shelf_rust{ + dir = 8 + }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ljz" = ( /obj/structure/barricade/tentclothedge{ dir = 8; @@ -37565,6 +44339,7 @@ /obj/structure/flora/tree/tall, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream "ljY" = ( /obj/machinery/light/small{ dir = 4; @@ -37590,6 +44365,25 @@ }, /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/inside/mountain, +======= +"lkc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 4; + pixel_y = -16 + }, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) +"lki" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + dir = 1; + icon_state = "horizontaltopborderbottom0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "lkn" = ( /obj/effect/overlay/desert/sonora/edge, @@ -37654,6 +44448,35 @@ }, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +"llj" = ( +/obj/effect/spawner/lootdrop/glowstick, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" + }, +/obj/structure/closet/crate/bin/trashbin, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +"lll" = ( +/obj/structure/sign/poster/contraband/pinup_bed{ + pixel_x = 32 + }, +/obj/structure/sacrificealtar, +/obj/effect/decal/cleanable/blood, +/obj/machinery/light/fo13colored/Red{ + dir = 4 + }, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) +"llo" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerborder" + }, +/area/f13/wasteland) "llp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/darkbrown/side{ @@ -37740,6 +44563,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/g) +"lmw" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) "lmK" = ( /obj/structure/chair/wood{ dir = 4 @@ -37766,10 +44597,16 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) "lnd" = ( +<<<<<<< Updated upstream /obj/structure/chair/wood{ dir = 1 }, /turf/open/indestructible/ground/outside/sidewalk, +======= +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +>>>>>>> Stashed changes /area/f13/wasteland) "lnD" = ( /obj/effect/turf_decal/weather/dirt, @@ -37885,8 +44722,16 @@ /area/f13/wasteland) "lpb" = ( /obj/effect/decal/cleanable/dirt, +<<<<<<< Updated upstream /turf/open/floor/wood_wide, /area/f13/wasteland) +======= +/obj/item/restraints/legcuffs/beartrap, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "lpd" = ( /obj/structure/table, /obj/machinery/light{ @@ -38012,6 +44857,26 @@ /obj/structure/simple_door/wood, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"lqJ" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/effect/decal/cleanable/oil, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +"lqP" = ( +/obj/structure/wreck/trash/two_barrels, +/turf/open/indestructible/ground/outside/dirt{ + dir = 10; + icon_state = "dirt" + }, +/area/f13/wasteland/legion) +>>>>>>> Stashed changes "lqZ" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, @@ -38127,6 +44992,7 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "lsU" = ( +<<<<<<< Updated upstream /obj/structure/railing{ dir = 4; layer = 4.1 @@ -38135,6 +45001,11 @@ icon_state = "verticalleftborderleft1" }, /area/f13/wasteland) +======= +/obj/structure/barricade/wooden, +/turf/closed/indestructible/rock, +/area/f13/caves) +>>>>>>> Stashed changes "lsW" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -38194,6 +45065,7 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "ltA" = ( +<<<<<<< Updated upstream /obj/structure/fence/corner{ dir = 4 }, @@ -38202,6 +45074,23 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +/obj/structure/rack/shelf_metal, +/obj/item/clothing/head/helmet/f13/combat/mk2, +/obj/item/clothing/suit/armor/tiered/medium/combat/mk2, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/shoes/combat, +/obj/machinery/light/fo13colored/Red{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/blueprintVHighBallistics, +/obj/effect/spawner/lootdrop/f13/blueprintVHigh, +/obj/effect/spawner/lootdrop/f13/blueprintMid, +/obj/effect/spawner/bundle/f13/plasmapistol, +/turf/open/floor/pod/dark, +/area/f13/building/powered) +>>>>>>> Stashed changes "ltG" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -38253,6 +45142,21 @@ /obj/effect/spawner/lootdrop/ammo, /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) +"lub" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) +"luj" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "luk" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalbottombordertop2" @@ -38285,6 +45189,18 @@ /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/grass/dirtpath, /area/f13/ambientlighting/building/t) +"lvc" = ( +/obj/machinery/chem_dispenser, +/obj/machinery/light/fo13colored/Aqua{ + bulb_colour = "#b4ddea"; + desc = "A lighting fixture with blue UV lighting."; + dir = 8; + name = "UV light" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) "lve" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -38384,6 +45300,7 @@ /obj/structure/obstacle/barbedwire{ dir = 1 }, +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "lxa" = ( @@ -38396,6 +45313,24 @@ /turf/open/indestructible/ground/outside/dirt{ dir = 1; icon_state = "dirt" +======= +/turf/open/floor/plasteel/f13/stone/rugged, +/area/f13/legioncamp) +"lwK" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) +"lwL" = ( +/obj/item/storage/trash_stack{ + icon_state = "Junk_3" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" +>>>>>>> Stashed changes }, /area/f13/wasteland) "lxb" = ( @@ -38428,10 +45363,18 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "lxh" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, /turf/closed/mineral/random/low_chance, /area/f13/caves) +======= +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "lxp" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/effect/decal/cleanable/greenglow, @@ -38440,6 +45383,7 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream "lxq" = ( /obj/machinery/smartfridge/bottlerack{ pixel_x = -3 @@ -38453,6 +45397,14 @@ }, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +"lxr" = ( +/obj/item/storage/trash_stack, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "lxs" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/closed/wall/f13/wood/house, @@ -38465,10 +45417,56 @@ "lxE" = ( /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) +"lxO" = ( +/obj/machinery/button/door{ + pixel_y = 28; + id = 982 + }, +/obj/structure/disposalpipe/broken{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "lxR" = ( /obj/structure/barricade/wooden/strong, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"lxU" = ( +/obj/structure/flora/tree/tall{ + icon_state = "tree_3"; + pixel_y = 12 + }, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland/legion) +"lxW" = ( +/obj/structure/fence/corner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerturn" + }, +/area/f13/wasteland) +"lxY" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded"; + pixel_x = -14 + }, +/obj/structure/car/rubbish3{ + icon_state = "car_rubish2" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "lyg" = ( /obj/item/reagent_containers/glass/bucket, /turf/open/indestructible/ground/outside/dirt, @@ -38506,6 +45504,14 @@ /obj/effect/decal/marking, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"lyQ" = ( +/obj/structure/simple_door/metal/dirtystore, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "lyR" = ( /obj/structure/window/fulltile/wood/broken, /obj/structure/fence{ @@ -38574,6 +45580,7 @@ /turf/open/indestructible/ground/outside/dirt/harsh, /area/f13/followers) "lzH" = ( +<<<<<<< Updated upstream /obj/structure/chair/stool/retro/tan, /mob/living/simple_animal/hostile/renegade/grunt, /obj/item/storage/trash_stack{ @@ -38611,15 +45618,72 @@ icon_state = "verticalinnermain0" }, /area/f13/ncr) +======= +/obj/structure/junk/locker, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +"lzL" = ( +/obj/structure/fence{ + dir = 4 + }, +/obj/structure/decoration/rag, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/dirt{ + dir = 1; + icon_state = "dirt" + }, +/area/f13/wasteland/legion) +"lzT" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +"lAb" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ambientlighting/building/j) +"lAl" = ( +/obj/structure/car/rubbish4{ + pixel_x = -20 + }, +/obj/effect/turf_decal/big{ + dir = 4 + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +"lAH" = ( +/obj/effect/decal/fakelattice, +/obj/structure/bookcase, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "lAR" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; pixel_y = -4; +<<<<<<< Updated upstream pixel_x = -13 }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= + pixel_x = 16 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) +>>>>>>> Stashed changes "lAT" = ( /obj/machinery/door/poddoor/gate/preopen{ name = "north gate"; @@ -38747,7 +45811,15 @@ /area/f13/wasteland) "lCr" = ( /obj/effect/decal/cleanable/dirt, +<<<<<<< Updated upstream /turf/open/floor/wood_fancy, +======= +/mob/living/simple_animal/hostile/ghoul, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "lCA" = ( /obj/structure/barricade/tentclothcorner{ @@ -38756,6 +45828,20 @@ /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"lCJ" = ( +/obj/structure/girder, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +"lCN" = ( +/obj/structure/decoration/clock, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +>>>>>>> Stashed changes "lCR" = ( /turf/open/floor/f13{ icon_state = "whitegreenrustychess" @@ -38796,6 +45882,11 @@ icon_state = "verticalrightborderright3" }, /area/f13/wasteland) +"lDC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "lDG" = ( /obj/structure/barricade/sandbags, /obj/effect/turf_decal/weather/dirt, @@ -38940,10 +46031,20 @@ icon_state = "bluerustysolid" }, /area/f13/followers) +<<<<<<< Updated upstream "lFV" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +"lFO" = ( +/obj/machinery/autolathe/ammo, +/obj/item/book/granter/crafting_recipe/gunsmith_one, +/obj/item/book/granter/crafting_recipe/gunsmith_two, +/obj/item/book/granter/crafting_recipe/gunsmith_three, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "lFW" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/traitbooks/low, @@ -38985,6 +46086,15 @@ dir = 4 }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"lGW" = ( +/obj/structure/filingcabinet/chestdrawer, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "lGY" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -39037,6 +46147,7 @@ /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) "lHV" = ( +<<<<<<< Updated upstream /obj/structure/wreck/trash/engine, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) @@ -39048,6 +46159,19 @@ name = "rusted floor" }, /area/f13/ncr) +======= +/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/wasteland) +"lIl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "lIo" = ( /turf/open/transparent/openspace, /area/f13/wasteland/city) @@ -39086,6 +46210,7 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "lIE" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ dir = 8 }, @@ -39108,6 +46233,15 @@ /obj/item/stack/wrapping_paper, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "lIV" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier1, @@ -39133,6 +46267,7 @@ icon_state = "bar" }, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream "lJf" = ( /obj/structure/barricade/tentclothedge, /obj/structure/barricade/tentclothedge, @@ -39151,6 +46286,21 @@ /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/m) +======= +"lJh" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/obj/structure/sign/do_not_enter, +/obj/effect/turf_decal/siding/wood, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "lJl" = ( /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded" @@ -39267,6 +46417,7 @@ }, /area/f13/ambientlighting/building/i) "lKN" = ( +<<<<<<< Updated upstream /obj/effect/mob_spawn/human/corpse/legion, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) @@ -39278,6 +46429,11 @@ icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) +======= +/obj/item/twohanded/spear, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "lKW" = ( /mob/living/simple_animal/hostile/supermutant/nightkin/elitemutant, /turf/open/floor/f13{ @@ -39329,6 +46485,7 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, /area/f13/building/abandoned/l) +<<<<<<< Updated upstream "lLs" = ( /obj/effect/overlay/desert/sonora/edge, /obj/effect/overlay/desert/sonora/edge{ @@ -39343,6 +46500,14 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop2left" }, +======= +"lLC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/wasteland) "lLG" = ( /obj/effect/decal/cleanable/dirt, @@ -39500,6 +46665,21 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"lNw" = ( +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18 + }, +/obj/item/stack/sheet/leather/ten, +/obj/item/stack/sheet/leather/ten, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/mineral/limestone/ten, +/obj/item/stack/sheet/mineral/limestone, +/obj/item/stack/sheet/mineral/limestone, +/obj/item/stack/sheet/mineral/limestone, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "lNB" = ( /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/sidewalk{ @@ -39706,6 +46886,7 @@ /obj/structure/closet/crate/trashcart, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +<<<<<<< Updated upstream "lRB" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/large, @@ -39713,6 +46894,12 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) +======= +"lRK" = ( +/obj/structure/wreck/trash/brokenvendor, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "lRQ" = ( /obj/structure/barricade/tentleathercorner{ dir = 8 @@ -39749,11 +46936,16 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) "lSG" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +======= +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "lSI" = ( /obj/effect/decal/remains/deadeyebot, @@ -39788,6 +46980,15 @@ "lSV" = ( /turf/closed/wall/f13/wood/house, /area/f13/caves) +<<<<<<< Updated upstream +======= +"lSW" = ( +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/simple_door/brokenglass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "lSZ" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -39802,6 +47003,11 @@ icon_state = "floorrusty" }, /area/f13/building/abandoned/h) +"lTi" = ( +/obj/machinery/vending/clothing, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "lTq" = ( /obj/effect/overlay/junk, /turf/closed/indestructible/rock{ @@ -39917,11 +47123,18 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) "lUM" = ( +<<<<<<< Updated upstream /obj/structure/fluff/paper/stack{ dir = 1 }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) +======= +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "lUU" = ( /obj/effect/spawner/lootdrop/armylootbasic, /obj/effect/decal/cleanable/dirt, @@ -39949,12 +47162,39 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) +"lVo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/destructible/tribal_torch/lit, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) +"lVq" = ( +/obj/machinery/smartfridge/bottlerack/grownbin, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "lVy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/reagent_containers/food/drinks/mug/coco, /turf/open/floor/carpet/royalblack, /area/f13/building/abandoned/l) +"lVJ" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 48; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "lVM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/revolver{ @@ -39971,6 +47211,15 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"lWa" = ( +/obj/item/mine/shrapnel, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "lWi" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/lattice, @@ -39996,6 +47245,7 @@ /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream "lWz" = ( /obj/structure/closet/locker, /turf/open/indestructible/ground/inside/mountain, @@ -40008,6 +47258,20 @@ name = "dirty floor" }, /area/f13/brotherhood) +======= +"lWV" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "lWW" = ( /obj/structure/wreck/trash/five_tires, /turf/open/indestructible/ground/outside/dirt{ @@ -40091,6 +47355,7 @@ /turf/open/floor/f13{ icon_state = "reddirtyfull" }, +<<<<<<< Updated upstream /area/f13/brotherhood) "lXS" = ( /obj/item/reagent_containers/food/snacks/f13/canned/ncr/ham_and_eggs, @@ -40133,6 +47398,36 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/destructible/tribal_torch/lit{ + pixel_y = -12; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 9; + icon_state = "dirt" + }, +/area/f13/legioncamp) +"lXY" = ( +/obj/effect/decal/cleanable/generic{ + pixel_x = -8; + pixel_y = 12 + }, +/obj/structure/fence, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/legioncamp) +"lYf" = ( +/obj/item/defibrillator/primitive, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +"lYo" = ( +/obj/structure/table, +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "lYp" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -40193,6 +47488,18 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/building/abandoned/m) +<<<<<<< Updated upstream +======= +"lZM" = ( +/obj/structure/grille/broken, +/obj/effect/turf_decal/big{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "lZX" = ( /obj/machinery/dna_scannernew, /obj/effect/decal/cleanable/dirt/dust, @@ -40325,10 +47632,29 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) "mca" = ( +<<<<<<< Updated upstream /obj/structure/simple_door/metal/dirtystore, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bar, /area/f13/ambientlighting/building/m) +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/structure/closet/crate/large{ + layer = 4.9; + name = "large crate wall"; + anchored = 1 + }, +/obj/structure/closet/crate/large{ + pixel_y = 17; + layer = 5.1; + name = "large crate wall"; + anchored = 1 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "mcb" = ( /obj/structure/table, /turf/open/floor/plating/rust, @@ -40343,6 +47669,22 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"mcv" = ( +/obj/structure/closet/crate/trashcart, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"mcC" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "mcI" = ( /obj/structure/billboard/nukagirl2, /turf/open/indestructible/ground/outside/desert, @@ -40412,6 +47754,10 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/f) +"mdu" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "mdw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -40551,6 +47897,18 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"meL" = ( +/turf/open/floor/plating/f13/inside/gravel/edge{ + dir = 6 + }, +/area/f13/wasteland) +"meN" = ( +/obj/structure/chair/stool/retro/black, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "mfh" = ( /obj/effect/spawner/lootdrop/f13/armor/randomraiderchest, /obj/effect/decal/cleanable/dirt/dust, @@ -40574,6 +47932,7 @@ }, /area/f13/ambientlighting/building/i) "mfw" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/house{ dir = 2; icon_state = "housewindowvertical" @@ -40585,6 +47944,18 @@ "mfx" = ( /obj/structure/chair/stool, /obj/machinery/light/broken, +======= +/obj/effect/overlay/desert/sonora/edge{ + dir = 5 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +"mfx" = ( +/obj/structure/flora/branch_broken, +/obj/structure/flora/twig3, +/obj/structure/flora/twig4, +/obj/item/stack/sheet/mineral/wood/five, +>>>>>>> Stashed changes /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "mfA" = ( @@ -40660,6 +48031,7 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/building/abandoned/q) +<<<<<<< Updated upstream "mgC" = ( /obj/structure/table/wood, /turf/open/indestructible/ground/outside/dirt, @@ -40683,6 +48055,13 @@ dir = 4 }, /turf/open/indestructible/ground/outside/sidewalk, +======= +"mgn" = ( +/obj/item/trash/can, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "mgO" = ( /obj/structure/fence/wooden{ @@ -40714,6 +48093,14 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"mhe" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/power/floodlight, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +>>>>>>> Stashed changes "mhi" = ( /obj/effect/decal/remains/human, /turf/open/indestructible/ground/inside/mountain, @@ -40735,6 +48122,12 @@ icon_state = "horizontalinnermain2" }, /area/f13/wasteland) +"mhx" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/booth, +/obj/item/dice/d100, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "mhA" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 1; @@ -40787,10 +48180,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, /area/f13/legioncamp) +<<<<<<< Updated upstream "mic" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood/club, /turf/open/floor/wood_common, +======= +"mij" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/plasteel/bar, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "miw" = ( /obj/structure/wreck/trash/two_tire, @@ -40805,12 +48205,19 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"miD" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) "miE" = ( /obj/structure/simple_door/house{ icon_state = "room" }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/q) +<<<<<<< Updated upstream "miQ" = ( /obj/machinery/door/unpowered/secure_bos, /obj/effect/mapping_helpers/network_builder/power_cable/auto, @@ -40824,6 +48231,17 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +======= +"miR" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) +"miU" = ( +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "mji" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, @@ -40850,6 +48268,7 @@ /obj/item/clothing/glasses/welding, /turf/open/floor/plasteel/dark, /area/engine/workshop) +<<<<<<< Updated upstream "mjG" = ( /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/outside/sidewalk{ @@ -40862,6 +48281,14 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +"mjH" = ( +/obj/item/gun/ballistic/shotgun/hunting, +/obj/item/gun/ballistic/shotgun/hunting, +/obj/structure/shelf_wood, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "mjT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood/settler, @@ -40926,6 +48353,7 @@ icon_state = "verticaloutermain0" }, /area/f13/followers) +<<<<<<< Updated upstream "mlH" = ( /obj/structure/table, /obj/structure/barricade/bars, @@ -40934,6 +48362,14 @@ }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/ncr) +======= +"mlJ" = ( +/obj/item/trash/waffles, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "mlV" = ( /obj/structure/reagent_dispensers/barrel/four, /turf/open/indestructible/ground/outside/grass/dirtpath{ @@ -40976,6 +48412,19 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +"mmt" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/leatherstrips, +/obj/item/stack/sheet/mineral/concrete/ten, +/obj/item/stack/sheet/mineral/limestone/twenty, +/obj/item/stack/sheet/mineral/limestone/five, +/turf/open/floor/wood_common, +/area/f13/wasteland) "mmv" = ( /turf/closed/wall/f13/store, /area/f13/building/abandoned/h) @@ -41016,8 +48465,16 @@ }, /area/f13/building/abandoned/t) "mmI" = ( +<<<<<<< Updated upstream /obj/item/trash/f13/porknbeans, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +======= +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris1" + }, +/turf/open/indestructible/ground/outside/ruins, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "mmL" = ( /obj/structure/bed/mattress/pregame{ @@ -41095,6 +48552,14 @@ icon_state = "greenrustyfull" }, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream +======= +"mnv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/plasteel/rockvault/alien, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "mnA" = ( /obj/machinery/light/fo13colored/Red{ dir = 4 @@ -41160,6 +48625,15 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/g) +<<<<<<< Updated upstream +======= +"mnX" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "mox" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/advcrafting, @@ -41192,6 +48666,7 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) "moK" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/road, /area/f13/brotherhood/surface) "mpc" = ( @@ -41203,6 +48678,23 @@ }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +======= +/obj/structure/table/wood/settler, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/wasteland) +"moW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +"mpc" = ( +/turf/closed/wall/f13/wood/house, +/area/f13/ambientlighting/building/m) +"mpd" = ( +/obj/structure/janitorialcart, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "mps" = ( /obj/machinery/door/morgue, /turf/open/indestructible/ground/outside/desert, @@ -41210,6 +48702,20 @@ "mpt" = ( /turf/open/floor/plating/f13/inside, /area/f13/building) +<<<<<<< Updated upstream +======= +"mpv" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2top" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "mpB" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -41256,6 +48762,12 @@ name = "dirty floor" }, /area/f13/building/powered) +"mqj" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/m) "mqq" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/dirt, @@ -41309,6 +48821,16 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"mrF" = ( +/obj/structure/flora/tree/cactus, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "mrK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood/fancy/red, @@ -41434,6 +48956,15 @@ /obj/machinery/microwave/stove, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"mtT" = ( +/obj/item/chair/wood/modern, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "mtY" = ( /obj/structure/bookcase, /obj/item/book/manual/wiki/tcomms, @@ -41465,10 +48996,26 @@ /turf/open/floor/plasteel/grimy, /area/f13/ncr) "muq" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden/planks, /obj/structure/simple_door/metal/dirtystore, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/booth, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) +"mur" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "muv" = ( /obj/effect/overlay/desert_side{ dir = 4 @@ -41532,6 +49079,13 @@ /obj/item/reagent_containers/glass/bucket/wood, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"mvy" = ( +/obj/structure/barricade/bars, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "mvA" = ( /obj/structure/filingcabinet, /obj/structure/filingcabinet{ @@ -41540,6 +49094,7 @@ /turf/open/floor/f13, /area/f13/ambientlighting/building/o) "mvC" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ dir = 8 }, @@ -41556,6 +49111,17 @@ /obj/item/stack/sheet/mineral/concrete/ten, /obj/item/stack/sheet/mineral/plasma/twentyfive, /turf/open/floor/wood_common, +======= +/obj/effect/decal/marking{ + pixel_x = -14 + }, +/obj/structure/car/rubbish3{ + icon_state = "car_rubish2" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "mvI" = ( /turf/open/indestructible/ground/outside/dirt, @@ -41601,8 +49167,25 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) "mwN" = ( +<<<<<<< Updated upstream /turf/closed/wall/f13/store, /area/f13/building/powered) +======= +/obj/structure/chair/wood/wings{ + dir = 1 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +"mwT" = ( +/obj/structure/fence/wooden{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt"; + dir = 1 + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "mxg" = ( /obj/structure/chair/wood{ dir = 8 @@ -41653,10 +49236,29 @@ /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) +<<<<<<< Updated upstream "mxW" = ( /obj/structure/sign/poster/prewar/poster79, /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/m) +======= +"mxN" = ( +/obj/structure/closet/anchored, +/obj/item/clothing/shoes/f13/brownie, +/obj/item/clothing/shoes/f13/brownie, +/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/item/clothing/shoes/f13/brownie, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "mxX" = ( /obj/machinery/light/small{ dir = 4 @@ -41679,11 +49281,21 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) "myg" = ( +<<<<<<< Updated upstream /obj/structure/wreck/trash/bus_door, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) +======= +/obj/machinery/light/small{ + dir = 8; + pixel_y = -7 + }, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "myl" = ( /obj/structure/car/rubbish2, /obj/structure/car/rubbish3, @@ -41769,6 +49381,18 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, +<<<<<<< Updated upstream +======= +/obj/effect/spawner/lootdrop/trash, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/bar) +"mzf" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/plating/f13, +>>>>>>> Stashed changes /area/f13/wasteland) "mzi" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -41794,6 +49418,15 @@ icon_state = "rubble" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"mzq" = ( +/obj/structure/fence/corner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "mzJ" = ( /obj/structure/reagent_dispensers/barrel/three, /turf/open/indestructible/ground/outside/dirt{ @@ -41874,6 +49507,7 @@ /obj/structure/simple_door/tentflap_cloth, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/ambientlighting/building/d) +<<<<<<< Updated upstream "mBh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/simple_door/metal/dirtystore, @@ -41886,6 +49520,23 @@ "mBp" = ( /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/m) +======= +"mBk" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +"mBm" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/reagent_dispensers/foamtank, +/obj/effect/decal/fakelattice, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +>>>>>>> Stashed changes "mBr" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, @@ -41968,6 +49619,23 @@ /obj/item/reagent_containers/pill/salicyclic, /turf/open/floor/f13, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream +======= +"mCj" = ( +/obj/structure/closet/crate/large{ + pixel_y = 17; + layer = 5.1; + name = "large crate wall"; + anchored = 1 + }, +/obj/structure/closet/crate/large{ + layer = 4.9; + name = "large crate wall"; + anchored = 1 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "mCy" = ( /turf/closed/indestructible/f13vaultrusted, /area/f13/ambientlighting/building/x) @@ -41990,6 +49658,27 @@ /obj/effect/spawner/lootdrop/f13/ncr_c_ration, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) +<<<<<<< Updated upstream +======= +"mCN" = ( +/obj/effect/landmark/start/f13/ncrrearechelon, +/obj/effect/landmark/start/f13/ncrrearechelon, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) +"mCS" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/chair/wood/wings{ + pixel_y = 23 + }, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_common{ + icon_state = "common-broken4" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "mDa" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small{ @@ -42025,6 +49714,7 @@ }, /area/f13/wasteland) "mDw" = ( +<<<<<<< Updated upstream /obj/structure/cable/outdoors{ icon_state = "4-8" }, @@ -42035,6 +49725,12 @@ }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/human, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "mDz" = ( /obj/structure/chair/sofa/right{ dir = 1 @@ -42072,9 +49768,13 @@ }, /area/f13/wasteland) "mDT" = ( +<<<<<<< Updated upstream /obj/structure/fluff/rails{ icon_state = "rails-b2" }, +======= +/obj/structure/fluff/rails, +>>>>>>> Stashed changes /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "mDU" = ( @@ -42086,9 +49786,17 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/m) "mDZ" = ( +<<<<<<< Updated upstream /obj/structure/table/wood/junk, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/railing, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2left" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "mEa" = ( /obj/machinery/door/unpowered/secure_bos, /obj/effect/mapping_helpers/network_builder/power_cable/auto, @@ -42176,6 +49884,18 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"mER" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris1" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "mET" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/office/dark{ @@ -42185,6 +49905,16 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream +======= +"mFd" = ( +/obj/item/stack/sheet/mineral/wood, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt"; + dir = 1 + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "mFh" = ( /obj/structure/table/wood, /obj/structure/decoration/clock{ @@ -42202,6 +49932,24 @@ icon_state = "verticaloutermain0" }, /area/f13/followers) +"mFm" = ( +/obj/item/reagent_containers/glass/bucket{ + pixel_y = 17; + pixel_x = 11 + }, +/obj/item/storage/bag/plants{ + pixel_y = -6; + pixel_x = -10 + }, +/obj/machinery/light/small{ + dir = 4; + light_color = "#ff4747" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "mFp" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 6 @@ -42293,6 +50041,15 @@ /obj/structure/car/rubbish4, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +"mGF" = ( +/obj/structure/chair/stool{ + dir = 8; + icon_state = "bench" + }, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) "mGG" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -42326,10 +50083,20 @@ }, /area/f13/ambientlighting/building/m) "mGU" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood{ icon_state = "floor6" }, /obj/effect/gibspawner/human/bodypartless, +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/structure/flora/rock/jungle{ + icon_state = "rock3"; + pixel_x = -3 + }, +>>>>>>> Stashed changes /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "mGY" = ( @@ -42421,6 +50188,7 @@ /obj/structure/reagent_dispensers/compostbin, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +<<<<<<< Updated upstream "mIS" = ( /obj/structure/chair/wood{ dir = 4 @@ -42431,6 +50199,12 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +======= +"mIK" = ( +/obj/structure/table/snooker, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "mJa" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -42449,10 +50223,24 @@ icon_state = "horizontalinnermain2left" }, /area/f13/wasteland) +<<<<<<< Updated upstream "mJm" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"mJL" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_y = -1; + pixel_x = -2 + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "mJM" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "innermaincornerinner" @@ -42538,6 +50326,7 @@ }, /area/f13/ambientlighting/building/i) "mLN" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/structure/rack/large/shelf_rust{ dir = 8 @@ -42562,6 +50351,19 @@ /obj/structure/fluff/rails, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +"mLX" = ( +/obj/structure/table/snooker{ + dir = 10 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "mMp" = ( /obj/structure/dresser, /turf/open/floor/wood_common{ @@ -42615,11 +50417,22 @@ /obj/structure/barricade/wooden/planks/pregame, /turf/closed/wall/f13/ruins, /area/f13/wasteland/town) +<<<<<<< Updated upstream "mNN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/junk/small, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +"mND" = ( +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/cloth/ten, +/obj/item/stack/sheet/glass/ten, +/obj/item/stack/sheet/glass/ten, +/obj/item/stack/sheet/mineral/limestone/five, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "mNO" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/dirt{ @@ -42643,6 +50456,10 @@ /area/f13/ambientlighting/building/d) "mNW" = ( /obj/effect/decal/cleanable/dirt, +<<<<<<< Updated upstream +======= +/obj/structure/simple_door/tentflap_cloth, +>>>>>>> Stashed changes /turf/open/floor/wood_common{ icon_state = "common-broken4" }, @@ -42679,12 +50496,18 @@ /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "mOk" = ( +<<<<<<< Updated upstream /obj/structure/chair/comfy/green{ dir = 4; pixel_x = -12 }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +/obj/structure/statue_fal, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "mOr" = ( /obj/structure/curtain{ color = "#845f58"; @@ -42703,12 +50526,18 @@ }, /area/f13/wasteland) "mOF" = ( +<<<<<<< Updated upstream /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) "mOQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +/obj/effect/decal/remains/human, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "mOV" = ( /obj/machinery/light/fo13colored/Red{ dir = 1 @@ -42818,11 +50647,28 @@ }, /area/f13/wasteland) "mQK" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ dir = 1 }, /turf/open/floor/wood_common, /area/f13/wasteland) +======= +/obj/machinery/light, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/bone, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +"mQL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 1; + light_color = "#d8b1b1" + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "mQR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -42952,6 +50798,7 @@ /turf/open/floor/carpet/red, /area/f13/ambientlighting/building/e) "mTa" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 6 }, @@ -42960,6 +50807,14 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +======= +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6" + }, +/turf/open/floor/plating/rust, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "mTb" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -42989,6 +50844,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +<<<<<<< Updated upstream +======= +"mTs" = ( +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" + }, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "mTu" = ( /obj/structure/barricade/wooden, /obj/structure/decoration/rag, @@ -43028,6 +50893,24 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"mTP" = ( +/obj/effect/decal/fakelattice, +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 8 + }, +/obj/machinery/light/broken{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +"mTQ" = ( +/obj/effect/overlay/desert/sonora/edge, +/obj/structure/wreck/trash/three_barrels, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "mTS" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -43076,11 +50959,25 @@ /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "mUz" = ( +<<<<<<< Updated upstream /obj/structure/rack/shelf_metal, /obj/effect/decal/fakelattice, /obj/item/melee/smith/hammer, /turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/ambientlighting/building/j) +======= +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2"; + pixel_y = 4 + }, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "mUB" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 6; @@ -43330,6 +51227,13 @@ "mZc" = ( /turf/closed/wall/f13/ruins, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"mZg" = ( +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/high, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "mZo" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/road{ @@ -43525,6 +51429,13 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"nbB" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "nbJ" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/ghoul/reaver, @@ -43532,6 +51443,16 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/f) +<<<<<<< Updated upstream +======= +"nbO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/bin/trashbin, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "nbU" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/sidewalk{ @@ -43549,8 +51470,14 @@ /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) "ncc" = ( +<<<<<<< Updated upstream /obj/structure/nest/ghoul, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/structure/fence, +/obj/structure/obstacle/barbedwire, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "ncf" = ( /obj/effect/decal/cleanable/greenglow, @@ -43595,6 +51522,7 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream "ndc" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/light/small{ @@ -43602,6 +51530,15 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +======= +"ncO" = ( +/obj/item/shard, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ndk" = ( /obj/effect/overlay/desert/sonora/edge, /turf/closed/wall/f13/tunnel, @@ -43666,11 +51603,31 @@ "ndO" = ( /turf/open/indestructible/ground/outside/dirt/harsh, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"ndP" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common{ + icon_state = "common-broken4" + }, +/area/f13/ambientlighting/building/m) +"ndW" = ( +/obj/structure/fluff/rails{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2"; + pixel_y = 4 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "ndZ" = ( /turf/open/indestructible/ground/outside/dirt{ icon_state = "dirtcorner" }, /area/f13/wasteland) +<<<<<<< Updated upstream "ned" = ( /obj/structure/cable/outdoors{ icon_state = "1-2" @@ -43683,6 +51640,12 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) +======= +"nei" = ( +/obj/item/vending_refill/coffee, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "nek" = ( /obj/structure/reagent_dispensers/barrel/dangerous{ pixel_y = -5; @@ -43697,6 +51660,10 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) +"nem" = ( +/obj/structure/sign/poster/prewar/protectron, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "ner" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 7; @@ -43763,6 +51730,13 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/g) +"nfd" = ( +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "nff" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4"; @@ -43799,12 +51773,21 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +<<<<<<< Updated upstream "nfC" = ( /obj/structure/window/fulltile/house, /obj/structure/curtain{ color = "#363636" }, /turf/open/floor/plasteel/grimy, +======= +"nfz" = ( +/obj/machinery/light/small{ + dir = 8; + light_color = "#d8b1b1" + }, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/ncr) "nfD" = ( /obj/machinery/door/unpowered/securedoor{ @@ -43874,7 +51857,12 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "ngc" = ( +<<<<<<< Updated upstream /obj/structure/simple_door/brokenglass, +======= +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood/club, +>>>>>>> Stashed changes /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) "ngd" = ( @@ -43981,11 +51969,17 @@ }, /area/f13/building/powered) "nhC" = ( +<<<<<<< Updated upstream /obj/structure/chair/folding, /turf/open/floor/f13{ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/f13/building/powered) +>>>>>>> Stashed changes "nhF" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -43995,6 +51989,10 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/o) +"nhI" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "nhK" = ( /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/r) @@ -44189,6 +52187,15 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/t) +<<<<<<< Updated upstream +======= +"nkI" = ( +/obj/structure/cargocrate, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "nkM" = ( /obj/structure/wreck/car/bike, /turf/open/indestructible/ground/outside/road{ @@ -44214,10 +52221,21 @@ }, /area/f13/ambientlighting/building/b) "nkV" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/table/optable, +/obj/machinery/defibrillator_mount/loaded{ + pixel_x = -28 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "nlf" = ( /obj/structure/tires/five{ pixel_x = 7; @@ -44304,9 +52322,14 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "nml" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/structure/flora/grass/coyote/twentynine, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "nmn" = ( /obj/effect/decal/cleanable/greenglow, @@ -44340,6 +52363,7 @@ }, /area/f13/wasteland) "nmA" = ( +<<<<<<< Updated upstream /obj/item/storage/trash_stack, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" @@ -44350,6 +52374,16 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" }, +======= +/obj/structure/fence/end/wooden{ + dir = 8 + }, +/obj/item/flag/legion{ + pixel_y = 28; + pixel_x = 1 + }, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "nmH" = ( /obj/structure/curtain{ @@ -44408,6 +52442,20 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"nnl" = ( +/obj/structure/junk/small, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +"nnu" = ( +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/destructible/tribal_torch/wall/lit{ + pixel_y = 25 + }, +/turf/closed/wall/mineral/wood, +/area/f13/wasteland/legion) +>>>>>>> Stashed changes "nnz" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -44431,6 +52479,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +"nnT" = ( +/obj/item/storage/bag/plants{ + pixel_y = 6; + pixel_x = 3 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "nnU" = ( /obj/structure/junk/small/bed2, /turf/open/indestructible/ground/outside/desert, @@ -44478,6 +52533,12 @@ /obj/structure/barricade/wooden, /turf/closed/mineral/random/low_chance, /area/f13/caves) +"noR" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 6 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "npe" = ( /obj/structure/table/wood, /obj/machinery/computer/terminal{ @@ -44565,6 +52626,7 @@ }, /area/f13/wasteland) "nqo" = ( +<<<<<<< Updated upstream /obj/item/melee/onehanded/machete/scrapsabre, /obj/item/clothing/under/f13/raiderrags, /obj/item/clothing/gloves/f13/handwraps, @@ -44577,6 +52639,12 @@ /turf/open/indestructible/ground/outside/sidewalk{ dir = 4; icon_state = "outermaincornerouter" +======= +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 8 +>>>>>>> Stashed changes }, /area/f13/wasteland) "nqt" = ( @@ -44584,6 +52652,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"nqu" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "nqv" = ( /obj/structure/obstacle/barbedwire/end{ dir = 8 @@ -44698,10 +52778,14 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) "nrR" = ( +<<<<<<< Updated upstream /obj/structure/table/booth, /obj/effect/decal/cleanable/dirt, /obj/item/storage/fancy/cigarettes/cigpack_mindbreaker, /turf/open/floor/wood_fancy, +======= +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "nrU" = ( /turf/closed/mineral/random/no_caves, @@ -44780,6 +52864,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) +"nta" = ( +/obj/structure/chair/bench{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain2top" + }, +/area/f13/wasteland) "nti" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/greenglow, @@ -44856,11 +52948,24 @@ /obj/structure/simple_door/bunker, /turf/open/floor/plating/rust, /area/f13/building/powered) +"nuz" = ( +/obj/structure/closet/bus, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) "nuP" = ( /obj/structure/flora/twig, /obj/structure/flora/twig4, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"nuS" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain3" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "nuY" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -44930,11 +53035,18 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "nvC" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 10 }, /obj/effect/spawner/lootdrop/f13/advcrafting, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/structure/wreck/trash/five_tires, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "nvD" = ( /obj/structure/railing{ @@ -44949,6 +53061,7 @@ /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/k) "nvF" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/structure/window/fulltile/ruins{ icon_state = "ruinswindowdestroyed" @@ -44956,6 +53069,12 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "nvK" = ( /obj/structure/flora/grass/jungle/b, /turf/open/indestructible/ground/outside/dirt, @@ -45046,6 +53165,10 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +"nxg" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "nxk" = ( /mob/living/simple_animal/hostile/raider/ranged, /turf/open/indestructible/ground/outside/dirt, @@ -45058,10 +53181,24 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "nxr" = ( +<<<<<<< Updated upstream /obj/effect/spawner/lootdrop/f13/crafting, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, +======= +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench"; + pixel_y = 17 + }, +/obj/structure/billboard/superduper1{ + pixel_y = 33 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "nxs" = ( /obj/effect/turf_decal/weather/dirt{ @@ -45085,6 +53222,12 @@ /obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, /area/f13/clinic) +"nxI" = ( +/obj/structure/fluff/rails{ + icon_state = "rails-b2" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "nxR" = ( /obj/effect/decal/marking{ icon_state = "dottedvertical" @@ -45108,9 +53251,28 @@ }, /area/f13/ambientlighting/building/j) "nyh" = ( +<<<<<<< Updated upstream /obj/item/clothing/shoes/ballandchain, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +"nyj" = ( +/obj/machinery/seed_extractor, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "nyk" = ( /obj/item/storage/trash_stack{ icon_state = "Junk_10" @@ -45185,6 +53347,7 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "nzH" = ( +<<<<<<< Updated upstream /mob/living/simple_animal/hostile/renegade/soldier, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" @@ -45195,6 +53358,40 @@ /obj/structure/barricade/wooden/planks, /turf/closed/mineral/random/low_chance, /area/f13/caves) +======= +/obj/structure/rack/shelf_metal, +/obj/effect/decal/fakelattice, +/obj/item/melee/smith/hammer, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) +"nzI" = ( +/obj/structure/decoration/rag{ + icon_state = "flag_ncr"; + name = "NCR banner"; + pixel_y = 32 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) +"nzK" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +"nzO" = ( +/mob/living/simple_animal/hostile/renegade/defender, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "nzT" = ( /turf/closed/wall/f13/tentwall, /area/f13/ambientlighting/building/b) @@ -45289,6 +53486,7 @@ /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/g) "nAU" = ( +<<<<<<< Updated upstream /obj/structure/flora/tree/joshua, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) @@ -45299,6 +53497,21 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/fluff/paper/stack{ + dir = 5 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ambientlighting/building/j) +"nAV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "nBd" = ( /obj/structure/window/fulltile/wood, /obj/structure/barricade/bars, @@ -45343,10 +53556,19 @@ /obj/structure/disposalpipe/segment, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +<<<<<<< Updated upstream "nBs" = ( /obj/structure/weightmachine/weightlifter, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +"nBv" = ( +/obj/structure/rack/shelf_metal, +/obj/item/salvage/low, +/obj/item/salvage/low, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "nBI" = ( /obj/structure/chair/wood{ dir = 4 @@ -45399,6 +53621,20 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/f13/wood/house, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"nCx" = ( +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18 + }, +/obj/item/stack/sheet/hay/twenty, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/metal/ten, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "nCG" = ( /obj/item/chair/wood/modern, /turf/open/indestructible/ground/outside/sidewalk{ @@ -45418,6 +53654,7 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "nDc" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood{ dir = 8; icon_state = "tracks" @@ -45425,6 +53662,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/booth, +/obj/machinery/light/small{ + dir = 1; + light_color = "#d8b1b1" + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "nDd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -45456,6 +53704,30 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/f13/tentwall, /area/f13/building/tribal) +<<<<<<< Updated upstream +======= +"nDi" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/closed/wall/mineral/brick, +/area/f13/wasteland) +"nDk" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Armoury" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "nDn" = ( /obj/effect/landmark/questing/people{ location_description = "You'll find 'em on the far west side of the valley, in that raider camp with the turrets outside." @@ -45537,6 +53809,7 @@ }, /area/f13/wasteland) "nEL" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 1 }, @@ -45555,6 +53828,11 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +======= +/obj/effect/decal/cleanable/glass, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "nES" = ( /obj/structure/curtain{ color = "#845f58"; @@ -45603,8 +53881,29 @@ }, /area/f13/wasteland) "nFD" = ( +<<<<<<< Updated upstream /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/floor/wood_common, +/area/f13/wasteland) +>>>>>>> Stashed changes "nFF" = ( /obj/machinery/autolathe/ammo, /obj/item/book/granter/crafting_recipe/gunsmith_four, @@ -45653,6 +53952,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/dirt, /area/f13/building/abandoned/q) +<<<<<<< Updated upstream +======= +"nFZ" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "nGb" = ( /obj/structure/rack/shelf_metal, /obj/item/clothing/head/chefhat, @@ -45692,6 +54000,7 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +<<<<<<< Updated upstream "nGT" = ( /obj/structure/cargocrate{ pixel_x = 3 @@ -45707,6 +54016,26 @@ }, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +"nHb" = ( +/obj/structure/ladder/unbreakable{ + height = 2; + id = "roboticdung"; + level = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) +"nHo" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "nHZ" = ( /obj/structure/car/rubbish4, /turf/open/indestructible/ground/outside/sidewalk{ @@ -45799,12 +54128,24 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/m) +"nIS" = ( +/obj/structure/sink/well, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "nIX" = ( +<<<<<<< Updated upstream /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/weather/dirt{ dir = 8 }, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/obj/structure/flora/grass/coyote/thirty, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "nJd" = ( /turf/open/indestructible/ground/outside/ruins{ @@ -45848,6 +54189,16 @@ /obj/structure/bonfire, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"nJv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/fermichem/pHmeter, +/obj/item/fermichem/pHbooklet, +/obj/structure/table/wood, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "nJJ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -45863,11 +54214,22 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "nJY" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/vomit/old, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop0" }, +======= +/obj/effect/turf_decal/vg_decals/numbers/six{ + layer = 5 + }, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +"nKe" = ( +/obj/structure/fence/cut/large, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "nKg" = ( /turf/open/floor/f13/wood{ @@ -45910,6 +54272,17 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"nKO" = ( +/obj/machinery/door/poddoor/shutters{ + id = 983 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "nKZ" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 1 @@ -45931,6 +54304,7 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "nLc" = ( +<<<<<<< Updated upstream /obj/effect/decal/remains/human, /obj/item/clothing/suit/armor/outfit/jacket/police, /obj/item/clothing/under/f13/police, @@ -45947,6 +54321,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/booth, +/obj/structure/fluff/beach_umbrella/security{ + pixel_y = 17; + layer = 50000; + pixel_x = -6 + }, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) +>>>>>>> Stashed changes "nLj" = ( /obj/effect/overlay/desert/sonora/edge, /obj/effect/overlay/desert/sonora/edge/corner{ @@ -46045,6 +54430,17 @@ icon_state = "verticalrightborderleft0" }, /area/f13/wasteland/city) +<<<<<<< Updated upstream +======= +"nMC" = ( +/obj/structure/table/booth, +/obj/item/camera{ + pixel_x = 3; + pixel_y = 11 + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "nMO" = ( /obj/effect/spawner/lootdrop/toolsbasic, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -46109,10 +54505,16 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "nNx" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /obj/effect/overlay/desert/sonora/edge, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +/obj/structure/closet/cardboard, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "nNB" = ( /obj/structure/fermenting_barrel, /turf/open/indestructible/ground/outside/dirt{ @@ -46121,10 +54523,18 @@ }, /area/f13/wasteland) "nNE" = ( +<<<<<<< Updated upstream /obj/structure/table/wood/junk, /obj/effect/spawner/lootdrop/f13/cash_random_med, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +/obj/item/grenade/syndieminibomb/concussion, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "nNM" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, @@ -46133,9 +54543,18 @@ }, /area/f13/ambientlighting/building/w) "nNR" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/structure/nest/ghoul, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_4"; + layer = 5 + }, +/obj/structure/flora/twig, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "nNW" = ( /obj/structure/flora/tree/jungle/small, @@ -46300,6 +54719,18 @@ /obj/structure/flora/wasteplant/wild_datura, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"nQx" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerturn" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "nQB" = ( /obj/machinery/light/lampost, /turf/open/indestructible/ground/outside/sidewalk{ @@ -46325,8 +54756,13 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "nQN" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, +======= +/obj/structure/table/glass, +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "nQO" = ( /turf/open/indestructible/ground/outside/sidewalk{ @@ -46373,6 +54809,12 @@ icon_state = "horizontaltopborderbottom2" }, /area/f13/wasteland) +"nRU" = ( +/obj/structure/wreck/trash/one_tire, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "nRY" = ( /obj/structure/window/fulltile/ruins, /turf/open/floor/wood_common, @@ -46387,6 +54829,18 @@ /obj/structure/bed/old, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/t) +<<<<<<< Updated upstream +======= +"nSn" = ( +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "nSu" = ( /obj/structure/chair/folding{ dir = 4 @@ -46394,6 +54848,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"nSw" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "nSA" = ( /obj/structure/bed, /obj/item/bedsheet{ @@ -46423,10 +54892,29 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) "nSW" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_worn, /area/f13/ambientlighting/building/m) +======= +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +"nTa" = ( +/obj/structure/destructible/tribal_torch/lit{ + pixel_y = -12; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 9; + icon_state = "dirt" + }, +/area/f13/wasteland/legion) +>>>>>>> Stashed changes "nTc" = ( /obj/machinery/light{ dir = 8; @@ -46437,11 +54925,22 @@ }, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream "nTw" = ( /obj/structure/rack/shelf_metal, /obj/item/salvage/tool, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +======= +"nTv" = ( +/obj/structure/window/fulltile/house{ + icon_state = "housewindowbrokenvertical" + }, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/bars, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "nTy" = ( /obj/structure/cable{ icon_state = "1-2" @@ -46449,10 +54948,16 @@ /turf/closed/wall/f13/supermart, /area/f13/followers) "nTz" = ( +<<<<<<< Updated upstream /obj/machinery/icecream_vat, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/rockvault/alien, /area/f13/ambientlighting/building/m) +======= +/obj/structure/chair/stool/retro/tan, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "nTT" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -46467,6 +54972,7 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "nUb" = ( +<<<<<<< Updated upstream /obj/structure/rack/large/shelf_rust, /obj/effect/decal/cleanable/dirt, /obj/item/storage/box/dice, @@ -46476,10 +54982,19 @@ /obj/structure/barricade/wooden, /obj/structure/barricade/tentclothedge{ dir = 4 +======= +/obj/machinery/light{ + dir = 4; + pixel_y = -16 + }, +/obj/structure/bed/mattress/pregame{ + icon_state = "bedroll_unrolled" +>>>>>>> Stashed changes }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) "nUf" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/ruins/broken, /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks{ @@ -46488,6 +55003,15 @@ }, /turf/open/floor/plasteel/bar, /area/f13/ambientlighting/building/m) +======= +/obj/structure/filingcabinet, +/obj/machinery/light{ + dir = 8; + pixel_y = -16 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "nUg" = ( /obj/structure/table/wood/settler, /obj/effect/spawner/lootdrop/f13/alcoholspawner, @@ -46552,6 +55076,7 @@ /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) "nVz" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop2left" @@ -46561,6 +55086,13 @@ /obj/structure/barricade/bars, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) +======= +/obj/structure/chair/stool/retro/backed{ + dir = 8 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "nVD" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowbroken" @@ -46615,6 +55147,7 @@ }, /area/f13/building/powered) "nWo" = ( +<<<<<<< Updated upstream /obj/structure/car/rubbish2{ pixel_x = 7; pixel_y = -16 @@ -46623,6 +55156,28 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +======= +/obj/machinery/door/poddoor/shutters{ + id = 982 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +"nWq" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + layer = 1000 + }, +/obj/effect/decal/cleanable/generic, +/obj/machinery/light{ + dir = 4; + pixel_y = -16 + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "nWy" = ( /turf/open/indestructible/ground/outside/road{ dir = 8; @@ -46666,6 +55221,7 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "nXi" = ( +<<<<<<< Updated upstream /obj/structure/decoration/rag{ icon_state = "flag_ncr"; name = "NCR banner"; @@ -46673,6 +55229,20 @@ }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft0" +======= +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +"nXn" = ( +/obj/structure/barricade/sandbags, +/obj/structure/obstacle/barbedwire{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" +>>>>>>> Stashed changes }, /area/f13/wasteland) "nXs" = ( @@ -46738,6 +55308,7 @@ }, /area/f13/ambientlighting/building/o) "nYQ" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -46749,6 +55320,9 @@ "nYW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/junkspawners, +======= +/obj/structure/table/wood, +>>>>>>> Stashed changes /turf/open/floor/f13{ icon_state = "yellowrustyfull" }, @@ -46781,6 +55355,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) "nZE" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/siding/wood, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" @@ -46813,6 +55388,18 @@ dir = 1 }, /area/f13/wasteland) +======= +/obj/structure/chair/sofa/left{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"nZP" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "nZV" = ( /obj/structure/tires/two, /turf/open/indestructible/ground/outside/dirt{ @@ -46820,10 +55407,20 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +<<<<<<< Updated upstream "oah" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +======= +"nZW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/trash_stack{ + icon_state = "Junk_9" + }, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "oao" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -46898,6 +55495,18 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"obz" = ( +/obj/structure/chair/stool/retro/tan, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 17 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "obB" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8 @@ -46925,6 +55534,13 @@ icon_state = "bar" }, /area/f13/ambientlighting/building/g) +<<<<<<< Updated upstream +======= +"ocb" = ( +/obj/structure/sign/poster/official/cohiba_robusto_ad, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ocn" = ( /obj/structure/flora/tree/tall, /turf/open/indestructible/ground/outside/dirt{ @@ -47209,6 +55825,7 @@ /obj/structure/simple_door/wood, /turf/open/floor/plating/dirt/dark, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream "ofe" = ( /obj/structure/cable/outdoors{ icon_state = "4-8" @@ -47221,6 +55838,14 @@ /obj/item/stack/sheet/mineral/limestone/twenty, /obj/item/stack/sheet/mineral/limestone/five, /turf/open/floor/wood_common, +======= +"ofg" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/smoke_machine{ + name = "generator mechanism" + }, +/turf/open/floor/plating/f13, +>>>>>>> Stashed changes /area/f13/wasteland) "ofn" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -47233,6 +55858,11 @@ /obj/structure/simple_door/metal/iron, /turf/open/floor/plasteel/vault, /area/f13/building/abandoned/m) +"ofx" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "ofC" = ( /obj/structure/gallow, /obj/effect/mob_spawn/human/corpse/raider/ranged/biker, @@ -47370,6 +56000,15 @@ /obj/structure/table, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"ohg" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "ohj" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -47413,11 +56052,47 @@ /obj/structure/dresser, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream "ois" = ( /obj/structure/simple_door/metal/dirtystore, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +"oit" = ( +/obj/item/ammo_box/magazine/m556/rifle/empty{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/ammo_box/magazine/m556/rifle/empty{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/ammo_box/magazine/m556/rifle/empty{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/ammo_box/magazine/m556/rifle/empty{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/ammo_box/magazine/m556/rifle{ + pixel_y = -7; + pixel_x = -5 + }, +/obj/item/ammo_box/magazine/m556/rifle{ + pixel_y = -7; + pixel_x = -5 + }, +/obj/item/ammo_box/magazine/m556/rifle{ + pixel_y = -7; + pixel_x = -5 + }, +/obj/structure/rack/shelf_metal, +/obj/item/gun/ballistic/automatic/service/carbine, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "oiv" = ( /obj/structure/flora/grass/jungle/b, /turf/open/indestructible/ground/outside/savannah, @@ -47452,6 +56127,7 @@ }, /area/f13/caves) "oiL" = ( +<<<<<<< Updated upstream /obj/structure/barricade/tentclothedge, /obj/structure/barricade/tentclothedge, /obj/structure/barricade/tentclothedge{ @@ -47464,6 +56140,12 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop3" }, +======= +/obj/structure/fence/corner{ + dir = 5 + }, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "oiN" = ( /obj/structure/barricade/wooden, @@ -47489,6 +56171,7 @@ /obj/item/stack/f13Cash/caps/onefivezero, /turf/open/floor/f13/wood, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream "oje" = ( /obj/structure/chair/wood{ dir = 1 @@ -47496,6 +56179,14 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop0" }, +======= +"ojm" = ( +/obj/structure/table/booth, +/obj/item/flag/ncr{ + pixel_y = 22 + }, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "ojn" = ( /obj/structure/sign/crosswalk{ @@ -47616,11 +56307,23 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +<<<<<<< Updated upstream "oky" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 }, /turf/open/indestructible/ground/inside/mountain, +======= +"okx" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/ambientlighting/building/m) +"oky" = ( +/obj/item/trash/f13/tin, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/wasteland) "okE" = ( /obj/structure/debris/v4, @@ -47645,6 +56348,7 @@ icon_state = "redrustyfull" }, /area/f13/building/abandoned/t) +<<<<<<< Updated upstream "okR" = ( /mob/living/simple_animal/hostile/renegade/soldier, /obj/effect/decal/cleanable/blood/tracks{ @@ -47653,6 +56357,23 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, +======= +"okQ" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +"okR" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/robot_debris, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +"okT" = ( +/obj/structure/flora/grass/coyote/seventeen, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "okX" = ( /obj/structure/wreck/trash/five_tires, @@ -47664,6 +56385,7 @@ }, /area/f13/ambientlighting/building/i) "olg" = ( +<<<<<<< Updated upstream /obj/structure/chair/comfy/black{ dir = 4; pixel_x = -12 @@ -47671,6 +56393,13 @@ /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +/obj/structure/table, +/obj/item/electronic_assembly/medium/radio, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/f13/building/powered) +>>>>>>> Stashed changes "olr" = ( /obj/machinery/grill, /turf/open/indestructible/ground/outside/sidewalkdirt, @@ -47828,6 +56557,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"onJ" = ( +/obj/structure/wreck/trash/machinepile, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "onN" = ( /obj/structure/table/reinforced, /obj/item/flashlight/seclite, @@ -47904,10 +56642,19 @@ /obj/effect/decal/cleanable/dirt{ color = "000000" }, +<<<<<<< Updated upstream /turf/open/floor/f13{ icon_state = "dark" }, /area/f13/brotherhood) +======= +/turf/open/floor/plating/rust, +/area/f13/wasteland) +"oow" = ( +/obj/machinery/seed_extractor, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ooG" = ( /obj/item/trash/f13/steak, /turf/open/indestructible/ground/outside/desert, @@ -48088,6 +56835,13 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"osc" = ( +/obj/machinery/photocopier, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "ose" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -48165,10 +56919,45 @@ icon_state = "verticalinnermain2bottom" }, /area/f13/wasteland) +"otj" = ( +/obj/machinery/light/fo13colored/Red{ + dir = 4 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "otw" = ( +<<<<<<< Updated upstream /obj/structure/table/wood, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +======= +/obj/effect/overlay/desert_side{ + dir = 8 + }, +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_2"; + pixel_x = -6 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 5; + icon_state = "dirt" + }, +/area/f13/wasteland/legion) +"oup" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/item/electropack/shockcollar/explosive, +/obj/item/paper/crumpled{ + pixel_y = 33; + name = "tied crude paper"; + desc = "A piece of paper with a hole near the top, tied to the wooden fence using a leather strip."; + info = "I can't believe it! I can't believe my luck! My collar didn't go off! I'm scot free, the fuckers already left! If you're reading this, my name is Noh Effert. Do NOT go in this place! We dug too deep, horrible things lurk past the large crate wall."; + anchored = 1 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "ouu" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, @@ -48241,6 +57030,20 @@ /obj/effect/validball_spawner, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"ovf" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ovp" = ( /obj/machinery/door/poddoor/shutters{ id = "hospitalgarage1"; @@ -48346,6 +57149,7 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) +<<<<<<< Updated upstream "oxb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood{ @@ -48353,6 +57157,17 @@ }, /turf/open/floor/plating/rust, /area/f13/sewer/powered) +======= +"oxc" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "oxv" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain3" @@ -48384,6 +57199,7 @@ }, /area/f13/ambientlighting/building/m) "oxJ" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/siding/wood{ dir = 1; layer = 1000 @@ -48393,6 +57209,20 @@ }, /turf/open/floor/plasteel/grimy, /area/f13/ncr) +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +"oxQ" = ( +/obj/machinery/smartfridge/bottlerack, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "oya" = ( /obj/structure/table, /obj/item/clothing/suit/armor/tiered/medium/vest/breastplate/scrap/mutie/reinforced, @@ -48457,6 +57287,11 @@ name = "dirty floor" }, /area/f13/building/powered) +"ozt" = ( +/obj/effect/decal/cleanable/shreds, +/obj/machinery/power/floodlight, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "ozw" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/bomb/tier3, @@ -48464,12 +57299,22 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "ozC" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 10 }, /mob/living/simple_animal/hostile/ghoul, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/bed/mattress{ + icon_state = "mattress4"; + pixel_x = -1; + pixel_y = -1 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "ozM" = ( /obj/structure/fence{ dir = 8 @@ -48546,9 +57391,17 @@ /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/wood_common, /area/f13/building/abandoned/z) +<<<<<<< Updated upstream "oAB" = ( /obj/effect/spawner/lootdrop/f13/cash_random_low, /turf/open/floor/plasteel/grimy, +======= +"oAA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/cards/deck, +/obj/item/toy/cards/deck, +/turf/open/floor/plasteel/f13/stone, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "oAV" = ( /obj/structure/railing{ @@ -48604,10 +57457,22 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "oBZ" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/oil/slippery, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, +======= +/obj/effect/decal/remains/human, +/obj/structure/chair/stool{ + dir = 8; + icon_state = "bench"; + pixel_y = 17 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "oCe" = ( /obj/machinery/light{ @@ -48797,6 +57662,7 @@ /turf/closed/wall/f13/tunnel, /area/f13/tunnel/northeast) "oEK" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/siding/wood{ dir = 1; layer = 1000 @@ -48808,6 +57674,13 @@ desc = "It's a floor. Wow." }, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerturn" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "oEL" = ( /obj/structure/flora/junglebush, /turf/open/indestructible/ground/outside/dirt, @@ -48898,6 +57771,17 @@ /obj/structure/railing, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/building/abandoned/l) +"oGh" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/power/port_gen/pacman/diesel{ + anchored = 1 + }, +/obj/item/stack/sheet/mineral/plasma/fifty, +/obj/structure/cable/outdoors{ + icon_state = "0-8" + }, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "oGj" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -48910,6 +57794,10 @@ icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) +"oGp" = ( +/obj/effect/spawner/lootdrop/tool_box, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "oGx" = ( /turf/open/floor/plasteel/vaporwave, /area/maintenance/bar) @@ -48989,9 +57877,33 @@ }, /area/f13/building/tribal) "oHJ" = ( +<<<<<<< Updated upstream /obj/structure/flora/ausbushes/ppflowers, /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) +======= +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/brotherhood) +"oHL" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/floor/wood_common, +/area/f13/wasteland) +>>>>>>> Stashed changes "oHR" = ( /obj/structure/fence{ dir = 4 @@ -49001,6 +57913,7 @@ }, /area/f13/wasteland) "oHU" = ( +<<<<<<< Updated upstream /obj/structure/debris/v2, /turf/open/indestructible/ground/outside/dirt{ dir = 1; @@ -49017,6 +57930,18 @@ /obj/structure/cross, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/closet/crate/trashcart, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/ambientlighting/building/u) +"oHW" = ( +/obj/structure/junk/small/tv{ + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "oHY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -49078,6 +58003,7 @@ icon_state = "common-broken2" }, /area/f13/wasteland) +<<<<<<< Updated upstream "oJc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -49093,6 +58019,13 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +"oJi" = ( +/obj/item/storage/belt/utility/full/engi, +/obj/structure/closet/crate/engineering, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "oJl" = ( /obj/structure/table/wood, /obj/structure/decoration/clock{ @@ -49217,6 +58150,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "oKZ" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -49229,6 +58163,26 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) +======= +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +"oLh" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress2"; + pixel_y = 7 + }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "oLl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -49236,6 +58190,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) "oLn" = ( +<<<<<<< Updated upstream /obj/structure/chair/wood{ dir = 4 }, @@ -49255,12 +58210,31 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +======= +/obj/structure/table, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/item/reagent_containers/medspray/sterilizine, +/obj/item/reagent_containers/medspray/sterilizine, +/obj/item/storage/firstaid/tactical, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "oLu" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 }, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) +"oLv" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_2" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop3" + }, +/area/f13/wasteland) "oLy" = ( /obj/structure/car/rubbish2, /turf/open/indestructible/ground/outside/sidewalk{ @@ -49283,6 +58257,13 @@ icon_state = "greenrustyfull" }, /area/f13/ambientlighting/building/o) +"oLN" = ( +/obj/machinery/door/unpowered/secure_NCR{ + color = "#e8e4ca"; + name = "Captain's Office" + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "oLO" = ( /obj/effect/overlay/desert_side{ dir = 1 @@ -49342,6 +58323,13 @@ icon_state = "housewood2-broken" }, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream +======= +"oMD" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "oML" = ( /turf/open/indestructible/ground/outside/road, /area/f13/ambientlighting/building/y) @@ -49413,6 +58401,20 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"oNu" = ( +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "oNy" = ( /obj/structure/fence/wooden{ dir = 1 @@ -49605,23 +58607,37 @@ }, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +<<<<<<< Updated upstream "oPg" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/sidewalk{ dir = 4; icon_state = "outercorner" }, +======= +"oPo" = ( +/obj/structure/reagent_dispensers/compostbin, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "oPu" = ( /obj/structure/wreck/trash/three_barrels, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "oPv" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ dir = 1 }, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +/obj/structure/obstacle/tanktrap, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "oPz" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -49666,6 +58682,7 @@ /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, /area/f13/clinic) "oPU" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/ruins{ icon_state = "ruinswindowbroken" }, @@ -49673,6 +58690,14 @@ /obj/structure/barricade/wooden/planks/pregame, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +/obj/machinery/light{ + dir = 4; + light_color = "#228B22" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "oPV" = ( /obj/structure/chair/bench{ dir = 4; @@ -49693,10 +58718,21 @@ }, /area/f13/building/powered) "oQd" = ( +<<<<<<< Updated upstream /obj/structure/table/wood/junk, /obj/effect/spawner/lootdrop/f13/cash_random_low, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "oQe" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8 @@ -49879,6 +58915,17 @@ /obj/structure/flora/wasteplant/wild_fungus, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream +======= +"oTi" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/legion_guard{ + faction = list("Legion", "neutral"); + name = "Cattle Guard Barto"; + desc = "A legionary assigned to guard the Legion's cattle and livestock. His name's Barto." + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/legioncamp) +>>>>>>> Stashed changes "oTj" = ( /obj/structure/chair/bench{ dir = 8; @@ -49939,6 +58986,7 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream "oUs" = ( /obj/structure/fence{ dir = 4 @@ -49946,6 +58994,12 @@ /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop0" +======= +"oUk" = ( +/obj/structure/flora/tree/tall, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt" +>>>>>>> Stashed changes }, /area/f13/wasteland) "oUv" = ( @@ -50024,6 +59078,20 @@ /obj/structure/barricade/wooden, /turf/closed/wall/f13/wood/house, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"oVp" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) +"oVz" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/ausbushes/ppflowers{ + pixel_y = 5 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland/legion) +>>>>>>> Stashed changes "oVP" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 8; @@ -50037,10 +59105,32 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/f) +<<<<<<< Updated upstream "oWi" = ( /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +"oWh" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 4; + light_color = "#f4e3b0" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ambientlighting/building/j) +"oWl" = ( +/obj/structure/window/fulltile/house{ + dir = 2; + icon_state = "housewindowvertical" + }, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/bars, +/turf/open/indestructible/ground/outside/desert, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "oWn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, @@ -50052,9 +59142,19 @@ }, /area/f13/underground/cave) "oWA" = ( +<<<<<<< Updated upstream /obj/machinery/light, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "oWB" = ( /obj/structure/sign/flag_america, /turf/closed/wall/mineral/concrete/blastproof, @@ -50101,9 +59201,25 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "oWZ" = ( +<<<<<<< Updated upstream /obj/item/melee/onehanded/slavewhip, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +======= +/obj/machinery/vending/coffee{ + pixel_y = -11 + }, +/obj/machinery/vending/nukacolavend{ + pixel_y = -11; + pixel_x = 31 + }, +/obj/machinery/vending/cigarette{ + pixel_y = -11; + pixel_x = -31 + }, +/turf/closed/wall/f13/store, +/area/f13/building/powered) +>>>>>>> Stashed changes "oXd" = ( /obj/item/reagent_containers/glass/bucket, /obj/machinery/hydroponics/soil, @@ -50162,6 +59278,12 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"oYB" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "oYG" = ( /obj/effect/decal/marking{ icon_state = "dottedhorizontalcorroded" @@ -50212,8 +59334,13 @@ }, /area/f13/brotherhood) "oZf" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/structure/reagent_dispensers/barrel/four, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "oZi" = ( /obj/structure/table, @@ -50296,6 +59423,19 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) +"pay" = ( +/obj/structure/rack/large/shelf_rust{ + dir = 8 + }, +/obj/item/clothing/head/beret/headband, +/obj/item/clothing/head/beret/headband, +/obj/item/clothing/head/beret/headband, +/obj/item/clothing/head/beret/headband, +/obj/item/clothing/under/pants/jeanshort, +/obj/item/clothing/under/pants/jeanshort, +/obj/item/clothing/under/pants/jeanshort, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "paD" = ( /obj/effect/overlay/desert/sonora/edge, /obj/effect/overlay/desert/sonora/edge{ @@ -50306,6 +59446,7 @@ }, /area/f13/wasteland) "paG" = ( +<<<<<<< Updated upstream /obj/structure/fence{ dir = 4 }, @@ -50321,6 +59462,20 @@ }, /turf/open/floor/plasteel/grimy, /area/f13/ncr) +======= +/obj/structure/rack/shelf_metal, +/obj/effect/spawner/lootdrop/tool_box, +/obj/item/salvage/low, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +"paH" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/item/clothing/shoes/ballandchain, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "paL" = ( /obj/structure/decoration/clock/old, /turf/closed/wall/f13/store, @@ -50454,6 +59609,7 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/sidewalkdirt, /area/f13/wasteland/followers) +<<<<<<< Updated upstream "pcH" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/dark, @@ -50464,6 +59620,25 @@ /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, /area/f13/ambientlighting/building/m) +======= +"pcx" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/displaycase/trophy, +/obj/item/toy/gun/justicar, +/obj/structure/fluff/railing, +/obj/structure/fluff/railing{ + dir = 1 + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +"pcH" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) +>>>>>>> Stashed changes "pcZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -50565,12 +59740,15 @@ icon_state = "darkrusty" }, /area/f13/building/abandoned/h) +<<<<<<< Updated upstream "pev" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ icon_state = "housewood4-broken" }, /area/f13/ambientlighting/building/m) +======= +>>>>>>> Stashed changes "peC" = ( /obj/structure/chair/stool/retro/black, /turf/open/indestructible/ground/outside/ruins, @@ -50974,10 +60152,19 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "pjC" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/glass, /obj/effect/overlay/junk/curtain, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "pjF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/booth, @@ -50997,9 +60184,24 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream "pkq" = ( /turf/open/floor/wood_worn, /area/f13/ambientlighting/building/m) +======= +"pko" = ( +/obj/item/trash/can, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2" + }, +/area/f13/wasteland) +"pkq" = ( +/mob/living/simple_animal/hostile/radscorpion/black, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "pks" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -51012,6 +60214,7 @@ /turf/open/floor/plating/dirt/dark, /area/f13/building/abandoned/g) "pkS" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/glass, /obj/structure/fence/corner{ dir = 5 @@ -51020,6 +60223,18 @@ icon_state = "outermaincornerinner"; dir = 1 }, +======= +/obj/effect/decal/cleanable/dirt, +/obj/machinery/chem_master/advanced, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) +"pkU" = ( +/obj/structure/flora/grass/coyote/three, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "pkU" = ( /obj/effect/turf_decal/siding/wood{ @@ -51092,6 +60307,13 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/w) +<<<<<<< Updated upstream +======= +"plu" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "plx" = ( /obj/structure/toilet, /obj/effect/decal/cleanable/dirt{ @@ -51204,6 +60426,16 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"pnq" = ( +/obj/machinery/door/unpowered/secure_NCR{ + color = "#e8e4ca"; + name = "Captain's Lodge" + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "pnt" = ( /obj/structure/fence/cut/medium{ dir = 4 @@ -51225,12 +60457,31 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/q) +"pnN" = ( +/obj/structure/sign/poster/ncr/keep_to_myself{ + desc = "The man. The myth. The unknown NCR Corporal who's photo was taken years ago and is still used today in various NCR camps to encourage proper behavior."; + name = "Satisfactory NCR Poster" + }, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) "pnU" = ( /obj/structure/sign/crosswalk, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerborder" }, /area/f13/wasteland) +"pod" = ( +/obj/structure/shelf_wood, +/obj/item/camera{ + pixel_x = 3; + pixel_y = 11 + }, +/obj/item/camera{ + pixel_x = 3; + pixel_y = 11 + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "pol" = ( /obj/structure/table/booth, /obj/effect/decal/cleanable/dirt{ @@ -51310,6 +60561,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"ppH" = ( +/obj/structure/billboard/ritas, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outercorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ppM" = ( /obj/structure/closet/locker, /obj/item/clothing/under/f13/mechanic, @@ -51320,6 +60581,11 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/m) +"ppU" = ( +/obj/effect/decal/cleanable/robot_debris, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "pqj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -51419,6 +60685,20 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"pqZ" = ( +/obj/item/radio/intercom/retro{ + pixel_x = 31 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +"pre" = ( +/obj/effect/decal/fakelattice, +/obj/structure/grille, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "prt" = ( /obj/structure/table/booth, /obj/effect/decal/cleanable/dirt{ @@ -51432,6 +60712,11 @@ }, /turf/open/floor/carpet/purple, /area/f13/bar) +"pru" = ( +/obj/item/crowbar/smithed, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) "prv" = ( /obj/item/reagent_containers/food/snacks/meat/slab/human/ghoul, /obj/effect/decal/cleanable/blood/gibs/human/limb, @@ -51465,6 +60750,10 @@ color = "#c5bab2" }, /area/f13/building/abandoned/p) +"prW" = ( +/obj/effect/decal/cleanable/vomit, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "psg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/chem_master/advanced, @@ -51474,10 +60763,16 @@ }, /area/f13/ambientlighting/building/m) "psk" = ( +<<<<<<< Updated upstream /obj/structure/junk/small/disco, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) +======= +/obj/effect/turf_decal/vg_decals/department/hop, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "psn" = ( /obj/structure/chair/wood, /turf/open/indestructible/ground/outside/sidewalk{ @@ -51523,6 +60818,15 @@ icon_state = "wasteland33" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"psL" = ( +/obj/structure/closet/crate/freezer/blood/anchored, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "psM" = ( /obj/structure/closet/crate/bin/trashbin, /obj/effect/overlay/desert/sonora/edge{ @@ -51549,6 +60853,14 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream +======= +"ptb" = ( +/obj/machinery/vending/cigarette, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ptd" = ( /obj/structure/nest/gecko, /turf/open/indestructible/ground/outside/dirt, @@ -51717,6 +61029,15 @@ /obj/structure/wreck/trash/machinepiletwo, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland/town) +<<<<<<< Updated upstream +======= +"pvt" = ( +/obj/item/storage/trash_stack{ + icon_state = "Junk_3" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "pvy" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -51784,12 +61105,20 @@ }, /area/f13/wasteland) "pwi" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/structure/rack/large/shelf_rust, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, /area/f13/ambientlighting/building/m) +======= +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "pwv" = ( /obj/structure/rack, /obj/item/locked_box/weapon/ammo/tier4, @@ -51846,6 +61175,7 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream "pxT" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" @@ -51864,7 +61194,23 @@ pixel_x = 16 }, /turf/closed/mineral/random, +======= +"pxK" = ( +/obj/structure/fence{ + dir = 4 + }, +/obj/structure/obstacle/barbedwire{ + dir = 4; + pixel_y = 16 + }, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) +"pxT" = ( +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/wooden, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) "pyb" = ( /obj/structure/wreck/trash/engine, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -51942,6 +61288,7 @@ /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) "pyY" = ( +<<<<<<< Updated upstream /obj/structure/statue/petrified, /obj/item/clothing/under/sailordress, /obj/item/clothing/head/f13/hairband{ @@ -51951,11 +61298,29 @@ /obj/item/clothing/head/wig, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "verticaloutermainbottom" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "pze" = ( /obj/structure/car/rubbish4, /obj/effect/decal/cleanable/glass, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ambientlighting/building/x) +<<<<<<< Updated upstream +======= +"pzj" = ( +/obj/effect/turf_decal/big{ + dir = 6 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "pzp" = ( /turf/closed/indestructible/rock{ desc = "A pre-War wall made of solid concrete."; @@ -51965,6 +61330,7 @@ name = "Concrete wall"; smooth = 1 }, +<<<<<<< Updated upstream /area/f13/casino) "pzq" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -51989,6 +61355,17 @@ dir = 5 }, /turf/open/floor/plating/f13/inside/gravel, +======= +/area/f13/wasteland) +"pzF" = ( +/obj/structure/chair/wood{ + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "pzG" = ( /obj/effect/decal/cleanable/greenglow, @@ -52061,6 +61438,17 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"pBl" = ( +/obj/item/clockwork/alloy_shards{ + name = "rocks"; + desc = "Rocks. Mindblowing."; + anchored = 1 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "pBm" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/grass/dirtpath{ @@ -52084,6 +61472,7 @@ }, /turf/closed/wall/f13/tentwall, /area/f13/building/tribal) +<<<<<<< Updated upstream "pBr" = ( /obj/structure/cable/outdoors{ icon_state = "4-8" @@ -52097,6 +61486,22 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +======= +"pBu" = ( +/obj/structure/fluff/rails{ + icon_state = "rails-b1"; + pixel_y = 11; + pixel_x = -3 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"pBx" = ( +/obj/structure/rack/large/shelf_rust, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/dice, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "pBN" = ( /obj/structure/simple_door/tentflap_cloth{ pixel_y = -5 @@ -52148,6 +61553,26 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"pCD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/wood{ + dir = 8 + }, +/mob/living/simple_animal/hostile/renegade/soldier, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +"pCE" = ( +/obj/structure/chair/wood/wings{ + dir = 4 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "pCM" = ( /obj/item/storage/trash_stack, /obj/effect/decal/cleanable/dirt, @@ -52171,6 +61596,18 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"pDb" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "pDe" = ( /obj/structure/barricade/tentclothedge{ dir = 4 @@ -52186,6 +61623,11 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +"pDs" = ( +/obj/structure/table, +/obj/item/radio, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "pDQ" = ( /obj/structure/table/reinforced, /turf/open/indestructible/ground/inside/mountain, @@ -52204,6 +61646,7 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/q) "pDW" = ( +<<<<<<< Updated upstream /obj/effect/spawner/lootdrop/f13/crafting, /obj/effect/decal/cleanable/blood{ icon_state = "tracks" @@ -52211,6 +61654,10 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain0" }, +======= +/obj/structure/sign/warning/securearea, +/turf/closed/wall/mineral/brick, +>>>>>>> Stashed changes /area/f13/wasteland) "pEa" = ( /obj/effect/spawner/lootdrop/f13/weapon/melee/tier2, @@ -52232,6 +61679,20 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"pEx" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "pEQ" = ( /obj/machinery/light{ dir = 4 @@ -52262,6 +61723,7 @@ }, /area/f13/ambientlighting/building/b) "pFb" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/desert, /area/f13/ambientlighting/building/j) "pFi" = ( @@ -52271,6 +61733,24 @@ /obj/effect/overlay/desert/sonora/edge{ dir = 4 }, +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) +"pFi" = ( +/obj/item/flag/legion, +/turf/closed/wall/f13/wood/house/broken, +/area/f13/legioncamp) +"pFj" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/legion_extractor, +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "pFl" = ( @@ -52325,6 +61805,7 @@ /turf/open/indestructible/ground/outside/desert, /area/maintenance/bar) "pFP" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ dir = 1 }, @@ -52341,10 +61822,36 @@ }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +======= +/obj/structure/junk/small/table, +/obj/item/stack/sheet/mineral/wood, +/obj/structure/flora/twig3, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "pFV" = ( /obj/structure/flora/ausbushes/reedbush, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"pFZ" = ( +/obj/item/trash/candy, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) +"pGf" = ( +/obj/effect/overlay/desert_side, +/obj/structure/barricade/wooden, +/obj/structure/fence{ + dir = 1 + }, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland/legion) +>>>>>>> Stashed changes "pGg" = ( /turf/open/indestructible/ground/outside/road, /area/f13/ambientlighting/building/g) @@ -52413,13 +61920,23 @@ /obj/effect/landmark/poster_spawner/prewar, /turf/closed/indestructible/f13vaultrusted, /area/f13/building/powered) +"pHO" = ( +/obj/effect/decal/cleanable/crayon, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) "pHY" = ( +<<<<<<< Updated upstream /obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, /obj/item/clothing/under/suit_jacket/tan, /obj/item/clothing/shoes/laceup, /obj/item/clothing/glasses/hud/diagnostic/sunglasses, /turf/open/floor/plasteel/vaporwave, +======= +/obj/effect/decal/cleanable/glass, +/obj/structure/closet/crate/bin/trashbin, +/turf/open/floor/wood_wide, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "pHZ" = ( /obj/structure/reagent_dispensers/barrel/three, @@ -52528,6 +62045,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/f13/ambientlighting/building/y) +<<<<<<< Updated upstream +======= +"pJs" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/remains/human, +/obj/item/clothing/under/f13/jamrock, +/obj/item/clothing/shoes/f13/jamrock, +/obj/item/clothing/suit/armor/outfit/jacket/jamrock, +/turf/open/floor/plasteel/vaporwave, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "pJu" = ( /obj/effect/turf_decal/delivery, /mob/living/simple_animal/hostile/supermutant, @@ -52612,6 +62140,14 @@ icon_state = "housewood2" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"pKu" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/poster/prewar/poster69, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "pKv" = ( /obj/effect/decal/cleanable/greenglow{ pixel_x = -8; @@ -52698,6 +62234,14 @@ }, /turf/open/floor/wood_fancy, /area/f13/building/abandoned/x) +"pLl" = ( +/obj/item/storage/trash_stack{ + icon_state = "Junk_9"; + pixel_x = 2; + pixel_y = 19 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "pLm" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/indestructible/ground/outside/dirt, @@ -52829,6 +62373,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "pMr" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/underlayer{ layer = 6 }, @@ -52847,6 +62392,17 @@ icon_state = "wide-broken1" }, /area/f13/ambientlighting/building/m) +======= +/obj/structure/table/booth, +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "pMH" = ( /obj/structure/fence/wooden{ dir = 4; @@ -52857,6 +62413,7 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream "pMS" = ( /obj/structure/table/booth, /obj/effect/decal/cleanable/dirt, @@ -52866,6 +62423,12 @@ name = "wooden floor"; desc = "It's a floor. Wow." }, +======= +"pMM" = ( +/obj/item/chair/stool/brass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "pMT" = ( /obj/structure/reagent_dispensers/barrel/dangerous, @@ -52921,6 +62484,7 @@ icon_state = "outerbordercorner" }, /area/f13/wasteland) +<<<<<<< Updated upstream "pNV" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -52929,6 +62493,18 @@ }, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +"pOa" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + layer = 1000 + }, +/obj/structure/filingcabinet{ + layer = 10000 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "pOe" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -52937,11 +62513,40 @@ /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +<<<<<<< Updated upstream "pOm" = ( /obj/effect/decal/fakelattice, /obj/effect/decal/remains/human, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +"pOi" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +"pOj" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +"pOm" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress2"; + pixel_y = 5 + }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "pOy" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/trash_stack, @@ -52964,6 +62569,13 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/m) +"pOL" = ( +/obj/structure/bedsheetbin/empty, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "pOM" = ( /obj/structure/barricade/bars, /obj/structure/table/reinforced, @@ -53056,6 +62668,7 @@ /turf/open/indestructible/ground/outside/road, /area/f13/tunnel/northeast) "pQD" = ( +<<<<<<< Updated upstream /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" }, @@ -53079,12 +62692,21 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/generic, +/obj/item/storage/trash_stack{ + pixel_y = 17 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "pQZ" = ( /obj/structure/fence/corner{ dir = 4 }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland/followers) +<<<<<<< Updated upstream "pRi" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -53099,6 +62721,16 @@ /obj/structure/table_frame/wood, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +"pRo" = ( +/mob/living/simple_animal/hostile/renegade/defender, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "pRs" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/simple_door/tent, @@ -53205,6 +62837,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +"pTi" = ( +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "pTk" = ( /obj/structure/fireplace, /turf/open/floor/wood_common{ @@ -53240,6 +62881,15 @@ /obj/structure/simple_door/metal/iron, /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) +"pTK" = ( +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleftbottom" + }, +/area/f13/wasteland) "pTO" = ( /obj/structure/obstacle/barbedwire/end{ pixel_x = -5 @@ -53278,6 +62928,13 @@ /obj/structure/cross, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +"pUf" = ( +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/cloth/ten, +/obj/item/stack/sheet/glass/ten, +/obj/item/stack/sheet/metal/ten, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "pUq" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/vending/bigredvend, @@ -53327,15 +62984,37 @@ }, /turf/open/floor/wood_common, /area/maintenance/bar) +"pVd" = ( +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge{ + pixel_y = -14; + layer = 5 + }, +/obj/structure/railing/wood/underlayer{ + layer = 6 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) "pVs" = ( +<<<<<<< Updated upstream /obj/machinery/door/locked/easy/maybe_trapped, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/structure/wreck/trash/autoshaft, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "pVt" = ( /obj/effect/decal/cleanable/insectguts, /obj/item/reagent_containers/pill/patch/jet, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +<<<<<<< Updated upstream "pVA" = ( /obj/structure/junk/cabinet, /obj/effect/decal/cleanable/dirt, @@ -53359,6 +63038,17 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +"pVG" = ( +/obj/structure/chair/stool/retro/backed{ + dir = 1 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"pVI" = ( +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ncr) +>>>>>>> Stashed changes "pVT" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, @@ -53494,9 +63184,13 @@ }, /area/f13/building/powered) "pXt" = ( +<<<<<<< Updated upstream /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_3" }, +======= +/obj/structure/closet/crate/trashcart, +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "pXw" = ( @@ -53506,6 +63200,7 @@ icon_state = "outerborder" }, /area/f13/wasteland) +<<<<<<< Updated upstream "pXA" = ( /obj/machinery/door/unpowered/secure_NCR, /obj/structure/cable/outdoors{ @@ -53521,6 +63216,26 @@ "pXK" = ( /turf/open/indestructible, /area/f13/tcoms) +======= +"pXy" = ( +/obj/structure/simple_door/house, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +"pXK" = ( +/turf/open/indestructible, +/area/f13/tcoms) +"pXN" = ( +/obj/structure/flora/twig3, +/obj/structure/barricade/wooden, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +"pXQ" = ( +/obj/item/construction/rcd, +/obj/structure/rack/shelf_metal, +/obj/effect/decal/fakelattice, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "pXT" = ( /obj/effect/turf_decal, /obj/effect/decal/cleanable/dirt, @@ -53606,6 +63321,19 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/f) +<<<<<<< Updated upstream +======= +"pYD" = ( +/obj/structure/flora/rock/pile/largejungle, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "pYT" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/glass{ @@ -53684,6 +63412,14 @@ icon_state = "verticalrightborderright1" }, /area/f13/wasteland) +"qad" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/chem_dispenser, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "qae" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/vault_floor/misc/cmo, @@ -53698,6 +63434,15 @@ "qas" = ( /turf/open/indestructible/ground/outside/sidewalk, /area/f13/building/abandoned/m) +<<<<<<< Updated upstream +======= +"qav" = ( +/obj/structure/simple_door/metal/dirtystore, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "qax" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4"; @@ -53738,11 +63483,21 @@ /turf/open/floor/plating/rust, /area/f13/followers) "qaQ" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/structure/barricade/wooden, /obj/structure/barricade/bars, /turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) +======= +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "qaS" = ( /obj/structure/chair/office{ dir = 8 @@ -53771,6 +63526,7 @@ /obj/effect/overlay/desert_side, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +<<<<<<< Updated upstream "qbf" = ( /obj/structure/fence{ dir = 1 @@ -53778,6 +63534,15 @@ /turf/open/indestructible/ground/outside/dirt{ dir = 1; icon_state = "dirtcorner" +======= +"qbd" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outermaincornerouter" +>>>>>>> Stashed changes }, /area/f13/wasteland) "qbk" = ( @@ -53857,6 +63622,13 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"qcr" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/cargocrate, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "qcu" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/outside/dirt{ @@ -53904,6 +63676,7 @@ /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream "qcJ" = ( /obj/effect/decal/cleanable/ash, /obj/effect/decal/cleanable/dirt, @@ -53914,6 +63687,16 @@ /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +"qcV" = ( +/obj/effect/decal/fakelattice, +/obj/structure/car/rubbish2{ + pixel_x = 1; + pixel_y = 18 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "qcW" = ( /obj/structure/flora/ausbushes/ppflowers{ pixel_y = 5 @@ -53986,6 +63769,15 @@ }, /turf/closed/wall/f13/tunnel, /area/f13/wasteland/town) +"qed" = ( +/obj/structure/curtain{ + color = "#363636" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) "qeg" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/dirt, @@ -53998,6 +63790,7 @@ }, /area/f13/building/abandoned/t) "qen" = ( +<<<<<<< Updated upstream /obj/structure/fluff/hedge, /obj/structure/decoration/rag{ icon_state = "flag_ncr"; @@ -54006,10 +63799,34 @@ }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/ncr) +======= +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "qes" = ( /obj/structure/simple_door/glass, /turf/open/floor/f13/wood, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"qeK" = ( +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +"qeM" = ( +/obj/structure/flora/rock/jungle, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "qeX" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 1 @@ -54064,6 +63881,20 @@ icon_state = "bluedirtychess2" }, /area/f13/brotherhood) +"qgf" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner" + }, +/area/f13/wasteland) "qgh" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt/dust, @@ -54164,6 +63995,7 @@ }, /area/f13/wasteland) "qgV" = ( +<<<<<<< Updated upstream /obj/structure/rack/large/shelf_rust{ dir = 8 }, @@ -54186,6 +64018,31 @@ /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded"; pixel_x = -14 +======= +/obj/effect/decal/cleanable/ash, +/obj/item/clothing/mask/cigarette/cigar/ncr, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +"qhb" = ( +/obj/structure/closet/crate/bin/trashbin{ + pixel_x = 6 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland/legion) +"qhm" = ( +/mob/living/simple_animal/hostile/renegade/soldier, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +"qhs" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 8; + light_color = "#f4e3b0" +>>>>>>> Stashed changes }, /obj/structure/junk/locker, /turf/open/indestructible/ground/outside/road{ @@ -54264,10 +64121,24 @@ }, /area/f13/ambientlighting/building/o) "qil" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) +>>>>>>> Stashed changes "qio" = ( /obj/effect/turf_decal, /obj/structure/rack/shelf_metal, @@ -54276,6 +64147,13 @@ /obj/item/clothing/glasses/welding, /turf/open/indestructible/ground/outside/road, /area/engine/workshop) +<<<<<<< Updated upstream +======= +"qiE" = ( +/obj/structure/billboard/poseidenenergy2, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "qiF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/marking, @@ -54310,10 +64188,30 @@ /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/grass/dirtpath, /area/f13/ambientlighting/building/t) +<<<<<<< Updated upstream "qjd" = ( /obj/structure/window/fulltile/wood/broken, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +"qjb" = ( +/obj/item/radio{ + name = "walkie talkie" + }, +/obj/item/radio{ + name = "walkie talkie" + }, +/obj/item/radio{ + name = "walkie talkie" + }, +/obj/structure/shelf_wood, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +"qjd" = ( +/obj/structure/table/booth, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "qjm" = ( /obj/structure/car/rubbish1, /turf/open/indestructible/ground/outside/road{ @@ -54322,6 +64220,7 @@ }, /area/f13/wasteland) "qjq" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/shreds, /obj/effect/spawner/lootdrop/f13/cash_random_med, @@ -54331,6 +64230,14 @@ /obj/effect/spawner/lootdrop/f13/blueprintMid, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "qjr" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/bomb/tier2, @@ -54452,6 +64359,14 @@ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) +"qkX" = ( +/obj/item/kirbyplants{ + icon_state = "plant-12"; + pixel_y = 21; + pixel_x = -14 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "qla" = ( /obj/structure/fence/door{ dir = 4 @@ -54462,6 +64377,20 @@ /obj/effect/overlay/desert_side, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"qlb" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris1" + }, +/obj/effect/decal/fakelattice, +/obj/effect/overlay/desert/sonora/edge{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "qlf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -54491,6 +64420,16 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream +======= +"qlk" = ( +/obj/effect/decal/cleanable/generic, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "qln" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/sidewalk{ @@ -54526,6 +64465,7 @@ }, /area/f13/ambientlighting/building/i) "qlZ" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -54534,11 +64474,19 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outercorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "qma" = ( /obj/structure/sign/departments/medbay, /turf/closed/wall/rust, /area/f13/clinic) "qmb" = ( +<<<<<<< Updated upstream /obj/structure/fence{ dir = 1 }, @@ -54555,6 +64503,11 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/effect/overlay/desert/sonora/edge, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "qmd" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks, @@ -54569,11 +64522,36 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"qmf" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) "qmg" = ( +<<<<<<< Updated upstream /obj/structure/wreck/car/bike, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain2left" }, +======= +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/leather/twenty, +/obj/item/stack/sheet/mineral/concrete/ten, +/obj/item/stack/sheet/mineral/limestone/ten, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/wasteland) "qmh" = ( /obj/effect/overlay/desert_side{ @@ -54618,6 +64596,15 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +<<<<<<< Updated upstream +======= +"qmW" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "qmY" = ( /obj/structure/table, /obj/machinery/light{ @@ -54659,6 +64646,7 @@ }, /area/f13/wasteland/town) "qnM" = ( +<<<<<<< Updated upstream /obj/effect/spawner/lootdrop/wastelootgood, /turf/open/floor/f13{ icon_state = "yellowrustyfull" @@ -54672,6 +64660,23 @@ "qnY" = ( /turf/closed/indestructible/f13/matrix, /area/f13/tunnel/northeast) +======= +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"qnY" = ( +/turf/closed/indestructible/f13/matrix, +/area/f13/tunnel/northeast) +"qob" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "qoc" = ( /obj/structure/fence/door, /turf/open/indestructible/ground/outside/sidewalk, @@ -54699,11 +64704,19 @@ }, /area/f13/building/abandoned/h) "qoG" = ( +<<<<<<< Updated upstream /obj/effect/decal/remains/deadeyebot, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +======= +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "qoM" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/poppy/broc, @@ -54795,11 +64808,20 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "qpU" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden/planks/pregame, /obj/structure/simple_door/brokenglass, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +/obj/item/storage/trash_stack, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "qqh" = ( /obj/structure/table, /turf/open/indestructible/ground/outside/road{ @@ -54817,6 +64839,21 @@ }, /turf/open/floor/f13/wood, /area/f13/building/abandoned) +<<<<<<< Updated upstream +======= +"qqz" = ( +/obj/structure/flora/grass/coyote/one, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"qqH" = ( +/obj/machinery/door/unpowered/secure_bos, +/turf/open/floor/f13{ + color = "#ffe9de"; + icon_state = "darkrusty"; + name = "dirty floor" + }, +/area/f13/brotherhood) +>>>>>>> Stashed changes "qqM" = ( /obj/effect/decal/cleanable/blood/splats, /turf/open/indestructible/ground/inside/mountain, @@ -54826,6 +64863,7 @@ /obj/item/stack/sheet/metal/five, /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) +<<<<<<< Updated upstream "qrg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/displaycase/trophy, @@ -54835,6 +64873,24 @@ dir = 1 }, /turf/open/floor/carpet/arcade, +======= +"qrd" = ( +/obj/structure/fence{ + dir = 1; + icon_state = "straight" + }, +/turf/open/indestructible/ground/inside/dirt, +/area/f13/wasteland) +"qrf" = ( +/obj/structure/wreck/trash/three_barrels, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +"qrg" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/f13/stone, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "qrC" = ( /obj/structure/barricade/wooden, @@ -54849,6 +64905,13 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"qrK" = ( +/obj/structure/obstacle/tanktrap, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "qrP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -54966,6 +65029,11 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) +"qsZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/human, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) "qtg" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/open/indestructible/ground/outside/dirt, @@ -55156,7 +65224,13 @@ }, /area/f13/wasteland) "qwc" = ( +<<<<<<< Updated upstream /obj/item/flag/ncr, +======= +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "qwi" = ( @@ -55195,7 +65269,11 @@ /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; +<<<<<<< Updated upstream pixel_y = -4; +======= + pixel_y = 24; +>>>>>>> Stashed changes pixel_x = 16 }, /turf/open/indestructible/ground/inside/mountain, @@ -55298,11 +65376,23 @@ /area/f13/wasteland) "qyt" = ( /obj/structure/car/rubbish2{ +<<<<<<< Updated upstream icon_state = "car_rubish3" }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft0" }, +======= + pixel_x = 7; + pixel_y = -16 + }, +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "qyu" = ( /obj/effect/turf_decal/stripes/white/line, @@ -55311,6 +65401,7 @@ }, /area/f13/building/powered) "qyx" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/oil/slippery, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, @@ -55319,6 +65410,15 @@ /mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, /turf/open/floor/plasteel/grimy, /area/f13/ncr) +======= +/obj/effect/overlay/rockfloor_side{ + dir = 1 + }, +/obj/item/melee/onehanded/knife/bayonet, +/obj/item/gun/ballistic/automatic/assault_carbine/policerifle, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "qyB" = ( /obj/structure/chair/comfy, /obj/item/clothing/under/f13/bennys/gang, @@ -55381,8 +65481,16 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "qzi" = ( +<<<<<<< Updated upstream /obj/structure/chair/stool/retro/backed, /turf/open/floor/wood_fancy, +======= +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/trash_stack{ + icon_state = "trash_2" + }, +/turf/open/floor/carpet/arcade, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "qzm" = ( /obj/structure/flora/twig, @@ -55406,9 +65514,20 @@ }, /area/f13/building/lower_firetower) "qzy" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/structure/sign/poster/prewar/poster60, /turf/closed/wall/f13/ruins, +======= +/obj/structure/statue/petrified, +/obj/item/clothing/under/sailordress, +/obj/item/clothing/head/f13/hairband{ + pixel_y = 6; + layer = 5 + }, +/obj/item/clothing/head/wig, +/turf/open/floor/plasteel/grimy, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "qzA" = ( /turf/open/indestructible/ground/outside/sidewalk{ @@ -55518,6 +65637,7 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) "qAP" = ( +<<<<<<< Updated upstream /obj/structure/table/booth, /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/sidewalk{ @@ -55528,6 +65648,16 @@ /obj/structure/table/wood/junk, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +/obj/machinery/smartfridge/bottlerack{ + pixel_x = 3 + }, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "qBg" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, @@ -55571,6 +65701,20 @@ icon_state = "outerpavementcorner" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"qBX" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +"qBY" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "qCb" = ( /obj/structure/fence/wooden{ pixel_x = -15 @@ -55578,6 +65722,7 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "qCk" = ( +<<<<<<< Updated upstream /obj/structure/fence{ dir = 1 }, @@ -55588,6 +65733,13 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +======= +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "qCl" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -55619,6 +65771,21 @@ /obj/structure/chair/pew/left, /turf/open/floor/wood_common/wood_common_dark, /area/f13/building/abandoned/m) +<<<<<<< Updated upstream +======= +"qCz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "qCH" = ( /obj/structure/fence{ dir = 4 @@ -55636,6 +65803,7 @@ icon_state = "floordirty" }, /area/f13/building/powered) +<<<<<<< Updated upstream "qCP" = ( /obj/structure/cargocrate{ pixel_y = 32 @@ -55645,6 +65813,13 @@ }, /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, /area/f13/building/powered) +======= +"qCJ" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/cobweb, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "qCQ" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -55654,6 +65829,7 @@ }, /area/f13/ambientlighting/building/b) "qDa" = ( +<<<<<<< Updated upstream /obj/structure/fence{ dir = 4 }, @@ -55662,7 +65838,30 @@ /turf/open/indestructible/ground/outside/dirt{ dir = 1; icon_state = "dirt" +======= +/obj/structure/decoration/warning, +/turf/closed/wall/r_wall, +/area/f13/wasteland) +"qDl" = ( +/obj/machinery/smartfridge/bottlerack/gardentool/primitive, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/l4z, +/obj/item/reagent_containers/glass/bottle/nutrient/l4z, +/obj/item/reagent_containers/glass/bottle/nutrient/l4z, +/obj/item/reagent_containers/glass/bottle/nutrient/l4z, +/obj/item/reagent_containers/glass/bottle/nutrient/rh, +/obj/item/reagent_containers/glass/bottle/nutrient/rh, +/obj/item/reagent_containers/glass/bottle/nutrient/rh, +/obj/item/reagent_containers/glass/bottle/nutrient/rh, +/obj/item/reagent_containers/glass/bottle/nutrient/rh, +/obj/structure/cable/outdoors{ + icon_state = "1-2" +>>>>>>> Stashed changes }, +/turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "qDl" = ( /obj/item/melee/onehanded/knife/hunting, @@ -55696,12 +65895,18 @@ /turf/open/floor/plasteel/neutral, /area/f13/clinic) "qDT" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood/tracks{ dir = 4 }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop0" }, +======= +/obj/effect/turf_decal/sand/plating, +/obj/structure/reagent_dispensers/foamtank, +/turf/open/floor/plating/f13, +>>>>>>> Stashed changes /area/f13/wasteland) "qEb" = ( /obj/structure/spacevine, @@ -55716,6 +65921,7 @@ /obj/effect/overlay/desert_side{ dir = 1 }, +<<<<<<< Updated upstream /mob/living/simple_animal/cow/brahmin, /turf/open/indestructible/ground/outside/dirt, /area/f13/legioncamp) @@ -55729,6 +65935,43 @@ /obj/effect/spawner/structure/window/reinforced/indestructable, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +======= +/obj/effect/decal/cleanable/generic{ + pixel_x = -8; + pixel_y = 12 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 2; + icon_state = "dirt" + }, +/area/f13/wasteland/legion) +"qEp" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) +"qEt" = ( +/turf/closed/wall/f13/wood/house, +/area/maintenance/bar) +"qEv" = ( +/obj/item/megaphone, +/obj/structure/table/wood/junk, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = -8; + pixel_y = 7 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "qEI" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt{ @@ -55771,6 +66014,13 @@ /obj/structure/debris/v2, /turf/open/floor/plating/rust, /area/f13/wasteland) +"qFc" = ( +/obj/effect/decal/cleanable/oil{ + icon_state = "floor5" + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "qFp" = ( /obj/structure/chair/booth{ dir = 8 @@ -55788,11 +66038,23 @@ /turf/open/floor/carpet/purple, /area/f13/bar) "qFu" = ( +<<<<<<< Updated upstream /obj/structure/kitchenspike, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/gibspawner/human/bodypartless, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/displaycase/trophy, +/obj/item/toy/plush/bird, +/obj/structure/fluff/railing, +/obj/structure/fluff/railing{ + dir = 1 + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "qFA" = ( /obj/structure/closet/crate/large, /obj/item/ammo_box/a308box/improvised, @@ -55874,14 +66136,43 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "qHg" = ( /obj/machinery/autolathe, /turf/open/floor/wood_common/wood_common_light, /area/f13/ncr) +======= +"qGO" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) +"qHj" = ( +/obj/item/radio/intercom/retro{ + pixel_y = 32 + }, +/obj/machinery/camera/autoname{ + pixel_x = 27 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "qHs" = ( /obj/structure/bed/dogbed, /turf/open/floor/f13/wood, /area/f13/building/abandoned/b) +<<<<<<< Updated upstream +======= +"qHt" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "qHu" = ( /obj/item/clothing/head/helmet/f13/combat/mk2/legion, /obj/item/clothing/suit/armor/tiered/medium/combat/mk2/legion, @@ -55895,12 +66186,15 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream "qHy" = ( /obj/structure/cable/outdoors{ icon_state = "2-8" }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "qHD" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 5 @@ -55944,6 +66238,7 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/x) "qIr" = ( +<<<<<<< Updated upstream /obj/item/stack/f13Cash/random/denarius/high, /obj/item/stack/f13Cash/random/aureus/low, /obj/item/rack_parts, @@ -55952,6 +66247,9 @@ pixel_x = -18; pixel_y = 15 }, +======= +/obj/effect/decal/remains/human, +>>>>>>> Stashed changes /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "qIt" = ( @@ -56012,6 +66310,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) "qJO" = ( +<<<<<<< Updated upstream /obj/structure/sign/legion/mines{ pixel_y = 51; layer = 100 @@ -56024,6 +66323,12 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/effect/overlay/desert/sonora/edge, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/floor/wood_common, +/area/f13/wasteland) +>>>>>>> Stashed changes "qJZ" = ( /obj/machinery/door/airlock/medical/glass{ name = "Chemistry Lab"; @@ -56034,6 +66339,7 @@ }, /area/f13/followers) "qKf" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -56057,6 +66363,22 @@ }, /turf/closed/mineral/random/low_chance, /area/f13/caves) +======= +/obj/structure/barricade/wooden, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) +"qKl" = ( +/turf/open/floor/plating/f13/inside/gravel/edge{ + dir = 5 + }, +/area/f13/wasteland) +"qKm" = ( +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "qKt" = ( /obj/effect/landmark/start/f13/tribal, /turf/open/indestructible/ground/outside/dirt, @@ -56190,13 +66512,29 @@ name = "dirty floor" }, /area/f13/building/powered) +"qMj" = ( +/obj/structure/table/booth, +/obj/item/reagent_containers/food/drinks/coffee, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "qMo" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/oil{ icon_state = "floor5" }, /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "qMs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -56226,11 +66564,20 @@ /obj/structure/decoration/rag, /turf/closed/mineral/random/low_chance, /area/f13/wasteland) +<<<<<<< Updated upstream "qMM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/wastelootgood, /turf/open/floor/plasteel/rockvault/alien, /area/f13/ambientlighting/building/m) +======= +"qMR" = ( +/obj/structure/wreck/trash/machinepile, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "qMU" = ( /obj/structure/bed/mattress{ icon_state = "mattress2"; @@ -56243,6 +66590,15 @@ /obj/structure/sign/legion/records, /turf/closed/wall/mineral/wood, /area/f13/legioncamp) +"qNe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/obj/effect/spawner/lootdrop/f13/medical/vault/meds, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "qNu" = ( /obj/structure/chair/bench{ dir = 4; @@ -56302,10 +66658,25 @@ /turf/open/floor/wood_common/wood_common_light, /area/f13/building/powered) "qOr" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/flora/grass/coyote/twelve, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"qOs" = ( +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "qOw" = ( /obj/structure/simple_door/house, /turf/open/floor/f13, @@ -56327,6 +66698,15 @@ icon_state = "housewood1-broken" }, /area/f13/ambientlighting/building/d) +<<<<<<< Updated upstream +======= +"qOK" = ( +/obj/machinery/light{ + pixel_x = 16 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "qOP" = ( /obj/structure/flora/grass/jungle/b{ icon_state = "busha" @@ -56334,6 +66714,7 @@ /turf/open/indestructible/ground/outside/savannah, /area/f13/wasteland) "qOV" = ( +<<<<<<< Updated upstream /obj/structure/rack/shelf_metal, /obj/item/salvage/low, /obj/item/salvage/low, @@ -56368,6 +66749,29 @@ /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/table/wood, +/obj/item/melee/onehanded/knife/ritualdagger, +/turf/open/floor/f13/wood, +/area/f13/legioncamp) +"qOX" = ( +/obj/structure/sign/poster/prewar/vault_tec, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +"qPa" = ( +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18 + }, +/obj/item/stack/sheet/hay/twenty, +/obj/item/stack/sheet/hay/twenty, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/mineral/limestone/ten, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "qPb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light, @@ -56382,8 +66786,23 @@ }, /area/f13/building/powered) "qPf" = ( +<<<<<<< Updated upstream /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/low, /turf/open/indestructible/ground/outside/dirt, +======= +/obj/structure/rack/shelf_metal, +/obj/item/salvage/tool, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +"qPh" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/inside/mountain, +>>>>>>> Stashed changes /area/f13/caves) "qPo" = ( /obj/item/flag/legion, @@ -56428,6 +66847,18 @@ "qPR" = ( /turf/open/indestructible/ground/outside/water, /area/f13/underground/cave) +<<<<<<< Updated upstream +======= +"qPS" = ( +/obj/structure/chair/stool{ + dir = 1; + icon_state = "bench" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "qPW" = ( /obj/structure/obstacle/barbedwire/end{ dir = 1; @@ -56450,12 +66881,21 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +"qQz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "qQH" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/wreck/trash/three_barrels, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream "qQM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack/large/shelf_rust{ @@ -56465,6 +66905,16 @@ /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, /area/f13/ambientlighting/building/m) +======= +"qQI" = ( +/obj/structure/fluff/hedge, +/obj/machinery/light/small{ + dir = 8; + pixel_y = -7 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "qQN" = ( /obj/structure/table/wood/bar, /turf/open/indestructible/ground/outside/sidewalk{ @@ -56550,6 +67000,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"qRS" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/chair/sofa/left{ + color = "#475340"; + dir = 4; + pixel_x = 5 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "qRT" = ( /obj/structure/tires/five, /turf/open/indestructible/ground/outside/dirt, @@ -56606,6 +67068,7 @@ }, /area/f13/wasteland/city) "qSB" = ( +<<<<<<< Updated upstream /obj/structure/fence/corner{ dir = 5 }, @@ -56615,6 +67078,14 @@ /obj/structure/flora/brushwoodalt, /turf/closed/wall/mineral/brick, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "qSQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -56646,6 +67117,7 @@ icon_state = "greenrustyfull" }, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream "qTD" = ( /obj/effect/turf_decal/big{ dir = 4 @@ -56654,6 +67126,22 @@ icon_state = "verticalinnermain0" }, /area/f13/ncr) +======= +"qTx" = ( +/obj/item/trash/f13/tin_large, +/obj/structure/car/rubbish3{ + pixel_x = -14; + pixel_y = 6 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +"qTE" = ( +/obj/item/trash/f13/dog, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "qTG" = ( /obj/structure/wreck/trash/halftire, /turf/open/indestructible/ground/outside/desert, @@ -56666,10 +67154,22 @@ /turf/open/transparent/openspace, /area/f13/bunker) "qTP" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/robot_debris, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 8; + pixel_y = -16 + }, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken3" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "qTX" = ( /obj/machinery/conveyor/auto{ dir = 4; @@ -56764,6 +67264,7 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "qVq" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ dir = 8 }, @@ -56771,6 +67272,15 @@ dir = 4; icon_state = "outerturn" }, +======= +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 17 + }, +/obj/effect/decal/cleanable/blood, +/obj/structure/wreck/trash/machinepile, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/wasteland) "qVs" = ( /obj/machinery/light{ @@ -56804,6 +67314,7 @@ }, /turf/open/floor/f13/wood, /area/f13/building/abandoned/m) +<<<<<<< Updated upstream "qVQ" = ( /obj/structure/fence{ dir = 4 @@ -56812,6 +67323,18 @@ /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +======= +"qWc" = ( +/obj/item/book/granter/crafting_recipe/blueprint/service, +/obj/structure/rack/shelf_metal, +/obj/item/book/granter/crafting_recipe/blueprint/scoutcarbine, +/obj/machinery/light{ + dir = 4; + light_color = "#228B22" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "qWh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -56848,10 +67371,18 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "qWz" = ( /obj/item/cultivator/rake, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"qWA" = ( +/turf/open/floor/wood_wide{ + icon_state = "wide-broken1" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "qWB" = ( /obj/structure/tires/five, /turf/open/indestructible/ground/outside/desert, @@ -56876,6 +67407,7 @@ }, /area/f13/ambientlighting/building/q) "qWN" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 5 }, @@ -56884,6 +67416,14 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "qWW" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/f13/stone/rugged, @@ -56982,6 +67522,14 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream +======= +"qYd" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/reagent_dispensers/rainwater_tank, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +>>>>>>> Stashed changes "qYq" = ( /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/u) @@ -57001,6 +67549,14 @@ icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"qYF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) +>>>>>>> Stashed changes "qYH" = ( /obj/structure/sign/poster/official/soft_cap_pop_art, /turf/closed/wall/f13/wood/house, @@ -57060,6 +67616,7 @@ }, /area/f13/followers) "qZF" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 6 }, @@ -57086,6 +67643,21 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) +======= +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul/reaver, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) +"rag" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating/f13/outside/road{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "raj" = ( /obj/structure/barricade/tentleatheredge, /obj/effect/overlay/desert/sonora/edge{ @@ -57123,6 +67695,12 @@ icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) +"raG" = ( +/obj/structure/table/wood/club, +/obj/item/clothing/shoes/f13/jamrock, +/obj/item/clothing/shoes/f13/jamrock, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "raN" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/road{ @@ -57131,12 +67709,30 @@ }, /area/f13/wasteland) "raQ" = ( +<<<<<<< Updated upstream /obj/item/storage/bag/plants{ pixel_y = 6; pixel_x = 3 }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/item/reagent_containers/pill/bitterdrink, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"raZ" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt{ + color = "000000" + }, +/obj/machinery/workbench/forge, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/f13/legioncamp) +>>>>>>> Stashed changes "rbf" = ( /obj/structure/sign/poster/contraband/missing_gloves{ pixel_y = 32 @@ -57154,11 +67750,21 @@ /area/f13/wasteland/town) "rbl" = ( /obj/effect/decal/cleanable/blood{ +<<<<<<< Updated upstream icon_state = "gib2"; pixel_y = 4 }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= + dir = 13; + icon_state = "tracks"; + pixel_y = 8 + }, +/obj/item/camera, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "rbm" = ( /obj/machinery/deepfryer, /obj/effect/decal/cleanable/dirt, @@ -57177,6 +67783,22 @@ icon_state = "horizontalinnermain2" }, /area/f13/ambientlighting/building/y) +<<<<<<< Updated upstream +======= +"rbr" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +"rbH" = ( +/obj/machinery/door/morgue, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "rbP" = ( /obj/effect/turf_decal/box/white, /obj/structure/reagent_dispensers/barrel/explosive, @@ -57203,6 +67825,7 @@ /turf/open/floor/wood_common/wood_common_light, /area/f13/building/powered) "rcc" = ( +<<<<<<< Updated upstream /obj/machinery/workbench/forge, /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -57211,6 +67834,22 @@ icon_state = "dark" }, /area/f13/brotherhood) +======= +/obj/structure/railing/wood/post, +/turf/open/floor/wood_common, +/area/f13/wasteland) +"rce" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/components/unary/tank, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +>>>>>>> Stashed changes "rcf" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -57315,6 +67954,7 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "rdk" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/oil{ icon_state = "floor5"; pixel_x = -19 @@ -57322,6 +67962,13 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerturn" }, +======= +/obj/structure/chair/bench{ + dir = 1; + pixel_y = -16 + }, +/turf/open/indestructible/ground/outside/dirt, +>>>>>>> Stashed changes /area/f13/wasteland) "rdo" = ( /obj/structure/table{ @@ -57384,6 +68031,7 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/outside/desert, /area/f13/legioncamp) +<<<<<<< Updated upstream "ref" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 8 @@ -57392,6 +68040,15 @@ icon_state = "horizontalinnermain1" }, /area/f13/casino) +======= +"rek" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/restraints/legcuffs/bola, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "res" = ( /obj/structure/rack, /obj/item/seeds/poppy/broc, @@ -57418,6 +68075,19 @@ }, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream +======= +"reH" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) +"reP" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerouter" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "reU" = ( /obj/effect/decal/cleanable/generic, /mob/living/simple_animal/hostile/ghoul/reaver, @@ -57431,6 +68101,7 @@ }, /area/f13/wasteland) "reW" = ( +<<<<<<< Updated upstream /obj/structure/car/rubbish2{ icon_state = "car_rubish3" }, @@ -57440,6 +68111,14 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, +======= +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_8"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "rfa" = ( /obj/structure/decoration/rag, @@ -57467,22 +68146,38 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) +<<<<<<< Updated upstream "rfs" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/reagent_dispensers/foamtank, /turf/open/floor/plating/f13, +======= +"rfr" = ( +/obj/structure/cargocrate, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "rft" = ( /obj/machinery/iv_drip/primitive, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) "rfB" = ( +<<<<<<< Updated upstream /obj/structure/rack/large/shelf{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) +======= +/mob/living/simple_animal/hostile/renegade/soldier, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "rfC" = ( /obj/structure/bedsheetbin/color, /obj/structure/table/wood, @@ -57505,6 +68200,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "rfW" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 6 }, @@ -57514,6 +68210,19 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/structure/rack/large/shelf_rust, +/obj/machinery/light, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "rfX" = ( /turf/open/indestructible/ground/inside/mountain, /area/f13/bunker) @@ -57584,8 +68293,15 @@ }, /area/f13/wasteland) "rhc" = ( +<<<<<<< Updated upstream /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +======= +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "rhe" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/dirt{ @@ -57630,10 +68346,18 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "rhA" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/structure/junk/arcade, /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/m) +======= +/obj/structure/rack/shelf_metal, +/obj/item/stack/crafting/armor_plate, +/obj/item/stack/crafting/armor_plate/five, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "rhE" = ( /obj/structure/lattice, /obj/structure/reagent_dispensers/barrel/three, @@ -57663,17 +68387,41 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"rhO" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/glass, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +"rhP" = ( +/obj/structure/chair/sofa/right{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "rhR" = ( /turf/open/floor/f13/wood{ icon_state = "housewood2" }, /area/f13/wasteland) "rhY" = ( +<<<<<<< Updated upstream /obj/item/trash/candy, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain2" }, /area/f13/wasteland) +======= +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "rhZ" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop1" @@ -57693,6 +68441,7 @@ }, /area/f13/building/abandoned/h) "rie" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -57701,6 +68450,14 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/table/reinforced, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "rih" = ( /obj/machinery/smartfridge/bottlerack/lootshelf/cans, /obj/effect/decal/cleanable/dirt, @@ -57758,6 +68515,7 @@ /obj/structure/closet/fridge/cannibal, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream "rjf" = ( /obj/effect/decal/fakelattice, /obj/structure/fence/corner{ @@ -57770,6 +68528,12 @@ /obj/structure/table/glass, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +"rjg" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "rjm" = ( /turf/open/floor/wood_common, /area/f13/ambientlighting/building/r) @@ -57777,11 +68541,31 @@ /turf/closed/wall/mineral/concrete/blastproof, /area/f13/wasteland) "rjo" = ( +<<<<<<< Updated upstream /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/f13{ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/m) +======= +/obj/machinery/door/unpowered/secure_NCR, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +"rjG" = ( +/obj/effect/turf_decal/big{ + dir = 8 + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "rjJ" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/toolsbasic, @@ -57882,6 +68666,7 @@ }, /area/f13/wasteland) "rlB" = ( +<<<<<<< Updated upstream /obj/structure/destructible/tribal_torch/wall/lit{ dir = 1; pixel_y = 17 @@ -57894,6 +68679,12 @@ }, /obj/effect/spawner/lootdrop/f13/cash_random_med, /turf/open/indestructible/ground/outside/sidewalk, +======= +/obj/effect/decal/cleanable/shreds, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "rlN" = ( /obj/structure/barricade/sandbags, @@ -57933,6 +68724,17 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/m) +"rmi" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress2"; + pixel_y = 5 + }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) "rmr" = ( /obj/structure/barricade/wooden, /turf/closed/wall/f13/wood/interior, @@ -57978,6 +68780,15 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/c) +"rnb" = ( +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "rne" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/vending/cigarette{ @@ -57986,6 +68797,7 @@ }, /turf/open/floor/wood_common, /area/f13/clinic) +<<<<<<< Updated upstream "rnh" = ( /obj/structure/bed/mattress{ icon_state = "mattress4"; @@ -57994,6 +68806,14 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) +======= +"rnj" = ( +/obj/structure/car/rubbish4, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "rnk" = ( /obj/structure/fence/corner{ dir = 5 @@ -58011,10 +68831,19 @@ /turf/closed/wall/f13/wood/interior, /area/f13/building/abandoned/z) "rnE" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/structure/simple_door/metal/dirtystore, /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/m) +======= +/obj/structure/chair/stool{ + dir = 1; + icon_state = "bench_center" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "rnH" = ( /obj/machinery/light{ dir = 8; @@ -58042,12 +68871,17 @@ }, /area/f13/building/abandoned/t) "rnV" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/ruins{ icon_state = "ruinswindowbroken" }, /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, +======= +/obj/item/clothing/under/pants/mustangjeans, +/turf/open/floor/plasteel/grimy, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "rnX" = ( /obj/structure/window/plasma/reinforced/fulltile, @@ -58060,9 +68894,15 @@ }, /area/f13/building/powered) "rnY" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/generic, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/safe, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "rnZ" = ( /obj/structure/wreck/trash/one_barrel, /turf/open/indestructible/ground/outside/dirt, @@ -58130,6 +68970,17 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) +"roN" = ( +/obj/structure/closet/crate/large, +/obj/structure/closet/crate/large{ + layer = 5; + pixel_y = 18; + desc = s + }, +/obj/item/stack/sheet/glass/ten, +/obj/item/stack/sheet/mineral/limestone/ten, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) "roX" = ( /obj/structure/barricade/wooden, /turf/open/floor/wood_common, @@ -58204,11 +69055,21 @@ }, /area/f13/ambientlighting/building/o) "rpZ" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/sidewalk{ dir = 4; icon_state = "outercorner" }, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowdestroyed" + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "rqd" = ( /obj/structure/table/wood/bar, /obj/item/reagent_containers/food/snacks/f13/fire_ant_fricassee, @@ -58289,10 +69150,19 @@ }, /area/f13/wasteland) "rqP" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 10 }, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/structure/fluff/railing/corner{ + dir = 1 + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "rqR" = ( /obj/structure/car/rubbish3{ @@ -58315,6 +69185,19 @@ icon_state = "verticalrightborderright1" }, /area/f13/wasteland) +"rri" = ( +/obj/structure/rack, +/obj/item/clothing/neck/jamrock, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/clothing/glasses/heat, +/turf/open/floor/plasteel/vaporwave, +/area/f13/ambientlighting/building/j) +"rrp" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/fakelattice, +/obj/machinery/space_heater, +/turf/open/floor/plating/f13, +/area/f13/wasteland) "rru" = ( /mob/living/simple_animal/hostile/eyebot{ faction = list("raider"); @@ -58338,6 +69221,7 @@ /obj/structure/table/wood/fancy, /turf/open/floor/carpet/airless, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream "rrE" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -58347,6 +69231,23 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +======= +"rrz" = ( +/obj/item/melee/onehanded/club/ncrflag{ + pixel_x = -10; + pixel_y = 16; + anchored = 1; + layer = 100 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) +"rrE" = ( +/obj/structure/simple_door/tent, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "rrH" = ( /obj/machinery/light{ dir = 1 @@ -58387,10 +69288,15 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/ncr) "rrR" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/house/broken, /obj/structure/cable/outdoors{ icon_state = "4-8" }, +======= +/obj/structure/junk/small/bed2, +/obj/effect/decal/cleanable/dirt, +>>>>>>> Stashed changes /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "rrY" = ( @@ -58461,9 +69367,13 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) "rtj" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood{ icon_state = "floor6" }, +======= +/obj/effect/mob_spawn/human/corpse/legion, +>>>>>>> Stashed changes /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "rtk" = ( @@ -58492,6 +69402,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "rtC" = ( +<<<<<<< Updated upstream /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" @@ -58504,6 +69415,27 @@ }, /turf/open/floor/plating/rust, /area/f13/sewer/powered) +======= +/mob/living/simple_animal/hostile/renegade/meister, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +"rtI" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, +/area/f13/wasteland) +"rtN" = ( +/obj/structure/chair/comfy{ + dir = 4; + pixel_x = -12 + }, +/turf/open/floor/wood_common{ + icon_state = "common-broken3" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "rtV" = ( /obj/effect/decal/cleanable/blood/old{ pixel_x = 12 @@ -58530,6 +69462,7 @@ }, /area/f13/building/abandoned/h) "rup" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/structure/displaycase/trophy, /obj/item/toy/plush/beeplushie, @@ -58538,6 +69471,16 @@ }, /obj/structure/fluff/railing, /turf/open/floor/carpet/arcade, +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/obj/effect/spawner/lootdrop/f13/armor/clothes, +/turf/open/floor/plasteel/grimy, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "ruv" = ( /obj/structure/closet/crate/secure/gear{ @@ -58572,12 +69515,28 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"rvg" = ( +/obj/item/stack/sheet/mineral/wood, +/obj/effect/decal/cleanable/blood{ + dir = 5; + icon_state = "tracks" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "rvi" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bar, +======= +/obj/item/shard, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom3" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "rvn" = ( /obj/structure/flora/tree/oak_five, @@ -58713,6 +69672,15 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"rxJ" = ( +/obj/machinery/door/unpowered/celldoor{ + req_access_txt = "121" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "rxL" = ( /obj/machinery/light/small{ dir = 8 @@ -58734,10 +69702,21 @@ "rxY" = ( /turf/closed/wall/f13/wood, /area/f13/ambientlighting/building/s) +<<<<<<< Updated upstream "ryf" = ( /obj/structure/flora/grass/coyote/seven, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"ryi" = ( +/obj/structure/chair/comfy/black{ + dir = 4; + pixel_x = -12 + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ryj" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -58773,6 +69752,7 @@ /turf/open/floor/carpet/airless, /area/f13/ambientlighting/building/c) "rzh" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/cobweb{ dir = 1; icon_state = "cobweb2" @@ -58780,6 +69760,14 @@ /mob/living/simple_animal/hostile/radscorpion/black, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/effect/decal/cleanable/blood, +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "rzo" = ( /obj/machinery/vending/nukacolavend{ default_price = 0; @@ -58872,6 +69860,14 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/ambientlighting/building/u) +<<<<<<< Updated upstream +======= +"rAT" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) +>>>>>>> Stashed changes "rAW" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt{ @@ -58987,6 +69983,7 @@ }, /area/f13/ambientlighting/building/b) "rCg" = ( +<<<<<<< Updated upstream /obj/structure/car/rubbish2{ pixel_x = 7; pixel_y = -16 @@ -58998,6 +69995,14 @@ dir = 4; icon_state = "outerbordercorner" }, +======= +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "rCk" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -59005,6 +70010,15 @@ icon_state = "verticaloutermain1" }, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"rCl" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/reagent_dispensers/rainwater_tank, +/obj/effect/decal/fakelattice, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +>>>>>>> Stashed changes "rCq" = ( /turf/open/indestructible/ground/outside/road{ dir = 8; @@ -59020,10 +70034,26 @@ "rCx" = ( /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream "rCz" = ( /obj/structure/debris/v4, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain2" +======= +"rCC" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerborder" + }, +/area/f13/wasteland) +"rCE" = ( +/obj/structure/curtain{ + color = "#845f58"; + pixel_x = -32 +>>>>>>> Stashed changes }, /area/f13/wasteland) "rCC" = ( @@ -59051,6 +70081,10 @@ /obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) +"rCG" = ( +/obj/structure/obstacle/old_locked_door, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "rCK" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -59151,6 +70185,13 @@ /obj/effect/decal/cleanable/blood, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream +======= +"rDQ" = ( +/obj/item/grenade/syndieminibomb/concussion, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "rDU" = ( /obj/structure/destructible/tribal_torch/wall/lit, /obj/effect/decal/cleanable/dirt, @@ -59257,6 +70298,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) +<<<<<<< Updated upstream "rEV" = ( /obj/machinery/light{ dir = 4; @@ -59267,6 +70309,14 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +"rES" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom3" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "rEX" = ( /obj/structure/window/fulltile/house/broken, /obj/structure/barricade/bars, @@ -59316,12 +70366,28 @@ /obj/structure/barricade/wooden/planks, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream "rFY" = ( /obj/effect/turf_decal/bot_white, /turf/open/floor/f13{ icon_state = "reddirtyfull" }, /area/f13/brotherhood) +======= +"rFQ" = ( +/obj/effect/turf_decal/weather, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/item/kirbyplants/dead{ + desc = "A mummified potted plant."; + name = "very dead potted plant"; + pixel_x = -1; + pixel_y = 11 + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "rGa" = ( /obj/effect/turf_decal/bot, /obj/structure/car/rubbish3, @@ -59337,6 +70403,29 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +<<<<<<< Updated upstream +======= +"rGf" = ( +/obj/structure/fence{ + dir = 1 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 9 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +"rGg" = ( +/obj/structure/simple_door/tentflap_cloth{ + color = "#7c0A02" + }, +/obj/effect/overlay/desert_side{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/legioncamp) +>>>>>>> Stashed changes "rGB" = ( /obj/effect/decal/cleanable/robot_debris/gib, /obj/effect/decal/cleanable/dirt, @@ -59372,6 +70461,13 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "rHn" = ( +<<<<<<< Updated upstream +======= +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/item/chair/stool/retro, +>>>>>>> Stashed changes /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) @@ -59462,6 +70558,7 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +<<<<<<< Updated upstream "rJc" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" @@ -59481,6 +70578,36 @@ "rJp" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/plasteel/grimy, +======= +"rIY" = ( +/obj/structure/fence/corner{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) +"rJc" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/structure/car/rubbish3, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +"rJd" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/structure/decoration/rag{ + icon_state = "flag_ncr"; + name = "NCR banner"; + pixel_y = 32 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +>>>>>>> Stashed changes /area/f13/ncr) "rJq" = ( /obj/structure/closet/crate/trashcart{ @@ -59570,6 +70697,7 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream "rKn" = ( /obj/item/melee/onehanded/club/ncrflag{ pixel_x = -10; @@ -59579,6 +70707,14 @@ }, /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, /area/f13/ncr) +======= +"rKh" = ( +/obj/structure/wreck/trash/machinepiletwo, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "rKu" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/medical/rnd/mid, @@ -59598,6 +70734,13 @@ /obj/effect/decal/fakelattice, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"rKE" = ( +/obj/item/stack/sheet/mineral/sandbags, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "rKG" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/inside/dirt, @@ -59645,10 +70788,28 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream "rLN" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks/pregame, /turf/open/indestructible/ground/outside/desert, +======= +"rLQ" = ( +/obj/structure/barricade/wooden/strong, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) +"rMe" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_y = 5 + }, +/obj/structure/flora/ausbushes/fullgrass{ + pixel_x = 5; + pixel_y = -12 + }, +/turf/open/indestructible/ground/outside/dirt, +>>>>>>> Stashed changes /area/f13/wasteland) "rLZ" = ( /obj/effect/turf_decal/sand/plating, @@ -59713,6 +70874,7 @@ /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream "rMM" = ( /obj/structure/rack/large/shelf_rust, /obj/effect/spawner/lootdrop/f13/advboards, @@ -59751,6 +70913,22 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_wide, +======= +"rMP" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"rMR" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/junk/arcade, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +"rNa" = ( +/obj/structure/flora/grass/coyote/seven, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "rNb" = ( /obj/structure/table, @@ -59798,12 +70976,17 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) "rNx" = ( +<<<<<<< Updated upstream /obj/structure/chair/stool{ icon_state = "bench" }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" }, +======= +/obj/item/trash/f13/c_ration_2, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "rNV" = ( /obj/machinery/door/poddoor/shutters/preopen, @@ -59832,9 +71015,22 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) "rOv" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/oil/slippery, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain2right" +======= +/obj/structure/fence, +/obj/structure/obstacle/barbedwire{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"rOF" = ( +/obj/structure/fence/end/wooden{ + dir = 8; + pixel_x = -4 +>>>>>>> Stashed changes }, /area/f13/wasteland) "rOB" = ( @@ -59905,16 +71101,37 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "rPw" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, /obj/item/reagent_containers/pill/bitterdrink, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_x = -16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/obj/structure/railing/wood/underlayer, +/obj/structure/railing/wood/underlayer, +/obj/structure/railing/wood/underlayer{ + pixel_y = 23 + }, +/turf/closed/mineral/random/low_chance, +>>>>>>> Stashed changes /area/f13/caves) "rPC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13, /area/f13/ambientlighting/building/o) "rPH" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/booth, /obj/item/storage/box/dice, @@ -59922,6 +71139,15 @@ /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/m) +======= +/obj/structure/table, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/porta_turret/f13/turret_shotgun/burstfire/robot, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "rPK" = ( /obj/structure/sign/painting/library_secure{ persistence_id = "brotherhood_secure"; @@ -59938,6 +71164,15 @@ /obj/effect/landmark/start/f13/tribal_new, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"rPS" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood_common{ + icon_state = "common-broken2" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "rQf" = ( /obj/structure/simple_door/room, /turf/open/floor/f13/wood{ @@ -59947,6 +71182,15 @@ "rQh" = ( /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"rQn" = ( +/obj/item/trash/f13/mre, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "rQw" = ( /obj/structure/fence{ dir = 4 @@ -60057,6 +71301,12 @@ icon_state = "horizontalinnermainleft" }, /area/f13/wasteland) +"rSg" = ( +/obj/structure/closet/crate/trashcart, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) "rSi" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/store/bread/creamcheese, @@ -60089,6 +71339,17 @@ /obj/structure/car/rubbish2, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"rSs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/hydroponics, +/obj/item/circuitboard/machine/hydroponics/automagic, +/obj/item/circuitboard/machine/hydroponics/automagic, +/obj/item/circuitboard/machine/hydroponics/automagic, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "rSx" = ( /obj/structure/table/wood/settler, /obj/item/storage/book/bible/booze, @@ -60158,6 +71419,7 @@ /obj/structure/window/fulltile/ruins, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream "rTE" = ( /obj/structure/guncase{ anchored = 1; @@ -60170,6 +71432,13 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +======= +"rTC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/pill/bitterdrink, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "rTM" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" @@ -60253,6 +71522,13 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland/town) +<<<<<<< Updated upstream +======= +"rUE" = ( +/obj/structure/sign/poster/prewar/poster66, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "rUM" = ( /obj/structure/fence{ dir = 4 @@ -60286,6 +71562,33 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream +======= +"rVF" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/start/f13/ncrmedofficer, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +"rVG" = ( +/obj/structure/flora/rock/jungle{ + icon_state = "rock3"; + pixel_x = -3 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +>>>>>>> Stashed changes "rVI" = ( /obj/structure/stairs/west, /turf/open/floor/f13/wood, @@ -60296,8 +71599,19 @@ }, /area/f13/wasteland) "rVP" = ( +<<<<<<< Updated upstream /turf/open/floor/wood_common/wood_common_light, /area/f13/ncr) +======= +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_4"; + layer = 5 + }, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "rVS" = ( /obj/structure/chair/folding, /obj/effect/decal/cleanable/dirt/dust, @@ -60361,8 +71675,13 @@ /turf/closed/mineral/random/low_chance, /area/f13/caves) "rWU" = ( +<<<<<<< Updated upstream /obj/structure/flora/rock/pile/largejungle, /obj/effect/decal/cleanable/dirt, +======= +/obj/item/twohanded/legionaxe, +/obj/effect/decal/cleanable/generic, +>>>>>>> Stashed changes /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "rXd" = ( @@ -60371,6 +71690,7 @@ icon_state = "outerborder" }, /area/f13/wasteland) +<<<<<<< Updated upstream "rXm" = ( /obj/item/clothing/under/f13/recon, /obj/item/clothing/under/f13/recon, @@ -60380,6 +71700,12 @@ dir = 5 }, /area/f13/brotherhood) +======= +"rXj" = ( +/obj/effect/turf_decal/vg_decals/department/bar, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "rXu" = ( /obj/effect/decal/cleanable/dirt/dust{ dir = 4 @@ -60392,6 +71718,7 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "rXw" = ( /obj/structure/rack/large/shelf_rust{ dir = 8 @@ -60399,6 +71726,13 @@ /obj/effect/spawner/lootdrop/tool_box, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +======= +"rXx" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "rXM" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/closed/wall/mineral/concrete, @@ -60456,6 +71790,23 @@ /obj/item/seeds/yucca, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"rYE" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +"rYH" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirtcorner" + }, +/area/f13/wasteland/legion) +>>>>>>> Stashed changes "rYN" = ( /obj/machinery/light/fo13colored/Red{ dir = 4 @@ -60500,11 +71851,30 @@ icon_state = "horizontaloutermain2" }, /area/f13/wasteland) +"rZe" = ( +/obj/structure/table/booth, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = -6 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "rZy" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleftbottom" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"rZz" = ( +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "rZK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -60616,6 +71986,15 @@ /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"scf" = ( +/obj/item/storage/trash_stack{ + icon_state = "Junk_10" + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "scn" = ( /obj/effect/decal/cleanable/robot_debris, /turf/open/indestructible/ground/outside/sidewalk{ @@ -60703,6 +72082,7 @@ /obj/item/flashlight/seclite, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream "sdI" = ( /obj/structure/table, /obj/item/storage/backpack/duffelbag/med/surgery, @@ -60713,6 +72093,31 @@ name = "rusted floor" }, /area/f13/ncr) +======= +"sdw" = ( +/obj/effect/turf_decal/weather, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/item/kirbyplants/dead{ + desc = "A mummified potted plant."; + name = "very dead potted plant"; + pixel_x = -1; + pixel_y = 11 + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) +"sdJ" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench_center" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "sdN" = ( /obj/machinery/light{ light_color = "#e8eaff" @@ -60725,6 +72130,7 @@ icon_state = "bluedirtychess2" }, /area/f13/followers) +<<<<<<< Updated upstream "sdS" = ( /obj/effect/decal/cleanable/robot_debris, /obj/effect/decal/cleanable/dirt, @@ -60737,6 +72143,21 @@ icon_state = "outermaincornerouter" }, /area/f13/wasteland) +======= +"sdP" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/generic, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +"sdX" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 10 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "sdY" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -60747,6 +72168,20 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +<<<<<<< Updated upstream +======= +"sed" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/power/port_gen/pacman/diesel{ + anchored = 1 + }, +/obj/item/stack/sheet/mineral/plasma/fifty, +/obj/structure/cable/outdoors{ + icon_state = "0-2" + }, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +>>>>>>> Stashed changes "set" = ( /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/indestructible/ground/outside/desert, @@ -60770,6 +72205,21 @@ /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"seT" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "sfg" = ( /obj/structure/decoration/vent, /obj/effect/decal/cleanable/dirt{ @@ -60871,6 +72321,13 @@ icon_state = "outerpavement" }, /area/f13/wasteland) +"sgo" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/machinery/power/floodlight, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "sgr" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/trash_stack, @@ -60883,6 +72340,15 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland/town) +<<<<<<< Updated upstream +======= +"sgz" = ( +/obj/structure/table/wood/junk, +/obj/item/restraints/handcuffs/sinew, +/obj/item/clothing/mask/muzzle, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "sgB" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -60954,10 +72420,21 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream "sht" = ( /obj/structure/sign/poster/prewar/poster60, /turf/closed/wall/mineral/brick, /area/f13/ncr) +======= +"shu" = ( +/obj/structure/table, +/obj/machinery/light{ + dir = 4; + light_color = "#228B22" + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "shv" = ( /obj/machinery/light/small/broken{ dir = 4 @@ -60982,10 +72459,18 @@ }, /area/f13/wasteland) "shL" = ( +<<<<<<< Updated upstream /obj/structure/simple_door/brokenglass, /obj/structure/barricade/wooden/planks/pregame, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +>>>>>>> Stashed changes "shQ" = ( /obj/structure/fence{ dir = 8 @@ -60996,6 +72481,7 @@ }, /area/f13/wasteland) "shY" = ( +<<<<<<< Updated upstream /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded"; pixel_x = -14 @@ -61005,6 +72491,13 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/generic, +/obj/effect/decal/cleanable/dirt, +/obj/item/twohanded/legionaxe, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "sid" = ( /obj/structure/railing/corner{ color = "#A47449"; @@ -61023,14 +72516,21 @@ }, /area/f13/building/powered) "sik" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_4"; - layer = 6 +/obj/effect/spawner/structure/window/reinforced/indestructable, +/obj/structure/table, +/obj/structure/barricade/bars, +/obj/machinery/door/poddoor/shutters{ + id = 980 }, +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/dirt{ icon_state = "dirt" }, /area/f13/wasteland) +======= +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "sil" = ( /obj/machinery/button/door{ id = "followersdoor"; @@ -61088,6 +72588,7 @@ icon_state = "horizontaltopborderbottom0" }, /area/f13/ambientlighting/building/w) +<<<<<<< Updated upstream "sjl" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -61097,6 +72598,21 @@ name = "dirty floor" }, /area/f13/brotherhood) +======= +"sja" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/f13/vexillarius, +/turf/open/floor/f13/wood, +/area/f13/legioncamp) +"sjp" = ( +/obj/effect/decal/remains{ + icon_state = "remains" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "sjt" = ( /obj/effect/overlay/fog, /turf/open/indestructible/ground/outside/water, @@ -61133,13 +72649,37 @@ /obj/structure/chair/bench, /turf/open/floor/carpet/black, /area/f13/building/abandoned/b) +"skp" = ( +/obj/structure/car/rubbish2, +/obj/effect/turf_decal/big{ + dir = 10 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) "sks" = ( +<<<<<<< Updated upstream /obj/structure/flora/rock/jungle, /obj/effect/decal/cleanable/cobweb{ dir = 1; icon_state = "cobweb2" }, /turf/open/indestructible/ground/inside/mountain, +======= +/obj/item/blacksmith/chain{ + pixel_y = -7; + desc = "A length of chain hanging from an overhead support beam with cuffs at the bottom."; + anchored = 1 + }, +/obj/item/restraints/handcuffs{ + pixel_x = 4; + pixel_y = -21; + anchored = 1; + desc = "A pair of handcuffs attached to a chain overhead, bleak." + }, +/turf/closed/mineral/random/low_chance, +>>>>>>> Stashed changes /area/f13/caves) "skw" = ( /obj/structure/table/wood, @@ -61152,6 +72692,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +"skJ" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +/area/f13/wasteland) "skL" = ( /obj/machinery/mineral/wasteland_vendor/medical, /obj/effect/decal/cleanable/dirt{ @@ -61166,12 +72714,21 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "skZ" = ( +<<<<<<< Updated upstream /obj/structure/chair/wood{ pixel_x = 2; pixel_y = 3 }, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +/obj/structure/table/booth, +/obj/structure/decoration/clock{ + pixel_x = 29 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "slf" = ( /obj/machinery/light/fo13colored/Aqua{ desc = "A lighting fixture with cold blue lighting."; @@ -61197,6 +72754,7 @@ "slp" = ( /turf/open/floor/plating/f13/inside/gravel, /area/f13/building/abandoned/x) +<<<<<<< Updated upstream "slq" = ( /obj/structure/cable/outdoors{ icon_state = "4-8" @@ -61217,6 +72775,14 @@ pixel_x = 16 }, /turf/closed/wall/mineral/brick, +======= +"slr" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerouter" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "slu" = ( /turf/closed/wall/f13/wood, @@ -61238,10 +72804,19 @@ }, /area/f13/wasteland) "slD" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/booth, /turf/open/floor/carpet/arcade, /area/f13/ambientlighting/building/m) +======= +/turf/open/floor/plasteel/stairs{ + barefootstep = "woodbarefoot"; + color = "#A47449"; + footstep = "wood" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "slN" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt/dust, @@ -61452,6 +73027,7 @@ }, /area/f13/ambientlighting/building/f) "soo" = ( +<<<<<<< Updated upstream /obj/structure/cable/outdoors{ icon_state = "4-8" }, @@ -61464,6 +73040,15 @@ /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" }, +======= +/obj/structure/chair/bench{ + dir = 1; + pixel_y = -16 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "sot" = ( /obj/structure/flora/grass/jungle/b{ @@ -61497,6 +73082,7 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +<<<<<<< Updated upstream "soG" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt{ @@ -61519,6 +73105,29 @@ }, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/m) +======= +"soJ" = ( +/mob/living/simple_animal/hostile/renegade/soldier, +/obj/structure/chair/stool/retro/tan, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +"soY" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 10 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) +>>>>>>> Stashed changes "sps" = ( /obj/structure/closet, /obj/effect/decal/cleanable/dirt{ @@ -61559,11 +73168,20 @@ name = "dirty floor" }, /area/f13/brotherhood) +<<<<<<< Updated upstream "spP" = ( /obj/item/melee/onehanded/slavewhip, /turf/open/indestructible/ground/outside/dirt{ dir = 8; icon_state = "dirtcorner" +======= +"spX" = ( +/obj/structure/flora/tree/wasteland{ + icon_state = "deadtree_4" + }, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" +>>>>>>> Stashed changes }, /area/f13/wasteland) "sqd" = ( @@ -61627,14 +73245,48 @@ icon_state = "dirt" }, /area/f13/wasteland) +"sqN" = ( +/obj/item/gun/ballistic/automatic/service{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/gun/ballistic/automatic/service, +/obj/item/gun/ballistic/automatic/service{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/structure/guncase{ + anchored = 1 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "sqQ" = ( /mob/living/simple_animal/hostile/mirelurk, /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) "sra" = ( +<<<<<<< Updated upstream /obj/structure/table/snooker, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +/obj/structure/barricade/wooden, +/obj/structure/barricade/tentclothedge{ + dir = 4 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +"srb" = ( +/obj/structure/fence{ + dir = 4 + }, +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/dirt{ + dir = 2; + icon_state = "dirt" + }, +/area/f13/wasteland/legion) +>>>>>>> Stashed changes "srd" = ( /obj/structure/railing{ color = "#A47449"; @@ -61645,6 +73297,7 @@ icon_state = "floordirtysolid" }, /area/f13/wasteland) +<<<<<<< Updated upstream "srf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing/wood/post{ @@ -61657,6 +73310,14 @@ icon_state = "horizontaloutermain2left" }, /area/f13/wasteland) +======= +"srr" = ( +/obj/structure/table/wood/club, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "srv" = ( /obj/structure/decoration/rag, /obj/structure/barricade/tentleatheredge, @@ -61702,6 +73363,13 @@ icon_state = "horizontalbottomborderbottom3" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"ssJ" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "ssX" = ( /obj/structure/railing{ dir = 4 @@ -61770,11 +73438,21 @@ }, /area/f13/building/abandoned/h) "stT" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, /obj/structure/simple_door/metal/dirtystore, /turf/open/floor/plasteel/bar, /area/f13/ambientlighting/building/m) +======= +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "stU" = ( /obj/effect/overlay/desert_side, /obj/effect/overlay/desert_side{ @@ -61815,9 +73493,20 @@ /turf/open/floor/f13/wood, /area/f13/legioncamp) "suy" = ( +<<<<<<< Updated upstream /obj/structure/table/booth, /obj/item/trash/f13/electronic/toaster, /turf/open/floor/f13/wood, +======= +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/displaycase/trophy, +/obj/item/toy/plush/beeplushie, +/obj/structure/fluff/railing{ + dir = 1 + }, +/obj/structure/fluff/railing, +/turf/open/floor/carpet/arcade, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "suz" = ( /obj/structure/car/rubbish4{ @@ -61855,6 +73544,13 @@ /obj/machinery/autolathe, /turf/open/floor/f13/wood, /area/f13/building/abandoned/p) +"suY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth/five, +/obj/item/stack/sheet/cloth, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "svn" = ( /obj/structure/closet, /obj/item/coin/iron, @@ -61882,6 +73578,23 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +"svI" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/suit/armor/outfit/jacket/police, +/obj/item/clothing/under/f13/police, +/obj/item/clothing/head/f13/police/officer, +/obj/item/melee/classic_baton/police, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib1"; + pixel_y = -6 + }, +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "tracks" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "svK" = ( /obj/structure/simple_door/tent, /obj/effect/decal/cleanable/blood/tracks{ @@ -61933,6 +73646,16 @@ dir = 6 }, /area/f13/wasteland/town) +<<<<<<< Updated upstream +======= +"swt" = ( +/obj/item/mine/shrapnel, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 4; + icon_state = "outermaincornerouter" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "sww" = ( /obj/structure/reagent_dispensers/barrel/four, /turf/open/indestructible/ground/outside/grass, @@ -61946,10 +73669,19 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "swK" = ( +<<<<<<< Updated upstream /obj/item/restraints/handcuffs, /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/item/grenade/syndieminibomb/concussion, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "swO" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 6 @@ -62216,6 +73948,7 @@ /obj/structure/reagent_dispensers/barrel/four, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream "sAQ" = ( /obj/item/pen/fountain, /obj/structure/cable/outdoors{ @@ -62223,6 +73956,14 @@ }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +======= +"sAI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/simple_door/brokenglass, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "sAV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -62247,6 +73988,27 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +<<<<<<< Updated upstream +======= +"sBd" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6" + }, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) +"sBf" = ( +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowdestroyed" + }, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +"sBk" = ( +/obj/structure/flora/rock/pile/largejungle, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "sBl" = ( /obj/structure/fence{ dir = 4 @@ -62370,11 +74132,27 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +<<<<<<< Updated upstream "sCR" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/reagent_dispensers/barrel/dangerous, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +"sCY" = ( +/obj/structure/shelf_wood, +/obj/item/reagent_containers/hypospray/medipen/stimpak/super, +/obj/item/reagent_containers/hypospray/medipen/stimpak/super, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/item/defibrillator/loaded, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "sDb" = ( /obj/structure/barricade/wooden, /obj/effect/decal/cleanable/dirt, @@ -62426,6 +74204,19 @@ icon_state = "horizontalbottombordertop3" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"sDy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/obj/structure/chair/booth{ + dir = 1 + }, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) +>>>>>>> Stashed changes "sDB" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/effect/turf_decal/weather/dirt{ @@ -62474,12 +74265,26 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +<<<<<<< Updated upstream "sEz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/wooden/planks/pregame, /obj/structure/simple_door/brokenglass, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, /area/f13/ambientlighting/building/m) +======= +"sEv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/broom, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +"sEI" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "sEJ" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/sidewalk{ @@ -62490,6 +74295,17 @@ /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/carpet/green, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"sEN" = ( +/obj/effect/turf_decal/big{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "sEU" = ( /obj/effect/overlay/desert_side, /turf/open/indestructible/ground/outside/dirt, @@ -62514,6 +74330,7 @@ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) +<<<<<<< Updated upstream "sFe" = ( /obj/effect/turf_decal/big{ dir = 8 @@ -62525,6 +74342,12 @@ icon_state = "verticalinnermain0" }, /area/f13/ncr) +======= +"sFi" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "sFx" = ( /obj/structure/bed/old, /turf/open/floor/wood_common{ @@ -62538,6 +74361,7 @@ }, /area/f13/wasteland/city) "sFB" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/robot_debris, /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -62547,6 +74371,13 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul/glowing/strong/legendary, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "sFI" = ( /mob/living/simple_animal/hostile/raider/ranged, /obj/effect/decal/cleanable/dirt, @@ -62713,18 +74544,45 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/w) +"sHV" = ( +/obj/structure/rack/shelf_metal, +/obj/item/clothing/mask/gas/enclave, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "sHX" = ( /obj/structure/car/rubbish1, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +"sIf" = ( +/obj/machinery/power/port_gen/pacman/diesel{ + anchored = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) "sIp" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden/strong, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) +======= +/obj/machinery/photocopier, +/obj/structure/decoration/clock{ + pixel_y = 27 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "sIv" = ( /obj/structure/chair/comfy/beige{ dir = 4 @@ -62767,6 +74625,13 @@ /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/closed/wall/f13/wood/house, /area/maintenance/bar) +"sIZ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) "sJc" = ( /turf/open/floor/plating/f13/outside/road{ icon_state = "horizontaltopbordertop0" @@ -62784,11 +74649,18 @@ /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) "sJu" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 5 }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +======= +/turf/open/floor/f13/wood{ + icon_state = "housewood1-broken" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "sJy" = ( /obj/structure/rack/shelf_metal, /obj/item/clothing/glasses/welding, @@ -62806,11 +74678,20 @@ /obj/item/stack/tile/carpet/fifty, /turf/open/floor/plating, /area/f13/bar) +<<<<<<< Updated upstream "sJE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/floor/plasteel/f13/stone, /area/f13/ambientlighting/building/m) +======= +"sJH" = ( +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "sJK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old{ @@ -62851,6 +74732,15 @@ icon_state = "whitedirtysolid" }, /area/f13/followers) +<<<<<<< Updated upstream +======= +"sKv" = ( +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2right" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "sKA" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/dirt{ @@ -62900,10 +74790,14 @@ /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) "sLe" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/structure/simple_door/room/dirty, /obj/structure/barricade/wooden/planks, /turf/open/floor/plasteel/f13/stone, +======= +/turf/open/indestructible/ground/outside/ruins, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "sLh" = ( /obj/item/melee/onehanded/machete/spatha, @@ -63078,6 +74972,14 @@ icon_state = "housewood2-broken" }, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream +======= +"sNv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/junk/small, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "sNA" = ( /obj/structure/table/glass, /obj/effect/decal/cleanable/dirt, @@ -63155,6 +75057,7 @@ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/f) +<<<<<<< Updated upstream "sOK" = ( /obj/effect/decal/cleanable/robot_debris, /turf/open/indestructible/ground/outside/sidewalk{ @@ -63165,6 +75068,13 @@ /mob/living/simple_animal/hostile/renegade/meister, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/ruins, +======= +"sOQ" = ( +/turf/open/indestructible/ground/outside/ruins{ + dir = 5; + icon_state = "rubbleplate" + }, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "sPe" = ( /obj/effect/decal/cleanable/blood{ @@ -63208,11 +75118,17 @@ }, /area/f13/wasteland) "sPF" = ( +<<<<<<< Updated upstream /obj/structure/fence{ dir = 4 }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" +======= +/obj/structure/nest/ghoul, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" +>>>>>>> Stashed changes }, /area/f13/wasteland) "sPT" = ( @@ -63280,10 +75196,25 @@ /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) "sQJ" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ dir = 8 }, /turf/open/floor/wood_common, +======= +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/structure/sign/basic{ + pixel_y = 31; + layer = 1000; + name = "threatening sign"; + desc = "A simple sign that reads--If you're not LD or going to pass out, you can stand. NCOs and above may use the benches during formation only." + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "sQS" = ( /obj/effect/decal/cleanable/blood/old{ @@ -63296,6 +75227,15 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"sQT" = ( +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "sQV" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/armor/costumes, @@ -63311,6 +75251,7 @@ }, /turf/open/floor/f13, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream "sRg" = ( /obj/machinery/workbench/forge{ pixel_x = 4 @@ -63329,6 +75270,16 @@ icon_state = "dirtcorner" }, /area/f13/wasteland) +======= +"sRi" = ( +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/open/floor/plating/rust, +/area/f13/wasteland) +"sRm" = ( +/obj/structure/barricade/concrete, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "sRs" = ( /obj/effect/spawner/lootdrop/weapons/experimental, /obj/structure/table, @@ -63385,6 +75336,7 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream "sRT" = ( /obj/structure/campfire, /turf/open/indestructible/ground/outside/road{ @@ -63411,6 +75363,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +"sRP" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +"sSb" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/structure/fluff/rails, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +>>>>>>> Stashed changes "sSl" = ( /obj/structure/barricade/wooden, /turf/closed/mineral/random/no_caves, @@ -63504,6 +75473,7 @@ }, /area/f13/building/abandoned/h) "sTR" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 8 }, @@ -63512,6 +75482,11 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +======= +/obj/structure/flora/grass/coyote/twentyseven, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "sTS" = ( /obj/structure/railing{ color = "#A47449"; @@ -63540,6 +75515,7 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/building/abandoned/x) +<<<<<<< Updated upstream "sUc" = ( /obj/machinery/chem_dispenser, /obj/machinery/light/fo13colored/Aqua{ @@ -63551,12 +75527,26 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, +======= +"sUi" = ( +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +>>>>>>> Stashed changes /area/f13/ncr) "sUs" = ( /obj/structure/wreck/car, /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/road, /area/f13/building/abandoned/k) +<<<<<<< Updated upstream +======= +"sUt" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outermaincornerouter" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "sUF" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/f13{ @@ -63673,10 +75663,25 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +<<<<<<< Updated upstream "sWI" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, +======= +"sWE" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +>>>>>>> Stashed changes /area/f13/ncr) +"sWI" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib2"; + pixel_y = 4 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "sWL" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowvertical" @@ -63792,6 +75797,13 @@ icon_state = "dirt" }, /area/f13/wasteland/legion) +<<<<<<< Updated upstream +======= +"sXY" = ( +/obj/structure/flora/grass/coyote/twentyfive, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "sYf" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/road{ @@ -63916,12 +75928,34 @@ icon_state = "bluedirtychess2" }, /area/f13/followers) +<<<<<<< Updated upstream "sZP" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain0" }, /area/f13/wasteland) +======= +"sZW" = ( +/obj/machinery/workbench, +/obj/item/reagent_containers/hypospray/medipen/stimpak, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"sZZ" = ( +/obj/structure/closet/crate/large{ + layer = 4.9; + name = "large crate wall"; + anchored = 1 + }, +/obj/structure/closet/crate/large{ + pixel_y = 17; + layer = 5.1; + name = "large crate wall"; + anchored = 1 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "taa" = ( /obj/structure/bed, /obj/machinery/light/small{ @@ -64035,8 +76069,18 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) "tbh" = ( +<<<<<<< Updated upstream /turf/open/floor/carpet/black, /area/f13/ambientlighting/building/m) +======= +/obj/machinery/power/apc/fusebox/south, +/obj/structure/table/wood/club, +/obj/item/paper_bin, +/obj/structure/cable/outdoors, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "tbk" = ( /obj/structure/fence{ dir = 8 @@ -64079,6 +76123,13 @@ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) +"tbB" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "tbJ" = ( /obj/item/paper/crumpled/fluff, /mob/living/simple_animal/hostile/supermutant{ @@ -64235,6 +76286,24 @@ /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/closed/wall/f13/wood/house, /area/maintenance/bar) +"tdD" = ( +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench" + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +"tdE" = ( +/obj/structure/punching_bag, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "tdN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ @@ -64242,6 +76311,7 @@ }, /area/f13/ambientlighting/building/e) "tdR" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/glass, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) @@ -64254,6 +76324,14 @@ desc = "It's a floor. Wow." }, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/marking{ + icon_state = "dottedhorizontalcorroded"; + pixel_y = -17 + }, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) +>>>>>>> Stashed changes "teh" = ( /obj/structure/cable/outdoors{ icon_state = "1-4" @@ -64293,6 +76371,14 @@ icon_state = "darkrusty" }, /area/f13/building/abandoned/h) +<<<<<<< Updated upstream +======= +"teQ" = ( +/obj/structure/table/wood/junk, +/obj/item/laser_pointer, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "teS" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -64307,6 +76393,20 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream +======= +"tfe" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench"; + pixel_y = 17 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "tff" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_2"; @@ -64337,6 +76437,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"tfE" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "tfK" = ( /obj/structure/chair/left{ dir = 1 @@ -64407,12 +76513,24 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "tgI" = ( +<<<<<<< Updated upstream /obj/structure/junk/small/table, /obj/item/stack/sheet/mineral/wood, /obj/structure/flora/twig3, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common/wood_common_light, /area/f13/building/powered) +======= +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "tgJ" = ( /obj/effect/spawner/lootdrop/f13/armor/tier4, /turf/open/indestructible/ground/inside/mountain, @@ -64553,8 +76671,18 @@ /obj/effect/overlay/fog/fog2, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"tiY" = ( +/obj/machinery/food_cart, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "tjb" = ( /obj/effect/decal/fakelattice, +<<<<<<< Updated upstream +======= +/obj/effect/decal/cleanable/dirt, +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "tji" = ( @@ -64583,6 +76711,14 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"tjz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "tjA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bonfire, @@ -64711,6 +76847,20 @@ /obj/effect/mapping_helpers/network_builder/power_cable/auto, /turf/open/floor/wood_common, /area/maintenance/bar) +"tkR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + layer = 1000 + }, +/obj/machinery/light{ + dir = 4; + pixel_y = -16 + }, +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "tkS" = ( /obj/structure/reagent_dispensers/barrel/three, /turf/open/indestructible/ground/outside/dirt{ @@ -64718,6 +76868,7 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream "tkV" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 6 @@ -64730,6 +76881,14 @@ /turf/open/indestructible/ground/outside/dirt{ dir = 8; icon_state = "dirtcorner" +======= +"tkT" = ( +/obj/structure/car/rubbish2{ + icon_state = "car_rubish3" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" +>>>>>>> Stashed changes }, /area/f13/wasteland) "tld" = ( @@ -64781,12 +76940,24 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) "tlP" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 1 }, /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +======= +/obj/structure/fence/wooden{ + dir = 4; + icon_state = "post_wood" + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "tlW" = ( /obj/structure/fence/corner/wooden, /obj/effect/turf_decal/weather/dirt{ @@ -64808,11 +76979,19 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) "tlY" = ( +<<<<<<< Updated upstream /obj/structure/railing{ dir = 1 }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul/reaver, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "tmc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, @@ -64983,8 +77162,16 @@ }, /area/f13/building/powered) "toH" = ( +<<<<<<< Updated upstream /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/j) +======= +/obj/structure/closet/crate/trashcart, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "toK" = ( /obj/structure/chair{ dir = 8 @@ -65032,6 +77219,13 @@ /obj/structure/table, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/t) +<<<<<<< Updated upstream +======= +"tpA" = ( +/obj/structure/table/wood/junk, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "tpE" = ( /obj/structure/bonfire/prelit, /turf/open/indestructible/ground/outside/road{ @@ -65044,6 +77238,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream +======= +"tqe" = ( +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/j) +"tqh" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "tqk" = ( /obj/structure/railing/corner{ color = "#A47449"; @@ -65068,7 +77275,12 @@ /area/f13/bar) "tqr" = ( /obj/effect/decal/cleanable/dirt, +<<<<<<< Updated upstream /turf/closed/wall/f13/store, +======= +/obj/effect/decal/cleanable/generic, +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "tqs" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, @@ -65080,8 +77292,20 @@ /obj/structure/wreck/trash/three_barrels, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream "tqM" = ( /obj/structure/chair/wood{ +======= +"tqF" = ( +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +"tqM" = ( +/turf/open/floor/wood_worn, +/area/f13/ambientlighting/building/m) +"tqP" = ( +/obj/effect/overlay/desert_side{ +>>>>>>> Stashed changes dir = 1 }, /turf/open/floor/wood_fancy, @@ -65092,6 +77316,7 @@ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) +<<<<<<< Updated upstream "tra" = ( /obj/structure/table/booth, /obj/item/camera{ @@ -65100,6 +77325,8 @@ }, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/m) +======= +>>>>>>> Stashed changes "trd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -65113,6 +77340,34 @@ dir = 8 }, /area/f13/wasteland/followers) +<<<<<<< Updated upstream +======= +"trr" = ( +/obj/structure/fence/wooden{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"trs" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + pixel_y = 25 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/f13/orator, +/turf/open/floor/f13/wood, +/area/f13/legioncamp) +"trv" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +"trx" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft2top" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "trA" = ( /obj/structure/reagent_dispensers/barrel/dangerous{ pixel_y = -5; @@ -65160,9 +77415,15 @@ icon_state = "verticalrightborderright3" }, /area/f13/ambientlighting/building/y) +<<<<<<< Updated upstream "tse" = ( /obj/structure/bed/mattress, /turf/open/indestructible/ground/inside/mountain, +======= +"tsn" = ( +/obj/effect/landmark/start/f13/ncrlogisticsofficer, +/turf/open/floor/wood_common/wood_common_light, +>>>>>>> Stashed changes /area/f13/ncr) "tsv" = ( /obj/effect/decal/cleanable/greenglow, @@ -65184,6 +77445,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "tsU" = ( +<<<<<<< Updated upstream /obj/structure/rack/shelf_metal, /obj/item/storage/bag/salvagestorage, /obj/item/weldingtool, @@ -65192,6 +77454,35 @@ icon_state = "dirt" }, /area/f13/wasteland) +======= +/obj/structure/simple_door/metal/iron, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"tsY" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded"; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop3" + }, +/area/f13/wasteland) +"ttg" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/f13/weapon/melee/tier3, +/obj/effect/spawner/lootdrop/low_tools, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/w) +"tts" = ( +/obj/item/trash/energybar, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"tty" = ( +/mob/living/simple_animal/hostile/radscorpion/black, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "ttF" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/desert, @@ -65459,6 +77750,7 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) "tyt" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/glass, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) @@ -65469,6 +77761,11 @@ /obj/effect/spawner/lootdrop/f13/alcoholspawner, /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/floor/wood_fancy, +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "tyF" = ( /obj/structure/reagent_dispensers/water_cooler, @@ -65482,6 +77779,12 @@ "tyG" = ( /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland) +"tyI" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) "tyL" = ( /obj/effect/turf_decal/delivery, /obj/structure/reagent_dispensers/barrel/dangerous, @@ -65602,6 +77905,18 @@ /obj/effect/mob_spawn/human/corpse, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"tzN" = ( +/obj/structure/fence/corner{ + dir = 4 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "tzP" = ( /obj/machinery/door/locked/hard, /turf/open/floor/wood_common, @@ -65618,6 +77933,18 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"tAd" = ( +/obj/structure/table/booth, +/obj/item/paper_bin, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "tAs" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "innermaincornerouter" @@ -65671,14 +77998,17 @@ }, /area/f13/building/powered) "tBb" = ( +<<<<<<< Updated upstream /obj/structure/fence{ dir = 8 }, +======= +>>>>>>> Stashed changes /obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/ground/outside/dirt{ - dir = 1; - icon_state = "dirt" +/obj/structure/chair/booth{ + dir = 1 }, +/turf/open/floor/plasteel/bar, /area/f13/wasteland) "tBj" = ( /obj/effect/decal/cleanable/dirt{ @@ -65748,9 +78078,28 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/i) +<<<<<<< Updated upstream "tCm" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/floor/plasteel/f13/stone, +======= +"tCj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +"tCm" = ( +/obj/effect/decal/fakelattice, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/ruins, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "tCy" = ( /obj/structure/spacevine, @@ -65801,11 +78150,16 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "tDd" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 6 }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +======= +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "tDe" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -65837,14 +78191,35 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/p) "tDB" = ( +<<<<<<< Updated upstream /obj/structure/fence/cut/large, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/structure/table, +/obj/item/clothing/mask/chameleon, +/obj/item/clothing/glasses/hud/diagnostic{ + pixel_y = 6 + }, +/turf/open/floor/pod/dark, +/area/f13/building/powered) +>>>>>>> Stashed changes "tDE" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, /area/f13/ambientlighting/building/y) +<<<<<<< Updated upstream +======= +"tDI" = ( +/obj/machinery/msgterminal/ncr, +/obj/machinery/light/small{ + dir = 4; + brightness = 9 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "tDJ" = ( /turf/closed/indestructible/rock, /area/f13/wasteland) @@ -65887,6 +78262,13 @@ dir = 4 }, /area/f13/wasteland) +"tEk" = ( +/obj/effect/decal/fakelattice, +/obj/item/melee/onehanded/machete/scrapsabre, +/obj/item/clothing/under/f13/raiderrags, +/obj/item/clothing/gloves/f13/handwraps, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) "tEl" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/road{ @@ -65910,9 +78292,15 @@ }, /area/maintenance/bar) "tEu" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/closed/mineral/random/high_chance, /area/f13/wasteland) +======= +/obj/effect/turf_decal/vg_decals/atmos/mix, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "tEA" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -65979,11 +78367,18 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "tFr" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 8 }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +/obj/structure/table, +/obj/item/paper_bin, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "tFt" = ( /obj/structure/barricade/tentleatheredge, /turf/open/indestructible/ground/outside/dirt, @@ -66045,6 +78440,16 @@ /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"tGl" = ( +/obj/structure/closet/locker, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +"tGE" = ( +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) +>>>>>>> Stashed changes "tGT" = ( /mob/living/simple_animal/cow/brahmin, /turf/open/indestructible/ground/outside/grass, @@ -66058,6 +78463,16 @@ }, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"tHr" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "tHu" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/f13/weapon/melee/random, @@ -66085,10 +78500,35 @@ icon_state = "horizontalinnermain2left" }, /area/f13/wasteland/town) +<<<<<<< Updated upstream "tHX" = ( /obj/effect/decal/cleanable/crayon, /turf/open/floor/carpet/black, /area/f13/ambientlighting/building/m) +======= +"tHW" = ( +/obj/structure/car/rubbish1, +/obj/effect/turf_decal/big{ + dir = 8 + }, +/obj/effect/decal/cleanable/oil{ + icon_state = "floor6"; + pixel_y = 9; + pixel_x = -10 + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +"tHX" = ( +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "tHZ" = ( /obj/structure/campfire{ pixel_y = 12 @@ -66096,10 +78536,20 @@ /turf/open/floor/plating/asteroid/basalt, /area/f13/building/abandoned/x) "tIa" = ( +<<<<<<< Updated upstream /obj/structure/chair/stool/retro/black, /obj/effect/decal/fakelattice, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +/obj/structure/table/booth, +/obj/structure/curtain, +/obj/machinery/reagentgrinder, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "tIc" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light, @@ -66112,6 +78562,7 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "tIu" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt{ color = "000000" }, @@ -66119,15 +78570,34 @@ icon_state = "reddirtyfull" }, /area/f13/brotherhood) +======= +/obj/structure/rack/shelf_metal, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/u) +"tIw" = ( +/obj/structure/chair/stool/retro/backed{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "tID" = ( /obj/machinery/smartfridge/bottlerack, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) "tIH" = ( +<<<<<<< Updated upstream /obj/item/construction/rcd, /obj/structure/rack/shelf_metal, /obj/effect/decal/fakelattice, /turf/open/floor/plasteel/f13/vault_floor/plating, +======= +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/ruins, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "tIN" = ( /obj/effect/decal/cleanable/dirt{ @@ -66202,6 +78672,22 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream +======= +"tJZ" = ( +/obj/structure/sign/legion/mines{ + pixel_y = 51; + layer = 100 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "tKd" = ( /obj/structure/simple_door/dirtyglass, /turf/open/floor/f13/wood{ @@ -66218,12 +78704,19 @@ }, /area/f13/wasteland) "tKC" = ( +<<<<<<< Updated upstream /mob/living/simple_animal/hostile/renegade/defender, /obj/effect/decal/cleanable/cobweb{ dir = 1; icon_state = "cobweb2" }, /turf/open/indestructible/ground/outside/sidewalk, +======= +/obj/item/trash/candy, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "tKI" = ( /obj/machinery/light{ @@ -66267,8 +78760,18 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +<<<<<<< Updated upstream /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) +======= +/obj/structure/flora/ausbushes/leafybush, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +"tLV" = ( +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "tLX" = ( /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/sidewalk{ @@ -66293,6 +78796,18 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +<<<<<<< Updated upstream +======= +"tMB" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "tME" = ( /obj/structure/flora/tree/oak_five, /turf/open/indestructible/ground/inside/dirt, @@ -66334,6 +78849,11 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/w) +"tNq" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/simple_door/metal/barred, +/turf/open/floor/plasteel/vaporwave, +/area/f13/ambientlighting/building/j) "tNu" = ( /turf/open/floor/f13{ icon_state = "whitegreenrustychess" @@ -66398,6 +78918,7 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream "tOr" = ( /obj/structure/punching_bag, /obj/structure/railing{ @@ -66405,6 +78926,14 @@ layer = 4.1 }, /turf/open/indestructible/ground/outside/sidewalk, +======= +"tOp" = ( +/obj/item/storage/money_stack/ncr{ + pixel_x = 5 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/wood_common/wood_common_light, +>>>>>>> Stashed changes /area/f13/ncr) "tOx" = ( /obj/effect/decal/cleanable/dirt, @@ -66414,9 +78943,18 @@ }, /area/f13/ambientlighting/building/b) "tOD" = ( +<<<<<<< Updated upstream /obj/item/clothing/under/pants/mustangjeans, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/structure/junk/drawer, +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "tOF" = ( /turf/open/indestructible/ground/outside/dirt{ dir = 4; @@ -66429,6 +78967,13 @@ icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"tOK" = ( +/obj/structure/flora/rock/pile/largejungle, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "tON" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/indestructible/ground/inside/mountain, @@ -66579,11 +79124,18 @@ }, /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) +<<<<<<< Updated upstream "tQR" = ( /obj/structure/campfire/barrel, /turf/open/indestructible/ground/outside/dirt{ dir = 5; icon_state = "dirt" +======= +"tQM" = ( +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/hobo, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" +>>>>>>> Stashed changes }, /area/f13/wasteland) "tQS" = ( @@ -66764,6 +79316,15 @@ /obj/structure/debris/v2, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +<<<<<<< Updated upstream +======= +"tSv" = ( +/obj/structure/chair/office{ + pixel_y = 24 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "tSA" = ( /obj/effect/overlay/desert/sonora/edge/corner, /turf/open/indestructible/ground/outside/sidewalk, @@ -66796,6 +79357,12 @@ /obj/structure/table, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"tSO" = ( +/turf/closed/wall/f13/tentwall, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "tST" = ( /obj/structure/table, /obj/item/book/granter/trait/techno, @@ -66803,6 +79370,20 @@ icon_state = "horizontalbottombordertop2" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"tTi" = ( +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/cloth, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "tTu" = ( /obj/effect/turf_decal/huge{ dir = 1 @@ -66815,9 +79396,14 @@ }, /area/f13/wasteland) "tTv" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/generic, /turf/open/floor/plasteel/grimy, +======= +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/wood_fancy/wood_fancy_light, +>>>>>>> Stashed changes /area/f13/ncr) "tTB" = ( /obj/structure/chair/wood{ @@ -66873,9 +79459,19 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "tUc" = ( +<<<<<<< Updated upstream /obj/structure/debris/v4, /turf/closed/indestructible/rock, /area/f13/wasteland) +======= +/obj/structure/rack/shelf_metal, +/obj/item/stack/crafting/armor_plate, +/obj/item/stack/crafting/armor_plate, +/obj/item/stack/crafting/armor_plate, +/obj/item/stack/crafting/armor_plate, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "tUd" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 4 @@ -66893,6 +79489,13 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"tUw" = ( +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "tUz" = ( /obj/machinery/vending/coffee, /obj/effect/decal/cleanable/dirt, @@ -66930,6 +79533,7 @@ }, /area/f13/ambientlighting/building/o) "tUK" = ( +<<<<<<< Updated upstream /obj/structure/table/wood/junk, /obj/item/reagent_containers/food/snacks/soup/hotchili{ pixel_y = 11 @@ -66937,6 +79541,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "tUU" = ( /obj/item/blacksmith/chain, /turf/open/indestructible/ground/outside/desert, @@ -66972,6 +79581,7 @@ }, /area/f13/ambientlighting/building/w) "tVf" = ( +<<<<<<< Updated upstream /obj/structure/kitchenspike, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/gibspawner/human/bodypartless, @@ -66979,6 +79589,13 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/barricade/wooden, +/obj/structure/barricade/bars, +/turf/open/floor/plasteel/vaporwave, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "tVt" = ( /obj/structure/decoration/clock/old/active{ layer = 3 @@ -67047,6 +79664,26 @@ /obj/item/locked_box/armor/tier3, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) +"tWr" = ( +/obj/structure/table/wood/junk, +/obj/item/clothing/mask/cigarette/rollie/cannabis{ + pixel_y = 5 + }, +/obj/item/clothing/mask/cigarette/rollie/cannabis{ + pixel_y = 10 + }, +/obj/item/clothing/mask/cigarette/rollie/cannabis{ + pixel_y = 15 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +"tWu" = ( +/obj/machinery/door/locked/easy/trapped, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "tWA" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -67085,6 +79722,7 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream "tXn" = ( /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; @@ -67100,6 +79738,19 @@ }, /turf/open/floor/wood_common, /area/f13/wasteland) +======= +"tXw" = ( +/obj/structure/window/fulltile/house/broken, +/obj/structure/curtain{ + color = "#363636" + }, +/obj/structure/barricade/wooden/planks, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "tXE" = ( /obj/structure/barricade/wooden/planks, /turf/closed/wall/mineral/wood, @@ -67123,17 +79774,30 @@ icon_state = "dirt" }, /area/f13/wasteland) +"tYo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2" + }, +/area/f13/wasteland) "tYv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) "tYG" = ( +<<<<<<< Updated upstream /obj/machinery/grill, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +======= +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "tYL" = ( /obj/structure/closet/crate/freezer/blood, /obj/machinery/light/small{ @@ -67188,10 +79852,21 @@ /area/f13/ncr) "tZx" = ( /obj/structure/barricade/wooden, +<<<<<<< Updated upstream /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, /area/f13/bunker) +======= +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/bunker) +"tZz" = ( +/obj/structure/wreck/trash/secway, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "tZA" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/ammo/civilian, @@ -67217,6 +79892,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +"uae" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/displaycase/trophy, +/obj/item/toy/plush, +/obj/structure/fluff/railing{ + dir = 1 + }, +/obj/structure/fluff/railing, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) "uaf" = ( /obj/effect/decal/remains/human, /turf/open/indestructible/ground/outside/sidewalk{ @@ -67275,11 +79960,23 @@ icon_state = "bluerustysolid" }, /area/f13/followers) +<<<<<<< Updated upstream "ubM" = ( /obj/structure/junk/small/table, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain0" }, +======= +"ubI" = ( +/obj/structure/flora/grass/coyote/twentytwo, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"ubK" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/wasteland) "ubP" = ( /obj/structure/gas_pump/oilpump1, @@ -67326,6 +80023,16 @@ /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"ucp" = ( +/obj/structure/sign/poster/ncr/keep_to_myself{ + desc = "The man. The myth. The unknown NCR Corporal who's photo was taken years ago and is still used today in various NCR camps to encourage proper behavior."; + name = "Satisfactory NCR Poster" + }, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +>>>>>>> Stashed changes "ucs" = ( /obj/effect/spawner/lootdrop/f13/weapon/melee/random_mid, /turf/open/indestructible/ground/outside/dirt{ @@ -67380,11 +80087,23 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream "ucV" = ( /obj/structure/stairs/south{ color = "#A47449" }, /turf/open/floor/f13/wood, +======= +"ucQ" = ( +/obj/structure/stairs/south{ + color = "#A47449" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/ncr) +"ucV" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "udl" = ( /obj/structure/closet/cabinet, @@ -67408,6 +80127,7 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/legioncamp) "udz" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -67417,6 +80137,20 @@ /obj/structure/flora/rock/jungle, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) +"udB" = ( +/obj/machinery/light/fo13colored/Red{ + dir = 1; + pixel_x = -16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "udH" = ( /obj/structure/fence{ dir = 4 @@ -67460,9 +80194,17 @@ }, /area/f13/wasteland) "udU" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/generic, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +/obj/structure/rack/shelf_metal, +/obj/item/salvage/low, +/obj/effect/decal/cleanable/cobweb, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "udW" = ( /obj/structure/railing/corner{ color = "#A47449" @@ -67521,9 +80263,25 @@ }, /area/f13/wasteland) "ueJ" = ( +<<<<<<< Updated upstream /obj/structure/sign/flag_america, /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/k) +======= +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge{ + pixel_y = -14; + layer = 5 + }, +/obj/structure/railing/wood/underlayer{ + layer = 6 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop3" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ueL" = ( /obj/structure/table/wood, /turf/open/floor/f13/wood, @@ -67566,11 +80324,27 @@ /obj/structure/debris/v2, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream "ufz" = ( /obj/effect/decal/cleanable/glass, /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"ufw" = ( +/obj/structure/chair/wood{ + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"ufz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/structure/simple_door/metal/dirtystore, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ufC" = ( /obj/item/radio/off, /obj/structure/table, @@ -67588,6 +80362,7 @@ }, /area/f13/wasteland) "ufJ" = ( +<<<<<<< Updated upstream /obj/structure/closet/crate/large, /obj/structure/closet/crate/large{ layer = 5; @@ -67601,6 +80376,17 @@ /obj/item/stack/sheet/mineral/limestone, /obj/item/stack/sheet/mineral/limestone, /turf/open/indestructible/ground/outside/dirt, +======= +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "ufK" = ( /obj/machinery/light{ @@ -67626,6 +80412,18 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/purple, /area/f13/bar) +<<<<<<< Updated upstream +======= +"ufV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/trash_stack, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +"ufX" = ( +/obj/structure/sign/poster/prewar/poster94, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "uga" = ( /obj/machinery/chem_dispenser/drinks/beer{ pixel_y = 17 @@ -67687,6 +80485,18 @@ icon_state = "verticalinnermain2bottom" }, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream +======= +"ugZ" = ( +/obj/structure/fluff/rug/rug_rubber{ + pixel_y = 15 + }, +/obj/structure/fluff/paper/stack{ + dir = 5 + }, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "uhb" = ( /obj/structure/reagent_dispensers/barrel/three, /obj/structure/lattice, @@ -67701,6 +80511,15 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/f) +<<<<<<< Updated upstream +======= +"uhh" = ( +/obj/item/card/id/rusted/brokenholodog/enclave, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "uhi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -67989,6 +80808,13 @@ /obj/item/storage/trash_stack, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream +======= +"ukT" = ( +/obj/item/storage/trash_stack, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "ukX" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -68072,12 +80898,19 @@ icon_state = "bluedirtychess2" }, /area/f13/followers) +<<<<<<< Updated upstream "umQ" = ( /obj/item/target/clown, /turf/open/floor/f13{ icon_state = "dark" }, /area/f13/casino) +======= +"umH" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "umR" = ( /obj/structure/window/fulltile/wood, /obj/structure/barricade/bars{ @@ -68129,6 +80962,7 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "unz" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/sidewalk{ @@ -68147,6 +80981,15 @@ /obj/item/stack/sheet/mineral/concrete/ten, /turf/open/indestructible/ground/outside/road{ icon_state = "verticalinnermain0" +======= +"unx" = ( +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +"unT" = ( +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" +>>>>>>> Stashed changes }, /area/f13/wasteland) "unU" = ( @@ -68263,6 +81106,7 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream "upA" = ( /obj/structure/car/rubbish4{ pixel_y = -9; @@ -68279,6 +81123,15 @@ pixel_y = 28 }, /turf/open/indestructible/ground/outside/sidewalk, +======= +"ups" = ( +/obj/effect/landmark/start/f13/ncrmp, +/obj/effect/landmark/start/f13/ncrmp, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/plasteel/grimy, +>>>>>>> Stashed changes /area/f13/ncr) "upK" = ( /obj/structure/barricade/wooden/strong, @@ -68336,6 +81189,10 @@ /obj/structure/barricade/sandbags, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"uqT" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/m) "uqX" = ( /obj/item/storage/trash_stack{ icon_state = "trash_2" @@ -68423,6 +81280,7 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +<<<<<<< Updated upstream "ush" = ( /obj/structure/closet/crate/large, /obj/item/stack/sheet/cloth/three, @@ -68430,6 +81288,8 @@ /obj/item/stack/sheet/metal/ten, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +======= +>>>>>>> Stashed changes "usB" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -68517,6 +81377,15 @@ icon_state = "dirt" }, /area/f13/wasteland) +"utT" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 28 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "utV" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -68560,6 +81429,7 @@ /obj/structure/closet/crate/secure/engineering, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream "uuR" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" @@ -68574,6 +81444,19 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) +======= +"uuN" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2top" + }, +/area/f13/wasteland) +"uve" = ( +/obj/structure/fence/corner{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/legioncamp) +>>>>>>> Stashed changes "uvj" = ( /obj/structure/reagent_dispensers/barrel/explosive, /turf/open/indestructible/ground/outside/sidewalk{ @@ -68581,10 +81464,19 @@ }, /area/f13/wasteland) "uvn" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood/tracks{ dir = 6 }, /turf/open/indestructible/ground/outside/sidewalk, +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "uvq" = ( /obj/structure/window/fulltile/house, @@ -68618,9 +81510,22 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "uvL" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood/tracks{ dir = 4 }, +======= +/obj/effect/spawner/lootdrop/f13/cash_random_med, +/obj/structure/table/wood/junk, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = -8; + pixel_y = 7 + }, +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, @@ -68661,10 +81566,17 @@ }, /area/f13/wasteland) "uwq" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/table/booth, +/obj/item/trash/f13/electronic/toaster, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "uws" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood/settler, @@ -68695,6 +81607,11 @@ icon_state = "horizontalbottombordertop0" }, /area/f13/ambientlighting/building/w) +"uwU" = ( +/obj/item/stack/sheet/bone, +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "uwV" = ( /obj/structure/wreck/trash/two_tire, /turf/open/indestructible/ground/outside/dirt{ @@ -68746,6 +81663,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/f13/building/powered) +"uxG" = ( +/obj/structure/table/wood/club, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) "uxI" = ( /obj/structure/rack/shelf_metal, /obj/effect/decal/cleanable/dirt, @@ -68778,11 +81701,17 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "uyr" = ( +<<<<<<< Updated upstream /obj/structure/closet/crate/trashcart, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain2left" }, /area/f13/wasteland) +======= +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "uyw" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 10 @@ -68793,6 +81722,16 @@ /obj/structure/chair/left, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/lower_firetower) +<<<<<<< Updated upstream +======= +"uyA" = ( +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "uyC" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 4 @@ -68826,6 +81765,7 @@ }, /area/f13/ambientlighting/building/y) "uyU" = ( +<<<<<<< Updated upstream /obj/structure/rack/large/shelf_rust{ dir = 8 }, @@ -68848,6 +81788,13 @@ name = "rusted floor" }, /area/f13/ncr) +======= +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "uzc" = ( /obj/structure/lamp_post/doubles{ dir = 4; @@ -68888,6 +81835,18 @@ /obj/structure/wreck/trash/machinepiletwo, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"uzR" = ( +/obj/structure/chair/stool{ + dir = 4; + icon_state = "bench_center" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "uzY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/overlay/junk/sink{ @@ -68898,6 +81857,19 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream +======= +"uAc" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +"uAe" = ( +/obj/structure/chair/comfy/throne, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "uAo" = ( /obj/structure/tires/two, /turf/open/floor/plating/f13/inside/gravel, @@ -68936,10 +81908,37 @@ footstep = "wood" }, /area/f13/ambientlighting/building/e) +<<<<<<< Updated upstream "uAL" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +======= +"uAI" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +"uAL" = ( +/obj/structure/flora/stump, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt"; + dir = 4 + }, +/area/f13/wasteland) +"uAQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/simple_door/metal/dirtystore, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "uAU" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, @@ -68977,9 +81976,16 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) "uBz" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bar, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/glass, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "uBG" = ( /obj/structure/wreck/trash/machinepiletwo, /turf/open/indestructible/ground/outside/dirt, @@ -68993,6 +81999,7 @@ /turf/open/floor/plating, /area/f13/bar) "uBI" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ambientlighting/building/j) "uBL" = ( @@ -69001,6 +82008,13 @@ dir = 6 }, /turf/open/floor/plating/f13/inside/gravel, +======= +/obj/effect/decal/cleanable/glass, +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/wasteland) "uBP" = ( /obj/effect/overlay/desert/sonora/edge{ @@ -69158,6 +82172,13 @@ color = "#9c9c9c" }, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream +======= +"uEc" = ( +/obj/structure/sign/warning/securearea, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +>>>>>>> Stashed changes "uEo" = ( /obj/machinery/hydroponics/soil, /obj/effect/turf_decal/weather/dirt{ @@ -69170,6 +82191,18 @@ }, /turf/open/indestructible/ground/outside/dirt/harsh, /area/f13/followers) +<<<<<<< Updated upstream +======= +"uEr" = ( +/obj/structure/closet/crate/trashcart, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +"uEy" = ( +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/barricade/wooden, +/turf/closed/mineral/random/no_caves, +/area/f13/wasteland/legion) +>>>>>>> Stashed changes "uEH" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 6 @@ -69205,6 +82238,15 @@ /obj/effect/decal/cleanable/blood/splats, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"uFj" = ( +/obj/structure/table/booth, +/obj/item/reagent_containers/food/condiment/pack/coffee, +/obj/item/reagent_containers/food/condiment/pack/coffee, +/obj/item/reagent_containers/food/condiment/pack/coffee, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "uFm" = ( /obj/effect/overlay/desert/sonora/edge/corner, /turf/open/indestructible/ground/outside/sidewalk{ @@ -69296,6 +82338,14 @@ /obj/structure/flora/wasteplant/wild_broc, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"uGd" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/w) +>>>>>>> Stashed changes "uGf" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -69367,6 +82417,13 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"uGX" = ( +/obj/item/flag/ncr, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "uHb" = ( /obj/structure/rack, /obj/item/stack/sheet/metal/twenty, @@ -69482,6 +82539,13 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/b) +"uIr" = ( +/obj/item/radio{ + name = "walkie talkie" + }, +/obj/structure/shelf_wood, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) "uIt" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4 @@ -69489,6 +82553,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) +<<<<<<< Updated upstream +======= +"uIB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/simple_door/room/dirty, +/obj/structure/barricade/wooden/planks, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "uIF" = ( /obj/structure/reagent_dispensers/rainwater_tank, /turf/open/indestructible/ground/inside/dirt, @@ -69520,6 +82593,7 @@ /turf/open/indestructible/ground/outside/water, /area/f13/wasteland) "uJq" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/siding/wood{ dir = 1; layer = 1000 @@ -69540,6 +82614,11 @@ icon_state = "horizontaloutermain2" }, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "uJw" = ( /obj/effect/decal/marking{ icon_state = "dottedverticaldegraded" @@ -69576,14 +82655,40 @@ icon_state = "horizontalinnermain2" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"uKw" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/ncr) +"uKy" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "uKC" = ( /obj/machinery/door/unpowered/securedoor/khandoor, /turf/open/floor/carpet/purple, /area/f13/bar) "uKD" = ( +<<<<<<< Updated upstream /obj/structure/sign/poster/prewar/poster66, /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/m) +======= +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "uKE" = ( /obj/structure/fence{ dir = 8 @@ -69600,6 +82705,13 @@ /obj/machinery/light/small, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/z) +<<<<<<< Updated upstream +======= +"uKU" = ( +/obj/effect/turf_decal/caution, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +>>>>>>> Stashed changes "uKY" = ( /obj/machinery/light/fo13colored/Red{ dir = 1 @@ -69614,6 +82726,12 @@ /obj/machinery/workbench/forge, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"uLb" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) "uLd" = ( /obj/structure/wreck/trash/brokenvendor, /obj/effect/decal/cleanable/dirt{ @@ -69622,6 +82740,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) +<<<<<<< Updated upstream +======= +"uLw" = ( +/obj/effect/decal/fakelattice, +/obj/structure/fence/corner{ + dir = 4; + icon_state = "end" + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "uLz" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/f13{ @@ -69637,6 +82766,22 @@ /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"uLE" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood{ + icon_state = "housewood1-broken" + }, +/area/f13/ambientlighting/building/m) +"uLH" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/obj/machinery/door/unpowered/secure_NCR, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "uLJ" = ( /obj/structure/chair/office{ dir = 1 @@ -69646,6 +82791,12 @@ name = "rusted floor" }, /area/f13/building/powered) +"uLU" = ( +/mob/living/simple_animal/hostile/ghoul, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) "uMe" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -69743,6 +82894,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/blue, /area/f13/building/abandoned/m) +<<<<<<< Updated upstream +======= +"uMY" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 8 + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "uNd" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 1 @@ -69769,6 +82929,10 @@ icon_state = "wasteland32" }, /area/f13/wasteland) +"uNG" = ( +/obj/item/stack/sheet/bone, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "uNM" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /turf/open/indestructible/ground/outside/roaddirt{ @@ -69798,6 +82962,15 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/f) +"uNV" = ( +/obj/structure/car/rubbish3{ + icon_state = "debris1" + }, +/turf/open/indestructible/ground/outside/road{ + dir = 8; + icon_state = "horizontalinnermain2right" + }, +/area/f13/wasteland) "uNY" = ( /obj/effect/overlay/desert/sonora/edge/corner, /obj/effect/overlay/desert/sonora/edge/corner{ @@ -69854,10 +83027,22 @@ }, /area/f13/ambientlighting/building/m) "uOD" = ( +<<<<<<< Updated upstream /obj/structure/table/booth, /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +/obj/item/clockwork/alloy_shards{ + name = "rocks"; + desc = "Rocks. Mindblowing."; + anchored = 1 + }, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland32" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "uOH" = ( /obj/machinery/door/unpowered/securedoor/legion, /turf/open/floor/carpet/red, @@ -69970,6 +83155,17 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/w) +<<<<<<< Updated upstream +======= +"uQv" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "uQx" = ( /obj/structure/cable{ icon_state = "0-4" @@ -69978,12 +83174,27 @@ icon_state = "bluedirtychess2" }, /area/f13/brotherhood) +<<<<<<< Updated upstream +======= +"uQB" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "uQH" = ( /turf/open/indestructible/ground/outside/sidewalk{ dir = 4; icon_state = "outerpavement" }, /area/f13/wasteland) +"uQK" = ( +/obj/item/storage/trash_stack{ + pixel_y = 17 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "uQS" = ( /obj/machinery/light{ dir = 1; @@ -69994,11 +83205,21 @@ }, /area/f13/brotherhood) "uQU" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/vg_decals/numbers/two{ layer = 5 }, /turf/closed/wall/mineral/brick, /area/f13/ncr) +======= +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/effect/decal/cleanable/glass, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "uQV" = ( /obj/structure/toilet{ pixel_y = 13 @@ -70006,9 +83227,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/f13, /area/f13/ambientlighting/building/y) +<<<<<<< Updated upstream "uRi" = ( /turf/open/floor/plasteel/grimy, /area/f13/ncr) +======= +"uRd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/garbagetomid, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "uRn" = ( /obj/effect/decal/cleanable/blood/old{ icon_state = "gibbear1" @@ -70031,6 +83260,7 @@ /obj/structure/bed, /turf/open/floor/wood_mosaic, /area/f13/building/abandoned/x) +<<<<<<< Updated upstream "uRF" = ( /obj/structure/cable/outdoors{ icon_state = "4-8" @@ -70045,6 +83275,15 @@ dir = 8 }, /turf/open/floor/wood_common, +======= +"uRI" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris1" + }, +/obj/effect/overlay/desert/sonora/edge/corner, +/turf/open/indestructible/ground/outside/sidewalk, +>>>>>>> Stashed changes /area/f13/wasteland) "uSd" = ( /obj/structure/wreck/trash/machinepile, @@ -70069,6 +83308,7 @@ /obj/effect/spawner/lootdrop/f13/armor/tier1, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream "uSm" = ( /obj/structure/cable/outdoors{ icon_state = "2-8" @@ -70082,6 +83322,14 @@ /obj/structure/sign/poster/prewar/poster82, /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/m) +======= +"uSv" = ( +/obj/item/blacksmith/chain{ + pixel_x = -8 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "uSB" = ( /obj/structure/ladder/unbreakable{ height = 2; @@ -70166,6 +83414,24 @@ icon_state = "floorrusty" }, /area/f13/building/abandoned/h) +<<<<<<< Updated upstream +======= +"uTc" = ( +/obj/structure/filingcabinet, +/obj/effect/decal/cleanable/cobweb{ + dir = 1; + icon_state = "cobweb2" + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +"uTf" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 4; + pixel_y = -8 + }, +/turf/open/floor/f13/wood, +/area/f13/legioncamp) +>>>>>>> Stashed changes "uTh" = ( /obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt{ @@ -70210,6 +83476,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) "uTy" = ( +<<<<<<< Updated upstream /obj/structure/closet/crate/large{ layer = 4.9; name = "large crate wall"; @@ -70223,6 +83490,15 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/clothing/under/suit_jacket/tan, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/glasses/hud/diagnostic/sunglasses, +/turf/open/floor/plasteel/vaporwave, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "uTO" = ( /obj/structure/decoration/rag, /turf/closed/wall/mineral/wood, @@ -70261,6 +83537,7 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) "uUM" = ( +<<<<<<< Updated upstream /obj/structure/sign/flag_america, /turf/closed/indestructible/rock{ desc = "A pre-War wall made of solid concrete."; @@ -70271,6 +83548,14 @@ smooth = 1 }, /area/f13/brotherhood/surface) +======= +/obj/structure/barricade/wooden/strong, +/turf/closed/wall/r_wall/rust, +/area/f13/brotherhood) +"uUN" = ( +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "uUT" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt/dust, @@ -70290,6 +83575,30 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"uVd" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/chair/bench, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) "uVg" = ( /obj/machinery/light/small{ dir = 8 @@ -70365,6 +83674,16 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream +======= +"uWm" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris2" + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "uWy" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -70378,6 +83697,19 @@ icon_state = "dirt" }, /area/f13/wasteland) +"uWH" = ( +/obj/machinery/light/lampost, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland) +"uWN" = ( +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "uWU" = ( /turf/closed/wall/mineral/sandstone, /area/f13/wasteland) @@ -70512,12 +83844,20 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) +<<<<<<< Updated upstream "uYb" = ( /obj/item/card/id/rusted/brokenholodog/enclave, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" }, /area/f13/sewer/powered) +======= +"uYa" = ( +/obj/structure/junk/small/disco, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/vaporwave, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "uYh" = ( /turf/open/indestructible/ground/outside/road, /area/f13/tunnel/southwest) @@ -70663,6 +84003,13 @@ icon_state = "horizontaltopbordertop2" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"vaH" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "vaI" = ( /obj/structure/fence{ dir = 1 @@ -70671,6 +84018,7 @@ /obj/item/flag/khan, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream "vaS" = ( /obj/item/stack/sheet/mineral/wood, /obj/effect/decal/cleanable/blood{ @@ -70680,6 +84028,24 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common/wood_common_light, /area/f13/building/powered) +======= +"vaL" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_2" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2" + }, +/area/f13/wasteland) +"vaU" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "vaW" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2, @@ -70905,10 +84271,24 @@ /obj/effect/mob_spawn/human/corpse/damaged, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream "vdF" = ( /obj/machinery/vending/cigarette, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +======= +"vdH" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/fakelattice, +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/plating/f13, +/area/f13/wasteland) +>>>>>>> Stashed changes "vdK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/wrench, @@ -71025,12 +84405,28 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/f) +<<<<<<< Updated upstream "vfa" = ( /obj/machinery/door/poddoor/shutters{ id = 984 }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +======= +"vfb" = ( +/obj/item/clothing/head/beret/headband, +/obj/structure/statue/petrified, +/obj/item/clothing/under/pants/mustangjeans{ + pixel_y = -8 + }, +/obj/item/clothing/mask/cigarette/rollie{ + pixel_x = -5; + pixel_y = 12 + }, +/obj/item/clothing/suit/armor/outfit/jacket/ncrcfjacket, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "vfe" = ( /obj/structure/railing{ color = "#A47449"; @@ -71057,11 +84453,18 @@ icon_state = "common_dark-broken3" }, /area/f13/building/abandoned/n) +"vfr" = ( +/obj/item/tele_iv, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) "vfs" = ( /obj/effect/landmark/start/f13/tribal, /obj/structure/chair/stool, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream "vfE" = ( /obj/structure/debris/v4, /turf/open/floor/f13{ @@ -71094,6 +84497,37 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"vfF" = ( +/obj/structure/table/booth, +/obj/structure/gallow{ + pixel_x = 14; + pixel_y = 10; + layer = 10 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +"vfL" = ( +/obj/structure/stairs/north{ + color = "#A47449" + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1; + layer = 10000 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"vfS" = ( +/obj/item/clockwork/alloy_shards{ + name = "rocks"; + desc = "Rocks. Mindblowing."; + anchored = 1 + }, +/turf/open/indestructible/ground/outside/desert{ + icon_state = "wasteland33" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "vfW" = ( /obj/structure/curtain{ pixel_x = 32 @@ -71101,6 +84535,7 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/bluechess, /area/f13/legioncamp) "vfX" = ( +<<<<<<< Updated upstream /obj/machinery/smartfridge/bottlerack{ pixel_x = 3 }, @@ -71108,6 +84543,10 @@ /obj/effect/spawner/lootdrop/f13/alcoholspawner, /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/floor/wood_fancy, +======= +/obj/structure/simple_door/brokenglass, +/turf/open/floor/plasteel/grimy, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "vfZ" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -71159,12 +84598,20 @@ }, /area/f13/ambientlighting/building/o) "vgK" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_wide, /area/f13/wasteland) +======= +/obj/effect/turf_decal/vg_decals/numbers/two{ + layer = 5 + }, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +>>>>>>> Stashed changes "vgM" = ( /obj/structure/window/fulltile/house{ dir = 2; @@ -71183,6 +84630,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "vgW" = ( +<<<<<<< Updated upstream /obj/effect/decal/fakelattice, /obj/machinery/light{ dir = 4; @@ -71190,6 +84638,11 @@ }, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) +>>>>>>> Stashed changes "vgX" = ( /obj/effect/spawner/lootdrop/ammo/fiftypercent, /obj/effect/decal/cleanable/dirt, @@ -71240,12 +84693,27 @@ /obj/structure/car/rubbish4, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"vhI" = ( +/obj/structure/table/booth, +/obj/item/seeds/coffee, +/obj/item/seeds/coffee/robusta, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) "vie" = ( /obj/structure/table/wood, /obj/machinery/processor/chopping_block, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/p) +<<<<<<< Updated upstream +======= +"vig" = ( +/obj/structure/curtain, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "vjf" = ( /obj/effect/overlay/desert_side, /obj/effect/overlay/desert_side{ @@ -71262,6 +84730,7 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream "vju" = ( /obj/item/radio/headset/headset_ncr{ pixel_y = 24; @@ -71293,6 +84762,15 @@ /obj/item/twohanded/spear, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +"vjl" = ( +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "vjA" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/indestructible/ground/outside/dirt{ @@ -71313,6 +84791,13 @@ icon_state = "verticalinnermain1" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"vjP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/rust, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "vjQ" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright2bottom" @@ -71336,6 +84821,22 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/w) +"vkg" = ( +/obj/machinery/smartfridge/bottlerack, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"vkk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/large/shelf_rust, +/obj/item/toy/cards/deck/cas, +/obj/item/toy/cards/deck/cas/black, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/plasteel/f13/stone, +/area/f13/ambientlighting/building/m) "vkm" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowvertical" @@ -71387,6 +84888,7 @@ }, /area/f13/building/lower_firetower) "vkI" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/structure/rack/large/shelf_rust, /obj/effect/spawner/lootdrop/f13/armor/clothes, @@ -71396,6 +84898,16 @@ /obj/effect/spawner/lootdrop/f13/armor/clothes, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalbottombordertop3" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "vkP" = ( /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/g) @@ -71415,6 +84927,7 @@ }, /area/f13/followers) "vle" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert_side{ pixel_x = -15 }, @@ -71433,6 +84946,14 @@ name = "rusted floor" }, /area/f13/sewer/powered) +======= +/obj/machinery/button/door{ + id = 984; + pixel_x = 27 + }, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "vlg" = ( /obj/machinery/workbench, /obj/item/storage/toolbox/mechanical, @@ -71447,10 +84968,25 @@ icon_state = "bluerustysolid" }, /area/f13/followers) +<<<<<<< Updated upstream "vlI" = ( /obj/machinery/radioterminal/ncr, /turf/open/floor/plasteel/grimy, /area/f13/ncr) +======= +"vlk" = ( +/obj/structure/table/wood/junk, +/obj/item/paperslip, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) +"vln" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "vlJ" = ( /obj/structure/barricade/tentclothedge{ dir = 4 @@ -71488,6 +85024,13 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/bar) +<<<<<<< Updated upstream +======= +"vmd" = ( +/obj/item/melee/onehanded/slavewhip, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "vmg" = ( /obj/item/flag/khan, /obj/effect/turf_decal/weather/dirt, @@ -71496,9 +85039,20 @@ }, /area/f13/wasteland) "vmi" = ( +<<<<<<< Updated upstream /obj/effect/spawner/lootdrop/f13/crafting, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/m) +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "vmp" = ( /obj/structure/simple_door/house, /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, @@ -71562,6 +85116,7 @@ /turf/open/floor/f13, /area/f13/ambientlighting/building/y) "vnO" = ( +<<<<<<< Updated upstream /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; @@ -71583,6 +85138,13 @@ /obj/item/multitool, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/ncr) +======= +/obj/item/storage/trash_stack{ + icon_state = "Junk_10" + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "vnX" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/planks, @@ -71597,11 +85159,36 @@ icon_state = "floorrusty" }, /area/f13/ambientlighting/building/f) +<<<<<<< Updated upstream +======= +"voo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/human, +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" + }, +/turf/open/floor/f13{ + icon_state = "yellowrustyfull" + }, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "voA" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/raider/sulphite, /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"voC" = ( +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2left" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "voL" = ( /obj/structure/simple_door/metal/fence, /obj/structure/decoration/rag, @@ -71617,6 +85204,13 @@ /obj/structure/dresser, /turf/open/floor/wood_common, /area/f13/building/abandoned/z) +<<<<<<< Updated upstream +======= +"voS" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "voU" = ( /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/desert, @@ -71636,9 +85230,18 @@ }, /area/f13/brotherhood) "vpp" = ( +<<<<<<< Updated upstream /obj/item/reagent_containers/pill/healingpowder, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "vps" = ( /obj/structure/barricade/tentleatheredge{ dir = 8 @@ -71666,6 +85269,10 @@ icon_state = "tunnelrusty" }, /area/f13/building/powered) +"vpN" = ( +/obj/item/stack/sheet/mineral/plasma/twentyfive, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) "vpT" = ( /obj/structure/destructible/tribal_torch/lit, /turf/open/floor/bronze, @@ -71695,10 +85302,24 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "vqD" = ( +<<<<<<< Updated upstream /obj/item/reagent_containers/pill/patch/healpoultice, /obj/effect/decal/cleanable/blood, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/machinery/power/port_gen/pacman/diesel{ + anchored = 1; + pixel_y = 24 + }, +/obj/machinery/power/port_gen/pacman/diesel{ + anchored = 1; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "vqS" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -71740,12 +85361,31 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) +<<<<<<< Updated upstream "vrB" = ( /obj/structure/fluff/paper/stack{ dir = 8 }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) +======= +"vrA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +"vrB" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "vrI" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4"; @@ -71873,14 +85513,22 @@ /obj/structure/flora/ausbushes/reedbush, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +<<<<<<< Updated upstream "vtA" = ( /obj/structure/sign/poster/prewar/poster94, /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/m) +======= +"vtH" = ( +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "vtI" = ( /obj/structure/barricade/wooden/strong, /turf/closed/wall/r_wall/rust, /area/f13/wasteland/town) +<<<<<<< Updated upstream "vtL" = ( /obj/structure/flora/grass/coyote/twentysix, /turf/open/indestructible/ground/outside/desert, @@ -71889,6 +85537,12 @@ /obj/structure/reagent_dispensers/compostbin, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"vtQ" = ( +/obj/structure/table/wood/club, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "vtU" = ( /obj/structure/curtain{ pixel_x = 32 @@ -71896,6 +85550,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, /area/f13/clinic) +"vtW" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerborder" + }, +/area/f13/wasteland) "vuf" = ( /obj/structure/sink{ dir = 1; @@ -71917,6 +85577,19 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/p) +<<<<<<< Updated upstream +======= +"vui" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/structure/wreck/trash/bus_door, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "vuk" = ( /turf/open/indestructible/ground/outside/dirthole, /area/f13/wasteland) @@ -72048,6 +85721,13 @@ icon_state = "redrustyfull" }, /area/f13/building/abandoned/h) +"vvu" = ( +/obj/structure/car/rubbish4{ + pixel_y = -9; + icon_state = "debris3" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "vvx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -72129,6 +85809,7 @@ }, /area/f13/wasteland) "vwC" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 5 }, @@ -72143,6 +85824,14 @@ icon_state = "horizontaloutermain1" }, /area/f13/wasteland) +======= +/turf/open/floor/plasteel/stairs{ + barefootstep = "woodbarefoot"; + color = "#A47449"; + footstep = "wood" + }, +/area/f13/caves) +>>>>>>> Stashed changes "vwI" = ( /obj/structure/debris/v3{ pixel_x = -12; @@ -72162,6 +85851,7 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "vxq" = ( +<<<<<<< Updated upstream /obj/structure/table/wood/junk, /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/floor/wood_fancy, @@ -72173,6 +85863,25 @@ /obj/item/clothing/shoes/f13/jamrock, /obj/item/clothing/suit/armor/outfit/jacket/jamrock, /turf/open/floor/plasteel/vaporwave, +======= +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/freezer, +/obj/item/reagent_containers/food/snacks/icecream, +/obj/item/reagent_containers/food/snacks/icecream, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/turf/open/floor/plasteel/rockvault/alien, +/area/f13/ambientlighting/building/m) +"vxu" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +"vxC" = ( +/obj/structure/girder, +/turf/open/indestructible/ground/outside/ruins, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "vxP" = ( /obj/structure/simple_door/house{ @@ -72238,6 +85947,7 @@ }, /area/f13/ambientlighting/building/i) "vyT" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood{ icon_state = "floor6"; pixel_x = -18; @@ -72245,6 +85955,11 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +======= +/obj/structure/flora/grass/coyote/thirteen, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "vzn" = ( /obj/structure/rack/shelf_metal, /obj/item/flashlight/flare/torch, @@ -72332,8 +86047,14 @@ }, /area/f13/building/abandoned/h) "vAd" = ( +<<<<<<< Updated upstream /obj/item/stack/sheet/mineral/plasma/twentyfive, /turf/open/indestructible/ground/outside/ruins, +======= +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/barricade/wooden, +/turf/open/floor/plasteel/vaporwave, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/j) "vAf" = ( /obj/structure/curtain{ @@ -72375,10 +86096,18 @@ /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) "vAW" = ( +<<<<<<< Updated upstream /obj/effect/spawner/lootdrop/f13/junkspawners, /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +======= +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_3" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "vBa" = ( /turf/open/indestructible/ground/outside/ruins{ dir = 4; @@ -72401,6 +86130,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"vBr" = ( +/obj/machinery/power/apc/fusebox/south, +/obj/structure/cable/outdoors, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "vBv" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/road{ @@ -72449,6 +86183,23 @@ /obj/structure/beebox, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream +======= +"vCa" = ( +/obj/machinery/door/unpowered/secure_NCR{ + name = "Medical" + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "vCb" = ( /obj/structure/legion_extractor, /turf/open/floor/wood_common{ @@ -72485,6 +86236,16 @@ }, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +<<<<<<< Updated upstream +======= +"vCA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/fo13colored/Red{ + dir = 1 + }, +/turf/open/floor/plating/rust, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "vCN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -72505,6 +86266,16 @@ /obj/structure/flora/tree/oak_three, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"vCU" = ( +/obj/structure/sign/poster/prewar/poster60, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) +"vDa" = ( +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "vDf" = ( /obj/structure/table, /obj/machinery/reagentgrinder, @@ -72559,6 +86330,7 @@ }, /area/f13/legioncamp) "vDy" = ( +<<<<<<< Updated upstream /obj/structure/destructible/tribal_torch/wall/lit{ dir = 4; light_color = "#f4e3b0" @@ -72576,6 +86348,10 @@ icon_state = "verticalinnermain0" }, /area/f13/ncr) +======= +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "vDU" = ( /obj/effect/decal/marking, /turf/open/indestructible/ground/outside/road{ @@ -72683,7 +86459,14 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) "vFU" = ( +<<<<<<< Updated upstream /turf/closed/mineral/random/high_chance, +======= +/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "vFW" = ( /obj/machinery/seed_extractor, @@ -72863,6 +86646,15 @@ /obj/item/reagent_containers/food/snacks/friedegg, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"vHR" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) "vHT" = ( /obj/structure/fence{ dir = 4 @@ -72871,9 +86663,15 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) "vIm" = ( +<<<<<<< Updated upstream /obj/structure/grille, /turf/open/indestructible/ground/outside/water/running, /area/f13/caves) +======= +/obj/structure/chair/stool, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "vIu" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/inside/dirt, @@ -72973,6 +86771,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/engine/workshop) +<<<<<<< Updated upstream +======= +"vJN" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/blood{ + dir = 6; + icon_state = "tracks" + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "vJU" = ( /obj/structure/chair{ dir = 4 @@ -72999,6 +86808,13 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"vKH" = ( +/obj/machinery/photocopier, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "vKM" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3, @@ -73087,6 +86903,7 @@ /mob/living/simple_animal/hostile/raider/sulphite, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream "vMj" = ( /obj/effect/decal/fakelattice, /obj/structure/railing/wood/post{ @@ -73097,6 +86914,14 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"vMt" = ( +/obj/item/storage/belt/military/alt, +/obj/item/storage/belt/military/alt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "vMK" = ( /obj/machinery/light/small{ dir = 8; @@ -73107,6 +86932,14 @@ icon_state = "dark" }, /area/f13/brotherhood) +<<<<<<< Updated upstream +======= +"vMM" = ( +/obj/structure/barricade/wooden, +/obj/effect/overlay/desert/sonora/edge, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "vMO" = ( /obj/structure/chair/bench, /turf/open/floor/f13/wood, @@ -73199,6 +87032,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "vOf" = ( +<<<<<<< Updated upstream /turf/open/indestructible/ground/outside/road{ dir = 4; icon_state = "innermaincornerinner" @@ -73214,6 +87048,19 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) +======= +/obj/effect/mapping_helpers/network_builder/power_cable/auto, +/turf/closed/wall/f13/wood, +/area/f13/brotherhood) +"vOh" = ( +/obj/structure/fence/wooden, +/obj/item/flag/legion{ + pixel_y = 28; + pixel_x = 1 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "vOi" = ( /obj/structure/fence/wooden{ dir = 1 @@ -73285,12 +87132,18 @@ /obj/effect/overlay/desert/sonora/edge, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/town) +<<<<<<< Updated upstream "vPM" = ( /obj/structure/rack/shelf_metal, /obj/effect/spawner/lootdrop/tool_box, /obj/effect/spawner/lootdrop/tool_box, /obj/item/salvage/tool, /turf/open/indestructible/ground/outside/sidewalk, +======= +"vPQ" = ( +/obj/effect/decal/cleanable/ash, +/turf/open/floor/plasteel/grimy, +>>>>>>> Stashed changes /area/f13/ncr) "vPV" = ( /obj/effect/decal/cleanable/blood, @@ -73501,6 +87354,7 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "vTo" = ( +<<<<<<< Updated upstream /obj/structure/table/wood, /obj/item/smelling_salts, /obj/effect/decal/cleanable/dirt, @@ -73526,6 +87380,23 @@ name = "dirty floor" }, /area/f13/brotherhood) +======= +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt"; + dir = 1 + }, +/area/f13/wasteland/legion) +"vTy" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +"vTF" = ( +/turf/closed/mineral/random/no_caves, +/area/f13/ncr) +>>>>>>> Stashed changes "vTH" = ( /obj/structure/simple_door/interior, /turf/open/floor/plasteel/f13/vault_floor/misc/bar, @@ -73571,6 +87442,13 @@ }, /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/c) +"vUx" = ( +/obj/structure/window/fulltile/house/broken, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) "vUH" = ( /obj/effect/decal/marking, /turf/open/indestructible/ground/outside/road{ @@ -73671,6 +87549,18 @@ /obj/structure/junk/small/table, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"vWy" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticalcorroded"; + pixel_x = -14 + }, +/obj/structure/car/rubbish3{ + icon_state = "car_rubish2" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) "vWB" = ( /obj/effect/decal/marking{ icon_state = "dottedhorizontalcorroded" @@ -73689,6 +87579,13 @@ icon_state = "dark" }, /area/f13/ambientlighting/building/o) +"vWU" = ( +/obj/machinery/computer/camera_advanced{ + id = "veryevilnetwork" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/f13/building/powered) "vWW" = ( /obj/machinery/light/floor, /turf/open/floor/plating/rust, @@ -73786,6 +87683,11 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +"vYE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/icecream_vat, +/turf/open/floor/plasteel/bar, +/area/f13/ambientlighting/building/m) "vZb" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 4 @@ -73794,9 +87696,13 @@ /turf/open/indestructible/ground/outside/ruins, /area/f13/wasteland) "vZc" = ( +<<<<<<< Updated upstream /obj/item/storage/trash_stack{ pixel_y = 17 }, +======= +/obj/effect/decal/fakelattice, +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "vZd" = ( @@ -73868,6 +87774,15 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned/g) +<<<<<<< Updated upstream +======= +"was" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "waA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -73909,11 +87824,22 @@ icon_state = "housewood2" }, /area/f13/ambientlighting/building/w) +<<<<<<< Updated upstream "waN" = ( /obj/effect/decal/cleanable/dirt, /obj/item/broom, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +"waK" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "waO" = ( /obj/structure/flora/tree/wasteland, /turf/open/indestructible/ground/outside/sidewalk{ @@ -73927,6 +87853,7 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +<<<<<<< Updated upstream "waW" = ( /obj/structure/window/fulltile/house, /obj/structure/curtain{ @@ -73935,6 +87862,27 @@ /obj/structure/barricade/wooden/planks, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/ncr) +======= +"wbf" = ( +/obj/structure/cargocrate{ + icon_state = "cargocrate2" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +"wbg" = ( +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +"wby" = ( +/obj/effect/decal/cleanable/oil{ + pixel_x = -8 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "wbz" = ( /obj/structure/fence{ dir = 8 @@ -74043,8 +87991,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/j) +<<<<<<< Updated upstream "wde" = ( /obj/effect/decal/cleanable/oil/slippery, +======= +"wcT" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland/legion) +"wdk" = ( +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/cloth/three, +/obj/item/stack/sheet/leather/ten, +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "wdq" = ( @@ -74084,6 +88043,18 @@ icon_state = "innermaincornerouter" }, /area/f13/building/lower_firetower) +<<<<<<< Updated upstream +======= +"wdV" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "wea" = ( /obj/structure/curtain{ color = "#845f58" @@ -74122,6 +88093,7 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) "wer" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood/club, /obj/item/clothing/suit/armor/outfit/vest, @@ -74129,6 +88101,11 @@ /obj/item/clothing/suit/armor/outfit/vest, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/item/clothing/head/crown, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "wes" = ( /obj/machinery/door/poddoor/shutters{ id = "hospitalgarage1"; @@ -74163,6 +88140,7 @@ }, /area/f13/wasteland) "weQ" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 8 }, @@ -74171,6 +88149,19 @@ icon_state = "dirt" }, /area/f13/wasteland) +======= +/obj/structure/chair/sofa/right{ + color = "#475340"; + dir = 4; + pixel_x = 5 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "weR" = ( /obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt{ @@ -74350,11 +88341,16 @@ /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) "wid" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/generic, /obj/effect/spawner/lootdrop/f13/junkspawners, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, +======= +/obj/item/trash/f13/mre, +/turf/open/indestructible/ground/outside/desert, +>>>>>>> Stashed changes /area/f13/wasteland) "wie" = ( /obj/structure/closet/locker, @@ -74385,6 +88381,15 @@ smooth = 1 }, /area/f13/ambientlighting/building/o) +<<<<<<< Updated upstream +======= +"wiE" = ( +/obj/machinery/light/lampost{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/road, +/area/f13/wasteland) +>>>>>>> Stashed changes "wiN" = ( /obj/structure/sink/greyscale{ pixel_y = 20 @@ -74555,6 +88560,7 @@ }, /area/f13/ambientlighting/building/i) "wkQ" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 10 }, @@ -74563,6 +88569,12 @@ }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland) +======= +/obj/effect/spawner/lootdrop/f13/crafting, +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "wkX" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowvertical" @@ -74582,12 +88594,18 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "wlf" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden/strong, /obj/structure/barricade/wooden/planks/pregame, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalleftborderleft0" }, /area/f13/wasteland) +======= +/obj/structure/junk/small/tv, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "wlg" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /obj/machinery/door/airlock/virology/glass{ @@ -74598,7 +88616,14 @@ "wli" = ( /turf/closed/wall/f13/wood/interior, /area/f13/ambientlighting/building/q) +"wln" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2" + }, +/area/f13/wasteland) "wlq" = ( +<<<<<<< Updated upstream /obj/structure/car/rubbish2{ pixel_x = 7; pixel_y = -16 @@ -74610,6 +88635,11 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +======= +/obj/structure/rack/large/shelf_rust, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "wlt" = ( /obj/effect/overlay/desert/sonora/edge/corner{ dir = 4 @@ -74683,6 +88713,17 @@ icon_state = "outercorner" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"wmc" = ( +/obj/structure/closet/secure_closet/freezer, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/food/drinks/soda_cans/cream, +/obj/item/reagent_containers/food/drinks/soda_cans/cream, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/turf/open/floor/plasteel/rockvault/alien, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "wmi" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -74692,10 +88733,17 @@ /turf/open/floor/carpet, /area/f13/ambientlighting/building/d) "wmm" = ( +<<<<<<< Updated upstream /turf/open/floor/f13{ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/m) +======= +/obj/machinery/power/floodlight, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "wmn" = ( /obj/structure/rack/large/shelf_rust, /obj/effect/spawner/lootdrop/ammo/fiftypercent, @@ -74732,15 +88780,33 @@ icon_state = "outerbordercorner" }, /area/f13/wasteland) +"wmK" = ( +/obj/structure/flora/wasteplant/wild_fungus, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "wna" = ( /obj/structure/barricade/tentclothedge, /obj/effect/overlay/desert_side, /obj/structure/decoration/rag, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +<<<<<<< Updated upstream "wnm" = ( /obj/effect/decal/cleanable/shreds, /turf/open/indestructible/ground/inside/mountain, +======= +"wnb" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "wnn" = ( /obj/item/storage/trash_stack, @@ -74769,7 +88835,12 @@ /obj/effect/landmark/start/f13/dendoc, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/clinic) +"wnE" = ( +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/m) "wnP" = ( +<<<<<<< Updated upstream /obj/structure/fence/corner{ dir = 4 }, @@ -74790,6 +88861,14 @@ icon_state = "horizontaloutermain2" }, /area/f13/wasteland) +======= +/obj/structure/rack/large/shelf_rust{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/toolsbasic, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "wnZ" = ( /obj/effect/overlay/desert/sonora/edge{ dir = 4 @@ -74804,6 +88883,14 @@ /obj/structure/sign/warning/nosmoking/circle, /turf/closed/wall/f13/wood/house, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"wob" = ( +/obj/effect/decal/fakelattice, +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "wom" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticaloutermain2top" @@ -74823,6 +88910,21 @@ "wot" = ( /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream +======= +"woy" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/window/fulltile/house{ + icon_state = "housewindowbroken" + }, +/obj/structure/curtain{ + color = "#363636" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "woz" = ( /obj/structure/flora/tree/wasteland, /turf/open/indestructible/ground/outside/dirt{ @@ -74882,11 +88984,32 @@ /turf/open/floor/wood_common, /area/maintenance/bar) "wpI" = ( +<<<<<<< Updated upstream /obj/structure/fluff/paper/stack{ dir = 5 }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) +======= +/obj/effect/overlay/desert/sonora/edge/corner{ + dir = 8 + }, +/obj/structure/destructible/tribal_torch/wall/lit, +/obj/structure/barricade/wooden, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +"wpJ" = ( +/obj/structure/fluff/railing/corner{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 8; + icon_state = "outerbordercorner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "wpN" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -75051,6 +89174,7 @@ }, /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) +<<<<<<< Updated upstream "wrX" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/power/port_gen/pacman/diesel{ @@ -75069,6 +89193,15 @@ icon_state = "dark" }, /area/f13/brotherhood/surface) +======= +"wsc" = ( +/obj/effect/decal/cleanable/generic, +/obj/structure/cable/outdoors{ + icon_state = "2-4" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "wsd" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" @@ -75096,9 +89229,24 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) "wsn" = ( +<<<<<<< Updated upstream /obj/structure/table, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) +>>>>>>> Stashed changes "wsp" = ( /obj/structure/curtain{ color = "#5c131b"; @@ -75177,6 +89325,7 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/indestructible/ground/outside/grass, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream "wsX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/f13/crafting, @@ -75189,6 +89338,37 @@ icon_state = "dirt" }, /area/f13/wasteland) +======= +"wtd" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +"wth" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_x = 16 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/obj/structure/railing/wood/underlayer, +/obj/structure/railing/wood/underlayer{ + pixel_y = 23 + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 39; + pixel_x = -16 + }, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) +>>>>>>> Stashed changes "wtj" = ( /obj/structure/legion_extractor, /turf/open/indestructible/ground/inside/dirt, @@ -75371,6 +89551,17 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) +"wvH" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) "wvO" = ( /obj/machinery/microwave/stove, /obj/item/melee/onehanded/knife/cosmic, @@ -75416,12 +89607,24 @@ }, /area/f13/ambientlighting/building/b) "wwj" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/structure/table/booth, /obj/structure/fluff/beach_umbrella/security{ pixel_y = 22 }, /turf/open/floor/plasteel/bar, +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2top" + }, +>>>>>>> Stashed changes /area/f13/wasteland) "wwx" = ( /obj/effect/decal/cleanable/dirt{ @@ -75451,6 +89654,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream "wwK" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/ghoul, @@ -75459,6 +89663,24 @@ "wwR" = ( /turf/closed/wall/f13/wood/house, /area/f13/building/abandoned/j) +======= +"wwO" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright2bottom" + }, +/area/f13/wasteland) +"wwR" = ( +/turf/closed/wall/f13/wood/house, +/area/f13/building/abandoned/j) +"wwS" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "wxc" = ( /obj/structure/flora/wasteplant/wild_xander, /turf/open/indestructible/ground/outside/dirt{ @@ -75542,6 +89764,13 @@ /obj/effect/landmark/start/f13/tribal_new, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"wxY" = ( +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "wyh" = ( /obj/structure/fence{ dir = 4 @@ -75590,6 +89819,13 @@ name = "dirty floor" }, /area/f13/building/powered) +"wyy" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy, +/obj/structure/barricade/bars, +/obj/effect/spawner/structure/window/reinforced/indestructable, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "wyz" = ( /obj/structure/rack/shelf_metal, /obj/effect/spawner/lootdrop/f13/advcrafting, @@ -75672,7 +89908,11 @@ }, /area/f13/wasteland) "wzW" = ( +<<<<<<< Updated upstream /mob/living/simple_animal/hostile/renegade/defender, +======= +/obj/effect/decal/cleanable/blood/tracks, +>>>>>>> Stashed changes /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, @@ -75718,6 +89958,13 @@ "wAl" = ( /turf/open/floor/f13/wood, /area/f13/building/abandoned/m) +<<<<<<< Updated upstream +======= +"wAn" = ( +/obj/effect/spawner/lootdrop/f13/crafting, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "wAr" = ( /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds, /obj/structure/table/reinforced, @@ -75740,10 +89987,27 @@ /obj/item/clothing/suit/toggle/labcoat/depjacket/sup/qm, /turf/open/floor/plasteel/vaporwave, /area/f13/ambientlighting/building/j) +<<<<<<< Updated upstream "wAU" = ( /obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +"wAK" = ( +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +"wAU" = ( +/obj/structure/table/wood/club, +/obj/effect/spawner/lootdrop/three_course_meal, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "wBa" = ( /obj/structure/simple_door/tent{ color = "#7c0A02" @@ -75841,6 +90105,7 @@ /turf/closed/mineral/random, /area/f13/wasteland) "wCM" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/item/storage/trash_stack{ icon_state = "trash_3" @@ -75853,6 +90118,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/obj/structure/sign/do_not_enter, +/obj/effect/turf_decal/siding/wood, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "wCV" = ( /obj/structure/fence/pole_t, /obj/structure/railing{ @@ -75944,7 +90226,19 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain0" }, +<<<<<<< Updated upstream /area/f13/casino) +======= +/area/f13/brotherhood) +"wDP" = ( +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "wDT" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/mineral/wasteland_vendor/advcomponents, @@ -75952,6 +90246,16 @@ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/f) +"wDU" = ( +/obj/structure/table/booth, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, +/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "wEb" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/ammo/shotgun, @@ -75979,6 +90283,7 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "wEh" = ( +<<<<<<< Updated upstream /obj/effect/decal/marking{ icon_state = "dottedvertical"; pixel_x = -14 @@ -75988,11 +90293,30 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +======= +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2left" + }, +/area/f13/wasteland) +"wEl" = ( +/obj/effect/turf_decal/big{ + dir = 4 + }, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "wEq" = ( /obj/structure/reagent_dispensers/barrel/three, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) "wED" = ( +<<<<<<< Updated upstream /obj/structure/window/fulltile/house{ icon_state = "housewindowbrokenvertical" }, @@ -76000,6 +90324,18 @@ /obj/structure/barricade/bars, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/effect/spawner/lootdrop/f13/seedspawner, +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + pixel_x = -16 + }, +/turf/open/floor/wood_common, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "wEK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/barrel/dangerous, @@ -76020,6 +90356,13 @@ icon_state = "bluedirtychess2" }, /area/f13/brotherhood) +<<<<<<< Updated upstream +======= +"wEO" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) +>>>>>>> Stashed changes "wEU" = ( /obj/effect/mapping_helpers/network_builder/power_cable/auto, /obj/structure/railing{ @@ -76155,7 +90498,25 @@ /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/powered) "wGw" = ( +<<<<<<< Updated upstream /obj/effect/overlay/desert/sonora/edge{ +======= +/obj/effect/decal/fakelattice, +/obj/machinery/light{ + dir = 4; + flickering = 1 + }, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +"wGB" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +"wGF" = ( +/obj/structure/fence{ +>>>>>>> Stashed changes dir = 4 }, /turf/open/indestructible/ground/outside/sidewalk{ @@ -76209,6 +90570,15 @@ /obj/effect/spawner/lootdrop/f13/weapon/gun/energy/low, /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) +<<<<<<< Updated upstream +======= +"wHk" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "wHl" = ( /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" @@ -76231,6 +90601,13 @@ icon_state = "horizontalinnermainleft" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"wHC" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide, +/area/f13/wasteland) +>>>>>>> Stashed changes "wHH" = ( /obj/machinery/smartfridge/bottlerack/lootshelf, /turf/open/floor/f13{ @@ -76376,6 +90753,12 @@ /obj/structure/flora/tree/tall, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland/legion) +<<<<<<< Updated upstream +======= +"wJz" = ( +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "wKh" = ( /obj/structure/car, /obj/structure/tires/five, @@ -76402,6 +90785,21 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/y) +<<<<<<< Updated upstream +======= +"wKv" = ( +/obj/structure/fluff/paper{ + dir = 5 + }, +/obj/structure/table{ + layer = 10 + }, +/obj/item/warpaint_bowl, +/obj/item/paint/anycolor, +/obj/item/paint/anycolor, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "wKA" = ( /obj/machinery/light/small{ dir = 8 @@ -76441,6 +90839,20 @@ icon_state = "bluedirtychess2" }, /area/f13/ambientlighting/building/y) +"wLl" = ( +/obj/structure/table/wood/junk, +/obj/item/clothing/mask/cigarette/rollie/cannabis{ + pixel_y = 15 + }, +/obj/item/clothing/mask/cigarette/rollie/cannabis{ + pixel_y = 10 + }, +/obj/item/clothing/mask/cigarette/rollie/cannabis{ + pixel_y = 5 + }, +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) "wLm" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/crafting, @@ -76644,6 +91056,14 @@ "wOi" = ( /turf/open/indestructible/ground/outside/graveldirt, /area/f13/caves) +<<<<<<< Updated upstream +======= +"wOu" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticaloutermain2top" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "wOB" = ( /obj/structure/flora/tree/oak_one, /turf/open/indestructible/ground/outside/grass, @@ -76666,6 +91086,13 @@ /obj/machinery/vending/boozeomat, /turf/closed/wall/f13/wood/house, /area/f13/ambientlighting/building/w) +<<<<<<< Updated upstream +======= +"wOQ" = ( +/obj/structure/barricade/wooden/planks, +/turf/closed/wall/f13/wood/interior, +/area/f13/ncr) +>>>>>>> Stashed changes "wOT" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4"; @@ -76725,12 +91152,31 @@ /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/legion) +<<<<<<< Updated upstream +======= +"wPK" = ( +/obj/structure/fluff/paper/stack, +/obj/effect/decal/remains/human, +/obj/item/gun/ballistic/revolver/hobo/piperifle, +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6" + }, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "wPL" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/indestructible/ground/outside/grass/dirtpath{ dir = 8 }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"wPM" = ( +/obj/item/stack/sheet/mineral/concrete, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "wPP" = ( /obj/machinery/light/small{ dir = 8 @@ -76745,6 +91191,17 @@ }, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/e) +<<<<<<< Updated upstream +======= +"wQl" = ( +/obj/structure/statue/petrified, +/obj/item/clothing/suit/armor/outfit/jacket/police/lieutenant{ + layer = 5 + }, +/obj/item/clothing/under/rank/civilian/victorianblackdress, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "wQp" = ( /obj/structure/car/rubbish4{ desc = "A rusty Pre-War Fire Engine carcass.. or at least you think that's what this is.
This carcass is damaged beyond repair."; @@ -76761,6 +91218,32 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"wQC" = ( +/obj/item/reagent_containers/glass/rag/towel, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +"wQF" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-2" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "horizontaloutermain1" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "wQI" = ( /obj/structure/debris/v2, /turf/open/floor/f13{ @@ -76882,10 +91365,17 @@ "wSd" = ( /turf/closed/wall/f13/wood, /area/f13/building/abandoned) +<<<<<<< Updated upstream "wSh" = ( /obj/structure/flora/grass/coyote/eighteen, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"wSe" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "wSi" = ( /obj/effect/overlay/desert_side{ dir = 1 @@ -76911,6 +91401,7 @@ }, /area/f13/wasteland) "wSu" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 9 }, @@ -76924,6 +91415,29 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/f13/wood, +/area/f13/ambientlighting/building/m) +"wSA" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 28 + }, +/obj/item/gun/ballistic/automatic/service, +/obj/item/gun/ballistic/automatic/service{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/gun/ballistic/automatic/service{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/structure/guncase{ + anchored = 1 + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) +>>>>>>> Stashed changes "wSB" = ( /obj/structure/car/rubbish1, /turf/open/indestructible/ground/outside/road{ @@ -76960,6 +91474,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) +"wSU" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib1"; + pixel_y = -6 + }, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirt" + }, +/area/f13/wasteland) "wTh" = ( /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ name = "rusted floor" @@ -77029,9 +91554,22 @@ }, /area/f13/brotherhood) "wUg" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/trash_stack{ + icon_state = "Junk_10" + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +"wUi" = ( +/obj/machinery/light, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "wUj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/storage/box/drinkingglasses, @@ -77180,9 +91718,15 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "wWn" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/vg_decals/numbers/zero, /turf/closed/wall/f13/store, /area/f13/ambientlighting/building/m) +======= +/obj/structure/billboard/hubris2, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "wWy" = ( /obj/structure/chair{ dir = 8 @@ -77265,10 +91809,17 @@ /turf/open/floor/plating/rust, /area/f13/building/powered) "wXr" = ( +<<<<<<< Updated upstream /obj/structure/flora/wasteplant/wild_fungus, /obj/effect/decal/cleanable/blood{ icon_state = "tracks" }, +======= +/obj/effect/decal/cleanable/blood{ + icon_state = "floor6" + }, +/obj/effect/gibspawner/human/bodypartless, +>>>>>>> Stashed changes /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "wXs" = ( @@ -77306,6 +91857,16 @@ icon_state = "dirt" }, /area/f13/wasteland/legion) +<<<<<<< Updated upstream +======= +"wYD" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "wYM" = ( /obj/structure/window/fulltile/house{ dir = 2 @@ -77338,6 +91899,12 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"wZv" = ( +/turf/open/indestructible/ground/outside/desert, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "wZH" = ( /turf/open/indestructible/ground/outside/roaddirt{ dir = 8; @@ -77378,9 +91945,15 @@ /turf/open/floor/wood_common, /area/f13/clinic) "xae" = ( +<<<<<<< Updated upstream /obj/structure/flora/grass/coyote/twentytwo, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/effect/spawner/lootdrop/f13/cash_random_low, +/turf/open/floor/plasteel/grimy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "xag" = ( /mob/living/simple_animal/hostile/ghoul/reaver, /obj/effect/decal/cleanable/dirt, @@ -77401,6 +91974,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) "xav" = ( +<<<<<<< Updated upstream /obj/structure/car/rubbish4{ pixel_y = -9; icon_state = "debris1" @@ -77408,6 +91982,17 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, +======= +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/components/unary/tank/bz, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/floor/plating/f13, +>>>>>>> Stashed changes /area/f13/wasteland) "xax" = ( /obj/structure/barricade/sandbags, @@ -77430,9 +92015,19 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/q) "xaK" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/stone, /area/f13/ambientlighting/building/m) +======= +/obj/machinery/vending/wallmed{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "xaT" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6"; @@ -77459,6 +92054,10 @@ name = "dirty floor" }, /area/f13/building/powered) +"xaY" = ( +/obj/machinery/autolathe, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/ncr) "xbe" = ( /obj/structure/wreck/trash/machinepiletwo, /obj/effect/decal/cleanable/dirt/dust{ @@ -77538,17 +92137,28 @@ icon_state = "verticaloutermain3" }, /area/f13/wasteland) +<<<<<<< Updated upstream "xcO" = ( +======= +"xcY" = ( +>>>>>>> Stashed changes /obj/structure/railing/wood/post{ desc = "A wooden stanchion."; name = "wooden stanchion"; pixel_y = -4; +<<<<<<< Updated upstream pixel_x = 16 }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) +======= + pixel_x = -16 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/ncr) +>>>>>>> Stashed changes "xdb" = ( /turf/closed/wall/f13/store{ desc = "A pre-War wall made of solid concrete."; @@ -77564,11 +92174,24 @@ }, /area/f13/wasteland) "xdg" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 1 }, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/bed/mattress{ + icon_state = "mattress4"; + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/bedsheet/blanket{ + pixel_y = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "xdm" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/trash_stack, @@ -77659,10 +92282,26 @@ icon_state = "bluedirtychess2" }, /area/f13/brotherhood) +<<<<<<< Updated upstream "xew" = ( /turf/open/floor/f13/wood{ icon_state = "housewood3-broken" }, +======= +"xey" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/obj/structure/simple_door/tent, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +"xeD" = ( +/obj/structure/table/snooker{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/f13/alcoholspawner, +/turf/open/floor/wood_fancy, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "xeI" = ( /obj/structure/car/rubbish3, @@ -77689,6 +92328,11 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"xfn" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul/reaver, +/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, +/area/f13/ambientlighting/building/m) "xfo" = ( /obj/structure/simple_door/tentflap_cloth{ pixel_y = -4 @@ -77725,6 +92369,7 @@ /turf/closed/indestructible/f13/obsidian, /area/f13/tunnel) "xfE" = ( +<<<<<<< Updated upstream /obj/item/storage/trash_stack{ icon_state = "trash_2" }, @@ -77745,6 +92390,23 @@ icon_state = "horizontaloutermain2left" }, /area/f13/wasteland) +======= +/obj/structure/sink/well{ + pixel_x = -20 + }, +/obj/structure/flora/grass/jungle/b{ + icon_state = "grassb3"; + pixel_x = -5; + pixel_y = 1 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/legioncamp) +"xfJ" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/planks/pregame, +/turf/closed/mineral/random/low_chance, +/area/f13/caves) +>>>>>>> Stashed changes "xfK" = ( /obj/structure/sacrificealtar{ density = 1; @@ -77809,9 +92471,26 @@ /obj/structure/table/snooker{ dir = 6 }, +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +/area/f13/wasteland/legion) +"xgP" = ( +/obj/structure/decoration/vent, +/turf/closed/wall/f13/store, +/area/f13/ambientlighting/building/m) +"xgQ" = ( +/obj/effect/decal/cleanable/generic{ + pixel_x = -8 + }, +/turf/open/indestructible/ground/outside/dirt{ + dir = 8; + icon_state = "dirt" + }, +/area/f13/wasteland/legion) +>>>>>>> Stashed changes "xgS" = ( /obj/structure/closet/locker, /obj/effect/decal/cleanable/dirt/dust, @@ -77824,6 +92503,15 @@ /obj/item/clothing/suit/beekeeper_suit, /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) +"xgV" = ( +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = 16 + }, +/turf/closed/wall/mineral/brick, +/area/f13/ncr) "xgW" = ( /obj/structure/car/rubbish4{ desc = "A rusty Pre-War Fire Engine carcass.. or at least you think that's what this is.
This carcass is damaged beyond repair."; @@ -77838,6 +92526,15 @@ /obj/structure/flora/tree/jungle, /turf/open/indestructible/ground/outside/grass, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream +======= +"xhh" = ( +/obj/structure/closet/crate/trashcart, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "xhl" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/grown/pungafruit, @@ -77898,6 +92595,13 @@ }, /turf/open/indestructible/ground/outside/grass, /area/f13/wasteland) +"xhW" = ( +/obj/item/storage/trash_stack{ + icon_state = "Junk_3" + }, +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "xhZ" = ( /obj/structure/lattice, /obj/machinery/light/fo13colored/Red{ @@ -77936,12 +92640,19 @@ }, /turf/open/indestructible/ground/outside/dirthole, /area/f13/wasteland) +<<<<<<< Updated upstream "xiG" = ( /obj/structure/chair/bench{ dir = 1 }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +======= +"xiF" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "xiS" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/reagent_dispensers/barrel/three, @@ -78133,6 +92844,18 @@ dir = 4 }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"xln" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain2bottom" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "xlp" = ( /obj/structure/grille/ratvar{ name = "radio antenna" @@ -78142,6 +92865,15 @@ }, /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/building/abandoned/l) +<<<<<<< Updated upstream +======= +"xlt" = ( +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_5" + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "xlu" = ( /obj/structure/filingcabinet, /obj/structure/filingcabinet{ @@ -78187,6 +92919,18 @@ }, /turf/open/floor/f13/wood, /area/f13/legioncamp) +"xmk" = ( +/obj/item/stack/sheet/mineral/wood/twenty, +/obj/item/stack/sheet/mineral/wood/twenty, +/obj/structure/shelf_wood, +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" + }, +/turf/open/floor/f13/wood{ + icon_state = "housewood1-broken" + }, +/area/f13/ambientlighting/building/m) "xml" = ( /obj/structure/fence/corner, /obj/effect/overlay/desert_side{ @@ -78210,6 +92954,15 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"xmv" = ( +/obj/effect/decal/remains/human, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "xmx" = ( /obj/effect/decal/cleanable/blood/old{ icon_state = "gibbear1" @@ -78277,6 +93030,7 @@ }, /area/f13/ambientlighting/building/u) "xnp" = ( +<<<<<<< Updated upstream /obj/structure/table/snooker{ dir = 5 }, @@ -78284,6 +93038,13 @@ /obj/effect/spawner/lootdrop/f13/alcoholspawner, /turf/open/floor/wood_fancy, /area/f13/ambientlighting/building/m) +======= +/obj/structure/chair/bench{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +>>>>>>> Stashed changes "xnG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack/large/shelf_rust, @@ -78294,11 +93055,33 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream "xnM" = ( /obj/effect/spawner/lootdrop/f13/crafting, /obj/effect/spawner/lootdrop/wastelootgood, /turf/open/floor/wood_common/wood_common_light, /area/f13/building/powered) +======= +"xnL" = ( +/obj/structure/car/rubbish2{ + icon_state = "car_rubish3" + }, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +"xnR" = ( +/obj/structure/table/wood/junk, +/obj/structure/fluff/paper/stack{ + desc = "A stack of various papers, illegible scribbles scattered across each page."; + pixel_x = 6 + }, +/turf/open/floor/carpet/black, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "xnV" = ( /obj/structure/barricade/wooden, /turf/closed/mineral/random/low_chance, @@ -78315,6 +93098,7 @@ /turf/open/floor/wood_wide, /area/f13/building/abandoned/g) "xom" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/booth, /obj/item/dice/d100, @@ -78325,6 +93109,18 @@ /obj/effect/spawner/lootdrop/cigars_cases, /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) +======= +/obj/effect/overlay/rockfloor_side, +/turf/open/indestructible/ground/outside/road{ + icon_state = "horizontalinnermain1" + }, +/area/f13/wasteland) +"xoA" = ( +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "xoL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/hydroponics/constructable, @@ -78337,6 +93133,10 @@ /turf/closed/wall/f13/tentwall, /area/f13/wasteland/legion) "xoR" = ( +<<<<<<< Updated upstream +======= +/obj/structure/stairs/east, +>>>>>>> Stashed changes /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/j) "xoT" = ( @@ -78397,11 +93197,18 @@ /turf/open/indestructible/ground/outside/road, /area/f13/wasteland) "xpW" = ( +<<<<<<< Updated upstream /obj/structure/table/wood/club, /obj/effect/spawner/lootdrop/f13/cash_random_low, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/m) +======= +/obj/effect/decal/fakelattice, +/obj/item/electropack/shockcollar/explosive, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "xpX" = ( /obj/machinery/door/airlock/engineering, /obj/effect/decal/cleanable/dirt, @@ -78450,12 +93257,20 @@ /mob/living/simple_animal/hostile/mirelurk/hunter, /turf/open/indestructible/ground/inside/mountain, /area/f13/underground/cave) +<<<<<<< Updated upstream "xqH" = ( /obj/structure/fence/corner{ dir = 4 }, /turf/open/indestructible/ground/outside/ruins, /area/f13/ambientlighting/building/j) +======= +"xqz" = ( +/obj/effect/gibspawner/human/bodypartless, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +>>>>>>> Stashed changes "xqI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/apc/fusebox/south, @@ -78536,6 +93351,16 @@ smooth = 1 }, /area/f13/building/abandoned/h) +"xrL" = ( +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/effect/spawner/lootdrop/f13/junkspawners, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft1" + }, +/area/f13/wasteland) "xrO" = ( /obj/structure/decoration/rag{ icon_state = "skin" @@ -78548,6 +93373,20 @@ icon_state = "floorrusty" }, /area/f13/building/powered) +"xrV" = ( +/obj/effect/decal/marking{ + icon_state = "dottedverticaldegraded" + }, +/obj/structure/car/rubbish3{ + icon_state = "car_rubish2" + }, +/obj/structure/cable/outdoors{ + icon_state = "2-8" + }, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain1" + }, +/area/f13/wasteland) "xrX" = ( /obj/structure/closet/crate/large, /obj/item/ammo_box/c45/improvised, @@ -78616,6 +93455,19 @@ /obj/structure/fence/corner, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"xtj" = ( +/obj/structure/cable/outdoors{ + icon_state = "1-8" + }, +/obj/structure/cable/outdoors{ + icon_state = "1-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) +>>>>>>> Stashed changes "xtm" = ( /mob/living/simple_animal/hostile/ghoul, /obj/effect/decal/cleanable/dirt, @@ -78641,10 +93493,25 @@ icon_state = "floorrusty" }, /area/f13/building/abandoned/h) +<<<<<<< Updated upstream "xty" = ( /obj/structure/chair/comfy{ dir = 4; pixel_x = -12 +======= +"xtt" = ( +/obj/structure/window/fulltile/house, +/obj/structure/curtain{ + color = "#363636" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +"xty" = ( +/obj/structure/tires/two, +/turf/open/indestructible/ground/outside/dirt{ + dir = 9; + icon_state = "dirt" +>>>>>>> Stashed changes }, /turf/open/floor/wood_common{ icon_state = "common-broken3" @@ -78709,6 +93576,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common/wood_common_light, /area/maintenance/bar) +<<<<<<< Updated upstream +======= +"xuQ" = ( +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "xvb" = ( /obj/structure/barricade/bars{ max_integrity = 800; @@ -78727,9 +93600,16 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) "xvq" = ( +<<<<<<< Updated upstream /obj/structure/reagent_dispensers/fueltank, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/window/fulltile/house, +/obj/structure/barricade/wooden/planks, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "xvu" = ( /obj/structure/bodycontainer/morgue, /obj/machinery/light/small{ @@ -78755,6 +93635,31 @@ icon_state = "yellowrustyfull" }, /area/f13/ambientlighting/building/f) +<<<<<<< Updated upstream +======= +"xvT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/book/granter/trait/chemistry, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) +"xvV" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/fence/corner{ + dir = 5 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 1 + }, +/area/f13/wasteland) +"xvX" = ( +/obj/effect/spawner/lootdrop/wastelootgood, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "xwa" = ( /obj/structure/chair/sofa/right{ dir = 1 @@ -78959,6 +93864,19 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating/rust, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"xyR" = ( +/obj/structure/table/wood/junk, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"xyS" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom3" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "xyU" = ( /obj/structure/rack, /obj/item/stack/sheet/metal/ten, @@ -78993,6 +93911,14 @@ icon_state = "floorrusty" }, /area/f13/followers) +<<<<<<< Updated upstream +======= +"xzj" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "xzB" = ( /obj/structure/table/wood, /turf/open/indestructible/ground/outside/sidewalk{ @@ -79018,6 +93944,13 @@ }, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/c) +<<<<<<< Updated upstream +======= +"xAc" = ( +/obj/structure/table/wood/junk, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "xAf" = ( /obj/machinery/chem_lab, /turf/closed/wall/f13/store, @@ -79059,6 +93992,7 @@ /turf/open/floor/wood_wide, /area/f13/ambientlighting/building/m) "xAJ" = ( +<<<<<<< Updated upstream /obj/structure/cargocrate, /obj/structure/sign/poster/ncr/keep_to_myself{ desc = "The man. The myth. The unknown NCR Corporal who's photo was taken years ago and is still used today in various NCR camps to encourage proper behavior."; @@ -79069,6 +94003,12 @@ icon_state = "verticalinnermain0" }, /area/f13/wasteland) +======= +/obj/effect/spawner/lootdrop/wastelootgood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13/wood, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "xBd" = ( /obj/structure/bed/mattress/pregame{ icon_state = "mattress4" @@ -79203,6 +94143,14 @@ }, /turf/open/floor/plating, /area/f13/bar) +<<<<<<< Updated upstream +======= +"xCz" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/poster/prewar/poster60, +/turf/closed/wall/f13/ruins, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "xCD" = ( /obj/structure/chair/booth{ icon_state = "booth_south_middle" @@ -79326,6 +94274,15 @@ }, /turf/open/indestructible/ground/outside/desert, /area/f13/caves) +<<<<<<< Updated upstream +======= +"xDO" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "xDP" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/greenglow, @@ -79386,12 +94343,16 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) "xEY" = ( +<<<<<<< Updated upstream /obj/machinery/microwave, /obj/structure/table, /obj/machinery/light{ dir = 1; pixel_x = 16 }, +======= +/obj/item/trash/f13/porknbeans, +>>>>>>> Stashed changes /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ambientlighting/building/j) "xFe" = ( @@ -79449,6 +94410,7 @@ }, /area/f13/building/powered) "xGn" = ( +<<<<<<< Updated upstream /obj/structure/rack/large/shelf_rust, /obj/item/stack/sheet/cloth/thirty, /obj/item/stack/sheet/cloth/five, @@ -79456,6 +94418,13 @@ /obj/item/stack/sheet/cloth, /obj/item/stack/sheet/cloth/three, /turf/open/floor/plasteel/grimy, +======= +/obj/structure/window/fulltile/ruins{ + icon_state = "ruinswindowbroken" + }, +/obj/structure/barricade/wooden/planks/pregame, +/turf/open/floor/f13/wood, +>>>>>>> Stashed changes /area/f13/ambientlighting/building/m) "xGx" = ( /obj/effect/decal/cleanable/greenglow, @@ -79472,6 +94441,7 @@ /turf/open/floor/plasteel/f13/stone/rugged, /area/f13/building/abandoned/g) "xGA" = ( +<<<<<<< Updated upstream /obj/structure/rack/large/shelf_rust{ dir = 8 }, @@ -79486,6 +94456,16 @@ }, /turf/open/floor/plasteel/grimy, /area/f13/ambientlighting/building/m) +======= +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "xGD" = ( /obj/structure/table/wood, /obj/item/lock, @@ -79535,6 +94515,7 @@ /obj/structure/barricade/wooden, /turf/closed/wall/f13/tentwall, /area/f13/ambientlighting/building/b) +<<<<<<< Updated upstream "xHn" = ( /obj/structure/table/reinforced, /obj/structure/barricade/bars, @@ -79544,6 +94525,15 @@ name = "dirty floor" }, /area/f13/brotherhood/surface) +======= +"xGZ" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_wide{ + icon_state = "wide-broken5" + }, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "xHu" = ( /obj/effect/decal/marking{ icon_state = "dottedvertical" @@ -79569,6 +94559,7 @@ }, /area/f13/brotherhood) "xHX" = ( +<<<<<<< Updated upstream /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded"; pixel_x = -14 @@ -79580,6 +94571,13 @@ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +======= +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +>>>>>>> Stashed changes "xIf" = ( /obj/machinery/porta_turret/f13/turret_22lr/burstfire/raider, /turf/open/indestructible/ground/outside/desert, @@ -79611,6 +94609,7 @@ }, /area/f13/ambientlighting/building/b) "xIz" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood{ icon_state = "gib1"; pixel_y = -6 @@ -79620,6 +94619,15 @@ dir = 8; icon_state = "dirt" }, +======= +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/leather/twenty, +/obj/item/stack/sheet/mineral/concrete/ten, +/obj/item/stack/sheet/mineral/plasma/twentyfive, +/turf/open/floor/wood_common, +>>>>>>> Stashed changes /area/f13/wasteland) "xIC" = ( /obj/effect/turf_decal/delivery/red, @@ -79670,6 +94678,19 @@ icon_state = "verticalinnermain2" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"xJn" = ( +/obj/structure/junk/locker, +/obj/item/storage/backpack/enclave, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/sewer/powered) +>>>>>>> Stashed changes "xJB" = ( /obj/structure/obstacle/jammed_door, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ @@ -79686,12 +94707,26 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/powered) +"xJO" = ( +/obj/machinery/food_cart, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland) "xJV" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright0" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"xKg" = ( +/obj/item/mine/shrapnel, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 8 + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "xKk" = ( /obj/structure/table/wood, /turf/open/floor/f13/wood{ @@ -79841,6 +94876,7 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/purple, /area/f13/bar) +<<<<<<< Updated upstream "xMY" = ( /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, @@ -79848,6 +94884,14 @@ icon_state = "common-broken3" }, /area/f13/ambientlighting/building/m) +======= +"xMp" = ( +/obj/effect/spawner/structure/window/reinforced/indestructable, +/obj/structure/table, +/obj/structure/barricade/bars, +/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2, +/area/f13/ncr) +>>>>>>> Stashed changes "xNb" = ( /obj/structure/window/fulltile/house{ dir = 2; @@ -79874,12 +94918,24 @@ /obj/item/twohanded/sledgehammer/simple, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +<<<<<<< Updated upstream "xNB" = ( /obj/structure/wreck/trash/autoshaft, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain0" }, /area/f13/wasteland) +======= +"xNE" = ( +/obj/structure/table/wood/junk, +/obj/item/stamp/captain{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/stamp/denied, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "xNG" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -79903,6 +94959,7 @@ }, /area/f13/wasteland) "xNV" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/m) @@ -79916,6 +94973,22 @@ "xOc" = ( /obj/effect/spawner/lootdrop/toolsbasic, /turf/open/indestructible/ground/outside/sidewalk, +======= +/obj/effect/turf_decal/siding/wood{ + dir = 1; + layer = 1000 + }, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/ghoul/reaver, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) +"xOc" = ( +/obj/structure/filingcabinet, +/turf/open/floor/plasteel/grimy, +>>>>>>> Stashed changes /area/f13/ncr) "xOf" = ( /obj/effect/decal/cleanable/dirt{ @@ -79926,9 +94999,20 @@ }, /area/f13/brotherhood) "xOi" = ( +<<<<<<< Updated upstream /obj/structure/flora/grass/coyote/twentyseven, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +/obj/structure/curtain, +/obj/structure/cable/outdoors{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + name = "rusted floor" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "xOl" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -80057,6 +95141,13 @@ dir = 8 }, /area/f13/wasteland) +"xQJ" = ( +/obj/structure/flora/wasteplant/wild_fungus, +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "xQL" = ( /obj/structure/railing{ layer = 3.1 @@ -80151,6 +95242,7 @@ icon_state = "housewood2" }, /area/f13/building/abandoned/a) +<<<<<<< Updated upstream "xRQ" = ( /obj/machinery/camera/autoname{ dir = 8; @@ -80167,6 +95259,14 @@ dir = 4 }, /area/f13/brotherhood) +======= +"xRP" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "tracks" + }, +/turf/open/floor/wood_common/wood_common_light, +/area/f13/building/powered) +>>>>>>> Stashed changes "xRT" = ( /obj/structure/fence{ dir = 8 @@ -80174,12 +95274,34 @@ /obj/effect/overlay/desert_side, /turf/open/indestructible/ground/outside/gravel, /area/f13/wasteland/town) +<<<<<<< Updated upstream "xRZ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain2" +======= +"xRW" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner"; + dir = 8 + }, +/area/f13/wasteland) +"xRZ" = ( +/obj/structure/debris/v2, +/turf/closed/wall/f13/wood, +/area/f13/wasteland) +"xSm" = ( +/obj/structure/flora/rock/jungle, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"xSr" = ( +/turf/open/floor/wood_common/wood_common_dark{ + icon_state = "common_dark-broken2" +>>>>>>> Stashed changes }, /area/f13/wasteland) "xSc" = ( @@ -80214,6 +95336,7 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) "xSF" = ( +<<<<<<< Updated upstream /obj/machinery/light, /obj/effect/decal/cleanable/dirt, /obj/item/stack/sheet/bone, @@ -80223,6 +95346,16 @@ /obj/machinery/food_cart, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +======= +/obj/effect/turf_decal/big{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/road{ + icon_state = "verticalinnermain0" + }, +/area/f13/ncr) +>>>>>>> Stashed changes "xSN" = ( /obj/structure/car/rubbish2{ pixel_x = -18; @@ -80282,6 +95415,33 @@ name = "dirty floor" }, /area/f13/building/powered) +<<<<<<< Updated upstream +======= +"xTJ" = ( +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/turf/open/indestructible/ground/outside/sidewalk{ + dir = 1; + icon_state = "outercorner" + }, +/area/f13/wasteland) +"xTO" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/breadhard, +/obj/item/reagent_containers/food/snacks/meatsmoked, +/obj/effect/decal/cleanable/dirt{ + color = "#363636" + }, +/turf/open/floor/f13/wood, +/area/f13/legioncamp) +"xTY" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outermaincornerinner" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "xUg" = ( /obj/structure/table/wood, /obj/item/paper, @@ -80299,12 +95459,22 @@ icon_state = "common_dark-broken4" }, /area/f13/building/abandoned/n) +<<<<<<< Updated upstream "xUw" = ( /obj/structure/cable/outdoors{ icon_state = "1-8" }, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +======= +"xUu" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/trash_stack{ + icon_state = "trash_3" + }, +/turf/open/floor/carpet/arcade, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "xUx" = ( /mob/living/simple_animal/hostile/raider/thief, /turf/open/indestructible/ground/outside/dirt, @@ -80584,11 +95754,17 @@ /turf/open/floor/f13/wood, /area/f13/ambientlighting/building/k) "xYk" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/blood/tracks, /turf/open/indestructible/ground/outside/road{ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +======= +/obj/item/chair/wood/modern, +/turf/open/floor/wood_wide, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "xYn" = ( /obj/effect/overlay/desert_side{ dir = 4 @@ -80627,6 +95803,13 @@ }, /turf/open/indestructible/ground/outside/water/running, /area/f13/wasteland) +"xZi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/desert/sonora/edge{ + dir = 1 + }, +/turf/open/floor/plasteel/bar, +/area/f13/wasteland) "xZj" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -80681,6 +95864,13 @@ /obj/structure/simple_door/metal/iron, /turf/open/floor/wood_common, /area/f13/bar) +"yaa" = ( +/obj/structure/rack/large/shelf_rust{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/tool_box, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/ncr) "yad" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, @@ -80689,9 +95879,16 @@ icon_state = "yellowrustychess" }, /area/f13/ambientlighting/building/m) +<<<<<<< Updated upstream "yae" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaloutermain2right" +======= +"yap" = ( +/obj/structure/wreck/trash/bus_door, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" +>>>>>>> Stashed changes }, /area/f13/wasteland) "yau" = ( @@ -80725,11 +95922,26 @@ icon_state = "whitegreenrustychess" }, /area/f13/ambientlighting/building/i) +<<<<<<< Updated upstream "yaS" = ( /obj/effect/decal/cleanable/dirt, /obj/item/broken_bottle, /turf/open/floor/plasteel/bar, +======= +"yaP" = ( +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_4"; + layer = 6 + }, +/turf/open/indestructible/ground/outside/dirt{ + icon_state = "dirt" + }, +>>>>>>> Stashed changes /area/f13/wasteland) +"yaS" = ( +/obj/item/reagent_containers/pill/healingpowder, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "yaW" = ( /obj/structure/table/wood, /turf/open/indestructible/ground/outside/dirt, @@ -80748,11 +95960,17 @@ }, /area/f13/ambientlighting/building/t) "yba" = ( +<<<<<<< Updated upstream /obj/effect/turf_decal/weather/dirt{ dir = 10 }, /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland) +======= +/obj/structure/simple_door/interior, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/ncr) +>>>>>>> Stashed changes "ybd" = ( /obj/structure/rack/shelf_metal, /obj/effect/spawner/lootdrop/crafts, @@ -80809,6 +96027,7 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/ambientlighting/building/u) "ybL" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/dirt, /obj/structure/rack/shelf_metal, /obj/effect/spawner/lootdrop/f13/medical/vault/meds, @@ -80816,6 +96035,11 @@ /obj/effect/spawner/lootdrop/f13/medical/vault/meds, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/chair/stool/retro/backed, +/turf/open/floor/wood_fancy, +/area/f13/ambientlighting/building/m) +>>>>>>> Stashed changes "ybN" = ( /obj/machinery/rnd/server/followers, /turf/open/floor/f13{ @@ -80874,6 +96098,19 @@ icon_state = "dirt" }, /area/f13/wasteland) +<<<<<<< Updated upstream +======= +"ycu" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 4; + light_color = "#f4e3b0" + }, +/obj/item/storage/trash_stack, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "ycx" = ( /obj/structure/sink{ dir = 1; @@ -80886,6 +96123,14 @@ icon_state = "whitegreenrustychess" }, /area/f13/building/abandoned/p) +"ycF" = ( +/obj/structure/table/booth, +/obj/structure/gallow{ + pixel_x = 14; + pixel_y = 10 + }, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) "ycI" = ( /obj/machinery/light/small{ dir = 8; @@ -80963,7 +96208,16 @@ icon_state = "darkrusty"; name = "dirty floor" }, +<<<<<<< Updated upstream /area/f13/brotherhood/offices1st) +======= +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland) +"yey" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/desert, +/area/f13/wasteland) +>>>>>>> Stashed changes "yeC" = ( /obj/structure/car/rubbish4, /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, @@ -81032,6 +96286,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/ambientlighting/building/p) +"yfI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/fermichem/pHpaper, +/obj/item/fermichem/pHpaper, +/obj/structure/table/wood, +/obj/machinery/reagentgrinder, +/obj/machinery/light{ + light_color = "#e8eaff" + }, +/turf/open/floor/plating/f13/outside/roof/wood{ + name = "wooden floor"; + desc = "It's a floor. Wow." + }, +/area/f13/ambientlighting/building/m) "yfQ" = ( /obj/structure/decoration/warning, /turf/closed/wall/f13/wood/house, @@ -81150,6 +96418,15 @@ icon_state = "oakfloor1" }, /area/f13/followers) +<<<<<<< Updated upstream +======= +"yhi" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "yhn" = ( /obj/structure/barricade/tentclothcorner, /turf/open/indestructible/ground/inside/dirt, @@ -81196,6 +96473,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/clinic) +"yhU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/wood/post{ + desc = "A wooden stanchion."; + name = "wooden stanchion"; + pixel_y = 24; + pixel_x = -16 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaloutermain2left" + }, +/area/f13/wasteland) "yhV" = ( /obj/structure/fence{ dir = 1 @@ -81205,6 +96494,7 @@ }, /area/f13/wasteland) "yhZ" = ( +<<<<<<< Updated upstream /obj/structure/bed/mattress{ icon_state = "mattress4"; pixel_x = -8; @@ -81216,6 +96506,14 @@ /obj/effect/landmark/start/f13/ncrconscript, /turf/open/floor/plasteel/grimy, /area/f13/ncr) +======= +/obj/effect/decal/cleanable/dirt, +/obj/effect/overlay/desert/sonora/edge{ + dir = 8 + }, +/turf/open/floor/wood_common, +/area/f13/wasteland) +>>>>>>> Stashed changes "yik" = ( /obj/machinery/computer/terminal{ dir = 4; @@ -81248,9 +96546,18 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) "yiF" = ( +<<<<<<< Updated upstream /obj/structure/barricade/wooden, /turf/closed/indestructible/rock, /area/f13/caves) +======= +/obj/structure/chair/wood/wings{ + dir = 4 + }, +/obj/effect/landmark/start/f13/ncrlieutenant, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +>>>>>>> Stashed changes "yiG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/hacking_guide{ @@ -81272,6 +96579,21 @@ /obj/structure/table/wood, /turf/open/floor/carpet, /area/f13/ambientlighting/building/d) +<<<<<<< Updated upstream +======= +"yjb" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/structure/fluff/rails{ + icon_state = "rails-r" + }, +/turf/open/indestructible/ground/outside/graveldirt, +/area/f13/caves) +>>>>>>> Stashed changes "yjc" = ( /obj/machinery/microwave/stove, /obj/effect/decal/cleanable/dirt/dust, @@ -81297,6 +96619,7 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "yjr" = ( +<<<<<<< Updated upstream /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_fancy, @@ -81304,6 +96627,42 @@ "yjy" = ( /turf/closed/wall/f13/wood/house, /area/f13/bar) +======= +/obj/structure/table/wood/junk, +/obj/item/statuebust{ + pixel_y = 16 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +"yjy" = ( +/turf/closed/wall/f13/wood/house, +/area/f13/bar) +"yjB" = ( +/obj/structure/table/wood/junk, +/obj/item/pen/red, +/obj/item/pen/charcoal, +/obj/item/pen, +/obj/machinery/light/small{ + dir = 8; + brightness = 9 + }, +/turf/open/floor/plasteel/grimy, +/area/f13/ncr) +"yjE" = ( +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge, +/obj/structure/barricade/tentclothedge{ + pixel_y = -14; + layer = 5 + }, +/obj/structure/railing/wood/underlayer{ + layer = 6 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" + }, +/area/f13/wasteland) +>>>>>>> Stashed changes "yjG" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/inside/dirt, @@ -81437,6 +96796,7 @@ /turf/closed/mineral/random/no_caves, /area/f13/ncr) "ylX" = ( +<<<<<<< Updated upstream /obj/structure/simple_door/metal/fence, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) @@ -81444,6 +96804,18 @@ /obj/structure/debris/v4, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) +======= +/obj/structure/fluff/paper/stack{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ambientlighting/building/j) +"ymf" = ( +/obj/structure/chair/stool/retro/black, +/obj/effect/decal/fakelattice, +/turf/open/indestructible/ground/outside/ruins, +/area/f13/ambientlighting/building/j) +>>>>>>> Stashed changes "ymg" = ( /obj/structure/chair/middle{ dir = 4 @@ -81838,15 +97210,22 @@ yfv yfv yfv ufo +<<<<<<< Updated upstream aJV sOw tBQ +======= +cRC +mCN +khs +>>>>>>> Stashed changes yfv yfv yfv yfv yfv yfv +<<<<<<< Updated upstream ylR ylR ylR @@ -81855,6 +97234,16 @@ ylR ylR ylR ylR +======= +vTF +vTF +vTF +vTF +vTF +vTF +vTF +vTF +>>>>>>> Stashed changes yfv yfv yfv @@ -81982,8 +97371,13 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream eFC eFC +======= +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn @@ -82141,7 +97535,11 @@ aTW aTW ufo akv +<<<<<<< Updated upstream mQK +======= +cDp +>>>>>>> Stashed changes ufo aTW aTW @@ -82149,6 +97547,7 @@ aTW aTW aTW aTW +<<<<<<< Updated upstream hkO tse huh @@ -82157,6 +97556,16 @@ xQm nVA rnh huh +======= +fJE +kAL +uSv +mvy +hcZ +mvy +ozC +uSv +>>>>>>> Stashed changes aTW yfv yfv @@ -82284,8 +97693,13 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream eFC eFC +======= +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn @@ -82429,16 +97843,25 @@ aTW aTW aTW aTW +<<<<<<< Updated upstream hkO hkO hkO hkO hkO +======= +fJE +fJE +fJE +fJE +fJE +>>>>>>> Stashed changes aTW aTW aTW aTW xic +<<<<<<< Updated upstream gZW xic thS @@ -82461,6 +97884,30 @@ oos hta hkO pxU +======= +sZW +xic +nIS +qJO +cDp +dZG +dZG +dZG +dZG +dZG +dZG +dZG +dZG +mvy +rxJ +aqx +rxJ +aqx +aqx +rxJ +fJE +jkv +>>>>>>> Stashed changes aTW rkv rkv @@ -82586,9 +98033,15 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream eFC eFC eFC +======= +kIF +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn @@ -82731,12 +98184,21 @@ azA azA aTW aTW +<<<<<<< Updated upstream hkO eer rdi ewm hkO hkO +======= +fJE +iEF +qoG +fyd +fJE +fJE +>>>>>>> Stashed changes aTW aTW azA @@ -82744,6 +98206,7 @@ azA azA xic azA +<<<<<<< Updated upstream hZK iOE jwS @@ -82755,6 +98218,19 @@ ahk aQs jwS jwS +======= +hDE +lAR +dZG +tOp +bgd +bgd +xaY +fOf +lFO +dZG +dZG +>>>>>>> Stashed changes uaE uaE uaE @@ -82762,7 +98238,11 @@ xXA uaE uaE uaE +<<<<<<< Updated upstream hkO +======= +fJE +>>>>>>> Stashed changes aTW rkv pjw @@ -82889,8 +98369,13 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream eFC eFC +======= +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn @@ -83027,12 +98512,17 @@ aTW aTW azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes azA azA azA azA aTW +<<<<<<< Updated upstream hkO uaE akN @@ -83042,11 +98532,23 @@ hkO vtS azA qWz +======= +fJE +uaE +uAc +mmm +qoG +fJE +oPo +azA +afq +>>>>>>> Stashed changes xic xic xic xic akv +<<<<<<< Updated upstream mQK jwS jwS @@ -83066,6 +98568,27 @@ mmm rdi dpi hkO +======= +cDp +dZG +dZG +hog +bgd +bgd +bgd +bgd +bsp +vgK +uaE +seT +mmm +pOj +pOj +mmm +qoG +dpi +fJE +>>>>>>> Stashed changes rkv pjw pjw @@ -83162,10 +98685,17 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream lxh jeL fOf rie +======= +xfJ +sks +xqz +qwC +>>>>>>> Stashed changes qoT taO fOW @@ -83191,8 +98721,13 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream eFC eFC +======= +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn @@ -83329,6 +98864,7 @@ aTW aTW azA azA +<<<<<<< Updated upstream wRi azA qLk @@ -83368,6 +98904,47 @@ vZw sJO hkO hkO +======= +pxK +azA +gcP +kcF +kcF +kcF +ojm +fJE +krt +fJE +nXi +fJE +hSf +azA +nnT +azA +azA +nbB +azA +akv +cDp +xic +dZG +bnr +hPF +hPF +bgd +tsn +bsp +nJY +tGl +nXi +tGl +mxN +iGE +iVg +qed +fJE +fJE +>>>>>>> Stashed changes rkv pjw pjw @@ -83450,29 +99027,47 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream nzO +======= +rAT +>>>>>>> Stashed changes sQD ryj eyn eyn eyn eyn +<<<<<<< Updated upstream lxh +======= +xfJ +>>>>>>> Stashed changes eyn eyn eyn eyn eyn +<<<<<<< Updated upstream lxh bqb mhi +======= +xfJ +pkq +qIr +>>>>>>> Stashed changes taO cfW taO taO taO taO +<<<<<<< Updated upstream lxh +======= +xfJ +>>>>>>> Stashed changes eyn eyn eyn @@ -83493,17 +99088,28 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream vIm vIm +======= +cso +cso +>>>>>>> Stashed changes eyn eyn eyn eyn eyn eyn +<<<<<<< Updated upstream eGa taO vqD +======= +tty +taO +aAo +>>>>>>> Stashed changes eyn eyn eyn @@ -83528,7 +99134,11 @@ eyn eyn eyn cyW +<<<<<<< Updated upstream ayt +======= +gBQ +>>>>>>> Stashed changes azA azA azA @@ -83539,9 +99149,15 @@ qmk qmk qmk qmk +<<<<<<< Updated upstream glZ glZ glZ +======= +cIs +cIs +cIs +>>>>>>> Stashed changes azA azA azA @@ -83631,6 +99247,7 @@ aTW azA azA azA +<<<<<<< Updated upstream wRi azA eRO @@ -83670,6 +99287,47 @@ uaE ffB iUu hkO +======= +pxK +azA +kcF +kcF +kcF +kcF +kcF +azA +wsc +chQ +uKw +chQ +qDl +mFm +pFj +lVq +fpL +ecK +ecK +oHL +qmf +ecK +dzd +efz +wwS +iVe +bgd +bgd +dwg +dZQ +otj +nXi +uaE +fJE +fJE +uaE +nXi +xcY +fJE +>>>>>>> Stashed changes rkv pjw pjw @@ -83758,7 +99416,11 @@ cHT eyn eyn cfW +<<<<<<< Updated upstream lAR +======= +fVy +>>>>>>> Stashed changes qoT taO taO @@ -83768,6 +99430,7 @@ taO taO taO taO +<<<<<<< Updated upstream lbU imc taO @@ -83775,6 +99438,15 @@ bBb lbU taO lxh +======= +xHX +cRJ +taO +tOK +xHX +taO +xfJ +>>>>>>> Stashed changes eyn eyn eyn @@ -83795,8 +99467,13 @@ eyn kex eyn eyn +<<<<<<< Updated upstream eFC eFC +======= +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn @@ -83804,9 +99481,15 @@ eyn eyn taO taO +<<<<<<< Updated upstream eFC eFC eFC +======= +kIF +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn @@ -83836,6 +99519,7 @@ azA azA azA qmk +<<<<<<< Updated upstream nLc swK rfg @@ -83844,6 +99528,16 @@ pAK hMS xSc glZ +======= +svI +cXi +hGN +qmk +gEl +jVw +fnF +cIs +>>>>>>> Stashed changes azA azA azA @@ -83933,6 +99627,7 @@ azA azA azA azA +<<<<<<< Updated upstream wRi azA yjj @@ -83972,6 +99667,47 @@ uaE pnz uaE hkO +======= +pxK +azA +vfF +kcF +ycF +kcF +ycF +azA +mnX +dZG +dZG +dZG +dZG +dZG +dZG +dZG +dZG +dZG +xic +iTM +cDp +edX +dZG +aTG +bgd +gWG +cCJ +rhA +dZG +dZG +ucp +gXB +dZG +fJE +uaE +uaE +cpw +uaE +fJE +>>>>>>> Stashed changes rkv pjw pjw @@ -84051,9 +99787,15 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream nzO kIF lbU +======= +rAT +kVV +xHX +>>>>>>> Stashed changes bFn ryj fDK @@ -84062,14 +99804,21 @@ vur taO vCm urR +<<<<<<< Updated upstream mhi taO bBb +======= +qIr +taO +tOK +>>>>>>> Stashed changes taO taO taO oJW iLM +<<<<<<< Updated upstream tDd rie taO @@ -84078,6 +99827,16 @@ sJu wOi taO lxh +======= +gai +qwC +taO +taO +hKK +wOi +taO +xfJ +>>>>>>> Stashed changes eyn eyn eyn @@ -84085,6 +99844,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream cAe dDN bdX @@ -84099,17 +99859,41 @@ rnY taO eFC eFC +======= +mCj +dDN +ddE +tty +fOW +xQJ +rMP +rMP +rMP +lCb +vaH +taO +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn eyn taO fOW +<<<<<<< Updated upstream eFC eFC eFC eFC eFC +======= +kIF +kIF +kIF +kIF +kIF +>>>>>>> Stashed changes taO eyn eyn @@ -84126,11 +99910,16 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream rav +======= +mZg +>>>>>>> Stashed changes dzm cyW cyW cyW +<<<<<<< Updated upstream glZ glZ glZ @@ -84146,6 +99935,23 @@ lIs aFU cEy qjd +======= +cIs +cIs +cIs +qmk +qmk +cIs +cIs +jVw +wLl +tWr +qmk +suY +aOz +jfb +hNm +>>>>>>> Stashed changes azA azA azA @@ -84243,6 +100049,7 @@ azA azA azA azA +<<<<<<< Updated upstream jpl jwS gaX @@ -84274,6 +100081,39 @@ bIP bIP uaE hkO +======= +mnX +dZG +gRu +lvc +adp +dZG +oLn +nkV +jto +dZG +xic +iTM +cDp +xic +dZG +wSA +bgd +gWG +fAf +tUc +dZG +udU +nfz +wAK +dZG +dZG +uaE +fOQ +fOQ +uaE +fJE +>>>>>>> Stashed changes rkv pjw pjw @@ -84373,6 +100213,7 @@ taO cfW taO taO +<<<<<<< Updated upstream lxh taO qoT @@ -84381,24 +100222,44 @@ sJu bFn taO rie +======= +xfJ +taO +qoT +taO +hKK +bFn +taO +qwC +>>>>>>> Stashed changes eyn eyn eyn taO taO taO +<<<<<<< Updated upstream cAe bdX bdX bdX rDO cDz +======= +mCj +ddE +ddE +ddE +rDO +rMP +>>>>>>> Stashed changes daT rtj qHE taO taO taO +<<<<<<< Updated upstream eGa eFC eFC @@ -84408,12 +100269,30 @@ eyn rnY eFC eFC +======= +tty +kIF +kIF +kIF +eyn +eyn +vaH +kIF +kIF +fdE +>>>>>>> Stashed changes rtj lKN eyn +<<<<<<< Updated upstream eFC taO rnY +======= +kIF +taO +vaH +>>>>>>> Stashed changes eyn eyn eyn @@ -84427,12 +100306,17 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream onB +======= +uAe +>>>>>>> Stashed changes gmU azA rls cyW cyW +<<<<<<< Updated upstream glZ tOD xGA @@ -84448,6 +100332,23 @@ xGn nQN vkI qjd +======= +cIs +rnV +fKd +vfb +jVw +wQl +qmk +jVw +jVw +jVw +cIs +jlb +fyN +cET +hNm +>>>>>>> Stashed changes azA azA azA @@ -84537,13 +100438,19 @@ azA azA azA azA +<<<<<<< Updated upstream wRi jXw +======= +pxK +nNR +>>>>>>> Stashed changes azA azA azA azA azA +<<<<<<< Updated upstream pYc xUw jwS @@ -84576,6 +100483,40 @@ uaE juE uaE hkO +======= +tfE +uKy +dZG +xoA +rVF +xoA +dZG +vfr +qKm +ges +dZG +xic +eLn +cDp +xic +dZG +sqN +bgd +fCP +efz +efz +dzd +ddY +bVN +xtj +fWw +dZG +udB +uaE +meN +uaE +fJE +>>>>>>> Stashed changes rkv pjw pjw @@ -84664,38 +100605,64 @@ taO taO whm iXz +<<<<<<< Updated upstream lAR lbd urR taO eGa +======= +fVy +lbd +urR +taO +tty +>>>>>>> Stashed changes wdx taO taO taO eyn +<<<<<<< Updated upstream lxh eyn tum taO eGa +======= +xfJ +eyn +tum +taO +tty +>>>>>>> Stashed changes taO taO taO fOW taO taO +<<<<<<< Updated upstream mhi lbU taO taO cAe uTy +======= +qIr +xHX +taO +taO +mCj +sZZ +>>>>>>> Stashed changes dDN aHq aHq aHq hYg +<<<<<<< Updated upstream cDz cDz dUo @@ -84716,11 +100683,40 @@ eyn eFC eFC qoT +======= +rMP +rMP +jOn +mBk +cfW +taO +taO +kIF +kIF +kIF +kIF +kIF +kIF +eyn +qoT +eyn +eyn +kIF +kIF +qoT +eyn +eyn +eyn +eyn +eyn +eyn +>>>>>>> Stashed changes eyn eyn eyn eyn eyn +<<<<<<< Updated upstream eyn eyn eyn @@ -84749,6 +100745,30 @@ glZ oSt nQN awS +======= +oZf +wer +jKr +azA +uKD +dzm +cyW +cyW +cIs +jVw +tqM +tqM +tqM +eOp +qmk +jVw +jhB +laY +cIs +tTi +fyN +rup +>>>>>>> Stashed changes qmk azA azA @@ -84839,6 +100859,7 @@ azA azA azA azA +<<<<<<< Updated upstream wRi qhE mLi @@ -84878,6 +100899,47 @@ dpY bgZ aUY hkO +======= +pxK +qhE +ipI +meL +odS +odS +hux +mnX +dZG +dZG +tIa +xOi +vig +dZG +vig +vig +vig +dZG +dZG +iTM +cDp +xGA +dZG +bsp +hPF +bgd +bgd +bgd +nDk +uUN +kQC +wAK +kqB +dZG +fJE +qMo +aAm +cad +fJE +>>>>>>> Stashed changes rkv pjw pjw @@ -84957,7 +101019,11 @@ azA eyn eyn eyn +<<<<<<< Updated upstream nzO +======= +rAT +>>>>>>> Stashed changes oTg dof dof @@ -84967,10 +101033,17 @@ fOW dhI taO pgi +<<<<<<< Updated upstream nYQ nEL taO lAR +======= +qPh +bqb +taO +fVy +>>>>>>> Stashed changes taO taO ivX @@ -84982,6 +101055,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream mhi taO rie @@ -84993,6 +101067,19 @@ taO rnY taO uTy +======= +qIr +taO +qwC +vaH +taO +oJW +gai +taO +vaH +taO +sZZ +>>>>>>> Stashed changes aHq eyn eyn @@ -85005,18 +101092,31 @@ eyn eyn ijh taO +<<<<<<< Updated upstream eFC eFC eFC eFC eFC +======= +kIF +kIF +kIF +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn eyn eyn +<<<<<<< Updated upstream eFC eFC +======= +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn @@ -85031,6 +101131,7 @@ eyn cyW voU dzm +<<<<<<< Updated upstream myC iRo dzm @@ -85051,6 +101152,28 @@ glZ bLf hMS aoB +======= +amC +uLU +dzm +rtI +cyW +cyW +qmk +qzy +tqM +hMS +hMS +jVw +qmk +hMe +qmk +cIs +cIs +gMH +jVw +rfW +>>>>>>> Stashed changes qmk azA azA @@ -85141,6 +101264,7 @@ azA azA azA azA +<<<<<<< Updated upstream wRi pCk vbB @@ -85179,6 +101303,46 @@ jwS hkO hkO hkO +======= +pxK +dpm +vbB +odS +odS +oMD +qKl +mnX +dZG +dGQ +xoA +uQv +xoA +xaK +xoA +xoA +xoA +xoA +dZG +eLn +cDp +azA +dZG +idh +bgd +oit +qWc +ioR +dZG +qPf +uUN +mLN +vxu +fWw +dZG +fJE +fJE +fJE +>>>>>>> Stashed changes rkv aTW pjw @@ -85260,17 +101424,28 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream nzO nzO +======= +rAT +rAT +>>>>>>> Stashed changes eyn eyn eyn eyn lSV taO +<<<<<<< Updated upstream eGa taO vwC +======= +tty +taO +oxJ +>>>>>>> Stashed changes fDK taO taO @@ -85287,6 +101462,7 @@ eyn eyn eyn taO +<<<<<<< Updated upstream eGa qoT taO @@ -85298,6 +101474,19 @@ yiF aHq bRy qIr +======= +tty +qoT +taO +xfJ +cfW +taO +vaH +lsU +aHq +cYT +gzM +>>>>>>> Stashed changes kex aHq aHq @@ -85308,11 +101497,16 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream eFC +======= +kIF +>>>>>>> Stashed changes eyn eyn eyn eyn +<<<<<<< Updated upstream cDz fMZ qKE @@ -85320,6 +101514,15 @@ eyn eyn eFC eFC +======= +rMP +tbB +iNn +eyn +eyn +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn @@ -85330,14 +101533,20 @@ eyn eyn eyn cyW +<<<<<<< Updated upstream sHC sHC +======= +rtI +rtI +>>>>>>> Stashed changes azA ttF dzm cyW cyW cyW +<<<<<<< Updated upstream xPY uSv hMS @@ -85353,6 +101562,23 @@ hMS hMS hMS hwJ +======= +wAn +iwR +jVw +hMS +knH +aQx +fyN +kVw +jVw +ciV +jVw +jVw +jVw +jVw +eIx +>>>>>>> Stashed changes qmk azA azA @@ -85443,6 +101669,7 @@ azA azA azA azA +<<<<<<< Updated upstream wRi aUc azA @@ -85481,6 +101708,46 @@ qOV jwS jwS jwS +======= +pxK +aUc +azA +enj +odS +odS +odS +mnX +ipq +xoA +xoA +sRP +cQi +cQi +cQi +cQi +cQi +nzK +vCa +nFD +cDp +xGA +dZG +dZG +nDk +dZG +dZG +dZG +dZG +dZG +tdE +uWN +wAK +uUN +nBv +dZG +dZG +dZG +>>>>>>> Stashed changes rkv neZ taO @@ -85569,6 +101836,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream oHW taO bBb @@ -85578,6 +101846,17 @@ rnY taO fOW lxh +======= +cGR +taO +tOK +pBu +taO +vaH +taO +fOW +xfJ +>>>>>>> Stashed changes eyn eyn eyn @@ -85591,7 +101870,11 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream lxh +======= +xfJ +>>>>>>> Stashed changes eyn eyn sFX @@ -85600,9 +101883,15 @@ aHq aHq wWz iTe +<<<<<<< Updated upstream hLN vpp kqJ +======= +krJ +yaS +rWU +>>>>>>> Stashed changes aHq eyn eyn @@ -85614,6 +101903,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream eFC eFC eFC @@ -85623,6 +101913,17 @@ eFC eyn eFC eFC +======= +kIF +kIF +kIF +kIF +kIF +kIF +eyn +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn @@ -85638,6 +101939,7 @@ qmk qmk qmk qmk +<<<<<<< Updated upstream ayt wde azA @@ -85656,6 +101958,26 @@ hMS hMS fWM qjd +======= +gBQ +tLV +azA +cIs +jVw +xae +fyN +fyN +lDC +ngc +fDS +raG +vtQ +jVw +jVw +jVw +bdX +hNm +>>>>>>> Stashed changes azA azA azA @@ -85746,6 +102068,7 @@ azA azA azA sqv +<<<<<<< Updated upstream cbD azA azA @@ -85783,6 +102106,45 @@ dOD xOc rXw jwS +======= +qOr +azA +azA +azA +enj +oMD +bgn +dZG +eGk +gHE +qKm +sCY +psL +lcv +mUz +vrB +lcv +jMc +iTM +qGg +bRy +nSw +gvD +gvD +byn +rrz +xIz +mmt +dZG +pVI +slD +qjq +kQC +uUN +hsI +yaa +dZG +>>>>>>> Stashed changes rkv aTW vwf @@ -85871,6 +102233,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream mhi lAR taO @@ -85879,6 +102242,16 @@ taO mAQ taO lxh +======= +qIr +fVy +taO +eyd +taO +mAQ +taO +xfJ +>>>>>>> Stashed changes eyn eyn eyn @@ -85889,19 +102262,33 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream lxh ezC +======= +xfJ +nZP +>>>>>>> Stashed changes taO eyn eyn eyn eyn +<<<<<<< Updated upstream rnY taO uTy aHq taO vpp +======= +vaH +taO +sZZ +aHq +taO +yaS +>>>>>>> Stashed changes mqN qHu wjC @@ -85915,6 +102302,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream eFC eFC eFC @@ -85925,6 +102313,18 @@ eFC eyn eyn eFC +======= +kIF +kIF +kIF +eyn +eyn +eyn +kIF +eyn +eyn +kIF +>>>>>>> Stashed changes eyn eyn eyn @@ -85933,6 +102333,7 @@ eyn azA azA dzm +<<<<<<< Updated upstream sHC qmk hBs @@ -85958,6 +102359,33 @@ hMS hMS hwJ qjd +======= +rtI +qmk +ofx +nfd +hgr +qmk +qmk +nNE +dzm +wlS +cIs +vfX +vfX +qmk +eJl +jVw +jVw +jVw +jVw +jVw +jVw +jVw +jVw +eIx +hNm +>>>>>>> Stashed changes azA azA azA @@ -86047,6 +102475,7 @@ azA azA azA azA +<<<<<<< Updated upstream wRi ljW fZL @@ -86085,6 +102514,46 @@ guP ktI xJc jwS +======= +pxK +ljW +fZL +hox +fZL +azA +azA +mnX +dZG +dZG +dZG +dZG +dZG +dZG +dZG +dZG +dZG +dZG +dZG +soY +kMT +kMT +qil +kMT +yhZ +wsn +icM +faX +qmg +dZG +pVI +ucQ +ckR +bVN +bVN +ddY +vBr +dZG +>>>>>>> Stashed changes rkv aTW taO @@ -86174,12 +102643,21 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream lAR rnY taO taO fDt lxh +======= +fVy +vaH +taO +taO +fDt +xfJ +>>>>>>> Stashed changes eyn eyn eyn @@ -86189,9 +102667,15 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream lxh taO mhi +======= +xfJ +taO +qIr +>>>>>>> Stashed changes taO cwT dof @@ -86199,14 +102683,23 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream kjr bdX +======= +mca +ddE +>>>>>>> Stashed changes aHq aHq ewE vSX sEs +<<<<<<< Updated upstream kbo +======= +imc +>>>>>>> Stashed changes aHq eyn eyn @@ -86216,17 +102709,30 @@ taO eyn eyn eyn +<<<<<<< Updated upstream eFC eFC eFC +======= +kIF +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn eyn +<<<<<<< Updated upstream eFC eyn taO eFC +======= +kIF +eyn +taO +kIF +>>>>>>> Stashed changes taO eyn eyn @@ -86236,12 +102742,18 @@ azA azA azA azA +<<<<<<< Updated upstream glZ cym +======= +cIs +nei +>>>>>>> Stashed changes lQS qmk qmk qmk +<<<<<<< Updated upstream vNq sLD rBH @@ -86259,6 +102771,25 @@ iFi hMS hMS aFU +======= +eZS +reP +aJw +xmv +aaJ +caI +psk +ocb +jVw +jVw +fyN +fyN +wnE +sLe +jVw +jVw +aOz +>>>>>>> Stashed changes qmk azA azA @@ -86349,7 +102880,11 @@ azA azA azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes azA azA azA @@ -86361,14 +102896,24 @@ wsd wsd wsd wsd +<<<<<<< Updated upstream gKD htS +======= +wwO +tYo +>>>>>>> Stashed changes rmK wsd wsd wsd +<<<<<<< Updated upstream ezE dOn +======= +eco +ibg +>>>>>>> Stashed changes wsd wsd wsd @@ -86378,6 +102923,7 @@ rOi rmK wsd wsd +<<<<<<< Updated upstream bEf bEf ycM @@ -86387,6 +102933,17 @@ sWI fbM qft jwS +======= +xgV +xgV +btx +sdP +uUN +kQC +oGp +wnP +dZG +>>>>>>> Stashed changes rkv aTW neZ @@ -86477,11 +103034,19 @@ eyn eyn eyn kHo +<<<<<<< Updated upstream lxh taO taO kVV lxh +======= +xfJ +taO +taO +mDT +xfJ +>>>>>>> Stashed changes eyn eyn eyn @@ -86490,12 +103055,21 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream lxh qoT pRi taO rWU rPw +======= +xfJ +qoT +nyh +taO +sBk +raQ +>>>>>>> Stashed changes eyn eyn eyn @@ -86506,8 +103080,13 @@ taO taO aHq eyn +<<<<<<< Updated upstream vpp gBE +======= +yaS +hnJ +>>>>>>> Stashed changes eyn eyn eyn @@ -86518,17 +103097,30 @@ uPc taO eyn iTe +<<<<<<< Updated upstream eFC eFC +======= +kIF +kIF +>>>>>>> Stashed changes eyn eyn eyn eyn +<<<<<<< Updated upstream eFC eFC eyn eGa eFC +======= +kIF +kIF +eyn +tty +kIF +>>>>>>> Stashed changes taO eyn eyn @@ -86538,6 +103130,7 @@ azA azA azA azA +<<<<<<< Updated upstream glZ bUW vAW @@ -86560,6 +103153,30 @@ uyU nsL rGU glZ +======= +cIs +plu +qBY +jEq +lQS +cIs +bHu +xKg +reP +xTJ +rVP +jKr +foE +qmk +fOL +pay +lTi +vMt +ljx +kWq +wnE +cIs +>>>>>>> Stashed changes qmk qmk cyW @@ -86651,14 +103268,24 @@ gvU jKr azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes azA azA ljW ahs +<<<<<<< Updated upstream qmg ioi rma +======= +isI +ioi +eWg +>>>>>>> Stashed changes eDX eAw eAw @@ -86667,9 +103294,15 @@ gpB eDX eAw eAw +<<<<<<< Updated upstream glf eAw lKQ +======= +eBB +eAw +qEp +>>>>>>> Stashed changes eAw eAw eAw @@ -86681,6 +103314,7 @@ ioi eAw eAw eAw +<<<<<<< Updated upstream ozi ndc gFV @@ -86689,6 +103323,16 @@ sWI sWI pUW jwS +======= +uKU +hZE +jbp +uUN +kQC +kQC +cjq +dZG +>>>>>>> Stashed changes aTW aTW pjw @@ -86773,6 +103417,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream eyn eyn eyn @@ -86821,11 +103466,60 @@ eGa taO taO fOW +======= eyn eyn eyn eyn eyn +eyn +eyn +qPh +taO +mDT +aeY +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +xHX +gai +dof +rTC +rTC +eyn +eyn +eyn +adi +vwC +dof +dof +cDz +aHq +>>>>>>> Stashed changes +eyn +sZZ +sZZ +eyn +eyn +tty +fOW +rtj +eyn +taO +tty +taO +taO +fOW +eyn +eyn +eyn +eyn eFC eyn eyn @@ -86833,13 +103527,24 @@ vyT eFC taO eyn +kIF +eyn +eyn +jge +kIF +taO +eyn eyn +<<<<<<< Updated upstream +======= eyn +>>>>>>> Stashed changes azA azA azA azA azA +<<<<<<< Updated upstream bnJ vOh xNV @@ -86853,15 +103558,37 @@ sLD fXZ jKr uKD +======= +wDP +fOT +bFX +uLE +jRZ +cIs +bHu +bHu +xRW +reP +fDn +jKr +rUE +>>>>>>> Stashed changes qmk qmk qmk qmk qmk +<<<<<<< Updated upstream glZ bFY nsL glZ +======= +cIs +exm +kWq +cIs +>>>>>>> Stashed changes cyW cyW cyW @@ -86953,14 +103680,22 @@ azA azA azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes azA azA azA qzA eDX eAw +<<<<<<< Updated upstream lKQ +======= +qEp +>>>>>>> Stashed changes arq tPS tPS @@ -86971,6 +103706,7 @@ tPS tPS cNV cNV +<<<<<<< Updated upstream nPi tPS tPS @@ -86979,10 +103715,21 @@ nrn nrn nrn nrn +======= +xln +tPS +tPS tPS +dqu +dqu +dqu +dqu +>>>>>>> Stashed changes tPS tPS tPS +tPS +<<<<<<< Updated upstream jEq heA sFe @@ -86991,6 +103738,16 @@ gWT dOD tQX pEl +======= +nKO +lZM +rjG +hyP +skp +uUN +ozt +nem +>>>>>>> Stashed changes aTW aTW pjw @@ -87084,12 +103841,17 @@ eyn eyn mVp taO +<<<<<<< Updated upstream kVV +======= +mDT +>>>>>>> Stashed changes taO eyn eyn eyn eyn +<<<<<<< Updated upstream lxh eyn eyn @@ -87098,13 +103860,28 @@ tNM sJu rDO fop +======= +xfJ +eyn +eyn +pxT +tNM +hKK +rDO +shY +>>>>>>> Stashed changes eyn eyn eyn eyn eyn +<<<<<<< Updated upstream ggj wSO +======= +vfL +vwC +>>>>>>> Stashed changes dof dof dof @@ -87115,7 +103892,11 @@ qoT fOW eyn iTe +<<<<<<< Updated upstream sJu +======= +hKK +>>>>>>> Stashed changes taO eyn eyn @@ -87127,6 +103908,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream eFC eFC eyn @@ -87138,10 +103920,24 @@ eyn eyn qHy goG +======= +kIF +kIF +eyn +taO +kIF +kIF +eyn +eyn +eyn +hQq +qwc +>>>>>>> Stashed changes azA azA azA azA +<<<<<<< Updated upstream bnJ ixw jsI @@ -87164,6 +103960,30 @@ glZ bFY bFY glZ +======= +wDP +uFj +vhI +uwq +lQS +cIs +cIs +qmk +wln +xKg +jOa +jOa +slr +qmk +jyw +nAV +afL +qNe +cIs +exm +exm +cIs +>>>>>>> Stashed changes cyW cyW azA @@ -87261,8 +104081,13 @@ azA azA xxH lmd +<<<<<<< Updated upstream xAJ xxN +======= +aCp +dUX +>>>>>>> Stashed changes eJc eJc tPS @@ -87270,6 +104095,7 @@ tPS tPS tPS tPS +<<<<<<< Updated upstream nrn uVv nrn @@ -87280,11 +104106,24 @@ tPS qtr qtr nrn +======= +dqu +vFU +dqu +dUX +tPS +tPS +tPS +flS +flS +dqu +>>>>>>> Stashed changes tPS tPS tPS tPS tPS +<<<<<<< Updated upstream jEq qTD lti @@ -87293,6 +104132,16 @@ vDH dOD aZK uQU +======= +nKO +sEN +lAl +bjZ +pzj +uUN +wlq +vgK +>>>>>>> Stashed changes aTW rjL taO @@ -87385,17 +104234,30 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream nYQ kVV eGa +======= +qPh +mDT +tty +>>>>>>> Stashed changes tJl eyn eyn taO +<<<<<<< Updated upstream sry eyn eyn rnY +======= +cRc +eyn +eyn +vaH +>>>>>>> Stashed changes taO taO taO @@ -87407,17 +104269,26 @@ noM eyn eyn eyn +<<<<<<< Updated upstream eoK +======= +wmK +>>>>>>> Stashed changes dof eyn aHq eyn +<<<<<<< Updated upstream rnY +======= +vaH +>>>>>>> Stashed changes wOi taO eyn sgi taO +<<<<<<< Updated upstream eGa eyn eyn @@ -87441,6 +104312,58 @@ azA azA jpl azA +======= +tty +eyn +eyn +taO +tty +gbB +fIO +vaH +eyn +eyn +tty +kIF +kIF +kIF +kIF +kIF +kIF +eyn +eyn +azA +azA +mnX +azA +azA +azA +azA +qmk +qmk +eSh +vIm +lQS +bFX +iaq +qmk +sJH +gXS +hXB +aaJ +sUt +cIs +ucV +tlY +ucV +ucV +tSO +rXx +tCm +exm +mZc +cyW +>>>>>>> Stashed changes azA azA azA @@ -87557,6 +104480,7 @@ azA jKr azA azA +<<<<<<< Updated upstream wRi ljW azA @@ -87565,17 +104489,36 @@ bpa lmd tPS soo +======= +pxK +ljW +azA +azA +gdg +lmd +tPS +sQJ +>>>>>>> Stashed changes hsU eJc eJc tPS +<<<<<<< Updated upstream lDP lFq +======= +xyS +hGq +>>>>>>> Stashed changes rmK wsd wsd wsd +<<<<<<< Updated upstream xKp +======= +hxl +>>>>>>> Stashed changes wsd wsd rmK @@ -87587,6 +104530,7 @@ luk bho wsd wsd +<<<<<<< Updated upstream ozi syx iZh @@ -87595,6 +104539,16 @@ dOD dOD dOD wJq +======= +uKU +hwp +wAK +uUN +uUN +uUN +uUN +nJY +>>>>>>> Stashed changes aTW taO taO @@ -87688,25 +104642,43 @@ eyn eyn eyn tum +<<<<<<< Updated upstream kVV +======= +mDT +>>>>>>> Stashed changes taO taO eyn taO cwT +<<<<<<< Updated upstream vjz lYi lbU +======= +lKN +dqU +xHX +>>>>>>> Stashed changes dqP taO dof taO iXz +<<<<<<< Updated upstream rie taO fDK iXz rie +======= +qwC +taO +fDK +iXz +qwC +>>>>>>> Stashed changes taO dof dof @@ -87725,6 +104697,7 @@ eyn eyn eyn taO +<<<<<<< Updated upstream sJu urR rnY @@ -87736,17 +104709,35 @@ eFC eFC eFC eFC +======= +hKK +urR +vaH +eyn +eyn +cfW +kIF +kIF +kIF +kIF +kIF +>>>>>>> Stashed changes fOW eyn eyn azA azA +<<<<<<< Updated upstream jpl +======= +mnX +>>>>>>> Stashed changes azA azA azA azA azA +<<<<<<< Updated upstream eTC tyt pev @@ -87768,6 +104759,29 @@ pkU pqV lqA hpZ +======= +xGn +nEL +cgu +dJs +okx +lQS +xGn +gXS +sUt +rDQ +jKr +ebh +cIs +lVo +jsI +qSB +qSB +ktB +aZV +jdp +eUG +>>>>>>> Stashed changes mZc azA azA @@ -87859,19 +104873,28 @@ azA azA ckU azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes azA azA qhE ahs lmd kdY +<<<<<<< Updated upstream eJl +======= +wnb +>>>>>>> Stashed changes kdY tPS eJc tPS ahs +<<<<<<< Updated upstream pgX nht nht @@ -87882,12 +104905,25 @@ aTq hwA qZA lZG +======= +rYE +mur +mur +cDX +kge +ufJ +wQF +hwA +qZA +mpv +>>>>>>> Stashed changes lmd tPS eJc tPS xxH asH +<<<<<<< Updated upstream slr jwS sht @@ -87897,6 +104933,17 @@ vnW sWI nDB kBR +======= +nDi +dZG +vCU +eEd +fBA +bGr +kQC +kqQ +dZQ +>>>>>>> Stashed changes aTW taO jhX @@ -87988,6 +105035,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream lxh taO kVV @@ -87999,6 +105047,19 @@ kST dof cgQ tDd +======= +xfJ +taO +mDT +taO +vaH +eyn +tNM +xSm +dof +cNI +gai +>>>>>>> Stashed changes taO dof dof @@ -88028,6 +105089,7 @@ eyn eyn cfW taO +<<<<<<< Updated upstream euK taO eyn @@ -88038,17 +105100,34 @@ eFC eFC eyn rbl +======= +vHR +taO +eyn +eyn +vaH +kIF +kIF +kIF +eyn +sWI +>>>>>>> Stashed changes eyn eyn azA azA azA +<<<<<<< Updated upstream jpl +======= +mnX +>>>>>>> Stashed changes azA azA azA azA azA +<<<<<<< Updated upstream mrl caI xrs @@ -88070,6 +105149,29 @@ pkU tec jLb glZ +======= +sBf +eME +hIm +lQS +vIm +iap +xGn +nqo +swt +azA +lWa +cIs +cIs +jsI +ucV +iBY +lCr +ktB +bEh +tSO +cIs +>>>>>>> Stashed changes azA azA azA @@ -88161,19 +105263,31 @@ dzm azA azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes azA aUc azA ahs +<<<<<<< Updated upstream oiL btN kaI oKZ +======= +ueJ +iED +stT +lJh +>>>>>>> Stashed changes rVM tPS luk ahs +<<<<<<< Updated upstream bGL jwS jwS @@ -88199,6 +105313,33 @@ sWI sdS uMR sMT +======= +ohg +dZG +dZG +jCl +dZG +dZG +tXw +dZG +dZG +ubK +wwj +dqu +flS +eJc +aOB +eAw +sIf +uKU +lxO +wAK +lYf +kQC +ppU +dZH +fGa +>>>>>>> Stashed changes aTW taO nxs @@ -88292,6 +105433,7 @@ eyn eyn eyn taO +<<<<<<< Updated upstream mLX lbU fDK @@ -88300,6 +105442,16 @@ cce taO etj cQJ +======= +hKn +xHX +fDK +eyn +gLH +taO +iVA +iVM +>>>>>>> Stashed changes cwT taO xmD @@ -88309,6 +105461,8 @@ noM eyn eyn eyn +<<<<<<< Updated upstream +======= eyn eyn eyn @@ -88321,13 +105475,38 @@ eyn eyn tyk tyk +sZZ +taO +taO +>>>>>>> Stashed changes +eyn +eyn +eyn +eyn +eyn +taO +taO +eyn +eyn +<<<<<<< Updated upstream +aHq +eyn +eyn +tyk +tyk uTy taO +======= +eyn +iKX +iTe +>>>>>>> Stashed changes taO eyn eyn eyn eyn +<<<<<<< Updated upstream eyn taO taO @@ -88346,12 +105525,20 @@ azA azA azA jpl +======= +mnX +azA +azA +azA +mnX +>>>>>>> Stashed changes azA azA azA azA hay qmk +<<<<<<< Updated upstream fhl xDd tyt @@ -88371,6 +105558,27 @@ tVb oEK sNB pdF +======= +rZe +ayd +nEL +qMj +hDp +qmk +swK +eZS +dnM +dzm +cIs +kma +ucV +sFB +rnb +qSB +xNV +lCr +nJv +>>>>>>> Stashed changes qmk azA azA @@ -88463,6 +105671,7 @@ azA azA azA azA +<<<<<<< Updated upstream wRi azA jUr @@ -88472,10 +105681,22 @@ lJf bjo kaI nZE +======= +pxK +azA +jUr +drR +yap +yjE +esJ +stT +sEI +>>>>>>> Stashed changes tPS tPS luk cAr +<<<<<<< Updated upstream bGL jwS iNl @@ -88501,6 +105722,33 @@ bnL sWI pPz jwS +======= +ohg +dZG +xAc +wJz +hPz +irY +miD +qOK +dZG +iDS +wOu +dqu +dqu +tPS +tPS +dqu +dqu +nWo +hyP +tHW +xSF +jVn +kQC +kXt +dZG +>>>>>>> Stashed changes neZ taO oFS @@ -88585,6 +105833,7 @@ azA azA azA azA +<<<<<<< Updated upstream eyn eyn eyn @@ -88623,6 +105872,46 @@ aHq eyn tyk uTy +======= +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +taO +mDT +gai +taO +xfJ +nyh +taO +xfJ +eyn +eyn +fGd +taO +taO +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +eyn +aHq +aHq +eyn +tyk +sZZ +>>>>>>> Stashed changes taO taO taO @@ -88631,8 +105920,13 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream rnY eGa +======= +vaH +tty +>>>>>>> Stashed changes eyn eyn eyn @@ -88643,15 +105937,24 @@ eyn eyn eyn azA +<<<<<<< Updated upstream jpl azA azA azA jpl +======= +mnX +azA +azA +azA +mnX +>>>>>>> Stashed changes azA azA azA hay +<<<<<<< Updated upstream dhC qmk bxu @@ -88673,6 +105976,29 @@ iwk pkU fLP ikE +======= +ezz +qmk +aFA +qmk +fMZ +qmk +aFA +qmk +bLe +sKv +uMY +reP +cIs +jCV +xfn +ucV +gWU +tjz +ktB +xvT +yfI +>>>>>>> Stashed changes qmk azA azA @@ -88770,14 +106096,22 @@ qhE azA azA ahs +<<<<<<< Updated upstream pMr bVN ikh pxT +======= +cqs +aZg +guj +fne +>>>>>>> Stashed changes tPS eJc eJc xxH +<<<<<<< Updated upstream oMY nwb jau @@ -88803,6 +106137,33 @@ vDH dOD aZK jwS +======= +kOQ +ucp +ijZ +wJz +pCE +qmW +wJz +wJz +dZG +uAI +lub +tPS +dqu +tPS +tPS +dqu +tPS +nWo +sEN +wEl +cMW +pzj +uUN +wlq +dZG +>>>>>>> Stashed changes pjw lSV aRK @@ -88894,6 +106255,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream lxh udz mDT @@ -88901,6 +106263,15 @@ taO qlZ lxh vwC +======= +xfJ +cof +nxI +taO +vmi +xfJ +oxJ +>>>>>>> Stashed changes taO eyn eyn @@ -88943,6 +106314,7 @@ eyn qmk qmk qmk +<<<<<<< Updated upstream mwN mwN mwN @@ -88976,6 +106348,41 @@ pkU fwp psg glZ +======= +fSZ +fSZ +fSZ +fSZ +azA +azA +mnX +azA +azA +jiW +mUB +fKQ +hTU +fRi +lQf +xNr +qZA +fRi +uyU +fKQ +aKT +bLe +bXz +qmk +qen +jsI +ucV +wDU +qZF +ktB +jWs +pkS +cIs +>>>>>>> Stashed changes cyW azA snR @@ -89067,19 +106474,31 @@ wfv wfv uhS azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes azA azA ljW ahs +<<<<<<< Updated upstream lJf tPS xxN nZE +======= +yjE +tPS +dUX +sEI +>>>>>>> Stashed changes tPS eJc eJc jUV +<<<<<<< Updated upstream dpM jwS nAd @@ -89089,10 +106508,22 @@ sRW bwa rhc rOZ +======= +efb +dZG +lRK +wJz +xAc +eWx +mwN +wJz +tTv +>>>>>>> Stashed changes uVn lmd cNV tPS +<<<<<<< Updated upstream lDP oFi wsd @@ -89105,6 +106536,20 @@ egt aMB dOD jwS +======= +xyS +oYB +wsd +wvH +uKU +luj +cHI +ddY +sgo +vxu +uUN +dZG +>>>>>>> Stashed changes pjw lSV aRK @@ -89196,13 +106641,21 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream lxh +======= +xfJ +>>>>>>> Stashed changes qoT taO taO cfW eyn +<<<<<<< Updated upstream aJw +======= +ffZ +>>>>>>> Stashed changes qoT eyn eyn @@ -89215,6 +106668,7 @@ taO taO eyn eyn +<<<<<<< Updated upstream bgw bgw bgw @@ -89225,6 +106679,18 @@ eyn eyn fOW qlZ +======= +aVc +aVc +aVc +aVc +aVc +aVc +eyn +eyn +fOW +vmi +>>>>>>> Stashed changes taO taO taO @@ -89243,6 +106709,7 @@ eyn qmk qmk qmk +<<<<<<< Updated upstream rjo rjo mwN @@ -89256,16 +106723,36 @@ mwN mwN mwN sZP +======= +lGW +lGW +fSZ +tDB +pDs +fSZ +fSZ +fSZ +fSZ +fSZ +fSZ +fSZ +bLe +>>>>>>> Stashed changes fKQ peg tZf pAh +<<<<<<< Updated upstream fwi +======= +nFZ +>>>>>>> Stashed changes psn tZf nCG fKQ fKQ +<<<<<<< Updated upstream kJH qmk qmk @@ -89278,11 +106765,29 @@ pkU gTE dQI glZ +======= +abO +qmk +qmk +dTy +ucV +ucV +wSu +iBY +ktB +qad +qQz +cIs +>>>>>>> Stashed changes cyW cyW snR cBf +<<<<<<< Updated upstream nAU +======= +dTs +>>>>>>> Stashed changes cBf kiP uhS @@ -89369,19 +106874,31 @@ rRz hYR nrq azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes azA azA azA ahs +<<<<<<< Updated upstream lJf bjo xxN nZE +======= +yjE +esJ +dUX +sEI +>>>>>>> Stashed changes tPS eJc tPS ahs +<<<<<<< Updated upstream bGL jwS vdF @@ -89391,12 +106908,24 @@ jPb rhc rhc jwS +======= +ohg +dZG +jBI +wJz +wJz +bLC +wJz +wJz +dZG +>>>>>>> Stashed changes uVn lmd cNV tPS oDA uup +<<<<<<< Updated upstream jwS oNR jwS @@ -89407,6 +106936,18 @@ dOD gFQ jwS jwS +======= +dZG +cTr +dZG +cEy +uUN +uUN +uUN +hqE +dZG +dZG +>>>>>>> Stashed changes pjw lSV aRK @@ -89500,16 +107041,24 @@ eyn eyn eyn fOW +<<<<<<< Updated upstream tlP kVV taO lxh +======= +vTy +mDT +taO +xfJ +>>>>>>> Stashed changes eyn taO eyn eyn eyn eyn +<<<<<<< Updated upstream cRj bki rnY @@ -89525,12 +107074,33 @@ kxz bgw eyn rnY +======= +pxT +bki +vaH +taO +djf +iTe +eyn +aVc +bgw +xJn +cvy +cvy +aVc +eyn +vaH +>>>>>>> Stashed changes taO taO taO taO fOW +<<<<<<< Updated upstream rnY +======= +vaH +>>>>>>> Stashed changes eyn eyn eyn @@ -89543,6 +107113,7 @@ eyn eyn azA qmk +<<<<<<< Updated upstream xxW sCa wmm @@ -89561,11 +107132,32 @@ bwE kib fKQ cKR +======= +mtT +aPL +ggj +ggj +fSZ +aHg +aso +tWu +xRP +xvX +gBE +laF +qjb +fSZ +tfe +iOG +fKQ +gqS +>>>>>>> Stashed changes fKQ fKQ fKQ fKQ fKQ +<<<<<<< Updated upstream rMP fKQ fKQ @@ -89580,6 +107172,22 @@ qmk qmk glZ glZ +======= +qpU +fKQ +fKQ +sAI +ucV +jsI +ucV +ucV +ucV +cJZ +qmk +qmk +cIs +cIs +>>>>>>> Stashed changes cyW cyW bce @@ -89671,11 +107279,16 @@ rRz nDt ctN azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes ljW azA azA qzA +<<<<<<< Updated upstream xfJ pQD dfc @@ -89693,11 +107306,31 @@ slq rhc rhc sMT +======= +pVd +uVd +pEx +wCM +tPS +vFU +tPS +ioi +ohg +dZG +iSc +wJz +wJz +qmW +wJz +wJz +fGa +>>>>>>> Stashed changes nQO lmd tPS tPS ahs +<<<<<<< Updated upstream mgI jwS aZK @@ -89708,6 +107341,18 @@ gdm nwb uof jwS +======= +ctC +dZG +wlq +uUN +uUN +bqR +bqR +ucp +aZv +dZG +>>>>>>> Stashed changes vkP vkP vkP @@ -89796,6 +107441,19 @@ azA azA oZJ upl +<<<<<<< Updated upstream +======= +eyn +eyn +eyn +eyn +eyn +taO +vTy +mDT +taO +xfJ +>>>>>>> Stashed changes eyn eyn eyn @@ -89832,10 +107490,33 @@ qwC taO aHq eyn +eyn +eyn +<<<<<<< Updated upstream +======= +rZz +dof +gLl +dof +eyn +aVc +vCA +vjP +vjP +lxr +aVc +taO +taO +taO +asc +taO +aHq +eyn aHq aHq eyn eyn +>>>>>>> Stashed changes eyn eyn eyn @@ -89845,6 +107526,7 @@ eyn azA azA qmk +<<<<<<< Updated upstream qnM pfL xFO @@ -89860,10 +107542,28 @@ uXs xnM mwN cuA +======= +qCk +jgl +bNC +qBX +fSZ +olg +nhC +fSZ +nhI +ibC +buK +lUM +wkQ +fSZ +oBZ +>>>>>>> Stashed changes fKQ fKQ fKQ fKQ +<<<<<<< Updated upstream aEq fKQ fKQ @@ -89879,6 +107579,23 @@ cHW qmk glZ glZ +======= +fqh +fKQ +fKQ +nFZ +fKQ +fKQ +fKQ +jFg +ucV +kSD +lkc +xfn +qmk +cIs +cIs +>>>>>>> Stashed changes cyW cyW cyW @@ -89973,19 +107690,30 @@ nDt ctN azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes lbp azA qhE oDA +<<<<<<< Updated upstream yae qid xxN +======= +ktI +qid +dUX +>>>>>>> Stashed changes tPS eJc tPS luk oDA +<<<<<<< Updated upstream dpM jwS jZl @@ -90010,6 +107738,32 @@ pBE dOD iZh jwS +======= +efb +dZG +wOQ +kBr +cRj +brU +wJz +wJz +vgK +tMB +lWV +tPS +tPS +aaO +iDS +dZG +uUN +wmm +luj +wyy +cPG +uUN +wAK +dZG +>>>>>>> Stashed changes vkP laX olF @@ -90103,10 +107857,17 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream vfF taO mAQ qlZ +======= +bpn +taO +mAQ +vmi +>>>>>>> Stashed changes eyn eyn eyn @@ -90116,11 +107877,16 @@ eyn eyn taO taO +<<<<<<< Updated upstream nDc +======= +oWA +>>>>>>> Stashed changes dof taO taO eyn +<<<<<<< Updated upstream bgw xjZ lQf @@ -90138,6 +107904,25 @@ aHq eyn eyn eyn +======= +aVc +hVf +vjP +mTa +aMQ +ggK +taO +taO +vaH +noM +eyn +aHq +aHq +aHq +eyn +eyn +eyn +>>>>>>> Stashed changes eyn eyn eyn @@ -90149,6 +107934,7 @@ azA qmk qmk qmk +<<<<<<< Updated upstream oml wmm mwN @@ -90165,11 +107951,30 @@ pDW fKQ tKw qAP +======= +tCj +ggj +fSZ +vWU +nhC +fSZ +qHj +bNB +laF +rvg +xRP +eDU +pDb +fKQ +pzF +gTS +>>>>>>> Stashed changes izU qZA izU fKQ fKQ +<<<<<<< Updated upstream mLW fwi glZ @@ -90177,6 +107982,15 @@ glZ glZ glZ glZ +======= +was +nFZ +cIs +cIs +cIs +cIs +cIs +>>>>>>> Stashed changes qmk qmk cyW @@ -90279,6 +108093,7 @@ sqv azA aUc azA +<<<<<<< Updated upstream aOz lmd wvE @@ -90312,6 +108127,41 @@ upH ktI xWF jwS +======= +nvC +lmd +wvE +dUX +tPS +tPS +wbf +nkI +iTC +lwK +dZG +kRS +rnY +tGE +wYD +wJz +wJz +nJY +uVn +gNQ +tPS +tPS +qCz +uYI +dZG +paG +dln +paG +dZG +utT +ddY +wGB +dZG +>>>>>>> Stashed changes vkP fiR hze @@ -90405,7 +108255,11 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream iOG +======= +vDa +>>>>>>> Stashed changes taO taO taO @@ -90416,6 +108270,7 @@ eyn eyn eyn tNM +<<<<<<< Updated upstream vpp dMZ jwh @@ -90429,6 +108284,21 @@ hmi qiI lQf bgw +======= +yaS +rVG +iXv +taO +xfJ +eyn +eyn +dJC +rPH +uLb +nHb +vjP +aVc +>>>>>>> Stashed changes cfW taO aHq @@ -90449,6 +108319,7 @@ azA azA azA qmk +<<<<<<< Updated upstream nhC cFH rlm @@ -90467,11 +108338,32 @@ dJH kck fKQ fyN +======= +fVP +kWV +rek +dci +fSZ +fSZ +irI +fSZ +iWu +xzj +jhP +ukT +laF +pXN +euK +iHp +fKQ +hpR +>>>>>>> Stashed changes qZA qZA hwA fKQ fKQ +<<<<<<< Updated upstream niA fUa glZ @@ -90483,6 +108375,19 @@ hxm glZ azA jFD +======= +aMR +jaO +cIs +jBp +aXo +kJH +uJq +oNu +cIs +azA +aaC +>>>>>>> Stashed changes azA azA iHx @@ -90577,19 +108482,29 @@ azA azA azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes ljW azA azA ahs lmd kdY +<<<<<<< Updated upstream uuR pwe +======= +xrV +jxc +>>>>>>> Stashed changes cNV xhr mJM ahs +<<<<<<< Updated upstream rma jwS fdB @@ -90614,6 +108529,32 @@ rSZ jwS jwS jwS +======= +eWg +dZG +fGj +sWE +ksD +mJL +wJz +wJz +dZQ +wdV +lmd +dqu +dqu +xdE +uVn +dZG +dZG +dZG +dZG +dZG +rjo +dZG +dZG +dZG +>>>>>>> Stashed changes vkP jiP sEJ @@ -90709,8 +108650,13 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream rzh rnY +======= +aPS +vaH +>>>>>>> Stashed changes cfW eyn eyn @@ -90718,19 +108664,33 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream rnY mhi +======= +vaH +qIr +>>>>>>> Stashed changes qoT eyn eyn eyn eyn +<<<<<<< Updated upstream bgw wFa kWO vlf msO bgw +======= +aVc +sHV +iva +cHi +aMQ +aVc +>>>>>>> Stashed changes aHq aHq aHq @@ -90744,13 +108704,18 @@ eyn azA azA azA +<<<<<<< Updated upstream pCk +======= +dpm +>>>>>>> Stashed changes azA azA azA azA azA qmk +<<<<<<< Updated upstream wmm nLJ wmm @@ -90786,6 +108751,43 @@ glZ pbH azA uJV +======= +ggj +nYQ +ggj +aPL +jqz +fSZ +ltA +fSZ +iJF +pFP +bfY +pqZ +uIr +fSZ +fKQ +abO +fKQ +iOG +lwL +fKQ +gTS +dZa +nFZ +qzA +vpp +lSW +moW +tyt +nrR +nrR +oKZ +cIs +xlt +azA +kBW +>>>>>>> Stashed changes azA iHx jKr @@ -90798,7 +108800,7 @@ azA azA azA azA -hHf +oUk pmV cBf aWG @@ -90879,19 +108881,29 @@ fZR azA azA azA +<<<<<<< Updated upstream wRi paN +======= +pxK +dnA +>>>>>>> Stashed changes azA azA ahs lmd tPS tPS +<<<<<<< Updated upstream pRE +======= +hYY +>>>>>>> Stashed changes rfM xhr gTs ahs +<<<<<<< Updated upstream oMY jwS jAn @@ -90916,6 +108928,32 @@ rUC vYa jwS jwS +======= +kOQ +dZG +aov +wJz +wOQ +hIh +wJz +wJz +nem +uVn +vyg +dqu +tPS +ahs +kyK +uVn +dZG +qkX +nSn +fpJ +uQB +rie +dZG +dZG +>>>>>>> Stashed changes vkP jaM qLq @@ -91016,8 +109054,13 @@ taO taO taO taO +<<<<<<< Updated upstream mhi eGa +======= +qIr +tty +>>>>>>> Stashed changes eyn eyn eyn @@ -91027,12 +109070,21 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream bgw iDY hmi qOb sVy bgw +======= +aVc +ijs +uLb +enJ +sjp +aVc +>>>>>>> Stashed changes eyn eyn eyn @@ -91053,6 +109105,7 @@ azA azA azA qmk +<<<<<<< Updated upstream hfm nYW wmm @@ -91086,6 +109139,41 @@ mOF rtg qmk vfS +======= +qWN +bFD +ggj +lIl +ixw +fSZ +fSZ +fSZ +fSZ +fSZ +fSZ +fSZ +fSZ +oWZ +waK +fKQ +iOG +fKQ +fKQ +fKQ +gqS +fKQ +sgn +oDA +oLv +qmk +ayG +uJq +fDG +nrR +bBb +qmk +pBl +>>>>>>> Stashed changes azA azA azA @@ -91181,11 +109269,16 @@ sLI azA azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes azA azA ljW ahs +<<<<<<< Updated upstream nAb iKG tPS @@ -91203,6 +109296,25 @@ cIz hNc rhc qEK +======= +rfr +wbf +tPS +hYY +cNV +xhr +aPP +nHo +hrM +dZG +fLH +wJz +tGE +lYo +aui +wJz +fwX +>>>>>>> Stashed changes uVn vyg tPS @@ -91210,6 +109322,7 @@ tPS aOB nEj uVn +<<<<<<< Updated upstream fMf gaq gaq @@ -91218,6 +109331,16 @@ gaq ffy jwS jwS +======= +sUi +fpJ +fpJ +fpJ +fpJ +rhY +dZG +dZG +>>>>>>> Stashed changes vkP thA fkM @@ -91317,6 +109440,7 @@ eyn taO taO taO +<<<<<<< Updated upstream cDN taO taO @@ -91335,6 +109459,26 @@ fnD ttM uYb bgw +======= +pYD +taO +taO +taO +xfJ +xfJ +eyn +eyn +xyR +xyR +xyR +eyn +aVc +onJ +akT +beU +uhh +aVc +>>>>>>> Stashed changes eyn eyn eyn @@ -91347,6 +109491,7 @@ azA azA qmk qmk +<<<<<<< Updated upstream glZ glZ glZ @@ -91375,10 +109520,41 @@ izU evm fKQ bro +======= +cIs +cIs +cIs +azA +azA +epF +fop +qmk +ggj +ifN +aPL +ggj +tdD +qmk +vqD +myg +lQS +jcu +lQS +blR +lQS +qmk +fKQ +nFZ +izU +eID +fKQ +aDt +>>>>>>> Stashed changes sgn qMB nqZ jUV +<<<<<<< Updated upstream iUj oPU gai @@ -91386,6 +109562,15 @@ bDA avq mOF iLb +======= +btN +uQU +rFQ +oow +moW +nrR +jPX +>>>>>>> Stashed changes qmk azA azA @@ -91483,7 +109668,11 @@ sLI azA azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes qhE azA azA @@ -91491,6 +109680,7 @@ ahs weO uhp kdY +<<<<<<< Updated upstream dfc bNM cNV @@ -91506,12 +109696,30 @@ slq fYh jwS cpS +======= +pEx +nta +cNV +ewz +shL +shL +dZG +lCN +pnq +dZG +dZG +qmW +qOK +dZG +wdV +>>>>>>> Stashed changes lmd tPS tPS eJc ahs uVn +<<<<<<< Updated upstream jwS eHh bgK @@ -91519,6 +109727,15 @@ mra tSg ffy jwS +======= +dZG +hbU +oPU +vle +tyI +rhY +dZG +>>>>>>> Stashed changes azA vkP vkP @@ -91617,6 +109834,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream lxh rnY qlZ @@ -91637,6 +109855,28 @@ bgw bgw bgw bgw +======= +xfJ +vaH +vmi +xHX +sSb +qoT +taO +gkQ +xfJ +eyn +jlS +taO +taO +eyn +aVc +aVc +aVc +aVc +aVc +aVc +>>>>>>> Stashed changes eyn eyn azA @@ -91644,6 +109884,7 @@ azA azA azA azA +<<<<<<< Updated upstream glZ glZ qmk @@ -91693,6 +109934,57 @@ azA boK lbp pbH +======= +cIs +cIs +qmk +qmk +rMR +rMR +dnw +cIs +azA +azA +mUB +bCH +qmk +fVP +kWV +voo +hWU +mGF +qmk +hhY +lQS +eiU +lQS +jLT +lQS +eKg +mfx +fKQ +uVn +uVn +fTt +qmk +qmk +cIs +azA +azA +jQG +vtW +uQU +sdw +nyj +uJq +nrR +wED +qmk +azA +reW +lbp +xlt +>>>>>>> Stashed changes iHx azA azA @@ -91787,12 +110079,17 @@ azA azA sqv azA +<<<<<<< Updated upstream jFD +======= +aaC +>>>>>>> Stashed changes azA xxH arq tPS ijL +<<<<<<< Updated upstream gZg sRT vQZ @@ -91809,11 +110106,30 @@ rhc jwS uVn wnU +======= +bkV +kiK +soo +dUX +dZG +xOc +pTi +yjB +unx +unx +dZG +rJd +wJz +dZG +uVn +flZ +>>>>>>> Stashed changes tPS tPS luk uXT nEj +<<<<<<< Updated upstream jwS jwS jwS @@ -91821,6 +110137,15 @@ jwS hRc hRc jEU +======= +dZG +dZG +dZG +dZG +xMp +xMp +uEc +>>>>>>> Stashed changes azA azA nmy @@ -91923,14 +110248,23 @@ eyn eyn eyn mVp +<<<<<<< Updated upstream kVV sTR +======= +mDT +iFv +>>>>>>> Stashed changes taO fDK fOW eyn eyn +<<<<<<< Updated upstream mGU +======= +wXr +>>>>>>> Stashed changes taO eyn eyn @@ -91938,13 +110272,18 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream bLZ +======= +reH +>>>>>>> Stashed changes eyn azA azA qmk qmk qmk +<<<<<<< Updated upstream glZ glZ rhA @@ -91957,11 +110296,26 @@ jLT ufz epF vle +======= +cIs +cIs +rMR +qzi +eOa +kAA +kAA +suy +gMb +uBz +epF +cPo +>>>>>>> Stashed changes azA qmk qmk qmk qmk +<<<<<<< Updated upstream jHg aoO qmk @@ -91992,6 +110346,38 @@ mKb xpW qmk xae +======= +lpb +eDc +qmk +sJu +lQS +tpA +bFX +cgu +mjH +eXP +qmk +fKQ +jUl +klW +fTt +qmk +cIs +cIs +cIs +cIs +cIs +cIs +qmk +qmk +qmk +tyt +mKb +uxG +qmk +ubI +>>>>>>> Stashed changes azA azA azA @@ -92087,7 +110473,11 @@ sLI azA azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes azA ljW qhE @@ -92095,6 +110485,7 @@ xxH lcl tPS tPS +<<<<<<< Updated upstream xxN veM tPS @@ -92109,11 +110500,28 @@ nwb slq rhc qEK +======= +dUX +fTI +tPS +dUX +bYu +fOj +ept +xNE +hxj +unx +ucp +qmW +wJz +fwX +>>>>>>> Stashed changes uVn izU tPS tPS eJc +<<<<<<< Updated upstream qtr uXT nEj @@ -92123,6 +110531,17 @@ rAg wsd wsd ixI +======= +flS +uXT +nEj +izU +aaI +aJW +wsd +wsd +khi +>>>>>>> Stashed changes wsd wsd jQw @@ -92225,6 +110644,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream akT taO taO @@ -92235,12 +110655,25 @@ qKf vnO rfW jcO +======= +jcO +taO +taO +qwC +taO +taO +wth +aWT +mGU +mTb +>>>>>>> Stashed changes eyn eyn eyn eyn eyn eyn +<<<<<<< Updated upstream nZP azA azA @@ -92276,10 +110709,48 @@ lQS xew qmk jfT +======= +mwT +azA +azA +qmk +pBx +cfj +vkk +ufX +rMR +kAA +kAA +rhc +avt +uae +rpZ +ncO +oeF +bCH +azA +enj +tyG +tyG +qav +qWN +ggj +qmk +jtd +lQS +jUe +xAJ +lQS +lQS +fUm +qmk +nxr +>>>>>>> Stashed changes uVn uVn weO qmk +<<<<<<< Updated upstream knm lJh mBp @@ -92292,6 +110763,20 @@ qmk mOF rHn avq +======= +pod +tUK +miU +uqT +rbH +vDy +wPK +vDy +qmk +nrR +uJq +moW +>>>>>>> Stashed changes qmk azA azA @@ -92389,12 +110874,17 @@ sLI azA azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes azA fZL azA ahs hwA +<<<<<<< Updated upstream ign myt xxN @@ -92416,16 +110906,48 @@ yae tPS tPS nrn +======= +qcr +jvX +dUX +cNV +iMI +gkE +bYu +fAj +unx +teQ +unx +unx +oLN +qmW +wJz +fwX +uVn +ktI +tPS +tPS +dqu +>>>>>>> Stashed changes eJc cNV qzA ioi +<<<<<<< Updated upstream hpE nXi eAw eAw mVY ybD +======= +aaI +nzI +eAw +eAw +jIl +tHr +>>>>>>> Stashed changes eAw gXS quO @@ -92527,6 +111049,7 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream sks rnY oJW @@ -92536,10 +111059,22 @@ itr cDz qJO dHZ +======= +qeM +vaH +oJW +yjb +ndW +bQF +rMP +tJZ +paH +>>>>>>> Stashed changes cBf cBf cBf cBf +<<<<<<< Updated upstream fKM ush cBf @@ -92558,11 +111093,32 @@ aPP aPP qzy glZ +======= +roN +hDi +cBf +mwT +azA +azA +qmk +oAA +kjr +avA +ikE +rMR +kAA +rhc +kAA +kAA +xCz +cIs +>>>>>>> Stashed changes azA epF jOa bbF azA +<<<<<<< Updated upstream quf rrL hwE @@ -92594,6 +111150,39 @@ qmk mOF avq mic +======= +enj +jrB +qav +ggj +aPL +qmk +jtd +mTs +lbe +hEG +eXP +xmk +btW +qmk +iUp +uVn +uVn +kxu +qmk +esM +bDA +miU +bDA +qmk +vKH +pHO +ugZ +qmk +nrR +moW +cSH +>>>>>>> Stashed changes qmk azA azA @@ -92691,12 +111280,17 @@ sLI azA azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes azA qhE azA ahs ioi +<<<<<<< Updated upstream myt myt xxN @@ -92715,6 +111309,26 @@ rhc jwS cpS dCE +======= +jvX +jvX +dUX +eJc +vln +gFJ +bYu +yjr +unx +unx +unx +unx +dZG +qmW +wJz +dZG +wdV +cVI +>>>>>>> Stashed changes wsd iwB tPS @@ -92722,12 +111336,21 @@ tPS cNV tPS tPS +<<<<<<< Updated upstream vfa smK smK smK uaS uaS +======= +dWQ +smK +smK +smK +oVp +oVp +>>>>>>> Stashed changes smK smK smK @@ -92830,18 +111453,29 @@ eyn eyn eyn eyn +<<<<<<< Updated upstream lxh +======= +xfJ +>>>>>>> Stashed changes eyn eyn eyn eyn +<<<<<<< Updated upstream gOW wSu oWZ +======= +rPw +oup +vmd +>>>>>>> Stashed changes cBf cBf cBf cBf +<<<<<<< Updated upstream dwn cBf cBf @@ -92862,12 +111496,39 @@ qrg avw oMd dIL +======= +bgH +cBf +cBf +gGn +azA +azA +qmk +mQL +gCo +qrg +bHF +rMR +kAA +kAA +kAA +rhc +qFu +fTU +oMd +rvi +>>>>>>> Stashed changes ioi gXS azA azA +<<<<<<< Updated upstream quf vuy +======= +enj +qOX +>>>>>>> Stashed changes qmk qmk qmk @@ -92879,6 +111540,7 @@ qmk qmk qmk qmk +<<<<<<< Updated upstream kmB uVn uVn @@ -92897,6 +111559,26 @@ hdM rHn mic glZ +======= +cKM +uVn +uVn +wEh +qmk +lcI +miU +aCT +aEE +cIs +vlk +cos +xnR +qmk +hHP +uJq +cSH +cIs +>>>>>>> Stashed changes jUr azA nLA @@ -92906,7 +111588,11 @@ azA dzm azA azA +<<<<<<< Updated upstream vGk +======= +mrF +>>>>>>> Stashed changes wTQ ctN isX @@ -92993,7 +111679,11 @@ sLI azA azA azA +<<<<<<< Updated upstream wRi +======= +pxK +>>>>>>> Stashed changes ljW azA azA @@ -93001,6 +111691,7 @@ ioi ioi ioi wsd +<<<<<<< Updated upstream xKp wsd wsd @@ -93015,12 +111706,29 @@ jwS slq rhc jwS +======= +hxl +wsd +wsd +rCC +dZG +sIp +unx +tDI +emi +lbi +dZG +qmW +wJz +dZG +>>>>>>> Stashed changes uVn nQO uVn lmd tPS tPS +<<<<<<< Updated upstream nrn tPS nrn @@ -93029,6 +111737,16 @@ smK smK uaS uaS +======= +dqu +tPS +dqu +dWQ +smK +smK +oVp +oVp +>>>>>>> Stashed changes luk smK smK @@ -93137,8 +111855,13 @@ eyn eyn cBf cBf +<<<<<<< Updated upstream hKK bUo +======= +krO +lVJ +>>>>>>> Stashed changes cBf cBf cBf @@ -93147,6 +111870,7 @@ cBf cBf cBf cBf +<<<<<<< Updated upstream nZP azA azA @@ -93181,10 +111905,47 @@ iAe kYn ckK twv +======= +mwT +azA +azA +qmk +qrg +qrg +cAe +qmk +nDc +kTQ +bvx +kAA +kAA +pcx +gMb +oMd +rES +xTY +bCH +jFO +dHZ +rOi +wsd +clg +sdJ +qPS +wsd +wsd +clg +uzR +qPS +tiY +ckK +lzT +>>>>>>> Stashed changes jQw uVn uVn ioi +<<<<<<< Updated upstream sVO xAG vmi @@ -93199,6 +111960,22 @@ hdM kXc glZ glZ +======= +bUW +iKz +amw +bzD +qWA +cIs +fqX +lll +sgz +qmk +hHP +rSs +cIs +cIs +>>>>>>> Stashed changes azA azA qhE @@ -93300,6 +112077,7 @@ azA azA aUc ioi +<<<<<<< Updated upstream uJs kna kna @@ -93331,6 +112109,39 @@ fSZ wsd dDM ixI +======= +skJ +bcQ +bcQ +bWJ +qgf +iaE +llo +dZG +qKf +iIa +qKf +let +iIa +dZG +uLH +tTv +dZG +tTv +tTv +dZG +sqF +fgw +djp +dwn +sIZ +yhU +aaI +huJ +wsd +okQ +khi +>>>>>>> Stashed changes wsd wsd ioi @@ -93436,17 +112247,27 @@ eyn eyn azA azA +<<<<<<< Updated upstream fdE jbl fYG bHu cBf rDL +======= +tlP +jbl +qPa +jYM +cBf +nCx +>>>>>>> Stashed changes cBf cBf cBf cBf cBf +<<<<<<< Updated upstream bHu cBf nZP @@ -93467,6 +112288,28 @@ qmk azA xxH fCk +======= +jYM +cBf +mwT +azA +azA +cIs +aNu +cfj +qrg +bZG +vJN +wUg +mhx +bqI +kAA +pKu +qmk +azA +xxH +pyY +>>>>>>> Stashed changes azA ydp fye @@ -93475,11 +112318,19 @@ uVn uVn uVn uVn +<<<<<<< Updated upstream kdx yae ioi ioi ehF +======= +umH +ktI +ioi +ioi +wln +>>>>>>> Stashed changes ioi ioi izU @@ -93487,6 +112338,7 @@ uVn uVn uVn xNr +<<<<<<< Updated upstream sVO xEs mBp @@ -93494,12 +112346,25 @@ tra lam glZ glZ +======= +bUW +gCO +miU +nMC +mqj +cIs +cIs +>>>>>>> Stashed changes qmk qmk qmk qmk qmk +<<<<<<< Updated upstream glZ +======= +cIs +>>>>>>> Stashed changes azA azA azA @@ -93602,6 +112467,7 @@ bvo azA azA azA +<<<<<<< Updated upstream jpl odS odS @@ -93633,6 +112499,39 @@ jak eAw eAw mVY +======= +mnX +odS +odS +azA +mnX +azA +dZG +dZG +oLh +let +unx +vtH +unx +dZG +qmW +wJz +iEH +wJz +wJz +dZG +dZG +ovf +eAw +dXO +gpB +dXO +aaI +lcR +eAw +eAw +jIl +>>>>>>> Stashed changes eAw eAw nEj @@ -93738,13 +112637,21 @@ eyn eyn azA azA +<<<<<<< Updated upstream aoD +======= +trr +>>>>>>> Stashed changes gAg jbl cBf cBf cBf +<<<<<<< Updated upstream aUl +======= +pUf +>>>>>>> Stashed changes cBf cBf cBf @@ -93754,6 +112661,7 @@ nDt cvJ azA azA +<<<<<<< Updated upstream glZ glZ sLe @@ -93770,11 +112678,30 @@ vfS jUV aso rpZ +======= +cIs +cIs +uIB +qmk +qOX +kAA +kAA +ejl +kAA +xUu +qmk +qmk +pBl +jUV +uMY +qlZ +>>>>>>> Stashed changes yho agf nEj uVn fKQ +<<<<<<< Updated upstream xSM fwi fKQ @@ -93789,12 +112716,29 @@ nEj uVn yae gQn +======= +xJO +nFZ +fKQ +miR +ioi +gXS +aaJ +bCH +yho +ldV +nEj +uVn +ktI +ppH +>>>>>>> Stashed changes qmk qmk qmk qmk qmk qmk +<<<<<<< Updated upstream drA foo ihu @@ -93807,6 +112751,20 @@ azA iRT azA vfS +======= +nTz +gpX +dUo +vAW +pBl +bNr +azA +xlt +azA +iRT +azA +pBl +>>>>>>> Stashed changes lPN cdo isQ @@ -93903,6 +112861,7 @@ bvo bvo azA azA +<<<<<<< Updated upstream vMj nov czG @@ -93935,6 +112894,40 @@ uJH cyW rLN rLN +======= +cKR +mzf +fvm +fvm +egv +mnX +lhS +dZG +rmi +qgV +kBr +unx +unx +yiF +pMr +qmW +wJz +kfy +wJz +wJz +ewS +dZG +eQh +azA +rNx +azA +aaI +aaI +pDW +cyW +iMj +iMj +>>>>>>> Stashed changes azA azA ahs @@ -94042,10 +113035,17 @@ azA azA iHx azA +<<<<<<< Updated upstream spP wTQ jbl ufJ +======= +dGM +wTQ +jbl +lNw +>>>>>>> Stashed changes cBf cBf cBf @@ -94053,6 +113053,7 @@ xcD cBf nDt ctN +<<<<<<< Updated upstream aoD kXs azA @@ -94074,17 +113075,45 @@ uVn aso xae vfS +======= +trr +qrK +azA +kXs +fso +mgn +toH +qmk +bqI +kAA +iox +kAA +iav +qmk +sQT +wsd +jQw +uVn +uMY +ubI +pBl +>>>>>>> Stashed changes ahs eAw eAw eAw eAw eAw +<<<<<<< Updated upstream hoH +======= +trx +>>>>>>> Stashed changes rlA rZy azA bbF +<<<<<<< Updated upstream paN bLE ahs @@ -94095,19 +113124,40 @@ nqY foo drA axO +======= +dnA +nml +ahs +uVn +weO +qqz +eYQ +gpX +nTz +hTU +>>>>>>> Stashed changes uVn uVn uVn mUY arq +<<<<<<< Updated upstream huE pbH +======= +pkU +xlt +>>>>>>> Stashed changes voU azA nLA azA azA +<<<<<<< Updated upstream pbH +======= +xlt +>>>>>>> Stashed changes azA jDe pav @@ -94196,7 +113246,11 @@ sOC jgd rJx bvo +<<<<<<< Updated upstream xCG +======= +amQ +>>>>>>> Stashed changes lox uBR cbF @@ -94205,6 +113259,7 @@ bvo bvo azA azA +<<<<<<< Updated upstream eQj juY cjq @@ -94235,6 +113290,38 @@ gzB hpE cyW rLN +======= +sed +vdH +gyi +rrp +qYd +mnX +azA +dZG +ckl +bOc +fBy +hpE +tAd +kuS +lbi +qmW +wJz +bAG +xDO +xDO +ups +dZG +azA +dpm +qTE +xhW +gzB +aaI +cyW +iMj +>>>>>>> Stashed changes cyW azA azA @@ -94343,12 +113430,18 @@ aFL klm aFL lbW +<<<<<<< Updated upstream dxK fAj +======= +wdk +jpQ +>>>>>>> Stashed changes rzH gAg wTQ wTQ +<<<<<<< Updated upstream xIz jbl cBf @@ -94374,6 +113467,33 @@ izU kdx izU bfO +======= +wSU +jbl +cBf +xcD +mFd +azA +nmA +azA +azA +dyA +tKC +rQn +gPN +qmk +hfw +kAA +avt +bqI +rhc +gQY +izU +izU +umH +izU +kbo +>>>>>>> Stashed changes nLA qhE ahs @@ -94381,7 +113501,11 @@ tfP bTA jqt jqt +<<<<<<< Updated upstream bqo +======= +iwd +>>>>>>> Stashed changes jqt jqt gTs @@ -94396,12 +113520,20 @@ ckK jQw uVn uVn +<<<<<<< Updated upstream qMo +======= +qFc +>>>>>>> Stashed changes uVn uVn uVn isS +<<<<<<< Updated upstream fBy +======= +uuN +>>>>>>> Stashed changes ckK ckK eSw @@ -94410,7 +113542,11 @@ azA ljW azA azA +<<<<<<< Updated upstream dsH +======= +qqz +>>>>>>> Stashed changes jDe pav pAA @@ -94507,6 +113643,7 @@ bvo bvo azA azA +<<<<<<< Updated upstream rOB oew czG @@ -94536,6 +113673,37 @@ aUc azA mBX rLN +======= +ihO +jMO +fvm +fvm +ihO +mnX +azA +hWc +xdg +wQC +wOQ +unx +unx +klZ +unx +qmW +wJz +pOa +fKH +tHX +osc +dZG +pXt +dPn +azA +aUc +azA +eOv +iMj +>>>>>>> Stashed changes cyW azA azA @@ -94645,17 +113813,26 @@ jQV cDB jrq gon +<<<<<<< Updated upstream rCU aTG azA azA nyh +======= +jeV +mND +azA +azA +lgB +>>>>>>> Stashed changes azA puQ gAg jbl cBf kiP +<<<<<<< Updated upstream tzE vZc azA @@ -94664,33 +113841,62 @@ paG kOU nZL bLv +======= +bVH +uQK +azA +azA +qbd +bYm +pko +vaL +>>>>>>> Stashed changes qmk qmk qmk qmk +<<<<<<< Updated upstream glZ glZ glZ +======= +cIs +cIs +cIs +>>>>>>> Stashed changes rlA fhJ nEj ioi lmd +<<<<<<< Updated upstream vfS +======= +pBl +>>>>>>> Stashed changes azA ahs tfP jqt jqt +<<<<<<< Updated upstream xNB +======= +pVs +>>>>>>> Stashed changes jqt jqt jqt luk ybl kyc +<<<<<<< Updated upstream egT lbC +======= +sXY +uOD +>>>>>>> Stashed changes ahs mUY uVn @@ -94699,6 +113905,7 @@ uVn uVn uVn uVn +<<<<<<< Updated upstream oWi uVn uVn @@ -94710,6 +113917,19 @@ gXS aeE nLA gwE +======= +wEO +uVn +uVn +uVn +ssJ +ktI +ioi +gXS +bCH +nLA +okT +>>>>>>> Stashed changes azA azA azA @@ -94728,7 +113948,11 @@ uZd uZd lxE lPN +<<<<<<< Updated upstream gzM +======= +uGd +>>>>>>> Stashed changes ruw uZd glX @@ -94809,6 +114033,7 @@ bvo bvo azA azA +<<<<<<< Updated upstream rfs wrX dlS @@ -94837,6 +114062,36 @@ azA urs azA mBX +======= +qDT +oGh +rCl +fvm +dvN +mnX +azA +xtt +gtb +imq +tTv +wJz +wJz +wJz +wJz +qmW +wJz +dZG +dZG +ucp +dZG +dZG +pXt +oMd +azA +prW +azA +eOv +>>>>>>> Stashed changes cyW azA azA @@ -94947,21 +114202,33 @@ dDG tgG cIT gon +<<<<<<< Updated upstream iWX +======= +bXx +>>>>>>> Stashed changes mkG mkG mkG mkG mkG mkG +<<<<<<< Updated upstream bXa ehh eSe eSe +======= +vOh +cDN +rKE +rKE +>>>>>>> Stashed changes nrq azA azA hQx +<<<<<<< Updated upstream pkS gDb iYw @@ -94975,6 +114242,21 @@ fGa qmk vgK vgK +======= +xvV +aBw +pFZ +fFk +biF +wxY +gxH +kYn +kYn +hBx +qmk +edo +edo +>>>>>>> Stashed changes ahs ioi lmd @@ -94982,6 +114264,7 @@ azA aUc ahs cpq +<<<<<<< Updated upstream shY jGd jqt @@ -94990,11 +114273,25 @@ jqt daY vXj thF +======= +gqA +rbr +jqt +acP +jqt +lqJ +tsY +vkI +>>>>>>> Stashed changes arq qhE azA ahs +<<<<<<< Updated upstream hle +======= +pLl +>>>>>>> Stashed changes uVn uVn uVn @@ -95007,9 +114304,15 @@ uVn uVn isS uVn +<<<<<<< Updated upstream ajU vSR rpZ +======= +lez +vSR +qlZ +>>>>>>> Stashed changes azA azA azA @@ -95030,7 +114333,11 @@ rKu kNn lxE lPN +<<<<<<< Updated upstream anA +======= +ttg +>>>>>>> Stashed changes uZd uZd bxC @@ -95110,6 +114417,7 @@ hoi bvo bvo mUU +<<<<<<< Updated upstream azA unA czG @@ -95139,6 +114447,37 @@ qbB cJw azA mBX +======= +azA +mBm +fvm +rCl +mhe +pre +hQq +ecK +woy +rhO +sWE +gPB +eGa +sWE +sWE +sWE +nqu +wJz +dZG +qHt +bjI +dqC +dZG +mcv +azA +mdu +jip +azA +eOv +>>>>>>> Stashed changes azA ljW azA @@ -95148,7 +114487,11 @@ azA ahs nbU smK +<<<<<<< Updated upstream jWa +======= +nuz +>>>>>>> Stashed changes smK yky mUU @@ -95264,6 +114607,7 @@ ctN azA azA qmk +<<<<<<< Updated upstream knH knH qmk @@ -95286,11 +114630,36 @@ ahs tfP jqt rcq +======= +bNa +bNa +qmk +qmk +cIs +wbg +kYn +cJU +xeD +kYn +qmk +nSW +wHC +ahs +ktI +lmd +xlt +sTR +ahs +tfP +jqt +rnj +>>>>>>> Stashed changes jqt jqt jqt jqt kds +<<<<<<< Updated upstream gqz lcl azA @@ -95300,10 +114669,22 @@ bDg uVn lfS daW +======= +uNV +lcl +azA +lcg +ahs +ssJ +uVn +rCg +cfY +>>>>>>> Stashed changes eAw nEj eDX cPp +<<<<<<< Updated upstream iWm lsU uVn @@ -95317,6 +114698,21 @@ azA azA azA laZ +======= +hBy +ete +uVn +ete +cPp +xrL +cPp +pTK +cgt +azA +azA +azA +dMN +>>>>>>> Stashed changes jDe ouF jns @@ -95332,7 +114728,11 @@ kNn mGO lxE lPN +<<<<<<< Updated upstream fOJ +======= +hMj +>>>>>>> Stashed changes til uZd bxC @@ -95413,6 +114813,7 @@ bvo bvo azA azA +<<<<<<< Updated upstream fSI rLZ rLZ @@ -95444,6 +114845,39 @@ hpE lwP lwP qSG +======= +fFQ +dvN +dvN +hpV +vZc +qhE +azA +xtt +dcd +vPQ +pnN +vtH +unx +klZ +unx +lxh +sWE +gfx +dtH +fpJ +fpJ +dZG +dZG +dZG +cXl +tts +wid +aaI +rOv +rOv +keO +>>>>>>> Stashed changes azA azA azA @@ -95558,13 +114992,18 @@ azA gwF gwF azA +<<<<<<< Updated upstream kXs +======= +qrK +>>>>>>> Stashed changes azA ecE pka gwF azA azA +<<<<<<< Updated upstream glZ fOT jkv @@ -95579,6 +115018,22 @@ yjr rnV gcP lpb +======= +cIs +hvs +jnj +ghw +wbg +qnM +iFf +kYn +mIK +avw +dia +qaQ +goi +wHC +>>>>>>> Stashed changes ahs uVn lmd @@ -95586,6 +115041,7 @@ nLA azA ahs cpq +<<<<<<< Updated upstream wEh jBW uAZ @@ -95616,6 +115072,38 @@ hxj cCw tlY peH +======= +liv +jGR +fmr +jqt +jqt +rbr +rbr +gqA +lmd +azA +dMN +egT +uVn +voC +azA +voU +rwf +pFb +hGq +lLC +yey +qYF +vgW +vgW +vgW +vgW +vgW +xZi +gSK +vyT +>>>>>>> Stashed changes azA jOt azA @@ -95715,6 +115203,7 @@ bvo bvo azA azA +<<<<<<< Updated upstream kiz jHT pty @@ -95746,6 +115235,39 @@ azA azA azA mBX +======= +rce +ofg +vZc +rCl +xav +azA +azA +dZG +pOL +aRb +kBr +hpE +lbi +tAd +kuS +wJz +qOK +dZG +gqN +fpJ +fpJ +nUf +gqN +dZG +jFe +dPn +dpm +azA +azA +azA +eOv +>>>>>>> Stashed changes azA azA azA @@ -95852,7 +115374,67 @@ cBf vNZ uMf cBf +kyN +qrK +azA +azA +azA +azA +azA +azA +azA +azA +ecE +pka +gwF +azA +azA +qmk +vkg +gxH +wbg +jkw +ybL +jqg +wbg +mLX +jfz +lbC +qaQ +lnd +gev +ahs +hTU +lmd +sTR +udz +ahs +tfP +jqt +jqt +jqt +jqt +jqt +acP +jqt +jqt +lmd +azA +azA +ahs +uVn +voC +voU +azA +fwA +ufz +jle +fwA +qmk +jiV +nLc tBb +<<<<<<< Updated upstream kXs azA azA @@ -95920,6 +115502,16 @@ tlY iRT fZL azA +======= +hVY +muq +nLc +sDy +gSK +iRT +fZL +azA +>>>>>>> Stashed changes xTy lPN xYN @@ -96024,6 +115616,7 @@ azA azA azA azA +<<<<<<< Updated upstream jwS nwz tTv @@ -96048,6 +115641,32 @@ azA nBj dWL mBX +======= +dZG +atw +vrA +wOQ +unx +kuS +lhV +unx +wJz +wJz +dZG +dgW +fpJ +fpJ +fpJ +iYV +dZG +prW +azA +mpd +azA +hMo +nbB +eOv +>>>>>>> Stashed changes azA azA azA @@ -96159,7 +115778,11 @@ azA azA azA azA +<<<<<<< Updated upstream kXs +======= +qrK +>>>>>>> Stashed changes azA azA azA @@ -96169,6 +115792,7 @@ pka azA azA oMd +<<<<<<< Updated upstream knH wqV nFD @@ -96183,10 +115807,27 @@ mgR rnV rNa lpb +======= +bNa +bDQ +wbg +wbg +ggY +pVG +jnj +cDS +wbg +wbg +lbC +qaQ +aUn +wHC +>>>>>>> Stashed changes ahs uVn lmd azA +<<<<<<< Updated upstream egT ahs cpq @@ -96198,10 +115839,24 @@ jqt aaC uME hiN +======= +sXY +ahs +cpq +tgI +han +jqt +jqt +jqt +ecc +emH +ejU +>>>>>>> Stashed changes lmd afB azA ahs +<<<<<<< Updated upstream oWi sqF ohj @@ -96210,16 +115865,35 @@ mca uBz uBz hPz +======= +wEO +sqF +ohj +ohj +jle +voS +voS +fcs +>>>>>>> Stashed changes qmk qmk qmk qmk +<<<<<<< Updated upstream glZ glZ glZ glZ azA pbH +======= +cIs +cIs +cIs +cIs +azA +xlt +>>>>>>> Stashed changes azA azA azA @@ -96317,6 +115991,7 @@ uNU voi bvo bvo +<<<<<<< Updated upstream pKM pKM pKM @@ -96343,13 +116018,45 @@ gaq gaq lAy jwS +======= +ncc +ncc +ncc +ncc +ncc +ncc +ncc +ncc +ncc +dZG +eFC +pOm +fBy +unx +skZ +liq +vtH +wJz +wJz +dZG +aUi +tyI +fpJ +fpJ +tFr +dZG +>>>>>>> Stashed changes azA azA aQq azA azA mUU +<<<<<<< Updated upstream mBX +======= +eOv +>>>>>>> Stashed changes azA aUc azA @@ -96457,6 +116164,7 @@ kkQ cBf cBf gon +<<<<<<< Updated upstream azA azA azA @@ -96524,6 +116232,75 @@ pXt vfS egT azA +======= +azA +azA +azA +azA +azA +azA +azA +ldt +azA +ecE +pka +azA +azA +oMd +bNa +dNo +kYn +kYn +jkw +pVG +gxH +wbg +ufw +fhl +wHk +tEu +fNL +jGK +jQw +uVn +lmd +azA +afB +ahs +tfP +jqt +jqt +jqt +jqt +jqt +hqC +jqt +unT +lmd +uOD +mUU +gZu +uVn +eDX +uVn +rjg +uAQ +gfq +voS +deN +qmk +nZE +rhP +ptb +qmk +wmc +vxq +cIs +vAW +pBl +sXY +azA +>>>>>>> Stashed changes afB azA azA @@ -96628,6 +116405,7 @@ azA qhE azA azA +<<<<<<< Updated upstream jwS jwS jwS @@ -96652,6 +116430,32 @@ hpE pKM pKM hpE +======= +dZG +dZG +dZG +dZG +dZG +dZG +dZG +dZG +tTv +tTv +dZG +sik +aXd +sik +dZG +dZG +dZG +ncc +ncc +ncc +aaI +ncc +ncc +aaI +>>>>>>> Stashed changes azA azA azA @@ -96773,6 +116577,7 @@ pka azA azA oMd +<<<<<<< Updated upstream knH vfX lCr @@ -96789,11 +116594,30 @@ ciV lpb nEj hMU +======= +bNa +qAP +kYn +wbg +jAr +faS +wbg +wbg +kzR +ivH +wHk +rXj +gev +wHC +nEj +oky +>>>>>>> Stashed changes lmd azA mUU ahs cpq +<<<<<<< Updated upstream wig qyX jqt @@ -96802,11 +116626,22 @@ piH jGd aaC jBW +======= +rJc +lxY +jqt +qTx +mlJ +rbr +ecc +jGR +>>>>>>> Stashed changes lmd azA azA ahs uVn +<<<<<<< Updated upstream lLC hxj hxj @@ -96822,6 +116657,23 @@ eCW eIL ecx kAC +======= +mDZ +vgW +vgW +fwA +voS +voS +eEx +qmk +kYn +qob +qsZ +tsU +jDg +gOW +bMM +>>>>>>> Stashed changes ndZ rDi rDi @@ -96929,6 +116781,7 @@ aUc azA azA azA +<<<<<<< Updated upstream hOl lmd tfP @@ -96955,6 +116808,34 @@ qwc azA azA azA +======= +iBL +lmd +tfP +tdR +smK +tdR +smK +ijk +vgK +wJz +wJz +bBF +wJz +wJz +kfy +qQI +uyr +dZG +azA +azA +azA +azA +uGX +azA +azA +azA +>>>>>>> Stashed changes azA azA ahs @@ -97076,6 +116957,7 @@ azA azA azA qmk +<<<<<<< Updated upstream cSH nFD nHo @@ -97093,12 +116975,32 @@ ahs uVn lmd bLE +======= +oxQ +wbg +vnO +jED +nVz +kYn +kYn +kYn +kYn +gxH +aeE +wHC +wHC +ahs +uVn +lmd +nml +>>>>>>> Stashed changes aQq ahs tfP jqt jqt jqt +<<<<<<< Updated upstream xRG jqt jqt @@ -97123,6 +117025,32 @@ dFN qmk qMM eIL +======= +iyM +jqt +jqt +jqt +gZY +lmd +azA +nLA +kjL +uVn +wEh +vgW +vgW +hrQ +mDw +voS +nZW +cIs +oHW +kqG +qob +qmk +mnv +jDg +>>>>>>> Stashed changes qmk snR qfO @@ -97234,6 +117162,7 @@ ljW ahs lmd tfP +<<<<<<< Updated upstream gDP smK ekZ @@ -97249,6 +117178,23 @@ rhc rhc rhc jwS +======= +tdR +smK +axO +smK +smK +nJY +fow +wJz +glZ +wJz +wJz +wJz +wJz +wJz +dZG +>>>>>>> Stashed changes azA azA azA @@ -97377,6 +117323,7 @@ pka azA azA azA +<<<<<<< Updated upstream glZ lxq jkv @@ -97426,6 +117373,57 @@ qmk ecx nTz glZ +======= +cIs +dbw +jnj +aIb +jNX +tIw +kYn +kYn +jCz +ftu +wHk +cIs +oxc +tqh +egT +uVn +sqF +nLA +uOD +ahs +cpq +bHY +jGR +jqt +dkg +jqt +rbr +rJc +mvC +lmd +mUU +azA +kjL +isS +mDZ +vgW +aTY +hrQ +fcs +mij +voS +cIs +qmk +qmk +lyQ +qmk +gOW +eNM +cIs +>>>>>>> Stashed changes snR qfO nDt @@ -97528,7 +117526,11 @@ hYq hYq xUy ner +<<<<<<< Updated upstream huE +======= +pkU +>>>>>>> Stashed changes azA azA azA @@ -97536,6 +117538,7 @@ bho jQw lmd tfP +<<<<<<< Updated upstream gDP smK gDP @@ -97559,6 +117562,31 @@ azA azA azA wSh +======= +tdR +smK +tdR +smK +smK +dZQ +qjd +qjd +bBF +wJz +wJz +dsU +aoD +fov +dZG +azA +aUc +azA +fwp +azA +azA +azA +dhC +>>>>>>> Stashed changes azA azA ahs @@ -97654,7 +117682,11 @@ kYf aZm lLM ine +<<<<<<< Updated upstream rdk +======= +cNq +>>>>>>> Stashed changes cNV aZm smK @@ -97678,6 +117710,7 @@ ecE pka azA azA +<<<<<<< Updated upstream glZ glZ glZ @@ -97694,11 +117727,33 @@ glZ mZc mcI jBl +======= +cIs +cIs +cIs +qmk +qmk +qmk +cIs +qmk +qmk +qmk +cIs +cIs +cIs +mZc +bSY +egT +>>>>>>> Stashed changes isS eDX jKr voU +<<<<<<< Updated upstream jBl +======= +egT +>>>>>>> Stashed changes tfP brQ jqt @@ -97710,6 +117765,7 @@ jqt jqt lmd azA +<<<<<<< Updated upstream lbC jZF uVn @@ -97728,12 +117784,36 @@ qmk qmk glZ glZ +======= +uOD +kjL +uVn +weO +vgW +eUm +xgP +deN +voS +hTd +cjZ +voS +ufV +kmB +qmk +qmk +cIs +cIs +>>>>>>> Stashed changes snR qfO nrq azA wNx +<<<<<<< Updated upstream aWT +======= +iiA +>>>>>>> Stashed changes fbI nrq azA @@ -97832,7 +117912,11 @@ hYq ner azA ljW +<<<<<<< Updated upstream qmc +======= +pvt +>>>>>>> Stashed changes azA ahs uVn @@ -97843,6 +117927,7 @@ cNV smK smK smK +<<<<<<< Updated upstream jwS rOd rOd @@ -97853,6 +117938,18 @@ nwb rOd rOd jwS +======= +dZG +xvq +xvq +fGa +yba +yba +ucp +xvq +xvq +dZG +>>>>>>> Stashed changes azA azA azA @@ -97896,7 +117993,11 @@ azA azA ndZ rDi +<<<<<<< Updated upstream eMO +======= +aUl +>>>>>>> Stashed changes azA azA azA @@ -97980,6 +118081,7 @@ ecE pka azA azA +<<<<<<< Updated upstream glZ adR olg @@ -97993,6 +118095,21 @@ qWI nUe rHn tlK +======= +cIs +emw +ryi +rtN +jGd +nrR +qmk +nrR +lSG +tqF +sra +uJq +pQD +>>>>>>> Stashed changes mZc azA ahs @@ -98001,6 +118118,7 @@ lmd mUU dzm ahs +<<<<<<< Updated upstream bDm hpp cgG @@ -98026,6 +118144,33 @@ mGu uBz uBz uBz +======= +lki +mvC +vui +acP +jqt +jqt +rbr +jGR +jGR +lmd +nLA +azA +kjL +uVn +mDZ +vgW +vgW +qmk +eEx +voS +voS +cjZ +voS +voS +voS +>>>>>>> Stashed changes qmk azA azA @@ -98035,7 +118180,11 @@ qfO xkl azA azA +<<<<<<< Updated upstream tsU +======= +kNI +>>>>>>> Stashed changes qfO nrq azA @@ -98132,10 +118281,17 @@ mWz hra hYq ner +<<<<<<< Updated upstream cJw azA azA jwI +======= +jip +azA +azA +qiE +>>>>>>> Stashed changes ahs uVn lmd @@ -98145,6 +118301,7 @@ cNV cNV smK smK +<<<<<<< Updated upstream pDU lmd azA @@ -98157,6 +118314,20 @@ azA qwc azA pbH +======= +gMf +lmd +azA +qOs +snR +nrq +qOs +qhE +azA +uGX +azA +xlt +>>>>>>> Stashed changes ndZ dPr cBf @@ -98196,13 +118367,20 @@ aqO wYW azA azA +<<<<<<< Updated upstream sik +======= +yaP +>>>>>>> Stashed changes gMR nrq dzm ndZ uhS +<<<<<<< Updated upstream azA +======= +>>>>>>> Stashed changes azA ohQ azA @@ -98282,6 +118460,7 @@ ecE pka azA azA +<<<<<<< Updated upstream glZ bqM rHn @@ -98297,6 +118476,23 @@ avq rHn mZc jJH +======= +cIs +tyt +uJq +dGb +nrR +cMJ +qmk +nUb +mOF +tqr +mNW +moW +uJq +mZc +kHN +>>>>>>> Stashed changes ahs uVn lmd @@ -98308,13 +118504,18 @@ jqt jqt jqt jqt +<<<<<<< Updated upstream nmF +======= +xhh +>>>>>>> Stashed changes jqt jqt jqt lmd azA azA +<<<<<<< Updated upstream jZF isS weO @@ -98328,6 +118529,21 @@ rOQ mGu uBz tcf +======= +kjL +isS +weO +vgW +vgW +hrQ +fcs +fcs +voS +srr +cjZ +voS +vYE +>>>>>>> Stashed changes qmk azA azA @@ -98434,7 +118650,11 @@ mWz mWz hYq ner +<<<<<<< Updated upstream boK +======= +reW +>>>>>>> Stashed changes qhE azA azA @@ -98450,7 +118670,11 @@ smK ahs lmd azA +<<<<<<< Updated upstream bGj +======= +mOk +>>>>>>> Stashed changes snR kiP rDi @@ -98460,6 +118684,7 @@ rDi rDi rDi dPr +<<<<<<< Updated upstream xiG mgC xNY @@ -98467,6 +118692,15 @@ cBf nrq azA dYy +======= +xnp +fpo +rdk +cBf +nrq +azA +wWn +>>>>>>> Stashed changes ahs rhZ hiH @@ -98506,7 +118740,11 @@ uer nrq dzm azA +<<<<<<< Updated upstream azA +======= +jHW +>>>>>>> Stashed changes azA dzm azA @@ -98585,6 +118823,7 @@ pka azA azA qmk +<<<<<<< Updated upstream euC rjg mNW @@ -98631,6 +118870,54 @@ mGu uBz uBz glZ +======= +tSv +nQN +ndP +jMh +lSG +cIs +xiF +bNV +bNV +hpp +nrR +tyt +sqv +rnE +fze +uVn +lmd +vfS +nml +ahs +cpq +jGR +jGR +xhh +jqt +qrf +rbr +tgI +rbr +lmd +dzm +nIX +ahs +uVn +mDZ +vgW +eUm +hrQ +qeK +deN +kmB +mDw +cjZ +voS +voS +cIs +>>>>>>> Stashed changes azA ndZ dPr @@ -98762,9 +119049,15 @@ cBf cBf cBf cBf +<<<<<<< Updated upstream xiG mgC xNY +======= +xnp +fpo +rdk +>>>>>>> Stashed changes cBf nrq azA @@ -98862,7 +119155,11 @@ kYf smK ktq bZO +<<<<<<< Updated upstream jCV +======= +oEK +>>>>>>> Stashed changes smK smK smK @@ -98886,6 +119183,7 @@ ecE pka azA oMd +<<<<<<< Updated upstream laF idu rHn @@ -98901,10 +119199,28 @@ mOF mOF sqv wHc +======= +uyA +pOi +uJq +pMM +uJq +nrR +enA +uJq +nrR +qUT +nrR +nrR +nrR +sqv +dMZ +>>>>>>> Stashed changes ahs uVn lmd aUc +<<<<<<< Updated upstream pbH ahs tfP @@ -98915,10 +119231,23 @@ jqt jqt jqt uAZ +======= +xlt +ahs +tfP +hqC +jqt +cml +jqt +jqt +jqt +fmr +>>>>>>> Stashed changes jqt lmd azA mUU +<<<<<<< Updated upstream mzb uVn weO @@ -98933,6 +119262,22 @@ uBz uBz oCk glZ +======= +fze +uVn +weO +vgW +vgW +cIs +eEx +eEx +voS +voS +voS +voS +kmB +cIs +>>>>>>> Stashed changes ndZ dPr cBf @@ -99054,7 +119399,11 @@ smK ahs lmd azA +<<<<<<< Updated upstream ryf +======= +rNa +>>>>>>> Stashed changes snR nDt wTQ @@ -99069,7 +119418,11 @@ cBf nDt wTQ ctN +<<<<<<< Updated upstream dOi +======= +cay +>>>>>>> Stashed changes azA ahs rhZ @@ -99188,6 +119541,7 @@ ecE pka azA oMd +<<<<<<< Updated upstream laF xMY gyr @@ -99198,10 +119552,23 @@ bqM mOF oHa mOF +======= +uyA +iFu +ejo +dGb +dwV +uJq +tyt +nrR +nxg +nrR +>>>>>>> Stashed changes mKb mKb qmk bYA +<<<<<<< Updated upstream wGw ahs uVn @@ -99240,6 +119607,46 @@ cBf cBf cBf jMn +======= +bvB +ahs +uVn +lmd +qOr +uOD +ahs +bDm +hak +jGR +nRU +jqt +jqt +rbr +ecc +rbr +lmd +azA +spX +qzA +izU +mDZ +pcH +pcH +cIs +cIs +cIs +qmk +qmk +qmk +cIs +cIs +cIs +snR +cBf +cBf +cBf +xty +>>>>>>> Stashed changes ctN ndZ hUC @@ -99341,7 +119748,11 @@ hYq xUy ner aUc +<<<<<<< Updated upstream mEj +======= +iob +>>>>>>> Stashed changes azA azA qhE @@ -99361,7 +119772,11 @@ snR nrq azA azA +<<<<<<< Updated upstream jFD +======= +aaC +>>>>>>> Stashed changes azA azA azA @@ -99372,7 +119787,11 @@ ctN ljW azA aUc +<<<<<<< Updated upstream cbD +======= +qOr +>>>>>>> Stashed changes ahs kPz kqU @@ -99411,7 +119830,11 @@ wTQ wTQ vGi azA +<<<<<<< Updated upstream dzm +======= +azA +>>>>>>> Stashed changes azA azA azA @@ -99491,6 +119914,7 @@ pka azA azA qmk +<<<<<<< Updated upstream tCQ wsX mOF @@ -99513,12 +119937,37 @@ grJ jQw hfR erZ +======= +lbU +fDG +nrR +nrR +nrR +hot +rHn +uJq +uJq +ajU +lSG +eDa +rjg +uVn +qlk +uVn +sqF +hVn +oQd +jQw +ixI +pjC +>>>>>>> Stashed changes acP jqt jqt jqt jqt jqt +<<<<<<< Updated upstream dnB uVn bpA @@ -99529,6 +119978,18 @@ uoK hKX hKX prA +======= +wby +uVn +hVn +oQd +cva +ioi +wpJ +cuA +cuA +rqP +>>>>>>> Stashed changes azA voU azA @@ -99651,11 +120112,19 @@ ahs lmd tfP rVM +<<<<<<< Updated upstream oXG kYf kYf kYf diZ +======= +nuS +kYf +kYf +kYf +uWH +>>>>>>> Stashed changes lmd azA azA @@ -99663,11 +120132,19 @@ snR nrq azA ljW +<<<<<<< Updated upstream boK azA azA aUc bLE +======= +reW +azA +azA +aUc +nml +>>>>>>> Stashed changes azA azA azA @@ -99793,6 +120270,7 @@ pka azA azA qmk +<<<<<<< Updated upstream gpT nIl isM @@ -99807,10 +120285,27 @@ eWg qmk lfS kbY +======= +mCS +qRS +weQ +tkR +rPS +mKb +mKb +nWq +uJq +yjK +scf +qmk +rCg +hRn +>>>>>>> Stashed changes ahs uVn eDX nAH +<<<<<<< Updated upstream gBo nEj cpq @@ -99825,6 +120320,22 @@ jlT uVn nAH gBo +======= +hct +nEj +cpq +vWy +rbr +mjp +mjp +jqt +jGR +rbr +kFt +uVn +nAH +hct +>>>>>>> Stashed changes nEj ioi eDX @@ -99836,7 +120347,11 @@ azA azA voU azA +<<<<<<< Updated upstream eyc +======= +gFK +>>>>>>> Stashed changes azA azA snR @@ -100064,7 +120579,11 @@ azA azA azA hKk +<<<<<<< Updated upstream wnP +======= +hZw +>>>>>>> Stashed changes xVJ xVJ xVJ @@ -100095,6 +120614,7 @@ pka azA uVn qmk +<<<<<<< Updated upstream glZ ebh ebh @@ -100109,6 +120629,22 @@ qmk qmk lfU lfU +======= +cIs +cbK +cbK +qmk +qmk +cbK +cbK +qmk +qmk +cbK +qmk +qmk +hNt +hNt +>>>>>>> Stashed changes ahs uVn sqF @@ -100122,13 +120658,21 @@ cKE dkV mjp jqt +<<<<<<< Updated upstream rcq +======= +rnj +>>>>>>> Stashed changes jqt uVn tMH bff jQw +<<<<<<< Updated upstream yae +======= +ktI +>>>>>>> Stashed changes sqF azA azA @@ -100371,7 +120915,11 @@ moC moC moC moC +<<<<<<< Updated upstream byK +======= +wiE +>>>>>>> Stashed changes smK smK smK @@ -100398,12 +120946,21 @@ moC moC moC moC +<<<<<<< Updated upstream dgW dgW moC moC dgW dgW +======= +rag +rag +moC +moC +rag +rag +>>>>>>> Stashed changes moC moC moC @@ -100432,12 +120989,20 @@ jQw uVn uVn uVn +<<<<<<< Updated upstream bDg +======= +ssJ +>>>>>>> Stashed changes uVn uVn uVn moC +<<<<<<< Updated upstream fBy +======= +uuN +>>>>>>> Stashed changes xcL xcL ckK @@ -100555,7 +121120,11 @@ smK smK smK pAX +<<<<<<< Updated upstream kvH +======= +jJo +>>>>>>> Stashed changes smK smK smK @@ -102990,6 +123559,7 @@ eAw eAw eAw eAw +<<<<<<< Updated upstream lfS rCg lMg @@ -102999,6 +123569,17 @@ qyt fVP wlq lfS +======= +rCg +aXb +lMg +bHs +wKj +tkT +hya +qyt +rCg +>>>>>>> Stashed changes eAw eAw eAw @@ -103293,6 +123874,7 @@ azA azA azA nQM +<<<<<<< Updated upstream nNx bLe efV @@ -103300,6 +123882,15 @@ efV eUj jJo efV +======= +vMM +cym +kIO +kIO +eUj +rSg +kIO +>>>>>>> Stashed changes nvv azA azA @@ -103595,6 +124186,7 @@ azA azA azA loW +<<<<<<< Updated upstream dyA bLe jJo @@ -103602,6 +124194,15 @@ efV efV efV efV +======= +mTQ +cym +rSg +kIO +kIO +kIO +kIO +>>>>>>> Stashed changes loW azA azA @@ -103891,6 +124492,7 @@ vVz vVz qHK ahs +<<<<<<< Updated upstream hGZ hGZ hGZ @@ -103913,6 +124515,30 @@ hGZ hGZ toH toH +======= +tqe +tqe +tqe +aSu +aSu +aSu +uRI +hyp +eUj +kIO +eUj +kIO +wpI +aSu +cYL +gNA +oWl +tqe +tqe +tqe +aSu +aSu +>>>>>>> Stashed changes kcn fyv myG @@ -104193,6 +124819,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream hGZ hNt jmU @@ -104215,6 +124842,30 @@ bJW csd bJW toH +======= +tqe +iVf +gYJ +nAU +hmV +aSu +uVn +lIE +eUj +eUj +eUj +fQd +kIO +evI +wtd +iWX +dgF +tqe +kNu +een +kNu +aSu +>>>>>>> Stashed changes azA azA myG @@ -104495,6 +125146,7 @@ mZo eUj eUj ahs +<<<<<<< Updated upstream hGZ xEY lUM @@ -104517,6 +125169,30 @@ mOh toH roC toH +======= +tqe +hNN +hfR +jxe +exB +xqi +uBI +lIE +tZz +eUj +eUj +eUj +kKl +evI +wlf +hvT +xYk +tqe +xoR +aSu +hMU +aSu +>>>>>>> Stashed changes azA azA myG @@ -104797,6 +125473,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream toH jYg mmI @@ -104805,10 +125482,21 @@ nsX xqi lFV qDT +======= +aSu +jYg +xEY +ylX +nsX +xqi +klW +lIE +>>>>>>> Stashed changes eUj eUj eUj eUj +<<<<<<< Updated upstream jeV eJx irl @@ -104819,6 +125507,18 @@ toH toH bJW hGZ +======= +hWa +btv +lzH +kNu +kNu +aSu +aSu +aSu +kNu +tqe +>>>>>>> Stashed changes azA azA myG @@ -105099,6 +125799,7 @@ eUj eUj ybl ahs +<<<<<<< Updated upstream toH eUm rag @@ -105121,6 +125822,30 @@ cXt xoR bJW hGZ +======= +aSu +wKv +bIP +ehv +hGZ +tqe +aZA +lmd +ihu +qUA +dhi +eUj +pCD +eJx +blT +kNu +kNu +kNu +uEr +blT +kNu +tqe +>>>>>>> Stashed changes azA azA myG @@ -105401,6 +126126,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream toH toH toH @@ -105423,6 +126149,30 @@ iWK bJW bJW hGZ +======= +aSu +aSu +aSu +tqe +tqe +tqe +klW +cym +eUj +eUj +dhi +eUj +ijH +eJx +pHY +blT +kNu +aSu +uNG +kNu +kNu +tqe +>>>>>>> Stashed changes azA azA myG @@ -105703,6 +126453,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream toH dee gPd @@ -105725,6 +126476,30 @@ bJW bJW bJW toH +======= +aSu +tEk +cSa +xuQ +cSa +tqe +jmU +cym +kIO +eUj +dhi +kIO +lfS +nTv +uTc +shu +asz +tqe +kNu +kNu +kNu +aSu +>>>>>>> Stashed changes azA azA myG @@ -106004,6 +126779,7 @@ lmd eUj lxu eUj +<<<<<<< Updated upstream klW toH gPd @@ -106027,6 +126803,31 @@ bJW bJW kPr toH +======= +tQM +aSu +cSa +cSa +frc +cSa +yhi +pwi +qGO +rzh +eUj +qUA +kIO +bMp +aSu +aSu +aSu +tqe +tqe +kNu +kNu +gAX +aSu +>>>>>>> Stashed changes azA azA myG @@ -106307,6 +127108,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream toH aGP gPd @@ -106329,6 +127131,30 @@ bJW xoR xoR toH +======= +aSu +hoq +cSa +cSa +biB +vQc +rbl +lmd +eUj +eUj +rlB +eUj +qUA +aSu +qCJ +cZx +bTU +aSu +kNu +blT +blT +aSu +>>>>>>> Stashed changes azA azA myG @@ -106609,6 +127435,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream toH frc wGk @@ -106618,10 +127445,22 @@ hNV lnd oje omc +======= +aSu +frc +sBd +xpW +xuQ +yhi +pwi +qGO +rfB +>>>>>>> Stashed changes eUj eUj eUj eUj +<<<<<<< Updated upstream xqH tjb dGQ @@ -106631,6 +127470,17 @@ adp bJW fDM toH +======= +mzq +cZx +hlS +sOQ +aSu +ksz +kNu +wUi +aSu +>>>>>>> Stashed changes azA azA myG @@ -106911,6 +127761,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream toH iVL bCu @@ -106920,10 +127771,22 @@ toH oeN idG eJV +======= +aSu +ayt +kLc +cSa +jCe +aSu +qVq +qEv +uvL +>>>>>>> Stashed changes eUj eUj eUj eUj +<<<<<<< Updated upstream tjb tjb dGQ @@ -106933,6 +127796,17 @@ xPE bJW lvw toH +======= +cZx +cZx +hlS +hlS +aSu +wSe +kNu +sRm +aSu +>>>>>>> Stashed changes azA azA myG @@ -107213,6 +128087,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream toH toH toH @@ -107220,12 +128095,22 @@ toH toH toH rMR +======= +aSu +aSu +aSu +aSu +aSu +aSu +qyx +>>>>>>> Stashed changes lmd eUj eUj eUj eUj eUj +<<<<<<< Updated upstream rjf tjb tjb @@ -107235,6 +128120,17 @@ gUF bJW xoR toH +======= +uLw +cZx +cZx +hlS +pXy +fjo +kNu +blT +aSu +>>>>>>> Stashed changes azA azA myG @@ -107515,6 +128411,7 @@ eUj ybl eUj ahs +<<<<<<< Updated upstream toH vAd tIa @@ -107522,11 +128419,21 @@ dPJ peC cgg tKC +======= +aSu +vpN +ymf +dPJ +peC +cgg +pRo +>>>>>>> Stashed changes lmd eUj eUj eUj eUj +<<<<<<< Updated upstream efV hGZ tjb @@ -107537,6 +128444,18 @@ dGQ xoR xoR toH +======= +kIO +tqe +cZx +wGw +fzy +tqe +hlS +blT +blT +aSu +>>>>>>> Stashed changes azA azA myG @@ -107817,6 +128736,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream toH kZz uaM @@ -107824,10 +128744,20 @@ dGQ mOQ toH qTP +======= +aSu +kZz +tjb +hlS +sFi +aSu +okR +>>>>>>> Stashed changes lmd eUj qUA eUj +<<<<<<< Updated upstream efV tVf mlF @@ -107839,6 +128769,19 @@ cQL dGQ rbn toH +======= +kIO +iOp +vxC +vxC +tqe +tqe +tqe +nnl +hlS +tUw +aSu +>>>>>>> Stashed changes azA azA myG @@ -108119,11 +129062,19 @@ eUj rru eUj ahs +<<<<<<< Updated upstream toH iSM tjb sOQ dGQ +======= +aSu +iSM +cZx +rtC +hlS +>>>>>>> Stashed changes jUO uVn lmd @@ -108131,6 +129082,7 @@ eUj eUj qUA eUj +<<<<<<< Updated upstream okR dGQ lXA @@ -108141,6 +129093,18 @@ hGZ dGQ dGQ toH +======= +qhm +hlS +oJi +hlS +bck +tqe +tqe +hlS +hlS +aSu +>>>>>>> Stashed changes azA azA myG @@ -108421,6 +129385,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream hGZ kZV tjb @@ -108428,11 +129393,21 @@ fEe dGQ toH oJh +======= +tqe +kZV +cZx +fEe +hlS +aSu +idG +>>>>>>> Stashed changes lmd eUj eUj eUj eUj +<<<<<<< Updated upstream uvL dGQ dGQ @@ -108443,6 +129418,18 @@ tjb tjb dGQ toH +======= +mcC +hlS +hlS +wob +qcV +aSu +cZx +cZx +hlS +aSu +>>>>>>> Stashed changes azA azA myG @@ -108723,6 +129710,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream hGZ tjb tjb @@ -108730,11 +129718,21 @@ ldI hFm toH ecK +======= +tqe +cZx +cZx +ldI +hFm +aSu +eUM +>>>>>>> Stashed changes lmd eUj eUj qUA eUj +<<<<<<< Updated upstream uvL dGQ tjb @@ -108745,6 +129743,18 @@ tjb nyg iBz toH +======= +mcC +hlS +cZx +cZx +uWm +aSu +cZx +bTU +sOQ +aSu +>>>>>>> Stashed changes azA azA myG @@ -109025,6 +130035,7 @@ eUj eUj mZo ahs +<<<<<<< Updated upstream hGZ hGZ hGZ @@ -109047,6 +130058,30 @@ ihE dGQ dGQ toH +======= +tqe +tqe +tqe +tqe +aSu +aSu +suz +lmd +rlB +eUj +qUA +eUj +mcC +jZF +cZx +hlS +hlS +nnl +mmI +hlS +hlS +aSu +>>>>>>> Stashed changes kcn azA myG @@ -109327,12 +130362,21 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream toH izB hIh blT dXR toH +======= +aSu +izB +dGq +rri +dXR +aSu +>>>>>>> Stashed changes uVn lmd eUj @@ -109340,6 +130384,7 @@ eUj eUj eUj nfN +<<<<<<< Updated upstream mlF nBs nyg @@ -109349,6 +130394,17 @@ dGQ wVz bJW toH +======= +vxC +ein +bTU +hlS +tqe +hlS +gTy +kNu +aSu +>>>>>>> Stashed changes azA azA myG @@ -109629,12 +130685,21 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream toH hIh hIh hIh wfR qaQ +======= +aSu +dGq +dGq +dGq +vAd +tVf +>>>>>>> Stashed changes uVn lmd eUj @@ -109642,6 +130707,7 @@ eUj eUj qUA eUj +<<<<<<< Updated upstream dGQ dGQ mlF @@ -109651,6 +130717,17 @@ dGQ bJW bJW toH +======= +hlS +hlS +vxC +tqe +tqe +hlS +kNu +kNu +aSu +>>>>>>> Stashed changes azA azA myG @@ -109931,6 +131008,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream toH cqy psk @@ -109953,6 +131031,30 @@ pVH bJW sQf hGZ +======= +aSu +iEJ +uYa +dGq +dGq +tNq +uup +lmd +eUj +aTP +xms +qUA +eUj +hlS +hlS +hlS +cZx +tqe +nNx +kNu +jBW +tqe +>>>>>>> Stashed changes azA azA myG @@ -110233,12 +131335,21 @@ eUj eUj ybl ahs +<<<<<<< Updated upstream toH hIh vxC hIh hIh qaQ +======= +aSu +dGq +pJs +dGq +dGq +tVf +>>>>>>> Stashed changes uup vyg eUj @@ -110246,6 +131357,7 @@ eUj tpE eUj eUj +<<<<<<< Updated upstream dGQ dGQ dGQ @@ -110255,6 +131367,17 @@ adp bJW bJW hGZ +======= +hlS +hlS +hlS +hlS +aSu +ksz +kNu +kNu +tqe +>>>>>>> Stashed changes azA azA myG @@ -110535,6 +131658,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream hGZ wAz hIh @@ -110542,12 +131666,22 @@ rfB pHY hGZ deN +======= +tqe +wAz +dGq +ggF +uTy +tqe +obz +>>>>>>> Stashed changes vyg eUj eUj eUj eUj eUj +<<<<<<< Updated upstream dGQ dGQ dGQ @@ -110557,6 +131691,17 @@ bJW bJW bJW hGZ +======= +hlS +hlS +hlS +hlS +aSu +kNu +kNu +kNu +tqe +>>>>>>> Stashed changes azA azA snR @@ -110837,6 +131982,7 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream hGZ toH toH @@ -110845,11 +131991,22 @@ hGZ toH eIx nJY +======= +tqe +aSu +aSu +aSu +tqe +aSu +jeL +bwE +>>>>>>> Stashed changes eUj xms eUj eUj eUj +<<<<<<< Updated upstream dGQ dGQ dGQ @@ -110859,6 +132016,17 @@ bJW bJW xPE toH +======= +hlS +hlS +hlS +hlS +pXy +kNu +kNu +wSe +aSu +>>>>>>> Stashed changes azA azA gAg @@ -111139,6 +132307,7 @@ vVz qHK vVz ahs +<<<<<<< Updated upstream hGZ fjV fjV @@ -111161,6 +132330,30 @@ vXQ xoR xoR toH +======= +tqe +fjV +fjV +gzV +eTC +tqe +aus +vyg +eUj +eUj +rfB +eUj +gWJ +tqe +lAH +kqJ +cZx +aSu +eGT +blT +blT +aSu +>>>>>>> Stashed changes kkM azA azA @@ -111441,11 +132634,19 @@ vVz qHK vVz ahs +<<<<<<< Updated upstream toH dGq dGq fAD cJj +======= +aSu +frP +frP +iCd +pru +>>>>>>> Stashed changes gBO uup lmd @@ -111454,6 +132655,7 @@ eUj eUj eUj tlh +<<<<<<< Updated upstream hGZ hGZ mLQ @@ -111463,6 +132665,17 @@ kNa xoR dGQ imq +======= +tqe +tqe +bUo +tqe +aSu +uRd +blT +hlS +lCJ +>>>>>>> Stashed changes azA azA azA @@ -111743,14 +132956,21 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream toH xLF dGq +======= +aSu +xLF +frP +>>>>>>> Stashed changes gBO gBO gBO uup lmd +<<<<<<< Updated upstream njU eUj eUj @@ -111765,6 +132985,22 @@ xPE doy iLG imq +======= +kJc +eUj +eUj +eUj +xom +tqe +hAD +ghi +tOD +aSu +wSe +uwU +wPM +lCJ +>>>>>>> Stashed changes azA azA ndZ @@ -112044,6 +133280,7 @@ eUj eUj eUj eUj +<<<<<<< Updated upstream xav toH gWG @@ -112051,6 +133288,15 @@ lbs gBO dGq gWG +======= +mER +aSu +hDZ +hzu +gBO +frP +hDZ +>>>>>>> Stashed changes uVn lNB eUj @@ -112058,6 +133304,7 @@ eUj qUA qUA eUj +<<<<<<< Updated upstream aWH oPv iEK @@ -112067,6 +133314,17 @@ dGQ tjb ikU oPv +======= +rrE +tIH +sPF +qmb +aSu +hlS +cZx +nvF +tIH +>>>>>>> Stashed changes azA azA snR @@ -112347,12 +133605,21 @@ eUj eUj eUj ahs +<<<<<<< Updated upstream hGZ tIH cpn ivH mUz toH +======= +tqe +pXQ +gdH +hbo +nzH +aSu +>>>>>>> Stashed changes xyq lmd eUj @@ -112360,6 +133627,7 @@ eUj qUA eUj eUj +<<<<<<< Updated upstream aWH oPv pFb @@ -112369,6 +133637,17 @@ wsu dGQ tjb oPv +======= +rrE +tIH +wZv +sdX +tqe +ddn +hlS +cZx +tIH +>>>>>>> Stashed changes azA azA gAg @@ -112649,6 +133928,7 @@ eUj mZo uvL ahs +<<<<<<< Updated upstream hGZ hGZ toH @@ -112656,12 +133936,22 @@ toH toH hGZ jMh +======= +tqe +tqe +aSu +aSu +aSu +tqe +fnx +>>>>>>> Stashed changes lmd eUj qUA eUj eUj eUj +<<<<<<< Updated upstream fXu iBz vAU @@ -112671,6 +133961,17 @@ dGQ dGQ tjb imq +======= +cqU +sOQ +jVg +wZv +xey +hlS +hlS +cZx +lCJ +>>>>>>> Stashed changes azA azA azA @@ -112951,6 +134252,7 @@ eUj eUj uvL ahs +<<<<<<< Updated upstream ylX uVn caq @@ -112958,12 +134260,22 @@ tFr gNZ gNZ uvn +======= +iOE +uVn +eRc +trv +gNZ +gNZ +lgJ +>>>>>>> Stashed changes lmd eUj eUj eUj eUj eUj +<<<<<<< Updated upstream hGZ iVJ lhX @@ -112974,6 +134286,18 @@ mOQ mOQ hGZ evZ +======= +tqe +bFY +mTP +qlb +tqe +hDe +sFi +sFi +tqe +vvu +>>>>>>> Stashed changes azA rDi rDi @@ -113253,7 +134577,11 @@ eUj eUj eUj rzw +<<<<<<< Updated upstream clg +======= +rIY +>>>>>>> Stashed changes eAw eAw eAw @@ -113263,6 +134591,7 @@ eAw qwL eUj eUj +<<<<<<< Updated upstream qoG eUj eUj @@ -113275,6 +134604,20 @@ waN vXQ xSF hGZ +======= +ihu +eUj +eUj +tqe +tqe +aSu +aSu +tqe +sEv +eGT +mQK +tqe +>>>>>>> Stashed changes azA azA avm @@ -113554,12 +134897,21 @@ eUj tjL eUj eUj +<<<<<<< Updated upstream mYq oBZ xYk ifN eUj mYq +======= +oPv +fQd +wzW +gsK +eUj +oPv +>>>>>>> Stashed changes eUj eUj eUj @@ -113569,6 +134921,7 @@ eUj eUj eUj tqQ +<<<<<<< Updated upstream hWa tUK lzH @@ -113577,6 +134930,16 @@ bJW bJW bJW hGZ +======= +soJ +hAK +bXa +aSu +kNu +kNu +kNu +tqe +>>>>>>> Stashed changes azA azA tey @@ -113858,8 +135221,13 @@ eUj eUj eUj eUj +<<<<<<< Updated upstream wzW mYq +======= +nzO +oPv +>>>>>>> Stashed changes eUj eUj eUj @@ -113874,12 +135242,21 @@ ahs uVn uup uup +<<<<<<< Updated upstream hGZ dHc bJW kNa hGZ hGZ +======= +tqe +llj +kNu +uRd +tqe +tqe +>>>>>>> Stashed changes azA cBf rRz @@ -114159,14 +135536,22 @@ eUj eUj eUj eUj +<<<<<<< Updated upstream jqz +======= +aZt +>>>>>>> Stashed changes wsd wsd tMH qUA qUA qUA +<<<<<<< Updated upstream sSb +======= +evg +>>>>>>> Stashed changes eTF wsd tMH @@ -114174,6 +135559,7 @@ eUj eUj ahs uVn +<<<<<<< Updated upstream wAU uup hGZ @@ -114182,6 +135568,16 @@ bJW bJW adp hGZ +======= +efV +uup +tqe +tqe +kNu +kNu +ksz +tqe +>>>>>>> Stashed changes azA wTQ wTQ @@ -114461,7 +135857,11 @@ eUj mjp eUj eUj +<<<<<<< Updated upstream sPF +======= +lmw +>>>>>>> Stashed changes uzc uVn lmd @@ -114477,6 +135877,7 @@ eUj ahs uVn uVn +<<<<<<< Updated upstream wuE hGZ hGZ @@ -114484,6 +135885,15 @@ xoR bJW bJW hGZ +======= +jUl +tqe +tqe +blT +kNu +kNu +tqe +>>>>>>> Stashed changes azA azA azA @@ -114763,9 +136173,15 @@ wKj smK eUj eUj +<<<<<<< Updated upstream aZt wlf sIp +======= +lxW +kfT +rLQ +>>>>>>> Stashed changes nAH eUj eUj @@ -114780,12 +136196,21 @@ rzw eAw nEj uVn +<<<<<<< Updated upstream hGZ hGZ pVH xoR xoR toH +======= +tqe +tqe +nNx +blT +blT +aSu +>>>>>>> Stashed changes azA azA wNx @@ -115064,11 +136489,19 @@ qNZ eUj mZo eUj +<<<<<<< Updated upstream mYq eUj wzW eUj mYq +======= +oPv +eUj +nzO +eUj +oPv +>>>>>>> Stashed changes qUA qUA qUA @@ -115082,12 +136515,21 @@ qUA eUj ahs uVn +<<<<<<< Updated upstream eRc toH xoR xoR bJW toH +======= +lAb +aSu +blT +blT +kNu +aSu +>>>>>>> Stashed changes azA azA ndZ @@ -115367,9 +136809,15 @@ eUj eUj eUj eUj +<<<<<<< Updated upstream oBZ mYq miU +======= +fQd +oPv +bGB +>>>>>>> Stashed changes eUj eUj eUj @@ -115384,12 +136832,21 @@ qUA eUj ahs uVn +<<<<<<< Updated upstream uBI gAX bJW bJW bJW toH +======= +tDd +rCG +kNu +kNu +kNu +aSu +>>>>>>> Stashed changes azA azA snR @@ -115669,6 +137126,7 @@ eUj eUj eUj bff +<<<<<<< Updated upstream amQ lIE lIE @@ -115692,6 +137150,31 @@ mNN bnW mNN toH +======= +htm +bhz +bhz +uvn +uvn +cIW +ycu +cgv +rKh +qMR +tMH +eUj +eUj +bpa +bpa +nQx +rCg +oWh +aSu +sNv +cMj +sNv +aSu +>>>>>>> Stashed changes azA azA snR @@ -115971,6 +137454,7 @@ wKj eUj uGQ ahs +<<<<<<< Updated upstream gqA azA igE @@ -115984,16 +137468,40 @@ toH toH eUj gGf +======= +fUa +azA +igE +aSu +dvp +aSu +aSu +vUx +uvq +aSu +aSu +eUj +bJW +>>>>>>> Stashed changes aUc azA azA gvU +<<<<<<< Updated upstream toH hGZ toH toH toH toH +======= +aSu +tqe +aSu +aSu +aSu +aSu +>>>>>>> Stashed changes azA azA gAg @@ -116273,6 +137781,7 @@ pKJ eUj jfW ahs +<<<<<<< Updated upstream gqA azA azA @@ -116290,6 +137799,25 @@ azA tkV rvZ dmf +======= +fUa +azA +azA +aSu +kNu +qTP +kNu +ptJ +kNu +wAU +aSu +vaU +bJW +azA +noR +adz +mfw +>>>>>>> Stashed changes azA azA azA @@ -116575,6 +138103,7 @@ eUj eUj uGQ ahs +<<<<<<< Updated upstream gqA azA azA @@ -116597,6 +138126,30 @@ azA aUc boK azA +======= +fUa +azA +azA +aSu +kNu +kNu +hvT +vjl +kGP +tbh +aSu +vaU +xnL +azA +aWQ +gqh +pka +azA +azA +aUc +reW +azA +>>>>>>> Stashed changes shl azA azA @@ -116877,6 +138430,7 @@ eUj eUj jfW ahs +<<<<<<< Updated upstream gqA azA azA @@ -116898,6 +138452,29 @@ azA jXc azA pbH +======= +fUa +azA +azA +aSu +xGZ +tYG +gPd +rrR +nbO +idZ +aSu +vaU +bJW +azA +azA +aWQ +bve +azA +jXc +azA +xlt +>>>>>>> Stashed changes azA aVw azA @@ -117179,6 +138756,7 @@ wsd wsd wsd jQw +<<<<<<< Updated upstream ltA lNW lNW @@ -117202,6 +138780,31 @@ lNW lNW tDB qSB +======= +tzN +kNV +kNV +aSu +aSu +aSu +aSu +aSu +aSu +aSu +aSu +edn +rGf +kNV +kNV +kNV +kNV +kNV +kNV +kNV +kNV +nKe +oiL +>>>>>>> Stashed changes azA azA oND