diff --git a/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm b/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm
index 0f7e7fbcf1..123b3fa3aa 100644
--- a/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm
+++ b/_maps/map_files/Vegas Valley/Vegas_Valley_Sky.dmm
@@ -12,15 +12,20 @@
},
/turf/open/floor/wood_common,
/area/f13/clinic)
+<<<<<<< Updated upstream
+=======
"ac" = (
-/obj/machinery/iv_drip,
-/obj/machinery/light/small{
- dir = 8
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = -4;
+ pixel_x = 16
},
-/turf/open/floor/wood_common{
- icon_state = "common-broken3"
+/turf/open/floor/f13/wood{
+ icon_state = "housebase4-broken"
},
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"ad" = (
/obj/structure/railing{
layer = 4.1;
@@ -89,6 +94,7 @@
icon_state = "bluedirtychess2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"ak" = (
/obj/structure/sign/flag_america,
/turf/closed/indestructible/rock{
@@ -100,21 +106,19 @@
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/effect/decal/cleanable/dirt/dust,
-/obj/structure/table,
-/obj/item/kitchen/knife/butcher,
-/obj/item/kitchen/rollingpin,
-/turf/open/floor/f13{
- icon_state = "bluedirtychess2"
+/obj/structure/barricade/wooden,
+/obj/structure/barricade/wooden/planks/pregame,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/ncr)
+=======
+"al" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 5
},
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"an" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/medical/ancientfirstaid,
@@ -143,16 +147,18 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+"ar" = (
+/turf/closed/wall/f13/store,
+/area/f13/ambientlighting/building/j)
+=======
"aq" = (
-/obj/structure/chair/sofa/right{
- color = "#475340"
- },
-/obj/machinery/light/small{
- dir = 1;
- light_color = "#ff4747"
+/turf/open/indestructible/ground/outside/dirt{
+ icon_state = "dirt";
+ dir = 6
},
-/turf/open/floor/carpet/red,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"as" = (
/obj/structure/railing{
dir = 10
@@ -210,12 +216,13 @@
/obj/structure/barricade/bars,
/turf/open/floor/plasteel/dark,
/area/f13/building/abandoned/l)
+<<<<<<< Updated upstream
+=======
"aA" = (
-/obj/structure/flora/grass/jungle/b{
- pixel_x = -22
- },
-/turf/open/floor/plating/dirt,
-/area/f13/caves)
+/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,
@@ -228,15 +235,12 @@
},
/turf/open/transparent/openspace,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/turf/closed/mineral/random,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"aG" = (
/obj/item/weldingtool,
/obj/effect/decal/cleanable/dirt,
@@ -260,6 +264,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,
@@ -269,16 +279,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{
@@ -292,18 +292,29 @@
/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)
+<<<<<<< Updated upstream
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken3"
+ },
+/area/f13/ambientlighting/building/j)
+"aQ" = (
+/obj/effect/turf_decal/weather/dirt{
+ 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/structure/fermenting_barrel{
- pixel_y = 10;
- pixel_x = 8;
- density = 0;
- layer = 3.1
+/obj/item/restraints/legcuffs/bola/tactical,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken5"
},
-/turf/open/indestructible/ground/outside/snow,
+>>>>>>> Stashed changes
/area/f13/wasteland)
"aT" = (
/obj/structure/bed/double,
@@ -329,10 +340,14 @@
},
/turf/open/transparent/openspace,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"aW" = (
-/obj/structure/flora/branch,
-/turf/open/floor/plating/dirt/dark,
-/area/f13/caves)
+/turf/open/floor/f13/wood{
+ color = "#c5bab2"
+ },
+/area/f13/ncr)
+>>>>>>> Stashed changes
"aX" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -340,12 +355,20 @@
},
/turf/open/floor/plating/rust,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"aY" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
+/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"
},
-/turf/open/floor/plating/f13/outside/roof/wood/old,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"ba" = (
/obj/structure/destructible/tribal_torch/wall/lit{
dir = 4
@@ -396,14 +419,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/showroomfloor,
/area/maintenance/bar)
+<<<<<<< Updated upstream
+=======
"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,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 8
+ },
/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+/area/f13/ncr)
+>>>>>>> Stashed changes
"bj" = (
/obj/structure/rack,
/obj/item/reagent_containers/food/snacks/f13/fancylads,
@@ -439,10 +463,15 @@
},
/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)
+<<<<<<< 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" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
@@ -463,6 +492,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,
@@ -620,19 +653,29 @@
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -703,9 +746,15 @@
/obj/structure/table,
/turf/open/floor/holofloor/carpet,
/area/f13/ambientlighting/building/e)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"ce" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -714,18 +763,15 @@
/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
+<<<<<<< Updated upstream
+/obj/structure/flora/big_bush,
+/turf/open/indestructible/ground/outside/dirt,
+=======
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken1"
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"cg" = (
/obj/structure/closet/firecloset/full,
/obj/machinery/light/fo13colored/Red{
@@ -809,9 +855,13 @@
/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)
+<<<<<<< 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,
@@ -823,11 +873,15 @@
},
/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)
+<<<<<<< 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,
@@ -861,17 +915,19 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"cB" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/generic{
+ name = "scratch marks"
},
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
- },
-/obj/structure/flora/ausbushes/stalkybush{
- pixel_y = 17
+/turf/open/floor/wood_wide,
+/area/f13/wasteland)
+=======
+/obj/item/cane,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken3"
},
-/turf/open/indestructible/ground/outside/water,
-/area/f13/caves)
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"cC" = (
/obj/structure/railing{
layer = 4.1
@@ -882,13 +938,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,
@@ -923,20 +972,36 @@
},
/turf/open/transparent/openspace,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+"cO" = (
+/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)
+=======
"cN" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/chair/sofa/right{
- dir = 8
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = -16
},
-/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"
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 8;
+ icon_state = "dirtcorner"
},
-/area/f13/ambientlighting/building/g)
+/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,
@@ -1003,26 +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/effect/turf_decal/weather/dirt{
- dir = 1
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = 16
},
-/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/outside/dirt{
+ icon_state = "dirtcorner"
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/area/f13/wasteland)
"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)
+/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,
@@ -1035,58 +1104,15 @@
icon_state = "bluedirtychess2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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,
+/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,
@@ -1116,14 +1142,17 @@
name = "dirty floor"
},
/area/f13/building/powered)
-"di" = (
-/obj/structure/flora/rock/jungle,
-/turf/open/floor/plating/dirt,
-/area/f13/caves)
+<<<<<<< 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,
@@ -1142,15 +1171,15 @@
},
/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)
+<<<<<<< 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,
@@ -1184,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,
@@ -1197,15 +1227,21 @@
},
/area/f13/brotherhood/offices1st)
"dv" = (
-/obj/structure/toilet{
+/obj/item/bedsheet/blanket,
+/obj/structure/bed,
+/obj/effect/landmark/start/f13/ncrtrooper,
+/turf/open/floor/f13/wood,
+/area/f13/ncr)
+=======
+"dv" = (
+/obj/effect/decal/cleanable/blood{
dir = 8;
- icon_state = "toilet00"
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13{
- icon_state = "bar"
+ icon_state = "tracks"
},
-/area/f13/ambientlighting/building/g)
+/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,
@@ -1221,11 +1257,15 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"dy" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/carpet/blue,
-/area/f13/ambientlighting/building/g)
+/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{
@@ -1236,16 +1276,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,
@@ -1257,9 +1287,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/purple,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"dD" = (
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/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,
@@ -1295,9 +1331,15 @@
},
/turf/open/floor/wood_wide,
/area/f13/followers)
+<<<<<<< Updated upstream
"dL" = (
-/turf/open/floor/plating/dirt,
-/area/f13/caves)
+/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{
@@ -1306,6 +1348,8 @@
name = "dirty floor"
},
/area/f13/brotherhood/offices1st)
+=======
+>>>>>>> Stashed changes
"dN" = (
/obj/structure/closet/cabinet,
/obj/effect/spawner/lootdrop/f13/armor/costumes,
@@ -1348,20 +1392,16 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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,
+/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
@@ -1374,15 +1414,17 @@
/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
+<<<<<<< Updated upstream
+/turf/open/floor/f13/wood{
+ icon_state = "housebase"
},
-/turf/open/floor/f13{
- icon_state = "bluedirtychess2"
+=======
+/obj/structure/obstacle/barbedwire{
+ dir = 1
},
-/area/f13/ambientlighting/building/g)
+/turf/open/floor/wood_wide,
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"dY" = (
/obj/structure/railing{
color = "#A47449";
@@ -1410,11 +1452,16 @@
/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)
+<<<<<<< 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,
@@ -1487,12 +1534,26 @@
},
/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/effect/turf_decal/weather/dirt{
- dir = 6
+<<<<<<< Updated upstream
+/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)
+=======
+/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)
@@ -1576,6 +1637,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{
@@ -1644,9 +1709,17 @@
},
/area/f13/building/powered)
"eO" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+<<<<<<< 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)
@@ -1724,13 +1797,21 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"fb" = (
-/obj/structure/sign/poster/ncr/loaded{
- pixel_y = 32
+<<<<<<< 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/wood_wide{
- icon_state = "wide-broken1"
+/turf/open/floor/f13/wood{
+ icon_state = "oakfloor1"
},
-/area/f13/ncr)
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"fc" = (
/obj/structure/simple_door/bunker/glass,
/turf/open/floor/f13{
@@ -1740,12 +1821,21 @@
},
/area/f13/building/powered)
"fd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
- color = "#A47449"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -1830,13 +1920,10 @@
/obj/item/reagent_containers/spray/cleaner,
/turf/open/floor/carpet,
/area/f13/ambientlighting/building/c)
+<<<<<<< Updated upstream
"fq" = (
-/obj/effect/decal/cleanable/blood{
- dir = 5;
- icon_state = "tracks"
- },
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/turf/closed/wall/f13/ruins,
+/area/f13/ambientlighting/building/j)
"fr" = (
/obj/item/clothing/head/welding/weldingjapan,
/obj/effect/decal/cleanable/dirt{
@@ -1848,6 +1935,8 @@
name = "dirty floor"
},
/area/f13/brotherhood/offices1st)
+=======
+>>>>>>> Stashed changes
"fs" = (
/obj/machinery/shower{
dir = 4
@@ -1911,6 +2000,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,
@@ -1958,25 +2051,21 @@
/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"
+<<<<<<< Updated upstream
+/obj/structure/barricade/wooden,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken5"
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/area/f13/wasteland)
"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{
@@ -1995,8 +2084,17 @@
/turf/open/floor/wood_wide,
/area/f13/legioncamp)
"fR" = (
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+<<<<<<< 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,
@@ -2010,13 +2108,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,
@@ -2026,12 +2117,19 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"fX" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 10
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = 16
},
-/turf/open/transparent/openspace,
+/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,
@@ -2170,25 +2268,22 @@
/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)
+<<<<<<< Updated upstream
+=======
"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,
+/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)
+"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,
@@ -2217,6 +2312,14 @@
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,
+/area/f13/wasteland)
"gC" = (
/obj/machinery/vending/autodrobe{
force_free = 1
@@ -2226,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{
@@ -2238,14 +2342,30 @@
},
/area/f13/brotherhood/offices1st)
"gE" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/raider/tribal{
- name = "Cannibal Chef"
+/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
},
-/turf/open/floor/f13{
- icon_state = "bluedirtychess2"
+/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
},
-/area/f13/ambientlighting/building/g)
+/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{
@@ -2274,13 +2394,17 @@
/obj/item/clothing/head/cowboyhat/black,
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/d)
+<<<<<<< Updated upstream
"gH" = (
-/obj/structure/fence/wooden{
- pixel_x = 13;
- density = 0
+/obj/effect/decal/cleanable/blood{
+ dir = 8;
+ icon_state = "tracks"
},
-/turf/open/transparent/openspace,
-/area/f13/ncr)
+/obj/item/soap/homemade,
+/turf/open/floor/wood_wide,
+/area/f13/wasteland)
+=======
+>>>>>>> Stashed changes
"gI" = (
/obj/machinery/light/small{
dir = 4;
@@ -2366,10 +2490,22 @@
/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)
+<<<<<<< Updated upstream
+/obj/structure/lattice/catwalk,
+/obj/item/grenade/syndieminibomb/concussion/frag,
+/obj/structure/obstacle/barbedwire{
+ dir = 8
+ },
+/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,
@@ -2407,10 +2543,13 @@
icon_state = "bluedirtychess2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"ha" = (
-/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/hostile/renegade/soldier,
/turf/open/floor/wood_wide,
-/area/f13/ncr)
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"hc" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/dirt,
@@ -2432,39 +2571,50 @@
"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
+ },
+<<<<<<< Updated upstream
+/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)
+=======
+/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" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6
- },
-/turf/open/floor/plating/f13/outside/roof/wood/old,
+/turf/open/indestructible/ground/outside/desert,
/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/structure/barricade/concrete,
+/turf/open/indestructible/ground/outside/ruins{
+ icon_state = "rubblepillar"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/wooden,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"ho" = (
/obj/structure/rack/large/shelf_rust,
/obj/effect/spawner/lootdrop/clothing_middle,
@@ -2508,35 +2658,59 @@
icon_state = "tunnelrusty"
},
/area/f13/building/powered)
-"hv" = (
-/obj/structure/flora/grass/brown{
- pixel_x = -6
+<<<<<<< Updated upstream
+"hw" = (
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+"hx" = (
+/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"
},
-/turf/open/indestructible/ground/outside/snow,
/area/f13/wasteland)
+"hy" = (
+/obj/item/bedsheet/blanket,
+/obj/structure/bed,
+/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/item/reagent_containers/glass/bucket{
- pixel_y = 17;
- pixel_x = -8
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/open/floor/wood_common,
+/obj/effect/decal/cleanable/vomit/old,
+/turf/open/floor/f13/wood,
/area/f13/ncr)
"hx" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table/wood/settler,
-/turf/open/floor/f13/wood{
- icon_state = "housewood4-broken"
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 1;
+ icon_state = "dirtcorner"
},
-/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)
+/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;
@@ -2608,34 +2782,27 @@
/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/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
+/turf/open/floor/wood_common/wood_common_dark,
+/area/f13/ambientlighting/building/u)
+"hM" = (
+/obj/structure/bookcase/random{
+ icon_state = "bookempty"
},
-/obj/machinery/light/small{
- dir = 4
+>>>>>>> Stashed changes
+/turf/open/floor/f13/wood{
+ color = "#c5bab2"
},
-/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)
"hN" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/mmi/posibrain,
@@ -2657,17 +2824,13 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/obj/effect/turf_decal/weather/dirt,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"hQ" = (
/obj/structure/curtain{
color = "#845f58";
@@ -2682,13 +2845,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,
@@ -2743,6 +2899,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{
@@ -2777,10 +2941,21 @@
},
/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)
+<<<<<<< Updated upstream
+/obj/machinery/door/unpowered/secure_NCR{
+ name = "Veteran Ranger's Lodging"
+ },
+/turf/open/floor/f13/wood{
+ 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,
@@ -2839,15 +3014,25 @@
dir = 1
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+"iv" = (
+/obj/structure/flora/grass/coyote/six,
+/turf/open/indestructible/ground/outside/desert,
+=======
"iu" = (
-/obj/structure/table/wood,
-/turf/open/floor/plating/f13/outside/roof/wood/old,
+/obj/structure/barricade/wooden,
+/turf/open/floor/wood_wide,
+>>>>>>> Stashed changes
/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
@@ -2873,16 +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/effect/decal/cleanable/dirt/dust,
-/obj/structure/toilet{
- dir = 8;
- icon_state = "toilet00"
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = -16
},
-/turf/open/floor/f13{
- icon_state = "bar"
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = 16
},
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"iE" = (
/turf/open/transparent/openspace,
/area/f13/building/abandoned/j)
@@ -2895,12 +3088,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/red,
/area/maintenance/bar)
+<<<<<<< Updated upstream
+=======
"iI" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 5
- },
-/turf/open/floor/plating/f13/outside/roof/wood/old,
+/turf/closed/wall/f13/store,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"iJ" = (
/obj/structure/table/reinforced,
/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,
@@ -2917,19 +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/effect/decal/cleanable/dirt/dust,
-/obj/structure/chair/wood{
- dir = 1
- },
-/turf/open/floor/f13/wood,
-/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)
+=======
"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/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,
@@ -2942,22 +3138,37 @@
/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"
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/blood{
+ dir = 9;
+ icon_state = "tracks";
+ pixel_y = 8
},
-/area/f13/ambientlighting/building/g)
+/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" = (
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/effect/decal/cleanable/blood{
+ dir = 8;
+ icon_state = "tracks";
+ pixel_y = 5
},
-/area/f13/ambientlighting/building/g)
+/turf/open/floor/wood_wide,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"iT" = (
/obj/structure/fence/wooden{
dir = 4;
@@ -2986,12 +3197,15 @@
/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"
+<<<<<<< Updated upstream
+/turf/open/indestructible/ground/inside/mountain,
+=======
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 8;
+ icon_state = "dirtcorner"
},
-/area/f13/ambientlighting/building/g)
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"iY" = (
/obj/effect/turf_decal,
/obj/structure/barricade/sandbags,
@@ -3016,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
},
@@ -3025,12 +3240,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,
@@ -3039,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,
@@ -3048,19 +3263,13 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -3089,6 +3298,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,
@@ -3108,10 +3320,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,
@@ -3127,6 +3338,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"
@@ -3184,11 +3401,21 @@
},
/area/f13/building/abandoned/m)
"jA" = (
-/obj/structure/fireplace,
-/turf/open/indestructible/ground/outside/ruins{
- name = "cobblestone floor"
+<<<<<<< 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
},
-/area/f13/ncr)
+/turf/open/floor/f13/wood{
+ color = "#c5bab2"
+>>>>>>> Stashed changes
+ },
+/area/f13/wasteland)
"jB" = (
/obj/effect/turf_decal/caution/stand_clear,
/obj/effect/turf_decal/big{
@@ -3216,10 +3443,14 @@
},
/turf/open/transparent/openspace,
/area/f13/building/abandoned/m)
+<<<<<<< Updated upstream
+=======
"jE" = (
-/obj/structure/flora/grass/brown,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/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;
@@ -3288,9 +3519,32 @@
},
/area/f13/building/powered)
"jQ" = (
-/obj/structure/flora/grass/both,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+<<<<<<< Updated upstream
+/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)
+=======
+/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;
@@ -3428,15 +3682,45 @@
},
/area/f13/legioncamp)
"ko" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+<<<<<<< Updated upstream
+/turf/open/floor/f13/wood{
+ 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" = (
-/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)
+=======
+/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,
@@ -3448,6 +3732,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,
@@ -3591,6 +3881,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{
@@ -3605,10 +3899,17 @@
},
/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"
},
+<<<<<<< Updated upstream
/obj/structure/table,
/obj/item/ammo_box/magazine/m45/empty{
pixel_x = 3;
@@ -3623,18 +3924,11 @@
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)
+=======
+/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,
@@ -3678,13 +3972,17 @@
icon_state = "darkdirtysolid"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"lg" = (
/obj/machinery/light/small{
dir = 4
@@ -3693,17 +3991,14 @@
color = "#c5bab2"
},
/area/f13/building/abandoned/z)
+<<<<<<< Updated upstream
+=======
"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
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken5"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/f13/outside/roof/wood/old,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"lj" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -3787,12 +4082,13 @@
},
/turf/open/floor/wood_fancy/wood_fancy_dark,
/area/f13/bar)
+<<<<<<< Updated upstream
+=======
"ls" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/turf/open/transparent/openspace,
-/area/f13/caves)
+/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
@@ -3822,13 +4118,26 @@
"lw" = (
/turf/open/floor/plating/f13/outside/roof/metal,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"lx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small{
- dir = 8
+/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)
+/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
@@ -3867,19 +4176,25 @@
/turf/open/transparent/openspace,
/area/f13/wasteland)
"lD" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/chair/wood{
- dir = 8;
- layer = 1
- },
+<<<<<<< Updated upstream
+/obj/machinery/space_heater,
/turf/open/floor/f13/wood,
-/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)
"lE" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood_wide{
- icon_state = "wide-broken4"
- },
+/obj/structure/debris/v3,
+/turf/closed/wall/mineral/brick,
+>>>>>>> Stashed changes
/area/f13/ncr)
+"lE" = (
+/obj/effect/decal/fakelattice,
+/turf/open/indestructible/ground/outside/ruins,
+/area/f13/wasteland)
"lF" = (
/obj/structure/railing,
/obj/machinery/light/small{
@@ -3916,9 +4231,13 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"lJ" = (
-/turf/closed/wall/f13/wood/house/broken,
-/area/f13/ambientlighting/building/g)
+/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)
@@ -3954,10 +4273,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
@@ -4001,26 +4316,18 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"lY" = (
-/obj/structure/railing{
- color = "#A47449";
+/obj/structure/barricade/tentclothedge{
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"
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 4
},
-/area/f13/ncr)
+/turf/open/floor/wood_common/wood_common_dark,
+/area/f13/ambientlighting/building/u)
+>>>>>>> Stashed changes
"lZ" = (
/obj/structure/falsewall/rust,
/turf/open/floor/f13{
@@ -4072,11 +4379,17 @@
},
/area/f13/building/powered)
"mg" = (
-/obj/structure/sign/departments/medbay/alt{
- name = "TRIAGE"
+<<<<<<< Updated upstream
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken1"
},
-/turf/closed/wall/f13/wood,
+/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
@@ -4087,26 +4400,30 @@
icon_state = "bluedirtychess2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"mi" = (
-/obj/structure/chair/folding,
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/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" = (
-/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"
+/turf/open/floor/f13/wood{
+ icon_state = "housebase4-broken"
},
-/area/f13/caves)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"ml" = (
/obj/effect/decal/remains/human,
/obj/item/clothing/head/f13/enclave/peacekeeper,
@@ -4134,10 +4451,15 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"mp" = (
-/obj/structure/fluff/hedge,
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/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
@@ -4175,10 +4497,9 @@
/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)
+<<<<<<< Updated upstream
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/wasteland)
"my" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -4190,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";
@@ -4230,13 +4557,15 @@
icon_state = "bluedirtychess2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"mD" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 8;
+ icon_state = "dirtcorner"
},
-/area/f13/ambientlighting/building/g)
+/area/f13/wasteland)
+=======
+>>>>>>> Stashed changes
"mE" = (
/turf/open/transparent/openspace{
name = "air";
@@ -4254,13 +4583,7 @@
},
/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)
+<<<<<<< Updated upstream
"mI" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -4285,6 +4608,8 @@
name = "dirty floor"
},
/area/f13/brotherhood/offices1st)
+=======
+>>>>>>> Stashed changes
"mK" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/dirt,
@@ -4299,6 +4624,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,
@@ -4311,10 +4645,20 @@
/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,
+<<<<<<< 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";
@@ -4351,11 +4695,17 @@
},
/area/f13/building/powered)
"mW" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 5
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/structure/chair/bench{
+ dir = 1
+ },
+/turf/open/indestructible/ground/outside/dirt,
+>>>>>>> Stashed changes
/area/f13/wasteland)
"mX" = (
/obj/structure/weightmachine/stacklifter,
@@ -4373,25 +4723,50 @@
/turf/open/floor/plasteel/f13/vault_floor/misc/rarewhite,
/area/f13/ambientlighting/building/c)
"mZ" = (
+<<<<<<< Updated upstream
/obj/effect/turf_decal/weather/dirt{
- dir = 6
+ dir = 1
},
-/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/wasteland)
+"nb" = (
+/obj/effect/decal/cleanable/blood{
+ dir = 8;
+ icon_state = "tracks"
},
-/area/f13/ambientlighting/building/g)
+/turf/open/floor/wood_wide,
+/area/f13/wasteland)
+"ne" = (
+/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/structure/barricade/sandbags,
-/obj/structure/table/wood,
-/turf/open/floor/plating/dirt,
-/area/f13/caves)
+/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
@@ -4422,14 +4797,7 @@
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)
+<<<<<<< Updated upstream
"nm" = (
/obj/machinery/light/small/broken{
dir = 4
@@ -4443,10 +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,
-/turf/closed/wall/f13/wood,
-/area/f13/caves)
+/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
@@ -4498,6 +4878,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;
@@ -4532,13 +4915,19 @@
/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"
+<<<<<<< Updated upstream
+/obj/item/restraints/legcuffs/bola/tactical,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken5"
},
-/turf/open/floor/wood_common,
+/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)
@@ -4561,19 +4950,23 @@
/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
+ },
+<<<<<<< Updated upstream
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 8;
+ icon_state = "dirt"
},
+=======
/turf/open/transparent/openspace,
/area/f13/wasteland)
"nL" = (
-/obj/item/newspaper{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/carpet/red,
-/area/f13/ncr)
+/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,
/area/f13/ambientlighting/building/e)
@@ -4606,14 +4999,15 @@
},
/turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"nS" = (
-/obj/structure/railing{
- color = "#A47449";
- dir = 4;
- layer = 4.1
+/obj/structure/fluff/railing{
+ dir = 6
},
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/turf/open/transparent/openspace,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"nU" = (
/obj/effect/decal/cleanable/blood/gibs,
/obj/structure/lattice,
@@ -4639,23 +5033,28 @@
"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)
+<<<<<<< Updated upstream
"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"
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken3"
},
-/area/f13/ncr)
+/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";
@@ -4682,6 +5081,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;
@@ -4766,12 +5170,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,
@@ -4784,6 +5182,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{
@@ -4825,11 +5227,20 @@
/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)
+<<<<<<< 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{
@@ -4849,6 +5260,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,
@@ -4895,14 +5312,15 @@
dir = 6
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"oL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small{
- dir = 8;
- light_color = "#ff4747"
+/obj/structure/bed/old,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken1"
},
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/area/f13/ambientlighting/building/j)
+=======
+>>>>>>> Stashed changes
"oM" = (
/obj/structure/wreck/trash/machinepile,
/obj/machinery/light/fo13colored/Red{
@@ -4955,15 +5373,12 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"oU" = (
/obj/structure/window/fulltile/house{
opacity = 1
@@ -4982,11 +5397,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{
@@ -5021,6 +5431,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,
@@ -5043,12 +5457,27 @@
/turf/open/floor/plating/f13/outside/roof/metal,
/area/f13/wasteland)
"pg" = (
-/obj/machinery/light/small{
- dir = 1;
- light_color = "#ff4747"
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/turf/open/indestructible/ground/inside/mountain,
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"ph" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
@@ -5170,21 +5599,29 @@
/turf/open/floor/wood_wide/wood_wide_light,
/area/engine/workshop)
"px" = (
-/obj/structure/filingcabinet{
- pixel_x = 11
+<<<<<<< Updated upstream
+/obj/effect/turf_decal/weather/dirt{
+ dir = 4
},
-/obj/structure/filingcabinet{
- pixel_x = 1
+/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/wood_common,
-/area/f13/ncr)
-"py" = (
-/obj/structure/decoration/rag{
- icon_state = "skin";
- pixel_y = 2
+/turf/open/floor/f13/wood{
+ icon_state = "oakfloor1"
},
-/turf/closed/wall/f13/wood,
-/area/f13/ncr)
+/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{
@@ -5195,6 +5632,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{
@@ -5341,17 +5787,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)
@@ -5445,11 +5894,18 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"qo" = (
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/transparent/openspace,
-/area/f13/ambientlighting/building/g)
+<<<<<<< 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)
@@ -5462,12 +5918,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 +5953,23 @@
/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"
+<<<<<<< Updated upstream
+/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)
+=======
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 10;
+ icon_state = "dirt"
+ },
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"qz" = (
/obj/structure/table/glass,
/obj/item/paper_bin,
@@ -5553,14 +6014,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"qG" = (
-/obj/machinery/vending/snack,
-/obj/machinery/light/small{
- dir = 4;
- light_color = "#ff4747"
+/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)
+/turf/open/floor/f13/wood{
+ icon_state = "oakfloor1-broken"
+ },
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"qH" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -5574,13 +6041,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13/wood,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"qJ" = (
-/obj/structure/window/fulltile/wood,
-/obj/structure/curtain{
- color = "#808080"
- },
-/turf/open/floor/f13/wood,
-/area/f13/ncr)
+/turf/open/floor/wood_wide,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"qK" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
@@ -5606,11 +6072,14 @@
/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)
+<<<<<<< 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
@@ -5641,12 +6110,13 @@
/obj/structure/wreck/trash/machinepiletwo,
/turf/open/floor/wood_fancy,
/area/f13/building/abandoned/j)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"qU" = (
/obj/structure/railing{
dir = 10
@@ -5831,37 +6301,20 @@
},
/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,
/turf/open/floor/plating/rust,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/obj/item/reagent_containers/glass/bucket,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"rx" = (
/obj/structure/curtain{
color = "#845f58";
@@ -5920,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';
@@ -5935,10 +6389,15 @@
},
/turf/open/transparent/openspace,
/area/f13/brotherhood/offices1st)
+=======
+/turf/open/floor/wood_fancy/wood_fancy_dark,
+/area/f13/brotherhood)
"rJ" = (
-/obj/structure/barricade/wooden/planks,
-/turf/closed/wall/f13/wood,
-/area/f13/caves)
+/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)
@@ -5963,6 +6422,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,
@@ -6035,16 +6500,14 @@
"sa" = (
/turf/open/floor/plating/f13/outside/roof/metal/corrugated,
/area/f13/underground/mountain)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"sd" = (
/obj/structure/chair/office{
dir = 8
@@ -6085,26 +6548,27 @@
},
/turf/open/floor/plating,
/area/engine/workshop)
-"si" = (
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+<<<<<<< Updated upstream
"sj" = (
-/obj/structure/table/booth,
-/obj/item/folder{
- pixel_x = -6;
- pixel_y = 2
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = 16
},
-/obj/item/paper_bin{
- pixel_x = 9;
- pixel_y = 3
+/obj/structure/closet/crate/large,
+/obj/structure/closet/crate/large{
+ layer = 5;
+ pixel_y = 18
},
-/obj/item/pen{
- pixel_x = 8;
- pixel_y = 3
+/turf/open/indestructible/ground/outside/desert,
+=======
+"si" = (
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken3"
},
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"sl" = (
/obj/effect/spawner/lootdrop/trash,
/obj/effect/decal/cleanable/dirt{
@@ -6153,21 +6617,29 @@
/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,
/obj/item/reagent_containers/hypospray/medipen/stimpak,
/turf/open/floor/plating/rust,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"su" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/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,
@@ -6186,6 +6658,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,
@@ -6244,6 +6729,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,
@@ -6383,6 +6872,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,
@@ -6402,13 +6895,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 +6902,17 @@
/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)
+<<<<<<< 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,
@@ -6440,12 +6933,16 @@
/obj/structure/bed/old,
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"tp" = (
/mob/living/simple_animal/hostile/securitron/sentrybot,
/obj/machinery/light/fo13colored/Red{
@@ -6462,20 +6959,21 @@
/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
+<<<<<<< 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/floor/plating/f13/outside/roof/wood/old,
+/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"tt" = (
-/obj/structure/simple_door/house,
-/turf/open/floor/f13{
- icon_state = "bar"
- },
-/area/f13/ambientlighting/building/g)
+/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{
@@ -6524,6 +7022,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,
@@ -6531,12 +7034,13 @@
icon_state = "floordirty"
},
/area/f13/building/abandoned/j)
+<<<<<<< Updated upstream
"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)
+/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,
@@ -6561,6 +7065,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";
@@ -6665,16 +7174,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)
@@ -6725,29 +7224,17 @@
icon_state = "greenrustyfull"
},
/area/f13/followers)
-"uf" = (
+<<<<<<< Updated upstream
+=======
+"ug" = (
+/obj/effect/decal/fakelattice,
+/obj/effect/turf_decal/weather/dirt,
/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
+ dir = 10
},
-/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)
+/turf/open/floor/f13/wood,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"uh" = (
/obj/machinery/pool/drain,
/obj/effect/decal/cleanable/dirt,
@@ -6925,6 +7412,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{
@@ -6938,17 +7430,21 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"uI" = (
-/obj/machinery/sleeper,
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/obj/structure/barricade/wooden,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken5"
+ },
+/area/f13/wasteland)
"uJ" = (
-/obj/structure/fluff/rails{
- icon_state = "rails-r";
- dir = 8
+/obj/structure/fluff/railing{
+ dir = 10
},
-/turf/open/floor/plating/dirt,
-/area/f13/caves)
+/turf/open/transparent/openspace,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"uK" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/wood,
@@ -6983,13 +7479,17 @@
/turf/open/floor/carpet/purple,
/area/f13/bar)
"uQ" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/autolathe,
-/obj/machinery/light/small{
- dir = 1
+<<<<<<< Updated upstream
+/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"
@@ -7000,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,
@@ -7109,11 +7614,15 @@
/turf/open/floor/carpet/black,
/area/maintenance/bar)
"vd" = (
-/obj/structure/simple_door/bunker,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+<<<<<<< Updated upstream
+/turf/open/floor/f13/wood{
+ icon_state = "oakfloor4-broken"
},
-/area/f13/ambientlighting/building/g)
+=======
+/obj/structure/closet/crate/large,
+/turf/open/indestructible/ground/outside/desert,
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"ve" = (
/obj/structure/table/reinforced,
/obj/item/blueprint/research,
@@ -7141,24 +7650,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{
@@ -7167,6 +7663,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"
@@ -7177,13 +7685,17 @@
},
/area/f13/bar)
"vo" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small{
- dir = 1
- },
-/mob/living/simple_animal/hostile/raider/ranged,
+<<<<<<< Updated upstream
+/obj/structure/closet/crate/footlocker,
/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+/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,
@@ -7200,27 +7712,24 @@
},
/turf/open/floor/wood_fancy/wood_fancy_dark,
/area/f13/bar)
-"vs" = (
-/obj/structure/decoration/rag{
- icon_state = "skin";
- layer = 5.0
+<<<<<<< Updated upstream
+"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"
},
-/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)
+/obj/effect/decal/fakelattice,
+/obj/effect/decal/fakelattice,
+/turf/open/indestructible/ground/outside/ruins,
+/area/f13/wasteland)
"vu" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/vending/cola/random,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
- },
-/area/f13/ambientlighting/building/g)
+/turf/open/transparent/openspace,
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/j)
"vv" = (
/obj/machinery/light/fo13colored/Red{
dir = 8
@@ -7274,15 +7783,16 @@
},
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/d)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/structure/table/wood/junk,
+/obj/item/clothing/glasses/fakeblindfold,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken5"
},
-/area/f13/ncr)
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"vD" = (
/obj/machinery/light/fo13colored/Red,
/obj/effect/decal/cleanable/blood/old,
@@ -7333,13 +7843,15 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"vJ" = (
-/obj/structure/flora/grass/brown{
- pixel_x = 9;
- pixel_y = 11
+/obj/item/cane,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken3"
},
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/area/f13/ambientlighting/building/j)
+=======
+>>>>>>> Stashed changes
"vK" = (
/obj/structure/window/fulltile/house/broken,
/obj/structure/barricade/wooden/planks/pregame,
@@ -7462,10 +7974,19 @@
},
/turf/open/floor/mineral/titanium/white,
/area/f13/clinic)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"we" = (
/obj/structure/table,
/obj/structure/railing/dancing_pole{
@@ -7686,25 +8207,33 @@
/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)
"wL" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/green,
-/area/f13/ambientlighting/building/g)
+<<<<<<< Updated upstream
+/obj/structure/barricade/concrete,
+/turf/open/indestructible/ground/outside/ruins,
+/area/f13/wasteland)
"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)
+=======
+/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,
@@ -7715,10 +8244,24 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"wP" = (
-/obj/effect/decal/cleanable/dirt,
+/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/ncr)
+/area/f13/ambientlighting/building/u)
+>>>>>>> Stashed changes
"wQ" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 1
@@ -7750,6 +8293,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)
@@ -7810,11 +8364,7 @@
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)
+<<<<<<< Updated upstream
"xg" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -7827,20 +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)
-"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)
+<<<<<<< Updated upstream
"xj" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 4
@@ -7852,21 +8404,16 @@
},
/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)
+/obj/structure/bed/wooden,
+/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,
@@ -7898,15 +8445,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{
@@ -7981,6 +8519,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;
@@ -7998,9 +8540,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;
@@ -8052,16 +8591,15 @@
icon_state = "bluerustysolid"
},
/area/f13/followers)
+<<<<<<< Updated upstream
+=======
"xL" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small{
- brightness = 3;
- dir = 8
- },
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 4;
+ icon_state = "dirt"
},
-/area/f13/ambientlighting/building/g)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"xM" = (
/turf/closed/wall/f13/wood/interior,
/area/f13/clinic)
@@ -8092,10 +8630,15 @@
},
/turf/open/floor/plating,
/area/f13/bar)
+<<<<<<< Updated upstream
+=======
"xS" = (
-/obj/structure/fluff/rails,
-/turf/open/floor/plating/dirt/dark,
-/area/f13/caves)
+/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,
@@ -8117,22 +8660,19 @@
icon_state = "bluedirtychess2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+"xX" = (
+/turf/closed/mineral/random/low_chance,
+/area/f13/caves)
+=======
"xW" = (
-/obj/structure/fence/wooden{
- dir = 4;
- icon_state = "post_wood"
+/obj/effect/decal/cleanable/blood{
+ dir = 8;
+ icon_state = "tracks"
},
-/turf/open/floor/plating/f13/outside/roof/wood/old,
+/turf/open/floor/wood_wide,
/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)
+>>>>>>> Stashed changes
"xY" = (
/obj/machinery/photocopier,
/turf/open/floor/f13{
@@ -8147,10 +8687,12 @@
/obj/structure/barricade/bars,
/turf/open/floor/f13/wood,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"yc" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/royalblack,
-/area/f13/ambientlighting/building/g)
+/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,
@@ -8197,13 +8739,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{
@@ -8225,6 +8760,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{
@@ -8292,15 +8833,16 @@
},
/turf/open/transparent/openspace,
/area/f13/wasteland)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"yB" = (
/obj/machinery/light/small{
dir = 4;
@@ -8358,6 +8900,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,
@@ -8383,17 +8931,21 @@
dir = 1
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"yN" = (
-/turf/open/floor/plasteel/elevatorshaft,
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/ruins{
+ icon_state = "rubbleplate"
+ },
+/area/f13/wasteland)
"yO" = (
-/obj/structure/flora/grass/jungle/b{
- icon_state = "grassb3";
- pixel_x = -5;
- pixel_y = 1
+/obj/structure/chair/stool/retro/tan,
+/obj/effect/landmark/start/f13/ncrranger,
+/turf/open/floor/f13/wood{
+ color = "#c5bab2"
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/area/f13/ncr)
+>>>>>>> Stashed changes
"yP" = (
/obj/effect/decal/cleanable/greenglow,
/obj/effect/decal/remains/human,
@@ -8506,16 +9058,25 @@
/obj/item/kirbyplants/random,
/turf/open/floor/plasteel/f13,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"zf" = (
-/obj/structure/fluff/hedge,
-/turf/open/floor/wood_common{
- icon_state = "common-broken2"
- },
-/area/f13/ncr)
+/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,
/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)
@@ -8679,12 +9240,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,
@@ -8722,25 +9277,16 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/obj/structure/flora/wasteplant/wild_broc,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"zR" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 8
- },
-/turf/open/floor/plating/f13/outside/roof/wood/old,
+/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"zS" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/sofa/corp{
@@ -8759,11 +9305,20 @@
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/d)
"zU" = (
-/obj/structure/bookcase/random{
- icon_state = "bookempty"
+<<<<<<< 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/floor/wood_common,
-/area/f13/ncr)
+/turf/open/indestructible/ground/outside/dirt{
+ icon_state = "dirt";
+ dir = 4
+ },
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/u)
"zV" = (
/obj/structure/rack/shelf_metal,
/obj/item/storage/toolbox/emergency,
@@ -8871,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/structure/flora/grass/both{
- icon_state = "snowgrass_esw"
+/obj/effect/decal/fakelattice,
+/turf/open/indestructible/ground/outside/ruins{
+ dir = 5;
+ icon_state = "rubbleplate"
},
-/turf/open/indestructible/ground/outside/snow,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"Al" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13/wood{
@@ -8913,14 +9478,16 @@
},
/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)
+<<<<<<< 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
@@ -8932,35 +9499,34 @@
/turf/open/transparent/openspace,
/area/f13/wasteland)
"As" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+<<<<<<< Updated upstream
+/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/ambientlighting/building/g)
+=======
+/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/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
+/obj/structure/bed/mattress{
+ icon_state = "mattress3"
},
-/turf/open/floor/carpet/red,
-/area/f13/ncr)
+/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,
@@ -8970,6 +9536,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)
@@ -8980,6 +9553,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,
@@ -9020,27 +9597,29 @@
/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)
+<<<<<<< Updated upstream
+/obj/structure/shelf_wood,
+/obj/effect/spawner/lootdrop/f13/weapon/melee/random_high,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"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"
+/obj/effect/decal/cleanable/blood{
+ dir = 8;
+ icon_state = "tracks"
},
-/area/f13/ambientlighting/building/g)
+/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{
@@ -9050,10 +9629,23 @@
},
/area/f13/building/powered)
"AI" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table/wood/settler,
+<<<<<<< Updated upstream
+/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)
+=======
+/obj/effect/decal/fakelattice,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+/area/f13/ncr)
+>>>>>>> Stashed changes
"AK" = (
/turf/open/floor/wood_wide,
/area/f13/legioncamp)
@@ -9073,15 +9665,16 @@
},
/area/f13/followers)
"AP" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/red,
-/area/f13/ambientlighting/building/g)
-"AQ" = (
-/obj/structure/barricade/bars,
-/obj/structure/curtain,
-/obj/structure/window/fulltile/wood/broken,
-/turf/open/floor/wood_common,
+<<<<<<< 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,
@@ -9114,14 +9707,14 @@
},
/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)
+<<<<<<< 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,
/obj/effect/decal/cleanable/dirt,
@@ -9132,22 +9725,14 @@
/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)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"Ba" = (
/obj/structure/falsewall/rust,
/turf/open/floor/plating/rust,
@@ -9198,6 +9783,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,
@@ -9251,6 +9840,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)
@@ -9260,15 +9855,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/red,
/area/f13/building/powered)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"Bv" = (
/obj/structure/table,
/obj/machinery/cell_charger{
@@ -9324,17 +9924,7 @@
},
/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)
+<<<<<<< Updated upstream
"BE" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -9346,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,
@@ -9365,6 +9963,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{
@@ -9462,12 +10071,14 @@
"BU" = (
/turf/open/floor/wood_common,
/area/f13/building/abandoned/m)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"BW" = (
/obj/structure/barricade/wooden/planks/pregame,
/turf/closed/wall/mineral/wood,
@@ -9477,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{
@@ -9489,17 +10101,20 @@
},
/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,
/area/f13/brotherhood/offices1st)
+=======
+>>>>>>> Stashed changes
"Cb" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/lootdrop/f13/junkspawners,
@@ -9551,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
@@ -9558,38 +10174,13 @@
/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)
+=======
+>>>>>>> Stashed changes
"Ck" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/f13/wood/house,
@@ -9657,12 +10248,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)
@@ -9733,13 +10318,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"
@@ -9830,32 +10408,31 @@
/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,
/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/bed/wooden,
-/obj/item/bedsheet/blanket,
-/obj/machinery/light/small{
- dir = 8;
- light_color = "#ff4747"
+<<<<<<< Updated upstream
+/obj/structure/barricade/wooden,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken3"
},
-/turf/open/floor/carpet,
+/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,
@@ -9878,9 +10455,20 @@
dir = 1
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"Db" = (
-/turf/open/floor/plating/wooden,
-/area/f13/ncr)
+/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
@@ -10031,13 +10619,15 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"Dx" = (
-/obj/structure/railing{
- color = "#A47449";
- dir = 9
+/obj/structure/barricade/wooden,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken3"
},
-/turf/open/transparent/openspace,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"Dz" = (
/obj/machinery/light{
dir = 1;
@@ -10059,12 +10649,20 @@
},
/area/f13/building/powered)
"DD" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small,
-/turf/open/floor/f13{
- icon_state = "bar"
+<<<<<<< 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
},
-/area/f13/ambientlighting/building/g)
+/turf/open/transparent/openspace,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"DE" = (
/obj/effect/decal/cleanable/blood/old,
/obj/structure/lattice,
@@ -10159,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"
@@ -10170,12 +10769,8 @@
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)
+=======
+>>>>>>> Stashed changes
"DY" = (
/obj/structure/reagent_dispensers/barrel/four,
/obj/effect/decal/cleanable/dirt,
@@ -10193,15 +10788,23 @@
/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
},
/turf/open/transparent/openspace,
/area/f13/building/powered)
+<<<<<<< Updated upstream
"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"
@@ -10213,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,
@@ -10356,6 +10961,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,
@@ -10370,6 +10980,21 @@
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{
@@ -10377,10 +11002,18 @@
},
/area/f13/legioncamp)
"EF" = (
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/item/flag/ncr,
-/turf/open/floor/plating/dirt,
-/area/f13/caves)
+<<<<<<< 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,
@@ -10405,10 +11038,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,
@@ -10509,15 +11138,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,
@@ -10654,13 +11274,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{
@@ -10669,6 +11282,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{
@@ -10690,27 +11307,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/structure/window/fulltile/ruins{
- icon_state = "ruinswindowvertical"
- },
-/turf/open/floor/f13/wood{
- icon_state = "housewood2"
- },
-/area/f13/ambientlighting/building/g)
-"FA" = (
-/obj/structure/wreck/trash/machinepiletwo,
-/turf/open/floor/plating/dirt,
-/area/f13/caves)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/f13/wood,
+/area/f13/ncr)
"FB" = (
/obj/structure/window/fulltile/house/broken,
/obj/structure/barricade/bars,
@@ -10744,11 +11344,14 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"FG" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/raider/baseball,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+/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{
@@ -10778,29 +11381,29 @@
},
/turf/open/floor/wood_fancy,
/area/f13/ambientlighting/building/c)
+<<<<<<< Updated upstream
"FL" = (
-/obj/structure/bed/old,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/red,
-/area/f13/ambientlighting/building/g)
+/obj/item/grown/log/tree,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+=======
"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,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/transparent/openspace,
/area/f13/ncr)
+>>>>>>> Stashed changes
"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)
+/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,
@@ -10860,20 +11463,29 @@
/obj/machinery/microwave/stove,
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/p)
+<<<<<<< Updated upstream
+=======
"Ga" = (
-/obj/structure/railing/corner{
- color = "#A47449";
- dir = 1
+/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/closet/crate/large,
+/obj/structure/closet/crate/large{
+ layer = 5;
+ pixel_y = 18
+ },
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"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)
+/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
@@ -10912,8 +11524,11 @@
},
/area/f13/brotherhood/offices1st)
"Gf" = (
-/turf/closed/wall/f13/wood/house,
-/area/f13/ambientlighting/building/g)
+<<<<<<< Updated upstream
+/turf/open/floor/f13/wood{
+ icon_state = "oakfloor1"
+ },
+/area/f13/wasteland)
"Gg" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -10926,46 +11541,68 @@
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/effect/turf_decal/weather/dirt{
+ dir = 5
},
-/obj/structure/fluff{
- icon = 'icons/fallout/objects/cave_decor.dmi';
- icon_state = "stalagmite";
- name = "stalagmite";
- density = 1
+/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/plating/dirt/dark,
-/area/f13/caves)
+/turf/open/floor/f13/wood{
+ icon_state = "housebase"
+ },
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"Gj" = (
/obj/structure/table/wood,
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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/effect/decal/cleanable/dirt/dust,
-/obj/machinery/autolathe/ammo,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+/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,
@@ -10987,13 +11624,14 @@
},
/turf/open/floor/plating/rust,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"Gq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/unpowered/secure_NCR{
- name = "Medical"
+/turf/open/floor/f13/wood{
+ icon_state = "oakfloor4-broken"
},
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"Gr" = (
/obj/effect/turf_decal/stripes/white/corner{
dir = 4
@@ -11039,6 +11677,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,
@@ -11115,16 +11758,18 @@
icon_state = "bluedirtychess2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"GG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
- color = "#A47449";
- dir = 8;
- layer = 4.1
+/obj/structure/barricade/tentclothedge{
+ pixel_y = -4
},
-/obj/machinery/light/small,
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/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,
@@ -11175,9 +11820,18 @@
},
/area/f13/building/powered)
"GQ" = (
-/obj/structure/flora/tree/pine,
-/turf/open/indestructible/ground/outside/snow,
+<<<<<<< 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
@@ -11215,6 +11869,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,
@@ -11244,12 +11902,15 @@
icon_state = "bluedirtychess2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"Hb" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -11285,12 +11946,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,
@@ -11366,11 +12021,15 @@
},
/area/f13/building/powered)
"Hs" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table/wood/settler,
-/obj/effect/spawner/lootdrop/f13/armor/random,
+<<<<<<< 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/ambientlighting/building/g)
+/area/f13/ncr)
"Ht" = (
/obj/structure/destructible/tribal_torch/lit,
/obj/structure/railing/corner{
@@ -11384,19 +12043,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,
@@ -11568,6 +12214,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{
@@ -11580,12 +12233,22 @@
},
/area/f13/building/powered)
"HX" = (
-/obj/structure/railing{
- color = "#A47449";
- dir = 1
+<<<<<<< Updated upstream
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
},
-/turf/open/transparent/openspace,
-/area/f13/ncr)
+/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,
/turf/open/floor/wood_fancy,
@@ -11609,10 +12272,12 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"Ib" = (
-/obj/structure/fluff/rails,
-/turf/open/floor/plating/dirt,
-/area/f13/caves)
+/turf/open/floor/wood_wide,
+/area/f13/ambientlighting/building/j)
+=======
+>>>>>>> Stashed changes
"Ic" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/drip,
@@ -11626,6 +12291,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"
@@ -11634,20 +12306,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
- },
-/turf/open/floor/plating/f13/outside/roof/wood/old,
-/area/f13/wasteland)
"Ii" = (
/obj/structure/sign/warning/fire,
/turf/closed/indestructible/f13vaultrusted,
@@ -11691,10 +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/dirt/dust,
-/turf/open/floor/holofloor/carpet,
-/area/f13/ambientlighting/building/g)
+/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,
@@ -11721,12 +12388,18 @@
/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/effect/decal/cleanable/dirt,
-/turf/open/floor/wood_common{
- icon_state = "common-broken5"
- },
-/area/f13/ncr)
+/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,
/obj/structure/table_frame,
@@ -11743,6 +12416,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,
@@ -11816,10 +12495,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
@@ -11835,10 +12510,15 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"IN" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/securitron/sentrybot,
@@ -11958,15 +12638,13 @@
},
/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)
+<<<<<<< Updated upstream
"Je" = (
-/turf/open/transparent/openspace,
-/area/f13/ambientlighting/building/g)
+/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,
@@ -11996,18 +12674,17 @@
/obj/structure/table,
/turf/open/floor/wood_fancy,
/area/f13/clinic)
+<<<<<<< Updated upstream
+=======
"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
+/obj/machinery/door/unpowered/secure_NCR{
+ name = "Veteran Ranger's Lodging"
+ },
+/turf/open/floor/f13/wood{
+ color = "#c5bab2"
},
-/turf/open/floor/wood_common,
/area/f13/ncr)
+>>>>>>> Stashed changes
"Jm" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -12063,12 +12740,16 @@
icon_state = "floordirty"
},
/area/f13/building/abandoned/j)
+<<<<<<< Updated upstream
+=======
"Ju" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 4
- },
-/turf/open/transparent/openspace,
-/area/f13/wasteland)
+/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,
@@ -12115,15 +12796,14 @@
/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)
+<<<<<<< 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,
@@ -12199,6 +12879,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,
@@ -12237,12 +12922,15 @@
/obj/structure/window/fulltile/house,
/turf/open/indestructible/ground/outside/desert,
/area/f13/building/abandoned/m)
+<<<<<<< Updated upstream
+=======
"JW" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood_wide{
- icon_state = "wide-broken5"
- },
-/area/f13/ncr)
+/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,
@@ -12263,6 +12951,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,
@@ -12306,10 +12998,15 @@
dir = 1
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"Kj" = (
-/obj/structure/flora/brushwood,
-/turf/open/floor/plating/dirt,
-/area/f13/caves)
+/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
@@ -12349,15 +13046,13 @@
"Kq" = (
/turf/open/transparent/openspace,
/area/f13/ambientlighting/building/d)
+<<<<<<< Updated upstream
+=======
"Kr" = (
-/obj/structure/railing/corner{
- color = "#A47449";
- dir = 8
- },
-/turf/open/floor/wood_common{
- icon_state = "common-broken5"
- },
-/area/f13/ncr)
+/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{
@@ -12433,12 +13128,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{
@@ -12455,24 +13144,19 @@
},
/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"
+<<<<<<< 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"
},
-/area/f13/caves)
+/obj/machinery/light,
+/turf/open/floor/wood_wide,
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/j)
"KK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -12493,10 +13177,17 @@
/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)
+<<<<<<< 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"
@@ -12548,13 +13239,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,
@@ -12574,11 +13258,19 @@
dir = 8
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"Lb" = (
/obj/structure/simple_door/house,
/turf/open/floor/wood_common/wood_common_light,
@@ -12730,9 +13422,16 @@
/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)
+<<<<<<< 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,
@@ -12766,10 +13465,17 @@
},
/turf/closed/indestructible/f13vaultrusted,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"LD" = (
-/obj/structure/barricade/wooden,
-/turf/closed/wall/f13/wood,
-/area/f13/ncr)
+/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)
@@ -12838,12 +13544,15 @@
/obj/machinery/photocopier,
/turf/open/floor/carpet/royalblack,
/area/f13/clinic)
+<<<<<<< Updated upstream
+=======
"LO" = (
/obj/effect/turf_decal/weather/dirt{
- dir = 10
+ dir = 1
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"LQ" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood/splatter,
@@ -12890,12 +13599,18 @@
icon_state = "bluerustysolid"
},
/area/f13/followers)
+<<<<<<< Updated upstream
"LW" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood{
- icon_state = "housewood2-broken"
+/obj/structure/simple_door/tentflap_cloth{
+ pixel_y = -3
+ },
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 1
},
-/area/f13/ambientlighting/building/g)
+/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"
@@ -12905,14 +13620,13 @@
"LY" = (
/turf/open/floor/plating/f13/outside/roof,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"LZ" = (
-/obj/structure/railing{
- color = "#A47449";
- dir = 8;
- layer = 4.1
- },
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/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,
@@ -12943,13 +13657,14 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"Mg" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6;
- icon_state = "snow_corner"
+/turf/open/indestructible/ground/outside/dirt{
+ icon_state = "dirt"
},
-/turf/open/transparent/openspace,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"Mh" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/food/drinks/bottle/fernet{
@@ -12969,25 +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" = (
-/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)
+/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,
@@ -13027,15 +13738,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,
@@ -13081,6 +13783,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{
@@ -13088,12 +13794,27 @@
},
/area/f13/building/powered)
"MF" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 5;
- icon_state = "snow_corner"
+<<<<<<< Updated upstream
+/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)
+=======
+/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"
},
-/turf/open/transparent/openspace,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"MG" = (
/obj/structure/dresser,
/turf/open/floor/carpet/black,
@@ -13145,14 +13866,18 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"MP" = (
-/obj/structure/fluff{
- icon = 'icons/fallout/objects/cave_decor.dmi';
- icon_state = "support_beams";
- name = "support wall"
+/obj/structure/simple_door/tentflap_cloth{
+ pixel_y = -3
},
-/turf/closed/mineral/random/low_chance,
-/area/f13/wasteland)
+/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";
@@ -13199,12 +13924,20 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"MZ" = (
/obj/structure/barricade/sandbags,
/obj/effect/decal/cleanable/dirt,
@@ -13212,16 +13945,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{
@@ -13238,6 +13961,7 @@
"Nd" = (
/turf/open/floor/carpet/blue,
/area/f13/followers)
+<<<<<<< Updated upstream
"Ne" = (
/obj/structure/closet/crate/footlocker{
anchored = 1
@@ -13250,9 +13974,20 @@
name = "dirty floor"
},
/area/f13/brotherhood/offices1st)
+=======
"Nf" = (
-/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/dirt{
+ dir = 10;
+ icon_state = "dirt"
+ },
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"Ng" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/simple_door/interior,
@@ -13328,12 +14063,13 @@
},
/turf/open/floor/wood_common,
/area/f13/followers)
+<<<<<<< Updated upstream
+=======
"Nt" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
- },
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/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)
@@ -13347,19 +14083,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;
@@ -13373,15 +14096,21 @@
},
/area/f13/building/powered)
"Ny" = (
-/obj/machinery/shower{
- dir = 1
+<<<<<<< Updated upstream
+/obj/item/bedsheet/blanket,
+/obj/structure/bed,
+/turf/open/floor/f13/wood,
+/area/f13/ncr)
+=======
+/obj/structure/barricade/tentclothcorner{
+ dir = 4
},
-/obj/structure/curtain,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13{
- icon_state = "bar"
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 5
},
-/area/f13/ambientlighting/building/g)
+/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,
@@ -13392,9 +14121,19 @@
},
/area/f13/brotherhood/offices1st)
"NA" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/turf/open/floor/plating/dirt,
-/area/f13/caves)
+<<<<<<< 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)
"NB" = (
/obj/structure/railing{
color = "#A47449";
@@ -13430,10 +14169,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"
@@ -13445,10 +14180,18 @@
/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,
+<<<<<<< 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,
@@ -13459,9 +14202,21 @@
/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)
+<<<<<<< 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"
+ },
+/area/f13/ncr)
"NQ" = (
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/dirt,
@@ -13508,11 +14263,17 @@
dir = 8
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"NZ" = (
/obj/machinery/light/broken{
dir = 8
@@ -13604,21 +14365,25 @@
icon_state = "common-broken3"
},
/area/maintenance/bar)
+<<<<<<< Updated upstream
+=======
"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)
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/f13/ncrspecialist,
+/turf/open/floor/f13/wood,
+/area/f13/ncr)
"On" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/chair/sofa{
- dir = 8
+/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 = "oakfloor3-broken"
+ },
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"Oo" = (
/obj/structure/railing{
color = "#A47449"
@@ -13648,9 +14413,16 @@
},
/area/f13/building/powered)
"Ot" = (
-/obj/structure/flora/grass/wasteland,
-/turf/open/floor/plating/dirt,
-/area/f13/caves)
+<<<<<<< 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,
/obj/structure/curtain{
@@ -13743,11 +14515,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
@@ -13769,15 +14538,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,
@@ -13796,17 +14556,6 @@
name = "dirty floor"
},
/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.";
- 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,
@@ -13835,20 +14584,27 @@
/obj/machinery/hydroponics/soil/pot,
/turf/open/floor/wood_common,
/area/engine/workshop)
+<<<<<<< Updated upstream
+=======
"OS" = (
-/obj/effect/turf_decal/weather/snow/corner,
-/turf/open/transparent/openspace,
-/area/f13/wasteland)
+/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/structure/obstacle/barbedwire/end{
- dir = 4
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken3"
},
-/turf/open/floor/plating/dirt/dark,
-/area/f13/caves)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"OV" = (
/obj/structure/table/reinforced,
/obj/item/storage/firstaid/brute,
@@ -13862,10 +14618,16 @@
},
/area/f13/building/powered)
"OW" = (
-/obj/structure/bed/wooden,
-/obj/item/bedsheet/blanket,
-/turf/open/floor/carpet,
-/area/f13/ncr)
+<<<<<<< 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" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/destructible/tribal_torch/wall/lit{
@@ -13882,30 +14644,14 @@
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)
-"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)
+<<<<<<< Updated upstream
+=======
"Pb" = (
-/obj/structure/railing/corner{
- color = "#A47449";
- dir = 8
- },
-/turf/open/transparent/openspace,
-/area/f13/ncr)
+/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{
@@ -13964,23 +14710,29 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/f13/outside/roof/metal,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"Pl" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6
- },
+/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/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small,
-/turf/open/floor/carpet/purple,
-/area/f13/ambientlighting/building/g)
+/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
@@ -14025,6 +14777,7 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"Pu" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -14045,10 +14798,19 @@
name = "dirty floor"
},
/area/f13/brotherhood/offices1st)
+=======
"Pv" = (
-/obj/structure/decoration/rag,
-/turf/closed/wall/f13/wood,
-/area/f13/ncr)
+/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,
@@ -14108,26 +14870,23 @@
},
/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)
-"PH" = (
-/turf/closed/wall/f13/wood/interior,
-/area/f13/ambientlighting/building/g)
+<<<<<<< Updated upstream
+=======
"PI" = (
-/turf/open/floor/wood_wide,
-/area/f13/ncr)
+/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
@@ -14241,16 +15000,17 @@
icon_state = "bluedirtychess2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"PY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/defibrillator/loaded,
-/turf/open/floor/wood_common,
+/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)
-"PZ" = (
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/transparent/openspace,
-/area/f13/caves)
+>>>>>>> Stashed changes
"Qa" = (
/obj/machinery/light/fo13colored/Red,
/obj/effect/decal/cleanable/dirt,
@@ -14329,10 +15089,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 +15260,15 @@
},
/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)
+<<<<<<< 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" = (
/obj/machinery/autolathe,
/turf/open/floor/f13{
@@ -14521,10 +15285,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{
@@ -14645,42 +15405,17 @@
},
/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)
+<<<<<<< Updated upstream
+=======
"Rg" = (
-/obj/structure/flora/grass/both{
- icon_state = "snowgrass_w"
- },
-/turf/open/indestructible/ground/outside/snow,
+/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,
@@ -14757,21 +15492,14 @@
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)
+<<<<<<< Updated upstream
"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"
@@ -14783,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,
@@ -14792,14 +15529,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,
@@ -14821,14 +15550,13 @@
},
/turf/open/floor/f13/wood,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -14849,9 +15577,19 @@
/turf/open/floor/carpet/purple,
/area/f13/bar)
"RE" = (
-/obj/structure/simple_door/wood,
+<<<<<<< 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{
@@ -14860,6 +15598,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,
@@ -14951,10 +15701,13 @@
/obj/structure/debris/v2,
/turf/closed/indestructible/f13vaultrusted,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"RS" = (
-/obj/structure/barricade/wooden/strong,
-/turf/closed/wall/f13/wood,
-/area/f13/ncr)
+/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,
@@ -15039,10 +15792,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{
@@ -15054,13 +15803,15 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"Sg" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/chair/sofa/corner{
- dir = 8
+/obj/structure/junk/small/bed,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken5"
},
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"Sh" = (
/obj/structure/fireplace,
/obj/effect/decal/cleanable/dirt,
@@ -15072,12 +15823,13 @@
},
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/e)
+<<<<<<< Updated upstream
+=======
"Sj" = (
-/obj/structure/chair/folding{
- dir = 4
- },
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/obj/structure/barricade/wooden,
+/turf/open/floor/wood_wide,
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"Sk" = (
/obj/machinery/light/small{
dir = 4;
@@ -15098,19 +15850,19 @@
/obj/machinery/light,
/turf/open/floor/wood_wide/wood_wide_light,
/area/engine/workshop)
+<<<<<<< Updated upstream
"Sn" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/junk/small/table,
-/turf/open/floor/carpet/green,
-/area/f13/ambientlighting/building/g)
+/obj/structure/fluff/railing,
+/turf/open/floor/plating/f13/outside/roof/metal/corrugated,
+/area/f13/wasteland)
+=======
"So" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/kitchenspike,
-/obj/effect/gibspawner/human/bodypartless,
-/turf/open/floor/f13{
- icon_state = "bluedirtychess2"
+/obj/structure/simple_door/tentflap_cloth{
+ pixel_y = -3
},
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/ambientlighting/building/u)
+>>>>>>> Stashed changes
"Sq" = (
/obj/structure/marker_beacon,
/turf/open/floor/plasteel/f13,
@@ -15159,11 +15911,26 @@
/turf/open/floor/wood_fancy/wood_fancy_dark,
/area/f13/bar)
"Sy" = (
-/obj/structure/simple_door/house,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+<<<<<<< Updated upstream
+/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/ambientlighting/building/g)
+=======
+/turf/closed/wall/f13/ruins,
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"Sz" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/rust,
@@ -15175,14 +15942,23 @@
/turf/open/floor/wood_common,
/area/f13/followers)
"SC" = (
-/turf/open/floor/carpet,
-/area/f13/ncr)
+<<<<<<< Updated upstream
+/obj/item/mine/stun,
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken5"
+ },
+/area/f13/wasteland)
"SD" = (
-/obj/structure/chair/folding{
- dir = 8
+/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/floor/wood_common,
-/area/f13/ncr)
+/turf/open/transparent/openspace,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"SF" = (
/obj/structure/sign/poster/official/fruit_bowl,
/turf/closed/wall/f13/wood/house,
@@ -15213,10 +15989,18 @@
icon_state = "bluedirtychess2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"SK" = (
/obj/structure/railing/corner{
color = "#A47449";
@@ -15224,10 +16008,15 @@
},
/turf/open/transparent/openspace,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"SL" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/closed/wall/f13/wood/house,
-/area/f13/ambientlighting/building/g)
+/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
@@ -15255,17 +16044,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 +16081,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 +16104,15 @@
/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)
+<<<<<<< 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,
@@ -15330,6 +16128,7 @@
},
/turf/open/floor/wood_wide,
/area/f13/followers)
+<<<<<<< Updated upstream
"Tb" = (
/obj/structure/simple_door/bunker,
/turf/open/floor/f13{
@@ -15339,12 +16138,13 @@
},
/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)
+=======
+>>>>>>> Stashed changes
"Td" = (
/turf/closed/wall/f13/wood/house,
/area/f13/building/abandoned/x)
@@ -15404,12 +16204,20 @@
},
/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,
+<<<<<<< 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
@@ -15445,10 +16253,17 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"Ts" = (
-/obj/structure/chair/folding,
-/turf/open/floor/plating/f13/outside/roof/wood/old,
-/area/f13/wasteland)
+/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,
@@ -15474,11 +16289,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{
@@ -15585,8 +16395,16 @@
/turf/open/floor/plating,
/area/f13/bar)
"TN" = (
-/turf/closed/wall/f13/wood,
-/area/f13/ncr)
+<<<<<<< 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{
dir = 1
@@ -15597,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";
@@ -15604,21 +16423,8 @@
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)
+=======
+>>>>>>> Stashed changes
"TR" = (
/obj/item/flag/bos,
/obj/effect/decal/cleanable/dirt{
@@ -15682,14 +16488,13 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/obj/item/mine/stun,
+/turf/open/floor/wood_wide,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"Ub" = (
/obj/structure/railing{
dir = 4
@@ -15739,36 +16544,23 @@
icon_state = "floordirtysolid"
},
/area/f13/building/abandoned/m)
+<<<<<<< Updated upstream
+=======
"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/structure/bed/mattress{
+ icon_state = "mattress4";
+ pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/bottle/nukashine{
- pixel_y = 5;
- pixel_x = -5
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken1"
},
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"Ui" = (
/obj/effect/decal/cleanable/dirt,
/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
@@ -15797,10 +16589,21 @@
icon_state = "floordirtysolid"
},
/area/f13/building/abandoned/n)
-"Us" = (
-/obj/structure/decoration/rag,
-/turf/closed/wall/f13/wood,
-/area/f13/caves)
+<<<<<<< Updated upstream
+"Uq" = (
+/obj/structure/fluff/railing{
+ dir = 9
+ },
+/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)
+=======
+>>>>>>> Stashed changes
"Ut" = (
/obj/structure/window/fulltile/house,
/obj/structure/curtain{
@@ -15832,15 +16635,15 @@
icon_state = "bluedirtychess2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -15907,17 +16710,15 @@
/obj/item/radio/old,
/turf/open/floor/plating/rust,
/area/f13/building/powered)
+<<<<<<< Updated upstream
"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"
+/obj/structure/chair/bench{
+ dir = 1
},
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/wasteland)
+=======
+>>>>>>> Stashed changes
"UL" = (
/obj/structure/chair/stool,
/obj/effect/decal/cleanable/dirt,
@@ -15944,18 +16745,21 @@
icon_state = "bluedirtychess2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"UP" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table,
-/turf/open/floor/f13{
- icon_state = "bluedirtychess2"
- },
-/area/f13/ambientlighting/building/g)
+/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,
/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,
@@ -16010,11 +16814,17 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"UZ" = (
-/obj/structure/railing{
- color = "#A47449"
+<<<<<<< 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"
},
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"Va" = (
/obj/structure/bed/mattress{
icon_state = "mattress5"
@@ -16029,11 +16839,15 @@
},
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/e)
+<<<<<<< Updated upstream
+=======
"Vc" = (
-/obj/structure/rack,
-/obj/item/book/granter/crafting_recipe/blueprint/service,
-/turf/open/floor/wood_wide,
-/area/f13/ncr)
+/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,
@@ -16046,13 +16860,14 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/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
@@ -16076,13 +16891,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)
@@ -16104,6 +16912,9 @@
icon_state = "floordirtysolid"
},
/area/f13/building/abandoned/j)
+"Vo" = (
+/turf/closed/wall/f13/ruins,
+/area/f13/wasteland)
"Vp" = (
/obj/machinery/shower{
dir = 4
@@ -16121,24 +16932,40 @@
},
/turf/open/floor/carpet/purple,
/area/f13/building/powered)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"Vu" = (
/obj/structure/grille/ratvar{
name = "radio antenna"
},
/turf/open/transparent/openspace,
/area/f13/building/abandoned/l)
+<<<<<<< Updated upstream
+=======
"Vv" = (
-/obj/structure/chair/sofa/left{
- color = "#475340"
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = -4;
+ pixel_x = -16
},
-/turf/open/floor/carpet/red,
-/area/f13/ncr)
+/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)
@@ -16199,11 +17026,27 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"VF" = (
-/obj/structure/simple_door/bunker/glass,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+<<<<<<< Updated upstream
+/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/ambientlighting/building/g)
+/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,
@@ -16244,6 +17087,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,
@@ -16297,10 +17144,19 @@
},
/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)
+<<<<<<< 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,
/obj/item/stack/sheet/metal/fifty,
@@ -16379,23 +17235,23 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"Wn" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/turf/open/transparent/openspace,
-/area/f13/wasteland)
+/turf/open/floor/wood_common/wood_common_dark,
+/area/f13/ambientlighting/building/u)
"Wp" = (
-/obj/structure/chair/office/dark{
- dir = 8
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = -16
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small{
- dir = 4;
- light_color = "#ff4747"
+/turf/open/floor/f13/wood{
+ icon_state = "housebase"
},
-/turf/open/floor/wood_common,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"Wr" = (
/obj/structure/railing{
color = "#A47449"
@@ -16424,12 +17280,24 @@
/obj/structure/sign/departments/science,
/turf/closed/indestructible/f13vaultrusted,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -16455,9 +17323,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 +17420,23 @@
/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"
+<<<<<<< Updated upstream
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = -16
},
-/area/f13/ambientlighting/building/g)
+/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,
/obj/effect/decal/cleanable/dirt{
@@ -16627,15 +17504,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{
@@ -16681,15 +17559,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,
@@ -16740,6 +17609,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,
@@ -16751,23 +17624,27 @@
"Xs" = (
/turf/closed/wall/f13/wood/house,
/area/maintenance/bar)
+<<<<<<< Updated upstream
"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)
+/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/effect/decal/cleanable/dirt/dust,
-/obj/item/kirbyplants/random,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+/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;
@@ -16781,6 +17658,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,
@@ -16806,16 +17686,18 @@
},
/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"
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
@@ -16856,10 +17738,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,
@@ -16878,12 +17758,16 @@
/obj/item/bedsheet/brown,
/turf/open/floor/carpet/red,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"XM" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
+/obj/structure/debris/v3{
+ pixel_x = -15;
+ pixel_y = 6
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/turf/closed/wall/f13/ruins,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"XN" = (
/obj/machinery/vending/clothing{
force_free = 1
@@ -16952,6 +17836,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{
@@ -17002,14 +17889,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,
@@ -17115,6 +17994,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,
@@ -17180,11 +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/fence/corner/wooden{
+/obj/structure/fluff/railing/corner{
dir = 8
},
-/turf/open/floor/plating/f13/outside/roof/wood/old,
+/turf/open/transparent/openspace,
+>>>>>>> Stashed changes
/area/f13/wasteland)
"YJ" = (
/obj/effect/decal/cleanable/blood/drip,
@@ -17208,13 +18102,20 @@
dir = 8
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"YO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/fo13colored/Red{
@@ -17247,11 +18148,14 @@
},
/turf/open/floor/wood_wide,
/area/f13/followers)
+<<<<<<< Updated upstream
+=======
"YT" = (
-/obj/structure/fluff/hedge,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood_common/wood_common_dark,
+/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,
@@ -17352,10 +18256,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,31 +18306,36 @@
/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)
+<<<<<<< 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" = (
-/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
+<<<<<<< Updated upstream
+/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/wood_common/wood_common_dark,
+/area/f13/ambientlighting/building/u)
+=======
+/turf/open/floor/f13/wood{
+ icon_state = "oakfloor3-broken"
},
-/turf/open/floor/plating/f13/outside/roof/wood/old,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"Zw" = (
/obj/item/storage/trash_stack{
icon_state = "trash_2"
@@ -17441,29 +18356,21 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/red,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
"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,
+=======
"ZB" = (
-/obj/structure/fence/wooden{
- pixel_x = 13
- },
-/turf/open/transparent/openspace,
-/area/f13/ncr)
+/obj/effect/decal/remains/human,
+/turf/open/indestructible/ground/outside/desert,
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"ZC" = (
/obj/structure/railing{
dir = 1
},
/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
@@ -17479,6 +18386,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,
@@ -17494,14 +18411,7 @@
/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)
+<<<<<<< Updated upstream
"ZN" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -17515,24 +18425,24 @@
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)
-"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"
+<<<<<<< Updated upstream
+"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{
@@ -17544,6 +18454,8 @@
smooth = 1
},
/area/f13/brotherhood/offices1st)
+=======
+>>>>>>> Stashed changes
"ZW" = (
/obj/structure/closet/wardrobe/cargotech,
/turf/open/floor/f13{
@@ -17919,47 +18831,90 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-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
+<<<<<<< Updated upstream
+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
+=======
+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
@@ -18026,103 +18981,203 @@ 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
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+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
@@ -18221,47 +19276,90 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-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
+<<<<<<< Updated upstream
+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
+=======
+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
@@ -18328,103 +19426,203 @@ 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
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+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
@@ -18523,12 +19721,77 @@ xm
xm
xm
xm
+EI
+<<<<<<< Updated upstream
+ZA
+ZA
+iX
+iX
+ZA
+ZA
+ZA
+ZA
+ZA
+ZA
+ZA
+ZA
+iX
+iX
+=======
+aD
+aD
+oT
+oT
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+oT
+oT
+>>>>>>> Stashed changes
xm
xm
xm
xm
xm
xm
+WC
+WC
+rt
+rt
+WC
+WC
+WC
+zi
+<<<<<<< Updated upstream
+ZA
+ZA
+ZA
+ZA
+ZA
+ZA
+ZA
+ZA
+ZA
+ZA
+ZA
+=======
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+>>>>>>> Stashed changes
xm
xm
xm
@@ -18573,6 +19836,224 @@ 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
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+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
@@ -18607,18 +20088,18 @@ xm
xm
xm
xm
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+EI
+"}
+(5,1,1) = {"
+EI
yT
yT
yT
@@ -18637,95 +20118,118 @@ 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
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+<<<<<<< Updated upstream
+iX
+iX
+ZA
+ZA
+ZA
+ZA
+ZA
+iX
+iX
+iX
+=======
+oT
+oT
+aD
+aD
+aD
+aD
+aD
+oT
+oT
+oT
+>>>>>>> Stashed changes
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+<<<<<<< Updated upstream
+NP
+hM
+tk
+tk
+tk
+tk
+NP
+zi
+iX
+ZA
+ZA
+ZA
+ZA
+ZA
+ZA
+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
xm
xm
@@ -18768,10 +20272,6 @@ xm
xm
xm
xm
-EI
-"}
-(5,1,1) = {"
-EI
yT
yT
yT
@@ -18783,6 +20283,214 @@ yT
yT
yT
yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+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
xm
xm
xm
@@ -18823,6 +20531,22 @@ xm
xm
xm
xm
+EI
+"}
+(6,1,1) = {"
+EI
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+xm
xm
xm
xm
@@ -18869,6 +20593,75 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+iX
+iX
+iX
+ZA
+ZA
+iX
+iX
+=======
+oT
+oT
+oT
+aD
+aD
+oT
+oT
+>>>>>>> Stashed changes
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+WC
+rt
+<<<<<<< Updated upstream
+VW
+tk
+XD
+tk
+NP
+zi
+iX
+iX
+ZA
+ZA
+ZA
+ZA
+ZA
+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
+xm
xm
xm
xm
@@ -18932,104 +20725,200 @@ yT
yT
yT
yT
+<<<<<<< Updated upstream
+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
+=======
+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
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
@@ -19072,7 +20961,7 @@ xm
xm
EI
"}
-(6,1,1) = {"
+(7,1,1) = {"
EI
yT
yT
@@ -19134,6 +21023,19 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+iX
+iX
+iX
+iX
+iX
+=======
+oT
+oT
+oT
+oT
+oT
+>>>>>>> Stashed changes
xm
xm
xm
@@ -19144,6 +21046,44 @@ xm
xm
xm
xm
+WC
+<<<<<<< Updated upstream
+wM
+tk
+La
+wM
+rt
+zi
+iX
+iX
+iX
+ZA
+ZA
+ZA
+ZA
+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
@@ -19154,29 +21094,7 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
+<<<<<<< Updated upstream
xm
xm
xm
@@ -19234,102 +21152,120 @@ yT
yT
yT
yT
+xX
+xX
+xX
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
-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
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+=======
+>>>>>>> Stashed changes
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
@@ -19358,35 +21294,140 @@ 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
xm
xm
-EI
-"}
-(7,1,1) = {"
-EI
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
xm
xm
xm
@@ -19414,6 +21455,21 @@ xm
xm
xm
xm
+EI
+"}
+(8,1,1) = {"
+EI
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
xm
xm
xm
@@ -19465,10 +21521,38 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
xm
+WC
+<<<<<<< Updated upstream
+wM
+tk
+yA
+to
+rt
+zi
+iX
+iX
+iX
+iX
+ZA
+ZA
+ZA
+ZA
+ZA
+ZA
+ZA
xm
xm
xm
@@ -19535,7 +21619,6 @@ yT
yT
yT
yT
-yT
xm
xm
xm
@@ -19543,95 +21626,132 @@ xm
xm
xm
xm
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-gw
-Zt
-Zt
-Zt
-Zt
-jE
-QM
-Wn
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+=======
+dD
+aW
+yO
+EF
+rt
+zi
+oT
+oT
+oT
+oT
+aD
+aD
+aD
+aD
+aD
+aD
+aD
xm
-IM
-IM
-TN
-TN
-Au
-NI
-wP
-qJ
-IM
-IM
xm
+>>>>>>> Stashed changes
xm
xm
xm
xm
-zy
-TN
-TN
-TN
-oW
-TN
-TN
-TN
-IM
-zy
-xW
xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
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
@@ -19661,6 +21781,118 @@ 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
@@ -19669,26 +21901,20 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
xm
xm
-EI
-"}
-(8,1,1) = {"
-EI
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
-yT
xm
xm
xm
@@ -19716,6 +21942,21 @@ xm
xm
xm
xm
+EI
+"}
+(9,1,1) = {"
+EI
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
xm
xm
xm
@@ -19767,9 +22008,56 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+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
+ZA
+ZA
+ZA
+ZA
+=======
+oT
+oT
+aD
+aD
+aD
+aD
+aD
+>>>>>>> Stashed changes
xm
xm
xm
@@ -19835,115 +22123,197 @@ yT
yT
yT
yT
-yT
-yT
-xm
-xm
-xm
-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
xm
xm
xm
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+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
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -19978,7 +22348,7 @@ xm
xm
EI
"}
-(9,1,1) = {"
+(10,1,1) = {"
EI
yT
yT
@@ -20042,37 +22412,54 @@ 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
+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
@@ -20147,105 +22534,186 @@ 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
-mP
-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
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+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
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -20280,7 +22748,7 @@ xm
xm
EI
"}
-(10,1,1) = {"
+(11,1,1) = {"
EI
yT
yT
@@ -20344,9 +22812,51 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
+cw
+zi
+rt
+Oy
+<<<<<<< Updated upstream
+wN
+mP
+=======
+hM
+ec
+>>>>>>> Stashed changes
+rt
+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
@@ -20392,35 +22902,6 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-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
@@ -20451,95 +22932,159 @@ 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
-bR
-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
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+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
@@ -20548,6 +23093,21 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -20582,7 +23142,7 @@ xm
xm
EI
"}
-(11,1,1) = {"
+(12,1,1) = {"
EI
yT
yT
@@ -20594,36 +23154,6 @@ yT
yT
yT
yT
-yT
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
xm
xm
xm
@@ -20675,8 +23205,47 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
+cw
+zi
+WC
+WC
+rt
+WC
+WC
+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
@@ -20752,95 +23321,157 @@ 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
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+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
@@ -20850,6 +23481,21 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -20884,7 +23530,7 @@ xm
xm
EI
"}
-(12,1,1) = {"
+(13,1,1) = {"
EI
yT
yT
@@ -20947,37 +23593,51 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-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
+<<<<<<< Updated upstream
+WQ
+Gf
+AI
+=======
+aY
+As
+fb
+>>>>>>> Stashed changes
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+<<<<<<< Updated upstream
+iX
+iX
+iX
+ZA
+ZA
+=======
+oT
+oT
+oT
+aD
+aD
+>>>>>>> Stashed changes
xm
xm
xm
@@ -21054,94 +23714,155 @@ xm
xm
xm
xm
-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
-xm
-xm
-xm
-xm
-xm
-xm
-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
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+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
@@ -21152,6 +23873,21 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -21186,7 +23922,7 @@ xm
xm
EI
"}
-(13,1,1) = {"
+(14,1,1) = {"
EI
yT
yT
@@ -21249,6 +23985,43 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+<<<<<<< Updated upstream
+qy
+vd
+uQ
+=======
+Pv
+Gq
+qG
+>>>>>>> Stashed changes
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+lC
xm
xm
xm
@@ -21295,6 +24068,25 @@ xm
xm
xm
xm
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+xm
xm
xm
xm
@@ -21307,153 +24099,176 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+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
+Ao
+TJ
+cz
+Ao
+Ao
+Ao
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
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-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
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -21488,7 +24303,7 @@ xm
xm
EI
"}
-(14,1,1) = {"
+(15,1,1) = {"
EI
yT
yT
@@ -21551,10 +24366,55 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+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
xm
xm
@@ -21602,33 +24462,6 @@ xm
xm
xm
xm
-xm
-xm
-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
@@ -21659,103 +24492,175 @@ 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
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+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
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
@@ -21790,7 +24695,7 @@ xm
xm
EI
"}
-(15,1,1) = {"
+(16,1,1) = {"
EI
yT
yT
@@ -21800,28 +24705,6 @@ yT
yT
yT
yT
-yT
-yT
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
xm
xm
xm
@@ -21875,6 +24758,21 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+<<<<<<< Updated upstream
+Sn
+=======
+Nt
+>>>>>>> Stashed changes
xm
xm
xm
@@ -21884,6 +24782,25 @@ xm
xm
xm
xm
+cw
+zi
+WC
+<<<<<<< Updated upstream
+AV
+qT
+XI
+Ha
+lf
+=======
+FM
+RB
+XI
+bi
+ug
+>>>>>>> Stashed changes
+WC
+zi
+lC
xm
xm
xm
@@ -21961,103 +24878,175 @@ 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
+<<<<<<< Updated upstream
+xX
+xX
+xX
+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
+=======
+FO
+FO
+FO
+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
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
@@ -22092,63 +25081,10 @@ xm
xm
EI
"}
-(16,1,1) = {"
+(17,1,1) = {"
EI
yT
yT
-yT
-yT
-yT
-yT
-yT
-yT
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
xm
xm
xm
@@ -22216,6 +25152,12 @@ xm
xm
xm
xm
+Zk
+<<<<<<< Updated upstream
+MY
+=======
+Gf
+>>>>>>> Stashed changes
xm
xm
xm
@@ -22226,74 +25168,24 @@ 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
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-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
+cw
+zi
+zi
+rt
+<<<<<<< Updated upstream
+QI
+Hs
+XI
+qN
+=======
+Kj
+AI
+XI
+dm
+>>>>>>> Stashed changes
+rt
+zi
+lC
xm
xm
xm
@@ -22306,50 +25198,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
@@ -22384,6 +25233,23 @@ xm
xm
xm
xm
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
+yT
xm
xm
xm
@@ -22392,28 +25258,179 @@ xm
xm
xm
xm
-EI
-"}
-(17,1,1) = {"
-EI
-yT
-yT
xm
xm
xm
xm
xm
+<<<<<<< Updated upstream
+xX
+xX
+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
+=======
+FO
+FO
+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
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
@@ -22446,6 +25463,10 @@ xm
xm
xm
xm
+EI
+"}
+(18,1,1) = {"
+EI
xm
xm
xm
@@ -22515,6 +25536,13 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+kq
+Gf
+=======
+Zu
+As
+>>>>>>> Stashed changes
xm
xm
xm
@@ -22525,6 +25553,28 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ZP
+fR
+zi
+iL
+Vs
+EA
+XI
+vo
+=======
+YH
+uJ
+zi
+nF
+bo
+Ol
+XI
+CX
+>>>>>>> Stashed changes
+rt
+zi
+lC
xm
xm
xm
@@ -22535,23 +25585,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
@@ -22567,19 +25600,6 @@ xm
xm
xm
xm
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-xE
-xE
-xE
-xE
-FO
-FO
-FO
xm
xm
xm
@@ -22602,6 +25622,10 @@ xm
xm
xm
xm
+yT
+yT
+yT
+yT
xm
xm
xm
@@ -22610,47 +25634,18 @@ 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
+yT
+yT
+yT
+xm
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -22658,19 +25653,170 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+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
+=======
+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
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
@@ -22694,10 +25840,6 @@ xm
xm
xm
xm
-EI
-"}
-(18,1,1) = {"
-EI
xm
xm
xm
@@ -22709,6 +25851,10 @@ xm
xm
xm
xm
+EI
+"}
+(19,1,1) = {"
+EI
xm
xm
xm
@@ -22778,6 +25924,13 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ko
+Gf
+=======
+mk
+As
+>>>>>>> Stashed changes
xm
xm
xm
@@ -22789,6 +25942,23 @@ xm
xm
xm
xm
+cw
+zi
+rt
+<<<<<<< Updated upstream
+Ny
+XI
+XI
+hy
+=======
+NL
+XI
+XI
+hv
+>>>>>>> Stashed changes
+WC
+zi
+lC
xm
xm
xm
@@ -22832,15 +26002,14 @@ xm
xm
xm
xm
+lw
+lw
+lw
xm
xm
xm
xm
xm
-yT
-yT
-yT
-yT
xm
xm
xm
@@ -22869,89 +26038,170 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+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
-Zt
-Zt
-Zt
-Zt
-xE
-xE
-Nf
-Nf
-Nf
+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
+=======
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+fL
+FO
FO
-py
-TN
-oA
-oA
-mg
LD
-LZ
-GG
-Pv
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
+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
xm
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
-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
@@ -22983,6 +26233,10 @@ xm
xm
xm
xm
+EI
+"}
+(20,1,1) = {"
+EI
xm
xm
xm
@@ -22996,10 +26250,6 @@ xm
xm
xm
xm
-EI
-"}
-(19,1,1) = {"
-EI
xm
xm
xm
@@ -23056,6 +26306,13 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+Gf
+Gf
+=======
+As
+As
+>>>>>>> Stashed changes
xm
xm
xm
@@ -23067,6 +26324,23 @@ xm
xm
xm
xm
+cw
+zi
+WC
+<<<<<<< Updated upstream
+gE
+XI
+XI
+lD
+=======
+JD
+XI
+XI
+QI
+>>>>>>> Stashed changes
+WC
+zi
+lC
xm
xm
xm
@@ -23110,6 +26384,9 @@ xm
xm
xm
xm
+lw
+lw
+lw
xm
xm
xm
@@ -23125,6 +26402,9 @@ xm
xm
xm
xm
+yT
+yT
+yT
xm
xm
xm
@@ -23135,15 +26415,141 @@ xm
xm
xm
xm
-lw
-lw
-lw
xm
xm
xm
xm
xm
xm
+<<<<<<< Updated upstream
+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
+=======
+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
@@ -23151,14 +26557,28 @@ xm
xm
xm
xm
+Ao
+Ao
+Ao
+yS
+Ao
+Ao
+zG
+Ao
xm
xm
-yT
-yT
-yT
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -23173,30 +26593,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
@@ -23216,43 +26613,14 @@ xm
xm
xm
xm
+EI
+"}
+(21,1,1) = {"
+EI
xm
xm
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
@@ -23298,10 +26666,6 @@ xm
xm
xm
xm
-EI
-"}
-(20,1,1) = {"
-EI
xm
xm
xm
@@ -23322,6 +26686,12 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+vd
+=======
+Gq
+>>>>>>> Stashed changes
+Ql
xm
xm
xm
@@ -23333,6 +26703,24 @@ xm
xm
xm
xm
+cw
+zi
+WC
+<<<<<<< Updated upstream
+vo
+GV
+XI
+vo
+am
+=======
+CX
+eq
+XI
+CX
+YT
+>>>>>>> Stashed changes
+zi
+lC
xm
xm
xm
@@ -23376,6 +26764,9 @@ xm
xm
xm
xm
+lw
+lw
+lw
xm
xm
xm
@@ -23391,6 +26782,9 @@ xm
xm
xm
xm
+yT
+yT
+yT
xm
xm
xm
@@ -23409,6 +26803,131 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+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
+=======
+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
@@ -23417,11 +26936,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
@@ -23437,9 +26972,6 @@ xm
xm
xm
xm
-lw
-lw
-lw
xm
xm
xm
@@ -23455,13 +26987,14 @@ xm
xm
xm
xm
-yT
-yT
-yT
xm
xm
xm
xm
+EI
+"}
+(22,1,1) = {"
+EI
xm
xm
xm
@@ -23476,29 +27009,7 @@ 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
@@ -23513,47 +27024,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
@@ -23591,6 +27064,13 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+qy
+YN
+=======
+Pv
+ac
+>>>>>>> Stashed changes
xm
xm
xm
@@ -23600,14 +27080,29 @@ xm
xm
xm
xm
-EI
-"}
-(21,1,1) = {"
-EI
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
@@ -23666,6 +27161,14 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -23681,6 +27184,67 @@ 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
+=======
+>>>>>>> Stashed changes
xm
xm
xm
@@ -23690,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
@@ -23742,6 +27323,11 @@ xm
lw
lw
lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -23757,104 +27343,65 @@ xm
xm
xm
xm
-yT
-yT
-yT
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-Zt
-xE
-xE
-Nf
-Nf
-op
-Aq
-dU
-eO
-fq
-Nf
-Nf
-oA
-fR
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
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
+fL
+fL
+il
+cr
+cr
+So
+Lx
+zR
+zR
+zR
+zR
+zR
+gs
+mp
+hx
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
+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
@@ -23864,10 +27411,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
@@ -23904,7 +27468,7 @@ xm
xm
EI
"}
-(22,1,1) = {"
+(23,1,1) = {"
EI
xm
xm
@@ -23973,6 +27537,14 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -23980,24 +27552,20 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
+cw
+zi
+WC
+XI
+XI
+Fz
+<<<<<<< Updated upstream
+AP
+=======
+OS
+>>>>>>> Stashed changes
+rt
+zi
+lC
xm
xm
xm
@@ -24081,81 +27649,125 @@ 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
+<<<<<<< Updated upstream
+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
+=======
+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
@@ -24166,10 +27778,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
@@ -24206,7 +27835,7 @@ xm
xm
EI
"}
-(23,1,1) = {"
+(24,1,1) = {"
EI
xm
xm
@@ -24275,6 +27904,20 @@ xm
xm
xm
xm
+zi
+OE
+OE
+<<<<<<< Updated upstream
+Vo
+Vo
+Vo
+=======
+Sy
+Sy
+Sy
+>>>>>>> Stashed changes
+OE
+zi
xm
xm
xm
@@ -24282,24 +27925,23 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
+cw
+zi
+rt
+<<<<<<< Updated upstream
+vo
+GV
+XI
+vo
+=======
+CX
+eq
+XI
+CX
+>>>>>>> Stashed changes
+rt
+zi
+lC
xm
xm
xm
@@ -24383,80 +28025,123 @@ xm
xm
xm
xm
-xm
-xm
-xE
-xE
-Nf
-Pb
-TN
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+It
+jr
+wJ
+xX
+xX
+pg
+sG
hl
-xf
-eO
-lY
+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
+=======
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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+Ve
+zf
+fL
+FO
+FO
+iD
+tt
+ZB
+cN
+Nf
+zR
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
+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
@@ -24468,10 +28153,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
@@ -24508,7 +28210,7 @@ xm
xm
EI
"}
-(24,1,1) = {"
+(25,1,1) = {"
EI
xm
xm
@@ -24577,6 +28279,21 @@ xm
xm
xm
xm
+zi
+OE
+<<<<<<< Updated upstream
+cr
+cr
+cr
+cr
+=======
+yc
+yc
+yc
+yc
+>>>>>>> Stashed changes
+OE
+zi
xm
xm
xm
@@ -24584,24 +28301,24 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
+cw
+zi
+<<<<<<< Updated upstream
+Tc
+bQ
+Fz
+XI
+DD
+=======
+de
+xS
+Fz
+XI
+lD
+>>>>>>> Stashed changes
+WC
+zi
+lC
xm
xm
xm
@@ -24686,21 +28403,120 @@ xm
xm
xm
xm
-xm
-Zt
-xE
-xE
-xE
+<<<<<<< Updated upstream
+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
+=======
+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
-uI
-hL
-dc
FO
FO
-zf
-SD
-fR
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+>>>>>>> Stashed changes
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -24709,50 +28525,29 @@ 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
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+xm
+xm
xm
xm
xm
@@ -24785,6 +28580,14 @@ xm
xm
xm
xm
+EI
+"}
+(26,1,1) = {"
+EI
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -24808,10 +28611,6 @@ xm
xm
xm
xm
-EI
-"}
-(25,1,1) = {"
-EI
xm
xm
xm
@@ -24852,11 +28651,49 @@ xm
xm
xm
xm
+zi
+OE
+<<<<<<< Updated upstream
+cr
+cr
+cr
+cr
+=======
+yc
+yc
+yc
+yc
+>>>>>>> Stashed changes
+OE
+zi
xm
xm
xm
xm
xm
+<<<<<<< Updated upstream
+fb
+no
+Ed
+zi
+iL
+XI
+Fz
+SY
+=======
+XD
+no
+nS
+zi
+nF
+XI
+Fz
+cO
+>>>>>>> Stashed changes
+WC
+WC
+zi
+lC
xm
xm
xm
@@ -24901,6 +28738,12 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -24911,6 +28754,14 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -24928,6 +28779,122 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+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
+=======
+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
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -24940,6 +28907,17 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -24964,14 +28942,6 @@ xm
xm
xm
xm
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-lw
xm
xm
xm
@@ -24982,6 +28952,10 @@ xm
xm
xm
xm
+EI
+"}
+(27,1,1) = {"
+EI
xm
xm
xm
@@ -24990,18 +28964,6 @@ xm
xm
xm
xm
-Zt
-Zt
-xE
-xE
-TN
-TN
-TN
-FO
-FO
-FO
-FO
-FO
xm
xm
xm
@@ -25011,43 +28973,12 @@ 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
@@ -25092,11 +29023,45 @@ xm
xm
xm
xm
+zi
+<<<<<<< Updated upstream
+Vo
+lE
+Ie
+cr
+cr
+=======
+Sy
+cu
+Aj
+yc
+yc
+>>>>>>> Stashed changes
+OE
+zi
xm
xm
xm
xm
xm
+cw
+zi
+zi
+zi
+WC
+<<<<<<< Updated upstream
+BV
+Fz
+vo
+=======
+jE
+Fz
+CX
+>>>>>>> Stashed changes
+rt
+zi
+zi
+lC
xm
xm
xm
@@ -25104,16 +29069,33 @@ xm
xm
xm
xm
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
xm
xm
xm
xm
xm
xm
-EI
-"}
-(26,1,1) = {"
-EI
xm
xm
xm
@@ -25124,6 +29106,12 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -25134,6 +29122,14 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -25151,7 +29147,121 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+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
+=======
+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
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -25164,6 +29274,17 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -25198,6 +29319,10 @@ xm
xm
xm
xm
+EI
+"}
+(28,1,1) = {"
+EI
xm
xm
xm
@@ -25250,12 +29375,6 @@ xm
xm
xm
xm
-lw
-lw
-lw
-lw
-lw
-lw
xm
xm
xm
@@ -25266,24 +29385,56 @@ xm
xm
xm
xm
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-lw
xm
xm
xm
xm
xm
+zi
+<<<<<<< Updated upstream
+Vo
+cr
+lE
+lE
+cr
+Vo
+=======
+Sy
+yc
+cu
+cu
+yc
+Sy
+>>>>>>> Stashed changes
+zi
xm
xm
xm
xm
xm
+cw
+zi
+zi
+WC
+<<<<<<< Updated upstream
+Rt
+Zs
+XI
+dv
+rt
+zi
+Uq
+yK
+=======
+XM
+Tm
+XI
+nl
+rt
+zi
+DD
+SC
+>>>>>>> Stashed changes
xm
xm
xm
@@ -25291,65 +29442,36 @@ xm
xm
xm
xm
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
+qE
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
@@ -25357,6 +29479,12 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -25367,6 +29495,13 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -25386,8 +29521,118 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+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
+=======
+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
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -25400,6 +29645,13 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -25412,10 +29664,6 @@ xm
xm
xm
xm
-EI
-"}
-(27,1,1) = {"
-EI
xm
xm
xm
@@ -25442,6 +29690,10 @@ xm
xm
xm
xm
+EI
+"}
+(29,1,1) = {"
+EI
xm
xm
xm
@@ -25509,6 +29761,52 @@ xm
xm
xm
xm
+zi
+OE
+<<<<<<< Updated upstream
+cr
+cr
+lE
+cr
+Vo
+zi
+Zk
+MY
+Gf
+Gf
+cO
+AI
+zi
+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
+zi
+lC
+xm
+xm
xm
xm
xm
@@ -25575,8 +29873,6 @@ lw
lw
lw
lw
-lw
-xm
xm
xm
xm
@@ -25596,74 +29892,117 @@ xm
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
+<<<<<<< Updated upstream
+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
+=======
+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
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -25675,6 +30014,13 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -25716,7 +30062,7 @@ xm
xm
EI
"}
-(28,1,1) = {"
+(30,1,1) = {"
EI
xm
xm
@@ -25785,30 +30131,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
+zi
+OE
+<<<<<<< Updated upstream
+cr
+cr
+cr
+cr
+Vo
+zi
+qy
+As
+vd
+dX
+qy
+Bu
+zi
+zi
+rt
+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
xm
xm
xm
@@ -25896,76 +30264,114 @@ xm
xm
xm
xm
-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
+<<<<<<< Updated upstream
+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
+=======
+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
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -25977,6 +30383,13 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -26018,7 +30431,7 @@ xm
xm
EI
"}
-(29,1,1) = {"
+(31,1,1) = {"
EI
xm
xm
@@ -26087,30 +30500,45 @@ xm
xm
xm
xm
+zi
+OE
+<<<<<<< Updated upstream
+cr
+cr
+cr
+cr
+=======
+yc
+yc
+yc
+yc
+>>>>>>> Stashed changes
+OE
+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
+cw
+zi
+zi
+WC
+<<<<<<< Updated upstream
+Lx
+sc
+XI
+qo
+iL
+=======
+Hs
+mg
+XI
+dU
+nF
+>>>>>>> Stashed changes
+zi
+lC
xm
xm
xm
@@ -26199,66 +30627,85 @@ xm
xm
xm
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
+<<<<<<< Updated upstream
+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
+=======
+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
@@ -26268,6 +30715,21 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -26279,6 +30741,13 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -26320,7 +30789,7 @@ xm
xm
EI
"}
-(30,1,1) = {"
+(32,1,1) = {"
EI
xm
xm
@@ -26389,11 +30858,50 @@ xm
xm
xm
xm
+zi
+<<<<<<< Updated upstream
+Vo
+cr
+cr
+cr
+lE
+=======
+Sy
+yc
+yc
+yc
+cu
+>>>>>>> Stashed changes
+OE
+zi
xm
xm
xm
xm
xm
+<<<<<<< Updated upstream
+ZP
+fR
+zi
+iL
+AZ
+Fz
+bo
+iL
+Tc
+=======
+YH
+uJ
+zi
+nF
+VW
+Fz
+hw
+nF
+de
+>>>>>>> Stashed changes
+zi
+lC
xm
xm
xm
@@ -26402,46 +30910,27 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+sa
+sa
+sa
+sa
+sa
+sa
+sa
+sa
xm
xm
xm
@@ -26503,78 +30992,73 @@ xm
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
+<<<<<<< Updated upstream
+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
+=======
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
-xm
-xm
-xm
-xm
-xm
+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
@@ -26588,6 +31072,21 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -26599,6 +31098,13 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -26620,10 +31126,6 @@ xm
xm
xm
xm
-EI
-"}
-(31,1,1) = {"
-EI
xm
xm
xm
@@ -26642,6 +31144,10 @@ xm
xm
xm
xm
+EI
+"}
+(33,1,1) = {"
+EI
xm
xm
xm
@@ -26709,12 +31215,42 @@ xm
xm
xm
xm
+zi
+<<<<<<< Updated upstream
+Vo
+cr
+cr
+lE
+lE
+=======
+Sy
+yc
+yc
+cu
+cu
+>>>>>>> Stashed changes
+OE
+zi
xm
xm
xm
xm
xm
xm
+cw
+zi
+<<<<<<< Updated upstream
+iL
+=======
+nF
+>>>>>>> Stashed changes
+XI
+jo
+SV
+WC
+zi
+zi
+lC
xm
xm
xm
@@ -26723,27 +31259,27 @@ xm
xm
xm
xm
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
-qE
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -26768,12 +31304,12 @@ lw
lw
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
+Rk
+Rk
+Rk
+Rk
+Rk
+Rk
xm
xm
lw
@@ -26806,53 +31342,65 @@ xm
xm
xm
xm
-xm
-xm
-Zt
-Zt
-Zt
-gw
-gw
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-gw
-gw
+<<<<<<< Updated upstream
+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
+=======
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
+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
@@ -26860,10 +31408,38 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -26875,6 +31451,13 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -26914,6 +31497,10 @@ xm
xm
xm
xm
+EI
+"}
+(34,1,1) = {"
+EI
xm
xm
xm
@@ -26922,10 +31509,6 @@ xm
xm
xm
xm
-EI
-"}
-(32,1,1) = {"
-EI
xm
xm
xm
@@ -26959,6 +31542,16 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -26973,50 +31566,49 @@ xm
xm
xm
xm
+zi
+zi
+zi
+<<<<<<< Updated upstream
+Vo
+cr
+Xc
+lE
+lE
+=======
+Sy
+yc
+yN
+cu
+cu
+>>>>>>> Stashed changes
+OE
+zi
xm
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
-Fz
-Gf
-Gf
-Gf
-Gf
-Gf
+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
@@ -27038,14 +31630,14 @@ zi
zi
zi
zi
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -27062,12 +31654,6 @@ xm
xm
xm
xm
-lw
-lw
-lw
-lw
-lw
-lw
xm
xm
xm
@@ -27076,6 +31662,12 @@ xm
xm
xm
xm
+Rk
+Rk
+Rk
+Rk
+Rk
+Rk
xm
xm
lw
@@ -27108,31 +31700,36 @@ 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
+<<<<<<< Updated upstream
+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
+=======
FO
-Ot
-fM
-Jd
FO
FO
FO
@@ -27141,188 +31738,49 @@ 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
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-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
-"}
-(33,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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+al
+Ot
+oT
+oT
+oT
+WQ
+FO
+FO
+FO
+FO
+FO
+>>>>>>> Stashed changes
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
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -27342,21 +31800,24 @@ zi
zi
zi
zi
-zi
-zi
-zi
-zi
-zi
-zi
-xm
xm
xm
xm
xm
+Bs
+Bs
+Bs
xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -27364,29 +31825,10 @@ 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
@@ -27414,46 +31856,11 @@ 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
+EI
+"}
+(35,1,1) = {"
+EI
xm
xm
xm
@@ -27495,6 +31902,16 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -27509,27 +31926,74 @@ xm
xm
xm
xm
+zi
+<<<<<<< Updated upstream
+Vo
+Vo
+Vo
+cr
+lE
+lE
+lE
+=======
+Sy
+Sy
+Sy
+yc
+cu
+cu
+cu
+>>>>>>> Stashed changes
+OE
+zi
xm
xm
xm
xm
xm
xm
+cw
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+lC
xm
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
-EI
-"}
-(34,1,1) = {"
-EI
xm
xm
xm
@@ -27552,8 +32016,21 @@ xm
xm
xm
xm
+Rk
+Rk
+Rk
+Rk
+Rk
+Rk
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -27574,57 +32051,51 @@ xm
xm
xm
xm
-zi
-zi
-zi
-zi
-zi
-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
+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
@@ -27644,6 +32115,8 @@ zi
zi
zi
zi
+<<<<<<< Updated upstream
+=======
zi
zi
zi
@@ -27712,18 +32185,6 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
FO
FO
FO
@@ -27734,9 +32195,6 @@ FO
FO
FO
FO
-uf
-dA
-Kj
FO
FO
FO
@@ -27744,34 +32202,67 @@ FO
FO
FO
FO
+pg
+oT
+oT
+hP
+FO
+FO
+FO
+FO
FO
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
xm
xm
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+>>>>>>> Stashed changes
xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -27811,6 +32302,10 @@ xm
xm
xm
xm
+EI
+"}
+(36,1,1) = {"
+EI
xm
xm
xm
@@ -27828,10 +32323,6 @@ xm
xm
xm
xm
-EI
-"}
-(35,1,1) = {"
-EI
xm
xm
xm
@@ -27856,6 +32347,16 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -27870,59 +32371,52 @@ xm
xm
xm
xm
+zi
+<<<<<<< Updated upstream
+Vo
+cr
+cr
+cr
+cr
+lE
+lE
+Vo
+=======
+Sy
+yc
+yc
+yc
+yc
+cu
+cu
+Sy
+>>>>>>> Stashed changes
+zi
xm
xm
xm
xm
xm
xm
-zi
-zi
-zi
-zi
-zi
-zi
-zi
xm
-Gf
-dv
-sc
-tt
-WC
-rt
-WC
-Sy
-OE
-OE
-Sy
-WC
-WC
-ZA
-Sy
-Vs
-dv
-Gf
+<<<<<<< Updated upstream
+hx
AI
-qT
-WC
-Lx
-Vs
-dv
-Gf
-Tc
-Tc
-WC
-Sy
-Vs
-dv
-Gf
-ec
-iL
-LW
-Sy
-Vs
-dv
-Gf
+=======
+Wp
+fb
+>>>>>>> Stashed changes
+OE
+BC
+BC
+BC
+BC
+<<<<<<< Updated upstream
+yK
+=======
+SC
+>>>>>>> Stashed changes
+xm
xm
xm
xm
@@ -27967,11 +32461,11 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -28014,19 +32508,48 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+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
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
+xm
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
FO
FO
FO
@@ -28035,28 +32558,39 @@ FO
FO
FO
FO
-EF
-XM
-fL
-BD
-vs
FO
FO
FO
FO
FO
FO
-Zt
-Zt
-Zt
-Zt
-Zt
-xm
-xm
-xm
+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
@@ -28064,10 +32598,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
@@ -28107,6 +32667,10 @@ xm
xm
xm
xm
+EI
+"}
+(37,1,1) = {"
+EI
xm
xm
xm
@@ -28130,10 +32694,6 @@ xm
xm
xm
xm
-EI
-"}
-(36,1,1) = {"
-EI
xm
xm
xm
@@ -28152,6 +32712,16 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -28166,6 +32736,27 @@ xm
xm
xm
xm
+zi
+<<<<<<< Updated upstream
+Vo
+cr
+cr
+cr
+lE
+lE
+lE
+Vo
+=======
+Sy
+yc
+yc
+yc
+cu
+cu
+cu
+Sy
+>>>>>>> Stashed changes
+zi
xm
xm
xm
@@ -28173,58 +32764,19 @@ xm
xm
xm
xm
+Ql
+<<<<<<< Updated upstream
+VF
+=======
+Db
+>>>>>>> Stashed changes
+OE
xm
xm
xm
xm
xm
-zi
-zi
-zi
-zi
-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
@@ -28286,15 +32838,6 @@ Rk
Rk
xm
xm
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-xm
-xm
xm
xm
xm
@@ -28325,32 +32868,44 @@ xm
xm
xm
xm
-Zt
-Zt
-Zt
-Zt
-Zt
-Zt
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+=======
FO
FO
FO
FO
-oT
-hP
-EL
-XM
-eq
-FA
FO
FO
FO
FO
FO
-Zt
-Zt
-Zt
-Zt
-Zt
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+>>>>>>> Stashed changes
+xm
xm
xm
xm
@@ -28361,14 +32916,70 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
+xm
+xm
+xm
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
@@ -28408,6 +33019,10 @@ xm
xm
xm
xm
+EI
+"}
+(38,1,1) = {"
+EI
xm
xm
xm
@@ -28432,10 +33047,6 @@ xm
xm
xm
xm
-EI
-"}
-(37,1,1) = {"
-EI
xm
xm
xm
@@ -28453,6 +33064,16 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -28467,6 +33088,26 @@ xm
xm
xm
xm
+zi
+OE
+<<<<<<< Updated upstream
+cr
+cr
+lE
+lE
+lE
+lE
+Vo
+=======
+yc
+yc
+cu
+cu
+cu
+cu
+Sy
+>>>>>>> Stashed changes
+zi
xm
xm
xm
@@ -28474,59 +33115,19 @@ xm
xm
xm
xm
+Zk
+<<<<<<< Updated upstream
+Gf
+=======
+As
+>>>>>>> Stashed changes
xm
xm
xm
xm
xm
xm
-zi
-zi
-zi
-zi
-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
-AI
-na
-to
-Gf
-Sn
-Ql
-Gf
-WC
-WC
-WC
-Gf
-Ig
-FL
-Gf
xm
xm
xm
@@ -28619,48 +33220,39 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-Zt
-Zt
-Zt
-Zt
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+=======
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
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+>>>>>>> Stashed changes
xm
xm
xm
@@ -28673,6 +33265,33 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -28680,10 +33299,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
@@ -28723,6 +33368,10 @@ xm
xm
xm
xm
+EI
+"}
+(39,1,1) = {"
+EI
xm
xm
xm
@@ -28734,10 +33383,6 @@ xm
xm
xm
xm
-EI
-"}
-(38,1,1) = {"
-EI
xm
xm
xm
@@ -28768,6 +33413,16 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -28783,52 +33438,45 @@ xm
xm
xm
zi
-zi
-zi
-zi
-zi
-zi
-zi
-xm
-Gf
-YN
-Ip
-Sy
-WC
-WC
-cu
-Gf
OE
-mD
-Gf
-AI
-AI
-WC
-Sy
-yc
-bo
-Gf
-LW
-to
-WC
-Sy
+<<<<<<< Updated upstream
cr
-Po
-Gf
-lD
-FG
-WC
-Sy
-wL
-Zk
-Gf
-WC
+cr
+cr
+lE
+lE
+lE
+Vo
+=======
+yc
+yc
+yc
+cu
+cu
cu
-WC
Sy
-AP
-VW
+>>>>>>> Stashed changes
+zi
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+sr
+<<<<<<< Updated upstream
Gf
+=======
+As
+>>>>>>> Stashed changes
+xm
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -28923,32 +33571,30 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-Zt
-Zt
-Zt
-Zt
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+xX
+=======
FO
FO
FO
-di
-dL
-XM
-LO
-KJ
-Zu
-Zt
-Zt
-Zt
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+>>>>>>> Stashed changes
+xm
xm
xm
xm
@@ -28963,6 +33609,33 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -28986,6 +33659,20 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -29025,6 +33712,10 @@ xm
xm
xm
xm
+EI
+"}
+(40,1,1) = {"
+EI
xm
xm
xm
@@ -29036,10 +33727,6 @@ xm
xm
xm
xm
-EI
-"}
-(39,1,1) = {"
-EI
xm
xm
xm
@@ -29070,6 +33757,16 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -29085,52 +33782,49 @@ xm
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
-zi
-zi
-xm
-Gf
-gU
-QI
-Gf
-WC
-WC
-Wx
-Gf
-OE
-OE
-Gf
-Xw
-WC
-WC
-Gf
-tk
-iN
+<<<<<<< Updated upstream
+Sy
Gf
-cu
-WC
-Xw
+MY
Gf
kq
-mx
-Gf
-WC
-WC
-Pa
-Gf
-BV
-sr
-Gf
-WC
-WC
-Pa
-Gf
-aP
-hM
+AI
+=======
+lx
+As
Gf
+As
+Zu
+fb
+>>>>>>> Stashed changes
+OE
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -29184,17 +33878,6 @@ xm
xm
xm
xm
-Rk
-Rk
-Rk
-Rk
-Rk
-Rk
-xm
-xm
-xm
-xm
-xm
xm
xm
xm
@@ -29238,46 +33921,19 @@ xm
xm
xm
xm
-Zt
-Zt
+<<<<<<< Updated upstream
+xX
+xX
+xX
+xX
+xX
+=======
FO
FO
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
+FO
+FO
+>>>>>>> Stashed changes
xm
xm
xm
@@ -29296,6 +33952,33 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -29319,9 +34002,43 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
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
@@ -29340,7 +34057,7 @@ xm
xm
EI
"}
-(40,1,1) = {"
+(41,1,1) = {"
EI
xm
xm
@@ -29383,9 +34100,13 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
zi
zi
zi
@@ -29394,45 +34115,60 @@ zi
zi
zi
xm
-Gf
-Gf
-Gf
-Gf
-Gf
-Gf
-Gf
-Gf
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+zi
+zi
+OE
+<<<<<<< Updated upstream
+cr
+cr
+cr
+cr
+lE
+lE
+OE
+OE
+Vo
+Vo
+=======
+yc
+yc
+yc
+yc
+cu
+cu
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
+>>>>>>> Stashed changes
+zi
+zi
+SQ
+On
+As
+<<<<<<< Updated upstream
Gf
-Gf
-Gf
-Gf
-Gf
-Gf
+Bu
+YN
+=======
+px
+ac
+>>>>>>> Stashed changes
+OE
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -29477,16 +34213,6 @@ xm
xm
xm
xm
-lw
-lw
-lw
-lw
-lw
-xm
-xm
-xm
-xm
-xm
xm
xm
xm
@@ -29541,17 +34267,15 @@ xm
xm
xm
xm
-Zt
-Zt
+<<<<<<< Updated upstream
+xX
+xX
+xX
+=======
FO
FO
-NA
-da
-dL
-ug
-aD
-Zt
-Zt
+FO
+>>>>>>> Stashed changes
xm
xm
xm
@@ -29570,6 +34294,33 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -29593,6 +34344,12 @@ xm
xm
xm
xm
+Bs
+Bs
+Bs
+Bs
+Bs
+Bs
xm
xm
xm
@@ -29642,7 +34399,7 @@ xm
xm
EI
"}
-(41,1,1) = {"
+(42,1,1) = {"
EI
xm
xm
@@ -29684,10 +34441,14 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
zi
zi
zi
@@ -29702,39 +34463,47 @@ xm
xm
xm
xm
-Gf
-vu
-ti
-OE
-OE
-OE
-As
-UK
-As
-OE
-OE
-OE
-OE
-OE
-xL
-OE
-OE
-OE
-OE
-OE
+xm
+xm
+zi
OE
-SQ
-As
-As
OE
+<<<<<<< Updated upstream
+cr
+cr
+cr
+wU
+cr
+lE
+lE
+lE
+lE
+=======
+yc
+yc
+yc
+Vc
+yc
+cu
+cu
+cu
+cu
+>>>>>>> Stashed changes
OE
-vt
+zi
+zi
+xm
+xm
+xm
+xm
OE
-xL
OE
OE
-vu
-Gf
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -29834,6 +34603,14 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+xX
+=======
+FO
+>>>>>>> Stashed changes
+xm
+xm
+xm
xm
xm
xm
@@ -29843,17 +34620,6 @@ xm
xm
xm
xm
-Zt
-Zt
-FO
-Us
-cf
-fL
-LO
-xS
-Ed
-Zt
-Zt
xm
xm
xm
@@ -29865,6 +34631,23 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -29944,7 +34727,7 @@ xm
xm
EI
"}
-(42,1,1) = {"
+(43,1,1) = {"
EI
xm
xm
@@ -29986,9 +34769,7 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
zi
zi
zi
@@ -30004,39 +34785,57 @@ zi
zi
zi
xm
-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
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+zi
+<<<<<<< Updated upstream
+Vo
+lE
+Xc
+cr
+cr
+cr
+cr
+cr
+lE
+lE
+lE
+Vo
+Vo
+=======
+Sy
+cu
+yN
+yc
+yc
+yc
+yc
+yc
+cu
+cu
+cu
+Sy
+Sy
+>>>>>>> Stashed changes
+zi
+xm
+xm
+xm
+xm
+xm
OE
-Uj
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -30128,6 +34927,11 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -30146,18 +34950,6 @@ xm
xm
xm
xm
-Zt
-Zt
-xi
-Nt
-yO
-si
-xS
-Zt
-Zt
-xm
-xm
-xm
xm
xm
xm
@@ -30167,6 +34959,23 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -30246,7 +35055,7 @@ xm
xm
EI
"}
-(43,1,1) = {"
+(44,1,1) = {"
EI
xm
xm
@@ -30288,9 +35097,7 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
zi
zi
zi
@@ -30306,39 +35113,56 @@ 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
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+zi
+<<<<<<< Updated upstream
+Vo
+lE
+lE
+cr
+cr
+cr
+cr
+cr
+cr
+lE
+lE
+lE
+=======
+Sy
+cu
+cu
+yc
+yc
+yc
+yc
+yc
+yc
+cu
+cu
+cu
+>>>>>>> Stashed changes
OE
-As
-iQ
-As
-vu
-Gf
+zi
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -30426,6 +35250,72 @@ 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
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -30449,62 +35339,6 @@ xm
xm
xm
xm
-Zt
-RB
-wc
-Na
-eq
-Ib
-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
-lw
-lw
-lw
-lw
-lw
-lw
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
xm
xm
xm
@@ -30548,7 +35382,7 @@ xm
xm
EI
"}
-(44,1,1) = {"
+(45,1,1) = {"
EI
xm
xm
@@ -30590,9 +35424,7 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
zi
zi
zi
@@ -30608,39 +35440,55 @@ 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
+xm
+xm
+zi
+OE
+<<<<<<< Updated upstream
+lE
+lE
+lE
+cr
+cr
+cr
+cr
+cr
+cr
+lE
+lE
+=======
+cu
+cu
+cu
+yc
+yc
+yc
+yc
+yc
+yc
+cu
+cu
+>>>>>>> Stashed changes
+OE
+zi
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -30728,6 +35576,18 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -30751,14 +35611,24 @@ xm
xm
xm
xm
-Zt
-MP
-aW
-Vj
-NA
-uJ
-Zt
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -30787,18 +35657,6 @@ xm
xm
xm
xm
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-lw
xm
xm
xm
@@ -30850,7 +35708,7 @@ xm
xm
EI
"}
-(45,1,1) = {"
+(46,1,1) = {"
EI
xm
xm
@@ -30892,9 +35750,7 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
zi
zi
zi
@@ -30910,27 +35766,43 @@ zi
zi
zi
xm
-Gf
-bi
-Gm
-WC
-WC
-Xw
-PH
-dy
-AZ
-Gb
-AF
-Gf
-yN
-yN
-yN
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+zi
+OE
+<<<<<<< Updated upstream
+lE
+lE
+lE
+cr
+cr
+cr
+cr
+Xc
+cr
+cr
+lE
+=======
+cu
+cu
+cu
+yc
+yc
+yc
+yc
yN
-Gf
-iS
-iS
-iS
-Gf
+yc
+yc
+cu
+>>>>>>> Stashed changes
+OE
+zi
xm
xm
xm
@@ -31030,6 +35902,18 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -31049,18 +35933,33 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-Zt
-FO
-fL
-LO
-FO
-Zt
-xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -31089,18 +35988,6 @@ xm
xm
xm
xm
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-lw
-lw
xm
xm
xm
@@ -31152,7 +36039,7 @@ xm
xm
EI
"}
-(46,1,1) = {"
+(47,1,1) = {"
EI
xm
xm
@@ -31194,9 +36081,7 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
zi
zi
zi
@@ -31212,36 +36097,64 @@ zi
zi
zi
xm
-Gf
-NY
-cu
-WC
-WC
-WC
-NP
-dy
+xm
+xm
+xm
+xm
+<<<<<<< Updated upstream
+=======
+xm
+xm
+xm
+xm
+zi
+OE
+vt
dy
-ZQ
-Gb
-Gf
-yN
-yN
-yN
-yN
-Gf
-qo
-qo
-Je
-Gf
+cu
+yc
+yc
+yc
+yc
+yc
+yc
+yc
+yc
+OE
+zi
+zi
+zi
+>>>>>>> Stashed changes
xm
xm
xm
+OE
xm
+zi
+OE
+od
+Br
+lE
+cr
+cr
+cr
+cr
+cr
+cr
+cr
+cr
+OE
+zi
+zi
+zi
xm
+OE
xm
xm
+OE
xm
xm
+OE
xm
xm
xm
@@ -31332,6 +36245,18 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -31351,6 +36276,33 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -31391,30 +36343,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
@@ -31436,11 +36364,11 @@ zy
zy
zy
zy
-xm
-xm
-xm
-xm
-xm
+zy
+zy
+zy
+zy
+zy
xm
xm
xm
@@ -31454,7 +36382,7 @@ xm
xm
EI
"}
-(47,1,1) = {"
+(48,1,1) = {"
EI
xm
xm
@@ -31496,9 +36424,7 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
zi
zi
zi
@@ -31514,27 +36440,6 @@ 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
@@ -31543,6 +36448,46 @@ xm
xm
xm
xm
+zi
+OE
+<<<<<<< Updated upstream
+lE
+lE
+lE
+lE
+lE
+lE
+cr
+cr
+cr
+cr
+cr
+Vo
+Vo
+Vo
+=======
+cu
+cu
+cu
+cu
+cu
+cu
+yc
+yc
+yc
+yc
+yc
+Sy
+Sy
+Sy
+>>>>>>> Stashed changes
+zi
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -31636,6 +36581,14 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -31657,6 +36610,33 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -31682,31 +36662,19 @@ 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
+<<<<<<< Updated upstream
+Xz
+Xz
+Xz
+Xz
+Xz
+=======
+XE
+XE
+XE
+XE
+XE
+>>>>>>> Stashed changes
xm
xm
xm
@@ -31756,7 +36724,7 @@ xm
xm
EI
"}
-(48,1,1) = {"
+(49,1,1) = {"
EI
xm
xm
@@ -31767,8 +36735,22 @@ xm
xm
xm
xm
+SU
+SU
+SU
+SU
+SU
+SU
+SU
xm
xm
+SU
+SU
+SU
+SU
+SU
+SU
+SU
xm
xm
xm
@@ -31784,23 +36766,7 @@ 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
@@ -31816,27 +36782,6 @@ 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
@@ -31845,6 +36790,45 @@ xm
xm
xm
xm
+zi
+OE
+<<<<<<< Updated upstream
+lE
+lE
+lE
+lE
+cr
+cr
+cr
+cr
+cr
+cr
+cr
+cr
+cr
+=======
+cu
+cu
+cu
+cu
+yc
+yc
+yc
+yc
+yc
+yc
+yc
+yc
+yc
+>>>>>>> Stashed changes
+OE
+zi
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -31938,6 +36922,14 @@ xm
xm
xm
xm
+lw
+lw
+lw
+lw
+lw
+lw
+lw
+lw
xm
xm
xm
@@ -31959,6 +36951,33 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -31984,38 +37003,33 @@ 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
-xm
-xm
-xm
-xm
-xm
-xm
-xm
+<<<<<<< Updated upstream
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+=======
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+>>>>>>> Stashed changes
xm
xm
xm
@@ -32058,7 +37072,7 @@ xm
xm
EI
"}
-(49,1,1) = {"
+(50,1,1) = {"
EI
xm
xm
@@ -32100,9 +37114,6 @@ xm
xm
xm
xm
-xm
-xm
-xm
zi
zi
zi
@@ -32117,21 +37128,7 @@ zi
zi
zi
zi
-xm
-Gf
-WC
-WC
-ZE
-Rt
-wM
-PH
-xX
-dy
-dy
-Gk
-Gf
-xm
-xm
+zi
xm
xm
xm
@@ -32141,6 +37138,36 @@ xm
xm
xm
xm
+zi
+OE
+OE
+OE
+OE
+<<<<<<< Updated upstream
+Vo
+Vo
+Vo
+Vo
+cr
+cr
+cr
+cr
+cr
+cr
+=======
+Sy
+Sy
+Sy
+Sy
+yc
+yc
+yc
+yc
+yc
+yc
+>>>>>>> Stashed changes
+OE
+zi
xm
xm
xm
@@ -32269,6 +37296,50 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -32277,41 +37348,33 @@ xm
xm
xm
xm
-xm
-xm
-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
+<<<<<<< Updated upstream
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+=======
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+>>>>>>> Stashed changes
xm
xm
xm
@@ -32341,12 +37404,6 @@ zy
zy
zy
zy
-zy
-zy
-zy
-zy
-zy
-zy
xm
xm
xm
@@ -32360,7 +37417,7 @@ xm
xm
EI
"}
-(50,1,1) = {"
+(51,1,1) = {"
EI
xm
xm
@@ -32402,9 +37459,6 @@ xm
xm
xm
xm
-xm
-xm
-xm
zi
zi
zi
@@ -32419,23 +37473,7 @@ zi
zi
zi
zi
-xm
-Gf
-WC
-WC
-cN
-On
-Sg
-Gf
-Gf
-Fz
-Fz
-Gf
-Gf
-xm
-xm
-xm
-xm
+zi
xm
xm
xm
@@ -32445,11 +37483,41 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+<<<<<<< Updated upstream
+Vo
+cr
+cr
+cr
+cr
+cr
+lE
+Vo
+=======
+Sy
+yc
+yc
+yc
+yc
+yc
+cu
+Sy
+>>>>>>> Stashed changes
+zi
xm
xm
xm
+OE
xm
xm
+OE
xm
xm
xm
@@ -32550,6 +37618,12 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -32565,6 +37639,33 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -32585,41 +37686,38 @@ 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
+<<<<<<< Updated upstream
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+=======
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+>>>>>>> Stashed changes
xm
xm
xm
@@ -32662,7 +37760,7 @@ xm
xm
EI
"}
-(51,1,1) = {"
+(52,1,1) = {"
EI
xm
xm
@@ -32704,9 +37802,7 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
zi
zi
zi
@@ -32722,17 +37818,15 @@ zi
zi
zi
xm
-Gf
-WC
-to
-SL
-SL
-SL
-Gf
xm
xm
xm
xm
+<<<<<<< Updated upstream
+=======
+xm
+xm
+xm
xm
xm
xm
@@ -32741,10 +37835,38 @@ xm
xm
xm
xm
+zi
+Sy
+yc
+yc
+yc
+yc
+dy
+cu
+Sy
+zi
+>>>>>>> Stashed changes
+xm
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
xm
+zi
+Vo
+cr
+cr
+cr
+cr
+Br
+lE
+Vo
+zi
xm
xm
xm
@@ -32852,6 +37974,12 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -32867,6 +37995,33 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -32887,41 +38042,38 @@ 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
+<<<<<<< Updated upstream
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+=======
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+>>>>>>> Stashed changes
xm
xm
xm
@@ -32964,7 +38116,7 @@ xm
xm
EI
"}
-(52,1,1) = {"
+(53,1,1) = {"
EI
xm
xm
@@ -33006,12 +38158,6 @@ xm
xm
xm
xm
-xm
-xm
-xm
-zi
-zi
-zi
zi
zi
zi
@@ -33024,25 +38170,9 @@ zi
zi
zi
xm
-Gf
-cu
-WC
-SL
-CT
-dm
-Gf
xm
xm
xm
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-zi
xm
xm
xm
@@ -33059,6 +38189,39 @@ xm
xm
xm
xm
+zi
+<<<<<<< Updated upstream
+Vo
+cr
+cr
+cr
+lE
+lE
+lE
+Vo
+=======
+Sy
+yc
+yc
+yc
+cu
+cu
+cu
+Sy
+>>>>>>> Stashed changes
+zi
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -33154,6 +38317,12 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -33169,6 +38338,33 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -33189,41 +38385,38 @@ 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
+<<<<<<< Updated upstream
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+=======
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+>>>>>>> Stashed changes
xm
xm
xm
@@ -33266,7 +38459,7 @@ xm
xm
EI
"}
-(53,1,1) = {"
+(54,1,1) = {"
EI
xm
xm
@@ -33293,6 +38486,10 @@ SU
SU
SU
SU
+SU
+SU
+SU
+SU
xm
xm
xm
@@ -33304,13 +38501,9 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
+zi
+zi
+zi
zi
zi
zi
@@ -33320,36 +38513,36 @@ zi
zi
zi
xm
+Rk
+Rk
+Rk
+Rk
+Rk
xm
xm
xm
xm
xm
xm
-Gf
-vo
-WC
-La
-Vs
-Vs
-Gf
xm
xm
xm
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-zi
xm
xm
xm
xm
xm
+zi
+OE
+OE
+OE
+OE
+OE
+OE
+OE
+OE
+zi
+xm
xm
xm
xm
@@ -33456,6 +38649,12 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -33470,6 +38669,37 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -33491,47 +38721,36 @@ 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
-xm
-xm
-xm
xm
xm
xm
+<<<<<<< Updated upstream
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+=======
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+>>>>>>> Stashed changes
xm
xm
xm
@@ -33555,6 +38774,12 @@ zy
zy
zy
zy
+zy
+zy
+zy
+zy
+zy
+zy
xm
xm
xm
@@ -33568,7 +38793,7 @@ xm
xm
EI
"}
-(54,1,1) = {"
+(55,1,1) = {"
EI
xm
xm
@@ -33610,9 +38835,9 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
+zi
+zi
zi
zi
zi
@@ -33628,13 +38853,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 +38876,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
@@ -33758,6 +38983,12 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -33772,6 +39003,37 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -33787,29 +39049,6 @@ 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
@@ -33817,14 +39056,29 @@ xm
xm
xm
xm
-zi
-zi
-zi
-zi
-zi
-zi
xm
xm
+<<<<<<< Updated upstream
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+=======
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+>>>>>>> Stashed changes
xm
xm
xm
@@ -33870,7 +39124,7 @@ xm
xm
EI
"}
-(55,1,1) = {"
+(56,1,1) = {"
EI
xm
xm
@@ -33912,9 +39166,9 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
+zi
+zi
zi
zi
zi
@@ -33930,38 +39184,38 @@ Rk
Rk
Rk
xm
-Gf
-SL
-La
-SL
-SL
-SL
-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
@@ -34059,13 +39313,13 @@ xm
xm
xm
xm
-zy
-zy
-zy
-zy
-zy
-zy
xm
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -34080,29 +39334,43 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
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
@@ -34119,14 +39387,29 @@ xm
xm
xm
xm
-zi
-zi
-zi
-zi
-zi
-zi
xm
xm
+<<<<<<< Updated upstream
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+=======
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+>>>>>>> Stashed changes
xm
xm
xm
@@ -34152,13 +39435,13 @@ zy
zy
zy
zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
+xm
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -34172,7 +39455,7 @@ xm
xm
EI
"}
-(56,1,1) = {"
+(57,1,1) = {"
EI
xm
xm
@@ -34214,9 +39497,9 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
+zi
+zi
zi
zi
zi
@@ -34232,39 +39515,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
@@ -34361,14 +39644,13 @@ xm
xm
xm
xm
-zy
-zy
-zy
-zy
-zy
-zy
-xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -34383,28 +39665,43 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
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
@@ -34421,14 +39718,29 @@ xm
xm
xm
xm
-zi
-zi
-zi
-zi
-zi
-zi
xm
xm
+<<<<<<< Updated upstream
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+=======
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+>>>>>>> Stashed changes
xm
xm
xm
@@ -34474,7 +39786,7 @@ xm
xm
EI
"}
-(57,1,1) = {"
+(58,1,1) = {"
EI
xm
xm
@@ -34494,17 +39806,62 @@ SU
SU
xm
xm
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
+SU
+SU
+SU
+SU
+SU
+SU
+SU
+SU
+SU
+SU
+SU
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+zi
+xm
+Rk
+Rk
+Rk
+Rk
+Rk
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -34519,54 +39876,9 @@ xm
xm
xm
xm
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-zi
xm
-Rk
-Rk
-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
@@ -34663,13 +39975,13 @@ xm
xm
xm
xm
-zy
-zy
-zy
-zy
-zy
-zy
xm
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -34684,29 +39996,43 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
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
@@ -34723,14 +40049,29 @@ xm
xm
xm
xm
-zi
-zi
-zi
-zi
-zi
-zi
xm
xm
+<<<<<<< Updated upstream
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+=======
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+>>>>>>> Stashed changes
xm
xm
xm
@@ -34776,7 +40117,7 @@ xm
xm
EI
"}
-(58,1,1) = {"
+(59,1,1) = {"
EI
xm
xm
@@ -34818,9 +40159,9 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
+zi
+zi
zi
zi
zi
@@ -34836,39 +40177,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
@@ -34965,13 +40306,13 @@ xm
xm
xm
xm
-zy
-zy
-zy
-zy
-zy
-zy
xm
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -34986,29 +40327,42 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
+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
@@ -35025,14 +40379,29 @@ xm
xm
xm
xm
-zi
-zi
-zi
-zi
-zi
-zi
xm
xm
+<<<<<<< Updated upstream
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+Xz
+=======
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+XE
+>>>>>>> Stashed changes
xm
xm
xm
@@ -35078,7 +40447,7 @@ xm
xm
EI
"}
-(59,1,1) = {"
+(60,1,1) = {"
EI
xm
xm
@@ -35120,9 +40489,9 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
+zi
+zi
zi
zi
zi
@@ -35138,79 +40507,6 @@ 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
-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
@@ -35267,22 +40563,6 @@ xm
xm
xm
xm
-zy
-zy
-zy
-zy
-zy
-zy
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
xm
xm
xm
@@ -35293,30 +40573,6 @@ 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
-xm
-xm
-xm
xm
xm
xm
@@ -35327,12 +40583,6 @@ xm
xm
xm
xm
-zi
-zi
-zi
-zi
-zi
-zi
xm
xm
xm
@@ -35341,25 +40591,6 @@ xm
xm
xm
xm
-zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
-zy
xm
xm
xm
@@ -35378,10 +40609,6 @@ xm
xm
xm
xm
-EI
-"}
-(60,1,1) = {"
-EI
xm
xm
xm
@@ -35391,26 +40618,8 @@ xm
xm
xm
xm
-SU
-SU
-SU
-SU
-SU
-SU
-SU
xm
xm
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
xm
xm
xm
@@ -35425,28 +40634,8 @@ xm
xm
xm
xm
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-zi
xm
-Rk
-Rk
-Rk
-Rk
-Rk
xm
-Gf
-Gf
-Fz
-Fz
-Fz
-Gf
-Gf
xm
zi
zi
@@ -35454,33 +40643,6 @@ 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
@@ -35495,6 +40657,35 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -35535,114 +40726,6 @@ xm
xm
xm
xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-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
-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
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
zy
zy
zy
@@ -35724,9 +40807,9 @@ xm
xm
xm
xm
-xm
-xm
-xm
+zi
+zi
+zi
zi
zi
zi
@@ -35750,29 +40833,6 @@ 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
@@ -35895,18 +40955,57 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
xm
xm
xm
@@ -36174,6 +41273,12 @@ xm
xm
xm
xm
+zi
+zi
+zi
+zi
+zi
+zi
xm
xm
xm
@@ -36188,6 +41293,35 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+ec
+=======
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+qN
+>>>>>>> Stashed changes
xm
xm
xm
@@ -36199,25 +41333,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
@@ -39086,27 +44201,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
@@ -39387,29 +44502,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
@@ -39689,29 +44804,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
@@ -39991,29 +45106,40 @@ 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
+<<<<<<< Updated upstream
+fq
+fq
+fq
+fq
+fq
+fq
+fq
+fq
+=======
+Mk
+Mk
+Mk
+Mk
+Mk
+Mk
+Mk
+Mk
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -40293,29 +45419,40 @@ 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
+<<<<<<< Updated upstream
+fq
+ku
+Ur
+oL
+fq
+fq
+fq
+fq
+=======
+Mk
+Xw
+jQ
+UZ
+Mk
+Mk
+Mk
+Mk
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -40595,29 +45732,40 @@ 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
+<<<<<<< Updated upstream
+fq
+CV
+Ib
+Ib
+fq
+XW
+ar
+ar
+=======
+Mk
+FG
+Zs
+Zs
+Mk
+vu
+ZM
+ZM
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -40897,29 +46045,40 @@ 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
+<<<<<<< Updated upstream
+eo
+Ak
+vJ
+Ib
+Ib
+Ib
+EF
+ar
+=======
+JW
+Au
+cB
+Zs
+Zs
+Zs
+Sj
+ZM
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -41199,29 +46358,40 @@ 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
+<<<<<<< Updated upstream
+KJ
+Gm
+CV
+aP
+SD
+Ib
+Ib
+ar
+=======
+SL
+Sg
+FG
+Gk
+xk
+Zs
+Zs
+ZM
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -41501,29 +46671,40 @@ 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
+<<<<<<< Updated upstream
+eo
+Gv
+CV
+tB
+Ml
+Xt
+Ib
+ar
+=======
+JW
+Aq
+FG
+mx
+Pb
+ha
+Zs
+ZM
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -41803,29 +46984,40 @@ 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
+<<<<<<< Updated upstream
+fq
+pB
+Ib
+GQ
+UP
+Ib
+Aw
+ar
+=======
+Mk
+Uh
+Zs
+vC
+dc
+Zs
+KJ
+ZM
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -42105,29 +47297,39 @@ 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
+<<<<<<< Updated upstream
+KN
+KN
+vu
+Ib
+Ib
+Ib
+fq
+=======
+oA
+oA
+Ts
+Zs
+Zs
+Zs
+Mk
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -42387,50 +47589,57 @@ zi
zi
zi
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
-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
+LY
+LY
+LY
+LY
+LY
+LY
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+<<<<<<< Updated upstream
+ar
+xB
+xB
+fq
+=======
+ZM
+py
+py
+Mk
+>>>>>>> Stashed changes
+xm
+xm
+xm
zi
zi
zi
@@ -42709,29 +47918,36 @@ 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
+<<<<<<< Updated upstream
+ny
+ny
+ny
+Vo
+=======
+qJ
+qJ
+qJ
+Sy
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -43011,29 +48227,36 @@ 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
+<<<<<<< Updated upstream
+cB
+uG
+oa
+jm
+=======
+vo
+lh
+si
+iI
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -43200,106 +48423,125 @@ xm
xm
xm
xm
-oy
-KE
-Wh
-KE
-KE
-KE
-Wh
-KE
-KE
-KE
-Wh
-KE
-KE
-KE
-Wh
-KE
-KE
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-EI
-"}
-(86,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
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-zi
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
+oy
+KE
+Wh
+KE
+KE
+KE
+Wh
+KE
+KE
+KE
+Wh
+KE
+KE
+KE
+Wh
+KE
+KE
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+EI
+"}
+(86,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
+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
+LY
+LY
+LY
+LY
+LY
+LY
xm
xm
xm
@@ -43311,31 +48553,19 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+dm
+Ix
+SC
+jm
+=======
+iu
+dX
+aP
+iI
+>>>>>>> Stashed changes
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
@@ -43615,29 +48845,40 @@ 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
+<<<<<<< Updated upstream
+Vo
+xm
+xm
+xm
+Vo
+ny
+ny
+jm
+=======
+Sy
+xm
+xm
+xm
+Sy
+qJ
+qJ
+iI
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -43917,29 +49158,38 @@ 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
+<<<<<<< Updated upstream
+Vo
+Vo
+Vo
+ny
+ny
+Vo
+=======
+Sy
+Sy
+Sy
+qJ
+qJ
+Sy
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -44219,29 +49469,36 @@ 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
+<<<<<<< Updated upstream
+Vo
+Xq
+dm
+Vo
+=======
+Sy
+Ua
+iu
+Sy
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -44521,29 +49778,35 @@ 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
+<<<<<<< Updated upstream
+jA
+uG
+jm
+=======
+Po
+lh
+iI
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -44823,29 +50086,36 @@ 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
+<<<<<<< Updated upstream
+Vo
+ny
+ny
+jm
+=======
+Sy
+qJ
+qJ
+iI
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -45125,29 +50395,36 @@ 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
+<<<<<<< Updated upstream
+ny
+ny
+ny
+jm
+=======
+qJ
+qJ
+qJ
+iI
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -45427,29 +50704,36 @@ 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
+<<<<<<< Updated upstream
+ny
+ny
+cB
+Vo
+=======
+qJ
+qJ
+vo
+Sy
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -45729,29 +51013,37 @@ 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
+<<<<<<< Updated upstream
+fM
+ny
+ny
+ny
+Vo
+=======
+uI
+qJ
+qJ
+qJ
+Sy
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -46031,29 +51323,36 @@ 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
+<<<<<<< Updated upstream
+jm
+ny
+oa
+jm
+=======
+iI
+qJ
+si
+iI
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -46333,29 +51632,36 @@ 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
+<<<<<<< Updated upstream
+Tm
+ny
+ny
+jm
+=======
+Ux
+qJ
+qJ
+iI
+>>>>>>> Stashed changes
+xm
+xm
xm
zi
zi
@@ -46635,29 +51941,36 @@ 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
+<<<<<<< Updated upstream
+Tm
+Ix
+Xq
+jm
+=======
+Ux
+dX
+Ua
+iI
+>>>>>>> Stashed changes
+xm
+xm
xm
xm
xm
@@ -46937,29 +52250,36 @@ 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
+<<<<<<< Updated upstream
+dm
+ny
+ny
+jm
+=======
+iu
+qJ
+qJ
+iI
+>>>>>>> Stashed changes
+xm
+xm
xm
xm
xm
@@ -47239,29 +52559,40 @@ 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
+<<<<<<< Updated upstream
+Vo
+xm
+xm
+xm
+Vo
+oa
+ny
+wL
+=======
+Sy
+xm
+xm
+xm
+Sy
+si
+qJ
+SY
+>>>>>>> Stashed changes
+xm
+xm
xm
xm
xm
@@ -47541,29 +52872,39 @@ 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
+<<<<<<< Updated upstream
+Vo
+Vo
+gU
+JQ
+dm
+ny
+dm
+=======
+Sy
+Sy
+PI
+Pl
+iu
+qJ
+iu
+>>>>>>> Stashed changes
+xm
+xm
+xm
xm
xm
xm
@@ -47843,29 +53184,39 @@ 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
+<<<<<<< Updated upstream
+Vo
+wT
+wT
+xm
+cB
+ny
+eE
+=======
+Sy
+wT
+wT
+xm
+vo
+qJ
+qf
+>>>>>>> Stashed changes
+xm
+xm
+xm
xm
xm
xm
@@ -48145,29 +53496,39 @@ 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
+<<<<<<< Updated upstream
+jm
+JQ
+xm
+xm
+Az
+ny
+eE
+=======
+iI
+Pl
+xm
+xm
+qo
+qJ
+qf
+>>>>>>> Stashed changes
+xm
+xm
+xm
xm
xm
xm
@@ -48447,29 +53808,39 @@ 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
+<<<<<<< Updated upstream
+jm
+wT
+xm
+xm
+jm
+eE
+eE
+=======
+iI
+wT
+xm
+xm
+iI
+qf
+qf
+>>>>>>> Stashed changes
+xm
+xm
+xm
xm
xm
xm
@@ -48577,12 +53948,170 @@ xm
xm
xm
xm
-Ce
-ND
-ND
-DQ
-ND
-YC
+Ce
+ND
+ND
+DQ
+ND
+YC
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+cw
+OR
+iW
+iW
+iW
+EQ
+iW
+iW
+HI
+lC
+xm
+xm
+xm
+xm
+zy
+zy
+zy
+zy
+zy
+er
+Oo
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+Ce
+kR
+Li
+Li
+Ug
+YC
+xm
+xm
+xm
+xm
+xm
+xm
+SU
+SU
+SU
+SU
+SU
+SU
+SU
+SU
+SU
+SU
+SU
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+EI
+"}
+(104,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
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -48591,6 +54120,12 @@ xm
xm
xm
xm
+LY
+LY
+LY
+LY
+LY
+LY
xm
xm
xm
@@ -48598,28 +54133,24 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+jm
+mg
xm
-cw
-OR
-iW
-iW
-iW
-EQ
-iW
-iW
-HI
-lC
xm
+uG
+CX
+iQ
+=======
+iI
+cf
xm
xm
+lh
+Dx
+Ip
+>>>>>>> Stashed changes
xm
-zy
-zy
-zy
-zy
-zy
-er
-Oo
xm
xm
xm
@@ -48629,12 +54160,6 @@ xm
xm
xm
xm
-Ce
-kR
-Li
-Li
-Ug
-YC
xm
xm
xm
@@ -48648,6 +54173,13 @@ SU
SU
SU
SU
+xm
+xm
+xm
+xm
+xm
+xm
+SU
SU
SU
SU
@@ -48663,14 +54195,15 @@ xm
xm
xm
xm
+DZ
+DZ
+DZ
+DZ
+DZ
+DZ
xm
xm
xm
-EI
-"}
-(104,1,1) = {"
-EI
-xm
xm
xm
xm
@@ -48727,6 +54260,12 @@ xm
xm
xm
xm
+Ce
+eh
+MR
+DQ
+DQ
+YC
xm
xm
xm
@@ -48743,35 +54282,29 @@ xm
xm
xm
xm
+cw
+Yx
+Yx
+Yx
+Yx
+Yx
+Lq
+ey
+HC
+lC
xm
xm
xm
xm
+zy
+zy
+zy
+zy
+zy
+er
+Oo
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
@@ -48779,6 +54312,12 @@ xm
xm
xm
xm
+Ce
+Li
+Li
+Li
+Ug
+YC
xm
xm
xm
@@ -48792,17 +54331,16 @@ SU
SU
SU
SU
+SU
+SU
+SU
+SU
xm
xm
xm
xm
xm
xm
-SU
-SU
-SU
-SU
-SU
xm
xm
xm
@@ -48811,15 +54349,13 @@ xm
xm
xm
xm
+EI
+"}
+(105,1,1) = {"
+EI
xm
xm
xm
-DZ
-DZ
-DZ
-DZ
-DZ
-DZ
xm
xm
xm
@@ -48879,12 +54415,6 @@ xm
xm
xm
xm
-Ce
-eh
-MR
-DQ
-DQ
-YC
xm
xm
xm
@@ -48901,27 +54431,10 @@ xm
xm
xm
xm
-cw
-Yx
-Yx
-Yx
-Yx
-Yx
-Lq
-ey
-HC
-lC
xm
xm
xm
xm
-zy
-zy
-zy
-zy
-zy
-er
-Oo
xm
xm
xm
@@ -48931,12 +54444,35 @@ xm
xm
xm
xm
-Ce
-Li
-Li
-Li
-Ug
-YC
+xm
+<<<<<<< Updated upstream
+Vo
+uG
+oE
+uG
+dm
+ny
+dL
+Vo
+=======
+Sy
+lh
+OU
+lh
+iu
+qJ
+iS
+Sy
+>>>>>>> Stashed changes
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
+xm
xm
xm
xm
@@ -48950,6 +54486,13 @@ SU
SU
SU
SU
+xm
+xm
+xm
+xm
+xm
+xm
+SU
SU
SU
SU
@@ -48965,14 +54508,15 @@ xm
xm
xm
xm
+DZ
+DZ
+DZ
+DZ
+DZ
+DZ
xm
xm
xm
-EI
-"}
-(105,1,1) = {"
-EI
-xm
xm
xm
xm
@@ -49029,6 +54573,12 @@ xm
xm
xm
xm
+Ce
+jX
+DQ
+ND
+DQ
+YC
xm
xm
xm
@@ -49045,35 +54595,29 @@ xm
xm
xm
xm
+ZF
+BC
+BC
+BC
+BC
+BC
+BC
+BC
+BC
+sU
xm
xm
xm
xm
+zy
+zy
+zy
+zy
+zy
+Bi
+Oo
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
@@ -49081,6 +54625,12 @@ xm
xm
xm
xm
+Ce
+Li
+jz
+fU
+Ug
+YC
xm
xm
xm
@@ -49094,18 +54644,10 @@ SU
SU
SU
SU
-xm
-xm
-xm
-xm
-xm
-xm
SU
SU
SU
SU
-SU
-xm
xm
xm
xm
@@ -49116,18 +54658,14 @@ xm
xm
xm
xm
-DZ
-DZ
-DZ
-DZ
-DZ
-DZ
-xm
-xm
xm
xm
xm
xm
+EI
+"}
+(106,1,1) = {"
+EI
xm
xm
xm
@@ -49181,137 +54719,6 @@ xm
xm
xm
xm
-Ce
-jX
-DQ
-ND
-DQ
-YC
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-ZF
-BC
-BC
-BC
-BC
-BC
-BC
-BC
-BC
-sU
-xm
-xm
-xm
-xm
-zy
-zy
-zy
-zy
-zy
-Bi
-Oo
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-Ce
-Li
-jz
-fU
-Ug
-YC
-xm
-xm
-xm
-xm
-xm
-xm
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-SU
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-xm
-EI
-"}
-(106,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
@@ -49351,31 +54758,27 @@ xm
xm
xm
xm
+<<<<<<< Updated upstream
+Vo
+Vo
+jm
+jm
+Vo
+FO
+FO
+Vo
+=======
+Sy
+Sy
+iI
+iI
+Sy
+mP
+mP
+Sy
+>>>>>>> Stashed changes
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
@@ -49655,29 +55058,36 @@ 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
+<<<<<<< Updated upstream
+Vo
+Ot
+ny
+Vo
+=======
+Sy
+Kr
+qJ
+Sy
+>>>>>>> Stashed changes
+xm
+xm
xm
xm
xm
@@ -49957,29 +55367,37 @@ 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
+<<<<<<< Updated upstream
+jm
+ny
+ny
+Vo
+Vo
+=======
+iI
+qJ
+qJ
+Sy
+Sy
+>>>>>>> Stashed changes
+xm
xm
xm
xm
@@ -50259,29 +55677,37 @@ 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
+<<<<<<< Updated upstream
+jm
+cB
+ny
+ny
+Vo
+=======
+iI
+vo
+qJ
+qJ
+Sy
+>>>>>>> Stashed changes
+xm
xm
xm
xm
@@ -50561,29 +55987,37 @@ 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
+<<<<<<< Updated upstream
+Vo
+nF
+gH
+oa
+Vo
+=======
+Sy
+aR
+dv
+si
+Sy
+>>>>>>> Stashed changes
+xm
xm
xm
xm
@@ -50863,29 +56297,37 @@ 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
+<<<<<<< Updated upstream
+Vo
+Vo
+AG
+ny
+jm
+=======
+Sy
+Sy
+nc
+qJ
+iI
+>>>>>>> Stashed changes
+xm
xm
xm
xm
@@ -51165,30 +56607,37 @@ 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
+<<<<<<< Updated upstream
+Vo
+nb
+ny
+jm
+=======
+Sy
+xW
+qJ
+iI
+>>>>>>> Stashed changes
+xm
+xm
xm
xm
xm
@@ -51467,30 +56916,37 @@ 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
+<<<<<<< Updated upstream
+Vo
+gA
+mg
+Vo
+=======
+Sy
+ko
+cf
+Sy
+>>>>>>> Stashed changes
+xm
+xm
xm
xm
xm
@@ -51769,30 +57225,37 @@ 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
+<<<<<<< Updated upstream
+Vo
+MD
+uG
+Vo
+=======
+Sy
+aA
+lh
+Sy
+>>>>>>> Stashed changes
+xm
+xm
xm
xm
xm
@@ -52071,30 +57534,38 @@ 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
+<<<<<<< Updated upstream
+jm
+Vo
+Vo
+TN
+Vo
+=======
+iI
+Sy
+Sy
+hn
+Sy
+>>>>>>> Stashed changes
+xm
+xm
xm
xm
xm
@@ -52373,30 +57844,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
@@ -52675,30 +58146,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
@@ -52977,30 +58448,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
@@ -53279,30 +58750,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 5d66fb6753..43f09fbac2 100644
--- a/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm
+++ b/_maps/map_files/Vegas Valley/Vegas_Valley_Surface.dmm
@@ -18,40 +18,56 @@
/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)
+<<<<<<< Updated upstream
+/obj/effect/decal/marking{
+ icon_state = "dottedverticaldegraded";
+ pixel_x = -14
+ },
+/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)
-"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)
+<<<<<<< Updated upstream
"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)
+=======
+"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,16 +88,54 @@
/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
+<<<<<<< Updated upstream
+"aaR" = (
+/obj/item/ammo_box/magazine/m556/rifle/empty{
+ pixel_x = 6;
+ pixel_y = -6
},
-/obj/item/trash/f13/c_ration_3{
- pixel_y = 11;
- pixel_x = 11
+/obj/item/ammo_box/magazine/m556/rifle/empty{
+ pixel_x = 6;
+ pixel_y = -6
},
-/turf/open/indestructible/ground/outside/graveldirt,
+/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)
+=======
+"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{
@@ -130,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,
@@ -143,6 +203,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
@@ -154,6 +223,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,
@@ -186,31 +259,23 @@
/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)
+<<<<<<< Updated upstream
"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{
+ icon_state = "common-broken2"
+ },
+/area/f13/ambientlighting/building/m)
"adY" = (
/obj/structure/car/rubbish3,
/turf/open/indestructible/ground/outside/dirt{
@@ -218,27 +283,81 @@
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,
-/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"
+=======
+"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" = (
/obj/structure/car/rubbish4,
/turf/open/indestructible/ground/outside/ruins,
/area/f13/wasteland)
"aeY" = (
-/obj/structure/sign/departments/medbay/alt{
- name = "TRIAGE"
+/obj/effect/decal/cleanable/cobweb,
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = -4;
+ pixel_x = -16
},
-/turf/closed/wall/f13/wood,
-/area/f13/ncr)
-"afq" = (
-/turf/open/floor/f13/wood{
- icon_state = "housewood2-broken"
+/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
},
-/area/f13/ncr)
+/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,
@@ -262,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
@@ -326,6 +453,14 @@
/obj/item/reagent_containers/food/snacks/grown/apple,
/turf/open/floor/wood_common,
/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/ncr)
"ahs" = (
/turf/open/indestructible/ground/outside/sidewalk{
icon_state = "horizontalbottomborderbottom0"
@@ -342,7 +477,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 +516,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 +562,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{
@@ -470,9 +611,18 @@
},
/area/f13/ambientlighting/building/y)
"ajU" = (
-/obj/machinery/light,
-/turf/open/floor/plasteel/f13/vault_floor/floor,
-/area/f13/ambientlighting/building/p)
+<<<<<<< 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"
@@ -506,9 +656,37 @@
"akw" = (
/turf/closed/wall/mineral/wood,
/area/f13/ambientlighting/building/d)
-"akT" = (
-/turf/open/indestructible/ground/outside/snow,
+<<<<<<< Updated upstream
+"akN" = (
+/obj/structure/cable/outdoors{
+ icon_state = "2-8"
+ },
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/ncr)
+"akT" = (
+/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)
+=======
+"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
@@ -628,36 +806,40 @@
/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)
-"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)
+<<<<<<< Updated upstream
"amQ" = (
-/obj/structure/chair/office/dark{
+/obj/structure/fence/corner{
+ dir = 4;
+ icon_state = "end"
+ },
+/obj/effect/overlay/desert/sonora/edge/corner{
dir = 4
},
-/obj/effect/decal/remains/human,
-/obj/effect/decal/cleanable/blood/old{
- icon_state = "gibmid1"
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/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/floor/plasteel/f13/vault_floor/red/whiteredfull,
-/area/f13/ambientlighting/building/j)
+/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{
@@ -669,11 +851,27 @@
/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)
+"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,
+/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,
@@ -702,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,
@@ -715,19 +917,38 @@
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
+<<<<<<< Updated upstream
+/obj/structure/fence/wooden{
+ dir = 8
},
-/obj/machinery/power/port_gen/infinite/diesel{
- anchored = 1;
- active = 1
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+"aoO" = (
+/obj/item/restraints/legcuffs/bola,
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
},
-/obj/structure/cable/outdoors{
- icon_state = "0-8"
+/area/f13/ambientlighting/building/m)
+=======
+/obj/structure/chair/sofa/right{
+ dir = 8
},
-/turf/open/indestructible/ground/inside/mountain,
+/turf/open/floor/wood_fancy/wood_fancy_light,
/area/f13/ncr)
+>>>>>>> Stashed changes
"aoV" = (
/obj/item/kirbyplants,
/obj/effect/decal/cleanable/dirt{
@@ -782,6 +1003,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)
@@ -841,10 +1069,21 @@
},
/area/f13/building/powered)
"aqx" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
+<<<<<<< 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{
@@ -938,10 +1177,18 @@
},
/turf/open/indestructible/ground/outside/grass,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"asc" = (
-/obj/effect/mob_spawn/human/corpse/enclave/soldier,
-/turf/open/indestructible/ground/outside/dirt,
+/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
@@ -957,10 +1204,26 @@
},
/area/f13/wasteland)
"aso" = (
-/turf/open/floor/f13/wood{
- icon_state = "housewood4-broken"
+<<<<<<< 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"
},
-/area/f13/ambientlighting/building/h)
+/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,
@@ -1029,13 +1292,18 @@
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/structure/table/wood/settler,
-/turf/open/floor/f13/wood{
- icon_state = "housewood4-broken"
- },
-/area/f13/ambientlighting/building/g)
+/obj/effect/decal/cleanable/ash,
+/turf/open/floor/plasteel/grimy,
+>>>>>>> Stashed changes
+/area/f13/ncr)
"atE" = (
/obj/machinery/power/port_gen/pacman/diesel{
anchored = 1
@@ -1089,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,
@@ -1174,12 +1453,28 @@
/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,
+/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,
+=======
+"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{
dir = 1
@@ -1197,16 +1492,31 @@
},
/area/f13/wasteland/followers)
"avw" = (
-/obj/structure/closet,
-/obj/item/crafting/lunchbox,
-/turf/open/floor/f13/wood,
-/area/f13/wasteland)
+<<<<<<< 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{
dir = 1
},
/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,
@@ -1317,6 +1627,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{
@@ -1379,13 +1699,24 @@
},
/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)
+<<<<<<< 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,
/turf/open/indestructible/ground/inside/dirt,
@@ -1412,14 +1743,16 @@
},
/area/f13/building/abandoned/h)
"ayd" = (
-/obj/structure/rack,
-/obj/item/clothing/under/f13/relaxedwear{
- pixel_x = 8;
- pixel_y = -4
+<<<<<<< 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"
},
-/obj/item/clothing/under/f13/spring,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/m)
"aye" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -1444,11 +1777,26 @@
},
/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)
+<<<<<<< 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
@@ -1556,6 +1904,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
@@ -1580,6 +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,
@@ -1609,6 +1981,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,
@@ -1619,20 +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/effect/decal/cleanable/dirt/dust,
-/obj/structure/sink{
- dir = 4;
- pixel_x = 12
+/obj/item/storage/trash_stack{
+ icon_state = "trash_3"
},
-/turf/open/floor/f13{
- icon_state = "bar"
+/obj/item/trash/can,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain2right"
},
-/area/f13/ambientlighting/building/g)
+/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.";
@@ -1640,6 +2025,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,
@@ -1650,13 +2039,20 @@
icon_state = "bluerustysolid"
},
/area/f13/followers)
+<<<<<<< Updated upstream
+=======
"aCp" = (
-/obj/structure/bed/mattress{
- icon_state = "mattress2";
- pixel_y = 7
+/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"
},
-/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"aCs" = (
/obj/structure/reagent_dispensers/compostbin,
/obj/effect/turf_decal/weather/dirt{
@@ -1708,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{
@@ -1727,10 +2129,18 @@
/turf/open/indestructible/ground/inside/dirt,
/area/f13/building/tribal)
"aDt" = (
-/obj/structure/flora/tree/tall,
+<<<<<<< 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{
- dir = 1;
- icon_state = "outerpavement"
+ icon_state = "verticaloutermain2"
+=======
+/obj/effect/decal/cleanable/oil,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain0"
+>>>>>>> Stashed changes
},
/area/f13/wasteland)
"aDA" = (
@@ -1746,7 +2156,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{
@@ -1800,6 +2212,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,
@@ -1810,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,
@@ -1891,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{
@@ -1899,12 +2337,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{
@@ -1970,10 +2406,29 @@
/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,
+<<<<<<< Updated upstream
+/area/f13/ambientlighting/building/j)
+=======
+/area/f13/wasteland)
"aHg" = (
-/obj/machinery/autolathe,
-/turf/open/floor/wood_wide,
-/area/f13/ncr)
+/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,
@@ -2015,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{
@@ -2024,6 +2480,25 @@
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
+ },
+=======
+"aIb" = (
+>>>>>>> Stashed changes
+/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{
@@ -2100,12 +2575,22 @@
},
/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"
+<<<<<<< Updated upstream
+/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)
+=======
+/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"
@@ -2121,6 +2606,27 @@
icon_state = "yellowrustychess"
},
/area/f13/ambientlighting/building/b)
+<<<<<<< Updated upstream
+"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,
+/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{
dir = 1;
@@ -2154,6 +2660,13 @@
icon_state = "housewood2"
},
/area/f13/ambientlighting/building/i)
+"aKn" = (
+/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)
"aKt" = (
/obj/structure/chair/office{
dir = 8
@@ -2174,6 +2687,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;
@@ -2181,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,
@@ -2200,6 +2727,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,
@@ -2252,6 +2788,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,
@@ -2270,6 +2809,14 @@
},
/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)
+"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,
@@ -2282,6 +2829,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,
@@ -2291,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,
@@ -2303,12 +2857,19 @@
icon_state = "reddirtyfull"
},
/area/f13/brotherhood)
+=======
"aMQ" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
+/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"
},
-/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"aMZ" = (
/obj/machinery/light,
/obj/effect/decal/cleanable/dirt,
@@ -2350,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{
@@ -2396,12 +2962,18 @@
/turf/open/floor/plating/f13/inside/gravel,
/area/f13/wasteland/town)
"aOz" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
+<<<<<<< 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,
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/ncr)
+/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";
@@ -2446,26 +3018,28 @@
},
/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"
},
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"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"
- },
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13{
- icon_state = "floorrusty"
+ icon_state = "yellowrustyfull"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"aPM" = (
/obj/structure/rack,
/obj/item/reagent_containers/food/snacks/kebab/human,
@@ -2486,21 +3060,27 @@
},
/area/f13/building/abandoned/h)
"aPP" = (
-/obj/effect/decal/remains/human,
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
+<<<<<<< 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/inside/mountain,
-/area/f13/caves)
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
+ },
+/area/f13/wasteland)
"aPS" = (
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/cleanable/cobweb{
+ dir = 1;
+ icon_state = "cobweb2"
},
-/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)
+/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,
@@ -2527,6 +3107,13 @@
},
/turf/open/indestructible/ground/outside/desert,
/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" = (
/obj/structure/anvil,
/obj/item/melee/smith/hammer/premade,
@@ -2538,11 +3125,14 @@
},
/turf/open/indestructible/ground/inside/dirt,
/area/f13/ambientlighting/building/d)
+<<<<<<< Updated upstream
+=======
"aQx" = (
-/obj/structure/bed/old,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/purple,
-/area/f13/ambientlighting/building/g)
+/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{
@@ -2551,6 +3141,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
@@ -2568,15 +3168,7 @@
"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)
+<<<<<<< Updated upstream
"aRk" = (
/obj/item/toy/cards/deck,
/obj/structure/table/booth,
@@ -2588,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
@@ -2608,7 +3217,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 +3265,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 +3284,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" = (
@@ -2686,16 +3294,19 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland/legion)
-"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"
+<<<<<<< Updated upstream
+"aSp" = (
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermainright"
},
-/turf/open/floor/plating/rust,
+/area/f13/wasteland)
+"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{
@@ -2713,6 +3324,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"
@@ -2739,13 +3368,19 @@
/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"
- },
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -2762,17 +3397,15 @@
icon_state = "bar"
},
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"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
+/obj/machinery/grill,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"aTU" = (
/obj/machinery/vending/tool,
/obj/effect/decal/cleanable/dirt{
@@ -2785,12 +3418,14 @@
"aTW" = (
/turf/closed/mineral/random,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"aTY" = (
-/obj/structure/flora/tree/wasteland,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow5"
- },
+/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,
@@ -2803,22 +3438,14 @@
/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)
+<<<<<<< Updated upstream
"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
@@ -2827,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,
@@ -2839,15 +3501,21 @@
},
/turf/closed/mineral/random/low_chance,
/area/f13/building/tribal)
-"aVc" = (
-/obj/structure/flora/stump{
- pixel_x = -27;
- pixel_y = 16
+<<<<<<< Updated upstream
+"aUY" = (
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = -4;
+ pixel_x = 16
},
-/obj/structure/flora/branch_broken,
-/obj/structure/destructible/tribal_torch/wall/lit,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/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,
@@ -2960,6 +3628,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{
@@ -2967,32 +3641,65 @@
},
/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)
+<<<<<<< Updated upstream
"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
+/obj/structure/table/snooker{
+ dir = 1
+ },
+/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{
@@ -3029,11 +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/effect/decal/cleanable/dirt/dust,
-/obj/effect/landmark/start/f13/ncrrearechelon,
-/turf/open/floor/wood_wide,
-/area/f13/ncr)
+/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
@@ -3065,6 +3777,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/ncr)
"aXW" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible/ground/outside/road{
@@ -3102,6 +3832,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
@@ -3152,10 +3888,26 @@
/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/turf_decal/weather/snow/corner,
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/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,
/area/engine/workshop)
@@ -3173,40 +3925,66 @@
},
/area/f13/ambientlighting/building/i)
"aZt" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/fence/corner{
+<<<<<<< Updated upstream
+ dir = 4
},
-/obj/machinery/door/poddoor/shutters{
- id = "MallStorage";
- name = "Mall Storage"
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 4;
+ icon_state = "outerturn"
},
-/turf/open/floor/plasteel/f13/vault_floor/plating,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+"aZz" = (
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ambientlighting/building/x)
+"aZK" = (
+/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/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/machinery/door/unpowered/secure_NCR,
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/structure/wreck/trash/one_tire,
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
"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)
+/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" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor/f13/wood,
+<<<<<<< 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
@@ -3279,15 +4057,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)
@@ -3399,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
@@ -3432,17 +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/effect/turf_decal/weather/dirt{
- dir = 4
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/obj/machinery/hydroponics/soil{
- mutmod = 0;
- name = "ancient fertile soil";
- yieldmod = 1.3
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain2"
},
-/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"bdc" = (
/obj/structure/debris/v4,
/turf/open/indestructible/ground/outside/sidewalk,
@@ -3474,6 +4253,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,
@@ -3484,13 +4273,23 @@
/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)
+<<<<<<< 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{
@@ -3526,16 +4325,21 @@
},
/turf/open/indestructible/ground/outside/grass,
/area/f13/wasteland)
-"beU" = (
-/obj/item/kirbyplants{
- icon_state = "plant-12";
- pixel_y = 21;
- pixel_x = -14
- },
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+<<<<<<< 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
@@ -3592,10 +4396,32 @@
icon_state = "dirtcorner"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"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)
+=======
+"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{
@@ -3609,22 +4435,30 @@
/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
+ },
+/area/f13/wasteland)
+"bgw" = (
+/turf/closed/wall/r_wall/rust,
+=======
"bgn" = (
-/obj/machinery/microwave/stove,
-/obj/item/crafting/coffee_pot{
- pixel_y = 15
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/structure/sign/poster/prewar/poster74{
- pixel_x = 32
+/turf/open/floor/plating/f13/inside/gravel/edge{
+ dir = 1
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/wasteland)
"bgw" = (
-/obj/structure/table/wood,
-/obj/structure/barricade/sandbags,
-/obj/structure/barricade/bars,
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/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{
dir = 8
@@ -3644,6 +4478,39 @@
/obj/structure/nest/scorpion,
/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"
+ },
+/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{
@@ -3661,6 +4528,10 @@
},
/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+"bgZ" = (
+/obj/structure/target_stake,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
"bhi" = (
/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/high,
/obj/structure/reagent_dispensers/barrel/two,
@@ -3676,18 +4547,17 @@
icon_state = "outerborder"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 8
},
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
+ },
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"bhD" = (
/obj/structure/chair/wood{
dir = 8
@@ -3766,16 +4636,18 @@
icon_state = "yellowrustyfull"
},
/area/f13/ambientlighting/building/f)
+<<<<<<< Updated upstream
+=======
"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"
+/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"
@@ -3783,10 +4655,15 @@
/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)
+<<<<<<< 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,
@@ -3827,6 +4704,12 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+"bjo" = (
+/obj/structure/chair/bench,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
+ },
+/area/f13/wasteland)
"bjA" = (
/obj/structure/flora/grass/wasteland{
icon_state = "tall_grass_4";
@@ -3836,35 +4719,36 @@
icon_state = "dirtcorner"
},
/area/f13/wasteland)
-"bjI" = (
-/obj/structure/railing{
- dir = 5
- },
-/turf/open/floor/f13{
- icon_state = "floorrusty"
- },
-/area/f13/ambientlighting/building/g)
+<<<<<<< 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/structure/chair{
- dir = 8
+/obj/effect/turf_decal/big{
+ dir = 4
},
-/obj/effect/decal/fakelattice,
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/cleanable/oil{
+ icon_state = "floor2";
+ pixel_x = -12
+ },
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/raider/ranged,
-/turf/open/floor/plating/rust,
-/area/f13/ambientlighting/building/j)
-"bki" = (
-/turf/closed/wall/f13/tentwall,
/area/f13/ncr)
+>>>>>>> Stashed changes
+"bki" = (
+/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,
@@ -3883,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{
@@ -3930,6 +4825,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
@@ -3938,9 +4842,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" = (
@@ -3959,13 +4861,17 @@
/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
+<<<<<<< Updated upstream
+/obj/effect/spawner/lootdrop/wastelootgood,
+/obj/effect/decal/cleanable/dirt,
+=======
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_y = -7
},
-/turf/open/floor/carpet/red,
-/area/f13/ncr)
+>>>>>>> Stashed changes
+/turf/open/floor/f13/wood,
+/area/f13/ambientlighting/building/m)
"blS" = (
/obj/item/storage/trash_stack{
icon_state = "trash_2"
@@ -3976,17 +4882,15 @@
},
/area/f13/wasteland)
"blT" = (
+<<<<<<< Updated upstream
/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,
+=======
+/turf/open/floor/wood_wide,
+>>>>>>> Stashed changes
/area/f13/ambientlighting/building/j)
"blV" = (
/obj/structure/table,
@@ -4037,15 +4941,40 @@
/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" = (
/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"
@@ -4069,18 +4998,53 @@
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
},
/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
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/fluff/rug/rug_rubber,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
+ },
+/area/f13/ncr)
"bnN" = (
/obj/structure/table/wood,
/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)
+"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{
@@ -4091,6 +5055,17 @@
icon_state = "floorrusty"
},
/area/f13/followers)
+"bok" = (
+/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)
"bop" = (
/obj/structure/closet/crate/wicker,
/turf/open/indestructible/ground/outside/dirt,
@@ -4105,17 +5080,29 @@
/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{
- pixel_y = 17
+<<<<<<< Updated upstream
+/obj/structure/wreck/trash/machinepile,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontalbottomborderbottom0"
},
-/obj/machinery/reagentgrinder{
- pixel_y = -1;
- pixel_x = -2
+=======
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 8
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
+ },
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"bph" = (
/obj/machinery/door/airlock/virology/glass{
req_one_access_txt = "133"
@@ -4128,10 +5115,19 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"bpn" = (
-/obj/structure/flora/stump,
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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)
@@ -4145,13 +5141,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
@@ -4200,8 +5196,30 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland/legion)
"bqb" = (
-/turf/closed/wall/f13/wood,
-/area/f13/ncr)
+<<<<<<< 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,
/turf/open/floor/wood_common,
@@ -4214,6 +5232,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"
@@ -4225,14 +5249,18 @@
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/machinery/radioterminal/ncr,
-/obj/structure/curtain{
- color = "#808080";
- pixel_x = -32
- },
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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,
/obj/effect/decal/cleanable/greenglow,
@@ -4246,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
@@ -4255,6 +5289,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
@@ -4269,6 +5308,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;
@@ -4305,14 +5350,7 @@
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)
+<<<<<<< Updated upstream
"bsi" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/glass/bottle/blackpowder,
@@ -4328,11 +5366,28 @@
},
/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)
+=======
+"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{
@@ -4386,21 +5441,22 @@
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"
+<<<<<<< Updated upstream
+=======
+"btv" = (
+/obj/structure/window/fulltile/house{
+ dir = 2;
+ icon_state = "housewindowbroken"
},
-/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2,
+/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
@@ -4420,10 +5476,31 @@
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/w)
"btN" = (
-/obj/structure/obstacle/barbedwire/end{
- dir = 4
+<<<<<<< Updated upstream
+/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"
+=======
+/obj/effect/decal/cleanable/glass,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaltopbordertop2"
+>>>>>>> Stashed changes
},
-/turf/open/indestructible/ground/outside/snow,
/area/f13/wasteland)
"btS" = (
/obj/structure/closet/fridge,
@@ -4431,6 +5508,22 @@
icon_state = "housewood2"
},
/area/f13/building/abandoned/t)
+<<<<<<< Updated upstream
+"btY" = (
+/obj/structure/filingcabinet/chestdrawer,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood_wide{
+ 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,
@@ -4445,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)
@@ -4463,20 +5561,15 @@
color = "00FFFF"
},
/area/maintenance/bar)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 9
},
-/turf/open/floor/plasteel/f13/vault_floor/red/white,
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"bvj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -4514,16 +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/turf_decal/weather/snow/corner{
- dir = 1
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 4
},
-/obj/structure/sink/well{
- pixel_x = -20
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 8;
+ icon_state = "outerborder"
},
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"bvI" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/f13,
@@ -4550,6 +5652,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"
@@ -4568,9 +5676,23 @@
/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)
+<<<<<<< Updated upstream
+/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"
+=======
+/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" = (
/obj/structure/table/wood,
/obj/effect/spawner/lootdrop/f13/medical/vault/meds,
@@ -4616,6 +5738,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,
@@ -4667,8 +5796,7 @@
/area/f13/ambientlighting/building/m)
"bya" = (
/obj/structure/chair/f13chair2{
- dir = 1;
- icon_state = "f13chair2"
+ dir = 1
},
/obj/machinery/light{
flickering = 1
@@ -4677,22 +5805,77 @@
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,
/area/f13/wasteland)
+"byy" = (
+/obj/structure/chair/wood/wings{
+ dir = 1
+ },
+/turf/open/floor/plasteel/grimy,
+/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)
+"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{
icon_state = "bar"
},
/area/f13/ambientlighting/building/g)
+"byQ" = (
+/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)
+"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{
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
@@ -4708,20 +5891,23 @@
/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,
+/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{
@@ -4732,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{
@@ -4782,11 +5977,15 @@
icon_state = "floorrusty"
},
/area/f13/followers)
+<<<<<<< Updated upstream
+=======
"bAG" = (
-/obj/structure/table/wood/settler,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/green,
-/area/f13/ambientlighting/building/g)
+/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
@@ -4801,18 +6000,27 @@
/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)
+<<<<<<< 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{
icon_state = "horizontalinnermain2"
},
/area/f13/wasteland)
+"bBt" = (
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
+ },
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
"bBu" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/barricade/tentclothcorner{
@@ -4832,22 +6040,20 @@
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,
-/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)
+<<<<<<< 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{
@@ -4882,10 +6088,22 @@
},
/turf/open/floor/plasteel/f13/vault_floor/misc/vault1,
/area/maintenance/bar)
+<<<<<<< Updated upstream
+"bCu" = (
+/obj/effect/decal/fakelattice,
+/obj/effect/decal/cleanable/blood{
+ icon_state = "gib2_flesh"
+ },
+/turf/open/floor/plating/rust,
+/area/f13/ambientlighting/building/j)
+=======
"bCH" = (
-/mob/living/simple_animal/chicken,
-/turf/open/indestructible/ground/outside/snow,
+/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)
@@ -4902,6 +6120,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{
@@ -4909,12 +6131,19 @@
},
/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)
+<<<<<<< Updated upstream
+=======
+/obj/structure/junk/locker,
+>>>>>>> Stashed changes
+/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,
@@ -4929,6 +6158,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
@@ -4938,9 +6178,15 @@
/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,
-/area/f13/caves)
+<<<<<<< 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,
/obj/structure/reagent_dispensers/barrel/dangerous{
@@ -4965,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,
@@ -4976,6 +6232,27 @@
icon_state = "housewood2"
},
/area/f13/building/abandoned/a)
+<<<<<<< Updated upstream
+"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)
+=======
+"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{
@@ -5061,9 +6338,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"
@@ -5084,11 +6364,22 @@
},
/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,
/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"
@@ -5096,18 +6387,28 @@
/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
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -5117,6 +6418,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
@@ -5126,32 +6431,44 @@
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)
-"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
+<<<<<<< Updated upstream
+"bGD" = (
+/obj/item/storage/trash_stack{
+ icon_state = "trash_2"
},
-/obj/structure/sign/poster/ncr/democracy{
- pixel_y = -32
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaltopbordertop3"
},
-/obj/effect/turf_decal/weather/dirt{
- dir = 4
+=======
+"bGB" = (
+/mob/living/simple_animal/hostile/renegade/guardian,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"bGH" = (
-/obj/effect/spawner/lootdrop/trash,
-/turf/open/indestructible/ground/outside/dirt,
+/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"
+ },
+/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/wasteland)
"bGM" = (
/obj/structure/barricade/sandbags,
@@ -5171,6 +6488,14 @@
/obj/effect/overlay/desert/sonora/edge,
/turf/open/floor/plating/f13/inside/gravel,
/area/f13/wasteland/town)
+"bGS" = (
+/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)
"bHd" = (
/obj/effect/decal/fakelattice,
/obj/structure/disposalpipe/segment{
@@ -5186,38 +6511,37 @@
/obj/effect/landmark/poster_spawner/pinup,
/turf/closed/wall/f13/wood,
/area/f13/building/abandoned/g)
+<<<<<<< Updated upstream
+=======
"bHs" = (
-/obj/machinery/recharge_station,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/car/rubbish2{
+ pixel_x = 7;
+ pixel_y = -16
},
-/obj/item/reagent_containers/food/snacks/fudgedice,
-/turf/open/floor/plasteel/f13/vault_floor/red/white,
-/area/f13/ambientlighting/building/j)
+/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" = (
-/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
+<<<<<<< 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"
},
-/obj/effect/landmark/start/f13/ncrconscript,
-/turf/open/indestructible/ground/outside/graveldirt,
+>>>>>>> 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{
@@ -5260,13 +6584,24 @@
/turf/open/floor/wood_common,
/area/maintenance/bar)
"bHY" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
+<<<<<<< Updated upstream
+/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)
+=======
+/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)
@@ -5289,6 +6624,21 @@
/obj/machinery/smartfridge/bottlerack/seedbin/primitive,
/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"
@@ -5322,14 +6672,19 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"bJW" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< 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/floor/f13{
- icon_state = "floorrusty"
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"bJX" = (
/obj/structure/table/reinforced,
/obj/structure/barricade/bars,
@@ -5413,12 +6768,23 @@
/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{
+<<<<<<< Updated upstream
+ 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,
+/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{
@@ -5426,9 +6792,36 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+"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,
+/area/f13/wasteland)
+=======
+ icon_state = "horizontaloutermain0"
+ },
+/area/f13/wasteland)
+"bLo" = (
+/obj/structure/lattice,
+/turf/open/floor/plating/rust,
+/area/f13/ambientlighting/building/u)
"bLC" = (
-/turf/open/floor/plating/dirt,
+/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,
@@ -5447,6 +6840,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,
@@ -5461,12 +6858,16 @@
icon_state = "housewood2"
},
/area/f13/building/abandoned/a)
+<<<<<<< Updated upstream
+=======
"bMp" = (
-/obj/structure/fluff/hedge,
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1"
+/obj/effect/overlay/rockfloor_side,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"bMJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old{
@@ -5479,9 +6880,15 @@
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,
+/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)
@@ -5499,13 +6906,16 @@
/obj/machinery/computer/slot_machine,
/turf/open/floor/carpet/purple,
/area/f13/bar)
+<<<<<<< Updated upstream
+=======
"bNa" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
+/obj/structure/window/fulltile/ruins{
+ icon_state = "ruinswindowbroken"
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/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"
@@ -5539,6 +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
@@ -5556,15 +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/effect/decal/cleanable/dirt/dust,
-/obj/machinery/vending/cola/random,
+/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 = "floorrusty"
+ icon_state = "yellowrustyfull"
},
-/area/f13/ambientlighting/building/g)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"bNK" = (
/obj/structure/car/rubbish4{
pixel_x = -11;
@@ -5580,6 +7012,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"
@@ -5588,13 +7028,25 @@
icon_state = "verticalrightborderright0"
},
/area/f13/wasteland)
-"bNV" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 10
+<<<<<<< Updated upstream
+=======
+"bNP" = (
+/obj/structure/destructible/tribal_torch/lit{
+ pixel_x = 13;
+ pixel_y = 9
},
-/obj/structure/destructible/tribal_torch/wall/lit,
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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"
@@ -5604,15 +7056,13 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"bOc" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
- },
-/obj/item/storage/trash_stack{
- pixel_y = 18
- },
-/turf/open/indestructible/ground/outside/graveldirt,
+/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{
@@ -5633,6 +7083,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{
@@ -5686,7 +7146,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)
@@ -5818,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{
@@ -5874,11 +7340,26 @@
/turf/open/floor/plating,
/area/f13/bar)
"bRy" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
+<<<<<<< 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
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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,
@@ -5891,6 +7372,22 @@
"bRM" = (
/turf/open/indestructible/ground/outside/dirt,
/area/f13/ambientlighting/building/k)
+"bRO" = (
+/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)
+"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
@@ -5907,11 +7404,22 @@
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,
/area/f13/legioncamp)
+"bSi" = (
+/obj/structure/filingcabinet,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
+"bSj" = (
+/obj/structure/chair/wood/wings{
+ dir = 8
+ },
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"bSo" = (
/obj/effect/mob_spawn/human/corpse/enclave/soldier,
/obj/effect/decal/cleanable/blood/old{
@@ -5945,24 +7453,32 @@
icon_state = "verticalleftborderright2"
},
/area/f13/ambientlighting/building/o)
-"bSF" = (
-/obj/structure/obstacle/barbedwire{
- dir = 4
+"bSZ" = (
+/obj/structure/cable/outdoors{
+ icon_state = "1-8"
},
-/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
- icon_state = "dirt"
+/obj/structure/cable/outdoors{
+ icon_state = "2-8"
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain2"
},
/area/f13/wasteland)
-"bSY" = (
-/obj/structure/rack,
-/obj/item/restraints/handcuffs,
-/obj/item/restraints/handcuffs,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+"bTn" = (
+/obj/structure/table,
+/obj/machinery/computer/terminal/stored_password{
+ dir = 4;
+ door_id = "evilassdoor"
},
-/turf/open/floor/plasteel/f13/vault_floor/red/white,
+/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
@@ -6009,14 +7525,14 @@
/obj/effect/landmark/start/f13/recleg,
/turf/open/floor/f13/wood,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"bTU" = (
-/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/fakelattice,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/indestructible/ground/outside/ruins{
+ icon_state = "rubblepillar"
},
-/turf/open/floor/plating/rust,
/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"bUf" = (
/obj/structure/car/rubbish1,
/turf/open/indestructible/ground/outside/road{
@@ -6036,9 +7552,26 @@
},
/area/f13/followers)
"bUo" = (
-/obj/structure/loot_pile,
-/turf/open/indestructible/ground/outside/snow,
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -6063,9 +7596,16 @@
/turf/open/floor/wood_fancy,
/area/f13/building/abandoned/x)
"bUW" = (
+<<<<<<< Updated upstream
/obj/machinery/vending/coffee,
/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/p)
+=======
+/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{
dir = 1
@@ -6079,19 +7619,35 @@
},
/turf/open/floor/plasteel/f13/stone/rugged,
/area/f13/ambientlighting/building/d)
+<<<<<<< Updated upstream
"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/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;
@@ -6122,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,
@@ -6149,18 +7716,23 @@
/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
+<<<<<<< Updated upstream
+/obj/structure/fence/wooden,
+/obj/item/flag/legion{
+ pixel_y = 28;
+ pixel_x = 1
},
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/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"
},
-/area/f13/ncr)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/outside/sidewalk,
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"bXd" = (
/obj/structure/tires/five,
/turf/open/indestructible/ground/outside/sidewalk,
@@ -6193,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,
@@ -6209,6 +7799,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"
@@ -6229,17 +7830,21 @@
},
/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
+<<<<<<< Updated upstream
+"bYl" = (
+/obj/structure/chair/wood/wings{
+ dir = 4
},
-/turf/open/indestructible/ground/outside/dirt{
- dir = 10;
- icon_state = "dirt"
+/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{
@@ -6256,12 +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/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
+/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
@@ -6270,14 +7889,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)
@@ -6292,6 +7910,21 @@
/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"
+ },
+/turf/open/floor/wood_common/wood_common_light,
+/area/f13/ncr)
"bZt" = (
/obj/item/mine/shrapnel{
alpha = 65
@@ -6318,16 +7951,15 @@
},
/turf/open/floor/plating/f13/inside/gravel,
/area/f13/wasteland/town)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -6369,21 +8001,18 @@
/obj/item/clothing/glasses/sunglasses,
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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"
+/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{
@@ -6402,6 +8031,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,
@@ -6411,15 +8046,19 @@
/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
+<<<<<<< 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"
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"caM" = (
/obj/structure/car/rubbish1{
pixel_y = -16
@@ -6469,6 +8108,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,
@@ -6477,10 +8120,17 @@
},
/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)
+<<<<<<< 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,
/obj/machinery/light{
@@ -6519,6 +8169,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{
@@ -6597,6 +8254,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,
@@ -6662,22 +8327,17 @@
/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)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -6704,19 +8364,24 @@
/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/structure/flora/rock/jungle{
+ icon_state = "rock3";
+ pixel_x = -3
},
-/obj/item/reagent_containers/hypospray/medipen/stimpak{
- pixel_y = 5;
- pixel_x = 4
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+<<<<<<< Updated upstream
+=======
+"cfY" = (
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 8
},
-/obj/structure/sign/poster/ncr/irradiated_food{
- pixel_y = 32
+/obj/effect/spawner/lootdrop/f13/junkspawners,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalleftborderleft0"
},
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"cga" = (
/obj/structure/destructible/tribal_torch/wall/lit{
dir = 4
@@ -6730,16 +8395,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,
@@ -6750,17 +8407,60 @@
icon_state = "redrustyfull"
},
/area/f13/building/abandoned/t)
+<<<<<<< Updated upstream
"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"
+ },
+/area/f13/ncr)
+"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"
},
-/turf/open/indestructible/ground/outside/sidewalk,
/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/structure/simple_door,
-/obj/structure/closet/cardboard,
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/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,
@@ -6771,6 +8471,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
@@ -6787,6 +8497,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)
@@ -6800,10 +8514,18 @@
icon_state = "horizontalinnermain2left"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"chQ" = (
-/obj/item/flag/ncr/snow,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/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,
@@ -6833,14 +8555,29 @@
/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,
+<<<<<<< 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,
@@ -6860,12 +8597,20 @@
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
"cjq" = (
-/obj/structure/window/fulltile/house{
- icon_state = "housewindowbrokenvertical"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -6883,6 +8628,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,
@@ -6891,19 +8643,22 @@
/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/ore_box,
-/turf/open/floor/plating/dirt,
-/area/f13/ncr)
+/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{
- icon_state = "0-1"
- },
+/obj/structure/cable,
/turf/open/floor/f13{
color = "#ffe9de";
icon_state = "darkrusty";
@@ -6934,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,
@@ -6952,6 +8718,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{
@@ -6986,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"
@@ -7019,14 +8800,21 @@
/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"
+<<<<<<< Updated upstream
+/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"
+=======
+/obj/structure/chair/stool{
+ icon_state = "bench"
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
+>>>>>>> Stashed changes
+ },
+/area/f13/wasteland)
"cli" = (
/obj/structure/table/wood/settler,
/turf/open/floor/carpet,
@@ -7061,10 +8849,15 @@
/obj/effect/decal/cleanable/blood/gibs/human/limb,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"cml" = (
-/obj/machinery/smartfridge/bottlerack/grownbin,
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/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"
@@ -7184,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
@@ -7191,6 +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,
@@ -7208,6 +9024,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";
@@ -7234,31 +9055,33 @@
/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/structure/chair/stool,
-/obj/machinery/light/broken,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/p)
+/obj/effect/decal/marking{
+ pixel_x = -14
+ },
+/turf/open/indestructible/ground/outside/road{
+ dir = 1;
+ icon_state = "horizontaltopborderbottom0"
+ },
+/area/f13/wasteland)
"cpt" = (
/turf/closed/wall/f13/wood/house/broken,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"cpw" = (
-/obj/structure/chair/wood{
- dir = 8
- },
-/obj/effect/decal/cleanable/cobweb{
- dir = 1;
- icon_state = "cobweb2"
- },
-/obj/structure/decoration/clock/old{
- pixel_y = 29;
- pixel_x = -1
- },
-/obj/machinery/light/small{
- dir = 1
+/obj/structure/chair/stool/retro/black,
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/turf/open/floor/wood_common/wood_common_dark,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/ncr)
+>>>>>>> Stashed changes
"cpK" = (
/obj/structure/toilet{
pixel_y = 13
@@ -7268,6 +9091,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/ncr)
"cqa" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -7280,6 +9116,31 @@
},
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/d)
+<<<<<<< Updated upstream
+"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)
+=======
+"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,
@@ -7306,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{
@@ -7390,6 +9259,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,
@@ -7401,18 +9275,13 @@
icon_state = "housewood2"
},
/area/f13/building/abandoned/s)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -7466,7 +9335,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"
@@ -7481,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,
@@ -7555,8 +9433,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,
@@ -7569,13 +9446,23 @@
},
/area/f13/wasteland)
"cuA" = (
-/obj/structure/table,
-/obj/machinery/computer/terminal{
- dir = 4;
- termtag = "Public"
+<<<<<<< Updated upstream
+/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,
-/area/f13/caves)
+/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,
/area/f13/building/powered)
@@ -7589,11 +9476,16 @@
},
/turf/open/floor/wood_fancy/wood_fancy_dark,
/area/f13/bar)
+<<<<<<< Updated upstream
+=======
"cva" = (
-/obj/structure/dresser,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/red,
-/area/f13/ambientlighting/building/g)
+/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,
@@ -7612,12 +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/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/turf/open/floor/plating/rust,
+/area/f13/sewer/powered)
+>>>>>>> Stashed changes
"cvF" = (
/obj/structure/chair/sofa/right{
dir = 4
@@ -7627,7 +9524,6 @@
"cvH" = (
/obj/structure/reagent_dispensers/barrel/four,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -7667,6 +9563,15 @@
icon_state = "horizontalinnermain2left"
},
/area/f13/wasteland)
+"cwi" = (
+/obj/structure/fence{
+ dir = 8
+ },
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
+ },
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/ncr)
"cwn" = (
/obj/structure/reagent_dispensers/barrel/dangerous,
/obj/structure/reagent_dispensers/barrel/dangerous{
@@ -7691,10 +9596,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,
@@ -7855,9 +9760,17 @@
/turf/open/floor/carpet/purple,
/area/f13/bar)
"cym" = (
-/obj/structure/simple_door/interior,
+<<<<<<< Updated upstream
+/obj/item/vending_refill/coffee,
/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/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,
@@ -7927,6 +9840,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
@@ -7952,6 +9870,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 +9899,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,
@@ -7986,11 +9911,25 @@
},
/area/f13/wasteland)
"cAe" = (
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -8086,6 +10025,11 @@
/obj/item/trade_sign,
/turf/open/indestructible/ground/outside/road,
/area/f13/wasteland/town)
+"cBO" = (
+/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{
@@ -8123,28 +10067,48 @@
/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)
+"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,
/area/f13/wasteland)
"cCJ" = (
-/obj/structure/bed/mattress{
- icon_state = "mattress2";
- pixel_y = 7
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -8182,13 +10146,15 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/building/abandoned/g)
+<<<<<<< Updated upstream
+=======
"cDp" = (
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 1
},
-/turf/open/floor/plating/dirt,
-/area/f13/ambientlighting/building/j)
+/turf/open/floor/wood_common,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"cDr" = (
/obj/structure/sign/directions/security{
dir = 4
@@ -8203,11 +10169,18 @@
/turf/closed/mineral/random,
/area/f13/wasteland)
"cDz" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 4
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/blood{
+ icon_state = "tracks"
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+=======
+/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" = (
/obj/structure/wreck/trash/machinepiletwo{
pixel_x = 2;
@@ -8229,15 +10202,36 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/legioncamp)
"cDN" = (
-/obj/item/storage/trash_stack{
- icon_state = "trash_2"
+<<<<<<< Updated upstream
+/obj/structure/flora/rock/pile/largejungle,
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = -4;
+ pixel_x = -16
},
-/obj/structure/flora/grass/brown{
- pixel_x = 9;
- pixel_y = 11
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+"cDQ" = (
+/obj/effect/decal/cleanable/blood{
+ dir = 13;
+ icon_state = "tracks";
+ pixel_y = 8
},
-/turf/open/indestructible/ground/outside/snow,
+/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
@@ -8247,11 +10241,24 @@
},
/turf/open/indestructible/ground/outside/grass,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"cDX" = (
-/obj/structure/closet/crate/miningcar,
+/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/inside/mountain,
-/area/f13/ncr)
+/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{
@@ -8281,10 +10288,26 @@
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -8303,34 +10326,35 @@
/obj/machinery/vending/cigarette/syndicate,
/turf/open/floor/plasteel/f13/vault_floor/misc/bar,
/area/f13/building/abandoned/l)
-"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
+<<<<<<< Updated upstream
+"cEN" = (
+/obj/item/ammo_box/magazine/m556/rifle/assault{
+ pixel_x = 2
},
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_y = 5;
- pixel_x = -7
+/obj/item/ammo_box/magazine/m556/rifle/assault{
+ pixel_x = -4
},
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 10;
- pixel_y = 4
+/obj/structure/rack/shelf_metal,
+/obj/item/ammo_box/magazine/m556/rifle/assault{
+ pixel_x = -4
},
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 5;
- pixel_y = 4
+/obj/item/ammo_box/magazine/m556/rifle/assault{
+ pixel_x = -4
},
-/turf/open/floor/wood_common/wood_common_dark,
+/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
@@ -8383,6 +10407,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,
@@ -8391,6 +10423,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,
@@ -8415,6 +10455,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{
@@ -8427,6 +10474,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{
@@ -8480,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,
@@ -8525,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{
@@ -8532,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,
@@ -8568,13 +10648,17 @@
/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)
+<<<<<<< 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,
@@ -8595,12 +10679,15 @@
/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"
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/f13/wood{
+ icon_state = "housewood2-broken"
},
-/area/f13/wasteland)
+=======
+/turf/closed/wall/f13/ruins,
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/m)
"cIu" = (
/obj/structure/sink{
dir = 1;
@@ -8617,6 +10704,13 @@
},
/turf/open/floor/plating/rust,
/area/f13/followers)
+"cIz" = (
+/obj/structure/table,
+/obj/structure/cable/outdoors{
+ icon_state = "2-8"
+ },
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
"cIE" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/camera/autoname{
@@ -8675,12 +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" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken3"
+/mob/living/simple_animal/hostile/renegade/soldier,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
},
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"cJl" = (
/obj/structure/simple_door/metal/store{
icon_state = "brokenstore"
@@ -8689,6 +10791,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,28 +10806,34 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland/legion)
+"cJB" = (
+/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)
"cJT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/barricade/tentclothedge,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/structure/table/snooker{
+ dir = 6
},
-/turf/open/floor/plating/rust,
-/area/f13/ambientlighting/building/j)
+/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
@@ -8731,10 +10843,15 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"cJZ" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/green,
-/area/f13/ambientlighting/building/g)
+/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{
@@ -8750,17 +10867,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"
@@ -8775,18 +10892,38 @@
/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"
+<<<<<<< Updated upstream
+/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{
+/obj/structure/chair/wood{
dir = 8
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/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,
/obj/effect/overlay/desert_side{
@@ -8845,6 +10982,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/ncr)
"cLP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/gibspawner/human,
@@ -8866,10 +11010,22 @@
/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)
+<<<<<<< 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"
@@ -8885,20 +11041,13 @@
},
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/r)
+<<<<<<< Updated upstream
+=======
"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)
+/obj/machinery/light,
+/turf/open/floor/wood_common,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"cMK" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -8913,13 +11062,31 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"cMW" = (
-/obj/item/storage/trash_stack{
- icon_state = "trash_2"
+<<<<<<< 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 = "verticaloutermain1"
+ icon_state = "outerturn"
},
/area/f13/wasteland)
+>>>>>>> Stashed changes
"cNt" = (
/obj/structure/flora/ausbushes/brflowers,
/turf/open/indestructible/ground/outside/desert,
@@ -8940,18 +11107,19 @@
icon_state = "outerpavement"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"cNI" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6
- },
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/effect/turf_decal/weather/dirt{
dir = 5
},
-/obj/structure/closet/crate/grave,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/obj/effect/turf_decal/weather/dirt{
+ dir = 8
},
-/area/f13/wasteland)
+/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"
@@ -8989,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"
@@ -9007,11 +11188,18 @@
/turf/open/floor/f13/wood,
/area/f13/building/abandoned/b)
"cPG" = (
-/obj/item/storage/trash_stack{
- icon_state = "Junk_3"
+<<<<<<< Updated upstream
+/obj/item/tele_iv,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+=======
+/obj/structure/chair/office/dark{
+ dir = 8
+ },
+/turf/open/indestructible/ground/outside/sidewalk,
+>>>>>>> Stashed changes
+/area/f13/ncr)
"cPH" = (
/obj/effect/overlay/desert_side{
dir = 4
@@ -9073,9 +11261,15 @@
icon_state = "bar"
},
/area/f13/ambientlighting/building/g)
+<<<<<<< Updated upstream
+=======
"cQi" = (
-/obj/structure/barricade/wooden/strong,
-/turf/closed/wall/f13/wood/house,
+/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{
@@ -9084,6 +11278,7 @@
},
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/e)
+>>>>>>> Stashed changes
"cQy" = (
/obj/structure/barricade/sandbags,
/turf/open/indestructible/ground/outside/grass/corner,
@@ -9097,6 +11292,21 @@
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)
+"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,
@@ -9112,18 +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/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)
+/obj/effect/decal/cleanable/generic,
+/obj/item/reagent_containers/pill/patch/healpoultice,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"cRj" = (
-/turf/open/indestructible/ground/outside/graveldirt,
+/obj/structure/sign/poster/ncr/irradiated_food,
+/turf/closed/wall/f13/wood/interior,
/area/f13/ncr)
+>>>>>>> Stashed changes
"cRm" = (
/obj/structure/fence{
dir = 8
@@ -9151,16 +11366,35 @@
},
/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)
+<<<<<<< Updated upstream
+/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,
+=======
+/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,
/turf/open/indestructible/ground/outside/desert,
@@ -9174,12 +11408,12 @@
},
/area/f13/wasteland)
"cSa" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/f13{
- icon_state = "bluerustysolid"
- },
+/obj/effect/decal/fakelattice,
+<<<<<<< Updated upstream
+/obj/item/electropack/shockcollar/explosive,
+=======
+>>>>>>> Stashed changes
+/turf/open/floor/plating/rust,
/area/f13/ambientlighting/building/j)
"cSc" = (
/obj/structure/reagent_dispensers/barrel/three,
@@ -9215,10 +11449,17 @@
/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)
+<<<<<<< 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,
/obj/effect/turf_decal/weather/dirt{
@@ -9277,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;
@@ -9307,7 +11557,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{
@@ -9390,11 +11642,26 @@
/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"
+<<<<<<< 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
},
-/area/f13/ambientlighting/building/p)
+/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,
@@ -9496,15 +11763,14 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/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;
@@ -9513,7 +11779,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,
@@ -9532,6 +11800,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
@@ -9583,18 +11855,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;
@@ -9617,13 +11877,17 @@
/obj/machinery/vending/coffee,
/turf/open/floor/wood_common,
/area/f13/clinic)
+<<<<<<< Updated upstream
+=======
"cYL" = (
-/obj/structure/railing{
- color = "#A47449"
+/obj/structure/window/fulltile/house{
+ icon_state = "housewindowbrokenvertical"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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{
@@ -9639,13 +11903,16 @@
/obj/structure/simple_door/tent,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"cYT" = (
-/obj/structure/curtain{
- color = "#808080";
- pixel_x = -32
- },
-/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)
+>>>>>>> Stashed changes
"cYW" = (
/obj/structure/table/reinforced,
/obj/structure/barricade/bars{
@@ -9676,12 +11943,18 @@
/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
/area/f13/ambientlighting/building/o)
"cZx" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/effect/decal/fakelattice,
+/turf/open/indestructible/ground/outside/ruins,
+>>>>>>> Stashed changes
/area/f13/ambientlighting/building/j)
"cZD" = (
/obj/structure/rack,
@@ -9692,6 +11965,13 @@
icon_state = "whitegreenrustychess"
},
/area/f13/ambientlighting/building/i)
+"cZH" = (
+/obj/structure/table/wood/junk,
+/obj/item/statuebust{
+ pixel_y = 16
+ },
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"cZI" = (
/obj/effect/turf_decal/weather/dirt{
dir = 8
@@ -9751,13 +12031,24 @@
/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/ncr)
"daz" = (
/obj/structure/fence/corner,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"daG" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/trash,
/turf/open/indestructible/ground/outside/ruins,
/area/f13/wasteland)
"daI" = (
@@ -9771,15 +12062,34 @@
/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)
+<<<<<<< Updated upstream
+"daW" = (
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 8
+ },
+/obj/effect/spawner/lootdrop/f13/junkspawners,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalleftborderleft0"
},
-/turf/open/indestructible/ground/outside/snow,
/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"
+ },
+/area/f13/wasteland)
+=======
+>>>>>>> Stashed changes
"dbb" = (
/obj/effect/turf_decal/huge{
dir = 1
@@ -9801,11 +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" = (
-/turf/open/floor/f13/wood{
- icon_state = "housewood3-broken"
+/obj/machinery/smartfridge/bottlerack{
+ pixel_x = -3
},
-/area/f13/ncr)
+/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;
@@ -9826,13 +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/table,
-/obj/effect/decal/cleanable/dirt/dust,
+/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 = "bluedirtychess2"
+ icon_state = "yellowrustyfull"
},
-/area/f13/ambientlighting/building/g)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"dcs" = (
/obj/effect/decal/cleanable/glass,
/obj/effect/decal/cleanable/dirt,
@@ -9905,17 +12246,18 @@
},
/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
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
@@ -9945,10 +12287,7 @@
icon_state = "yellowrustychess"
},
/area/f13/ambientlighting/building/b)
-"ddE" = (
-/obj/structure/closet/crate/footlocker,
-/turf/open/floor/plating/dirt,
-/area/f13/ncr)
+<<<<<<< Updated upstream
"ddL" = (
/obj/structure/chair/west_middle,
/obj/effect/decal/cleanable/dirt{
@@ -9958,20 +12297,45 @@
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,
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/p)
+"ddQ" = (
+/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)
"ddY" = (
-/obj/structure/chair,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -9981,6 +12345,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;
@@ -10013,16 +12384,35 @@
},
/area/f13/wasteland)
"deN" = (
-/obj/structure/nest/molerat,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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"
+ },
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/turf/open/indestructible/ground/outside/road{
+ 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;
- icon_state = "straight"
+ dir = 1
},
/obj/structure/fence/corner{
dir = 1
@@ -10038,6 +12428,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
@@ -10093,12 +12488,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{
@@ -10111,7 +12502,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)
@@ -10128,22 +12520,27 @@
/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
+<<<<<<< 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/indestructible/ground/outside/dirt,
-/area/f13/caves)
+/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2,
+/area/f13/ncr)
"dhi" = (
-/obj/item/trash/cheesie{
- pixel_x = -12;
- pixel_y = -4
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 4
},
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow5"
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
+>>>>>>> Stashed changes
},
/area/f13/wasteland)
"dhl" = (
@@ -10179,9 +12576,17 @@
},
/area/f13/wasteland)
"dhC" = (
-/mob/living/simple_animal/hostile/raider,
-/turf/open/floor/plating/f13/outside/road,
-/area/f13/ambientlighting/building/w)
+<<<<<<< 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{
pixel_x = -8;
@@ -10193,12 +12598,21 @@
/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)
+<<<<<<< Updated upstream
"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)
+=======
+>>>>>>> Stashed changes
"dhW" = (
/obj/machinery/light{
dir = 8;
@@ -10224,14 +12638,14 @@
},
/turf/closed/mineral/random,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"dia" = (
-/obj/structure/table,
-/obj/item/storage/box/prisoner{
- pixel_x = 3;
- pixel_y = 5
- },
-/turf/open/floor/plating/dirt,
-/area/f13/ncr)
+/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,
@@ -10273,19 +12687,34 @@
},
/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{
+ icon_state = "horizontalbottomborderbottom0"
+ },
+/area/f13/wasteland)
"dja" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/junk/small/bed,
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/effect/turf_decal/weather/dirt{
+ dir = 9
},
-/area/f13/ncr)
+/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
@@ -10313,9 +12742,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)
@@ -10347,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,
@@ -10361,6 +12798,14 @@
/obj/structure/barricade/bars,
/turf/open/floor/wood_common,
/area/f13/clinic)
+"dku" = (
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
+ },
+/area/f13/ncr)
"dkz" = (
/obj/structure/destructible/tribal_torch/wall/lit{
dir = 4
@@ -10393,15 +12838,22 @@
"dkX" = (
/turf/open/floor/f13/wood,
/area/f13/building/abandoned/n)
-"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,
+<<<<<<< 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";
@@ -10429,9 +12881,22 @@
},
/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)
+"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,
@@ -10440,6 +12905,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"
@@ -10471,26 +12942,26 @@
/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)
-"dnw" = (
-/obj/machinery/hydroponics/soil{
- mutmod = 0;
- name = "ancient fertile soil";
- yieldmod = 1.3
+<<<<<<< Updated upstream
+"dnB" = (
+/obj/effect/decal/cleanable/oil{
+ pixel_x = -8
},
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/indestructible/ground/inside/dirt,
+/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,
@@ -10499,15 +12970,18 @@
icon_state = "housewood2"
},
/area/f13/ambientlighting/building/i)
+<<<<<<< Updated upstream
+=======
"dnM" = (
-/obj/structure/chair{
- dir = 1
+/obj/item/storage/trash_stack{
+ icon_state = "trash_3"
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 4;
+ icon_state = "outermaincornerouter"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"dnQ" = (
/obj/structure/table/reinforced,
/obj/structure/barricade/bars,
@@ -10528,12 +13002,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,
@@ -10561,6 +13029,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{
@@ -10639,19 +13112,13 @@
icon_state = "floorrusty"
},
/area/f13/ncr)
+<<<<<<< Updated upstream
+=======
"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)
+/obj/effect/decal/cleanable/generic,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"dpq" = (
/turf/open/floor/f13{
icon_state = "bar"
@@ -10688,6 +13155,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
@@ -10695,6 +13168,15 @@
/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
+ },
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
"dqb" = (
/obj/effect/decal/marking{
icon_state = "dottedverticaldegraded"
@@ -10711,7 +13193,6 @@
dir = 4
},
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -10724,27 +13205,33 @@
/obj/item/radio/headset,
/turf/open/floor/carpet/royalblack,
/area/f13/building/abandoned/l)
+<<<<<<< Updated upstream
+=======
"dqu" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood{
- icon_state = "housewood3-broken"
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
},
-/area/f13/ambientlighting/building/g)
+/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/stairs/west,
-/obj/structure/railing{
- dir = 1
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/machinery/light{
+ pixel_x = 16
},
-/area/f13/ambientlighting/building/g)
+/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"dqK" = (
/obj/structure/toilet{
dir = 8
@@ -10766,24 +13253,34 @@
},
/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"
+/obj/effect/turf_decal/weather/dirt{
+ dir = 10
},
-/area/f13/ncr)
+/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/effect/turf_decal/weather/snow/corner{
- dir = 1;
- icon_state = "snow_corner"
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = 16
},
-/obj/effect/turf_decal/weather/snow/corner,
-/obj/structure/flora/ausbushes/ppflowers,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = -16
},
-/area/f13/wasteland)
+/turf/open/indestructible/ground/inside/mountain,
+>>>>>>> Stashed changes
+/area/f13/caves)
"dqV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -10817,9 +13314,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,
@@ -10854,6 +13351,7 @@
},
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/wasteland)
+<<<<<<< Updated upstream
"drQ" = (
/obj/structure/fence{
dir = 4
@@ -10862,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" = (
@@ -10873,6 +13375,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.";
@@ -10884,15 +13398,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
@@ -10907,10 +13415,16 @@
},
/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"dsU" = (
-/obj/structure/barricade/wooden/strong,
-/turf/closed/wall/f13/tunnel,
+/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
@@ -10926,7 +13440,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,
@@ -10946,9 +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" = (
-/turf/open/floor/plasteel/dark,
-/area/f13/ambientlighting/building/g)
+/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,
@@ -11003,14 +13539,13 @@
icon_state = "whiteyellowrustychess"
},
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"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,
+/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{
@@ -11037,40 +13572,41 @@
icon_state = "verticalrightborderright0"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"dvR" = (
+/obj/structure/sign/flag_america,
+/turf/closed/wall/r_wall/rust,
+/area/f13/sewer/powered)
+"dwn" = (
+/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,
+=======
"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)
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating/f13,
+/area/f13/wasteland)
"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)
+/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/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,
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = -16
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
},
-/area/f13/ncr)
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"dwo" = (
/obj/structure/bed,
/turf/open/floor/f13/wood{
@@ -11090,9 +13626,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{
@@ -11146,6 +13682,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{
@@ -11190,11 +13732,18 @@
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
"dyA" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< 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"
},
-/turf/open/floor/plasteel/f13/vault_floor/white/whitesolid,
-/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"dyL" = (
/obj/structure/table/booth,
/obj/machinery/light{
@@ -11212,14 +13761,18 @@
},
/turf/open/floor/carpet/purple,
/area/f13/bar)
+<<<<<<< Updated upstream
+=======
"dzd" = (
-/obj/structure/fluff/hedge,
-/obj/machinery/light/small{
- dir = 8;
- light_color = "#ff4747"
+/obj/machinery/door/unpowered/secure_NCR{
+ name = "Armoury"
},
-/turf/open/floor/wood_common/wood_common_dark,
+/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,
@@ -11248,7 +13801,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"
@@ -11286,6 +13838,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"
@@ -11306,6 +13865,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 +13921,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 +14048,18 @@
icon_state = "whitegreenrustychess"
},
/area/f13/building/abandoned/a)
+"dCE" = (
+/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)
"dCU" = (
/obj/structure/simple_door/metal/store,
/obj/effect/decal/cleanable/dirt,
@@ -11482,9 +14071,10 @@
/obj/structure/barricade/wooden,
/turf/closed/mineral/random/no_caves,
/area/f13/wasteland)
-"dDp" = (
-/turf/open/indestructible/ground/outside/gravel/path_desert{
- dir = 2
+"dDq" = (
+/obj/item/mine/shrapnel,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain1"
},
/area/f13/wasteland)
"dDx" = (
@@ -11521,6 +14111,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,
@@ -11543,6 +14140,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,
@@ -11575,6 +14179,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{
@@ -11593,11 +14202,17 @@
/turf/open/floor/wood_common,
/area/f13/clinic)
"dGb" = (
-/obj/machinery/door/unpowered/celldoor{
- req_access_txt = "121"
- },
+<<<<<<< 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,
-/area/f13/ncr)
+=======
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/wood_common,
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/m)
"dGd" = (
/obj/structure/decoration/clock/old{
pixel_y = 32
@@ -11616,11 +14231,13 @@
},
/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,
+<<<<<<< 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,
@@ -11639,21 +14256,32 @@
/turf/open/floor/f13/wood,
/area/f13/legioncamp)
"dGM" = (
-/obj/structure/barricade/wooden/planks{
- icon_state = "board-2"
- },
-/turf/closed/wall/f13/wood/house,
-/area/f13/ncr)
+<<<<<<< Updated upstream
+/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{
- color = "000000"
+/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"
},
-/mob/living/simple_animal/hostile/raider/sulphite{
- faction = list("raider")
+/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"
},
-/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2,
-/area/f13/ambientlighting/building/j)
+/area/f13/ncr)
+>>>>>>> Stashed changes
"dGT" = (
/obj/effect/turf_decal/weather/dirt,
/obj/structure/lamp_post/triples,
@@ -11661,6 +14289,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
@@ -11705,11 +14343,19 @@
/turf/closed/wall/r_wall/rust,
/area/f13/brotherhood)
"dHZ" = (
-/obj/structure/chair/wood{
- dir = 1
+<<<<<<< Updated upstream
+/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,
+=======
+/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{
color = "000000"
@@ -11749,6 +14395,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,
@@ -11794,9 +14446,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,
@@ -11816,21 +14468,26 @@
},
/turf/open/floor/carpet/red,
/area/f13/ambientlighting/building/e)
+<<<<<<< Updated upstream
+=======
"dJC" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 5;
- icon_state = "snow_corner"
- },
-/obj/structure/flora/burnedlog{
- pixel_x = 8;
- pixel_y = 3
- },
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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,
/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,
@@ -11865,6 +14522,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,
@@ -11976,6 +14638,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 +14652,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"
@@ -12084,9 +14751,28 @@
/turf/open/floor/plasteel/f13/stone/rugged,
/area/f13/legioncamp)
"dMZ" = (
-/obj/structure/flora/brushwoodalt,
-/turf/open/indestructible/ground/outside/snow,
+<<<<<<< Updated upstream
+/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)
+=======
+/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
@@ -12124,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
@@ -12209,6 +14899,18 @@
icon_state = "yellowrustychess"
},
/area/f13/ambientlighting/building/b)
+"dOi" = (
+/obj/structure/flora/brushwood,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+"dOn" = (
+/obj/structure/cable/outdoors{
+ icon_state = "1-8"
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
+ },
+/area/f13/wasteland)
"dOw" = (
/obj/structure/closet/fridge/cannibal,
/obj/effect/decal/cleanable/dirt,
@@ -12222,6 +14924,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"
@@ -12260,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;
@@ -12287,11 +14996,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" = (
@@ -12348,6 +15053,18 @@
/obj/structure/table/wood/fancy,
/turf/open/floor/carpet/airless,
/area/f13/ambientlighting/building/c)
+"dQz" = (
+/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
@@ -12367,6 +15084,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/ncr)
"dRb" = (
/obj/effect/turf_decal/weather/dirt,
/obj/structure/chair/bench{
@@ -12410,7 +15133,6 @@
"dRK" = (
/obj/structure/fence/corner,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -12497,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
@@ -12517,21 +15243,20 @@
name = "Concrete wall";
smooth = 1
},
+<<<<<<< Updated upstream
/area/f13/casino)
+=======
+/area/f13/wasteland)
"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)
+/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;
@@ -12542,6 +15267,17 @@
icon_state = "outerpavement"
},
/area/f13/wasteland)
+"dTC" = (
+/obj/structure/bed/mattress{
+ icon_state = "mattress2";
+ pixel_y = 5
+ },
+/obj/item/bedsheet/blanket{
+ pixel_y = 1
+ },
+/obj/effect/landmark/start/f13/ncrconscript,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"dTE" = (
/obj/structure/sign/poster/contraband/red_rum{
pixel_y = 32
@@ -12587,12 +15323,22 @@
/turf/closed/wall/mineral/concrete,
/area/f13/clinic)
"dUo" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6
+<<<<<<< Updated upstream
+/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)
+=======
+/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
@@ -12615,10 +15361,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
@@ -12642,13 +15387,17 @@
icon_state = "bluedirtychess2"
},
/area/f13/followers)
+<<<<<<< Updated upstream
+=======
"dUX" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
+ },
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"dUZ" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
@@ -12672,6 +15421,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"
@@ -12727,6 +15485,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"
@@ -12756,13 +15520,18 @@
},
/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/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small{
- dir = 1
+/obj/machinery/door/poddoor/shutters{
+ id = 984
},
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/road,
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"dXp" = (
/obj/structure/debris/v3,
/turf/open/indestructible/ground/outside/sidewalk,
@@ -12787,27 +15556,45 @@
},
/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,
-/area/f13/wasteland)
+=======
"dXO" = (
-/obj/structure/destructible/tribal_torch/wall/lit{
- dir = 8;
- light_color = "#f4e3b0"
+/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"
},
-/turf/open/indestructible/ground/outside/snow,
+>>>>>>> Stashed changes
/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,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"dYF" = (
/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,
@@ -12819,20 +15606,17 @@
icon_state = "common-broken3"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"dZa" = (
-/obj/structure/chair/folding{
- dir = 4
- },
-/obj/machinery/light/small{
- dir = 8;
- light_color = "#ff4747"
+/obj/structure/chair/wood{
+ dir = 1
},
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 8;
- icon_state = "snow_corner"
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain0"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"dZg" = (
/obj/structure/target_stake,
/obj/item/target/clown,
@@ -12906,23 +15690,42 @@
icon_state = "bluedirtychess2"
},
/area/f13/ambientlighting/building/o)
+<<<<<<< Updated upstream
+=======
"dZG" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/carpet/purple,
-/area/f13/ambientlighting/building/g)
+/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" = (
-/obj/structure/rack,
-/obj/item/clothing/head/sombrero,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+<<<<<<< Updated upstream
+/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)
+=======
+/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
@@ -12981,12 +15784,20 @@
/turf/open/floor/f13/wood,
/area/f13/building/abandoned/a)
"ebh" = (
-/obj/structure/window/fulltile/store{
- icon_state = "storewindowtop"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -12994,7 +15805,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{
@@ -13004,13 +15817,18 @@
icon_state = "yellowrustychess"
},
/area/f13/ambientlighting/building/b)
+<<<<<<< Updated upstream
+=======
"ecc" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/indestructible/ground/outside/dirt{
- dir = 8;
- icon_state = "dirt"
+/obj/effect/decal/marking{
+ icon_state = "dottedverticaldegraded";
+ pixel_x = -14
},
-/area/f13/caves)
+/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,
@@ -13020,11 +15838,25 @@
},
/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)
+<<<<<<< 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,
/obj/effect/decal/cleanable/dirt,
@@ -13043,6 +15875,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,
@@ -13064,25 +15901,42 @@
/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
+<<<<<<< Updated upstream
+/obj/structure/car/rubbish4{
+ pixel_y = -9;
+ icon_state = "debris2"
},
-/obj/effect/decal/fakelattice,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/indestructible/ground/outside/sidewalk,
+=======
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/turf/open/floor/plating/rust,
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"edn" = (
-/obj/structure/reagent_dispensers/rainwater_tank,
-/obj/item/flag/ncr/snow{
- pixel_y = 21
+/obj/structure/fence{
+ dir = 1
},
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1"
+/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,
+/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
@@ -13123,18 +15977,25 @@
icon_state = "verticalleftborderleft1"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"edX" = (
-/obj/structure/sign/warning/electricshock,
-/turf/closed/wall/f13/tunnel,
-/area/f13/ncr)
+/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;
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" = (
@@ -13151,21 +16012,26 @@
},
/turf/open/floor/plating/f13/inside/gravel,
/area/f13/wasteland/town)
+<<<<<<< Updated upstream
+=======
"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{
+ icon_state = "rampdowntop"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"eeo" = (
/turf/open/indestructible/ground/outside/sidewalk{
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,
@@ -13210,27 +16076,23 @@
/obj/structure/barricade/wooden,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/underground/cave)
+<<<<<<< Updated upstream
+=======
"efb" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = 31
- },
-/obj/machinery/light/small{
- dir = 4;
- light_color = "#ff4747"
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/weather/dirt{
- dir = 4
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain2"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/wasteland)
"efz" = (
-/obj/structure/flora/grass/wasteland{
- icon_state = "tall_grass_6";
- pixel_x = -11;
- pixel_y = 11
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/turf/open/indestructible/ground/outside/dirt,
-/area/f13/caves)
+/turf/open/floor/wood_common/wood_common_light,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"efI" = (
/obj/machinery/vending/coffee,
/obj/effect/decal/cleanable/dirt{
@@ -13243,7 +16105,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{
@@ -13255,12 +16119,24 @@
},
/area/f13/wasteland)
"efV" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
/obj/structure/barricade/wooden/planks/pregame,
@@ -13313,6 +16189,31 @@
icon_state = "tunnelrusty"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+"egt" = (
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
+ },
+/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,
+=======
+"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{
icon_state = "trash_2"
@@ -13335,8 +16236,16 @@
},
/area/f13/building/powered)
"egT" = (
-/turf/closed/wall/f13/store,
-/area/f13/ambientlighting/building/p)
+<<<<<<< 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,
/obj/effect/decal/cleanable/dirt,
@@ -13351,13 +16260,38 @@
icon_state = "crossborder"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+"ehh" = (
+/obj/item/stack/sheet/mineral/sandbags,
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 8;
+ 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,
/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)
+"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,
@@ -13366,20 +16300,13 @@
icon_state = "bluedirtychess2"
},
/area/f13/ambientlighting/building/y)
+<<<<<<< Updated upstream
+=======
"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,
+/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"
@@ -13412,14 +16339,15 @@
icon_state = "bluedirtychess2"
},
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"eiU" = (
-/obj/structure/barricade/wooden/strong,
-/obj/structure/decoration/rag{
- icon_state = "skin";
- pixel_y = 2
+/obj/effect/spawner/lootdrop/druggie_pill,
+/turf/open/floor/f13/wood{
+ icon_state = "housebase4-broken"
},
-/turf/closed/wall/f13/tentwall,
-/area/f13/wasteland)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"ejg" = (
/obj/machinery/porta_turret/f13/turret_shotgun/burstfire/robot,
/obj/effect/decal/cleanable/dirt/dust{
@@ -13427,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,
@@ -13440,14 +16376,14 @@
/obj/effect/landmark/start/f13/deputy,
/turf/open/floor/f13/wood,
/area/f13/building/abandoned/n)
+<<<<<<< Updated upstream
+=======
"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)
+/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";
@@ -13472,19 +16408,19 @@
},
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/c)
+<<<<<<< Updated upstream
+=======
"ejU" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 5
+/obj/effect/decal/marking{
+ icon_state = "dottedverticalcorroded";
+ pixel_x = -14
},
-/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
+/obj/structure/table/wood/junk,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain0"
},
-/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"eka" = (
/obj/structure/closet/fridge/standard,
/turf/open/floor/f13{
@@ -13551,6 +16487,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"
@@ -13607,20 +16553,13 @@
/obj/effect/decal/cleanable/greenglow,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -13638,12 +16577,15 @@
dir = 4
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"emw" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 4
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/wood_common{
+ icon_state = "common-broken2"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"emA" = (
/obj/item/chair/stool,
/turf/open/indestructible/ground/outside/dirt,
@@ -13652,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{
@@ -13661,10 +16612,18 @@
},
/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,
-/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,
@@ -13684,14 +16643,18 @@
},
/area/f13/building/abandoned/h)
"enj" = (
-/obj/structure/rack,
-/obj/item/clothing/under/lawyer/female{
- pixel_x = -5;
- pixel_y = -5
+<<<<<<< Updated upstream
+/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,
+=======
+/turf/open/floor/plating/f13/inside/gravel/edge{
+ dir = 10
+ },
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"enp" = (
/obj/item/storage/trash_stack,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -13713,10 +16676,14 @@
},
/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)
+<<<<<<< Updated upstream
+=======
+/obj/effect/spawner/lootdrop/wastelootgood,
+>>>>>>> Stashed changes
+/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)
@@ -13748,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,
@@ -13759,6 +16732,13 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+"enU" = (
+/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)
"enZ" = (
/obj/structure/chair/f13chair1,
/obj/item/cigbutt/cigarbutt,
@@ -13824,6 +16804,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,
@@ -13859,12 +16844,13 @@
/obj/machinery/reagentgrinder,
/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria,
/area/maintenance/bar)
+<<<<<<< Updated upstream
+=======
"ept" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/closed/wall/f13/wood/house,
-/area/f13/ambientlighting/building/g)
+/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,
@@ -13950,10 +16936,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" = (
@@ -13998,7 +16986,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,
@@ -14016,8 +17006,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,
@@ -14064,13 +17057,21 @@
},
/turf/open/floor/wood_common,
/area/f13/building/abandoned/x)
+<<<<<<< Updated upstream
+=======
"esJ" = (
-/obj/item/trash/f13/steak{
- pixel_x = -6;
- pixel_y = 5
+/obj/structure/chair/bench,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
},
-/turf/open/indestructible/ground/outside/snow,
/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,
@@ -14091,18 +17092,30 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"ete" = (
-/obj/structure/chair{
- dir = 8
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/shreds,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+=======
+/obj/structure/railing{
+ dir = 4;
+ layer = 4.1
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalleftborderleft1"
+ },
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"eti" = (
/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
@@ -14139,6 +17152,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
@@ -14204,10 +17223,32 @@
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -14216,12 +17257,19 @@
"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/effect/turf_decal/weather/snow/corner{
- dir = 1
+/obj/structure/barricade/wooden/strong,
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 1;
+ icon_state = "outerturn"
+>>>>>>> Stashed changes
},
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
"evp" = (
/obj/structure/reagent_dispensers/rainwater_tank,
@@ -14254,11 +17302,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{
@@ -14279,6 +17326,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.";
@@ -14292,6 +17346,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,
@@ -14299,27 +17357,55 @@
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{
icon_state = "wasteland33"
},
/area/f13/wasteland)
-"ewE" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 8
+<<<<<<< Updated upstream
+=======
+"ewz" = (
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 4
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain2bottom"
},
-/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
+"ewE" = (
+/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;
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{
@@ -14332,20 +17418,14 @@
icon_state = "floorrusty"
},
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -14361,17 +17441,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{
@@ -14382,13 +17455,30 @@
icon_state = "horizontalinnermain1"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"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{
- 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)
+=======
+"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,
@@ -14449,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,
@@ -14459,6 +17556,24 @@
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"
+ },
+/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"
+ },
+/area/f13/wasteland)
"ezV" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -14559,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
@@ -14644,21 +17765,25 @@
/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)
+/obj/structure/simple_door/brokenglass,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/wood_common,
+/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"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/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,
@@ -14695,15 +17820,16 @@
/obj/effect/overlay/fog,
/turf/open/indestructible/ground/outside/water,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"eDU" = (
-/obj/structure/destructible/tribal_torch/wall/lit{
- dir = 1;
- pixel_y = 12
- },
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow3"
+/obj/structure/simple_door/wood,
+/obj/effect/decal/cleanable/blood{
+ icon_state = "tracks"
},
-/area/f13/wasteland)
+/turf/open/floor/wood_common/wood_common_light,
+/area/f13/building/powered)
+>>>>>>> Stashed changes
"eDW" = (
/obj/machinery/light{
dir = 8;
@@ -14731,14 +17857,17 @@
/obj/item/reagent_containers/food/drinks/bottle/sunset,
/turf/open/floor/f13/wood,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"eEd" = (
-/obj/structure/chair/wood{
- pixel_x = 9;
- pixel_y = 14
+/obj/structure/rack/shelf_metal,
+/obj/item/wrench,
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/indestructible/ground/inside/mountain,
+/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/ncr)
+>>>>>>> Stashed changes
"eEe" = (
/turf/closed/indestructible/rock,
/area/f13/underground/cave)
@@ -14754,14 +17883,16 @@
},
/turf/open/indestructible/ground/outside/water,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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."
+/obj/structure/chair/booth{
+ dir = 8
},
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/bar,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"eEF" = (
/obj/structure/chair/stool{
dir = 4;
@@ -14832,21 +17963,27 @@
},
/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
+<<<<<<< Updated upstream
+/turf/open/indestructible/ground/outside/water/running,
+/area/f13/caves)
+=======
+/obj/structure/bed/mattress{
+ icon_state = "mattress1";
+ pixel_y = 9
},
-/obj/item/lighter{
- pixel_x = 9;
- pixel_y = -10
+/obj/structure/bed/mattress{
+ icon_state = "mattress2";
+ pixel_y = -6
},
-/turf/open/indestructible/ground/outside/ruins{
- name = "cobblestone floor"
+/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,
@@ -14880,11 +18017,18 @@
},
/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,
+<<<<<<< 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;
@@ -14903,13 +18047,17 @@
icon_state = "outerborder"
},
/area/f13/wasteland/city)
+<<<<<<< Updated upstream
+=======
"eGk" = (
-/obj/item/cigbutt{
- pixel_y = 9;
- pixel_x = -13
+/obj/structure/shelf_wood,
+/obj/item/storage/firstaid,
+/obj/item/storage/firstaid,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/area/f13/ncr)
+>>>>>>> Stashed changes
"eGt" = (
/obj/item/chair/folding,
/turf/open/indestructible/ground/outside/dirt,
@@ -14947,6 +18095,14 @@
},
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/k)
+"eGN" = (
+/obj/structure/bed/mattress{
+ icon_state = "mattress1";
+ pixel_y = 9
+ },
+/obj/effect/landmark/start/f13/ncrconscript,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"eGO" = (
/obj/effect/spawner/lootdrop/f13/junkspawners,
/obj/structure/obstacle/barbedwire/end,
@@ -14955,10 +18111,20 @@
},
/area/f13/wasteland)
"eGT" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 8
},
-/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess,
+/obj/structure/destructible/tribal_torch/wall/lit{
+ dir = 4;
+ 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,
@@ -14977,6 +18143,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/ncr)
"eHp" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/closed/wall/f13/wood/house,
@@ -14988,6 +18160,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";
@@ -15030,15 +18217,23 @@
/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)
+<<<<<<< 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,
@@ -15046,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,
@@ -15061,11 +18262,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,
@@ -15097,6 +18296,28 @@
icon_state = "whitedirtysolid"
},
/area/f13/followers)
+"eJl" = (
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -15114,11 +18335,18 @@
},
/area/f13/wasteland)
"eJx" = (
-/obj/structure/campfire/barrel,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/effect/decal/cleanable/glass,
+/obj/effect/overlay/junk/curtain,
+>>>>>>> Stashed changes
+/turf/open/floor/wood_wide,
/area/f13/ambientlighting/building/j)
"eJA" = (
/obj/machinery/chem_dispenser/drinks/beer{
@@ -15145,10 +18373,31 @@
/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,
/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"
@@ -15162,7 +18411,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 +18453,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/ncr)
"eLf" = (
/obj/structure/barricade/wooden/strong,
/obj/structure/decoration/rag,
@@ -15229,31 +18489,35 @@
/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/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
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/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/ncr)
+/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,
/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,
@@ -15322,22 +18586,33 @@
},
/area/f13/ambientlighting/building/o)
"eME" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 8;
- icon_state = "snow_corner"
- },
-/obj/machinery/hydroponics/soil{
- mutmod = 0;
- name = "ancient fertile soil";
- yieldmod = 1.3
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
+/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 +18620,10 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/legioncamp)
+"eMZ" = (
+/obj/item/defibrillator/primitive,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
"eNa" = (
/obj/structure/flora/ausbushes/ppflowers,
/obj/item/flag,
@@ -15375,7 +18654,25 @@
dir = 8;
icon_state = "horizontalinnermain2left"
},
+<<<<<<< Updated upstream
+/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)
+=======
+/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)
@@ -15391,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";
@@ -15410,17 +18716,27 @@
icon_state = "horizontaloutermain2left"
},
/area/f13/wasteland)
+"eOp" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ambientlighting/building/m)
"eOv" = (
-/obj/structure/closet/crate/footlocker{
- pixel_y = -1;
- pixel_x = -8
+<<<<<<< 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/effect/decal/cleanable/dirt/dust,
-/obj/item/clothing/head/helmet/f13/ncr/bandolier,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/obj/structure/obstacle/barbedwire{
+ dir = 4;
+ pixel_y = 16
},
-/area/f13/ncr)
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"eOE" = (
/obj/structure/destructible/tribal_torch/wall/lit{
dir = 8
@@ -15431,6 +18747,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{
@@ -15439,6 +18759,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,
@@ -15479,17 +18811,25 @@
icon_state = "housewood2"
},
/area/f13/building/abandoned/s)
-"eQh" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+"eQj" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/machinery/power/port_gen/pacman/diesel{
+ anchored = 1
},
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "MikoStiff";
- layer = 11;
- name = "Miko's Stiff Beds"
+/obj/item/stack/sheet/mineral/plasma/fifty,
+/obj/structure/cable/outdoors{
+ icon_state = "0-2"
},
-/turf/open/floor/plasteel/f13/vault_floor/yellow,
-/area/f13/ambientlighting/building/j)
+/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,
/obj/structure/junk/small/tv,
@@ -15525,14 +18865,28 @@
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{
+/obj/structure/destructible/tribal_torch/wall/lit{
dir = 8
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
- },
+/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
@@ -15545,7 +18899,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,
@@ -15561,6 +18916,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;
@@ -15575,6 +18941,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,
@@ -15582,12 +18952,27 @@
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
+<<<<<<< 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/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/turf/open/floor/f13/wood,
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/m)
"eSr" = (
/obj/structure/chair/bench{
dir = 4;
@@ -15619,6 +19004,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
@@ -15652,9 +19042,20 @@
/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)
+<<<<<<< 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{
@@ -15668,13 +19069,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;
@@ -15712,13 +19112,27 @@
},
/area/f13/wasteland)
"eUm" = (
-/obj/structure/barricade/wooden,
-/obj/structure/barricade/wooden/planks/pregame,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
@@ -15738,6 +19152,19 @@
},
/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,
@@ -15759,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";
@@ -15860,11 +19294,21 @@
},
/area/f13/wasteland)
"eWg" = (
-/obj/structure/simple_door/wood,
-/turf/open/floor/f13/wood{
- icon_state = "housewood4-broken"
+<<<<<<< Updated upstream
+/obj/item/storage/trash_stack{
+ icon_state = "Junk_10"
},
-/area/f13/ncr)
+/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,
@@ -15884,12 +19328,38 @@
},
/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{
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,
@@ -15977,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,
@@ -16014,15 +19490,41 @@
/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/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)
"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)
+<<<<<<< Updated upstream
+=======
"eYQ" = (
-/turf/open/floor/wood_wide,
-/area/f13/ncr)
+/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{
@@ -16032,6 +19534,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{
@@ -16065,14 +19581,25 @@
/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)
+<<<<<<< Updated upstream
+=======
"eZS" = (
-/obj/machinery/workbench,
-/obj/item/melee/onehanded/club/ncrflag,
-/turf/open/floor/wood_wide,
-/area/f13/ncr)
+/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
@@ -16088,6 +19615,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"
@@ -16134,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{
@@ -16180,6 +19731,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/ncr)
"fbO" = (
/obj/structure/simple_door/room,
/obj/structure/barricade/wooden/strong,
@@ -16242,13 +19797,28 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+"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)
+=======
"fcs" = (
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/structure/chair/booth{
dir = 4
},
-/obj/structure/obstacle/barbedwire,
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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
@@ -16324,6 +19894,18 @@
icon_state = "verticaloutermain1"
},
/area/f13/wasteland)
+"fdB" = (
+/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)
"fdC" = (
/obj/structure/beebox,
/obj/effect/turf_decal/weather/dirt{
@@ -16332,15 +19914,35 @@
/turf/open/indestructible/ground/inside/dirt,
/area/f13/ambientlighting/building/c)
"fdE" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
+<<<<<<< Updated upstream
+/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/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
+ },
+/obj/structure/flora/grass/coyote/thirty,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+"feb" = (
+/obj/structure/safe,
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
"feg" = (
/obj/item/reagent_containers/food/drinks/coffee{
pixel_x = -7;
@@ -16428,6 +20030,28 @@
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/ncr)
+"ffy" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2,
+/area/f13/ncr)
+"ffB" = (
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
"ffJ" = (
/obj/machinery/light/small{
dir = 4
@@ -16454,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,
@@ -16480,19 +20112,20 @@
dir = 8
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = -16
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain2right"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"fgN" = (
/obj/structure/bus_door,
/turf/open/indestructible/ground/outside/grass/corner,
@@ -16531,15 +20164,23 @@
/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,
+<<<<<<< Updated upstream
+/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,
+=======
+/turf/open/floor/wood_fancy,
+>>>>>>> Stashed changes
+/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,
@@ -16643,18 +20284,20 @@
/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,
/area/f13/building/abandoned/g)
+"fiF" = (
+/obj/structure/chair/sofa/right{
+ dir = 8
+ },
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
"fiI" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt{
@@ -16692,14 +20335,13 @@
/obj/structure/flora/wasteplant/wild_punga,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"fjo" = (
-/obj/structure/rack,
-/obj/item/gun/ballistic/shotgun/toy,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/carpet/arcade,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/wood_wide,
/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"fjp" = (
/obj/structure/fence/wooden{
dir = 1
@@ -16722,9 +20364,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
},
@@ -16756,15 +20396,17 @@
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,
-/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{
@@ -16888,22 +20530,38 @@
},
/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,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+<<<<<<< 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/effect/turf_decal/weather/dirt{
- dir = 1
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = -4;
+ pixel_x = -16
},
-/obj/machinery/hydroponics/soil{
- mutmod = 0;
- name = "ancient fertile soil";
- yieldmod = 1.3
+/mob/living/simple_animal/hostile/retaliate/talker/follower/faction/ncr_trooper,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain2"
},
-/turf/open/indestructible/ground/inside/dirt,
+>>>>>>> Stashed changes
/area/f13/wasteland)
"fmf" = (
/obj/structure/destructible/tribal_torch/wall/lit{
@@ -16934,14 +20592,27 @@
icon_state = "whitegreenrustychess"
},
/area/f13/ambientlighting/building/i)
+<<<<<<< Updated upstream
+=======
"fmr" = (
-/obj/structure/dresser,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/holofloor/carpet,
-/area/f13/ambientlighting/building/g)
+/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)
+"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
@@ -16956,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{
@@ -16968,12 +20649,21 @@
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"fnx" = (
-/obj/machinery/light/small/broken{
+<<<<<<< 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/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/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,
/obj/effect/decal/cleanable/dirt{
@@ -16981,6 +20671,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";
@@ -16989,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{
@@ -17002,6 +20711,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,
@@ -17019,41 +20736,76 @@
icon_state = "bluedirtychess2"
},
/area/f13/ambientlighting/building/y)
+"foo" = (
+/obj/structure/table/booth,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
"fop" = (
-/obj/structure/barricade/wooden/snowed,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow3"
+<<<<<<< Updated upstream
+/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/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)
+=======
+/obj/effect/spawner/lootdrop/f13/junkspawners,
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 4;
+ icon_state = "outercorner"
},
/area/f13/wasteland)
-"fow" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
+"fov" = (
+/obj/structure/chair/sofa/left{
+ dir = 8
},
-/obj/machinery/hydroponics/soil{
- mutmod = 0;
- name = "ancient fertile soil";
- yieldmod = 1.3
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
+"fow" = (
+/obj/machinery/light/small{
+ dir = 1
},
-/turf/open/indestructible/ground/inside/dirt,
-/area/f13/wasteland)
+/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."
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+"foA" = (
+/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)
"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/structure/stairs/north{
- color = "#A47449";
- dir = 8
- },
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/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"
@@ -17099,10 +20851,25 @@
},
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -17120,9 +20887,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 +20904,19 @@
"fpI" = (
/turf/open/floor/plating/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"fpJ" = (
-/turf/open/floor/plasteel/stairs{
- dir = 4
+/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"
},
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"fpO" = (
/obj/structure/railing{
layer = 4.1
@@ -17185,9 +20958,16 @@
},
/area/f13/building/powered)
"fqh" = (
-/obj/effect/landmark/start/f13/ncrsergeant,
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor3-broken"
+<<<<<<< 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" = (
@@ -17211,17 +20991,14 @@
/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/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,
@@ -17250,6 +21027,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/ncr)
"frK" = (
/obj/effect/decal/cleanable/blood/old{
icon_state = "gibbearcore"
@@ -17269,20 +21054,13 @@
},
/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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,
+/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{
@@ -17315,10 +21093,17 @@
},
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/e)
+<<<<<<< Updated upstream
+=======
"fso" = (
-/obj/structure/flora/stump,
-/turf/open/indestructible/ground/outside/snow,
+/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;
@@ -17331,6 +21116,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/w)
+"fsB" = (
+/obj/structure/bed/mattress{
+ icon_state = "mattress2"
+ },
+/obj/item/bedsheet/blanket{
+ pixel_y = 1
+ },
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"fsN" = (
/obj/structure/wreck/car,
/turf/open/indestructible/ground/outside/road{
@@ -17376,6 +21170,25 @@
/obj/effect/mapping_helpers/network_builder/power_cable/auto,
/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,
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
+ },
+/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,
/turf/open/indestructible/ground/outside/grass,
@@ -17395,12 +21208,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 +21234,13 @@
/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"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"fup" = (
/obj/structure/chair/sofa/left{
dir = 8;
@@ -17461,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"
@@ -17469,17 +21284,13 @@
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)
+/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;
@@ -17514,13 +21325,41 @@
icon_state = "horizontaltopbordertop0"
},
/area/f13/wasteland)
+"fvX" = (
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood_common/wood_common_light,
+/area/f13/ncr)
+"fwg" = (
+/obj/machinery/light/fo13colored/Red{
+ dir = 4
+ },
+/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -17532,16 +21371,22 @@
},
/area/f13/building/lower_firetower)
"fwA" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< 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/machinery/door/poddoor/shutters{
- id = "RicketyRick";
- layer = 11;
- name = "Rickety Rick's Camping Supplies"
+/obj/item/reagent_containers/food/snacks/icecreamsandwich{
+ pixel_x = -1;
+ anchored = 1;
+ name = "ice cream sign"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/turf/closed/wall/f13/store,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"fwC" = (
/obj/structure/fence/wooden,
/turf/open/indestructible/ground/outside/dirt{
@@ -17574,11 +21419,30 @@
/obj/structure/frame/machine,
/turf/open/floor/plasteel/dark,
/area/engine/workshop)
+<<<<<<< Updated upstream
+"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."
+=======
"fwX" = (
-/obj/structure/table/wood/settler,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/purple,
-/area/f13/ambientlighting/building/g)
+/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" = (
/obj/effect/landmark/start/f13/vetlegionary,
/turf/open/floor/f13/wood,
@@ -17626,12 +21490,13 @@
},
/turf/open/floor/wood_fancy/wood_fancy_dark,
/area/f13/bar)
+<<<<<<< Updated upstream
+=======
"fyd" = (
-/obj/effect/landmark/start/f13/ncrheavytrooper,
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor4-broken"
- },
-/area/f13/wasteland)
+/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"
@@ -17670,13 +21535,25 @@
icon_state = "horizontalbottombordertop3"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"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)
+=======
+"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)
@@ -17703,13 +21580,15 @@
icon_state = "whitebluechess"
},
/area/f13/building/abandoned/j)
+<<<<<<< Updated upstream
+=======
"fze" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/spawner/lootdrop/wastelootgood,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontalbottomborderbottom0"
},
-/turf/open/floor/carpet/red,
-/area/f13/ambientlighting/building/g)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"fzl" = (
/obj/structure/fence/wooden{
dir = 1;
@@ -17738,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,
@@ -17798,16 +21685,32 @@
/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)
"fAb" = (
/turf/closed/wall/f13/tunnel,
/area/f13/building)
+<<<<<<< Updated upstream
+=======
"fAf" = (
-/mob/living/simple_animal/hostile/radscorpion/black,
-/turf/open/indestructible/ground/outside/dirt,
-/area/f13/caves)
+/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{
@@ -17816,11 +21719,22 @@
},
/area/f13/wasteland/legion)
"fAj" = (
-/obj/structure/flora/grass/wasteland{
- icon_state = "tall_grass_5"
- },
-/turf/open/indestructible/ground/outside/graveldirt,
+<<<<<<< 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,
@@ -17831,6 +21745,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
@@ -17872,11 +21791,12 @@
/area/f13/building/abandoned/h)
"fBl" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/trash,
/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,
@@ -17901,17 +21821,21 @@
},
/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
+<<<<<<< Updated upstream
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright2top"
},
-/turf/open/floor/carpet/red,
+/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"
@@ -17941,6 +21865,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,
@@ -17980,12 +21910,15 @@
},
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/k)
+<<<<<<< Updated upstream
+=======
"fCP" = (
-/obj/effect/landmark/start/f13/ncrcorporal,
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1-broken"
+/obj/structure/cable/outdoors{
+ icon_state = "2-8"
},
-/area/f13/wasteland)
+/turf/open/floor/wood_common/wood_common_light,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"fCW" = (
/obj/structure/chair/office/dark,
/turf/open/floor/f13/wood,
@@ -17994,12 +21927,15 @@
/obj/structure/reagent_dispensers/barrel/three,
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"fDn" = (
-/obj/item/flag/ncr/snow,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow3"
+/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{
@@ -18007,12 +21943,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{
@@ -18030,22 +21969,37 @@
/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,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
- },
-/area/f13/ncr)
+/obj/effect/spawner/lootdrop/f13/crafting,
+/turf/open/floor/wood_common,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"fDK" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
+/obj/structure/flora/rock/pile/largejungle{
+ icon_state = "bush2";
+ pixel_x = -13;
+ pixel_y = -4
},
-/obj/structure/chair/bench{
- dir = 8;
- pixel_x = 14
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+<<<<<<< Updated upstream
+"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/graveldirt,
-/area/f13/wasteland)
+/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{
@@ -18054,21 +22008,22 @@
/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,
+<<<<<<< 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/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{
@@ -18130,6 +22085,13 @@
icon_state = "bluedirtychess2"
},
/area/f13/followers)
+"fEU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/trash_stack{
+ icon_state = "Junk_9"
+ },
+/turf/open/floor/plasteel/bar,
+/area/f13/ambientlighting/building/m)
"fFh" = (
/obj/structure/table/wood/settler,
/obj/item/reagent_containers/glass/bowl,
@@ -18140,19 +22102,16 @@
/mob/living/simple_animal/hostile/raider/baseball,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/structure/grille/broken,
+/obj/item/trash/f13/borscht,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain2right"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"fFq" = (
/obj/structure/flora/junglebush/c,
/turf/open/indestructible/ground/outside/dirt,
@@ -18167,17 +22126,44 @@
icon_state = "dark"
},
/area/f13/brotherhood)
+<<<<<<< Updated upstream
"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,
+/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{
@@ -18260,10 +22246,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"
@@ -18296,6 +22293,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";
@@ -18307,15 +22311,12 @@
/obj/effect/decal/cleanable/blood/gibs/human/body,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/turf/closed/mineral/random,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"fJI" = (
/obj/effect/decal/remains{
icon_state = "remains"
@@ -18379,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{
@@ -18414,14 +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/simple_door/bunker,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen{
+ pixel_x = 5;
+ pixel_y = 4
},
-/area/f13/ambientlighting/building/g)
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"fKI" = (
/obj/structure/closet/crate/footlocker{
pixel_x = -8;
@@ -18429,6 +22455,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;
@@ -18480,6 +22517,10 @@
icon_state = "outerbordercorner"
},
/area/f13/wasteland)
+"fLe" = (
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
"fLk" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/closed/wall/f13/wood,
@@ -18489,25 +22530,42 @@
icon_state = "innercornerpieceleft"
},
/area/f13/wasteland)
-"fLH" = (
-/obj/machinery/shower{
+<<<<<<< Updated upstream
+"fLu" = (
+/obj/machinery/button/door{
+ pixel_y = 28;
+ id = 982
+ },
+/obj/structure/disposalpipe/broken{
dir = 1
},
-/obj/structure/curtain,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13{
- icon_state = "bar"
+/obj/machinery/light/small{
+ dir = 1
},
-/area/f13/ambientlighting/building/g)
+/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{
- dir = 2
- },
+/obj/effect/turf_decal/weather/dirt,
/obj/effect/turf_decal/weather/dirt{
dir = 10
},
/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,
@@ -18519,6 +22577,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/ncr)
"fMi" = (
/obj/effect/overlay/desert/sonora/edge/corner{
dir = 8
@@ -18590,13 +22652,19 @@
/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
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -18642,19 +22710,15 @@
icon_state = "housewood2-broken"
},
/area/f13/building/abandoned/j)
+<<<<<<< Updated upstream
+=======
"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,
+/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,
@@ -18689,22 +22753,43 @@
/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
+<<<<<<< Updated upstream
+/obj/effect/gibspawner/human/bodypartless,
+/obj/effect/decal/cleanable/blood/gibs,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+"fOj" = (
+/obj/effect/decal/fakelattice,
+/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
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/indestructible/ground/outside/graveldirt,
+/turf/open/floor/wood_common/wood_common_light,
/area/f13/ncr)
"fOj" = (
-/obj/structure/window/reinforced/spawner/east,
-/obj/structure/fluff/railing{
- dir = 4
+/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
},
-/turf/open/water,
-/area/f13/ambientlighting/building/j)
+/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{
@@ -18719,31 +22804,52 @@
dir = 4
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"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/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,
+=======
"fOL" = (
-/obj/structure/chair/stool/retro,
-/obj/machinery/light/small{
- dir = 8;
- light_color = "#ff4747"
+/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/wood_common/wood_common_dark,
+/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/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/structure/table/booth,
+/obj/item/crafting/coffee_pot{
+ pixel_x = 8;
+ pixel_y = 6
},
-/obj/item/clothing/shoes/f13/brownie,
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/reagent_containers/food/drinks/bottle/instacoffee,
+/obj/effect/decal/cleanable/glass,
/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+>>>>>>> Stashed changes
+/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{
@@ -18764,6 +22870,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/ncr)
"fPz" = (
/turf/open/indestructible/ground/outside/sidewalk{
icon_state = "verticaloutermain2"
@@ -18799,15 +22922,15 @@
},
/turf/open/floor/plasteel/f13/stone/rugged,
/area/f13/building/abandoned/g)
+<<<<<<< Updated upstream
+=======
"fQd" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/obj/machinery/light{
- dir = 4
+/obj/effect/decal/cleanable/oil/slippery,
+/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)
+>>>>>>> Stashed changes
"fQs" = (
/obj/effect/turf_decal/weather/dirt{
dir = 5
@@ -18816,9 +22939,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" = (
@@ -18865,7 +22986,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"
@@ -18943,6 +23063,18 @@
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,
+/obj/effect/decal/fakelattice,
+/turf/open/floor/plating/f13,
+/area/f13/wasteland)
"fSK" = (
/obj/structure/window/fulltile/house{
icon_state = "housewindowbrokenvertical"
@@ -18974,11 +23106,20 @@
},
/area/f13/wasteland)
"fSZ" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken2"
+<<<<<<< Updated upstream
+/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)
+=======
+/turf/closed/wall/f13/store,
+/area/f13/building/powered)
+>>>>>>> Stashed changes
"fTl" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
@@ -18993,20 +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/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
+/obj/structure/barricade/wooden,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaltopbordertop2left"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"fTw" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -19026,26 +23167,50 @@
/turf/closed/wall/f13/wood/house,
/area/f13/legioncamp)
"fTI" = (
-/mob/living/simple_animal/hostile/stalker,
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
- },
+<<<<<<< Updated upstream
+/obj/structure/reagent_dispensers/barrel/dangerous,
/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+=======
+/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,
/obj/structure/junk/locker,
/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,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/floor/carpet/arcade,
+/area/f13/ambientlighting/building/m)
+"fUa" = (
+/obj/structure/fence{
+ dir = 4
},
-/obj/effect/spawner/lootdrop/trash,
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/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,
/area/f13/building/abandoned/g)
@@ -19055,15 +23220,16 @@
icon_state = "horizontalinnermain2"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"fUm" = (
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow3"
+/turf/open/floor/f13/wood{
+ icon_state = "housewood3-broken"
},
-/area/f13/wasteland)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"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)
@@ -19126,30 +23292,26 @@
/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
+<<<<<<< Updated upstream
+"fVF" = (
+/obj/item/twohanded/required/kirbyplants/random,
+/obj/machinery/light/small{
+ dir = 8;
+ brightness = 9
},
-/turf/open/floor/wood_common/wood_common_dark,
+/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
@@ -19181,9 +23343,27 @@
/turf/open/floor/carpet/purple,
/area/f13/bar)
"fVP" = (
-/obj/effect/decal/cleanable/generic,
-/turf/closed/wall/mineral/concrete,
-/area/f13/ambientlighting/building/j)
+<<<<<<< Updated upstream
+/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"
+ },
+/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)
@@ -19213,13 +23393,14 @@
/obj/item/bedsheet/blanket,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/ambientlighting/building/t)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -19234,6 +23415,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
@@ -19243,6 +23435,12 @@
},
/turf/open/floor/plasteel/f13/vault_floor/blue/bluechess,
/area/f13/legioncamp)
+"fXb" = (
+/obj/effect/spawner/lootdrop/bedsheet,
+/obj/structure/bed/wooden,
+/obj/effect/landmark/start/f13/ncrcaptain,
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
"fXf" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/closed/wall/mineral/sandstone,
@@ -19253,6 +23451,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
@@ -19297,6 +23503,30 @@
/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
+ },
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
"fYj" = (
/turf/open/floor/f13{
icon_state = "floorrusty"
@@ -19312,7 +23542,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,
@@ -19323,6 +23555,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
@@ -19398,14 +23643,37 @@
},
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
@@ -19416,6 +23684,9 @@
/obj/structure/flora/wasteplant/wild_prickly,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+"gaq" = (
+/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2,
+/area/f13/ncr)
"gaw" = (
/obj/machinery/door/unpowered/secure_bos,
/turf/open/floor/f13{
@@ -19468,6 +23739,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/ncr)
"gbc" = (
/turf/open/indestructible/ground/outside/water,
/area/f13/caves)
@@ -19486,15 +23763,35 @@
/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{
+ icon_state = "trash_3"
+ },
+/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)
+=======
+"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
@@ -19567,11 +23864,19 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+"gcN" = (
+/obj/structure/rack/shelf_metal,
+/obj/item/salvage/low,
+/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)
+<<<<<<< Updated upstream
+/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";
@@ -19581,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
@@ -19588,15 +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/decoration/rag{
- icon_state = "skulls";
- pixel_x = -4;
- pixel_y = 2
+/obj/structure/wreck/trash/machinepile,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontalbottomborderbottom0"
},
-/obj/structure/decoration/rag,
-/turf/closed/wall/f13/tentwall,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"gdo" = (
/obj/structure/debris/v1{
color = "#343a33";
@@ -19620,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
@@ -19673,6 +24000,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;
@@ -19695,13 +24027,32 @@
/obj/structure/obstacle/barbedwire,
/turf/open/indestructible/ground/outside/ruins,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"get" = (
+/obj/item/statuebust{
+ anchored = 1;
+ can_be_unanchored = 1
+ },
+/turf/open/floor/wood_wide,
+/area/f13/ambientlighting/building/m)
+=======
"ges" = (
-/obj/item/flashlight/lantern{
- pixel_y = 17;
- pixel_x = 6
+/obj/machinery/light/fo13colored/Aqua{
+ desc = "A lighting fixture with cold blue lighting.";
+ name = "UV light"
},
-/turf/open/indestructible/ground/outside/graveldirt,
+/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"
@@ -19741,6 +24092,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"
@@ -19765,31 +24122,22 @@
dir = 8
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/obj/effect/decal/cleanable/glass,
+/obj/effect/spawner/lootdrop/f13/junkspawners,
+/turf/open/floor/plasteel/bar,
+/area/f13/ambientlighting/building/m)
"gfx" = (
-/obj/structure/closet/locker/oldstyle{
- anchored = 1
- },
-/obj/item/storage/lockbox,
-/obj/item/storage/lockbox/medal{
- pixel_y = -5
+/obj/machinery/door/unpowered/secure_NCR,
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/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,
+/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2,
/area/f13/ncr)
+>>>>>>> Stashed changes
"gfz" = (
/obj/structure/table,
/obj/item/kitchen/knife,
@@ -19878,22 +24226,22 @@
/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
+<<<<<<< Updated upstream
+/obj/structure/stairs/north{
+ color = "#A47449"
},
-/obj/item/trash/f13/c_ration_1{
- pixel_x = 7;
- pixel_y = -6
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1;
+ layer = 10000
},
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+=======
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
},
-/area/f13/ncr)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"ggr" = (
/obj/structure/bed/wooden{
pixel_y = 15
@@ -19911,11 +24259,18 @@
/turf/open/floor/carpet,
/area/f13/legioncamp)
"ggF" = (
-/obj/structure/rack,
-/obj/item/clothing/under/f13/bluedress,
+<<<<<<< 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/f13/wood,
-/area/f13/ambientlighting/building/h)
+/turf/open/floor/plasteel/vaporwave,
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"ggI" = (
/obj/structure/table/wood,
/obj/structure/decoration/rag,
@@ -19931,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{
@@ -19943,27 +24304,32 @@
/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
+<<<<<<< Updated upstream
+/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,
/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/landmark/start/f13/ncroffduty,
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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,
@@ -19974,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,
@@ -20097,6 +24467,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,
@@ -20132,12 +24511,20 @@
/obj/structure/flora/tree/oak_one,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -20146,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,
@@ -20165,6 +24562,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,
@@ -20224,10 +24627,14 @@
/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)
+<<<<<<< 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,
@@ -20243,8 +24650,7 @@
/area/f13/wasteland)
"gmz" = (
/obj/structure/fence{
- dir = 1;
- icon_state = "straight"
+ dir = 1
},
/obj/structure/fence/corner{
dir = 4
@@ -20266,6 +24672,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"
@@ -20274,6 +24687,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)
@@ -20340,7 +24761,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
@@ -20349,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
@@ -20384,6 +24814,17 @@
/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"
+ },
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"goJ" = (
/obj/machinery/light/small{
dir = 1;
@@ -20441,6 +24882,23 @@
icon_state = "dirtcorner"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"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)
+=======
+"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{
@@ -20464,17 +24922,23 @@
/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"
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
icon_state = "gib3-old"
@@ -20488,20 +24952,35 @@
},
/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;
- icon_state = "housewindowbrokenvertical"
+<<<<<<< Updated upstream
+/obj/structure/fence{
+ dir = 4
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 1
},
-/obj/machinery/door/poddoor/shutters/preopen{
- layer = 11;
- name = "Toys for the Middle-Aged"
+/turf/open/indestructible/ground/outside/sidewalk,
+=======
+/obj/effect/decal/marking{
+ icon_state = "dottedverticalcorroded";
+ pixel_x = -14
},
-/turf/open/floor/carpet/arcade,
-/area/f13/ambientlighting/building/j)
+/obj/structure/car/rubbish1,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain0"
+ },
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"gqE" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/barrel/dangerous,
@@ -20530,18 +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/simple_door/metal/dirtystore,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
- },
-/area/f13/ambientlighting/building/g)
+/obj/structure/table,
+/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2,
+/area/f13/ncr)
"gqS" = (
-/obj/machinery/door/unpowered/secure_NCR{
- name = "Medical"
+/obj/structure/chair/wood{
+ dir = 8
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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{
@@ -20558,6 +25045,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
@@ -20595,6 +25087,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,
@@ -20631,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{
@@ -20638,11 +25146,15 @@
},
/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)
+<<<<<<< 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{
@@ -20705,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
@@ -20741,6 +25264,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{
@@ -20792,6 +25322,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,
@@ -20813,6 +25350,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,
@@ -20851,24 +25392,20 @@
},
/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,
+<<<<<<< Updated upstream
+/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,
/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"
@@ -20893,6 +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";
@@ -20994,6 +25547,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,
@@ -21009,22 +25569,32 @@
/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)
+<<<<<<< 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,
/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,
@@ -21061,6 +25631,14 @@
},
/turf/open/floor/wood_common,
/area/maintenance/bar)
+"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" = (
/obj/structure/flora/tree/oak_three,
/turf/open/indestructible/ground/outside/grass/dirtpath{
@@ -21083,13 +25661,12 @@
/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,
+<<<<<<< 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" = (
/obj/structure/flora/tree/tall{
@@ -21102,6 +25679,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,
@@ -21120,40 +25708,44 @@
/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
+<<<<<<< Updated upstream
+/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";
- layer = 11;
- name = "Isebel's Modern Attire"
- },
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/f13/vault_floor/plating,
+/area/f13/ambientlighting/building/j)
+"gBQ" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/indestructible/ground/inside/mountain,
+=======
+/obj/machinery/light/fo13colored/Red{
+ dir = 8
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
+/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/effect/turf_decal/weather/dirt{
- dir = 5
+/obj/structure/barricade/wooden,
+/turf/open/indestructible/ground/outside/desert{
+ icon_state = "wasteland32"
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+>>>>>>> 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{
@@ -21165,21 +25757,21 @@
smooth = 1
},
/area/f13/casino)
-"gCo" = (
+"gCl" = (
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
- brightness = 7
- },
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/effect/decal/cleanable/blood/old{
- pixel_x = 12
+ light_color = "red"
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
},
-/turf/open/floor/plasteel/f13/vault_floor/neutral/white/whitepurplechess,
-/area/f13/ambientlighting/building/j)
+=======
+"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,
/obj/machinery/computer/terminal{
@@ -21205,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";
@@ -21246,6 +25844,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,
@@ -21284,16 +25891,32 @@
/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" = (
/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" = (
+/obj/effect/decal/marking{
+ icon_state = "dottedhorizontalcorroded";
+ pixel_y = -17
+ },
+/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
@@ -21325,14 +25948,20 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -21343,6 +25972,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{
@@ -21411,12 +26049,45 @@
icon_state = "bluerustysolid"
},
/area/f13/ambientlighting/building/o)
+<<<<<<< Updated upstream
+"gFQ" = (
+/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)
+"gFV" = (
+/obj/machinery/power/floodlight,
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/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/structure/flora/stump,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow4"
+/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
@@ -21436,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
@@ -21443,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,
@@ -21464,6 +26152,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"
@@ -21486,6 +26178,24 @@
/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/structure/cable/outdoors{
+ icon_state = "1-2"
+ },
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"gHy" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/closed/wall/f13/wood/house,
@@ -21497,17 +26207,18 @@
},
/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland/town)
+<<<<<<< Updated upstream
+=======
"gHE" = (
-/obj/structure/window/reinforced/spawner/west,
-/obj/structure/rack,
-/obj/item/lightreplacer,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/machinery/light/small{
+ dir = 4
},
-/turf/open/floor/plasteel/f13/vault_floor/red/side{
- dir = 8
+/obj/item/tele_iv,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/ncr)
+>>>>>>> Stashed changes
"gHN" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -21549,11 +26260,9 @@
},
/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/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
@@ -21619,6 +26328,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{
@@ -21715,6 +26430,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"
@@ -21766,7 +26487,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,
@@ -21775,19 +26498,21 @@
color = "#e4e4e4"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"gLl" = (
-/obj/effect/turf_decal/weather/snow/corner,
-/obj/structure/bed/mattress{
- icon_state = "mattress2";
- pixel_y = -1;
- pixel_x = 2
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
},
-/obj/item/bedsheet/blanket,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
},
-/area/f13/ncr)
+/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
@@ -21807,36 +26532,29 @@
/turf/open/floor/plasteel/dark,
/area/f13/ambientlighting/building/y)
"gLz" = (
+<<<<<<< Updated upstream
/obj/structure/fence{
dir = 4
},
/obj/structure/barricade/wooden/planks,
/obj/structure/decoration/rag,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
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/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
+/obj/effect/decal/cleanable/blood{
+ icon_state = "gib2"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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{
@@ -21885,14 +26603,27 @@
/turf/open/floor/engine/air,
/area/engine/workshop)
"gMb" = (
-/obj/structure/rack,
-/obj/item/clothing/under/pants/jeans{
- pixel_y = -10
+<<<<<<< Updated upstream
+/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/under/f13/cowboyg,
+/obj/item/clothing/suit/armor/outfit/jacket/ncrcfjacket,
+/turf/open/floor/plasteel/grimy,
+=======
/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/carpet/arcade,
+>>>>>>> Stashed changes
+/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.";
@@ -21902,13 +26633,15 @@
icon_state = "horizontalinnermain2"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"gMf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
+/obj/item/flag/ncr,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontalbottomborderbottom0"
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"gMh" = (
/obj/structure/table/wood,
/obj/structure/decoration/rag,
@@ -21929,7 +26662,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,
@@ -21954,13 +26689,23 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"gMH" = (
-/obj/structure/dresser,
-/obj/item/radio/tribal{
+<<<<<<< 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
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/turf/open/floor/plasteel/grimy,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"gML" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/simple_door/tent,
@@ -22003,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,
@@ -22011,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,
@@ -22018,20 +26783,18 @@
/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,
-/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{
@@ -22070,13 +26833,31 @@
/turf/open/floor/wood_common,
/area/maintenance/bar)
"gOW" = (
-/obj/machinery/hydroponics/soil{
- mutmod = 0;
- name = "ancient fertile soil";
- yieldmod = 1.3
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
@@ -22085,19 +26866,14 @@
},
/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"
- },
+<<<<<<< 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,
@@ -22123,14 +26899,16 @@
icon_state = "common-broken4"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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."
+/obj/machinery/door/unpowered/secure_NCR,
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/turf/open/floor/holofloor/carpet,
-/area/f13/ambientlighting/building/g)
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"gPC" = (
/obj/machinery/light/small{
dir = 4;
@@ -22152,17 +26930,18 @@
/obj/structure/fence,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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."
+/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"
},
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"gPV" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -22191,10 +26970,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{
@@ -22258,9 +27039,16 @@
/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)
+"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{
@@ -22274,15 +27062,15 @@
/obj/structure/decoration/rag,
/turf/closed/wall/f13/tentwall,
/area/f13/ambientlighting/building/b)
+<<<<<<< Updated upstream
+=======
"gRu" = (
-/obj/machinery/light/small{
- brightness = 7
- },
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/machinery/chem_heater,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess,
-/area/f13/ambientlighting/building/j)
+/area/f13/ncr)
+>>>>>>> Stashed changes
"gRw" = (
/obj/structure/decoration/rag,
/obj/effect/decal/cleanable/dirt,
@@ -22345,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,
@@ -22392,12 +27186,14 @@
icon_state = "innermaincornerinner"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"gTy" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/plasteel/f13/vault_floor/yellow/whiteyellowfull,
+/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
@@ -22409,6 +27205,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
@@ -22417,21 +27229,16 @@
icon_state = "common-broken3"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/structure/table/booth,
+/obj/effect/spawner/lootdrop/f13/junkspawners,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain0"
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"gTW" = (
/obj/structure/closet/crate/footlocker{
anchored = 1
@@ -22501,6 +27308,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
@@ -22542,9 +27353,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
},
@@ -22609,19 +27418,39 @@
},
/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,
+<<<<<<< Updated upstream
+/turf/open/floor/plasteel/f13/vault_floor/plating,
/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"
+ },
+=======
+/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,
-/obj/structure/fluff/hedge,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/turf/open/floor/plating/f13/outside/roof/wood{
+ name = "wooden floor";
+ desc = "It's a floor. Wow."
},
-/area/f13/ncr)
+/area/f13/ambientlighting/building/m)
"gXh" = (
/obj/structure/table/wood,
/obj/item/kirbyplants{
@@ -22644,19 +27473,18 @@
},
/turf/open/floor/carpet/orange,
/area/f13/ambientlighting/building/c)
+<<<<<<< Updated upstream
+=======
"gXB" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
- },
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
+/obj/machinery/door/unpowered/secure_NCR{
+ name = "Prison"
},
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/item/storage/trash_stack,
-/turf/open/indestructible/ground/outside/graveldirt,
+/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/ncr)
+>>>>>>> Stashed changes
"gXD" = (
/obj/structure/wreck/car,
/turf/open/indestructible/ground/outside/dirt{
@@ -22729,13 +27557,32 @@
},
/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"
+ },
+/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,
/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,
@@ -22743,17 +27590,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/building/abandoned/q)
+<<<<<<< Updated upstream
+=======
"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)
+/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
@@ -22768,6 +27612,14 @@
/obj/structure/nest/mirelurk,
/turf/open/indestructible/ground/outside/dirt,
/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/ncr)
"gZc" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -22778,6 +27630,21 @@
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
+ },
+/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
@@ -22790,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;
@@ -22829,12 +27707,19 @@
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/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)
+/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,
/obj/effect/decal/cleanable/blood{
@@ -22860,14 +27745,42 @@
/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,
+<<<<<<< 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,
@@ -22935,24 +27848,25 @@
/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
+ 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/structure/flora/grass/brown{
- pixel_x = -6;
- pixel_y = 12
- },
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/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,
@@ -22997,23 +27911,15 @@
/mob/living/simple_animal/hostile/ghoul,
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"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"
+/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
@@ -23037,10 +27943,21 @@
/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,
+<<<<<<< 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" = (
/obj/effect/decal/cleanable/dirt,
@@ -23072,21 +27989,24 @@
/obj/effect/decal/cleanable/robot_debris/gib,
/turf/open/floor/plating/rust,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"hcZ" = (
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/remains/human,
-/turf/open/indestructible/ground/outside/dirt{
- dir = 4;
- icon_state = "dirtcorner"
+/obj/structure/bed/mattress{
+ icon_state = "mattress1";
+ pixel_y = 9
},
-/area/f13/wasteland)
+/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
},
-/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,
@@ -23095,6 +28015,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"
@@ -23126,6 +28053,18 @@
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"
+ },
+/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,
@@ -23189,6 +28128,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/ncr)
"heB" = (
/mob/living/simple_animal/hostile/supermutant/meleemutant,
/obj/effect/decal/cleanable/dirt,
@@ -23235,14 +28183,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{
@@ -23252,10 +28207,18 @@
icon_state = "floorrusty"
},
/area/f13/ambientlighting/building/b)
+<<<<<<< Updated upstream
+=======
"hfw" = (
-/obj/structure/sign/departments/security,
-/turf/closed/wall/mineral/concrete,
-/area/f13/ambientlighting/building/j)
+/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
@@ -23266,11 +28229,20 @@
},
/area/f13/wasteland)
"hfR" = (
-/obj/structure/simple_door/bunker,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/barricade/wooden,
+<<<<<<< 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/caves)
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"hfT" = (
/turf/closed/wall/f13/wood/house,
/area/f13/ambientlighting/building/u)
@@ -23278,6 +28250,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{
@@ -23285,19 +28261,7 @@
},
/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)
+<<<<<<< Updated upstream
"hgt" = (
/obj/structure/barricade/sandbags,
/obj/structure/cable/outdoors{
@@ -23307,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,
@@ -23378,6 +28350,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/ncr)
"hhr" = (
/obj/structure/junk/locker,
/obj/effect/spawner/lootdrop/f13/weapon/melee/tier3,
@@ -23441,14 +28417,13 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -23473,6 +28448,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"
@@ -23488,18 +28468,21 @@
},
/area/f13/wasteland)
"hiN" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/trash,
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/building/powered)
+/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)
"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"
@@ -23632,6 +28615,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,
@@ -23665,12 +28656,23 @@
/obj/item/defibrillator/primitive,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+"hkO" = (
+/turf/closed/mineral/random,
+/area/f13/ncr)
"hkX" = (
/obj/effect/turf_decal/trimline/white/line,
/turf/open/indestructible/ground/outside/road{
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
@@ -23723,14 +28725,12 @@
"hlO" = (
/turf/open/floor/carpet/royalblue,
/area/f13/building/abandoned/s)
+<<<<<<< Updated upstream
+=======
"hlS" = (
-/obj/machinery/computer/terminal,
-/obj/structure/table/reinforced,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/plasteel/f13/vault_floor/yellow,
+/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,
@@ -23740,6 +28740,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
@@ -23841,16 +28847,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,
@@ -23893,6 +28895,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/ncr)
"hnH" = (
/obj/structure/closet/cabinet,
/obj/effect/decal/cleanable/dirt,
@@ -23908,11 +28914,19 @@
},
/area/f13/wasteland/town)
"hnJ" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 8
+<<<<<<< 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"
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+>>>>>>> Stashed changes
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"hnL" = (
/obj/structure/chair/wood{
dir = 1
@@ -23936,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,
@@ -23950,24 +29000,28 @@
/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"
- },
+<<<<<<< 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;
- light_color = "#706891"
+ layer = 2.9
},
-/obj/machinery/smartfridge/bottlerack/lootshelf/condiment,
-/turf/open/floor/plasteel/f13/vault_floor/floor,
-/area/f13/ambientlighting/building/p)
+/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" = (
/obj/structure/ladder/unbreakable{
level = 1;
@@ -23983,15 +29037,23 @@
},
/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{
- dir = 1
+<<<<<<< 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/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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,
@@ -24026,22 +29088,36 @@
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/b)
"hpp" = (
-/obj/machinery/light,
+<<<<<<< Updated upstream
+/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)
+=======
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/f13/vault_floor/floor,
-/area/f13/ambientlighting/building/p)
+/obj/structure/barricade/wooden,
+/obj/structure/barricade/tentclothedge{
+ dir = 8
+ },
+/turf/open/floor/wood_common,
+/area/f13/ambientlighting/building/m)
"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"
+/obj/machinery/light{
+ dir = 1;
+ layer = 2.9
},
-/area/f13/ambientlighting/building/g)
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"hpH" = (
/obj/structure/lamp_post{
dir = 8
@@ -24056,35 +29132,45 @@
/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)
+<<<<<<< Updated upstream
"hpV" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/mob/living/simple_animal/hostile/raider/sulphite{
- faction = list("raider")
- },
-/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,
+/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"
},
/area/f13/brotherhood/surface)
+"hqe" = (
+/obj/structure/janitorialcart,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+"hql" = (
+/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,
@@ -24123,26 +29209,23 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/f13/stone/rugged,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"hqC" = (
-/obj/item/newspaper{
- pixel_x = -2
- },
-/obj/structure/rack,
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken3"
+/obj/effect/decal/remains/human,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain0"
},
-/area/f13/ncr)
+/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"
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2,
-/area/f13/ambientlighting/building/j)
+/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,
@@ -24199,6 +29282,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"
@@ -24234,14 +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/fence/corner/wooden,
-/turf/open/indestructible/ground/outside/desert,
-/area/f13/wasteland)
+/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"
@@ -24257,22 +29363,27 @@
},
/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,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"hsD" = (
+/obj/item/pickaxe,
+/turf/open/indestructible/ground/inside/mountain,
+=======
"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)
+/obj/effect/spawner/lootdrop/toolsbasic,
+/turf/open/indestructible/ground/outside/sidewalk,
+>>>>>>> Stashed changes
+/area/f13/ncr)
"hsO" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
@@ -24314,6 +29425,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/ncr)
"hti" = (
/obj/effect/turf_decal/weather/dirt{
dir = 1
@@ -24321,9 +29438,23 @@
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland/town)
"htm" = (
-/obj/structure/junk/machinery,
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
+<<<<<<< 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{
brightness = 7;
@@ -24349,8 +29480,16 @@
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/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright2"
+ },
+/area/f13/wasteland)
"htY" = (
/obj/structure/flora/grass/wasteland{
icon_state = "tall_grass_6"
@@ -24359,6 +29498,12 @@
icon_state = "dirtcorner"
},
/area/f13/wasteland)
+"huh" = (
+/obj/item/blacksmith/chain{
+ pixel_x = -8
+ },
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
"huj" = (
/obj/structure/flora/tree/cactus_alt,
/turf/open/indestructible/ground/outside/dirt{
@@ -24385,6 +29530,22 @@
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,
/obj/effect/spawner/lootdrop/f13/crafting,
@@ -24451,15 +29612,39 @@
/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)
+<<<<<<< Updated upstream
+"hvC" = (
+/obj/structure/cable/outdoors{
+ icon_state = "2-8"
+ },
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
+=======
"hvs" = (
-/obj/structure/flora/tree/wasteland,
-/obj/item/trash/candy{
+/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
},
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/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
@@ -24467,27 +29652,25 @@
/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
+<<<<<<< Updated upstream
+=======
+"hvO" = (
+/obj/structure/fence/wooden{
+ dir = 4;
+ icon_state = "post_wood"
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/effect/decal/cleanable/generic{
+ pixel_x = -8;
+ pixel_y = 12
},
-/area/f13/ncr)
+/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,
@@ -24517,6 +29700,7 @@
},
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
"hwn" = (
/obj/structure/noticeboard{
pixel_y = 32
@@ -24531,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
@@ -24543,12 +29739,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";
@@ -24567,7 +29779,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{
@@ -24585,16 +29799,36 @@
},
/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,
-/area/f13/caves)
+<<<<<<< Updated upstream
+/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)
+=======
+/obj/structure/chair/wood/wings{
+ dir = 1
+ },
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"hxl" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
+ },
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"hxr" = (
/turf/open/indestructible/ground/outside/road{
dir = 1;
@@ -24613,6 +29847,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;
@@ -24635,14 +29876,17 @@
},
/turf/open/floor/wood_common,
/area/maintenance/bar)
+<<<<<<< Updated upstream
+=======
"hya" = (
-/obj/structure/campfire,
-/obj/item/cigbutt{
- pixel_y = 11;
- pixel_x = 4
+/obj/structure/car/rubbish2{
+ icon_state = "car_rubish3"
+ },
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"hyb" = (
/turf/closed/indestructible/rock{
desc = "A pre-War wall made of solid concrete.";
@@ -24666,21 +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/structure/flora/grass/wasteland{
- icon_state = "tall_grass_2";
- pixel_x = 4;
- pixel_y = 3
+/obj/effect/turf_decal/big{
+ dir = 8
},
-/obj/effect/landmark/start/f13/ncrrep,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
+ },
+/area/f13/ncr)
+>>>>>>> Stashed changes
"hyZ" = (
/obj/structure/table/wood,
/obj/structure/curtain{
@@ -24713,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{
@@ -24783,13 +30048,22 @@
},
/area/f13/ambientlighting/building/m)
"hAD" = (
-/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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/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";
@@ -24819,11 +30093,21 @@
/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
"hAK" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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,
+=======
+/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" = (
/obj/structure/wreck/trash/three_barrels,
/turf/open/indestructible/ground/inside/dirt,
@@ -24890,14 +30174,31 @@
/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"
+<<<<<<< Updated upstream
+/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)
+=======
+/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"
@@ -24916,6 +30217,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
@@ -24969,6 +30277,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"
@@ -25011,40 +30324,35 @@
},
/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"
+<<<<<<< Updated upstream
+"hDi" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/displaycase/trophy,
+/obj/item/toy/plush,
+/obj/structure/fluff/railing{
+ dir = 1
},
-/mob/living/simple_animal/hostile/raider/ranged,
-/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess,
+/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/fence{
- dir = 4
- },
-/turf/open/indestructible/ground/outside/dirt{
- dir = 8;
- icon_state = "dirt"
- },
+/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/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
- },
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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{
dir = 8
@@ -25068,8 +30376,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/ncr)
"hDC" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/darkbrown,
@@ -25080,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,
@@ -25092,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{
@@ -25121,19 +30452,15 @@
},
/turf/open/floor/plating/f13/outside/roof/metal/corrugated,
/area/f13/building/abandoned/l)
+<<<<<<< Updated upstream
+=======
"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
+/obj/effect/spawner/lootdrop/f13/crafting,
+/turf/open/floor/f13/wood{
+ icon_state = "housewood2-broken"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"hEJ" = (
/turf/open/indestructible/ground/outside/desert{
icon_state = "wasteland32"
@@ -25200,12 +30527,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,
@@ -25252,16 +30582,16 @@
/obj/structure/barricade/wooden,
/turf/closed/wall/f13/tentwall,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"hGq" = (
-/obj/structure/toilet{
- dir = 8
- },
-/obj/structure/window/reinforced/spawner/north,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 8;
+ icon_state = "outerbordercorner"
},
-/turf/open/floor/plasteel/f13/vault_floor/neutral/white/whitepurplechess,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"hGw" = (
/obj/structure/fence/wooden,
/turf/open/indestructible/ground/inside/dirt,
@@ -25290,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"
@@ -25303,18 +30637,22 @@
},
/area/f13/ambientlighting/building/b)
"hGZ" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/turf/closed/wall/f13/ruins,
+=======
+/obj/structure/closet/crate/footlocker{
+ anchored = 1
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
+/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,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -25380,11 +30718,16 @@
/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)
+<<<<<<< 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,
@@ -25401,16 +30744,19 @@
/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,
+<<<<<<< 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,
@@ -25440,6 +30786,21 @@
/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,
+/obj/structure/barricade/tentclothedge{
+ 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{
pixel_y = 15
@@ -25528,11 +30889,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
@@ -25546,21 +30902,16 @@
icon_state = "whitegreenrustychess"
},
/area/f13/ambientlighting/building/i)
+<<<<<<< Updated upstream
+=======
"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
+/obj/structure/closet/crate/miningcar{
+ layer = 5
},
-/area/f13/ambientlighting/building/j)
+/obj/structure/fluff/rails,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+>>>>>>> Stashed changes
"hKo" = (
/obj/structure/car/rubbish2,
/obj/effect/decal/waste{
@@ -25568,6 +30919,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,
@@ -25576,11 +30931,22 @@
},
/area/f13/wasteland/city)
"hKK" = (
-/obj/structure/stairs/west{
- color = "#A47449"
+<<<<<<< Updated upstream
+/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)
+=======
+/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"
@@ -25598,6 +30964,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"
@@ -25650,16 +31022,13 @@
icon_state = "redrustyfull"
},
/area/f13/building/abandoned/t)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -25667,10 +31036,15 @@
icon_state = "outerpavement"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"hMj" = (
-/obj/machinery/msgterminal/ncr,
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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,
@@ -25678,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,
@@ -25686,19 +31080,30 @@
},
/area/f13/building/powered)
"hMS" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 4
+<<<<<<< Updated upstream
+/turf/open/floor/plasteel/grimy,
+/area/f13/ambientlighting/building/m)
+"hMU" = (
+/obj/item/trash/f13/tin,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
+"hNc" = (
+/obj/structure/cable/outdoors{
+ icon_state = "1-4"
},
-/turf/open/indestructible/ground/outside/dirt,
-/area/f13/caves)
+/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" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/floor/plasteel/f13{
+ dir = 4;
+ icon_state = "rampdowntop"
},
-/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)
+>>>>>>> Stashed changes
"hNl" = (
/obj/effect/turf_decal/weather/dirt{
dir = 1
@@ -25707,37 +31112,38 @@
dir = 1
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"hNm" = (
-/obj/effect/landmark/start/f13/ncrmp,
-/obj/machinery/light/small{
- dir = 8;
- light_color = "#ff4747"
- },
-/obj/structure/fluff/rug/rug_rubber{
- icon = 'icons/fallout/objects/64x64_rugs.dmi';
- layer = 2.7
- },
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1"
- },
-/area/f13/ncr)
+/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" = (
-/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
+<<<<<<< Updated upstream
+/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)
+=======
+/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;
@@ -25773,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
@@ -25781,6 +31196,26 @@
/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"
+ },
+/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{
+ dir = 1;
+ icon_state = "outerborder"
+ },
+/area/f13/wasteland)
"hOB" = (
/obj/structure/closet/fridge/meat,
/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria,
@@ -25844,6 +31279,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,
@@ -25887,15 +31334,25 @@
},
/area/f13/followers)
"hPz" = (
-/obj/structure/wreck/car/bike{
- dir = 8
+<<<<<<< Updated upstream
+/obj/structure/chair/booth{
+ dir = 4
},
-/turf/open/floor/plating/f13/outside/road,
-/area/f13/ambientlighting/building/w)
+/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/landmark/start/f13/ncrrearechelon,
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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,
@@ -25920,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,
@@ -25971,6 +31434,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;
@@ -26002,7 +31469,22 @@
},
/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,
+/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)
+=======
+>>>>>>> Stashed changes
"hRm" = (
/obj/structure/table/wood/junk,
/obj/structure/fence{
@@ -26014,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{
@@ -26056,6 +31546,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,
@@ -26072,22 +31569,29 @@
/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)
+<<<<<<< Updated upstream
+=======
"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,
+/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,
@@ -26181,21 +31685,14 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -26233,17 +31730,13 @@
},
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/ambientlighting/building/g)
+<<<<<<< Updated upstream
+=======
"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,
+/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,
@@ -26270,25 +31763,30 @@
dir = 6
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
"hVm" = (
/obj/effect/decal/cleanable/glass,
/turf/open/indestructible/ground/outside/dirt{
dir = 1;
icon_state = "dirt"
},
-/area/f13/wasteland)
-"hVn" = (
-/obj/structure/bed/old,
-/obj/item/bedsheet/blanket{
- pixel_y = 1
+=======
+"hVf" = (
+/obj/structure/wreck/trash/machinepiletwo,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/obj/structure/sign/poster/prewar/poster74{
- pixel_y = 32
+/area/f13/sewer/powered)
+"hVn" = (
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 4
},
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "outerbordercorner"
},
-/area/f13/ncr)
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"hVs" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -26316,13 +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" = (
-/obj/structure/wreck/trash/brokenvendor,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< 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"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/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;
@@ -26345,6 +31868,17 @@
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,
+/area/f13/wasteland)
"hWJ" = (
/turf/closed/wall/f13/wood/house,
/area/f13/building/abandoned/w)
@@ -26353,12 +31887,25 @@
/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{
+ icon_state = "trash_2"
+ },
+/turf/open/floor/carpet/arcade,
+/area/f13/ambientlighting/building/m)
"hWU" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/wasteland)
+=======
+"hWU" = (
+/obj/effect/spawner/bundle/f13/caravan_shotgun,
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"hWZ" = (
/obj/structure/simple_door/metal/store{
icon_state = "brokenstore"
@@ -26401,12 +31948,15 @@
icon_state = "verticalrightborderright2bottom"
},
/area/f13/ambientlighting/building/y)
+<<<<<<< Updated upstream
+=======
"hXB" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/highmid,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermainright"
},
-/turf/open/floor/plasteel/f13/vault_floor/green/white,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"hXV" = (
/obj/machinery/conveyor/auto{
dir = 4;
@@ -26420,15 +31970,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)
@@ -26463,13 +32010,17 @@
},
/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
/area/f13/ambientlighting/building/o)
+<<<<<<< Updated upstream
+=======
"hYY" = (
-/obj/structure/window/reinforced/spawner/west,
-/obj/structure/fluff/railing{
- dir = 8
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/turf/open/water,
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain2top"
+ },
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"hZa" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -26480,23 +32031,32 @@
/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"
+<<<<<<< Updated upstream
+"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)
-"hZE" = (
-/obj/structure/reagent_dispensers/barrel/dangerous,
-/obj/structure/reagent_dispensers/barrel/dangerous,
-/turf/open/indestructible/ground/outside/dirt{
- icon_state = "dirt";
- dir = 6
+=======
+"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
@@ -26506,6 +32066,16 @@
},
/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
+ },
+/obj/effect/overlay/desert/sonora/edge,
+/turf/open/floor/wood_common,
+/area/f13/wasteland)
"hZL" = (
/obj/structure/lamp_post{
dir = 8
@@ -26580,14 +32150,18 @@
icon_state = "horizontaltopbordertop0"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"iap" = (
-/obj/structure/chair/wood{
- dir = 1
- },
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1"
- },
-/area/f13/wasteland)
+/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{
@@ -26596,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{
@@ -26604,15 +32185,18 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"iaE" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/mob/living/simple_animal/hostile/raider/tribal{
- name = "Cannibal Chef"
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 4;
+ icon_state = "outermaincornerinner"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"iaF" = (
/obj/structure/destructible/tribal_torch/lit,
/turf/open/indestructible/ground/outside/dirt,
@@ -26660,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{
@@ -26670,14 +32262,15 @@
/obj/structure/fence,
/turf/open/indestructible/ground/outside/water/running,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"ibC" = (
-/obj/structure/table/wood,
-/obj/machinery/light/small{
- dir = 8;
- light_color = "#ff4747"
- },
-/turf/open/floor/f13/wood,
-/area/f13/ncr)
+/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,
@@ -26711,15 +32304,18 @@
icon_state = "verticalinnermain0"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
"icG" = (
/obj/structure/debris/v2,
/turf/open/indestructible/ground/outside/ruins,
-/area/f13/wasteland)
+=======
"icM" = (
-/obj/structure/flora/brushwood{
- pixel_x = -21
+/obj/item/crowbar,
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 8
},
-/turf/open/indestructible/ground/outside/snow,
+/turf/open/floor/wood_common,
+>>>>>>> Stashed changes
/area/f13/wasteland)
"icO" = (
/turf/open/indestructible/ground/outside/savannah,
@@ -26766,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,
@@ -26783,15 +32388,34 @@
/obj/structure/closet/crate/freezer,
/turf/open/indestructible/ground/outside/sidewalkdirt,
/area/f13/wasteland/followers)
-"idG" = (
+<<<<<<< Updated upstream
+"idu" = (
/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/floor/wood_common,
+/area/f13/ambientlighting/building/m)
+"idG" = (
+/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"
+ },
+=======
+"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{
color = "#845f58";
@@ -26804,9 +32428,20 @@
/turf/open/floor/carpet/purple,
/area/f13/bar)
"idZ" = (
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+<<<<<<< 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,
+/turf/open/indestructible/ground/outside/desert,
/area/f13/ambientlighting/building/j)
"iea" = (
/turf/open/indestructible/ground/outside/sidewalk{
@@ -26881,17 +32516,32 @@
/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,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+"ifQ" = (
+/obj/structure/cable/outdoors{
+ icon_state = "2-8"
+ },
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
+=======
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/wood,
/turf/open/floor/f13{
- icon_state = "floorrusty"
+ icon_state = "yellowrustyfull"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"ifR" = (
/obj/structure/flora/grass/jungle/b,
/obj/effect/turf_decal/weather/dirt{
@@ -26911,6 +32561,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{
@@ -26923,6 +32591,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,
@@ -27016,13 +32691,27 @@
icon_state = "horizontaloutermain2"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"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"
+/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)
+=======
+"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,
/obj/effect/turf_decal/delivery,
@@ -27031,6 +32720,25 @@
icon_state = "horizontaloutermain1"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"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,
+/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,
@@ -27079,6 +32787,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,
@@ -27088,14 +32804,16 @@
/obj/structure/obstacle/barbedwire,
/obj/structure/barricade/sandbags,
/turf/open/indestructible/ground/outside/desert,
-/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
+/area/f13/wasteland/legion)
"iiA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/outdoors{
- icon_state = "1-2"
+/obj/machinery/autolathe,
+/turf/open/indestructible/ground/outside/dirt{
+ icon_state = "dirt"
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/ncr)
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"iiG" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13/wood{
@@ -27110,7 +32828,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,
@@ -27141,20 +32861,27 @@
},
/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"
+<<<<<<< Updated upstream
+/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,
+=======
+/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,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -27169,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{
@@ -27183,13 +32918,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{
@@ -27216,10 +32950,29 @@
/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)
+<<<<<<< Updated upstream
+/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"
+ },
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/turf/open/indestructible/ground/outside/road{
+ 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,
@@ -27252,9 +33005,24 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"ikE" = (
-/obj/structure/flora/tree/tall,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+<<<<<<< Updated upstream
+/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."
+ },
+=======
+/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{
layer = 2;
@@ -27268,6 +33036,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
@@ -27358,20 +33131,17 @@
/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"
+<<<<<<< Updated upstream
+/obj/effect/turf_decal/weather/dirt{
+ dir = 10
},
-/area/f13/wasteland)
+/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{
dir = 1
@@ -27379,12 +33149,18 @@
/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
"imq" = (
-/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -27448,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"
@@ -27461,16 +33253,15 @@
/obj/item/stack/ore/iron,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -27495,10 +33286,25 @@
icon_state = "rubblepillar"
},
/area/f13/ambientlighting/building/t)
+<<<<<<< Updated upstream
+=======
"ioR" = (
-/mob/living/simple_animal/hostile/radscorpion,
-/turf/open/indestructible/ground/outside/dirt,
-/area/f13/caves)
+/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";
@@ -27519,6 +33325,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/ncr)
"ipk" = (
/obj/structure/fluff/fokoff_sign,
/turf/open/indestructible/ground/outside/dirt{
@@ -27535,14 +33347,17 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"ipq" = (
/obj/machinery/door/unpowered/secure_NCR{
- name = "Prison"
+ name = "Medical"
},
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1"
+/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)
@@ -27551,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,
@@ -27590,10 +33408,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
@@ -27608,6 +33440,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,
@@ -27632,12 +33468,15 @@
icon_state = "horizontalinnermain1"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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"
@@ -27655,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,
@@ -27681,6 +33527,27 @@
/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";
+ 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)
+=======
+"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,
@@ -27709,6 +33576,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
@@ -27717,7 +33591,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,
@@ -27799,15 +33673,17 @@
},
/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
+<<<<<<< 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"
},
-/turf/open/indestructible/ground/outside/dirt,
-/area/f13/caves)
+/area/f13/sewer/powered)
+>>>>>>> Stashed changes
"ivg" = (
/obj/structure/chair/wood,
/obj/effect/landmark/start/f13/tribal,
@@ -27860,6 +33736,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,
@@ -27868,21 +33752,38 @@
},
/area/f13/building/abandoned/h)
"ivH" = (
-/obj/effect/decal/cleanable/dirt{
- color = "#363636"
+<<<<<<< Updated upstream
+/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{
+ icon_state = "1-2"
},
-/obj/structure/fluff/railing{
- dir = 1
+/obj/machinery/light{
+ pixel_x = 16
},
-/obj/structure/flora/stump,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/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/open/floor/plating/dirt,
-/area/f13/ambientlighting/building/j)
+/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,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
+ },
/area/f13/bunker)
"ivV" = (
/obj/structure/rack,
@@ -27897,12 +33798,36 @@
},
/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
+<<<<<<< Updated upstream
+ },
+/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)
+=======
+ },
+/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"
},
-/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"iwp" = (
/obj/item/trash/f13/porknbeans,
/turf/open/indestructible/ground/outside/dirt,
@@ -27923,18 +33848,13 @@
/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)
+<<<<<<< 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" = (
/obj/structure/table,
/obj/machinery/computer/terminal{
@@ -27962,19 +33882,46 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/caves)
"ixw" = (
-/obj/machinery/light{
- dir = 1;
- light_color = "#706891"
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/structure/chair/stool{
+ dir = 8;
+ icon_state = "bench"
},
-/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/effect/decal/cleanable/dirt,
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
+ },
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/m)
"ixz" = (
/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"
+ },
+<<<<<<< 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{
dir = 9
@@ -28020,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
@@ -28068,23 +34023,17 @@
/obj/structure/obstacle/barbedwire,
/turf/open/indestructible/ground/outside/ruins,
/area/f13/wasteland)
-"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
+"izz" = (
+/obj/machinery/vending/hydronutrients{
+ force_free = 1
},
-/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood_common,
+/area/f13/ambientlighting/building/m)
+"izB" = (
+/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{
@@ -28131,6 +34080,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,
@@ -28142,6 +34100,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/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)
"iAt" = (
/obj/structure/reagent_dispensers/barrel/three,
/turf/open/floor/plating/rust,
@@ -28152,6 +34126,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,
@@ -28183,6 +34166,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/ncr)
"iBg" = (
/obj/structure/obstacle/barbedwire,
/turf/open/indestructible/ground/outside/road,
@@ -28193,6 +34182,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"
@@ -28204,13 +34199,16 @@
/obj/structure/janitorialcart,
/turf/open/indestructible/ground/outside/sidewalkdirt,
/area/f13/wasteland/followers)
+<<<<<<< Updated upstream
+=======
"iBL" = (
-/obj/effect/decal/cleanable/glass,
-/obj/structure/chair/bench{
- dir = 4
+/obj/item/flag/ncr,
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 1;
+ icon_state = "outerborder"
},
-/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"iBP" = (
/obj/machinery/door/poddoor/shutters{
id = "garage";
@@ -28226,12 +34224,27 @@
/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)
+<<<<<<< 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
@@ -28359,27 +34372,37 @@
name = "dirty floor"
},
/area/f13/building/powered)
-"iDS" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/obj/machinery/light/small{
- brightness = 7;
- dir = 4
+<<<<<<< Updated upstream
+"iDN" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/landmark/start/f13/ncrmedofficer,
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/area/f13/ambientlighting/building/j)
+/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."
},
/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"
@@ -28387,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{
@@ -28403,9 +34456,37 @@
/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)
+<<<<<<< Updated upstream
+/obj/item/clockwork/alloy_shards{
+ name = "rocks";
+ desc = "Rocks. Mindblowing.";
+ anchored = 1
+ },
+/turf/open/indestructible/ground/outside/desert{
+ 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
@@ -28421,15 +34502,22 @@
},
/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/structure/fluff/hedge,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small{
- light_color = "#ff4747";
- dir = 4
+/obj/machinery/light{
+ dir = 1;
+ layer = 2.9
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/turf/open/floor/plasteel/vaporwave,
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/j)
"iEQ" = (
/obj/effect/overlay/fog,
/turf/open/indestructible/ground/outside/water/running,
@@ -28439,20 +34527,29 @@
/obj/effect/overlay/desert/sonora/edge,
/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
-"iFf" = (
+<<<<<<< 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 = 1;
- pixel_y = 18
- },
-/obj/item/reagent_containers/glass/bucket{
- pixel_y = 17;
- pixel_x = 11
+ dir = 8
},
-/turf/open/floor/plating/dirt,
-/area/f13/wasteland)
+/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,
-/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,
@@ -28463,22 +34560,25 @@
},
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/w)
+<<<<<<< Updated upstream
+=======
"iFu" = (
-/obj/machinery/vending/cigarette{
- default_price = 0;
- extra_price = 0
- },
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/cleanable/glass,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood_common{
+ icon_state = "common-broken3"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/ambientlighting/building/m)
"iFv" = (
-/obj/structure/flora/grass/green,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow4"
+/obj/effect/turf_decal/weather/dirt{
+ dir = 8
},
-/area/f13/wasteland)
+/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,
@@ -28534,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,
@@ -28583,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
@@ -28597,7 +34707,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" = (
@@ -28635,16 +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/item/reagent_containers/food/drinks/beer{
- pixel_y = 4;
- pixel_x = 7
- },
-/obj/structure/cable/outdoors{
- icon_state = "1-2"
+/obj/structure/barricade/tentclothedge{
+ dir = 1;
+ pixel_y = -3
},
-/turf/open/indestructible/ground/inside/mountain,
+/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,
@@ -28696,9 +34811,17 @@
/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)
+<<<<<<< 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)
"iJM" = (
/obj/structure/barricade/sandbags,
/turf/open/indestructible/ground/outside/dirt{
@@ -28750,12 +34873,25 @@
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
},
/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"
@@ -28792,21 +34928,23 @@
/area/maintenance/bar)
"iKV" = (
/obj/structure/debris/v1,
-/obj/effect/spawner/lootdrop/trash,
/turf/open/indestructible/ground/outside/ruins,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"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)
+=======
"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)
+/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,
@@ -28852,6 +34990,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,
@@ -28865,10 +35007,21 @@
/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
+<<<<<<< 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)
"iMa" = (
/obj/machinery/iv_drip/primitive,
/obj/effect/turf_decal/siding/wood{
@@ -28885,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
@@ -28949,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,
@@ -28963,12 +35129,27 @@
icon_state = "yellowrustychess"
},
/area/f13/ambientlighting/building/b)
+"iNl" = (
+/obj/structure/table/wood/junk,
+/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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)
@@ -28979,6 +35160,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
@@ -29003,12 +35191,45 @@
},
/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland/town)
+<<<<<<< Updated upstream
+"iOE" = (
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = -4;
+ pixel_x = 16
+ },
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 1
+ },
+/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)
+=======
+"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{
@@ -29084,9 +35305,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" = (
@@ -29130,6 +35349,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"
@@ -29149,16 +35374,16 @@
/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,
/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,
@@ -29198,10 +35423,15 @@
},
/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)
+<<<<<<< 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"
@@ -29227,23 +35457,16 @@
/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)
-"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,
@@ -29261,12 +35484,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{
@@ -29282,16 +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" = (
-/mob/living/simple_animal/cow/brahmin,
-/turf/open/indestructible/ground/outside/snow,
+/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,
@@ -29303,9 +35537,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" = (
@@ -29316,6 +35550,28 @@
icon_state = "yellowrustychess"
},
/area/f13/ambientlighting/building/f)
+<<<<<<< Updated upstream
+"iUu" = (
+/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)
+=======
+"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,
@@ -29342,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,
@@ -29350,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,
@@ -29371,15 +35662,38 @@
/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,
+/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)
+=======
"iVA" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/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
},
-/area/f13/ambientlighting/building/g)
+/obj/structure/flora/wasteplant/wild_fungus,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+>>>>>>> Stashed changes
"iVU" = (
/obj/structure/chair/bench{
dir = 4;
@@ -29414,12 +35728,26 @@
"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{
+ 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)
+=======
+"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
@@ -29453,22 +35781,39 @@
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,
/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,
-/obj/machinery/light/small{
- dir = 8;
- light_color = "#ff4747"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -29480,16 +35825,26 @@
icon_state = "dirt"
},
/area/f13/building/tribal)
+<<<<<<< Updated upstream
"iXz" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
+/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/structure/cable/outdoors{
- icon_state = "1-2"
- },
+/obj/item/reagent_containers/pill/bitterdrink,
/turf/open/indestructible/ground/inside/mountain,
-/area/f13/ncr)
+/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{
@@ -29523,6 +35878,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";
@@ -29550,6 +35917,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,
@@ -29575,16 +35948,26 @@
icon_state = "horizontaloutermain1"
},
/area/f13/wasteland)
-"iYV" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+"iZh" = (
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/blood/old{
- icon_state = "gibmid1"
+/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"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/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,
@@ -29667,6 +36050,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,
@@ -29692,6 +36079,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 +36093,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/ncr)
"jaM" = (
/obj/structure/chair{
dir = 8
@@ -29724,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{
@@ -29741,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"
@@ -29810,6 +36222,7 @@
icon_state = "verticalrightborderrightbottom"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
"jcB" = (
/obj/machinery/vending/wallmed{
pixel_x = -32
@@ -29819,14 +36232,29 @@
},
/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/indestructible/ground/outside/dirt,
+=======
+"jcu" = (
+/turf/open/floor/f13/wood{
+ icon_state = "housewood4-broken"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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{
dir = 8;
@@ -29871,17 +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,
-/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)
+/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{
@@ -29922,6 +36348,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"
@@ -29946,40 +36378,99 @@
/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)
-"jeV" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< 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.";
+ 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 = 8
+ dir = 1;
+ light_color = "#706891"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/turf/open/floor/f13/wood,
+/area/f13/ambientlighting/building/m)
+"jeV" = (
+/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)
"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)
+=======
+/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
},
/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{
@@ -29987,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{
@@ -30014,6 +36511,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"
@@ -30042,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{
@@ -30061,19 +36579,32 @@
},
/turf/open/floor/plating/rust,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"jgl" = (
-/obj/structure/stairs/west{
- color = "#A47449";
- dir = 4
+/obj/structure/table/wood,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/pen/fourcolor,
+/obj/item/paper_bin,
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
},
-/turf/open/floor/plating/dirt,
-/area/f13/wasteland)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"jgs" = (
/obj/machinery/workbench,
/turf/open/indestructible/ground/outside/desert{
icon_state = "wasteland33"
},
/area/f13/ambientlighting/building/f)
+"jgy" = (
+/obj/structure/cable/outdoors{
+ icon_state = "1-8"
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "outerborder"
+ },
+/area/f13/wasteland)
"jgP" = (
/turf/closed/wall/r_wall/rust,
/area/f13/wasteland)
@@ -30103,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"
@@ -30120,16 +36657,17 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/effect/decal/remains/human,
+/obj/effect/decal/cleanable/blood{
+ icon_state = "gib2"
},
-/area/f13/ambientlighting/building/g)
+/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
@@ -30155,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{
@@ -30193,6 +36737,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,
@@ -30216,21 +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" = (
-/turf/open/floor/wood_wide{
- icon_state = "wide-broken1"
- },
-/area/f13/ncr)
+/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/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/barricade/wooden,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "outerpavementcorner"
},
-/obj/structure/junk/small/bed2,
-/obj/item/bedsheet/medical,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plasteel/f13/vault_floor/yellow,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"jjd" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/f13{
@@ -30327,12 +36882,23 @@
/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"
+<<<<<<< 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
},
-/area/f13/ambientlighting/building/h)
+/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" = (
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/handy,
@@ -30340,6 +36906,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{
@@ -30371,32 +36945,31 @@
},
/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
+<<<<<<< Updated upstream
+/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)
+=======
+/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/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)
+/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,
@@ -30436,6 +37009,24 @@
},
/turf/open/floor/plasteel/f13/stone/rugged,
/area/f13/ambientlighting/building/d)
+<<<<<<< Updated upstream
+"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)
+=======
+"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,
@@ -30498,11 +37089,30 @@
/turf/open/indestructible/ground/outside/road,
/area/f13/wasteland/city)
"jmU" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/plating/dirt,
+<<<<<<< Updated upstream
+/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,
+/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
@@ -30517,11 +37127,13 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"jnj" = (
-/obj/structure/closet/cabinet/anchored,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/holofloor/carpet,
-/area/f13/ambientlighting/building/g)
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/wood_fancy,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"jns" = (
/obj/structure/curtain{
color = "#c40e0e"
@@ -30617,9 +37229,13 @@
"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/cable/outdoors{
+ icon_state = "4-8"
},
+/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"jpq" = (
/obj/effect/turf_decal/weather/dirt,
@@ -30644,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,
@@ -30663,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"
@@ -30690,20 +37314,27 @@
},
/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"
+<<<<<<< Updated upstream
+/obj/structure/fence/corner{
+=======
+/obj/structure/chair/stool{
+ dir = 4;
+ icon_state = "bench"
},
/turf/open/floor/f13{
- icon_state = "floorrusty"
+ icon_state = "yellowrustyfull"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/ambientlighting/building/m)
+"jqB" = (
+/obj/structure/fence/wooden{
+>>>>>>> Stashed changes
+ dir = 1
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 1;
+ icon_state = "outerturn"
+ },
+/area/f13/wasteland)
"jqJ" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/f13/weapon/melee/tier2,
@@ -30739,12 +37370,24 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"jrB" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/weather/dirt{
+<<<<<<< Updated upstream
+/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)
+=======
+/obj/item/restraints/legcuffs/beartrap,
+/turf/open/floor/plating/f13/inside/gravel,
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"jrJ" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -30800,10 +37443,17 @@
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"jsI" = (
-/obj/structure/bed/mattress/pregame,
-/obj/effect/spawner/lootdrop/f13/weapon/melee/random,
+<<<<<<< Updated upstream
+/obj/structure/table/booth,
+/obj/item/seeds/coffee,
+/obj/item/seeds/coffee/robusta,
/turf/open/floor/f13/wood,
-/area/f13/wasteland)
+=======
+/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{
dir = 8
@@ -30843,16 +37493,29 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"jtd" = (
-/obj/structure/reagent_dispensers/peppertank{
- pixel_y = -31
+<<<<<<< Updated upstream
+/obj/structure/fluff/rails{
+ dir = 1
},
-/obj/structure/sign/poster/contraband/scum{
- pixel_x = -32
+/obj/effect/decal/cleanable/blood{
+ icon_state = "gib2";
+ pixel_y = 4
},
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1"
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+=======
+/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{
+ 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,
@@ -30870,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"
@@ -30935,6 +37604,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/ncr)
"juM" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -30960,6 +37633,17 @@
},
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/z)
+"juY" = (
+/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)
"jvc" = (
/obj/structure/fence{
dir = 1
@@ -31012,17 +37696,21 @@
icon_state = "stagestairs"
},
/area/f13/building/powered)
-"jvX" = (
-/obj/structure/debris/v3{
- pixel_x = -15;
- pixel_y = -12
+<<<<<<< Updated upstream
+=======
+"jvU" = (
+/obj/structure/sign/legion/prison,
+/turf/open/indestructible/ground/outside/dirt{
+ icon_state = "dirt"
},
-/obj/effect/decal/fakelattice,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/area/f13/wasteland/legion)
+"jvX" = (
+/obj/effect/turf_decal/delivery,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
},
-/turf/open/floor/plating/rust,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"jwc" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt/dust,
@@ -31035,6 +37723,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"
@@ -31065,6 +37770,10 @@
/obj/structure/barricade/sandbags,
/turf/open/indestructible/ground/outside/grass,
/area/f13/wasteland)
+"jwI" = (
+/obj/structure/billboard/poseidenenergy2,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"jwL" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -31086,26 +37795,35 @@
/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/structure/window/fulltile/wood,
-/obj/structure/curtain{
- color = "#808080"
- },
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1"
+/obj/effect/decal/marking{
+ icon_state = "dottedverticaldegraded"
},
-/area/f13/ncr)
-"jxe" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/closet/crate/bin{
- layer = 0.5
+/obj/structure/cable/outdoors{
+ icon_state = "1-4"
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain2top"
},
-/obj/effect/spawner/lootdrop/trash,
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
+"jxe" = (
+/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,
+/obj/structure/decoration/clock{
+ pixel_y = 27
+ },
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"jxh" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -31137,6 +37855,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{
@@ -31179,6 +37903,17 @@
icon_state = "common_dark-broken5"
},
/area/f13/building/abandoned/n)
+"jyb" = (
+/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)
"jyd" = (
/turf/open/floor/f13{
color = "#d9c4b9";
@@ -31194,6 +37929,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{
@@ -31207,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,
@@ -31291,6 +38043,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,
@@ -31318,6 +38076,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/ncr)
"jAp" = (
/obj/structure/decoration/hatch{
dir = 4
@@ -31326,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,
@@ -31337,6 +38104,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{
@@ -31348,6 +38120,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,
@@ -31373,13 +38159,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" = (
@@ -31387,6 +38175,29 @@
/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
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 1;
+ 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,
@@ -31400,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,
@@ -31416,15 +38231,20 @@
},
/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)
+<<<<<<< Updated upstream
+/obj/effect/decal/marking{
+ pixel_x = -14
+ },
+/turf/open/indestructible/ground/outside/road{
+ 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,
@@ -31433,14 +38253,15 @@
icon_state = "bar"
},
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"jCe" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/f13{
- icon_state = "bluedirtychess2"
- },
+/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,
@@ -31463,14 +38284,20 @@
},
/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"
+<<<<<<< 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"
},
-/area/f13/ambientlighting/building/j)
+/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
@@ -31478,24 +38305,39 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/asteroid/basalt/wasteland,
/area/f13/building/abandoned/g)
+<<<<<<< Updated upstream
+=======
"jCz" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/chair/wood{
+ pixel_x = 2;
+ pixel_y = 3
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/machinery/light{
+ dir = 4;
+ pixel_y = -16
},
-/area/f13/ambientlighting/building/g)
+/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/dust,
-/obj/structure/rack,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/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,
@@ -31514,14 +38356,13 @@
icon_state = "floorrusty"
},
/area/f13/ambientlighting/building/w)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -31573,6 +38414,21 @@
},
/turf/open/floor/carpet/purple,
/area/f13/bar)
+"jEq" = (
+<<<<<<< Updated upstream
+/obj/machinery/door/poddoor/shutters{
+ id = 983
+ },
+/turf/open/indestructible/ground/outside/road{
+ 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,
@@ -31581,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,
@@ -31598,6 +38459,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
@@ -31608,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
@@ -31657,6 +38533,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,
@@ -31682,10 +38562,23 @@
/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)
+<<<<<<< Updated upstream
+/obj/effect/decal/marking{
+ icon_state = "dottedverticalcorroded";
+ pixel_x = -14
+ },
+/turf/open/indestructible/ground/outside/road{
+ 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";
@@ -31715,23 +38608,44 @@
},
/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
+ },
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
+ },
+/area/f13/ncr)
+=======
"jGR" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/marking{
+ pixel_x = -14
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain0"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"jHe" = (
/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,
@@ -31771,6 +38685,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,
@@ -31781,14 +38702,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet,
/area/f13/ambientlighting/building/q)
+<<<<<<< Updated upstream
+=======
"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."
+/obj/structure/railing/handrail/rusty,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalleftborderleft0"
},
-/turf/open/floor/carpet/red,
-/area/f13/ambientlighting/building/g)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"jIx" = (
/obj/effect/turf_decal/weather/dirt{
dir = 5
@@ -31830,14 +38752,12 @@
/turf/closed/wall/f13/wood/house,
/area/f13/ambientlighting/building/e)
"jJo" = (
-/obj/effect/decal/fakelattice,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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";
@@ -31857,15 +38777,34 @@
icon_state = "dark"
},
/area/f13/brotherhood)
+"jJE" = (
+/obj/structure/bed/mattress{
+ 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/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,
/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,
@@ -31878,6 +38817,16 @@
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)
+"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{
@@ -31928,9 +38877,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,
-/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,
@@ -31965,24 +38913,46 @@
},
/area/f13/brotherhood)
"jLT" = (
-/obj/structure/table/wood,
-/obj/item/stack/f13Cash/random/med,
+<<<<<<< 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,
-/area/f13/wasteland)
+>>>>>>> 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
+ },
+/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)
+=======
"jMc" = (
-/obj/structure/barricade/wooden,
-/turf/closed/mineral/random/low_chance,
+/obj/structure/sign/departments/medbay/alt{
+ name = "TRIAGE"
+ },
+/turf/closed/wall/mineral/brick,
/area/f13/ncr)
"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/structure/table,
+/turf/open/floor/wood_common,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"jMk" = (
/obj/structure/junk/drawer{
pixel_y = 10
@@ -31995,12 +38965,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
@@ -32029,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{
@@ -32076,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"
@@ -32085,11 +39071,18 @@
/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)
+"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,
@@ -32137,6 +39130,15 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland/legion)
+"jPb" = (
+/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)
"jPj" = (
/obj/structure/barricade/sandbags,
/turf/open/indestructible/ground/outside/road{
@@ -32145,9 +39147,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" = (
@@ -32183,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"
@@ -32203,8 +39210,14 @@
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)
+"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;
@@ -32221,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{
@@ -32330,6 +39350,15 @@
/obj/structure/obstacle/barbedwire/end,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland/town)
+"jRD" = (
+/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,
/obj/item/clothing/suit/armor/tiered/medium/combat/swat,
@@ -32359,14 +39388,13 @@
},
/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,
+<<<<<<< Updated upstream
+/obj/item/trash/chips,
+=======
+/obj/machinery/light,
+>>>>>>> Stashed changes
/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,
@@ -32419,6 +39447,17 @@
},
/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,
+/obj/machinery/light/small{
+ dir = 8;
+ brightness = 9
+ },
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"jTC" = (
/obj/structure/table{
layer = 2.9
@@ -32459,25 +39498,25 @@
/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)
+<<<<<<< Updated upstream
"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)
+=======
+"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,
@@ -32513,16 +39552,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{
@@ -32546,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
@@ -32554,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,
@@ -32573,14 +39622,30 @@
/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{
- dir = 4
+<<<<<<< Updated upstream
+/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{
+ pixel_x = -10;
+ pixel_y = 16;
+ anchored = 1;
+ layer = 100
+ },
+/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,
@@ -32596,6 +39661,15 @@
/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)
+"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,
@@ -32606,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,
@@ -32640,6 +39724,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,
@@ -32654,6 +39742,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,
@@ -32664,19 +39760,28 @@
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,
/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{
@@ -32704,14 +39809,28 @@
},
/area/f13/wasteland)
"jYM" = (
-/obj/effect/spawner/lootdrop/trash,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/indestructible/ground/outside/road,
-/area/f13/caves)
+<<<<<<< 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,
/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
@@ -32728,6 +39847,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/ncr)
"jZu" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt/dust,
@@ -32754,12 +39877,18 @@
/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)
+<<<<<<< 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)
@@ -32786,7 +39915,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{
@@ -32798,6 +39929,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
@@ -32827,6 +39967,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
@@ -32858,6 +40006,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
@@ -32866,22 +40021,17 @@
/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)
+<<<<<<< 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"
@@ -32900,16 +40050,36 @@
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
+<<<<<<< Updated upstream
+"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,
+=======
+"kcF" = (
+/obj/structure/table/booth,
+/turf/open/indestructible/ground/outside/desert,
+>>>>>>> Stashed changes
/area/f13/wasteland)
"kcN" = (
/obj/machinery/light{
@@ -32972,6 +40142,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,
@@ -33041,11 +40215,10 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"kex" = (
-/obj/structure/barricade/wooden/planks{
- icon_state = "board-2"
+/turf/closed/indestructible/rock{
+ layer = 50
},
-/turf/closed/wall/f13/wood,
-/area/f13/ncr)
+/area/f13/caves)
"kez" = (
/obj/structure/rack,
/obj/item/camera,
@@ -33057,34 +40230,30 @@
icon_state = "yellowrustyfull"
},
/area/f13/ambientlighting/building/f)
+<<<<<<< Updated upstream
+=======
"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)
+/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)
"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)
+<<<<<<< Updated upstream
+=======
"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)
+/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
@@ -33099,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"
@@ -33151,14 +40327,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,
@@ -33192,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"
@@ -33203,6 +40379,27 @@
/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";
+ pixel_x = -14
+ },
+/obj/structure/junk/small,
+/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{
dir = 8
@@ -33267,11 +40464,20 @@
/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,
+/obj/item/pen{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"kie" = (
/obj/structure/chair/f13chair2,
/turf/open/floor/plating/rust,
@@ -33289,7 +40495,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)
@@ -33320,16 +40525,36 @@
icon_state = "floorrusty"
},
/area/f13/ambientlighting/building/f)
+<<<<<<< Updated upstream
+"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)
+"kiH" = (
+/obj/structure/sign/poster/official/cohiba_robusto_ad,
+/turf/closed/wall/f13/store,
+/area/f13/ambientlighting/building/m)
+=======
"kiK" = (
-/obj/structure/simple_door/house,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/structure/campfire,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
},
-/area/f13/ambientlighting/building/g)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"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,
@@ -33346,6 +40571,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"
@@ -33353,9 +40582,29 @@
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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;
@@ -33369,12 +40618,19 @@
},
/area/f13/ambientlighting/building/o)
"kjL" = (
-/obj/effect/decal/cleanable/blood/old{
- icon_state = "gibmid1"
+<<<<<<< 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
},
-/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{
@@ -33432,7 +40688,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,
@@ -33452,6 +40710,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
@@ -33516,27 +40781,27 @@
/turf/closed/wall/mineral/wood,
/area/f13/legioncamp)
"klW" = (
-/obj/structure/chair/bench,
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/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
+<<<<<<< Updated upstream
+/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/hobo,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontalbottomborderbottom0"
},
-/turf/open/indestructible/ground/outside/snow,
+=======
+/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"
@@ -33575,22 +40840,24 @@
/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
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -33613,17 +40880,36 @@
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
+<<<<<<< Updated upstream
+/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,
+=======
+/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{
dir = 8
@@ -33688,7 +40974,6 @@
"kox" = (
/obj/structure/simple_door/metal/fence,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -33800,30 +41085,49 @@
/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" = (
+<<<<<<< Updated upstream
+/obj/structure/table,
+/obj/machinery/button/door{
+ pixel_y = 28;
+ id = 980
},
-/area/f13/wasteland)
+/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2,
+/area/f13/ncr)
"kqJ" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6;
- icon_state = "snow_corner"
- },
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 5
+/obj/item/twohanded/legionaxe,
+/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
},
-/obj/structure/flora/tree_stump{
- pixel_y = 8
+/turf/open/indestructible/ground/outside/ruins,
+/area/f13/ambientlighting/building/j)
+"kqQ" = (
+/obj/effect/decal/cleanable/oil{
+ icon_state = "floor5"
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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,
@@ -33844,20 +41148,15 @@
/obj/structure/closet/fridge/standard,
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/machinery/door/unpowered/secure_NCR{
+ name = "Medical"
},
-/turf/open/floor/plating/rust,
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"kru" = (
/obj/structure/wreck/trash/two_barrels,
/turf/open/indestructible/ground/outside/graveldirt,
@@ -33874,11 +41173,17 @@
},
/area/f13/ambientlighting/building/o)
"krJ" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
@@ -33889,20 +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/effect/decal/cleanable/glass,
-/obj/item/shard,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/carpet/arcade,
+/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,
@@ -33932,19 +41266,33 @@
/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"
},
/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)
+=======
+/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,
@@ -33955,10 +41303,11 @@
},
/area/f13/building/powered)
"ktI" = (
-/turf/open/indestructible/ground/outside/sidewalk{
- icon_state = "horizontaloutermain2right"
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/area/f13/wasteland)
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
"ktM" = (
/turf/open/indestructible/ground/outside/sidewalk{
icon_state = "verticalleftborderleft2top"
@@ -33967,7 +41316,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,
@@ -34045,19 +41396,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13,
/area/f13/ambientlighting/building/o)
+<<<<<<< Updated upstream
+=======
"kuS" = (
-/mob/living/simple_animal/hostile/handy/protectron,
-/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)
+/obj/structure/table/booth,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"kuV" = (
/turf/open/indestructible/ground/outside/dirt,
/area/f13/caves)
@@ -34174,6 +41519,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,
@@ -34182,13 +41531,28 @@
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{
- icon_state = "board-2"
+ icon_state = "board-2";
+ desc = "This sps"
},
/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"
@@ -34277,6 +41641,13 @@
dir = 6
},
/area/f13/wasteland)
+"kyD" = (
+/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/ncr)
"kyE" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -34285,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
@@ -34309,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
@@ -34365,37 +41758,38 @@
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
+<<<<<<< Updated upstream
+"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,
+=======
+"kAA" = (
+/obj/effect/decal/cleanable/dirt/dust,
+>>>>>>> Stashed changes
+/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)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -34412,14 +41806,16 @@
/obj/item/reagent_containers/food/snacks/f13/deathclawegg,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
+<<<<<<< Updated upstream
+=======
"kBr" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/open/indestructible/ground/outside/sidewalk{
- icon_state = "horizontaloutermain0"
+/obj/structure/barricade/tentclothedge{
+ dir = 1;
+ pixel_y = -3
},
-/area/f13/wasteland)
+/turf/closed/wall/f13/wood/interior,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"kBw" = (
/obj/structure/simple_door/repaired,
/obj/structure/barricade/wooden/planks,
@@ -34444,6 +41840,30 @@
icon_state = "housewood2"
},
/area/f13/building/abandoned/a)
+<<<<<<< Updated upstream
+"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/nine{
+ layer = 5
+ },
+/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
@@ -34621,6 +42041,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,
@@ -34634,6 +42063,15 @@
icon_state = "horizontaloutermain0"
},
/area/f13/wasteland)
+"kEW" = (
+/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/ncr)
"kEZ" = (
/obj/structure/destructible/tribal_torch/lit,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -34644,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{
@@ -34702,19 +42150,24 @@
"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
+<<<<<<< Updated upstream
+"kGR" = (
+/obj/machinery/smartfridge/bottlerack/grownbin,
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/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,
@@ -34729,11 +42182,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
@@ -34790,11 +42250,29 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"kHN" = (
-/obj/effect/spawner/lootdrop/trash,
-/turf/open/indestructible/ground/outside/sidewalk{
- icon_state = "horizontaloutermain2"
+<<<<<<< Updated upstream
+/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
},
+/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
@@ -34821,12 +42299,14 @@
/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)
+<<<<<<< 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,
/obj/effect/decal/marking{
@@ -34848,17 +42328,15 @@
},
/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,
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/dirt,
+=======
+>>>>>>> Stashed changes
+/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
@@ -34890,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,
@@ -34913,12 +42400,17 @@
/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"
+<<<<<<< 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
@@ -34952,11 +42444,22 @@
/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,
+<<<<<<< Updated upstream
+/obj/structure/table/booth,
+/obj/effect/decal/cleanable/glass,
/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/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,
@@ -35008,10 +42511,16 @@
/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;
- icon_state = "f13chair2"
+ dir = 4
},
/turf/open/floor/f13{
icon_state = "floorrusty"
@@ -35030,21 +42539,16 @@
icon_state = "bluerustysolid"
},
/area/f13/ambientlighting/building/o)
+<<<<<<< Updated upstream
+=======
"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"
+/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{
@@ -35065,6 +42569,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
@@ -35102,7 +42615,8 @@
/area/f13/wasteland)
"kMh" = (
/obj/effect/turf_decal/siding/wood{
- dir = 1
+ dir = 1;
+ layer = 1000
},
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -35120,7 +42634,6 @@
"kMv" = (
/obj/effect/overlay/fog,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -35150,9 +42663,16 @@
/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)
+<<<<<<< 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,
/obj/machinery/smartfridge/bottlerack/lootshelf/books,
@@ -35160,6 +42680,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"
@@ -35241,18 +42766,15 @@
/turf/open/indestructible/ground/outside/road{
icon_state = "horizontalinnermain1"
},
+<<<<<<< Updated upstream
/area/f13/wasteland)
+=======
+/area/f13/brotherhood)
"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,
+/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;
@@ -35280,13 +42802,21 @@
pixel_y = -5;
pixel_x = 6
},
-/obj/effect/spawner/lootdrop/trash,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"kNE" = (
/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
@@ -35313,22 +42843,15 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland/legion)
+<<<<<<< Updated upstream
+=======
"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
+/obj/structure/fence{
+ dir = 1
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"kOg" = (
/obj/item/storage/toolbox/ammo,
/turf/open/indestructible/ground/outside/dirt,
@@ -35384,14 +42907,17 @@
icon_state = "dirt"
},
/area/f13/caves)
+<<<<<<< Updated upstream
+=======
"kOQ" = (
-/obj/structure/flora/tree/cactus,
-/obj/effect/decal/remains/deadeyebot,
-/turf/open/indestructible/ground/outside/dirt{
- dir = 9;
- icon_state = "dirt"
+/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
@@ -35400,6 +42926,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)
@@ -35411,6 +42943,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{
@@ -35485,24 +43021,17 @@
},
/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)
+<<<<<<< Updated upstream
+=======
"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)
+/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)
@@ -35516,6 +43045,16 @@
/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
+ },
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
+ },
+/turf/closed/wall/f13/wood/interior,
+/area/f13/ncr)
"kRb" = (
/obj/structure/frame/machine,
/obj/item/stack/cable_coil/red,
@@ -35580,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,
@@ -35612,25 +43159,15 @@
},
/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,
+<<<<<<< Updated upstream
+/obj/structure/chair/stool,
/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+=======
+/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,
/obj/structure/table/wood,
@@ -35662,6 +43199,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{
@@ -35682,15 +43224,14 @@
/obj/structure/destructible/tribal_torch/lit,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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
@@ -35751,6 +43292,23 @@
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,
/obj/structure/destructible/tribal_torch/lit,
@@ -35763,6 +43321,13 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+"kVL" = (
+/obj/item/cultivator/rake,
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
+ },
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"kVM" = (
/obj/structure/reagent_dispensers/beerkeg,
/obj/effect/decal/cleanable/dirt{
@@ -35783,9 +43348,14 @@
/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)
+<<<<<<< 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" = (
/obj/structure/fence/corner{
dir = 4
@@ -35798,10 +43368,13 @@
/obj/effect/turf_decal/vg_decals/radiation,
/turf/closed/indestructible/f13vaultrusted,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"kWq" = (
-/obj/structure/barricade/wooden/planks,
-/turf/closed/wall/f13/tentwall,
-/area/f13/ncr)
+/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,
@@ -35840,6 +43413,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
@@ -35848,16 +43427,25 @@
/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"
+<<<<<<< Updated upstream
+/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)
+=======
+/obj/structure/table/wood,
+/obj/item/pen/fourcolor,
+/obj/item/paper_bin,
/turf/open/floor/f13{
- icon_state = "bluedirtychess2"
+ icon_state = "yellowrustyfull"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"kWW" = (
/obj/structure/car/rubbish2,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -35868,6 +43456,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,
@@ -35891,16 +43487,25 @@
/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
+<<<<<<< Updated upstream
+/obj/structure/obstacle/tanktrap,
+/turf/open/indestructible/ground/outside/desert,
+=======
+/obj/structure/fence{
+ dir = 4
},
-/obj/effect/turf_decal/weather/dirt{
- dir = 9
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 1;
+ icon_state = "outermaincornerinner"
},
-/turf/open/indestructible/ground/inside/dirt,
+>>>>>>> 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,
@@ -35937,12 +43542,17 @@
},
/area/f13/building/powered)
"kYn" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/blood{
- icon_state = "floor6"
+<<<<<<< Updated upstream
+/obj/machinery/food_cart,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
},
-/turf/open/floor/plating/rust,
-/area/f13/caves)
+/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
@@ -35952,6 +43562,15 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland/legion)
+"kYv" = (
+/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"
@@ -35999,9 +43618,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" = (
@@ -36025,12 +43644,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" = (
@@ -36056,6 +43674,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)
@@ -36090,17 +43714,27 @@
/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)
+<<<<<<< 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,
/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
@@ -36110,12 +43744,25 @@
},
/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,
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
@@ -36125,17 +43772,27 @@
/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)
-"lbi" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood{
- icon_state = "housewood4-broken"
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
},
-/area/f13/ambientlighting/building/g)
+/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;
@@ -36160,6 +43817,16 @@
/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,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
"lbw" = (
/mob/living/simple_animal/hostile/raider/baseball,
/turf/open/floor/wood_wide,
@@ -36171,11 +43838,21 @@
/turf/open/floor/bronze,
/area/f13/building/abandoned/m)
"lbC" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 10
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -36193,7 +43870,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)
@@ -36206,21 +43884,26 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"lbU" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 9
- },
-/obj/structure/chair/folding{
- dir = 4
+/obj/structure/chair/wood/wings{
+ pixel_y = 23
},
-/obj/effect/decal/cleanable/cobweb,
+<<<<<<< Updated upstream
/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/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"
@@ -36246,18 +43929,24 @@
/obj/structure/wreck/trash/two_barrels,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland/legion)
+<<<<<<< Updated upstream
+=======
"lcv" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
+/obj/structure/chair{
+ dir = 8
},
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 10
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/obj/structure/closet/crate/grave,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/area/f13/ncr)
+"lcI" = (
+/obj/item/statuebust{
+ anchored = 1;
+ can_be_unanchored = 1
},
-/area/f13/wasteland)
+/turf/open/floor/wood_wide,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"lcO" = (
/obj/machinery/hydroponics/soil,
/obj/effect/overlay/desert_side{
@@ -36278,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,
@@ -36289,12 +43984,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{
@@ -36304,14 +43998,15 @@
/obj/structure/destructible/tribal_torch/lit,
/turf/open/floor/plasteel/f13/stone/rugged,
/area/f13/ambientlighting/building/d)
+<<<<<<< Updated upstream
+=======
"ldV" = (
-/obj/structure/railing/corner{
- color = "#A47449";
- dir = 8
+/obj/effect/spawner/lootdrop/wastelootgood,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalleftborderleft2bottom"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"ldX" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -36321,6 +44016,20 @@
},
/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/structure/cable/outdoors{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
+ },
+/area/f13/ncr)
"leh" = (
/obj/item/mine/shrapnel{
alpha = 65
@@ -36336,16 +44045,31 @@
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"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -36354,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";
@@ -36388,10 +44118,28 @@
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -36399,6 +44147,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{
@@ -36416,13 +44168,13 @@
dir = 1
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"lgB" = (
-/obj/structure/window/fulltile/wood,
-/obj/structure/curtain{
- color = "#808080"
- },
-/turf/open/floor/wood_wide,
-/area/f13/ncr)
+/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
@@ -36432,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,
@@ -36459,14 +44217,25 @@
/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"
+<<<<<<< Updated upstream
+"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)
+=======
+"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,
@@ -36491,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,
@@ -36499,11 +44286,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"
@@ -36528,18 +44310,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13/wood,
/area/f13/building/abandoned/j)
+<<<<<<< Updated upstream
+=======
"ljx" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/obj/machinery/light/small{
- brightness = 7;
+/obj/structure/rack/large/shelf_rust{
dir = 8
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
- },
-/area/f13/ambientlighting/building/j)
+/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;
@@ -36555,18 +44339,52 @@
/obj/structure/flora/tree/tall,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"ljY" = (
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "red"
+ },
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
+"lki" = (
+/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,
+=======
"lkc" = (
-/obj/structure/chair,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 4;
+ pixel_y = -16
},
-/mob/living/simple_animal/hostile/raider/thief,
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess,
+/area/f13/ambientlighting/building/m)
"lki" = (
-/obj/item/trash/chips,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/p)
+/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,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -36630,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{
@@ -36716,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
@@ -36742,10 +44597,17 @@
/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)
+<<<<<<< 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,
/turf/open/indestructible/ground/outside/road,
@@ -36765,6 +44627,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;
@@ -36820,7 +44688,6 @@
/obj/structure/barricade/wooden/strong,
/obj/structure/decoration/rag,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -36854,15 +44721,17 @@
/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,
+<<<<<<< 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{
@@ -36887,6 +44756,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,
@@ -36933,7 +44810,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" = (
@@ -36960,6 +44836,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,
@@ -36975,20 +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/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/marking{
+ icon_state = "dottedverticalcorroded";
+ pixel_x = -14
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/cleanable/oil,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain0"
},
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "IsebelAttire";
- layer = 11;
- name = "Isebel's Modern Attire"
+/area/f13/wasteland)
+"lqP" = (
+/obj/structure/wreck/trash/two_barrels,
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 10;
+ icon_state = "dirt"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland/legion)
+>>>>>>> Stashed changes
"lqZ" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/f13/wood,
@@ -37072,10 +44960,26 @@
/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,
/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,
@@ -37088,8 +44992,20 @@
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/m)
"lsU" = (
-/turf/open/indestructible/ground/outside/snow,
+<<<<<<< Updated upstream
+/obj/structure/railing{
+ dir = 4;
+ layer = 4.1
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ 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
@@ -37104,6 +45020,20 @@
},
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+"lti" = (
+/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)
"ltm" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -37127,17 +45057,40 @@
/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
+ },
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
"ltA" = (
-/obj/structure/table/reinforced,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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
@@ -37189,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"
@@ -37221,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"
@@ -37259,6 +45239,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,
@@ -37311,12 +45295,13 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland/legion)
-"lwL" = (
-/obj/structure/destructible/tribal_torch/wall/lit{
- dir = 4;
- pixel_y = -8
+"lwP" = (
+/obj/structure/fence,
+/obj/structure/obstacle/barbedwire{
+ dir = 1
},
-/turf/open/floor/plating/dirt,
+<<<<<<< Updated upstream
+/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"lxa" = (
/obj/structure/fence{
@@ -37328,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" = (
@@ -37360,13 +45363,18 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"lxh" = (
-/obj/effect/spawner/lootdrop/f13/ncr_c_ration{
- pixel_y = 17;
- pixel_x = 3
+<<<<<<< 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"
},
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/wood_common/wood_common_dark,
+/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,
@@ -37375,13 +45383,28 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"lxq" = (
+/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)
+=======
"lxr" = (
-/obj/effect/turf_decal/weather/snow/corner,
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
+/obj/item/storage/trash_stack,
+/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)
+>>>>>>> Stashed changes
"lxs" = (
/obj/effect/mapping_helpers/network_builder/power_cable/auto,
/turf/closed/wall/f13/wood/house,
@@ -37394,25 +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/chair/sofa/right{
- dir = 8
+/obj/structure/fence/corner{
+ dir = 4
},
-/obj/machinery/light/small{
+/turf/open/indestructible/ground/outside/sidewalk{
dir = 4;
- light_color = "#ff4747"
+ icon_state = "outerturn"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/wasteland)
"lxY" = (
-/obj/structure/junk/small/bed,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/green,
-/area/f13/ambientlighting/building/g)
+/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,
@@ -37450,18 +45504,14 @@
/obj/effect/decal/marking,
/turf/open/indestructible/ground/outside/road,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -37530,18 +45580,15 @@
/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"
+<<<<<<< Updated upstream
+/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;
@@ -37549,33 +45596,94 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland/legion)
-"lAb" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 10
+"lAy" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2,
+/area/f13/ncr)
+"lAJ" = (
+/obj/structure/car/rubbish1,
+/obj/effect/turf_decal/big{
+ dir = 8
},
-/obj/machinery/hydroponics/soil{
- mutmod = 0;
- name = "ancient fertile soil";
- yieldmod = 1.3
+/obj/effect/decal/cleanable/oil{
+ icon_state = "floor6";
+ pixel_y = 9;
+ pixel_x = -10
},
-/obj/effect/turf_decal/weather/dirt{
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/turf/open/indestructible/ground/outside/road{
+ 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
},
-/turf/open/indestructible/ground/inside/dirt,
+/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/structure/flora/grass/brown,
-/obj/structure/barricade/sandbags,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/obj/effect/decal/fakelattice,
+/obj/structure/bookcase,
+/turf/open/indestructible/ground/outside/ruins,
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"lAR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/fluff/rug/rug_rubber{
- icon = 'icons/fallout/objects/64x64_rugs.dmi';
- icon_state = "rug_fancy"
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = -4;
+<<<<<<< Updated upstream
+ pixel_x = -13
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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";
@@ -37692,25 +45800,27 @@
/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,
+<<<<<<< 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{
dir = 4
@@ -37718,29 +45828,20 @@
/obj/structure/barricade/wooden/strong,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/building/abandoned/g)
+<<<<<<< Updated upstream
+=======
"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
+/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)
"lCN" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13{
- icon_state = "bar"
- },
-/area/f13/ambientlighting/building/g)
+/obj/structure/decoration/clock,
+/turf/closed/wall/mineral/brick,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"lCR" = (
/turf/open/floor/f13{
icon_state = "whitegreenrustychess"
@@ -37781,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,
@@ -37794,6 +45900,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";
@@ -37816,6 +45928,14 @@
icon_state = "redmark"
},
/area/f13/building/abandoned/t)
+"lEm" = (
+/obj/structure/table/booth,
+/obj/structure/gallow{
+ pixel_x = 14;
+ pixel_y = 10
+ },
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"lED" = (
/obj/structure/flora/grass/wasteland,
/turf/closed/indestructible/f13/obsidian,
@@ -37871,6 +45991,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,
@@ -37879,6 +46006,17 @@
icon_state = "housewood2"
},
/area/f13/ambientlighting/building/w)
+"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" = (
/obj/structure/decoration/rag,
/obj/structure/decoration/rag{
@@ -37893,11 +46031,20 @@
icon_state = "bluerustysolid"
},
/area/f13/followers)
-"lFO" = (
-/obj/structure/flora/grass/brown,
-/obj/effect/spawner/lootdrop/trash,
-/turf/open/indestructible/ground/outside/snow,
+<<<<<<< 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,
@@ -37915,6 +46062,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{
@@ -37927,14 +46086,15 @@
dir = 4
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"lGW" = (
-/obj/structure/barricade/concrete,
-/obj/structure/car/rubbish1{
- pixel_x = 15
+/obj/structure/filingcabinet/chestdrawer,
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
},
-/obj/structure/grille/broken,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"lGY" = (
/obj/effect/overlay/desert/sonora/edge{
dir = 8
@@ -37977,22 +46137,56 @@
},
/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" = (
+<<<<<<< Updated upstream
/obj/structure/wreck/trash/engine,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/caves)
-"lIl" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
+"lIh" = (
+/obj/machinery/door/unpowered/secure_NCR{
+ name = "Medical"
},
-/obj/item/storage/trash_stack{
- pixel_y = 18
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ 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)
+"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
@@ -38000,6 +46194,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,
@@ -38009,14 +46210,14 @@
/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"
+<<<<<<< Updated upstream
+/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{
@@ -38026,6 +46227,21 @@
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)
+=======
+/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,
@@ -38051,14 +46267,40 @@
icon_state = "bar"
},
/area/f13/building/abandoned/j)
+<<<<<<< Updated upstream
+"lJf" = (
+/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
+/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
},
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
+/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"
@@ -38069,7 +46311,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,
@@ -38092,7 +46336,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" = (
@@ -38156,11 +46399,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,
@@ -38169,12 +46417,23 @@
},
/area/f13/ambientlighting/building/i)
"lKN" = (
-/obj/structure/window/fulltile/wood,
-/obj/structure/curtain{
- color = "#808080"
+<<<<<<< Updated upstream
+/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"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/turf/open/indestructible/ground/outside/sidewalk{
+ 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{
@@ -38191,6 +46450,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
@@ -38215,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{
@@ -38225,13 +46496,19 @@
},
/area/f13/caves)
"lLC" = (
-/obj/structure/junk/locker,
-/obj/item/storage/backpack/enclave,
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
+/obj/structure/railing,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaltopbordertop2left"
},
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
+=======
+"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,
/obj/structure/table,
@@ -38256,9 +46533,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
},
@@ -38286,21 +46561,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,
@@ -38398,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{
@@ -38528,11 +46810,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
@@ -38583,6 +46863,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,
@@ -38601,6 +46886,20 @@
/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,
+/turf/open/indestructible/ground/outside/road{
+ 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
@@ -38617,6 +46916,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,
@@ -38626,15 +46936,17 @@
/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)
+<<<<<<< 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,
/obj/effect/decal/cleanable/dirt,
@@ -38668,17 +46980,15 @@
"lSV" = (
/turf/closed/wall/f13/wood/house,
/area/f13/caves)
+<<<<<<< Updated upstream
+=======
"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)
+/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"
@@ -38693,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{
@@ -38758,6 +47073,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,
@@ -38772,7 +47092,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,
@@ -38791,28 +47113,41 @@
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,
/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"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
/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,
@@ -38827,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{
@@ -38849,12 +47211,15 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"lWa" = (
-/obj/structure/chair/folding{
- dir = 1
+/obj/item/mine/shrapnel,
+/turf/open/indestructible/ground/outside/desert{
+ icon_state = "wasteland33"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"lWi" = (
/obj/effect/decal/cleanable/greenglow,
/obj/structure/lattice,
@@ -38880,6 +47245,11 @@
/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,
+/area/f13/ncr)
"lWM" = (
/obj/machinery/vending/engineering,
/turf/open/floor/f13{
@@ -38888,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{
@@ -38921,11 +47305,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{
@@ -38944,6 +47331,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
@@ -38963,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,
@@ -38990,17 +47383,51 @@
/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"
+"lYi" = (
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = 16
},
-/obj/item/storage/trash_stack,
-/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/j)
+/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,
@@ -39044,31 +47471,49 @@
},
/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
},
/turf/open/floor/wood_common/wood_common_dark,
/area/f13/building/abandoned/m)
+<<<<<<< Updated upstream
+=======
"lZM" = (
-/obj/effect/decal/cleanable/blood/old{
- pixel_x = 12
- },
-/obj/item/ammo_casing/c10mm,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/grille/broken,
+/obj/effect/turf_decal/big{
+ dir = 8
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/clothing/head/helmet/skull{
- name = "reliquary"
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/ncr)
+>>>>>>> Stashed changes
"lZX" = (
/obj/machinery/dna_scannernew,
/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
@@ -39076,6 +47521,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
@@ -39126,6 +47575,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,
@@ -39179,10 +47632,29 @@
/turf/open/floor/plasteel/f13/stone/rugged,
/area/f13/building/abandoned/g)
"mca" = (
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1"
+<<<<<<< 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
},
-/area/f13/wasteland)
+/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,
@@ -39197,31 +47669,26 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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,
+/obj/structure/closet/crate/trashcart,
+/obj/effect/decal/cleanable/glass,
+/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"mcC" = (
-/obj/structure/fluff/railing{
+/obj/effect/decal/cleanable/blood/tracks{
dir = 4
},
-/turf/open/water,
-/area/f13/ambientlighting/building/j)
-"mcI" = (
-/obj/effect/spawner/lootdrop/trash,
-/turf/open/floor/f13{
- icon_state = "whitegreenrustychess"
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/area/f13/building/abandoned/a)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
+"mcI" = (
+/obj/structure/billboard/nukagirl2,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"mcJ" = (
/obj/effect/turf_decal/weather/dirt{
dir = 10
@@ -39242,6 +47709,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,
@@ -39280,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,
@@ -39294,6 +47772,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,
@@ -39406,32 +47897,18 @@
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{
+<<<<<<< Updated upstream
+=======
+"meL" = (
+/turf/open/floor/plating/f13/inside/gravel/edge{
dir = 6
},
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
- },
-/turf/open/indestructible/ground/outside/graveldirt,
+/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,
@@ -39455,22 +47932,32 @@
},
/area/f13/ambientlighting/building/i)
"mfw" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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/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,
+=======
+/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/h)
+/area/f13/ambientlighting/building/m)
"mfA" = (
/turf/open/indestructible/ground/outside/road{
icon_state = "horizontalinnermain3"
@@ -39524,7 +48011,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 +48031,38 @@
},
/turf/open/indestructible/ground/inside/dirt,
/area/f13/building/abandoned/q)
+<<<<<<< Updated upstream
+"mgC" = (
+/obj/structure/table/wood,
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/wasteland)
+"mgD" = (
+/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)
+"mgI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/wood{
+ 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{
dir = 1
@@ -39549,6 +48070,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{
@@ -39568,11 +48093,14 @@
icon_state = "verticalinnermain1"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"mhe" = (
-/obj/structure/closet/crate/large,
-/obj/item/stack/sheet/mineral/concrete/fifty,
-/turf/open/indestructible/ground/outside/graveldirt,
+/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,
@@ -39594,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;
@@ -39646,10 +48180,18 @@
/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/turf_decal/weather/snow/corner,
-/turf/open/floor/plating/dirt/dark,
-/area/f13/wasteland)
+/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,
/obj/structure/wreck/trash/one_tire,
@@ -39663,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,
@@ -39677,11 +48226,22 @@
},
/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)
+=======
+"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,
@@ -39708,12 +48268,27 @@
/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{
+ icon_state = "outermaincornerinner"
+ },
+/area/f13/wasteland)
"mjH" = (
-/obj/effect/decal/remains{
- icon_state = "remains"
+/obj/effect/turf_decal/weather/dirt{
+ dir = 5
},
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
+/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,
@@ -39768,12 +48343,33 @@
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{
icon_state = "verticaloutermain0"
},
/area/f13/followers)
+<<<<<<< Updated upstream
+"mlH" = (
+/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)
+=======
+"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{
@@ -39816,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)
@@ -39856,12 +48465,16 @@
},
/area/f13/building/abandoned/t)
"mmI" = (
-/obj/structure/junk/small/bed,
-/obj/effect/turf_decal/box/white,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< 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/floor/plasteel/f13/vault_floor/yellow/white/whiteyellowchess,
+/turf/open/indestructible/ground/outside/ruins,
+>>>>>>> Stashed changes
/area/f13/ambientlighting/building/j)
"mmL" = (
/obj/structure/bed/mattress/pregame{
@@ -39920,6 +48533,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";
@@ -39935,16 +48552,14 @@
icon_state = "greenrustyfull"
},
/area/f13/ambientlighting/building/o)
+<<<<<<< Updated upstream
+=======
"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)
+/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
@@ -40010,15 +48625,15 @@
icon_state = "bar"
},
/area/f13/ambientlighting/building/g)
+<<<<<<< Updated upstream
+=======
"mnX" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"mox" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/lootdrop/f13/advcrafting,
@@ -40051,11 +48666,35 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/legioncamp)
"moK" = (
+<<<<<<< Updated upstream
/turf/open/indestructible/ground/outside/road,
/area/f13/brotherhood/surface)
"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)
+=======
+/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,
@@ -40063,12 +48702,20 @@
"mpt" = (
/turf/open/floor/plating/f13/inside,
/area/f13/building)
+<<<<<<< Updated upstream
+=======
"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)
+/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"
@@ -40115,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,
@@ -40124,12 +48777,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,
@@ -40143,6 +48793,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/ncr)
"mri" = (
/obj/machinery/light,
/obj/effect/decal/cleanable/dirt/dust,
@@ -40150,6 +48807,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";
@@ -40157,11 +48821,16 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"mrF" = (
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken6"
+/obj/structure/flora/tree/cactus,
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 8;
+ icon_state = "dirtcorner"
},
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"mrK" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table/wood/fancy/red,
@@ -40240,6 +48909,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"
@@ -40282,16 +48956,15 @@
/obj/machinery/microwave/stove,
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"mtT" = (
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_y = 20;
- pixel_x = 11
- },
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
+/obj/item/chair/wood/modern,
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/ncr)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"mtY" = (
/obj/structure/bookcase,
/obj/item/book/manual/wiki/tcomms,
@@ -40312,20 +48985,37 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/legioncamp)
-"muq" = (
-/obj/item/storage/trash_stack,
-/obj/effect/turf_decal/weather/dirt{
- dir = 4
+"muo" = (
+/obj/structure/table/booth,
+/obj/item/melee/onehanded/club/ncrflag{
+ pixel_x = -10;
+ pixel_y = 16;
+ anchored = 1;
+ layer = 100
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/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/effect/decal/remains/human/grave,
-/turf/open/indestructible/ground/outside/dirt{
- dir = 4;
- icon_state = "dirtcorner"
+/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
@@ -40389,22 +49079,13 @@
/obj/item/reagent_containers/glass/bucket/wood,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/obj/structure/barricade/bars,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"mvA" = (
/obj/structure/filingcabinet,
/obj/structure/filingcabinet{
@@ -40413,12 +49094,35 @@
/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)
+<<<<<<< Updated upstream
+/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,
+/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,
+=======
+/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,
/area/f13/building/tribal)
@@ -40463,19 +49167,25 @@
/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)
+<<<<<<< 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/flora/grass/wasteland{
- icon_state = "tall_grass_4";
- layer = 6
+/obj/structure/fence/wooden{
+ dir = 8
},
-/turf/open/indestructible/ground/outside/desert{
- icon_state = "wasteland33"
+/turf/open/indestructible/ground/outside/dirt{
+ icon_state = "dirt";
+ dir = 1
},
/area/f13/wasteland)
+>>>>>>> Stashed changes
"mxg" = (
/obj/structure/chair/wood{
dir = 8
@@ -40526,6 +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
@@ -40548,11 +49281,21 @@
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/c)
"myg" = (
-/obj/structure/stairs/north{
- color = "#A47449"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -40572,6 +49315,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{
@@ -40579,6 +49328,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,
@@ -40601,6 +49357,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"
@@ -40615,17 +49377,22 @@
},
/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"
},
+<<<<<<< Updated upstream
+=======
/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,
+/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,
@@ -40651,16 +49418,15 @@
icon_state = "rubble"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/structure/fence/corner{
+ dir = 4
},
-/turf/open/floor/plating/rust,
+/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{
@@ -40731,30 +49497,46 @@
/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)
+<<<<<<< Updated upstream
+"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/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)
+=======
+"mBk" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
},
-/obj/item/clothing/head/f13/trilby{
- pixel_x = 6;
- pixel_y = 10
+/obj/effect/turf_decal/weather/dirt{
+ dir = 8
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/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,
@@ -40816,6 +49598,16 @@
icon_state = "bluedirtychess2"
},
/area/f13/brotherhood)
+"mBX" = (
+/obj/structure/fence{
+ dir = 8
+ },
+/obj/structure/obstacle/barbedwire{
+ dir = 4;
+ pixel_y = 16
+ },
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"mCa" = (
/obj/structure/table/wood/settler,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -40827,27 +49619,23 @@
/obj/item/reagent_containers/pill/salicyclic,
/turf/open/floor/f13,
/area/f13/ambientlighting/building/o)
+<<<<<<< Updated upstream
+=======
"mCj" = (
-/obj/structure/guncase{
+/obj/structure/closet/crate/large{
+ pixel_y = 17;
+ layer = 5.1;
+ name = "large crate wall";
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"
+/obj/structure/closet/crate/large{
+ layer = 4.9;
+ name = "large crate wall";
+ anchored = 1
},
-/area/f13/ncr)
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+>>>>>>> Stashed changes
"mCy" = (
/turf/closed/indestructible/f13vaultrusted,
/area/f13/ambientlighting/building/x)
@@ -40870,34 +49658,27 @@
/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
+<<<<<<< Updated upstream
+=======
+"mCN" = (
+/obj/effect/landmark/start/f13/ncrrearechelon,
+/obj/effect/landmark/start/f13/ncrrearechelon,
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 1
},
-/obj/item/reagent_containers/dropper{
- pixel_y = -6
+/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/cobweb{
- dir = 1;
- icon_state = "cobweb2"
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/wood_common{
+ icon_state = "common-broken4"
},
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"mDa" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small{
@@ -40933,13 +49714,23 @@
},
/area/f13/wasteland)
"mDw" = (
-/obj/structure/flora/stump,
-/obj/item/cigbutt{
- pixel_x = -5;
- pixel_y = 17
+<<<<<<< Updated upstream
+/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)
+=======
+/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
@@ -40977,14 +49768,15 @@
},
/area/f13/wasteland)
"mDT" = (
-/obj/structure/railing/corner{
- color = "#A47449"
- },
-/obj/machinery/door/unpowered/secure_NCR{
- name = "Medical"
+<<<<<<< Updated upstream
+/obj/structure/fluff/rails{
+ icon_state = "rails-b2"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+=======
+/obj/structure/fluff/rails,
+>>>>>>> Stashed changes
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"mDU" = (
/obj/structure/ladder/unbreakable{
level = 1;
@@ -40994,13 +49786,17 @@
/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
+<<<<<<< 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"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"mEa" = (
/obj/machinery/door/unpowered/secure_bos,
/obj/effect/mapping_helpers/network_builder/power_cable/auto,
@@ -41014,6 +49810,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,
@@ -41084,16 +49884,18 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"mER" = (
-/obj/structure/flora/stump,
-/obj/structure/flora/grass/brown{
- pixel_x = 9;
- pixel_y = 11
+/obj/structure/car/rubbish4{
+ pixel_y = -9;
+ icon_state = "debris1"
},
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow4"
+/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{
@@ -41103,17 +49905,16 @@
icon_state = "dark"
},
/area/f13/ambientlighting/building/o)
+<<<<<<< Updated upstream
+=======
"mFd" = (
-/obj/machinery/hydroponics/soil{
- mutmod = 0;
- name = "ancient fertile soil";
- yieldmod = 1.3
- },
-/obj/effect/turf_decal/weather/dirt{
+/obj/item/stack/sheet/mineral/wood,
+/turf/open/indestructible/ground/outside/dirt{
+ icon_state = "dirt";
dir = 1
},
-/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"mFh" = (
/obj/structure/table/wood,
/obj/structure/decoration/clock{
@@ -41131,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
@@ -41198,6 +50017,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
@@ -41217,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
@@ -41250,11 +50083,22 @@
},
/area/f13/ambientlighting/building/m)
"mGU" = (
-/obj/machinery/workbench/forge{
- pixel_x = 4
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/blood{
+ icon_state = "floor6"
},
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/ncr)
+/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" = (
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt,
@@ -41299,6 +50143,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
@@ -41311,6 +50159,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
@@ -41333,15 +50188,23 @@
/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"
+<<<<<<< Updated upstream
+"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)
+=======
+"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
@@ -41360,15 +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/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/table,
+/obj/machinery/reagentgrinder{
+ pixel_y = -1;
+ pixel_x = -2
},
-/mob/living/simple_animal/hostile/raider/baseball,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/area/f13/ambientlighting/building/j)
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"mJM" = (
/turf/open/indestructible/ground/outside/road{
icon_state = "innermaincornerinner"
@@ -41380,10 +50252,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
@@ -41424,6 +50295,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,
@@ -41452,13 +50326,44 @@
},
/area/f13/ambientlighting/building/i)
"mLN" = (
-/obj/structure/sign/flag_america,
-/turf/closed/wall/r_wall/rust,
-/area/f13/caves)
-"mLX" = (
+<<<<<<< Updated upstream
/obj/effect/decal/cleanable/dirt,
-/turf/open/indestructible/ground/outside/graveldirt,
+/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)
+"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{
+ 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)
+=======
+/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{
@@ -41512,10 +50417,24 @@
/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{
- dir = 2
- },
+/obj/effect/turf_decal/weather/dirt,
/turf/open/indestructible/ground/outside/dirt{
dir = 1;
icon_state = "dirtcorner"
@@ -41537,10 +50456,14 @@
/area/f13/ambientlighting/building/d)
"mNW" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/f13/vault_floor/floor{
- icon_state = "floordirty"
+<<<<<<< Updated upstream
+=======
+/obj/structure/simple_door/tentflap_cloth,
+>>>>>>> Stashed changes
+/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)
@@ -41568,11 +50491,23 @@
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/rack,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+<<<<<<< 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";
@@ -41584,18 +50519,25 @@
/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"
},
/area/f13/wasteland)
"mOF" = (
-/mob/living/simple_animal/hostile/handy,
-/turf/open/floor/plasteel/f13/vault_floor/floor,
-/area/f13/ambientlighting/building/p)
+<<<<<<< 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
@@ -41698,12 +50640,35 @@
/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
+<<<<<<< Updated upstream
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 1
},
-/turf/open/water,
+/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{
@@ -41750,10 +50715,23 @@
icon_state = "floorrusty"
},
/area/f13/building/abandoned/h)
-"mRx" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 2
+"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)
+"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,
/area/f13/wasteland)
"mRy" = (
@@ -41781,6 +50759,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/ncr)
"mSw" = (
/obj/effect/decal/marking{
pixel_x = -14
@@ -41797,6 +50783,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;
@@ -41808,17 +50798,30 @@
/turf/open/floor/carpet/red,
/area/f13/ambientlighting/building/e)
"mTa" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
+<<<<<<< Updated upstream
+/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)
+=======
+/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
},
-/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,
@@ -41841,11 +50844,16 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/k)
+<<<<<<< Updated upstream
+=======
"mTs" = (
-/obj/effect/turf_decal/weather/snow/corner,
-/mob/living/simple_animal/chicken,
-/turf/open/floor/plating/dirt,
-/area/f13/wasteland)
+/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,
@@ -41885,18 +50893,24 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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
+/obj/effect/decal/fakelattice,
+/obj/effect/overlay/desert/sonora/edge/corner{
+ dir = 8
+ },
+/obj/machinery/light/broken{
+ dir = 4
},
-/turf/open/indestructible/ground/outside/snow,
+/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
@@ -41945,20 +50959,25 @@
/turf/open/indestructible/ground/outside/ruins,
/area/f13/wasteland)
"mUz" = (
-/obj/structure/debris/v3{
- pixel_x = -15;
- pixel_y = -12
+<<<<<<< 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/debris/v3{
- pixel_x = -12;
- pixel_y = 13
+/obj/structure/chair{
+ dir = 8
},
-/obj/effect/decal/fakelattice,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/turf/open/floor/plating/rust,
-/area/f13/ambientlighting/building/j)
+/area/f13/ncr)
+>>>>>>> Stashed changes
"mUB" = (
/turf/open/indestructible/ground/outside/sidewalk{
dir = 6;
@@ -42019,12 +51038,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{
@@ -42044,14 +51063,19 @@
/obj/structure/fence/corner/wooden,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+"mVy" = (
+/obj/structure/chair/wood/wings{
+ dir = 4
+ },
+/obj/effect/landmark/start/f13/ncrlieutenant,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"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 +51103,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{
@@ -42174,6 +51204,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{
@@ -42191,24 +51227,13 @@
"mZc" = (
/turf/closed/wall/f13/ruins,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -42404,12 +51429,13 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"nbB" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/plasteel/f13/vault_floor/red/whiteredfull,
-/area/f13/ambientlighting/building/j)
+/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,
@@ -42417,18 +51443,16 @@
icon_state = "yellowrustychess"
},
/area/f13/ambientlighting/building/f)
+<<<<<<< Updated upstream
+=======
"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"
+/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{
@@ -42446,9 +51470,15 @@
/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)
+<<<<<<< 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,
/obj/effect/decal/cleanable/dirt,
@@ -42492,15 +51522,23 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"ndc" = (
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
+=======
"ncO" = (
-/obj/structure/barricade/wooden/strong,
-/obj/structure/barricade/wooden/strong,
-/obj/structure/barricade/wooden/planks,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/item/shard,
+/obj/effect/decal/cleanable/glass,
+/turf/open/indestructible/ground/outside/desert{
+ icon_state = "wasteland32"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"ndk" = (
/obj/effect/overlay/desert/sonora/edge,
/turf/closed/wall/f13/tunnel,
@@ -42519,6 +51557,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{
@@ -42558,22 +51603,49 @@
"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/flora/ausbushes/sparsegrass,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow4"
+/obj/structure/fluff/rails{
+ dir = 1
},
-/area/f13/wasteland)
+/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)
-"nei" = (
-/obj/structure/campfire/barrel,
-/obj/effect/decal/cleanable/dirt,
+<<<<<<< Updated upstream
+"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/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;
@@ -42588,12 +51660,21 @@
},
/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;
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"
@@ -42607,6 +51688,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{
@@ -42621,6 +51712,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)
@@ -42633,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";
@@ -42640,6 +51744,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,
@@ -42662,6 +51773,22 @@
},
/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{
req_one_access_txt = "136"
@@ -42696,17 +51823,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,
@@ -42736,13 +51857,14 @@
/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)
+<<<<<<< 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" = (
/mob/living/simple_animal/hostile/raider/ranged/boss,
/turf/open/floor/carpet/blue,
@@ -42812,7 +51934,6 @@
icon_state = "trash_2"
},
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland/legion)
@@ -42826,6 +51947,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,
@@ -42839,9 +51969,17 @@
},
/area/f13/building/powered)
"nhC" = (
-/obj/structure/barricade/wooden/planks,
-/turf/closed/wall/f13/wood/house,
-/area/f13/ncr)
+<<<<<<< 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"
@@ -42851,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)
@@ -42870,10 +52012,18 @@
/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/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" = (
@@ -42882,10 +52032,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{
@@ -42972,6 +52122,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,
@@ -43018,9 +52177,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)
@@ -43030,10 +52187,15 @@
},
/turf/open/indestructible/ground/inside/dirt,
/area/f13/ambientlighting/building/t)
+<<<<<<< Updated upstream
+=======
"nkI" = (
-/obj/structure/billboard/boardedwell,
-/turf/open/indestructible/ground/outside/snow,
+/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{
@@ -43059,15 +52221,21 @@
},
/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
+<<<<<<< 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
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/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;
@@ -43101,6 +52269,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
@@ -43143,10 +52322,15 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"nml" = (
-/obj/effect/decal/cleanable/ash,
+<<<<<<< Updated upstream
/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,
+=======
+/obj/structure/flora/grass/coyote/twentynine,
+/turf/open/indestructible/ground/outside/desert,
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"nmn" = (
/obj/effect/decal/cleanable/greenglow,
/obj/effect/decal/cleanable/dirt,
@@ -43179,10 +52363,28 @@
},
/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)
+<<<<<<< Updated upstream
+/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"
+ },
+=======
+/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{
color = "#845f58";
@@ -43240,17 +52442,20 @@
},
/turf/open/indestructible/ground/outside/grass,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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,
+/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,
@@ -43274,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,
@@ -43291,6 +52503,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,
@@ -43314,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{
@@ -43331,6 +52556,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{
@@ -43341,7 +52577,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)
@@ -43388,25 +52626,44 @@
},
/area/f13/wasteland)
"nqo" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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{
+ icon_state = "trash_3"
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/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/ambientlighting/building/j)
+/area/f13/wasteland)
"nqt" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13/wood,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"nqu" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/holofloor/carpet,
-/area/f13/ambientlighting/building/g)
+/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
@@ -43442,6 +52699,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;
@@ -43467,6 +52731,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;
@@ -43508,11 +52778,15 @@
/turf/open/floor/f13/wood,
/area/f13/building/abandoned/b)
"nrR" = (
-/obj/effect/decal/cleanable/blood,
-/mob/living/simple_animal/hostile/radroach,
+<<<<<<< Updated upstream
+/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,
+=======
+/turf/open/floor/wood_common,
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/m)
"nrU" = (
/turf/closed/mineral/random/no_caves,
/area/f13/caves)
@@ -43568,18 +52842,36 @@
/obj/effect/overlay/fog,
/turf/open/indestructible/ground/outside/water,
/area/f13/wasteland)
-"nsX" = (
-/obj/effect/decal/cleanable/dirt{
- color = "#363636"
- },
-/obj/structure/fluff/railing{
- dir = 5
+"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{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = 16
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalleftborderleft0"
},
-/turf/open/floor/plating/dirt,
+/area/f13/wasteland)
+"nsX" = (
+/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)
+"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,
@@ -43612,6 +52904,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,
@@ -43619,6 +52918,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,
@@ -43639,21 +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/structure/railing{
- color = "#A47449";
- dir = 4;
- layer = 4.1
- },
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken6"
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain3"
},
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"nuY" = (
/obj/effect/turf_decal/weather/dirt{
dir = 5
@@ -43723,15 +53035,19 @@
/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
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/structure/wreck/trash/five_tires,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontalbottomborderbottom0"
+ },
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"nvD" = (
/obj/structure/railing{
color = "#A47449"
@@ -43745,9 +53061,20 @@
/turf/closed/wall/f13/wood/house,
/area/f13/ambientlighting/building/k)
"nvF" = (
-/obj/structure/table/wood,
-/turf/open/floor/f13/wood,
-/area/f13/wasteland)
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -43767,31 +53094,42 @@
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/ncr)
"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/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/ash,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"nwJ" = (
/obj/structure/simple_door/house,
/turf/open/floor/f13{
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)
@@ -43827,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,
@@ -43839,15 +53181,25 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"nxr" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
+<<<<<<< Updated upstream
+/obj/effect/spawner/lootdrop/f13/crafting,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontalbottomborderbottom0"
},
-/obj/effect/turf_decal/weather/dirt{
- dir = 4
+=======
+/obj/structure/chair/stool{
+ dir = 4;
+ icon_state = "bench";
+ pixel_y = 17
},
-/obj/structure/closet/crate/large,
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/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{
dir = 1
@@ -43870,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"
@@ -43887,10 +53245,34 @@
name = "dirty floor"
},
/area/f13/building/powered)
+"nyg" = (
+/turf/open/indestructible/ground/outside/ruins{
+ icon_state = "rubblepillar"
+ },
+/area/f13/ambientlighting/building/j)
"nyh" = (
-/obj/structure/decoration/rag,
-/turf/closed/wall/f13/wood,
-/area/f13/ncr)
+<<<<<<< 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"
@@ -43918,6 +53300,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"
@@ -43928,7 +53321,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)
@@ -43952,32 +53347,51 @@
/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"
+<<<<<<< Updated upstream
+/mob/living/simple_animal/hostile/renegade/soldier,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
},
+/area/f13/wasteland)
+"nzO" = (
+/obj/structure/barricade/wooden,
+/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/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/decoration/rag{
+ icon_state = "flag_ncr";
+ name = "NCR banner";
+ pixel_y = 32
},
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
-"nzO" = (
-/obj/item/stack/sheet/mineral/wood/twenty{
- pixel_y = 7
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalleftborderleft0"
},
-/turf/open/indestructible/ground/outside/ruins{
- name = "cobblestone floor"
+/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)
@@ -43997,6 +53411,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/ncr)
"nAe" = (
/obj/structure/stairs/east,
/turf/open/floor/plating/rust,
@@ -44062,20 +53486,57 @@
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
/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
@@ -44095,6 +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
@@ -44147,17 +53621,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/f13/wood/house,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/structure/closet/crate/large,
+/obj/structure/closet/crate/large{
+ layer = 5;
+ pixel_y = 18
},
-/turf/open/floor/plating/rust,
-/area/f13/ambientlighting/building/j)
+/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{
@@ -44177,10 +53654,25 @@
/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)
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/blood{
+ dir = 8;
+ icon_state = "tracks"
+ },
+/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{
@@ -44212,12 +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/effect/decal/cleanable/blood/old{
- icon_state = "gibmid1"
+/obj/machinery/door/unpowered/secure_NCR{
+ name = "Armoury"
},
-/turf/open/indestructible/ground/outside/dirt,
-/area/f13/caves)
+/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."
@@ -44238,6 +53748,14 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+"nDB" = (
+/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)
"nDE" = (
/obj/machinery/door/unpowered/securedoor{
req_one_access_txt = "136"
@@ -44291,11 +53809,30 @@
},
/area/f13/wasteland)
"nEL" = (
-/obj/structure/bookcase/random{
- icon_state = "bookempty"
+<<<<<<< Updated upstream
+/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)
+=======
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/f13/wood,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"nES" = (
/obj/structure/curtain{
color = "#845f58";
@@ -44320,6 +53857,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,
@@ -44339,9 +53881,29 @@
},
/area/f13/wasteland)
"nFD" = (
-/obj/structure/bed/mattress/pregame,
-/turf/open/floor/f13/wood,
+<<<<<<< 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,
@@ -44390,15 +53952,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/building/abandoned/q)
+<<<<<<< Updated upstream
+=======
"nFZ" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/machinery/hydroponics/soil{
- mutmod = 0;
- name = "ancient fertile soil";
- yieldmod = 1.3
+/obj/effect/spawner/lootdrop/f13/junkspawners,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain0"
},
-/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"nGb" = (
/obj/structure/rack/shelf_metal,
/obj/item/clothing/head/chefhat,
@@ -44438,6 +54000,7 @@
icon_state = "whitegreenrustychess"
},
/area/f13/ambientlighting/building/i)
+<<<<<<< Updated upstream
"nGT" = (
/obj/structure/cargocrate{
pixel_x = 3
@@ -44447,32 +54010,32 @@
},
/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
/area/f13/building/powered)
+"nHo" = (
+/obj/item/storage/trash_stack{
+ icon_state = "Junk_10"
+ },
+/turf/open/floor/wood_fancy,
+/area/f13/ambientlighting/building/m)
+=======
"nHb" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
+/obj/structure/ladder/unbreakable{
+ height = 2;
+ id = "roboticdung";
+ level = 1
},
-/obj/structure/stairs/west{
- color = "#A47449";
- dir = 4
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/wasteland)
+/area/f13/sewer/powered)
"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/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/obj/item/pen{
- pixel_x = 5;
- pixel_y = 4
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontalbottomborderbottom0"
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"nHZ" = (
/obj/structure/car/rubbish4,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -44484,6 +54047,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,
@@ -44553,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" = (
-/obj/structure/window/fulltile/house{
- icon_state = "housewindowvertical"
+<<<<<<< Updated upstream
+/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,
+=======
+/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{
@@ -44578,6 +54165,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;
@@ -44598,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{
@@ -44613,10 +54214,23 @@
/turf/open/floor/carpet/purple,
/area/f13/bar)
"nJY" = (
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+<<<<<<< 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{
icon_state = "housewood2-broken"
@@ -44658,14 +54272,17 @@
/obj/effect/turf_decal/weather/dirt,
/turf/open/indestructible/ground/outside/water,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"nKO" = (
-/obj/structure/chair/office{
- dir = 4
+/obj/machinery/door/poddoor/shutters{
+ id = 983
},
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor3-broken"
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
},
/area/f13/ncr)
+>>>>>>> Stashed changes
"nKZ" = (
/obj/effect/overlay/desert/sonora/edge/corner{
dir = 1
@@ -44687,12 +54304,34 @@
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
@@ -44738,6 +54377,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,
@@ -44785,11 +54430,17 @@
icon_state = "verticalrightborderleft0"
},
/area/f13/wasteland/city)
+<<<<<<< Updated upstream
+=======
"nMC" = (
-/turf/closed/wall/f13/tentwall{
- icon_state = "tent9"
+/obj/structure/table/booth,
+/obj/item/camera{
+ pixel_x = 3;
+ pixel_y = 11
},
-/area/f13/ncr)
+/turf/open/floor/wood_wide,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"nMO" = (
/obj/effect/spawner/lootdrop/toolsbasic,
/obj/effect/spawner/lootdrop/f13/junkspawners,
@@ -44854,16 +54505,16 @@
/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,
+<<<<<<< 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{
@@ -44872,15 +54523,18 @@
},
/area/f13/wasteland)
"nNE" = (
-/obj/structure/stalkeregg,
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
- },
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
+<<<<<<< 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"
},
-/turf/open/indestructible/ground/outside/dirt,
-/area/f13/caves)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"nNM" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt/dust,
@@ -44889,12 +54543,19 @@
},
/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"
+<<<<<<< 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
},
-/area/f13/ambientlighting/building/h)
+/obj/structure/flora/twig,
+/turf/open/indestructible/ground/outside/desert,
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"nNW" = (
/obj/structure/flora/tree/jungle/small,
/turf/open/indestructible/ground/outside/grass,
@@ -44914,7 +54575,9 @@
},
/area/f13/wasteland)
"nOm" = (
-/obj/effect/overlay/junk/curtain,
+/obj/effect/overlay/junk/curtain{
+ layer = 100
+ },
/obj/machinery/shower{
pixel_y = 27
},
@@ -44978,6 +54641,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)
@@ -44988,7 +54660,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" = (
@@ -45009,9 +54683,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" = (
@@ -45019,6 +54693,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/ncr)
"nQe" = (
/obj/structure/decoration/rag{
icon_state = "skin"
@@ -45029,13 +54719,18 @@
/obj/structure/flora/wasteplant/wild_datura,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"nQx" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 10
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 8
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 4;
+ icon_state = "outerturn"
},
-/obj/structure/destructible/tribal_torch/lit,
-/turf/open/floor/plating/dirt/dark,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"nQB" = (
/obj/machinery/light/lampost,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -45061,13 +54756,14 @@
/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)
+<<<<<<< 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{
icon_state = "verticaloutermain1"
@@ -45113,25 +54809,38 @@
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,
/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,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/ambientlighting/building/t)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/item/melee/onehanded/club/ncrflag{
+ pixel_x = -10;
+ pixel_y = 16;
+ anchored = 1;
+ layer = 100
},
-/turf/open/floor/plating/rust,
-/area/f13/ambientlighting/building/j)
+/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"nSu" = (
/obj/structure/chair/folding{
dir = 4
@@ -45139,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{
@@ -45147,6 +54871,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,
@@ -45163,11 +54892,29 @@
/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"
+<<<<<<< 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
},
-/area/f13/ncr)
+/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;
@@ -45178,6 +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"
@@ -45185,12 +54948,16 @@
/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)
+<<<<<<< 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{
@@ -45198,28 +54965,53 @@
},
/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
},
/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)
+<<<<<<< Updated upstream
+/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
+=======
+/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" = (
-/obj/structure/chair/stool/retro/black{
- pixel_y = 19;
- pixel_x = 7
+<<<<<<< Updated upstream
+/obj/structure/window/fulltile/ruins/broken,
+/obj/structure/barricade/wooden,
+/obj/structure/barricade/wooden/planks{
+ icon_state = "board-2";
+ desc = "This sps"
},
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/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,
@@ -45250,6 +55042,10 @@
/obj/effect/mob_spawn/human/corpse/raider/baseball,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+"nUt" = (
+/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,
@@ -45280,11 +55076,23 @@
/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)
+<<<<<<< Updated upstream
+/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,
+/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"
@@ -45317,6 +55125,17 @@
icon_state = "horizontalbottombordertopright"
},
/area/f13/building/lower_firetower)
+"nVV" = (
+/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,
@@ -45328,17 +55147,37 @@
},
/area/f13/building/powered)
"nWo" = (
-/obj/effect/decal/cleanable/dirt{
- color = "#363636"
+<<<<<<< Updated upstream
+/obj/structure/car/rubbish2{
+ pixel_x = 7;
+ pixel_y = -16
},
-/obj/structure/fluff/railing{
- dir = 6
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/area/f13/wasteland)
+=======
+/obj/machinery/door/poddoor/shutters{
+ id = 982
},
-/turf/open/floor/plating/dirt,
-/area/f13/ambientlighting/building/j)
+/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;
@@ -45382,13 +55221,29 @@
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
"nXi" = (
-/obj/structure/chair/bench{
+<<<<<<< Updated upstream
+/obj/structure/decoration/rag{
+ icon_state = "flag_ncr";
+ name = "NCR banner";
+ pixel_y = 32
+ },
+/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
},
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6
+/turf/open/indestructible/ground/outside/desert{
+ icon_state = "wasteland32"
+>>>>>>> Stashed changes
},
-/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
"nXs" = (
/obj/structure/barricade/wooden,
@@ -45453,9 +55308,25 @@
},
/area/f13/ambientlighting/building/o)
"nYQ" = (
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/structure/table/wood,
+>>>>>>> Stashed changes
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
+ },
+/area/f13/ambientlighting/building/m)
"nYZ" = (
/obj/structure/table,
/obj/machinery/computer/terminal{
@@ -45484,11 +55355,11 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland/legion)
"nZE" = (
-/obj/structure/chair/wood{
- dir = 4
+<<<<<<< Updated upstream
+/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{
@@ -45501,17 +55372,34 @@
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)
+=======
+/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{
@@ -45519,6 +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
@@ -45593,10 +55495,18 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"obz" = (
-/obj/structure/flora/grass/both,
-/turf/open/indestructible/ground/outside/snow,
+/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
@@ -45624,15 +55534,13 @@
icon_state = "bar"
},
/area/f13/ambientlighting/building/g)
+<<<<<<< Updated upstream
+=======
"ocb" = (
-/obj/structure/window/fulltile/wood/broken,
-/obj/structure/curtain{
- color = "#808080"
- },
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1"
- },
-/area/f13/ncr)
+/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{
@@ -45659,6 +55567,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;
@@ -45863,6 +55779,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
@@ -45877,6 +55802,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{
@@ -45891,11 +55825,27 @@
/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"
+ },
+/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,
+=======
"ofg" = (
-/obj/structure/flora/brushwoodalt,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow5"
+/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,
@@ -45908,17 +55858,44 @@
/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,
/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{
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"
@@ -46023,13 +56000,15 @@
/obj/structure/table,
/turf/open/floor/plating/rust,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"ohg" = (
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/turf/open/floor/carpet/arcade,
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"ohj" = (
/obj/effect/overlay/desert/sonora/edge{
dir = 4
@@ -46073,16 +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/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/port_gen/pacman/diesel,
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/item/ammo_box/magazine/m556/rifle/empty{
+ pixel_x = 6;
+ pixel_y = -6
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/item/ammo_box/magazine/m556/rifle/empty{
+ pixel_x = 6;
+ pixel_y = -6
},
-/area/f13/ambientlighting/building/g)
+/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,
@@ -46117,12 +56127,26 @@
},
/area/f13/caves)
"oiL" = (
-/obj/structure/fluff/hedge,
-/obj/machinery/light/small{
- light_color = "#ff4747"
+<<<<<<< Updated upstream
+/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"
+ },
+=======
+/obj/structure/fence/corner{
+ dir = 5
+ },
+/turf/open/indestructible/ground/outside/desert,
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"oiN" = (
/obj/structure/barricade/wooden,
/obj/structure/barricade/wooden,
@@ -46147,6 +56171,23 @@
/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
+ },
+/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{
name = "trail"
@@ -46161,6 +56202,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,
@@ -46257,20 +56307,24 @@
},
/turf/open/floor/plating/f13/inside/gravel,
/area/f13/wasteland/town)
-"okx" = (
-/obj/structure/campfire/barrel{
- pixel_x = 3;
- pixel_y = 17;
- density = 0
+<<<<<<< Updated upstream
+"oky" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 8
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/turf/open/indestructible/ground/inside/mountain,
+=======
+"okx" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/f13/wood{
+ icon_state = "housewood2-broken"
},
-/area/f13/ncr)
+/area/f13/ambientlighting/building/m)
"oky" = (
-/obj/item/vending_refill/coffee,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/p)
+/obj/item/trash/f13/tin,
+/turf/open/indestructible/ground/outside/sidewalk,
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"okE" = (
/obj/structure/debris/v4,
/obj/structure/debris/v2,
@@ -46294,29 +56348,33 @@
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)
+<<<<<<< Updated upstream
"okR" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/mob/living/simple_animal/hostile/renegade/soldier,
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 4
},
-/mob/living/simple_animal/hostile/raider/firefighter,
-/obj/machinery/light/small{
- brightness = 7
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/obj/machinery/button/door{
- id = "MikoStiff";
- name = "Miko's Stiff Beds shutters";
- pixel_y = -32
+=======
+"okQ" = (
+/obj/structure/barricade/wooden,
+/obj/structure/barricade/wooden/planks/pregame,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
},
-/turf/open/floor/plasteel/f13/vault_floor/white/whitesolid,
-/area/f13/ambientlighting/building/j)
+/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,
/turf/open/indestructible/ground/outside/dirt,
@@ -46327,14 +56385,21 @@
},
/area/f13/ambientlighting/building/i)
"olg" = (
-/obj/structure/fence/corner{
- dir = 4
- },
-/turf/open/indestructible/ground/outside/sidewalk{
- dir = 6;
- icon_state = "outerpavement"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -46395,6 +56460,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"
@@ -46402,7 +56473,6 @@
/area/f13/building/lower_firetower)
"omh" = (
/obj/structure/debris/v3,
-/obj/effect/spawner/lootdrop/trash,
/obj/structure/fence{
dir = 8
},
@@ -46418,6 +56488,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,
@@ -46467,18 +56547,25 @@
/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,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/rust,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -46524,6 +56611,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/ncr)
"oot" = (
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/ghoul/legendary,
@@ -46545,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,
@@ -46611,6 +56717,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
@@ -46724,20 +56835,13 @@
/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/obj/machinery/photocopier,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"ose" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -46773,6 +56877,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{
@@ -46811,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,
@@ -46887,14 +57030,20 @@
/obj/effect/validball_spawner,
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"ovf" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/ammo/fiftypercent,
-/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)
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain1"
+ },
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"ovp" = (
/obj/machinery/door/poddoor/shutters{
id = "hospitalgarage1";
@@ -46922,6 +57071,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"
@@ -46954,6 +57110,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/ncr)
"owK" = (
/obj/structure/window/fulltile/house{
icon_state = "housewindowbroken"
@@ -46984,6 +57149,25 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland/legion)
+<<<<<<< Updated upstream
+"oxb" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/blood{
+ icon_state = "floor6"
+ },
+/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"
@@ -46997,15 +57181,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
@@ -47024,30 +57199,30 @@
},
/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
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -47080,7 +57255,6 @@
dir = 4
},
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -47097,6 +57271,10 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+"ozi" = (
+/obj/effect/turf_decal/caution,
+/turf/closed/wall/mineral/brick,
+/area/f13/ncr)
"ozn" = (
/mob/living/simple_animal/hostile/handy/gutsy,
/obj/machinery/light,
@@ -47109,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,
@@ -47116,10 +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,
-/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)
+=======
+/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
@@ -47179,7 +57374,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,
@@ -47194,6 +57391,18 @@
/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{
dir = 6
@@ -47248,15 +57457,23 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"oBZ" = (
-/obj/machinery/door/poddoor/shutters{
- id = "MallStorage";
- name = "Mall Storage"
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/oil/slippery,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+=======
+/obj/effect/decal/remains/human,
+/obj/structure/chair/stool{
+ dir = 8;
+ icon_state = "bench";
+ pixel_y = 17
},
-/turf/open/floor/plasteel/f13/vault_floor/plating,
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain0"
+ },
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"oCe" = (
/obj/machinery/light{
dir = 4
@@ -47267,6 +57484,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{
@@ -47275,6 +57502,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,
@@ -47399,7 +57631,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" = (
@@ -47428,9 +57662,25 @@
/turf/closed/wall/f13/tunnel,
/area/f13/tunnel/northeast)
"oEK" = (
-/obj/structure/wreck/trash/machinepile,
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -47467,6 +57717,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"
@@ -47515,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
@@ -47527,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)
@@ -47559,6 +57830,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
@@ -47586,11 +57861,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{
@@ -47605,19 +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/effect/turf_decal/weather/snow/corner{
- dir = 10
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/obj/structure/stairs/west{
- color = "#A47449";
- dir = 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/snow,
+/obj/effect/overlay/desert/sonora/edge,
+/turf/open/floor/wood_common,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"oHR" = (
/obj/structure/fence{
dir = 4
@@ -47627,6 +57913,7 @@
},
/area/f13/wasteland)
"oHU" = (
+<<<<<<< Updated upstream
/obj/structure/debris/v2,
/turf/open/indestructible/ground/outside/dirt{
dir = 1;
@@ -47634,19 +57921,27 @@
},
/area/f13/wasteland)
"oHW" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
- },
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = -16
},
-/obj/machinery/hydroponics/soil{
- mutmod = 0;
- name = "ancient fertile soil";
- yieldmod = 1.3
+/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
},
-/turf/open/indestructible/ground/inside/dirt,
-/area/f13/wasteland)
+/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,
@@ -47708,15 +58003,29 @@
icon_state = "common-broken2"
},
/area/f13/wasteland)
-"oJi" = (
+<<<<<<< Updated upstream
+"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)
+"oJh" = (
+/obj/structure/car/rubbish4{
+ pixel_y = -9;
+ icon_state = "debris1"
+ },
+/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{
@@ -47730,6 +58039,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
@@ -47759,17 +58072,31 @@
/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
},
/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
+ },
+/obj/effect/landmark/start/f13/ncrconscript,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"oKp" = (
/mob/living/simple_animal/hostile/handy,
/turf/open/floor/f13/wood{
@@ -47823,35 +58150,39 @@
/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
+<<<<<<< Updated upstream
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = -4;
+ pixel_x = -16
},
-/obj/effect/decal/cleanable/blood{
- plane = -14;
- layer = 3.7;
- icon_state = "drip4"
+/obj/structure/sign/do_not_enter,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
},
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
+/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
},
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken5"
+/obj/item/bedsheet/blanket{
+ pixel_y = 1
},
+/turf/open/floor/plasteel/grimy,
/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)
+>>>>>>> Stashed changes
"oLl" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood,
@@ -47859,15 +58190,51 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/building/tribal)
"oLn" = (
-/obj/structure/chair/wood,
-/turf/open/floor/wood_common/wood_common_dark,
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
@@ -47890,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
@@ -47949,10 +58323,13 @@
icon_state = "housewood2-broken"
},
/area/f13/building/abandoned/j)
+<<<<<<< Updated upstream
+=======
"oMD" = (
-/obj/structure/barricade/wooden/planks/pregame,
-/turf/closed/wall/f13/wood,
-/area/f13/caves)
+/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)
@@ -47982,6 +58359,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"
@@ -48016,15 +58401,20 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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)
+/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
@@ -48074,6 +58464,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/ncr)
"oNJ" = (
/obj/item/storage/toolbox/mechanical,
/obj/structure/rack/large/shelf,
@@ -48092,6 +58487,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,
@@ -48134,6 +58538,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"
@@ -48198,19 +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" = (
-/obj/effect/turf_decal/delivery,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+<<<<<<< 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"
@@ -48247,20 +58674,30 @@
/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,
/area/f13/clinic)
"oPU" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
+<<<<<<< Updated upstream
+/obj/structure/window/fulltile/ruins{
+ icon_state = "ruinswindowbroken"
},
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 10
+/obj/effect/decal/cleanable/glass,
+/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/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"oPV" = (
/obj/structure/chair/bench{
dir = 4;
@@ -48281,11 +58718,21 @@
},
/area/f13/building/powered)
"oQd" = (
-/obj/machinery/light,
-/turf/open/floor/plasteel/f13/vault_floor/floor{
- icon_state = "floordirty"
+<<<<<<< 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
},
-/area/f13/ambientlighting/building/p)
+/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
@@ -48329,7 +58776,6 @@
"oQL" = (
/obj/structure/flora/grass/wasteland,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -48347,6 +58793,18 @@
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)
+"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"
@@ -48384,7 +58842,6 @@
"oRR" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/building/tribal)
@@ -48406,6 +58863,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"
@@ -48443,8 +58911,21 @@
/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)
+<<<<<<< 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;
@@ -48456,13 +58937,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,
@@ -48480,6 +58959,13 @@
},
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/wasteland)
+"oTO" = (
+/obj/structure/bedsheetbin/empty,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"oTP" = (
/obj/structure/simple_door/glass,
/turf/open/floor/wood_common,
@@ -48500,6 +58986,7 @@
icon_state = "yellowrustychess"
},
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
"oUs" = (
/obj/structure/fence{
dir = 4
@@ -48507,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" = (
@@ -48576,15 +59069,29 @@
/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,
/turf/closed/wall/f13/wood/house,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"oVp" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/red,
-/area/f13/ambientlighting/building/g)
+/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;
@@ -48598,36 +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/turf_decal/weather/dirt{
+/obj/effect/overlay/desert/sonora/edge{
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;
+ dir = 4;
light_color = "#f4e3b0"
},
-/obj/structure/extinguisher_cabinet{
- pixel_x = -29;
- pixel_y = -1
- },
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ambientlighting/building/j)
"oWl" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- layer = 11;
- name = "Toys for the Middle-Aged"
+/obj/structure/window/fulltile/house{
+ dir = 2;
+ icon_state = "housewindowvertical"
},
-/turf/open/floor/carpet/arcade,
+/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,
@@ -48635,16 +59138,23 @@
"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)
"oWA" = (
-/obj/machinery/light/broken{
- dir = 4
+<<<<<<< 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"
},
-/turf/open/indestructible/ground/outside/dirt,
-/area/f13/wasteland)
+/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,
@@ -48691,16 +59201,25 @@
/turf/open/floor/wood_common,
/area/maintenance/bar)
"oWZ" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
+<<<<<<< Updated upstream
+/obj/item/melee/onehanded/slavewhip,
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/wasteland)
+=======
+/obj/machinery/vending/coffee{
+ pixel_y = -11
},
-/obj/structure/table/wood,
-/obj/item/clothing/head/beret/ncr/ncr_sapper{
- pixel_x = -3;
- pixel_y = 7
+/obj/machinery/vending/nukacolavend{
+ pixel_y = -11;
+ pixel_x = 31
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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,
@@ -48737,6 +59256,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;
@@ -48753,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"
@@ -48803,8 +59334,14 @@
},
/area/f13/brotherhood)
"oZf" = (
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
+<<<<<<< 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,
/obj/effect/decal/cleanable/dirt,
@@ -48886,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{
@@ -48896,16 +59446,44 @@
},
/area/f13/wasteland)
"paG" = (
-/obj/effect/decal/cleanable/blood,
+<<<<<<< Updated upstream
+/obj/structure/fence{
+ dir = 4
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 8;
+ icon_state = "outermaincornerouter"
+ },
+/area/f13/wasteland)
+"paK" = (
+/obj/machinery/light{
+ dir = 1;
+ layer = 2.9
+ },
+/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 = 6
+ dir = 9
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/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,
/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
@@ -48965,6 +59543,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{
@@ -48977,6 +59561,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{
@@ -48989,6 +59581,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,
@@ -49011,20 +59609,36 @@
/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,
+/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)
+=======
"pcx" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/indestructible/ground/outside/dirt{
- icon_state = "dirtcorner"
+/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
},
-/area/f13/wasteland)
+/turf/open/floor/carpet/arcade,
+/area/f13/ambientlighting/building/m)
"pcH" = (
-/obj/structure/flora/grass/brown{
- pixel_y = 11
- },
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow10"
+/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{
@@ -49052,6 +59666,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
@@ -49116,19 +59740,35 @@
icon_state = "darkrusty"
},
/area/f13/building/abandoned/h)
-"peC" = (
-/obj/effect/decal/fakelattice,
-/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+"pev" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/f13/wood{
+ icon_state = "housewood4-broken"
},
-/obj/item/storage/trash_stack,
-/turf/open/floor/plating/rust,
+/area/f13/ambientlighting/building/m)
+=======
+>>>>>>> Stashed changes
+"peC" = (
+/obj/structure/chair/stool/retro/black,
+/turf/open/indestructible/ground/outside/ruins,
/area/f13/ambientlighting/building/j)
"peG" = (
/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"
@@ -49171,6 +59811,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;
@@ -49212,9 +59861,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,
@@ -49243,6 +59897,18 @@
},
/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"
+ },
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
"pgY" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/lootdrop/f13/crafting,
@@ -49255,6 +59921,17 @@
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/mineral/plasma/twentyfive,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalbottombordertop2"
+ },
+/area/f13/wasteland)
"phk" = (
/obj/structure/sign/poster/random,
/turf/closed/indestructible/rock{
@@ -49314,6 +59991,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{
@@ -49362,10 +60050,40 @@
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;
+ icon_state = "car_rubish1"
+ },
+/turf/open/indestructible/ground/outside/road,
+/area/f13/wasteland)
"pja" = (
/obj/structure/sink/greyscale{
dir = 1
@@ -49406,6 +60124,13 @@
},
/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"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"pju" = (
/obj/structure/table/wood,
/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3,
@@ -49427,17 +60152,19 @@
/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
- },
+<<<<<<< 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,
@@ -49457,12 +60184,24 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
"pkq" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken4"
+/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/ncr)
+/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
@@ -49475,21 +60214,35 @@
/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
+<<<<<<< Updated upstream
+/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,
+=======
+/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{
+ dir = 1;
+ layer = 1000
+ },
+/turf/closed/wall/f13/wood,
+/area/f13/ambientlighting/building/m)
"pkV" = (
/obj/structure/chair/sofa/corner,
/obj/machinery/light/small{
@@ -49530,6 +60283,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,
@@ -49548,16 +60307,13 @@
icon_state = "housewood2"
},
/area/f13/ambientlighting/building/w)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -49579,6 +60335,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{
@@ -49663,26 +60426,16 @@
},
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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"
+/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
@@ -49690,6 +60443,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
@@ -49697,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{
@@ -49728,9 +60507,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 +60525,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,
@@ -49782,17 +60561,16 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"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."
+/obj/structure/billboard/ritas,
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 1;
+ icon_state = "outercorner"
},
-/turf/open/floor/carpet/arcade,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"ppM" = (
/obj/structure/closet/locker,
/obj/item/clothing/under/f13/mechanic,
@@ -49803,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,
@@ -49886,6 +60669,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{
@@ -49894,14 +60685,20 @@
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
+<<<<<<< Updated upstream
+=======
+"pqZ" = (
+/obj/item/radio/intercom/retro{
+ pixel_x = 31
},
-/turf/open/water,
-/area/f13/ambientlighting/building/j)
+/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{
@@ -49915,12 +60712,25 @@
},
/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,
/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
@@ -49940,30 +60750,29 @@
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/effect/spawner/lootdrop/trash,
-/turf/open/floor/f13/wood,
-/area/f13/building/abandoned/g)
-"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/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" = (
+<<<<<<< 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{
@@ -50009,10 +60818,15 @@
icon_state = "wasteland33"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"psL" = (
-/obj/machinery/smartfridge/chemistry,
-/turf/open/floor/wood_common/wood_common_dark,
+/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{
@@ -50033,32 +60847,38 @@
},
/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)
+<<<<<<< Updated upstream
+=======
"ptb" = (
-/obj/structure/fence{
- dir = 8;
- icon_state = "straight"
- },
-/turf/open/indestructible/ground/outside/dirt{
- dir = 1;
- icon_state = "dirt"
- },
-/area/f13/wasteland)
+/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,
/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,
/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
@@ -50075,10 +60895,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,
@@ -50204,11 +61029,15 @@
/obj/structure/wreck/trash/machinepiletwo,
/turf/open/floor/plating/f13/inside/gravel,
/area/f13/wasteland/town)
+<<<<<<< Updated upstream
+=======
"pvt" = (
-/obj/structure/bed/old,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/holofloor/carpet,
-/area/f13/ambientlighting/building/g)
+/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
@@ -50264,15 +61093,32 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/wasteland)
-"pwi" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+"pwe" = (
+/obj/effect/decal/marking{
+ icon_state = "dottedverticaldegraded"
},
-/obj/effect/spawner/lootdrop/trash,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/structure/cable/outdoors{
+ icon_state = "1-4"
},
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain2top"
+ },
+/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,
@@ -50315,6 +61161,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,
@@ -50325,22 +61175,42 @@
icon_state = "dark"
},
/area/f13/ambientlighting/building/o)
-"pxK" = (
-/obj/machinery/shower{
- pixel_y = 16
+<<<<<<< Updated upstream
+"pxT" = (
+/obj/effect/decal/marking{
+ icon_state = "dottedverticaldegraded"
},
-/obj/structure/curtain,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13{
- icon_state = "bar"
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/fluff/rug/rug_rubber,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
},
-/area/f13/ambientlighting/building/g)
-"pxT" = (
-/obj/structure/flora/brushwood{
- pixel_x = 14
+/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,
+=======
+"pxK" = (
+/obj/structure/fence{
+ dir = 4
+ },
+/obj/structure/obstacle/barbedwire{
+ dir = 4;
+ pixel_y = 16
},
-/turf/open/indestructible/ground/outside/snow,
+/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,
@@ -50418,22 +61288,39 @@
/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"
+<<<<<<< Updated upstream
+/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)
+=======
+/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/structure/flora/tree/cactus,
-/turf/open/indestructible/ground/outside/dirt{
- icon_state = "dirt"
+/obj/effect/turf_decal/big{
+ dir = 6
},
-/area/f13/wasteland)
+/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.";
@@ -50443,7 +61330,18 @@
name = "Concrete wall";
smooth = 1
},
+<<<<<<< Updated upstream
/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"
@@ -50452,12 +61350,23 @@
/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)
+"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,
/obj/structure/reagent_dispensers/barrel/dangerous,
@@ -50476,7 +61385,6 @@
icon_state = "car_rubish2"
},
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -50509,6 +61417,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,
@@ -50519,18 +61438,17 @@
},
/turf/open/indestructible/ground/outside/road,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"pBl" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6
- },
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1;
- icon_state = "snow_corner"
- },
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/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{
@@ -50554,6 +61472,36 @@
},
/turf/closed/wall/f13/tentwall,
/area/f13/building/tribal)
+<<<<<<< Updated upstream
+"pBr" = (
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/closed/wall/mineral/brick,
+/area/f13/ncr)
+"pBE" = (
+/obj/structure/chair/office/dark{
+ dir = 8
+ },
+/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
@@ -50573,11 +61521,27 @@
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,
/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)
@@ -50589,15 +61553,26 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"pCD" = (
-/obj/structure/chair{
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/wood{
dir = 8
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/mob/living/simple_animal/hostile/renegade/soldier,
+/obj/effect/decal/cleanable/glass,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2,
-/area/f13/ambientlighting/building/j)
+/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,
@@ -50606,20 +61581,33 @@
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)
+<<<<<<< Updated upstream
+=======
"pDb" = (
-/obj/structure/chair/wood{
- dir = 1
+/obj/effect/spawner/lootdrop/f13/crafting,
+/obj/effect/decal/cleanable/blood{
+ icon_state = "tracks"
},
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor3-broken"
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain0"
},
/area/f13/wasteland)
+>>>>>>> Stashed changes
"pDe" = (
/obj/structure/barricade/tentclothedge{
dir = 4
@@ -50635,10 +61623,21 @@
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,
/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{
@@ -50647,10 +61646,19 @@
/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)
+<<<<<<< Updated upstream
+/obj/effect/spawner/lootdrop/f13/crafting,
+/obj/effect/decal/cleanable/blood{
+ icon_state = "tracks"
+ },
+/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,
/obj/effect/decal/cleanable/dirt,
@@ -50658,6 +61666,10 @@
icon_state = "whitegreenrustychess"
},
/area/f13/building/abandoned/a)
+"pEl" = (
+/obj/structure/sign/poster/prewar/protectron,
+/turf/closed/wall/mineral/brick,
+/area/f13/ncr)
"pEu" = (
/turf/closed/wall/f13/wood,
/area/f13/building/abandoned/x)
@@ -50667,16 +61679,20 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"pEx" = (
-/obj/item/kirbyplants{
- icon_state = "plant-22";
- pixel_x = -10
+/obj/effect/decal/marking{
+ icon_state = "dottedverticalcorroded"
},
-/obj/machinery/jukebox{
- pixel_x = 5
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
+ },
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"pEQ" = (
/obj/machinery/light{
dir = 4
@@ -50707,17 +61723,8 @@
},
/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"
- },
+<<<<<<< Updated upstream
+/turf/open/indestructible/ground/outside/desert,
/area/f13/ambientlighting/building/j)
"pFi" = (
/obj/effect/overlay/desert/sonora/edge{
@@ -50726,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" = (
@@ -50740,7 +61765,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"
@@ -50781,20 +61805,53 @@
/turf/open/indestructible/ground/outside/desert,
/area/maintenance/bar)
"pFP" = (
-/obj/structure/flora/brushwood{
- pixel_x = 14
+<<<<<<< Updated upstream
+/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,
+/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)
+=======
+/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)
@@ -50840,6 +61897,11 @@
},
/turf/open/indestructible/ground/outside/grass,
/area/f13/wasteland)
+"pHg" = (
+/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,
@@ -50858,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" = (
-/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,
+<<<<<<< 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,
@@ -50973,18 +62045,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/f13/ambientlighting/building/y)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -51069,29 +62140,14 @@
icon_state = "housewood2"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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;
@@ -51100,7 +62156,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" = (
@@ -51133,6 +62188,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,
@@ -51142,7 +62202,6 @@
/area/f13/building/abandoned/l)
"pKR" = (
/obj/structure/nest/ghoul{
- max_mobs = 2;
radius = 5
},
/turf/open/indestructible/ground/outside/dirt,
@@ -51175,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,
@@ -51306,11 +62373,36 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"pMr" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6
+<<<<<<< Updated upstream
+/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)
+=======
+/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;
@@ -51321,15 +62413,23 @@
icon_state = "dirt"
},
/area/f13/wasteland)
-"pMM" = (
-/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+"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."
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+=======
+"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,
/turf/open/floor/plating/rust,
@@ -51384,14 +62484,27 @@
icon_state = "outerbordercorner"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"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,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/turf_decal/siding/wood{
+ dir = 1;
+ layer = 1000
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/obj/structure/filingcabinet{
+ layer = 10000
+ },
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"pOe" = (
/obj/effect/turf_decal/weather/dirt{
dir = 9
@@ -51400,41 +62513,40 @@
/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"
- },
+<<<<<<< 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/item/chair,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/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/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = 16
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
+"pOm" = (
+/obj/structure/bed/mattress{
+ icon_state = "mattress2";
+ pixel_y = 5
},
-/obj/item/storage/trash_stack{
- icon_state = "trash_3"
+/obj/item/bedsheet/blanket{
+ pixel_y = 1
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"pOy" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/trash_stack,
@@ -51457,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,
@@ -51481,6 +62600,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/ncr)
"pPC" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/raider/baseball,
@@ -51512,6 +62637,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,
@@ -51537,22 +62668,69 @@
/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
+<<<<<<< Updated upstream
+/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)
+=======
+/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
+ },
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/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)
+=======
+"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,
@@ -51569,6 +62747,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"
@@ -51613,7 +62799,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,
@@ -51649,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{
@@ -51684,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
@@ -51722,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,
@@ -51759,6 +62972,11 @@
/obj/effect/gibspawner/human,
/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+"pUW" = (
+/obj/structure/weightlifter,
+/obj/machinery/light/small,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
"pVa" = (
/obj/effect/mapping_helpers/network_builder/power_cable/auto,
/obj/structure/chair/wood{
@@ -51766,36 +62984,71 @@
},
/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" = (
-/obj/structure/closet/fridge/cannibal,
-/obj/effect/spawner/lootdrop/f13/foodspawner,
-/obj/effect/spawner/lootdrop/f13/foodspawner,
-/turf/open/floor/f13/wood,
+<<<<<<< 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)
-"pVG" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 5;
- icon_state = "snow_corner"
- },
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+<<<<<<< Updated upstream
+"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/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)
+=======
+"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,
@@ -51883,7 +63136,6 @@
"pWD" = (
/obj/structure/destructible/tribal_torch/lit,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -51927,19 +63179,20 @@
/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,
-/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
+<<<<<<< Updated upstream
+/obj/structure/flora/grass/wasteland{
+ icon_state = "tall_grass_3"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+=======
+/obj/structure/closet/crate/trashcart,
+>>>>>>> Stashed changes
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"pXw" = (
/obj/effect/spawner/lootdrop/cig_packs,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -51947,19 +63200,14 @@
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"
+<<<<<<< Updated upstream
+"pXA" = (
+/obj/machinery/door/unpowered/secure_NCR,
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/turf/open/floor/carpet/arcade,
-/area/f13/ambientlighting/building/j)
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
"pXG" = (
/obj/effect/decal/remains/human,
/obj/effect/spawner/lootdrop/f13/weapon/melee/tier4,
@@ -51968,12 +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/effect/turf_decal/weather/dirt{
- dir = 10
- },
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/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,
@@ -52000,6 +63262,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{
@@ -52025,7 +63293,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{
@@ -52051,18 +63321,19 @@
icon_state = "yellowrustychess"
},
/area/f13/ambientlighting/building/f)
+<<<<<<< Updated upstream
+=======
"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/structure/flora/rock/pile/largejungle,
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = -4;
+ pixel_x = -16
},
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+>>>>>>> Stashed changes
"pYT" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/glass{
@@ -52104,6 +63375,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
@@ -52130,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,
@@ -52144,13 +63434,15 @@
"qas" = (
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/building/abandoned/m)
+<<<<<<< Updated upstream
+=======
"qav" = (
-/obj/structure/fluff/hedge,
-/obj/structure/sign/poster/contraband/bountyhunters{
- pixel_y = 32
+/obj/structure/simple_door/metal/dirtystore,
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"qax" = (
/obj/structure/flora/grass/wasteland{
icon_state = "tall_grass_4";
@@ -52175,7 +63467,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,
@@ -52189,16 +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/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)
+=======
+/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
@@ -52227,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
@@ -52234,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" = (
@@ -52275,6 +63584,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,
@@ -52307,13 +63620,18 @@
pixel_x = -8;
pixel_y = -5
},
-/obj/effect/spawner/lootdrop/trash,
/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{
- dir = 2;
icon_state = "dirt"
},
/area/f13/underground/cave)
@@ -52358,6 +63676,27 @@
/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,
+/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)
+=======
+"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
@@ -52430,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,
@@ -52442,32 +63790,43 @@
},
/area/f13/building/abandoned/t)
"qen" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
+<<<<<<< Updated upstream
+/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)
+=======
+/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/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)
+/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
@@ -52481,6 +63840,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/ncr)
"qfI" = (
/turf/open/floor/f13/wood{
icon_state = "housewood1-broken"
@@ -52515,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,
@@ -52615,34 +63995,61 @@
},
/area/f13/wasteland)
"qgV" = (
-/obj/structure/table/booth,
-/obj/item/reagent_containers/food/drinks/coffee{
- pixel_x = -6
+<<<<<<< Updated upstream
+/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)
+"qhy" = (
+/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" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/snacks/baconegg{
- pixel_y = -1;
- pixel_x = -1
+/mob/living/simple_animal/hostile/renegade/soldier,
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 4
},
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 9;
- pixel_y = 14
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = 9;
- pixel_y = 10
+/area/f13/wasteland)
+"qhs" = (
+/obj/structure/destructible/tribal_torch/wall/lit{
+ dir = 8;
+ light_color = "#f4e3b0"
+>>>>>>> Stashed changes
},
-/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,
@@ -52656,6 +64063,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,
@@ -52671,6 +64087,11 @@
/obj/machinery/grill,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+"qhU" = (
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
+ },
+/area/f13/ncr)
"qhZ" = (
/obj/machinery/door/locked/hard/maybe_trapped,
/turf/open/indestructible/ground/outside/desert,
@@ -52700,14 +64121,24 @@
},
/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
+<<<<<<< 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
},
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/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,
@@ -52716,14 +64147,13 @@
/obj/item/clothing/glasses/welding,
/turf/open/indestructible/ground/outside/road,
/area/engine/workshop)
+<<<<<<< Updated upstream
+=======
"qiE" = (
-/obj/effect/decal/cleanable/cobweb{
- dir = 1;
- icon_state = "cobweb2"
- },
-/obj/structure/fluff/hedge,
-/turf/open/floor/plating/dirt,
-/area/f13/ncr)
+/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,
@@ -52739,6 +64169,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;
@@ -52748,19 +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/structure/flora/grass/green,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow3"
+/obj/item/radio{
+ name = "walkie talkie"
},
-/area/f13/wasteland)
+/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/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/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{
@@ -52769,12 +64220,24 @@
},
/area/f13/wasteland)
"qjq" = (
-/obj/structure/chair{
- dir = 8
+<<<<<<< Updated upstream
+/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)
+=======
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/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,
@@ -52819,6 +64282,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
@@ -52888,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
@@ -52898,28 +64377,20 @@
/obj/effect/overlay/desert_side,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"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/structure/car/rubbish4{
+ pixel_y = -9;
+ icon_state = "debris1"
},
-/obj/machinery/light/small{
- dir = 8;
- light_color = "#ff4747"
+/obj/effect/decal/fakelattice,
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 4
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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,
@@ -52949,10 +64420,16 @@
icon_state = "whitegreenrustychess"
},
/area/f13/building/abandoned/a)
+<<<<<<< Updated upstream
+=======
"qlk" = (
-/obj/structure/junk/small/bed,
-/turf/open/floor/f13/wood,
-/area/f13/ncr)
+/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{
@@ -52988,30 +64465,49 @@
},
/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
+<<<<<<< Updated upstream
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = -4;
+ pixel_x = -16
},
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/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" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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
+ },
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
+ },
+/area/f13/wasteland)
+"qmc" = (
+/obj/item/storage/trash_stack{
+ icon_state = "Junk_3"
},
+/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,
@@ -53026,10 +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" = (
-/obj/effect/turf_decal/weather/snow/corner,
-/obj/structure/barricade/sandbags,
-/turf/open/indestructible/ground/outside/graveldirt,
+<<<<<<< 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{
@@ -53056,6 +64578,15 @@
/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/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
"qmQ" = (
/obj/structure/fence{
dir = 1
@@ -53065,18 +64596,15 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland/legion)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/area/f13/ambientlighting/building/g)
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"qmY" = (
/obj/structure/table,
/obj/machinery/light{
@@ -53086,6 +64614,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,
@@ -53106,10 +64646,12 @@
},
/area/f13/wasteland/town)
"qnM" = (
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken2"
+<<<<<<< Updated upstream
+/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,
@@ -53118,10 +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/dust,
-/turf/open/floor/carpet,
-/area/f13/ncr)
+/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,
@@ -53149,16 +64704,19 @@
},
/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"
+<<<<<<< Updated upstream
+/obj/effect/decal/remains/deadeyebot,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/area/f13/wasteland)
+=======
+/obj/structure/cable/outdoors{
+ icon_state = "1-4"
},
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"qoM" = (
/obj/machinery/hydroponics/soil,
/obj/item/seeds/poppy/broc,
@@ -53250,12 +64808,20 @@
/turf/open/floor/f13/wood,
/area/f13/legioncamp)
"qpU" = (
-/obj/structure/barricade/wooden,
-/turf/open/indestructible/ground/outside/dirt{
- dir = 8;
- icon_state = "dirt"
+<<<<<<< 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{
@@ -53268,14 +64834,26 @@
/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)
+<<<<<<< Updated upstream
+=======
"qqz" = (
-/turf/open/floor/wood_wide{
- icon_state = "wide-broken5"
+/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/ncr)
+/area/f13/brotherhood)
+>>>>>>> Stashed changes
"qqM" = (
/obj/effect/decal/cleanable/blood/splats,
/turf/open/indestructible/ground/inside/mountain,
@@ -53285,6 +64863,17 @@
/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,
+/obj/item/toy/plush/bird,
+/obj/structure/fluff/railing,
+/obj/structure/fluff/railing{
+ dir = 1
+ },
+/turf/open/floor/carpet/arcade,
+=======
"qrd" = (
/obj/structure/fence{
dir = 1;
@@ -53293,23 +64882,16 @@
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
"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/structure/wreck/trash/three_barrels,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain0"
},
-/obj/item/clothing/head/cowboyhat/white,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/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,
/turf/open/indestructible/ground/outside/dirt,
@@ -53323,18 +64905,13 @@
},
/turf/open/indestructible/ground/outside/grass,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -53410,10 +64987,23 @@
icon_state = "rubble"
},
/area/f13/wasteland)
+"qsE" = (
+/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)
"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,
@@ -53421,6 +65011,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
@@ -53433,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,
@@ -53464,6 +65065,12 @@
/obj/structure/table/wood/poker,
/turf/open/floor/plasteel/f13/stone/rugged,
/area/f13/building/abandoned/g)
+"qtr" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain1"
+ },
+/area/f13/wasteland)
"qtu" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -53511,6 +65118,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,12 +65224,21 @@
},
/area/f13/wasteland)
"qwc" = (
-/obj/structure/billboard/poseidenenergy1,
-/turf/open/indestructible/ground/outside/sidewalk{
- dir = 1;
- icon_state = "horizontaloutermain1"
+<<<<<<< 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" = (
+/obj/structure/curtain,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
+ },
+/area/f13/ncr)
"qwl" = (
/obj/effect/turf_decal/huge,
/obj/item/storage/trash_stack,
@@ -53645,10 +65266,18 @@
},
/area/f13/wasteland)
"qwC" = (
-/turf/closed/wall/f13/tentwall{
- icon_state = "tent5"
+/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
},
-/area/f13/ncr)
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"qwK" = (
/obj/structure/barricade/sandbags,
/turf/open/indestructible/ground/outside/grass,
@@ -53673,6 +65302,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/ncr)
"qxs" = (
/obj/effect/overlay/desert/sonora/edge{
dir = 1
@@ -53681,6 +65314,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{
@@ -53730,17 +65375,25 @@
/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{
+<<<<<<< Updated upstream
+ 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)
+=======
+ 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,
/turf/open/indestructible/ground/outside/road{
@@ -53748,9 +65401,24 @@
},
/area/f13/building/powered)
"qyx" = (
-/obj/machinery/light,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/p)
+<<<<<<< Updated upstream
+/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,
+/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,
@@ -53790,6 +65458,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,
@@ -53801,10 +65481,17 @@
/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)
+<<<<<<< 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,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -53827,9 +65514,21 @@
},
/area/f13/building/lower_firetower)
"qzy" = (
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+<<<<<<< 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{
icon_state = "horizontalbottomborderbottom2left"
@@ -53938,11 +65637,27 @@
/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)
+<<<<<<< Updated upstream
+/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,
+/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,
@@ -53986,20 +65701,20 @@
icon_state = "outerpavementcorner"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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
+/obj/effect/spawner/lootdrop/f13/crafting,
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
},
-/turf/open/floor/wood_wide,
-/area/f13/ncr)
+/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
@@ -54007,15 +65722,24 @@
/turf/open/floor/wood_common,
/area/maintenance/bar)
"qCk" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -54047,14 +65771,21 @@
/obj/structure/chair/pew/left,
/turf/open/floor/wood_common/wood_common_dark,
/area/f13/building/abandoned/m)
+<<<<<<< Updated upstream
+=======
"qCz" = (
-/obj/structure/chair{
- dir = 1
+/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/f13{
- icon_state = "floorrusty"
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain2"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"qCH" = (
/obj/structure/fence{
dir = 4
@@ -54072,14 +65803,7 @@
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)
+<<<<<<< Updated upstream
"qCP" = (
/obj/structure/cargocrate{
pixel_y = 32
@@ -54089,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"
@@ -54098,6 +65829,7 @@
},
/area/f13/ambientlighting/building/b)
"qDa" = (
+<<<<<<< Updated upstream
/obj/structure/fence{
dir = 4
},
@@ -54106,16 +65838,37 @@
/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/structure/car,
-/obj/structure/tires/five,
-/turf/open/indestructible/ground/outside/dirt{
- dir = 1;
- icon_state = "dirt"
+/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,
+/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)
@@ -54142,54 +65895,83 @@
/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"
+<<<<<<< Updated upstream
+/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"
+ },
+=======
+/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,
/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
},
+<<<<<<< Updated upstream
/mob/living/simple_animal/cow/brahmin,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/legioncamp)
+"qEt" = (
+/turf/closed/wall/f13/wood/house,
+/area/maintenance/bar)
+"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/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/barricade/sandbags,
-/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/fakelattice,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/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/wasteland)
"qEt" = (
/turf/closed/wall/f13/wood/house,
/area/maintenance/bar)
"qEv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/fluff/rug/rug_rubber{
- icon = 'icons/fallout/objects/64x64_rugs.dmi';
- icon_state = "rug_red"
+/obj/item/megaphone,
+/obj/structure/table/wood/junk,
+/obj/item/reagent_containers/food/drinks/beer{
+ pixel_x = 9;
+ pixel_y = 9
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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{
@@ -54202,6 +65984,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,
@@ -54225,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
@@ -54242,12 +66038,23 @@
/turf/open/floor/carpet/purple,
/area/f13/bar)
"qFu" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< 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
},
-/mob/living/simple_animal/hostile/raider/ranged,
-/turf/open/floor/plasteel/f13/vault_floor/white/whitesolid,
-/area/f13/ambientlighting/building/j)
+/turf/open/floor/carpet/arcade,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"qFA" = (
/obj/structure/closet/crate/large,
/obj/item/ammo_box/a308box/improvised,
@@ -54329,19 +66136,65 @@
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" = (
-/turf/open/floor/plasteel/stairs{
- dir = 7
+/obj/structure/cable/outdoors{
+ icon_state = "2-4"
},
-/area/f13/ambientlighting/building/g)
+/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"qHu" = (
-/obj/structure/flora/grass/green,
-/turf/open/indestructible/ground/outside/snow,
+/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)
+<<<<<<< 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
@@ -54349,12 +66202,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
@@ -54382,24 +66238,20 @@
/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
+<<<<<<< Updated upstream
+/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)
+=======
+/obj/effect/decal/remains/human,
+>>>>>>> Stashed changes
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"qIt" = (
/obj/structure/table/greyscale,
/obj/item/kitchen/rollingpin,
@@ -54458,11 +66310,25 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/caves)
"qJO" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 4
+<<<<<<< Updated upstream
+/obj/structure/sign/legion/mines{
+ pixel_y = 51;
+ layer = 100
},
-/turf/open/floor/plating/dirt,
+/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)
+=======
+/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";
@@ -54473,24 +66339,46 @@
},
/area/f13/followers)
"qKf" = (
-/obj/structure/table/wood,
-/obj/item/newspaper{
- pixel_x = 7;
- pixel_y = 3
+<<<<<<< Updated upstream
+/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
+ },
+/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)
+=======
+/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/robot_debris/gib,
-/obj/effect/decal/cleanable/oil/streak,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/cleanable/vomit/old,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/ncr)
+>>>>>>> Stashed changes
"qKt" = (
/obj/effect/landmark/start/f13/tribal,
/turf/open/indestructible/ground/outside/dirt,
@@ -54499,6 +66387,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,
@@ -54527,6 +66422,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"
@@ -54609,10 +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" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating/rust,
-/area/f13/caves)
+<<<<<<< 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,
@@ -54624,6 +66546,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";
@@ -54638,15 +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/curtain{
- color = "#808080";
- pixel_x = -32
- },
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken6"
+/obj/structure/wreck/trash/machinepile,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
},
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"qMU" = (
/obj/structure/bed/mattress{
icon_state = "mattress2";
@@ -54659,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;
@@ -54690,6 +66630,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,
@@ -54704,20 +66650,33 @@
"qOh" = (
/obj/structure/barricade/sandbags,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
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"
- },
+<<<<<<< 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/structure/barricade/wooden,
-/turf/closed/mineral/snowmountain/cavern,
-/area/f13/caves)
+/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,
@@ -54728,9 +66687,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,46 +66698,80 @@
icon_state = "housewood1-broken"
},
/area/f13/ambientlighting/building/d)
+<<<<<<< Updated upstream
+=======
"qOK" = (
-/obj/structure/simple_door/house,
-/turf/open/floor/carpet/red,
-/area/f13/ambientlighting/building/g)
+/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"
},
/turf/open/indestructible/ground/outside/savannah,
/area/f13/wasteland)
-"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
+"qOV" = (
+<<<<<<< Updated upstream
+/obj/structure/rack/shelf_metal,
+/obj/item/salvage/low,
+/obj/item/salvage/low,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
+"qOY" = (
+/obj/effect/decal/cleanable/blood{
+ icon_state = "tracks"
},
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = -3;
- pixel_y = -10
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/cobweb{
- dir = 1;
- icon_state = "cobweb2"
+/obj/structure/cable/outdoors{
+ icon_state = "1-8"
},
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = 16
},
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
+/obj/effect/overlay/desert/sonora/edge,
+/turf/open/floor/wood_common,
+/area/f13/wasteland)
+"qPa" = (
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = 16
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/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" = (
-/turf/open/floor/carpet,
-/area/f13/ncr)
+/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,
@@ -54795,12 +66786,24 @@
},
/area/f13/building/powered)
"qPf" = (
+<<<<<<< Updated upstream
/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,
+=======
+/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,
/turf/open/indestructible/ground/outside/desert,
@@ -54844,15 +66847,18 @@
"qPR" = (
/turf/open/indestructible/ground/outside/water,
/area/f13/underground/cave)
+<<<<<<< Updated upstream
+=======
"qPS" = (
-/obj/structure/bookcase/manuals/medical,
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
+/obj/structure/chair/stool{
+ dir = 1;
+ icon_state = "bench"
},
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken3"
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
},
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"qPW" = (
/obj/structure/obstacle/barbedwire/end{
dir = 1;
@@ -54875,12 +66881,40 @@
/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{
+ 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)
+=======
+"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{
@@ -54899,6 +66933,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{
@@ -54933,6 +66973,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,
@@ -54953,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,
@@ -54967,6 +67026,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"
@@ -55001,15 +67068,24 @@
},
/area/f13/wasteland/city)
"qSB" = (
-/obj/structure/barricade/sandbags,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/obj/structure/fence/corner{
+ dir = 5
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+"qSG" = (
+/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."
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"qSQ" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13{
@@ -55041,16 +67117,31 @@
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"
+<<<<<<< Updated upstream
+"qTD" = (
+/obj/effect/turf_decal/big{
+ dir = 4
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
},
-/area/f13/ambientlighting/building/g)
+/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,
@@ -55063,18 +67154,22 @@
/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"
+<<<<<<< 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/f13{
- icon_state = "floorrusty"
+/turf/open/floor/wood_wide{
+ icon_state = "wide-broken3"
},
/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"qTX" = (
/obj/machinery/conveyor/auto{
dir = 4;
@@ -55131,18 +67226,18 @@
/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,
/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;
@@ -55169,13 +67264,24 @@
/turf/open/floor/f13/wood,
/area/f13/legioncamp)
"qVq" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
dir = 8
@@ -55208,6 +67314,7 @@
},
/turf/open/floor/f13/wood,
/area/f13/building/abandoned/m)
+<<<<<<< Updated upstream
"qVQ" = (
/obj/structure/fence{
dir = 4
@@ -55216,10 +67323,18 @@
/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)
+/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,
@@ -55256,10 +67371,26 @@
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,
/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
@@ -55276,12 +67407,23 @@
},
/area/f13/ambientlighting/building/q)
"qWN" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/window/fulltile/house{
- icon_state = "housewindowvertical"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -55304,7 +67446,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,
@@ -55378,18 +67522,14 @@
icon_state = "yellowrustychess"
},
/area/f13/ambientlighting/building/b)
+<<<<<<< Updated upstream
+=======
"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)
+/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)
@@ -55409,20 +67549,14 @@
icon_state = "verticalleftborderleft0"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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,
+/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,
@@ -55482,15 +67616,48 @@
},
/area/f13/followers)
"qZF" = (
-/turf/closed/indestructible/f13/matrix,
-/area/f13/ncr)
+<<<<<<< Updated upstream
+/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{
- 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)
+=======
+/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{
@@ -55511,6 +67678,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;
@@ -55524,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{
@@ -55532,12 +67709,30 @@
},
/area/f13/wasteland)
"raQ" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1;
- icon_state = "snow_corner"
+<<<<<<< Updated upstream
+/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)
+=======
+/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
@@ -55554,12 +67749,22 @@
/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{
+<<<<<<< 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,
@@ -55568,20 +67773,32 @@
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{
icon_state = "horizontalinnermain2"
},
/area/f13/ambientlighting/building/y)
+<<<<<<< Updated upstream
+=======
"rbr" = (
-/obj/structure/flora/twig{
- pixel_y = 23;
- pixel_x = -8
+/obj/effect/decal/marking{
+ icon_state = "dottedverticalcorroded";
+ pixel_x = -14
+ },
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain0"
},
-/obj/structure/flora/grass/brown,
-/turf/open/indestructible/ground/outside/snow,
/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,
@@ -55594,7 +67811,21 @@
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" = (
+<<<<<<< Updated upstream
/obj/machinery/workbench/forge,
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -55603,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
@@ -55612,10 +67859,21 @@
},
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/c)
+"rci" = (
+/obj/effect/decal/cleanable/ash,
+/obj/item/clothing/mask/cigarette/cigar/ncr,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"rcm" = (
/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{
@@ -55626,7 +67884,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{
@@ -55669,6 +67929,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.";
@@ -55683,10 +67947,29 @@
/obj/structure/flora/wasteplant/wild_coyote,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+"rdi" = (
+/obj/structure/cable/outdoors{
+ icon_state = "1-4"
+ },
+/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)
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/oil{
+ icon_state = "floor5";
+ pixel_x = -19
+ },
+/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{
layer = 2.9
@@ -55748,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
@@ -55756,16 +68040,15 @@
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"
- },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/restraints/legcuffs/bola,
/turf/open/floor/f13{
- icon_state = "floorrusty"
+ icon_state = "yellowrustyfull"
},
-/area/f13/ambientlighting/building/g)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"res" = (
/obj/structure/rack,
/obj/item/seeds/poppy/broc,
@@ -55792,13 +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" = (
-/obj/structure/flora/burnedlog{
- pixel_x = 15;
- pixel_y = 9
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 4;
+ icon_state = "outermaincornerouter"
},
-/turf/open/indestructible/ground/outside/snow,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"reU" = (
/obj/effect/decal/cleanable/generic,
/mob/living/simple_animal/hostile/ghoul/reaver,
@@ -55812,17 +68101,25 @@
},
/area/f13/wasteland)
"reW" = (
-/obj/structure/sink{
- dir = 1;
- pixel_y = 16
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
/obj/structure/decoration/rag{
@@ -55832,6 +68129,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,
@@ -55845,25 +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/effect/decal/cleanable/dirt/dust,
-/obj/structure/table/wood/settler,
-/turf/open/floor/f13/wood{
- icon_state = "housewood3-broken"
+/obj/structure/cargocrate,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaltopbordertop0"
},
-/area/f13/ambientlighting/building/g)
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"rft" = (
/obj/machinery/iv_drip/primitive,
/turf/open/floor/plasteel/f13/stone/rugged,
/area/f13/legioncamp)
"rfB" = (
-/obj/item/ammo_casing/c10mm,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -55886,9 +68200,29 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"rfW" = (
-/obj/structure/barricade/wooden/planks,
-/turf/closed/wall/f13/wood,
-/area/f13/wasteland)
+<<<<<<< Updated upstream
+/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)
+=======
+/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)
@@ -55959,12 +68293,15 @@
},
/area/f13/wasteland)
"rhc" = (
-/obj/structure/billboard/redrocket1,
-/turf/open/indestructible/ground/outside/sidewalk{
- dir = 1;
- icon_state = "horizontaloutermain1"
- },
-/area/f13/wasteland)
+<<<<<<< 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{
@@ -56009,11 +68346,18 @@
/turf/open/floor/plating/rust,
/area/f13/building/powered)
"rhA" = (
-/obj/structure/table/wood,
-/obj/item/clothing/head/fluff/bandit,
+<<<<<<< Updated upstream
/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)
+=======
+/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,
@@ -56043,29 +68387,41 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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."
+/obj/effect/decal/cleanable/glass,
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/turf/open/floor/f13{
- icon_state = "bluedirtychess2"
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
+"rhP" = (
+/obj/structure/chair/sofa/right{
+ dir = 4
},
-/area/f13/ambientlighting/building/g)
+/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" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/junk/locker,
-/obj/effect/turf_decal/weather/dirt{
- dir = 4
+<<<<<<< Updated upstream
+/obj/item/trash/candy,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticaloutermain2"
},
-/turf/open/floor/plating/rust,
-/area/f13/caves)
+/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"
@@ -56085,26 +68441,23 @@
},
/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
+<<<<<<< Updated upstream
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = 16
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small{
- dir = 8;
- light_color = "#ff4747"
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+=======
+/obj/structure/table/reinforced,
+/obj/structure/cable/outdoors{
+ icon_state = "1-4"
},
-/turf/open/floor/wood_common/wood_common_dark,
+/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,
@@ -56162,12 +68515,25 @@
/obj/structure/closet/fridge/cannibal,
/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"
+<<<<<<< Updated upstream
+"rjf" = (
+/obj/effect/decal/fakelattice,
+/obj/structure/fence/corner{
+ dir = 4;
+ icon_state = "end"
},
-/area/f13/ambientlighting/building/p)
+/turf/open/indestructible/ground/outside/ruins,
+/area/f13/ambientlighting/building/j)
+"rjg" = (
+/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)
@@ -56175,11 +68541,31 @@
/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)
+<<<<<<< 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,
@@ -56220,6 +68606,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)
@@ -56232,6 +68624,29 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+"rkZ" = (
+/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)
+"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{
@@ -56251,13 +68666,26 @@
},
/area/f13/wasteland)
"rlB" = (
-/obj/structure/window/reinforced/spawner/north,
-/obj/structure/window/reinforced/spawner/east,
-/obj/structure/fluff/railing{
- dir = 5
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/effect/decal/cleanable/shreds,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
+ },
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"rlN" = (
/obj/structure/barricade/sandbags,
/turf/open/floor/plating/f13/outside/road{
@@ -56273,6 +68701,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
@@ -56288,6 +68724,21 @@
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,
+/area/f13/ncr)
"rmt" = (
/obj/structure/barricade/bars{
max_integrity = 800;
@@ -56329,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{
@@ -56337,6 +68797,23 @@
},
/turf/open/floor/wood_common,
/area/f13/clinic)
+<<<<<<< Updated upstream
+"rnh" = (
+/obj/structure/bed/mattress{
+ icon_state = "mattress4";
+ pixel_x = -1;
+ pixel_y = -1
+ },
+/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
@@ -56354,11 +68831,19 @@
/turf/closed/wall/f13/wood/interior,
/area/f13/building/abandoned/z)
"rnE" = (
-/obj/structure/rack,
-/obj/item/clothing/under/assistantformal,
+<<<<<<< Updated upstream
/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)
+=======
+/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;
@@ -56386,9 +68871,18 @@
},
/area/f13/building/abandoned/t)
"rnV" = (
-/obj/effect/spawner/lootdrop/f13/junkspawners,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/p)
+<<<<<<< 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,
/obj/structure/grille,
@@ -56400,13 +68894,25 @@
},
/area/f13/building/powered)
"rnY" = (
-/obj/structure/window/fulltile/wood,
-/turf/open/floor/wood_common/wood_common_dark,
+<<<<<<< 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,
/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"
@@ -56430,6 +68936,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"
@@ -56458,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,
@@ -56485,6 +69008,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{
@@ -56500,7 +69031,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{
@@ -56523,10 +69055,21 @@
},
/area/f13/ambientlighting/building/o)
"rpZ" = (
-/obj/structure/mirror,
+<<<<<<< Updated upstream
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 4;
+ icon_state = "outercorner"
+ },
+/area/f13/wasteland)
+=======
/obj/effect/decal/cleanable/dirt/dust,
-/turf/closed/wall/f13/wood/house,
-/area/f13/ambientlighting/building/h)
+/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,
@@ -56607,9 +69150,20 @@
},
/area/f13/wasteland)
"rqP" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
+<<<<<<< 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{
icon_state = "car_rubish2"
@@ -56631,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");
@@ -56654,13 +69221,33 @@
/obj/structure/table/wood/fancy,
/turf/open/floor/carpet/airless,
/area/f13/ambientlighting/building/c)
+<<<<<<< Updated upstream
"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,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/outside/road{
+ 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
@@ -56690,8 +69277,27 @@
},
/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"
+ },
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
"rrR" = (
-/turf/closed/wall/mineral/concrete,
+<<<<<<< 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" = (
/obj/structure/flora/wasteplant/wild_feracactus,
@@ -56750,13 +69356,32 @@
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,
+<<<<<<< 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" = (
/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 +69389,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
@@ -56771,20 +69402,40 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"rtC" = (
-/obj/effect/decal/fakelattice,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/obj/structure/destructible/tribal_torch/wall/lit,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
+ },
+/area/f13/wasteland)
+"rtI" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/fo13colored/Red{
+ dir = 1
},
/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/rack/shelf_metal,
-/obj/item/clothing/mask/gas/enclave,
-/obj/effect/turf_decal/weather/dirt{
- dir = 4
+/obj/structure/barricade/wooden,
+/turf/open/indestructible/ground/outside/desert{
+ icon_state = "wasteland33"
},
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
+/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
@@ -56811,11 +69462,26 @@
},
/area/f13/building/abandoned/h)
"rup" = (
-/obj/structure/table/wood,
+<<<<<<< Updated upstream
/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,
+=======
+/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{
anchored = 1;
@@ -56836,6 +69502,12 @@
icon_state = "dirt"
},
/area/f13/wasteland/legion)
+"ruJ" = (
+/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{
dir = 8
@@ -56843,15 +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" = (
-/obj/effect/turf_decal/weather/snow/corner{
+<<<<<<< Updated upstream
+/obj/effect/overlay/desert/sonora/edge{
dir = 8
},
-/obj/machinery/light/small{
- dir = 8;
- light_color = "#ff4747"
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/bar,
+=======
+/obj/item/shard,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontalbottomborderbottom3"
},
-/turf/open/indestructible/ground/outside/graveldirt,
+>>>>>>> Stashed changes
/area/f13/wasteland)
"rvn" = (
/obj/structure/flora/tree/oak_five,
@@ -56873,7 +69558,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 +69582,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"
@@ -56912,10 +69590,21 @@
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,
/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
@@ -56963,12 +69652,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/rust,
/area/f13/building/powered)
-"rxs" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 2
+"rxq" = (
+/obj/structure/junk/drawer,
+/obj/effect/overlay/desert/sonora/edge/corner{
+ dir = 1
},
-/turf/open/indestructible/ground/outside/grass,
-/area/f13/wasteland)
+/turf/open/indestructible/ground/outside/ruins,
+/area/f13/ambientlighting/building/j)
"rxD" = (
/obj/structure/window/fulltile/ruins{
icon_state = "ruinswindowbrokenvertical"
@@ -56982,11 +69672,15 @@
},
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"rxJ" = (
-/turf/open/floor/wood_wide{
- icon_state = "wide-broken6"
+/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
@@ -56998,7 +69692,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,
@@ -57006,12 +69702,27 @@
"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
},
/turf/open/indestructible/ground/inside/mountain,
-/area/f13/ncr)
+/area/f13/caves)
"ryn" = (
/turf/open/floor/f13{
color = "#ffe9de";
@@ -57041,11 +69752,22 @@
/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"
+<<<<<<< Updated upstream
+/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)
+=======
+/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;
@@ -57101,6 +69823,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;
@@ -57132,18 +69860,14 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/ambientlighting/building/u)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -57195,6 +69919,49 @@
/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{
+ 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)
"rBY" = (
/obj/effect/turf_decal/arrows{
pixel_y = 7
@@ -57216,34 +69983,42 @@
},
/area/f13/ambientlighting/building/b)
"rCg" = (
-/obj/structure/barricade/wooden/planks/pregame,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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"
+ },
+=======
+/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,
/turf/open/indestructible/ground/outside/sidewalk{
icon_state = "verticaloutermain1"
},
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"rCl" = (
-/obj/structure/flora/ausbushes/fullgrass{
- pixel_x = -6;
- pixel_y = 6
- },
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow5"
- },
+/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;
@@ -57259,18 +70034,34 @@
"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" = (
-/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
@@ -57290,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
@@ -57301,6 +70096,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
@@ -57349,6 +70158,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,
@@ -57357,12 +70185,13 @@
/obj/effect/decal/cleanable/blood,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
+<<<<<<< Updated upstream
+=======
"rDQ" = (
-/obj/effect/landmark/start/f13/ncrcorporal,
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1"
- },
+/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,
@@ -57397,6 +70226,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";
@@ -57459,6 +70298,25 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13/wood,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+"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)
+=======
+"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,
@@ -57508,16 +70366,28 @@
/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)
+<<<<<<< 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,
@@ -57533,12 +70403,29 @@
},
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/k)
+<<<<<<< Updated upstream
+=======
"rGf" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/fence{
+ dir = 1
},
-/turf/open/floor/carpet/arcade,
-/area/f13/ambientlighting/building/j)
+/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,
@@ -57549,6 +70436,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"
@@ -57570,8 +70461,16 @@
/turf/open/floor/wood_common,
/area/maintenance/bar)
"rHn" = (
-/turf/open/floor/plasteel/f13/vault_floor/floor,
-/area/f13/ambientlighting/building/p)
+<<<<<<< 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)
"rHt" = (
/obj/structure/destructible/tribal_torch/wall/lit{
pixel_y = 25
@@ -57607,8 +70506,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
@@ -57655,16 +70558,57 @@
icon_state = "outerpavement"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"rJc" = (
+/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,
+/turf/open/floor/plasteel/grimy,
+=======
"rIY" = (
-/obj/structure/barricade/sandbags,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow3"
+/obj/structure/fence/corner{
+ dir = 4
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalleftborderleft0"
},
/area/f13/wasteland)
"rJc" = (
-/obj/structure/wreck/trash/machinepiletwo,
-/turf/open/indestructible/ground/outside/snow,
+/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{
pixel_y = 15
@@ -57753,17 +70697,24 @@
icon_state = "dirt"
},
/area/f13/wasteland)
-"rKh" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 4
+<<<<<<< Updated upstream
+"rKn" = (
+/obj/item/melee/onehanded/club/ncrflag{
+ pixel_x = -10;
+ pixel_y = 16;
+ anchored = 1;
+ layer = 100
},
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/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"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"rKu" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/f13/medical/rnd/mid,
@@ -57783,15 +70734,13 @@
/obj/effect/decal/fakelattice,
/turf/open/indestructible/ground/outside/water/running,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"rKE" = (
-/mob/living/simple_animal/hostile/raider/sulphite{
- faction = list("raider")
- },
-/obj/effect/decal/cleanable/blood{
- icon_state = "floor6"
- },
+/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,
@@ -57839,17 +70788,33 @@
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/rack,
-/obj/item/crafting/campfirekit,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/barricade/wooden/strong,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalleftborderleft0"
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/area/f13/wasteland)
+"rMe" = (
+/obj/structure/flora/ausbushes/ppflowers{
+ pixel_y = 5
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/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,
+/turf/open/floor/plating/f13,
+/area/f13/wasteland)
"rMe" = (
/obj/structure/table/wood,
/obj/item/storage/backpack/duffelbag/med/surgery/primitive/anchored,
@@ -57909,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,
@@ -57926,34 +70892,44 @@
},
/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,
-/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" = (
-/mob/living/simple_animal/hostile/ghoul/reaver,
+/obj/effect/decal/cleanable/glass,
+/obj/structure/chair/wood{
+ dir = 4
+ },
+/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,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/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,
/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2,
@@ -58000,10 +70976,18 @@
/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)
+<<<<<<< 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,
/turf/open/indestructible/ground/outside/road{
@@ -58014,14 +70998,46 @@
/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/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)
+<<<<<<< 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" = (
+/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,
@@ -58032,6 +71048,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
@@ -58049,6 +71071,19 @@
icon_state = "greenrustyfull"
},
/area/f13/ambientlighting/building/o)
+"rOZ" = (
+/obj/machinery/door/unpowered/secure_NCR,
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
+"rPe" = (
+/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)
"rPl" = (
/obj/item/bedsheet{
icon_state = "sheetbrown"
@@ -58066,24 +71101,53 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland/town)
"rPw" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6
+<<<<<<< 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
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/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,
+>>>>>>> Stashed changes
+/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,
+<<<<<<< Updated upstream
/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)
+=======
+/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";
@@ -58100,16 +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/weather/dirt{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood_common{
+ icon_state = "common-broken2"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"rQf" = (
/obj/structure/simple_door/room,
/turf/open/floor/f13/wood{
@@ -58119,13 +71182,15 @@
"rQh" = (
/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria,
/area/maintenance/bar)
+<<<<<<< Updated upstream
+=======
"rQn" = (
-/obj/structure/fence/wooden{
- dir = 1;
- icon_state = "post_wood"
+/obj/item/trash/f13/mre,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticaloutermain2"
},
-/turf/open/indestructible/ground/outside/snow,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"rQw" = (
/obj/structure/fence{
dir = 4
@@ -58172,7 +71237,6 @@
dir = 2
},
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -58210,6 +71274,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{
@@ -58231,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,
@@ -58263,16 +71339,17 @@
/obj/structure/car/rubbish2,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -58307,6 +71384,13 @@
name = "dirty floor"
},
/area/f13/building/powered)
+"rSZ" = (
+/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)
"rTf" = (
/obj/structure/rack,
/turf/open/floor/f13/wood,
@@ -58316,7 +71400,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,
@@ -58325,15 +71411,34 @@
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"
+<<<<<<< Updated upstream
+"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{
+ loot = s
+ },
+/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"
@@ -58404,6 +71509,12 @@
icon_state = "floorrusty"
},
/area/f13/ambientlighting/building/f)
+"rUC" = (
+/obj/structure/cable/outdoors{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess/whitebluechess2,
+/area/f13/ncr)
"rUD" = (
/obj/machinery/door/poddoor/gate/preopen{
id = 334;
@@ -58411,18 +71522,13 @@
},
/turf/open/indestructible/ground/outside/road,
/area/f13/wasteland/town)
+<<<<<<< Updated upstream
+=======
"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)
+/obj/structure/sign/poster/prewar/poster66,
+/turf/closed/wall/f13/store,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"rUM" = (
/obj/structure/fence{
dir = 4
@@ -58441,6 +71547,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,
@@ -58452,14 +71562,33 @@
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,
+<<<<<<< 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,
@@ -58470,9 +71599,19 @@
},
/area/f13/wasteland)
"rVP" = (
-/obj/structure/flora/wasteplant/wild_buffalogourd,
-/turf/open/indestructible/ground/outside/desert,
+<<<<<<< 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,
@@ -58508,7 +71647,6 @@
dir = 8
},
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -58529,9 +71667,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" = (
@@ -58539,16 +71675,22 @@
/turf/closed/mineral/random/low_chance,
/area/f13/caves)
"rWU" = (
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow5"
- },
-/area/f13/wasteland)
+<<<<<<< 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" = (
/obj/structure/lamp_post/quadra,
/turf/open/indestructible/ground/outside/sidewalk{
icon_state = "outerborder"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
"rXm" = (
/obj/item/clothing/under/f13/recon,
/obj/item/clothing/under/f13/recon,
@@ -58558,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
@@ -58570,6 +71718,21 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+"rXw" = (
+/obj/structure/rack/large/shelf_rust{
+ dir = 8
+ },
+/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,
@@ -58627,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
@@ -58671,17 +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/structure/closet/crate/footlocker,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/obj/effect/decal/cleanable/blood{
+ dir = 8;
+ icon_state = "tracks"
},
-/area/f13/ncr)
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+>>>>>>> Stashed changes
"rZK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -58726,14 +71919,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{
@@ -58795,13 +71986,15 @@
/obj/effect/spawner/lootdrop/f13/alcoholspawner,
/turf/open/floor/plasteel/f13/vault_floor/misc/vault1,
/area/maintenance/bar)
+<<<<<<< Updated upstream
+=======
"scf" = (
-/obj/structure/bed/wooden,
-/obj/item/bedsheet/brown,
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken4"
+/obj/item/storage/trash_stack{
+ icon_state = "Junk_10"
},
-/area/f13/ncr)
+/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{
@@ -58889,6 +72082,42 @@
/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,
+/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)
+=======
+"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"
@@ -58901,21 +72130,34 @@
icon_state = "bluedirtychess2"
},
/area/f13/followers)
-"sdP" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
+<<<<<<< Updated upstream
+"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"
},
-/obj/structure/destructible/tribal_torch/lit,
-/turf/open/indestructible/ground/outside/graveldirt,
/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/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 10
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/storage/trash_stack,
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
+/turf/open/indestructible/ground/outside/ruins,
/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"sdY" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -58926,24 +72168,20 @@
},
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/k)
+<<<<<<< Updated upstream
+=======
"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{
+/obj/effect/turf_decal/sand/plating,
+/obj/machinery/power/port_gen/pacman/diesel{
anchored = 1
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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,
@@ -58967,24 +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/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/structure/cable/outdoors{
+ icon_state = "2-4"
},
-/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
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = 16
},
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/ncr)
+>>>>>>> Stashed changes
"sfg" = (
/obj/structure/decoration/vent,
/obj/effect/decal/cleanable/dirt{
@@ -59021,6 +72256,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,
@@ -59057,11 +72302,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,
@@ -59077,25 +72321,34 @@
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,
/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
},
/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland/town)
+<<<<<<< Updated upstream
+=======
"sgz" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/landmark/start/f13/ncrlogisticsofficer,
-/turf/open/floor/wood_wide,
-/area/f13/ncr)
+/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"
@@ -59112,12 +72365,24 @@
},
/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"
+ },
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 1
+ },
+/turf/open/floor/wood_common,
+/area/f13/wasteland)
"shf" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/f13/cash_random_low,
@@ -59129,6 +72394,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,
@@ -59149,6 +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
@@ -59173,9 +72459,18 @@
},
/area/f13/wasteland)
"shL" = (
-/obj/structure/sign/poster/ncr/keep_to_myself,
-/turf/closed/wall/f13/ruins,
-/area/f13/ambientlighting/building/h)
+<<<<<<< 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
@@ -59186,11 +72481,23 @@
},
/area/f13/wasteland)
"shY" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 5
+<<<<<<< Updated upstream
+/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)
+=======
+/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";
@@ -59209,15 +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{
- dir = 2;
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";
@@ -59275,6 +72588,7 @@
icon_state = "horizontaltopborderbottom0"
},
/area/f13/ambientlighting/building/w)
+<<<<<<< Updated upstream
"sjl" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
@@ -59284,23 +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/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"
+/obj/effect/decal/remains{
+ icon_state = "remains"
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/sewer/powered)
+>>>>>>> Stashed changes
"sjt" = (
/obj/effect/overlay/fog,
/turf/open/indestructible/ground/outside/water,
@@ -59326,6 +72638,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)
@@ -59333,10 +72649,38 @@
/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" = (
-/obj/structure/junk/machinery,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+<<<<<<< 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,
/obj/structure/barricade/bars,
@@ -59348,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{
@@ -59362,11 +72714,21 @@
/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"
+<<<<<<< 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
},
-/area/f13/ambientlighting/building/h)
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"slf" = (
/obj/machinery/light/fo13colored/Aqua{
desc = "A lighting fixture with cold blue lighting.";
@@ -59392,6 +72754,36 @@
"slp" = (
/turf/open/floor/plating/f13/inside/gravel,
/area/f13/building/abandoned/x)
+<<<<<<< Updated upstream
+"slq" = (
+/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,
+=======
+"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,
/area/f13/ambientlighting/building/q)
@@ -59412,13 +72804,19 @@
},
/area/f13/wasteland)
"slD" = (
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -59462,7 +72860,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,
@@ -59488,6 +72888,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,
@@ -59511,6 +72919,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
@@ -59528,6 +72942,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"
@@ -59608,17 +73027,29 @@
},
/area/f13/ambientlighting/building/f)
"soo" = (
-/obj/structure/table/wood,
-/obj/item/binoculars{
- pixel_x = 2;
- pixel_y = 6
+<<<<<<< Updated upstream
+/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"
+ },
+=======
+/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{
icon_state = "grassa4"
@@ -59651,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{
@@ -59660,6 +73092,42 @@
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)
+=======
+"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{
@@ -59700,6 +73168,22 @@
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" = (
/obj/structure/fence/wooden{
pixel_x = -15
@@ -59713,6 +73197,14 @@
/obj/machinery/power/apc/fusebox/north,
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/m)
+"sqk" = (
+/obj/machinery/door/poddoor/shutters{
+ id = 982
+ },
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
+ },
+/area/f13/ncr)
"sqv" = (
/turf/closed/wall/f13/store,
/area/f13/wasteland)
@@ -59753,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" = (
-/obj/structure/closet/fridge/meat,
-/turf/open/floor/plasteel/f13/vault_floor/floor,
-/area/f13/ambientlighting/building/p)
+<<<<<<< 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";
@@ -59771,15 +73297,42 @@
icon_state = "floordirtysolid"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"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,
-/area/f13/ncr)
+/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,
/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)
+"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{
@@ -59798,17 +73351,25 @@
},
/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)
+<<<<<<< Updated upstream
+=======
"ssJ" = (
-/turf/open/floor/f13/wood{
- icon_state = "housewood4-broken"
- },
-/area/f13/ncr)
+/obj/effect/decal/cleanable/robot_debris,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"ssX" = (
/obj/structure/railing{
dir = 4
@@ -59826,6 +73387,15 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+"ste" = (
+/obj/effect/turf_decal/big{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
+ },
+/area/f13/ncr)
"stp" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -59868,11 +73438,21 @@
},
/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)
+<<<<<<< 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{
@@ -59913,20 +73493,28 @@
/turf/open/floor/f13/wood,
/area/f13/legioncamp)
"suy" = (
-/obj/structure/rack,
-/obj/item/clothing/mask/balaclava,
+<<<<<<< Updated upstream
+/obj/structure/table/booth,
+/obj/item/trash/f13/electronic/toaster,
/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
-"suz" = (
-/obj/structure/barricade/wooden,
-/obj/structure/barricade/wooden/planks/pregame,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+=======
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/displaycase/trophy,
+/obj/item/toy/plush/beeplushie,
+/obj/structure/fluff/railing{
+ dir = 1
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/structure/fluff/railing,
+/turf/open/floor/carpet/arcade,
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/m)
+"suz" = (
+/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
@@ -59956,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,
@@ -59971,11 +73566,35 @@
/obj/effect/decal/cleanable/oil,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+"svx" = (
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
+ },
+/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)
+"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{
@@ -60027,18 +73646,16 @@
dir = 6
},
/area/f13/wasteland/town)
+<<<<<<< Updated upstream
+=======
"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
+/obj/item/mine/shrapnel,
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 4;
+ icon_state = "outermaincornerouter"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"sww" = (
/obj/structure/reagent_dispensers/barrel/four,
/turf/open/indestructible/ground/outside/grass,
@@ -60052,11 +73669,19 @@
/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)
+<<<<<<< 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
@@ -60103,7 +73728,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 +73799,16 @@
},
/turf/open/floor/plating/rust,
/area/f13/wasteland)
+"syx" = (
+/obj/machinery/button/door{
+ pixel_y = 28;
+ id = 983
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
"syC" = (
/obj/structure/fermenting_barrel,
/turf/open/indestructible/ground/outside/desert,
@@ -60195,6 +73829,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,
@@ -60249,6 +73891,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,
@@ -60299,6 +73948,22 @@
/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{
+ icon_state = "1-2"
+ },
+/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{
@@ -60323,23 +73988,27 @@
icon_state = "whitegreenrustychess"
},
/area/f13/ambientlighting/building/i)
+<<<<<<< Updated upstream
+=======
"sBd" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/mob/living/simple_animal/hostile/raider/ranged/boss,
-/turf/open/floor/f13{
- icon_state = "bluedirtychess2"
+/obj/effect/decal/cleanable/blood{
+ icon_state = "floor6"
},
+/turf/open/floor/plating/rust,
/area/f13/ambientlighting/building/j)
-"sBk" = (
-/obj/structure/flora/grass/brown,
-/obj/structure/flora/grass/brown{
- pixel_x = 9;
- pixel_y = 11
+"sBf" = (
+/obj/structure/window/fulltile/ruins{
+ icon_state = "ruinswindowdestroyed"
},
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/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
@@ -60394,6 +74063,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,
@@ -60404,6 +74079,26 @@
},
/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/structure/cable/outdoors{
+ icon_state = "1-2"
+ },
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"sCw" = (
/obj/structure/chair/wood/wings{
dir = 4
@@ -60437,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,
@@ -60493,16 +74204,19 @@
icon_state = "horizontalbottombordertop3"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"sDy" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 10
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 1
},
-/obj/item/trash/f13/steak{
- pixel_x = -6;
- pixel_y = 5
+/obj/structure/chair/booth{
+ dir = 1
},
-/turf/open/indestructible/ground/outside/graveldirt,
+/turf/open/floor/plasteel/bar,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"sDB" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/effect/turf_decal/weather/dirt{
@@ -60527,6 +74241,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/closed/wall/mineral/brick,
+/area/f13/ncr)
"sEr" = (
/obj/structure/bed/old,
/obj/effect/decal/cleanable/dirt/dust,
@@ -60535,22 +74258,33 @@
},
/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)
+/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/structure/flora/bush,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/obj/effect/decal/cleanable/dirt,
+/obj/item/broom,
+/turf/open/indestructible/ground/outside/ruins,
+/area/f13/ambientlighting/building/j)
"sEI" = (
-/obj/structure/flora/tree/cactus,
-/turf/open/indestructible/ground/outside/dirt{
- dir = 10;
- icon_state = "dirt"
+/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{
@@ -60561,18 +74295,29 @@
/obj/effect/mapping_helpers/network_builder/power_cable/auto,
/turf/open/floor/carpet/green,
/area/maintenance/bar)
+<<<<<<< Updated upstream
+=======
"sEN" = (
-/obj/structure/easel,
-/obj/machinery/light/small{
- dir = 8;
- light_color = "#ff4747"
+/obj/effect/turf_decal/big{
+ dir = 4
+ },
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
},
-/turf/open/floor/wood_common/wood_common_dark,
/area/f13/ncr)
+>>>>>>> Stashed changes
"sEU" = (
/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,
@@ -60585,19 +74330,24 @@
icon_state = "horizontalbottomborderbottom0"
},
/area/f13/wasteland)
-"sFi" = (
-/obj/structure/toilet{
- dir = 4
+<<<<<<< Updated upstream
+"sFe" = (
+/obj/effect/turf_decal/big{
+ dir = 8
},
-/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/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/vomit/old,
-/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess,
+/turf/open/indestructible/ground/outside/road{
+ 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{
@@ -60611,16 +74361,35 @@
},
/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,
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
/turf/open/floor/f13/wood,
/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" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -60637,12 +74406,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,
@@ -60685,7 +74456,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{
@@ -60704,6 +74477,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;
@@ -60742,8 +74523,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,
@@ -60761,15 +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" = (
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+<<<<<<< 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
@@ -60812,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"
@@ -60829,9 +74649,18 @@
/turf/open/indestructible/ground/outside/water/running,
/area/f13/wasteland)
"sJu" = (
-/obj/structure/barricade/wooden/strong,
-/turf/closed/wall/f13/wood,
-/area/f13/ncr)
+<<<<<<< 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,
@@ -60849,14 +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/item/paper/crumpled/bloody/ruins{
- name = "treasure map";
- pixel_y = -11;
- pixel_x = -19
+/obj/effect/decal/remains/human,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain2"
},
-/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"sJK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old{
@@ -60864,6 +74699,15 @@
},
/turf/open/floor/plating/rust,
/area/f13/building/powered)
+"sJO" = (
+/obj/structure/curtain{
+ color = "#363636"
+ },
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
"sJV" = (
/obj/structure/barricade/sandbags,
/turf/open/indestructible/ground/outside/road,
@@ -60877,18 +74721,26 @@
},
/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"
},
/area/f13/followers)
+<<<<<<< Updated upstream
+=======
"sKv" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/cleanable/oil/slippery,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain2right"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/closed/wall/mineral/concrete,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"sKA" = (
/obj/structure/fence,
/turf/open/indestructible/ground/outside/dirt{
@@ -60938,11 +74790,15 @@
/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)
+<<<<<<< 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,
/turf/open/indestructible/ground/outside/desert,
@@ -60971,6 +74827,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
@@ -60990,6 +74851,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;
@@ -61068,6 +74935,10 @@
icon_state = "darkrusty"
},
/area/f13/building/abandoned/h)
+"sMT" = (
+/obj/structure/sign/poster/ncr/democracy,
+/turf/closed/wall/mineral/brick,
+/area/f13/ncr)
"sNd" = (
/obj/structure/decoration/hatch{
desc = "A faded inscription reads: Manufactured in Queens, NY, 2062.";
@@ -61079,19 +74950,36 @@
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/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)
+<<<<<<< Updated upstream
+=======
"sNv" = (
-/obj/structure/flora/timber{
- pixel_x = 10
- },
-/obj/structure/flora/stump,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/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,
@@ -61103,6 +74991,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
@@ -61142,6 +75038,16 @@
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,
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 1
+ },
+/turf/open/floor/wood_common,
+/area/f13/wasteland)
"sOC" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small{
@@ -61151,11 +75057,24 @@
icon_state = "yellowrustyfull"
},
/area/f13/ambientlighting/building/f)
+<<<<<<< Updated upstream
+"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"
+/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"
},
-/turf/open/floor/plasteel/f13/vault_floor/yellow,
+>>>>>>> Stashed changes
/area/f13/ambientlighting/building/j)
"sPe" = (
/obj/effect/decal/cleanable/blood{
@@ -61192,16 +75111,26 @@
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{
- color = "000000"
+<<<<<<< Updated upstream
+/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"
+=======
+/obj/structure/nest/ghoul,
+/turf/open/indestructible/ground/outside/desert{
+ icon_state = "wasteland33"
+>>>>>>> Stashed changes
},
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
"sPT" = (
/obj/structure/reagent_dispensers/barrel/dangerous,
/turf/open/indestructible/ground/outside/dirt,
@@ -61223,6 +75152,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,
@@ -61260,19 +75194,28 @@
dir = 10
},
/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/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"
+<<<<<<< Updated upstream
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 8
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/turf/open/floor/wood_common,
+=======
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/area/f13/ambientlighting/building/j)
+/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{
icon_state = "gibbearcore"
@@ -61284,20 +75227,15 @@
name = "dirty floor"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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
+/obj/structure/barricade/wooden,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright1"
},
-/turf/open/indestructible/ground/outside/snow,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"sQV" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/f13/armor/costumes,
@@ -61313,6 +75251,15 @@
},
/turf/open/floor/f13,
/area/f13/ambientlighting/building/o)
+<<<<<<< Updated upstream
+"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
@@ -61323,20 +75270,28 @@
icon_state = "dirtcorner"
},
/area/f13/wasteland)
-"sRm" = (
-/obj/effect/decal/fakelattice,
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
+=======
+"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,
/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{
@@ -61381,18 +75336,50 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/building/abandoned/g)
+<<<<<<< Updated upstream
+"sRT" = (
+/obj/structure/campfire,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
+ },
+/area/f13/wasteland)
+"sRW" = (
+/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)
"sSb" = (
-/obj/effect/decal/cleanable/dirt{
- color = "#363636"
+/obj/structure/barricade/wooden/strong,
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 1;
+ icon_state = "outerturn"
},
-/obj/structure/fluff/railing{
- dir = 10
+/area/f13/wasteland)
+"sSf" = (
+/obj/machinery/atmospherics/components/unary/tank/toxins,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/wasteland)
+=======
+"sRP" = (
+/obj/structure/cable/outdoors{
+ icon_state = "2-8"
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/turf/open/floor/plating/dirt,
-/area/f13/ambientlighting/building/j)
+/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,
@@ -61486,25 +75473,20 @@
},
/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
+<<<<<<< Updated upstream
+/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)
+=======
+/obj/structure/flora/grass/coyote/twentyseven,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"sTS" = (
/obj/structure/railing{
color = "#A47449";
@@ -61533,19 +75515,38 @@
},
/turf/open/floor/plating/f13/inside/gravel,
/area/f13/building/abandoned/x)
+<<<<<<< Updated upstream
+"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"
+ },
+=======
+"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" = (
-/obj/effect/decal/cleanable/glass,
-/obj/item/shard,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 1;
+ icon_state = "outermaincornerouter"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"sUF" = (
/obj/effect/mapping_helpers/network_builder/power_cable/auto,
/turf/open/floor/f13{
@@ -61574,10 +75575,36 @@
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)
+"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{
@@ -61636,14 +75663,25 @@
icon_state = "horizontalinnermain0"
},
/area/f13/wasteland)
-"sWE" = (
-/turf/open/floor/plasteel/elevatorshaft,
-/area/f13/ambientlighting/building/g)
+<<<<<<< Updated upstream
"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,
+=======
+"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"
@@ -61726,6 +75764,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
@@ -61753,13 +75797,13 @@
icon_state = "dirt"
},
/area/f13/wasteland/legion)
+<<<<<<< Updated upstream
+=======
"sXY" = (
-/obj/item/storage/bag/plants{
- pixel_y = 6;
- pixel_x = 3
- },
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+/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{
@@ -61836,6 +75880,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/ncr)
"sYX" = (
/obj/machinery/shower{
dir = 4
@@ -61880,10 +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/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood_wide,
-/area/f13/ncr)
+/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{
@@ -61978,6 +76050,18 @@
"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"
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain2left"
+ },
+/area/f13/wasteland)
"tbg" = (
/obj/machinery/light/small{
dir = 1
@@ -61985,11 +76069,18 @@
/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)
+<<<<<<< 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
@@ -62032,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{
@@ -62045,7 +76143,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{
@@ -62060,6 +76160,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{
@@ -62087,7 +76201,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{
@@ -62170,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{
@@ -62177,9 +76311,27 @@
},
/area/f13/ambientlighting/building/e)
"tdR" = (
-/obj/structure/sign/plaques/kiddie/library,
-/turf/closed/wall/f13/wood/house,
-/area/f13/ambientlighting/building/h)
+<<<<<<< Updated upstream
+/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)
+=======
+/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"
@@ -62219,11 +76371,14 @@
icon_state = "darkrusty"
},
/area/f13/building/abandoned/h)
+<<<<<<< Updated upstream
+=======
"teQ" = (
-/obj/structure/junk/small/bed,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/royalblack,
-/area/f13/ambientlighting/building/g)
+/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
@@ -62238,13 +76393,20 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/f13/wood,
/area/f13/building/abandoned/j)
+<<<<<<< Updated upstream
+=======
"tfe" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 8
+/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"
},
-/obj/effect/turf_decal/weather/snow/corner,
-/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"tff" = (
/obj/structure/flora/grass/wasteland{
icon_state = "tall_grass_2";
@@ -62275,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
@@ -62345,17 +76513,32 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"tgI" = (
-/obj/structure/flora/grass/both{
- icon_state = "snowgrass_esw"
+<<<<<<< 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
},
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow3"
+/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,
/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,
@@ -62395,11 +76578,17 @@
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
},
-/obj/effect/spawner/lootdrop/trash,
/turf/open/indestructible/ground/outside/sidewalk{
dir = 1;
icon_state = "horizontaloutermain1"
@@ -62412,12 +76601,25 @@
},
/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{
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{
@@ -62459,18 +76661,28 @@
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,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
-"tjb" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/mob/living/simple_animal/hostile/raider/sulphite{
- faction = list("raider")
+"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" = (
@@ -62499,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,
@@ -62627,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{
@@ -62634,17 +76868,27 @@
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,
-/area/f13/ncr)
+<<<<<<< Updated upstream
+"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,
/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" = (
@@ -62653,17 +76897,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"
@@ -62691,20 +76932,32 @@
"tlA" = (
/turf/open/indestructible/ground/outside/ruins,
/area/f13/wasteland)
+"tlK" = (
+/obj/effect/decal/cleanable/generic,
+/obj/item/storage/trash_stack{
+ pixel_y = 17
+ },
+/turf/open/floor/wood_common,
+/area/f13/ambientlighting/building/m)
"tlP" = (
-/obj/structure/bed/mattress{
- pixel_x = 7;
- pixel_y = 12
+<<<<<<< Updated upstream
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
},
-/obj/item/bedsheet/blanket{
- pixel_y = 13;
- pixel_x = 6
+/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"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 8;
+ icon_state = "dirtcorner"
},
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"tlW" = (
/obj/structure/fence/corner/wooden,
/obj/effect/turf_decal/weather/dirt{
@@ -62726,10 +76979,19 @@
/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,
+<<<<<<< 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,
@@ -62834,6 +77096,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{
@@ -62887,17 +77157,21 @@
"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,
-/obj/structure/barricade/wooden,
-/obj/structure/barricade/wooden/planks/pregame,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/plating/rust,
+<<<<<<< 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
@@ -62945,40 +77219,38 @@
/obj/structure/table,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/ambientlighting/building/t)
+<<<<<<< Updated upstream
+=======
"tpA" = (
-/obj/structure/dresser,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/purple,
-/area/f13/ambientlighting/building/g)
+/obj/structure/table/wood/junk,
+/turf/open/floor/f13/wood,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"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)
+<<<<<<< Updated upstream
+=======
"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,
+/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";
@@ -63003,40 +77275,58 @@
/area/f13/bar)
"tqr" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/f13/vault_floor/floor,
-/area/f13/ambientlighting/building/p)
+<<<<<<< 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/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)
+<<<<<<< Updated upstream
+"tqM" = (
+/obj/structure/chair/wood{
+=======
"tqF" = (
-/obj/structure/punching_bag,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood_wide,
-/area/f13/ncr)
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/turf/open/floor/wood_common,
+/area/f13/ambientlighting/building/m)
"tqM" = (
-/mob/living/simple_animal/hostile/stalker,
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
+/turf/open/floor/wood_worn,
+/area/f13/ambientlighting/building/m)
+"tqP" = (
+/obj/effect/overlay/desert_side{
+>>>>>>> Stashed changes
+ 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"
+/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)
+<<<<<<< Updated upstream
+"tra" = (
+/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
"trd" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -63050,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;
@@ -63097,13 +77415,16 @@
icon_state = "verticalrightborderright3"
},
/area/f13/ambientlighting/building/y)
+<<<<<<< Updated upstream
+"tse" = (
+/obj/structure/bed/mattress,
+/turf/open/indestructible/ground/inside/mountain,
+=======
"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)
+/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,
/obj/effect/decal/cleanable/greenglow{
@@ -63124,31 +77445,44 @@
/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,
/obj/effect/spawner/lootdrop/toolsbasic,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
-"tts" = (
-/obj/structure/chair/folding{
- dir = 4
- },
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
+=======
+/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/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/road{
+ icon_state = "horizontalbottombordertop3"
},
-/turf/open/indestructible/ground/outside/graveldirt,
/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,
@@ -63163,6 +77497,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{
@@ -63194,9 +77534,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,
@@ -63244,6 +77585,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,
@@ -63274,6 +77625,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,
@@ -63313,7 +77670,8 @@
/area/f13/followers)
"txc" = (
/obj/effect/turf_decal/siding/wood{
- dir = 1
+ dir = 1;
+ layer = 1000
},
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -63392,10 +77750,23 @@
/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)
+<<<<<<< Updated upstream
+/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,
+=======
+/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,
/obj/structure/sign/poster/official/safety_eye_protection{
@@ -63408,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,
@@ -63425,6 +77802,24 @@
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
+ },
+/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/ncr)
"tyU" = (
/obj/structure/table/reinforced{
color = "#c1b6a5"
@@ -63469,13 +77864,21 @@
"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/structure/cable/outdoors{
+ icon_state = "1-2"
+ },
+/turf/open/floor/wood_common/wood_common_light,
+/area/f13/ncr)
"tzB" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt,
@@ -63490,22 +77893,30 @@
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)
+<<<<<<< Updated upstream
+=======
"tzN" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 5
- },
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 10
+/obj/structure/fence/corner{
+ dir = 4
},
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/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,
@@ -63522,16 +77933,18 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/building/abandoned/g)
+<<<<<<< Updated upstream
+=======
"tAd" = (
-/obj/structure/toilet{
- dir = 4
- },
-/obj/structure/window/reinforced/spawner/north,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/table/booth,
+/obj/item/paper_bin,
+/obj/item/pen{
+ pixel_x = 5;
+ pixel_y = 4
},
-/turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess,
-/area/f13/ambientlighting/building/j)
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"tAs" = (
/turf/open/indestructible/ground/outside/road{
icon_state = "innermaincornerouter"
@@ -63585,15 +77998,17 @@
},
/area/f13/building/powered)
"tBb" = (
+<<<<<<< Updated upstream
/obj/structure/fence{
- dir = 8;
- icon_state = "straight"
+ 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{
@@ -63643,6 +78058,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{
@@ -63654,22 +78078,29 @@
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/structure/rack,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/lootdrop/f13/junkspawners,
+/obj/machinery/light/small{
+ dir = 1
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/ambientlighting/building/m)
"tCm" = (
-/obj/structure/toilet{
- dir = 1
- },
-/turf/open/indestructible/ground/outside/dirt,
-/area/f13/wasteland)
+/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,
/turf/closed/wall/f13/wood/house,
@@ -63702,6 +78133,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
@@ -63713,24 +78150,16 @@
/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
+<<<<<<< Updated upstream
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
},
/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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,
@@ -63742,7 +78171,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,
@@ -63760,23 +78191,35 @@
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/p)
"tDB" = (
-/obj/structure/chair,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< 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/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/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/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)
+/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)
@@ -63819,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{
@@ -63842,11 +78292,15 @@
},
/area/maintenance/bar)
"tEu" = (
-/obj/structure/table/booth,
-/turf/open/floor/f13/wood{
- icon_state = "housewood1-broken"
- },
-/area/f13/ambientlighting/building/p)
+<<<<<<< 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{
@@ -63913,14 +78367,18 @@
/turf/open/floor/wood_common,
/area/maintenance/bar)
"tFr" = (
-/obj/effect/decal/fakelattice,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -63949,6 +78407,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{
@@ -63978,20 +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/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)
+/obj/structure/closet/locker,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
"tGE" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+/turf/closed/wall/f13/wood/interior,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"tGT" = (
/mob/living/simple_animal/cow/brahmin,
/turf/open/indestructible/ground/outside/grass,
@@ -64005,11 +78463,16 @@
},
/turf/open/floor/plasteel/f13/stone/rugged,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"tHr" = (
-/obj/structure/bed/old,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/red,
-/area/f13/ambientlighting/building/g)
+/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,
@@ -64037,12 +78500,35 @@
icon_state = "horizontalinnermain2left"
},
/area/f13/wasteland/town)
+<<<<<<< Updated upstream
"tHX" = (
-/obj/structure/flora/tree/cactus,
-/turf/open/indestructible/ground/outside/desert{
- icon_state = "wasteland33"
+/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
},
-/area/f13/wasteland)
+/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
@@ -64050,15 +78536,20 @@
/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,
+<<<<<<< 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,
@@ -64071,6 +78562,7 @@
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"tIu" = (
+<<<<<<< Updated upstream
/obj/effect/decal/cleanable/dirt{
color = "000000"
},
@@ -64078,14 +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" = (
-/obj/structure/girder/reinforced,
+<<<<<<< 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{
@@ -64107,30 +78619,30 @@
/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
},
/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,
/obj/effect/spawner/lootdrop/clothing_low,
/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier1,
/obj/effect/decal/cleanable/dirt{
@@ -64139,6 +78651,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{
@@ -64155,36 +78672,52 @@
icon_state = "bluedirtychess2"
},
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+=======
"tJZ" = (
-/obj/structure/guncase{
- anchored = 1
+/obj/structure/sign/legion/mines{
+ pixel_y = 51;
+ layer = 100
},
-/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)
+/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{
icon_state = "housewood2"
},
/area/f13/building/abandoned/t)
-"tKC" = (
-/obj/structure/window/reinforced/spawner,
-/obj/structure/rack,
-/obj/item/storage/toolbox/electrical,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+"tKw" = (
+/obj/structure/chair/wood{
+ pixel_x = 2;
+ pixel_y = 3
},
-/obj/effect/landmark/questing/item{
- location_description = "in that mall south of the khans."
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain0"
},
-/turf/open/floor/plasteel/f13/vault_floor/red/side{
- dir = 6
+/area/f13/wasteland)
+"tKC" = (
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/item/trash/candy,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticaloutermain2"
+ },
+>>>>>>> Stashed changes
+/area/f13/wasteland)
"tKI" = (
/obj/machinery/light{
dir = 4
@@ -64193,6 +78726,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,
@@ -64221,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{
@@ -64247,14 +78796,18 @@
icon_state = "whitegreenrustychess"
},
/area/f13/ambientlighting/building/i)
+<<<<<<< Updated upstream
+=======
"tMB" = (
-/obj/structure/table/wood,
-/obj/item/documents{
- desc = "Documents and maps concerning the local NCR presence.";
- pixel_y = 4
+/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/outside/sidewalk,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"tME" = (
/obj/structure/flora/tree/oak_five,
/turf/open/indestructible/ground/inside/dirt,
@@ -64296,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"
@@ -64311,7 +78869,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 +78918,23 @@
},
/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"
+<<<<<<< Updated upstream
+"tOr" = (
+/obj/structure/punching_bag,
+/obj/structure/railing{
+ dir = 4;
+ layer = 4.1
},
-/turf/open/floor/f13{
- icon_state = "bar"
+/turf/open/indestructible/ground/outside/sidewalk,
+=======
+"tOp" = (
+/obj/item/storage/money_stack/ncr{
+ pixel_x = 5
},
-/area/f13/ambientlighting/building/g)
+/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,
/obj/effect/landmark/start/f13/great_khan,
@@ -64378,12 +78943,18 @@
},
/area/f13/ambientlighting/building/b)
"tOD" = (
-/obj/effect/decal/cleanable/oil{
- icon_state = "floor5";
- pixel_x = -19
+<<<<<<< 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/sidewalk,
-/area/f13/wasteland)
+/turf/open/indestructible/ground/outside/ruins,
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"tOF" = (
/turf/open/indestructible/ground/outside/dirt{
dir = 4;
@@ -64396,10 +78967,13 @@
icon_state = "verticalleftborderleft0"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"tOK" = (
-/obj/structure/sign/warning/electricshock,
-/turf/closed/wall/f13/wood/house,
-/area/f13/ncr)
+/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,
@@ -64435,6 +79009,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,
@@ -64460,7 +79043,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{
@@ -64494,6 +79079,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;
@@ -64508,10 +79099,22 @@
/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"
+ },
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain2bottom"
+ },
+/area/f13/wasteland)
"tQI" = (
/obj/effect/overlay/desert/sonora/edge{
dir = 4
@@ -64521,18 +79124,18 @@
},
/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)
+<<<<<<< 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" = (
@@ -64555,6 +79158,11 @@
},
/turf/open/indestructible/ground/outside/water,
/area/f13/wasteland)
+"tQX" = (
+/obj/effect/decal/cleanable/shreds,
+/obj/machinery/power/floodlight,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
"tQY" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -64635,7 +79243,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
@@ -64680,6 +79287,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/ncr)
"tSk" = (
/obj/machinery/light{
dir = 1;
@@ -64703,15 +79316,15 @@
/obj/structure/debris/v2,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland/town)
+<<<<<<< Updated upstream
+=======
"tSv" = (
-/obj/structure/simple_door,
-/obj/structure/barricade/wooden/strong,
-/obj/structure/barricade/wooden/planks,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/chair/office{
+ pixel_y = 24
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/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,
@@ -64729,7 +79342,6 @@
dir = 2
},
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -64745,15 +79357,12 @@
/obj/structure/table,
/turf/open/floor/plating/rust,
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"tSO" = (
-/obj/structure/table_frame,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/f13{
- icon_state = "bluerustysolid"
- },
-/area/f13/ambientlighting/building/j)
+/turf/closed/wall/f13/tentwall,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"tST" = (
/obj/structure/table,
/obj/item/book/granter/trait/techno,
@@ -64761,10 +79370,20 @@
icon_state = "horizontalbottombordertop2"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"tTi" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/red,
-/area/f13/ncr)
+/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
@@ -64777,13 +79396,15 @@
},
/area/f13/wasteland)
"tTv" = (
-/obj/structure/table,
+<<<<<<< Updated upstream
/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)
+/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{
dir = 4
@@ -64823,6 +79444,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,
@@ -64832,11 +79459,19 @@
/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,
-/area/f13/caves)
+<<<<<<< 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
@@ -64854,15 +79489,13 @@
icon_state = "verticalinnermain0"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -64870,6 +79503,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{
@@ -64894,14 +79533,19 @@
},
/area/f13/ambientlighting/building/o)
"tUK" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -64922,9 +79566,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,
@@ -64934,23 +79581,21 @@
},
/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"
+<<<<<<< Updated upstream
+/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/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
@@ -65008,7 +79653,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
},
@@ -65017,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
@@ -65055,6 +79722,35 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+"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)
+=======
+"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,
@@ -65067,6 +79763,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/ncr)
"tXZ" = (
/obj/structure/fence/wooden,
/turf/open/indestructible/ground/outside/dirt{
@@ -65074,22 +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" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/obj/machinery/light{
- dir = 4
- },
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+<<<<<<< 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{
@@ -65138,18 +79846,27 @@
icon_state = "horizontaltopbordertop2"
},
/area/f13/wasteland)
+"tZw" = (
+/obj/structure/railing/wood/underlayer,
+/turf/closed/wall/f13/wood/interior,
+/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/item/storage/trash_stack,
-/obj/structure/flora/grass/brown{
- pixel_x = 9;
- pixel_y = 11
+/obj/structure/wreck/trash/secway,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/turf/open/indestructible/ground/outside/snow,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"tZA" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/ammo/civilian,
@@ -65175,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{
@@ -65199,6 +79926,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;
@@ -65206,6 +79938,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
@@ -65224,22 +79960,23 @@
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)
+<<<<<<< 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,
@@ -65286,11 +80023,16 @@
/obj/item/storage/trash_stack,
/turf/open/indestructible/ground/outside/grass,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"ucp" = (
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/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"
},
-/area/f13/ambientlighting/building/g)
+/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{
@@ -65345,13 +80087,24 @@
},
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/b)
+<<<<<<< Updated upstream
"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)
+=======
+"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,
/obj/effect/spawner/lootdrop/f13/armor/tier2,
@@ -65374,22 +80127,30 @@
/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"
+<<<<<<< Updated upstream
+/obj/structure/railing/wood/post{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = -16
},
-/area/f13/ncr)
-"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"
+/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"
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/area/f13/wasteland)
+"udB" = (
+/obj/machinery/light/fo13colored/Red{
+ dir = 1;
+ pixel_x = -16
},
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"udH" = (
/obj/structure/fence{
dir = 4
@@ -65433,12 +80194,17 @@
},
/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)
+<<<<<<< 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"
@@ -65497,9 +80263,25 @@
},
/area/f13/wasteland)
"ueJ" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
+<<<<<<< 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,
@@ -65533,18 +80315,36 @@
"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,
/area/f13/wasteland)
+<<<<<<< Updated upstream
"ufz" = (
-/obj/effect/spawner/lootdrop/trash,
-/obj/effect/decal/cleanable/dirt{
- color = "#363636"
+/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
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/k)
+/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,
@@ -65562,18 +80362,32 @@
},
/area/f13/wasteland)
"ufJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood{
- plane = -14;
- layer = 3.7;
- icon_state = "drip4"
+<<<<<<< Updated upstream
+/obj/structure/closet/crate/large,
+/obj/structure/closet/crate/large{
+ layer = 5;
+ pixel_y = 18
},
-/obj/effect/decal/cleanable/blood{
- dir = 6;
- icon_state = "tracks"
+/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,
+=======
+/obj/structure/cable/outdoors{
+ icon_state = "1-8"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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{
dir = 4;
@@ -65598,19 +80412,18 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/carpet/purple,
/area/f13/bar)
+<<<<<<< Updated upstream
+=======
"ufV" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 10
- },
-/turf/open/floor/plating/dirt,
-/area/f13/wasteland)
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/trash_stack,
+/turf/open/floor/plasteel/bar,
+/area/f13/ambientlighting/building/m)
"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)
+/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
@@ -65672,11 +80485,18 @@
icon_state = "verticalinnermain2bottom"
},
/area/f13/ambientlighting/building/b)
+<<<<<<< Updated upstream
+=======
"ugZ" = (
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1-broken"
+/obj/structure/fluff/rug/rug_rubber{
+ pixel_y = 15
},
-/area/f13/wasteland)
+/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,
@@ -65691,20 +80511,15 @@
icon_state = "yellowrustychess"
},
/area/f13/ambientlighting/building/f)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/item/card/id/rusted/brokenholodog/enclave,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/sewer/powered)
+>>>>>>> Stashed changes
"uhi" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
@@ -65744,6 +80559,10 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+"uhs" = (
+/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
@@ -65758,10 +80577,34 @@
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,
/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
@@ -65824,6 +80667,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{
@@ -65879,13 +80729,21 @@
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{
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,
@@ -65950,19 +80808,13 @@
/obj/item/storage/trash_stack,
/turf/open/floor/f13/wood,
/area/f13/building/abandoned/a)
+<<<<<<< Updated upstream
+=======
"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)
+/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"
@@ -66010,15 +80862,29 @@
/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{
icon_state = "common-broken3"
},
/area/f13/ambientlighting/building/p)
+"umk" = (
+/obj/structure/flora/branch_broken,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"umv" = (
/turf/open/indestructible/ground/outside/gravel/path_desert{
dir = 1;
@@ -66032,16 +80898,19 @@
icon_state = "bluedirtychess2"
},
/area/f13/followers)
-"umH" = (
-/obj/structure/simple_door/metal/fence/wooden,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/ncr)
+<<<<<<< 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{
@@ -66056,17 +80925,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{
@@ -66099,15 +80962,34 @@
name = "dirty floor"
},
/area/f13/building/powered)
-"unx" = (
-/obj/structure/simple_door/bunker/glass,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+<<<<<<< Updated upstream
+"unz" = (
+/obj/effect/spawner/lootdrop/f13/junkspawners,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontalbottomborderbottom3"
},
-/area/f13/ambientlighting/building/g)
+/area/f13/wasteland)
+"unA" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/structure/reagent_dispensers/foamtank,
+/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/mineral/concrete/ten,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
+=======
+"unx" = (
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"unT" = (
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow4"
+/obj/structure/table/wood/junk,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain0"
+>>>>>>> Stashed changes
},
/area/f13/wasteland)
"unU" = (
@@ -66120,6 +81002,13 @@
icon_state = "dirt"
},
/area/f13/building/abandoned/g)
+"uof" = (
+/obj/machinery/door/unpowered/secure_NCR,
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
"uoq" = (
/obj/structure/decoration/hatch{
dir = 8
@@ -66128,6 +81017,13 @@
icon_state = "horizontalinnermain2"
},
/area/f13/wasteland)
+"uou" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/lootdrop/wastelootgood,
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
+ },
+/area/f13/ambientlighting/building/m)
"uow" = (
/obj/effect/turf_decal/weather/dirt,
/turf/open/indestructible/ground/inside/dirt,
@@ -66168,6 +81064,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)
@@ -66201,14 +81106,33 @@
},
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/b)
-"ups" = (
-/obj/structure/simple_door/metal/store{
- icon_state = "brokenstore"
+<<<<<<< Updated upstream
+"upA" = (
+/obj/structure/car/rubbish4{
+ pixel_y = -9;
+ icon_state = "debris2"
},
-/turf/open/floor/f13{
- icon_state = "bluerustysolid"
+/obj/effect/decal/fakelattice,
+/turf/open/indestructible/ground/outside/ruins,
+/area/f13/ambientlighting/building/j)
+"upH" = (
+/obj/structure/cable/outdoors{
+ icon_state = "2-4"
},
-/area/f13/ambientlighting/building/g)
+/obj/structure/extinguisher_cabinet{
+ 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,
/obj/structure/decoration/rag,
@@ -66265,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"
@@ -66280,6 +81208,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"
@@ -66300,6 +81236,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,
@@ -66337,12 +81277,19 @@
},
/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)
+<<<<<<< Updated upstream
+"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)
+=======
+>>>>>>> Stashed changes
"usB" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
@@ -66427,10 +81374,18 @@
},
/obj/structure/barricade/wooden/strong,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
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{
@@ -66451,7 +81406,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,
@@ -66472,25 +81429,34 @@
/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
+<<<<<<< Updated upstream
+"uuR" = (
+/obj/effect/decal/marking{
+ icon_state = "dottedverticaldegraded"
},
-/obj/item/reagent_containers/glass/bucket/wood{
- pixel_x = -8;
- pixel_y = 3
+/obj/structure/car/rubbish3{
+ icon_state = "car_rubish2"
},
-/obj/item/reagent_containers/glass/bucket/wood{
- pixel_x = 5;
- pixel_y = 10
+/obj/structure/cable/outdoors{
+ icon_state = "2-8"
},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain1"
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/ncr)
+/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{
@@ -66498,25 +81464,26 @@
},
/area/f13/wasteland)
"uvn" = (
-/mob/living/simple_animal/hostile/handy/protectron,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 6
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/turf/open/indestructible/ground/outside/sidewalk,
+=======
+/obj/effect/turf_decal/weather/dirt{
+ dir = 4
},
-/area/f13/ambientlighting/building/j)
-"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/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+>>>>>>> Stashed changes
+/area/f13/wasteland)
+"uvq" = (
+/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,
@@ -66543,13 +81510,26 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"uvL" = (
-/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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"
+ },
+/area/f13/wasteland)
"uvN" = (
/obj/effect/landmark/start/f13/tribal_new,
/obj/structure/bed/mattress{
@@ -66586,12 +81566,17 @@
},
/area/f13/wasteland)
"uwq" = (
-/obj/structure/decoration/rag{
- icon_state = "skulls"
- },
-/obj/structure/barricade/wooden,
-/turf/open/indestructible/ground/outside/dirt,
+<<<<<<< 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,
@@ -66622,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{
@@ -66673,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,
@@ -66705,15 +81701,17 @@
/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"
+<<<<<<< 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
@@ -66724,12 +81722,16 @@
/obj/structure/chair/left,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/building/lower_firetower)
+<<<<<<< Updated upstream
+=======
"uyA" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken5"
+/obj/structure/window/fulltile/ruins{
+ icon_state = "ruinswindowbroken"
},
-/area/f13/ncr)
+/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
@@ -66763,22 +81765,44 @@
},
/area/f13/ambientlighting/building/y)
"uyU" = (
-/obj/effect/decal/cleanable/robot_debris,
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
-"uzc" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/obj/structure/rack/large/shelf_rust{
+ dir = 8
},
-/obj/machinery/button/door{
- id = "MallStorage";
- name = "Mall Storage shutters";
- pixel_y = 32
+/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{
+ name = "rusted floor"
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/area/f13/ncr)
+=======
+/obj/structure/barricade/wooden,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain1"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
+"uzc" = (
+/obj/structure/lamp_post/doubles{
+ dir = 4;
+ pixel_y = -25
+ },
+/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,
@@ -66811,20 +81835,18 @@
/obj/structure/wreck/trash/machinepiletwo,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"uzR" = (
-/obj/structure/filingcabinet{
- pixel_x = -12
- },
-/obj/structure/filingcabinet{
- pixel_x = -2
+/obj/structure/chair/stool{
+ dir = 4;
+ icon_state = "bench_center"
},
-/obj/item/kirbyplants{
- icon_state = "plant-22";
- pixel_x = 10;
- pixel_y = 1
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"uzY" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/overlay/junk/sink{
@@ -66835,16 +81857,19 @@
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"
+<<<<<<< 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,
@@ -66859,6 +81884,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
@@ -66878,17 +81908,37 @@
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)
+<<<<<<< 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,
@@ -66908,11 +81958,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"
@@ -66925,22 +81976,16 @@
/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)
+<<<<<<< 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,
@@ -66954,13 +81999,23 @@
/turf/open/floor/plating,
/area/f13/bar)
"uBI" = (
+<<<<<<< Updated upstream
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ambientlighting/building/j)
+"uBL" = (
+/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/weather/dirt{
- dir = 1
+ dir = 6
},
-/obj/structure/closet/crate/bin,
-/obj/effect/spawner/lootdrop/trash,
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/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{
dir = 8
@@ -66975,6 +82030,19 @@
icon_state = "floorrusty"
},
/area/f13/ambientlighting/building/f)
+"uCa" = (
+/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)
"uCe" = (
/obj/structure/simple_door/house,
/turf/open/floor/f13{
@@ -67034,6 +82102,14 @@
icon_state = "outerpavementcorner"
},
/area/f13/wasteland)
+"uCY" = (
+/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)
"uDb" = (
/obj/structure/chair/comfy{
dir = 1
@@ -67096,16 +82172,13 @@
color = "#9c9c9c"
},
/area/f13/building/abandoned/j)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -67118,10 +82191,18 @@
},
/turf/open/indestructible/ground/outside/dirt/harsh,
/area/f13/followers)
+<<<<<<< Updated upstream
+=======
"uEr" = (
-/obj/machinery/door/unpowered/secure_NCR,
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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
@@ -67157,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{
@@ -67248,15 +82338,14 @@
/obj/structure/flora/wasteplant/wild_broc,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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
@@ -67328,13 +82417,13 @@
icon_state = "horizontalinnermain1"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -67413,6 +82502,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
@@ -67444,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
@@ -67451,20 +82553,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13/wood,
/area/f13/legioncamp)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -67496,10 +82593,32 @@
/turf/open/indestructible/ground/outside/water,
/area/f13/wasteland)
"uJq" = (
-/turf/open/floor/plasteel/f13/vault_floor/floor{
- icon_state = "floordirty"
+<<<<<<< Updated upstream
+/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"
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ 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"
@@ -67508,15 +82627,22 @@
icon_state = "horizontalinnermain2"
},
/area/f13/wasteland)
+"uJz" = (
+/obj/structure/simple_door/interior,
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
+"uJH" = (
+/obj/structure/sign/warning/securearea,
+/turf/closed/wall/mineral/brick,
+/area/f13/wasteland)
"uJM" = (
/obj/structure/table/reinforced,
/obj/effect/spawner/lootdrop/f13/weapon/melee/tier3,
/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,
@@ -67529,32 +82655,40 @@
icon_state = "horizontalinnermain2"
},
/area/f13/building/powered)
+<<<<<<< Updated upstream
+=======
"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,
+/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/effect/turf_decal/weather/dirt,
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 4
+/obj/structure/cable/outdoors{
+ icon_state = "1-8"
},
-/turf/open/indestructible/ground/outside/graveldirt,
+/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" = (
-/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid,
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
+<<<<<<< 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"
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"uKE" = (
/obj/structure/fence{
dir = 8
@@ -67563,17 +82697,21 @@
/obj/structure/decoration/rag,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+"uKK" = (
+/obj/machinery/photocopier,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"uKS" = (
/obj/machinery/light/small,
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/z)
+<<<<<<< Updated upstream
+=======
"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)
+/obj/effect/turf_decal/caution,
+/turf/closed/wall/mineral/brick,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"uKY" = (
/obj/machinery/light/fo13colored/Red{
dir = 1
@@ -67588,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{
@@ -67596,17 +82740,17 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/k)
+<<<<<<< Updated upstream
+=======
"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
+/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{
@@ -67622,26 +82766,37 @@
/obj/structure/destructible/tribal_torch/wall/lit,
/turf/open/floor/wood_wide,
/area/f13/building/abandoned/g)
+<<<<<<< Updated upstream
+=======
"uLE" = (
-/obj/machinery/vending/cigarette{
- default_price = 0;
- extra_price = 0
- },
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/f13/wood{
+ icon_state = "housewood1-broken"
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/area/f13/ambientlighting/building/m)
+"uLH" = (
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/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
},
/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)
+"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
@@ -67695,6 +82850,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";
@@ -67715,18 +82879,30 @@
/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,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
+"uMS" = (
+/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,
/area/f13/building/abandoned/m)
+<<<<<<< Updated upstream
+=======
"uMY" = (
-/obj/structure/bed/mattress{
- icon_state = "mattress4";
- pixel_x = -1;
- pixel_y = -1
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "outermaincornerinner";
+ dir = 8
},
-/turf/open/floor/f13/wood,
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"uNd" = (
/obj/effect/overlay/desert/sonora/edge{
dir = 1
@@ -67753,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{
@@ -67782,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{
@@ -67838,10 +83027,22 @@
},
/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)
+<<<<<<< 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,
@@ -67887,7 +83088,6 @@
},
/obj/structure/decoration/rag,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -67939,6 +83139,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,
@@ -67950,16 +83155,17 @@
},
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/w)
+<<<<<<< Updated upstream
+=======
"uQv" = (
-/obj/structure/chair/wood{
- dir = 4
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/area/f13/ncr)
+>>>>>>> Stashed changes
"uQx" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -67968,24 +83174,27 @@
icon_state = "bluedirtychess2"
},
/area/f13/brotherhood)
+<<<<<<< Updated upstream
+=======
"uQB" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/obj/machinery/light/small{
- brightness = 7
+/obj/structure/cable/outdoors{
+ icon_state = "2-8"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/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;
@@ -67996,12 +83205,21 @@
},
/area/f13/brotherhood)
"uQU" = (
-/obj/machinery/light/small/broken{
- dir = 4
+<<<<<<< Updated upstream
+/obj/effect/turf_decal/vg_decals/numbers/two{
+ layer = 5
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/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
@@ -68009,15 +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{
- color = "000000"
- },
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
+/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"
@@ -68040,6 +83260,31 @@
/obj/structure/bed,
/turf/open/floor/wood_mosaic,
/area/f13/building/abandoned/x)
+<<<<<<< Updated upstream
+"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,
+/obj/effect/overlay/desert/sonora/edge{
+ 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,
/obj/effect/decal/cleanable/dirt,
@@ -68063,14 +83308,28 @@
/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"
+ },
+/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{
- pixel_x = -6
+/obj/structure/sign/poster/prewar/poster82,
+/turf/closed/wall/f13/store,
+/area/f13/ambientlighting/building/m)
+=======
+"uSv" = (
+/obj/item/blacksmith/chain{
+ pixel_x = -8
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"uSB" = (
/obj/structure/ladder/unbreakable{
height = 2;
@@ -68155,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{
@@ -68199,11 +83476,29 @@
/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"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -68242,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.";
@@ -68252,12 +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/dirt{
- dir = 1;
- icon_state = "dirt"
- },
-/area/f13/caves)
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"uUT" = (
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt/dust,
@@ -68277,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
@@ -68286,12 +83608,24 @@
},
/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)
"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"
@@ -68340,15 +83674,16 @@
},
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/c)
+<<<<<<< Updated upstream
+=======
"uWm" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/f13/wood{
- icon_state = "housewood4-broken"
+/obj/structure/car/rubbish4{
+ pixel_y = -9;
+ icon_state = "debris2"
},
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/ruins,
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"uWy" = (
/obj/effect/turf_decal/weather/dirt{
dir = 1
@@ -68362,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)
@@ -68376,9 +83724,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
},
@@ -68422,6 +83768,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,
@@ -68441,7 +83792,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,
@@ -68461,6 +83814,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{
@@ -68481,10 +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/shopping_cart,
-/turf/open/indestructible/ground/outside/dirt,
-/area/f13/wasteland)
+/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)
@@ -68518,6 +83891,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
@@ -68530,6 +83907,13 @@
icon_state = "floorrusty"
},
/area/f13/building/powered)
+"uYN" = (
+/obj/structure/table/booth,
+/obj/structure/decoration/clock{
+ pixel_x = 29
+ },
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"uYO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/cola/random,
@@ -68553,6 +83937,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
@@ -68582,7 +83970,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,52 +83991,61 @@
/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{
icon_state = "horizontaltopbordertop2"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"vaH" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
- },
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/obj/effect/decal/cleanable/generic,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
+>>>>>>> Stashed changes
"vaI" = (
/obj/structure/fence{
- dir = 1;
- icon_state = "straight"
+ dir = 1
},
/obj/structure/fence/corner,
/obj/item/flag/khan,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
-"vaL" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 10
+<<<<<<< Updated upstream
+"vaS" = (
+/obj/item/stack/sheet/mineral/wood,
+/obj/effect/decal/cleanable/blood{
+ dir = 5;
+ icon_state = "tracks"
},
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
+/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"
},
-/obj/structure/flora/ausbushes/lavendergrass,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow_dug"
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticaloutermain2"
},
/area/f13/wasteland)
"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"
+/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)
+>>>>>>> Stashed changes
"vaW" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2,
@@ -68657,6 +84056,14 @@
/obj/effect/spawner/lootdrop/f13/weapon/gun/energy/superlow,
/turf/open/floor/wood_common,
/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/ncr)
"vbf" = (
/obj/structure/flora/grass/wasteland{
icon_state = "tall_grass_6"
@@ -68682,7 +84089,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 +84113,17 @@
dir = 8
},
/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/ncr)
"vbT" = (
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/delivery,
@@ -68726,6 +84146,14 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+"vcb" = (
+/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)
"vcg" = (
/obj/structure/window/fulltile/store{
icon_state = "storewindowleft"
@@ -68823,6 +84251,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
@@ -68833,6 +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,
@@ -68918,6 +84374,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,
@@ -68941,6 +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";
@@ -68967,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{
@@ -68981,22 +84474,60 @@
},
/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)
+=======
+"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
@@ -69004,10 +84535,19 @@
/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)
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/structure/simple_door/brokenglass,
+/turf/open/floor/plasteel/grimy,
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/m)
"vfZ" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/junk/small/table,
@@ -69016,7 +84556,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)
@@ -69059,11 +84598,20 @@
},
/area/f13/ambientlighting/building/o)
"vgK" = (
-/obj/structure/window/fulltile/house{
- icon_state = "housewindowvertical"
+<<<<<<< Updated upstream
+/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)
+=======
+/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;
@@ -69082,15 +84630,19 @@
/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
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -69141,17 +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/table/wood/settler,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/royalblack,
-/area/f13/ambientlighting/building/g)
+/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{
@@ -69168,6 +84730,47 @@
},
/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;
+ 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)
+"vjz" = (
+/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{
@@ -69188,12 +84791,13 @@
icon_state = "verticalinnermain1"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"vjP" = (
-/obj/structure/obstacle/barbedwire/end{
- dir = 8
- },
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/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"
@@ -69217,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"
@@ -69268,11 +84888,26 @@
},
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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)
@@ -69292,12 +84927,33 @@
},
/area/f13/followers)
"vle" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/ammo/civilian,
-/turf/open/floor/plasteel/f13/vault_floor/floor{
- icon_state = "floordirty"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -69312,11 +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/decal/cleanable/dirt/dust,
-/obj/structure/table/wood/settler,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/g)
+/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
@@ -69354,13 +85024,13 @@
},
/turf/open/floor/wood_fancy/wood_fancy_dark,
/area/f13/bar)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -69369,24 +85039,20 @@
},
/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
+<<<<<<< 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/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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,
@@ -69400,6 +85066,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{
@@ -69446,11 +85116,35 @@
/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"
+<<<<<<< Updated upstream
+/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,
+/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,
@@ -69465,27 +85159,36 @@
icon_state = "floorrusty"
},
/area/f13/ambientlighting/building/f)
+<<<<<<< Updated upstream
+=======
"voo" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/f13/wood{
- icon_state = "oakfloor1"
+/obj/effect/decal/remains/human,
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
},
-/area/f13/ncr)
+/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/decal/fakelattice,
-/obj/effect/decal/cleanable/blood/old{
- icon_state = "gibbear1"
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 1
},
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaltopbordertop2left"
},
-/turf/open/floor/plating/rust,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"voL" = (
/obj/structure/simple_door/metal/fence,
/obj/structure/decoration/rag,
@@ -69501,16 +85204,13 @@
/obj/structure/dresser,
/turf/open/floor/wood_common,
/area/f13/building/abandoned/z)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -69530,11 +85230,18 @@
},
/area/f13/brotherhood)
"vpp" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
+<<<<<<< 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"
},
-/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"vps" = (
/obj/structure/barricade/tentleatheredge{
dir = 8
@@ -69546,7 +85253,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,
@@ -69560,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,
@@ -69589,9 +85302,24 @@
/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)
+<<<<<<< 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
@@ -69611,12 +85339,15 @@
},
/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,
-/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{
@@ -69630,14 +85361,31 @@
},
/turf/open/indestructible/ground/inside/mountain,
/area/f13/underground/cave)
+<<<<<<< Updated upstream
"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)
+=======
+"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";
@@ -69765,29 +85513,36 @@
/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" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
- },
-/area/f13/ambientlighting/building/g)
+/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,
+/area/f13/wasteland)
+"vtS" = (
+/obj/structure/reagent_dispensers/compostbin,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+=======
"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)
+/obj/structure/table/wood/club,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"vtU" = (
/obj/structure/curtain{
pixel_x = 32
@@ -69795,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;
@@ -69816,16 +85577,19 @@
icon_state = "whitegreenrustychess"
},
/area/f13/building/abandoned/p)
+<<<<<<< Updated upstream
+=======
"vui" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/marking{
+ icon_state = "dottedverticalcorroded";
+ pixel_x = -14
},
-/obj/structure/wreck/trash/two_tire,
-/obj/structure/wreck/trash/five_tires,
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/structure/wreck/trash/bus_door,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain0"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"vuk" = (
/turf/open/indestructible/ground/outside/dirthole,
/area/f13/wasteland)
@@ -69843,15 +85607,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{
@@ -69875,6 +85637,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;
@@ -69923,6 +85689,15 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+"vvf" = (
+/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)
"vvo" = (
/obj/effect/turf_decal/weather/dirt{
dir = 1
@@ -69946,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,
@@ -70027,9 +85809,13 @@
},
/area/f13/wasteland)
"vwC" = (
-/obj/effect/landmark/start/f13/ncrspecialist,
+<<<<<<< Updated upstream
+/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"
@@ -70038,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;
@@ -70057,30 +85851,37 @@
/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,
+/area/f13/ambientlighting/building/m)
+"vxC" = (
/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood{
- icon_state = "housewood3-broken"
- },
-/area/f13/ambientlighting/building/h)
+/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,
+=======
+/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/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"
+/obj/structure/cable/outdoors{
+ icon_state = "1-4"
},
-/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/ncr)
"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/structure/girder,
+/turf/open/indestructible/ground/outside/ruins,
+>>>>>>> Stashed changes
/area/f13/ambientlighting/building/j)
"vxP" = (
/obj/structure/simple_door/house{
@@ -70118,9 +85919,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{
@@ -70148,12 +85947,19 @@
},
/area/f13/ambientlighting/building/i)
"vyT" = (
-/obj/structure/ore_box,
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -70241,13 +86047,14 @@
},
/area/f13/building/abandoned/h)
"vAd" = (
-/obj/effect/decal/cleanable/glass,
+<<<<<<< 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,
-/obj/structure/barricade/wooden/planks/pregame,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/plasteel/f13/vault_floor/green/white,
+/turf/open/floor/plasteel/vaporwave,
+>>>>>>> Stashed changes
/area/f13/ambientlighting/building/j)
"vAf" = (
/obj/structure/curtain{
@@ -70270,14 +86077,37 @@
/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)
+"vAU" = (
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 5
+ },
+/turf/open/indestructible/ground/outside/ruins,
+/area/f13/ambientlighting/building/j)
"vAW" = (
-/obj/structure/table/booth,
-/obj/effect/decal/cleanable/glass,
+<<<<<<< Updated upstream
+/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)
+=======
+/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;
@@ -70300,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{
@@ -70321,7 +86156,6 @@
"vBQ" = (
/obj/structure/campfire/barrel,
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland)
@@ -70349,11 +86183,23 @@
/obj/structure/beebox,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/ambientlighting/building/c)
+<<<<<<< Updated upstream
+=======
"vCa" = (
-/obj/structure/dresser,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/green,
-/area/f13/ambientlighting/building/g)
+/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{
@@ -70377,19 +86223,29 @@
/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)
+<<<<<<< Updated upstream
+=======
"vCA" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/box/emptysandbags,
-/obj/item/shovel,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/fo13colored/Red{
+ dir = 1
},
-/turf/open/floor/plasteel/f13/vault_floor/yellow,
-/area/f13/ambientlighting/building/j)
+/turf/open/floor/plating/rust,
+/area/f13/sewer/powered)
+>>>>>>> Stashed changes
"vCN" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -70410,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,
@@ -70464,16 +86330,28 @@
},
/area/f13/legioncamp)
"vDy" = (
-/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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
+ },
+/turf/open/indestructible/ground/outside/road{
+ 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{
@@ -70501,8 +86379,9 @@
/area/f13/building/abandoned/g)
"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{
@@ -70580,8 +86459,15 @@
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/e)
"vFU" = (
-/turf/closed/wall/r_wall/rust,
-/area/f13/caves)
+<<<<<<< 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,
/obj/effect/decal/cleanable/dirt/dust,
@@ -70623,6 +86509,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";
@@ -70633,9 +86524,18 @@
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,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
+ },
/area/f13/building/abandoned/t)
"vGr" = (
/obj/structure/car/rubbish3,
@@ -70654,10 +86554,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,
@@ -70746,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
@@ -70754,16 +86663,15 @@
/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)
+<<<<<<< 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,
@@ -70804,7 +86712,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,
@@ -70821,6 +86731,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,
@@ -70835,7 +86749,6 @@
anchored = 1
},
/obj/structure/tires/five,
-/obj/effect/spawner/lootdrop/trash,
/turf/open/indestructible/ground/outside/ruins,
/area/f13/wasteland)
"vJF" = (
@@ -70858,17 +86771,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/engine/workshop)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/blood{
+ dir = 6;
+ icon_state = "tracks"
},
-/turf/open/floor/plasteel/f13/vault_floor/green/greenchess/greenchess2,
-/area/f13/ambientlighting/building/j)
+/turf/open/floor/carpet/arcade,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"vJU" = (
/obj/structure/chair{
dir = 4
@@ -70895,22 +86808,22 @@
/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"vKH" = (
-/obj/structure/fireplace{
- dir = 4;
- pixel_x = -7
- },
-/turf/open/indestructible/ground/outside/ruins{
- name = "cobblestone floor"
- },
-/area/f13/ncr)
+/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,
/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,
@@ -70990,6 +86903,25 @@
/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{
+ desc = "A wooden stanchion.";
+ name = "wooden stanchion";
+ pixel_y = 24;
+ pixel_x = -16
+ },
+/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;
@@ -71000,17 +86932,14 @@
icon_state = "dark"
},
/area/f13/brotherhood)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -71032,9 +86961,18 @@
},
/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,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
+ },
/area/f13/bunker)
"vNu" = (
/obj/effect/decal/cleanable/dirt,
@@ -71083,9 +87021,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,
@@ -71096,19 +87032,35 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"vOf" = (
+<<<<<<< Updated upstream
/turf/open/indestructible/ground/outside/road{
dir = 4;
icon_state = "innermaincornerinner"
},
/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)
+=======
+/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
@@ -71134,6 +87086,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/ncr)
"vOw" = (
/obj/structure/debris/v1,
/obj/structure/barricade/wooden/strong,
@@ -71141,9 +87104,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,20 +87113,38 @@
icon_state = "rubbleplate"
},
/area/f13/wasteland)
+"vPt" = (
+/obj/structure/fluff/hedge,
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
"vPF" = (
/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,
/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/dirt/dust,
-/turf/open/floor/f13{
- icon_state = "bluedirtychess2"
- },
-/area/f13/ambientlighting/building/g)
+/obj/effect/decal/cleanable/ash,
+/turf/open/floor/plasteel/grimy,
+>>>>>>> Stashed changes
+/area/f13/ncr)
"vPV" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/dirt/dust,
@@ -71179,12 +87158,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{
@@ -71231,6 +87214,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
@@ -71318,6 +87310,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"
@@ -71349,10 +87348,13 @@
},
/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" = (
+<<<<<<< Updated upstream
/obj/structure/table/wood,
/obj/item/smelling_salts,
/obj/effect/decal/cleanable/dirt,
@@ -71378,22 +87380,38 @@
name = "dirty floor"
},
/area/f13/brotherhood)
+=======
+/turf/open/indestructible/ground/outside/dirt{
+ icon_state = "dirt";
+ dir = 1
+ },
+/area/f13/wasteland/legion)
"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)
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/effect/turf_decal/weather/dirt,
+/turf/open/indestructible/ground/outside/graveldirt,
+/area/f13/caves)
"vTF" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/f13/seedspawner,
-/obj/effect/spawner/lootdrop/f13/seedspawner,
-/turf/open/floor/plating/dirt,
+/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,
/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"
@@ -71424,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{
@@ -71524,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"
@@ -71542,10 +87579,26 @@
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,
/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,
@@ -71587,11 +87640,23 @@
/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,
/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"
@@ -71618,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
@@ -71626,14 +87696,15 @@
/turf/open/indestructible/ground/outside/ruins,
/area/f13/wasteland)
"vZc" = (
-/obj/item/clothing/under/lawyer/female{
- pixel_x = -5;
- pixel_y = -5
+<<<<<<< Updated upstream
+/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)
+=======
+/obj/effect/decal/fakelattice,
+>>>>>>> Stashed changes
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"vZd" = (
/obj/structure/table/wood,
/obj/machinery/microwave,
@@ -71652,6 +87723,15 @@
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
+ },
+/turf/closed/mineral/random,
+/area/f13/ncr)
"vZy" = (
/turf/open/floor/engine/air,
/area/engine/workshop)
@@ -71678,12 +87758,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
@@ -71696,11 +87774,15 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/building/abandoned/g)
+<<<<<<< Updated upstream
+=======
"was" = (
-/obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/f13/foodspawner,
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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,
@@ -71742,6 +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{
@@ -71755,19 +87853,36 @@
},
/turf/open/indestructible/ground/outside/road,
/area/f13/wasteland)
-"wbg" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+"waW" = (
+/obj/structure/window/fulltile/house,
+/obj/structure/curtain{
+ color = "#363636"
},
-/turf/open/floor/f13/wood{
- icon_state = "housewood2-broken"
+/obj/structure/barricade/wooden/planks,
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
+=======
+"wbf" = (
+/obj/structure/cargocrate{
+ icon_state = "cargocrate2"
},
-/area/f13/ambientlighting/building/g)
+/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/landmark/start/f13/ncrconscript,
-/turf/open/indestructible/ground/outside/graveldirt,
+/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
@@ -71816,6 +87931,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
@@ -71869,6 +87991,21 @@
/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" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 10
@@ -71891,20 +88028,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,
@@ -71917,10 +88043,18 @@
icon_state = "innermaincornerouter"
},
/area/f13/building/lower_firetower)
+<<<<<<< Updated upstream
+=======
"wdV" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/purple,
-/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/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"wea" = (
/obj/structure/curtain{
color = "#845f58"
@@ -71951,11 +88085,27 @@
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/obj/item/clothing/head/crown,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"wes" = (
/obj/machinery/door/poddoor/shutters{
id = "hospitalgarage1";
@@ -71964,6 +88114,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{
@@ -71976,10 +88140,28 @@
},
/area/f13/wasteland)
"weQ" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating/rust,
-/area/f13/caves)
+<<<<<<< Updated upstream
+/obj/effect/turf_decal/weather/dirt{
+ dir = 8
+ },
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 4;
+ 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{
@@ -72054,6 +88236,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/royalblack,
/area/f13/building/abandoned/l)
+"wfN" = (
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 8;
+ 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"
@@ -72145,17 +88341,31 @@
/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"
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/item/trash/f13/mre,
+/turf/open/indestructible/ground/outside/desert,
+>>>>>>> Stashed changes
/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,
@@ -72171,17 +88381,15 @@
smooth = 1
},
/area/f13/ambientlighting/building/o)
+<<<<<<< Updated upstream
+=======
"wiE" = (
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/machinery/light/lampost{
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,
+/turf/open/indestructible/ground/outside/road,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"wiN" = (
/obj/structure/sink/greyscale{
pixel_y = 20
@@ -72236,11 +88444,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{
@@ -72277,9 +88484,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,
@@ -72353,11 +88560,21 @@
},
/area/f13/ambientlighting/building/i)
"wkQ" = (
-/obj/structure/stairs/south{
- color = "#A47449"
+<<<<<<< Updated upstream
+/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)
+=======
+/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"
@@ -72377,14 +88594,18 @@
/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"
+<<<<<<< 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{
@@ -72395,20 +88616,30 @@
"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" = (
-/obj/structure/window/reinforced/spawner,
-/obj/structure/window/reinforced/spawner/west,
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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
@@ -72482,10 +88713,17 @@
icon_state = "outercorner"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"wmc" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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"
@@ -72495,15 +88733,17 @@
/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
+<<<<<<< Updated upstream
+/turf/open/floor/f13{
+ icon_state = "yellowrustyfull"
},
-/turf/open/indestructible/ground/outside/dirt,
-/area/f13/caves)
+/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,
@@ -72540,12 +88780,34 @@
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,
/obj/effect/decal/cleanable/dirt{
@@ -72573,13 +88835,40 @@
/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" = (
-/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)
+<<<<<<< Updated upstream
+/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.";
+ 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"
+ },
+/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
@@ -72594,10 +88883,14 @@
/obj/structure/sign/warning/nosmoking/circle,
/turf/closed/wall/f13/wood/house,
/area/maintenance/bar)
+<<<<<<< Updated upstream
+=======
"wob" = (
-/obj/structure/simple_door/wood,
-/turf/open/floor/f13/wood,
-/area/f13/ncr)
+/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"
@@ -72617,17 +88910,21 @@
"wot" = (
/turf/closed/wall/f13/wood/house,
/area/f13/ambientlighting/building/b)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/structure/cable/outdoors{
+ icon_state = "1-2"
},
-/turf/open/floor/plating/rust,
-/area/f13/ambientlighting/building/j)
+/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{
@@ -72641,7 +88938,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,
@@ -72685,15 +88984,32 @@
/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"
+<<<<<<< Updated upstream
+/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)
+=======
+/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"
@@ -72704,24 +89020,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{
@@ -72791,6 +89097,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;
@@ -72858,6 +89174,18 @@
},
/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{
+ 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,
@@ -72865,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"
@@ -72892,18 +89229,24 @@
/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
+<<<<<<< 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/item/clothing/under/pants/mustangjeans,
-/obj/item/clothing/under/pants/youngfolksjeans{
- pixel_y = -10
+/obj/effect/overlay/desert/sonora/edge{
+ dir = 8
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/turf/open/floor/wood_common,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"wsp" = (
/obj/structure/curtain{
color = "#5c131b";
@@ -72911,6 +89254,18 @@
},
/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)
+"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{
@@ -72963,15 +89318,19 @@
/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
},
/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,
+/turf/open/floor/wood_common,
+/area/f13/ambientlighting/building/m)
"wta" = (
/obj/structure/barricade/sandbags,
/turf/open/indestructible/ground/outside/dirt{
@@ -72979,18 +89338,45 @@
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,
+/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,
/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
@@ -73080,6 +89466,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{
@@ -73161,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,
@@ -73206,9 +89607,25 @@
},
/area/f13/ambientlighting/building/b)
"wwj" = (
-/mob/living/simple_animal/hostile/radscorpion/blue,
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
+<<<<<<< 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{
color = "#363636"
@@ -73237,18 +89654,33 @@
/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,
+/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)
+=======
"wwO" = (
-/obj/structure/dresser,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/royalblack,
-/area/f13/ambientlighting/building/g)
+/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/effect/turf_decal/weather/snow/corner,
-/turf/open/floor/plating/dirt,
-/area/f13/wasteland)
+/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{
@@ -73256,6 +89688,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";
@@ -73324,13 +89764,13 @@
/obj/effect/landmark/start/f13/tribal_new,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"wxY" = (
-/obj/structure/fluff/railing{
- dir = 6
- },
-/obj/item/shard,
-/turf/open/water,
-/area/f13/ambientlighting/building/j)
+/obj/effect/spawner/lootdrop/f13/junkspawners,
+/turf/open/floor/wood_fancy,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"wyh" = (
/obj/structure/fence{
dir = 4
@@ -73379,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,
@@ -73445,6 +89892,14 @@
/obj/effect/decal/cleanable/robot_debris,
/turf/open/floor/plating/rust,
/area/f13/building/powered)
+"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/ncr)
"wzU" = (
/obj/structure/fence/cut/medium,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -73453,12 +89908,15 @@
},
/area/f13/wasteland)
"wzW" = (
-/obj/effect/turf_decal/loading_area,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< 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"
},
-/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
@@ -73500,20 +89958,13 @@
"wAl" = (
/turf/open/floor/f13/wood,
/area/f13/building/abandoned/m)
+<<<<<<< Updated upstream
+=======
"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,
-/area/f13/ncr)
+/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,
@@ -73531,40 +89982,32 @@
},
/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)
+<<<<<<< Updated upstream
+"wAU" = (
+/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
+=======
"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
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/turf/open/indestructible/ground/inside/mountain,
+/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/ncr)
"wAU" = (
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/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"
@@ -73662,15 +90105,36 @@
/turf/closed/mineral/random,
/area/f13/wasteland)
"wCM" = (
-/obj/structure/flora/twig{
- pixel_y = 23;
- pixel_x = -8
+<<<<<<< Updated upstream
+/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)
+"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)
+=======
+/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/flora/grass/both{
- icon_state = "snowgrass_esw"
+/obj/structure/sign/do_not_enter,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain0"
},
-/turf/open/indestructible/ground/outside/snow,
/area/f13/wasteland)
+>>>>>>> Stashed changes
"wCV" = (
/obj/structure/fence/pole_t,
/obj/structure/railing{
@@ -73762,17 +90226,19 @@
/turf/open/indestructible/ground/outside/sidewalk{
icon_state = "horizontaloutermain0"
},
+<<<<<<< Updated upstream
/area/f13/casino)
+=======
+/area/f13/brotherhood)
"wDP" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/obj/structure/chair/bench{
- dir = 4;
- pixel_x = -16
+/obj/structure/window/fulltile/ruins{
+ icon_state = "ruinswindowbroken"
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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,
@@ -73780,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,
@@ -73807,21 +90283,59 @@
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"wEh" = (
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/p)
+<<<<<<< Updated upstream
+/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)
+=======
+/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" = (
-/obj/effect/decal/cleanable/glass,
-/obj/item/shard,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -73842,12 +90356,13 @@
icon_state = "bluedirtychess2"
},
/area/f13/brotherhood)
+<<<<<<< Updated upstream
+=======
"wEO" = (
-/obj/structure/flora/stump,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow5"
- },
+/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{
@@ -73855,6 +90370,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;
@@ -73882,6 +90407,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{
@@ -73931,6 +90467,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;
@@ -73956,12 +90498,32 @@
/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)
+<<<<<<< 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{
+ dir = 8;
+ icon_state = "outerborder"
+ },
+/area/f13/wasteland)
"wGF" = (
/obj/structure/barricade/tentclothcorner{
color = "#7c0A02";
@@ -73997,17 +90559,26 @@
/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)
+<<<<<<< Updated upstream
+=======
"wHk" = (
-/obj/structure/decoration/rag{
- icon_state = "skin";
- pixel_y = 2
+/obj/structure/chair/wood{
+ dir = 1
},
-/turf/closed/wall/f13/wood,
-/area/f13/ncr)
+/turf/open/floor/wood_fancy,
+/area/f13/ambientlighting/building/m)
+>>>>>>> Stashed changes
"wHl" = (
/turf/open/indestructible/ground/outside/road{
icon_state = "horizontalinnermain0"
@@ -74030,15 +90601,13 @@
icon_state = "horizontalinnermainleft"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"wHC" = (
-/obj/structure/wreck/trash/three_barrels{
- pixel_y = 9;
- pixel_x = 9
- },
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow3"
- },
+/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{
@@ -74086,7 +90655,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,
@@ -74111,9 +90682,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,
@@ -74137,6 +90708,13 @@
icon_state = "dirt"
},
/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" = (
/obj/structure/destructible/tribal_torch/wall/lit{
dir = 8
@@ -74150,24 +90728,37 @@
icon_state = "whitegreenrustychess"
},
/area/f13/ambientlighting/building/w)
+"wJq" = (
+/obj/effect/turf_decal/vg_decals/numbers/six{
+ layer = 5
+ },
+/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,
/area/f13/wasteland/legion)
+<<<<<<< Updated upstream
+=======
"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)
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
+>>>>>>> Stashed changes
"wKh" = (
/obj/structure/car,
/obj/structure/tires/five,
@@ -74194,13 +90785,21 @@
icon_state = "bluedirtychess2"
},
/area/f13/ambientlighting/building/y)
+<<<<<<< Updated upstream
+=======
"wKv" = (
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/structure/fluff/paper{
dir = 5
},
-/obj/structure/junk/small,
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/wasteland)
+/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
@@ -74240,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,
@@ -74248,8 +90861,15 @@
"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)
+"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,
@@ -74318,9 +90938,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"
@@ -74436,22 +91054,16 @@
},
/area/f13/ambientlighting/building/y)
"wOi" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 5;
- icon_state = "snow_corner"
- },
-/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)
+<<<<<<< Updated upstream
+=======
"wOu" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/royalblack,
-/area/f13/ambientlighting/building/g)
+/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,
@@ -74474,12 +91086,13 @@
/obj/machinery/vending/boozeomat,
/turf/closed/wall/f13/wood/house,
/area/f13/ambientlighting/building/w)
+<<<<<<< Updated upstream
+=======
"wOQ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/f13{
- icon_state = "bluerustysolid"
- },
-/area/f13/ambientlighting/building/g)
+/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";
@@ -74503,6 +91116,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,
@@ -74520,37 +91143,40 @@
},
/turf/open/indestructible/ground/outside/dirthole,
/area/f13/wasteland)
+"wPF" = (
+/obj/structure/table/booth,
+/turf/open/floor/plasteel/grimy,
+/area/f13/ncr)
"wPH" = (
/obj/effect/overlay/desert_side,
/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{
- plane = -14;
- layer = 3.7;
- icon_state = "drip4"
+ icon_state = "floor6"
},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/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/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,
+/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
@@ -74565,24 +91191,17 @@
},
/turf/open/floor/f13/wood,
/area/f13/ambientlighting/building/e)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/structure/statue/petrified,
+/obj/item/clothing/suit/armor/outfit/jacket/police/lieutenant{
+ layer = 5
},
-/area/f13/ncr)
+/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.";
@@ -74599,10 +91218,32 @@
},
/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria,
/area/maintenance/bar)
-"wQF" = (
-/obj/machinery/gear_painter,
-/turf/open/floor/wood_wide,
+<<<<<<< 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{
@@ -74648,6 +91289,16 @@
icon_state = "floorrusty"
},
/area/f13/building/powered)
+"wRi" = (
+/obj/structure/fence{
+ dir = 4
+ },
+/obj/structure/obstacle/barbedwire{
+ dir = 4;
+ pixel_y = 16
+ },
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"wRn" = (
/obj/machinery/vending/hydronutrients{
force_free = 1
@@ -74707,26 +91358,24 @@
},
/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,
/area/f13/building/abandoned)
+<<<<<<< Updated upstream
+"wSh" = (
+/obj/structure/flora/grass/coyote/eighteen,
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+=======
"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,
+/obj/structure/barricade/wooden,
+/turf/open/floor/wood_wide,
/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"wSi" = (
/obj/effect/overlay/desert_side{
dir = 1
@@ -74752,14 +91401,43 @@
},
/area/f13/wasteland)
"wSu" = (
-/obj/structure/flora/branch,
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
@@ -74773,6 +91451,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
@@ -74789,8 +91474,21 @@
/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,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
+ },
/area/f13/bunker)
"wTj" = (
/mob/living/simple_animal/hostile/supermutant/rangedmutant/varmint,
@@ -74856,26 +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/structure/window/fulltile/house{
- dir = 2;
- icon_state = "housewindowbrokenvertical"
+/obj/item/storage/trash_stack{
+ icon_state = "Junk_10"
},
-/turf/open/floor/f13/wood,
-/area/f13/ambientlighting/building/h)
+/turf/open/floor/carpet/arcade,
+/area/f13/ambientlighting/building/m)
"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,
+/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,
@@ -74983,6 +91677,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;
@@ -75019,12 +91718,15 @@
/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)
+<<<<<<< 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
@@ -75036,9 +91738,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,
@@ -75072,6 +91774,10 @@
icon_state = "horizontaloutermain1"
},
/area/f13/wasteland)
+"wXb" = (
+/obj/effect/landmark/start/f13/ncrlogisticsofficer,
+/turf/open/floor/wood_common/wood_common_light,
+/area/f13/ncr)
"wXd" = (
/obj/structure/window/fulltile/wood_window,
/obj/structure/barricade/bars,
@@ -75087,6 +91793,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,
@@ -75098,13 +91809,19 @@
/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
+<<<<<<< Updated upstream
+/obj/structure/flora/wasteplant/wild_fungus,
+/obj/effect/decal/cleanable/blood{
+ icon_state = "tracks"
},
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+=======
+/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" = (
/obj/structure/table/reinforced,
/turf/open/indestructible/ground/outside/ruins,
@@ -75140,12 +91857,16 @@
icon_state = "dirt"
},
/area/f13/wasteland/legion)
+<<<<<<< Updated upstream
+=======
"wYD" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/turf/open/floor/wood_common/wood_common_dark,
+/turf/open/floor/wood_fancy/wood_fancy_light,
/area/f13/ncr)
+>>>>>>> Stashed changes
"wYM" = (
/obj/structure/window/fulltile/house{
dir = 2
@@ -75163,6 +91884,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 +91899,12 @@
/obj/effect/decal/cleanable/greenglow,
/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"wZv" = (
-/obj/structure/simple_door/house,
-/turf/open/floor/f13{
- icon_state = "bar"
- },
-/area/f13/ambientlighting/building/g)
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"wZH" = (
/turf/open/indestructible/ground/outside/roaddirt{
dir = 8;
@@ -75220,9 +91945,15 @@
/turf/open/floor/wood_common,
/area/f13/clinic)
"xae" = (
-/mob/living/simple_animal/hostile/stalker,
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+<<<<<<< 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,
@@ -75243,21 +91974,26 @@
/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"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
/obj/structure/obstacle/barbedwire/end{
@@ -75279,9 +92015,19 @@
/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)
+<<<<<<< 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";
@@ -75308,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{
@@ -75334,6 +92084,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{
@@ -75383,6 +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.";
@@ -75398,9 +92174,24 @@
},
/area/f13/wasteland)
"xdg" = (
-/obj/item/clothing/head/f13/enclave,
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/caves)
+<<<<<<< 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,
@@ -75491,12 +92282,27 @@
icon_state = "bluedirtychess2"
},
/area/f13/brotherhood)
+<<<<<<< Updated upstream
+"xew" = (
+/turf/open/floor/f13/wood{
+ icon_state = "housewood3-broken"
+ },
+=======
"xey" = (
-/obj/structure/decoration/rag{
- layer = 4.3
+/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
},
-/turf/closed/wall/f13/tentwall,
-/area/f13/wasteland)
+/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,
/turf/open/indestructible/ground/outside/road,
@@ -75522,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
@@ -75558,6 +92369,7 @@
/turf/closed/indestructible/f13/obsidian,
/area/f13/tunnel)
"xfE" = (
+<<<<<<< Updated upstream
/obj/item/storage/trash_stack{
icon_state = "trash_2"
},
@@ -75566,13 +92378,35 @@
},
/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)
+=======
+/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;
@@ -75633,13 +92467,30 @@
icon_state = "horizontalinnermain0"
},
/area/f13/wasteland/city)
+"xgL" = (
+/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/item/gun/ballistic/automatic/toy/pistol/riot,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/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/floor/carpet/arcade,
-/area/f13/ambientlighting/building/j)
+/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,
@@ -75652,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.";
@@ -75666,10 +92526,15 @@
/obj/structure/flora/tree/jungle,
/turf/open/indestructible/ground/outside/grass,
/area/f13/ambientlighting/building/c)
+<<<<<<< Updated upstream
+=======
"xhh" = (
-/obj/effect/landmark/start/f13/ncrcolonel,
-/turf/open/indestructible/ground/outside/graveldirt,
+/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,
@@ -75700,6 +92565,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
@@ -75721,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{
@@ -75759,12 +92640,19 @@
},
/turf/open/indestructible/ground/outside/dirthole,
/area/f13/wasteland)
-"xiF" = (
-/obj/structure/stairs/west{
- color = "#A47449"
+<<<<<<< Updated upstream
+"xiG" = (
+/obj/structure/chair/bench{
+ dir = 1
},
-/turf/open/indestructible/ground/outside/desert,
+/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,
@@ -75829,6 +92717,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"
@@ -75877,6 +92771,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
@@ -75943,17 +92844,18 @@
dir = 4
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"xln" = (
-/obj/structure/flora/grass/wasteland{
- layer = 4.2;
- pixel_x = 6;
- pixel_y = 9
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/f13/junkspawners,
-/turf/open/indestructible/ground/outside/snow{
- icon_state = "snow5"
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "verticalinnermain2bottom"
},
/area/f13/wasteland)
+>>>>>>> Stashed changes
"xlp" = (
/obj/structure/grille/ratvar{
name = "radio antenna"
@@ -75963,20 +92865,15 @@
},
/turf/open/floor/plating/f13/outside/roof/metal/corrugated,
/area/f13/building/abandoned/l)
+<<<<<<< Updated upstream
+=======
"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"
+/obj/structure/flora/grass/wasteland{
+ icon_state = "tall_grass_5"
},
-/area/f13/ambientlighting/building/j)
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"xlu" = (
/obj/structure/filingcabinet,
/obj/structure/filingcabinet{
@@ -76008,7 +92905,7 @@
icon_state = "Junk_9"
},
/turf/open/indestructible/ground/outside/sidewalk{
- icon_state = "verticaloutermain1"
+ icon_state = "verticalleftborderleft0"
},
/area/f13/wasteland)
"xmj" = (
@@ -76022,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{
@@ -76040,30 +92949,20 @@
},
/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"
+/obj/structure/campfire/barrel,
+/turf/open/indestructible/ground/outside/road{
+ icon_state = "horizontalinnermain1"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"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"
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "outermaincornerinner"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"xmx" = (
/obj/effect/decal/cleanable/blood/old{
icon_state = "gibbear1"
@@ -76077,11 +92976,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
@@ -76133,10 +93030,21 @@
},
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -76147,6 +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,
@@ -76163,34 +93098,29 @@
/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
- },
+<<<<<<< Updated upstream
/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"
- },
-/obj/item/storage/trash_stack{
- icon_state = "trash_2"
+/obj/structure/table,
+/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"
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/area/f13/wasteland)
+"xoA" = (
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
+ name = "rusted floor"
},
-/area/f13/ambientlighting/building/j)
+/area/f13/ncr)
+>>>>>>> Stashed changes
"xoL" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/hydroponics/constructable,
@@ -76203,14 +93133,11 @@
/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,
+<<<<<<< Updated upstream
+=======
+/obj/structure/stairs/east,
+>>>>>>> Stashed changes
+/turf/open/floor/wood_wide,
/area/f13/ambientlighting/building/j)
"xoT" = (
/obj/structure/table/greyscale,
@@ -76270,17 +93197,18 @@
/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)
+<<<<<<< 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,
@@ -76302,17 +93230,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{
@@ -76338,6 +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,
@@ -76366,6 +93299,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
@@ -76404,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"
@@ -76416,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,
@@ -76473,13 +93444,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{
@@ -76491,18 +93455,19 @@
/obj/structure/fence/corner,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"xtj" = (
-/obj/structure/table/reinforced,
-/obj/machinery/computer/terminal{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/cable/outdoors{
+ icon_state = "1-8"
},
-/turf/open/floor/plasteel/f13/vault_floor/red/side{
- dir = 8
+/obj/structure/cable/outdoors{
+ icon_state = "1-4"
},
-/area/f13/ambientlighting/building/j)
+/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,
@@ -76528,22 +93493,30 @@
icon_state = "floorrusty"
},
/area/f13/building/abandoned/h)
+<<<<<<< Updated upstream
+"xty" = (
+/obj/structure/chair/comfy{
+ dir = 4;
+ pixel_x = -12
+=======
"xtt" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/turf/open/floor/f13{
- icon_state = "bluerustysolid"
+/obj/structure/window/fulltile/house,
+/obj/structure/curtain{
+ color = "#363636"
},
-/area/f13/ambientlighting/building/g)
+/turf/open/floor/wood_fancy/wood_fancy_light,
+/area/f13/ncr)
"xty" = (
-/obj/structure/car/rubbish3,
+/obj/structure/tires/two,
/turf/open/indestructible/ground/outside/dirt{
- dir = 1;
+ dir = 9;
icon_state = "dirt"
+>>>>>>> Stashed changes
},
-/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
@@ -76592,7 +93565,6 @@
/obj/effect/decal/cleanable/dirt{
color = "#363636"
},
-/obj/effect/spawner/lootdrop/trash,
/turf/open/floor/carpet/purple,
/area/f13/bar)
"xut" = (
@@ -76604,10 +93576,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood_common/wood_common_light,
/area/maintenance/bar)
+<<<<<<< Updated upstream
+=======
"xuQ" = (
-/obj/structure/flora/grass/wasteland,
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/turf/open/floor/plating/rust,
+/area/f13/ambientlighting/building/j)
+>>>>>>> Stashed changes
"xvb" = (
/obj/structure/barricade/bars{
max_integrity = 800;
@@ -76626,11 +93600,16 @@
/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)
+<<<<<<< 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{
@@ -76656,33 +93635,31 @@
icon_state = "yellowrustyfull"
},
/area/f13/ambientlighting/building/f)
+<<<<<<< Updated upstream
+=======
"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
+/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."
},
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
-"xvX" = (
-/obj/structure/decoration/hatch{
- dir = 8
+/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 = "horizontaloutermain0"
+ 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
@@ -76721,6 +93698,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/ncr)
"xwF" = (
/obj/machinery/door/unpowered/securedoor/khandoor,
/turf/closed/wall/mineral/wood,
@@ -76766,7 +93749,6 @@
light_color = "#f4e3b0"
},
/turf/open/indestructible/ground/outside/dirt{
- dir = 2;
icon_state = "dirt"
},
/area/f13/wasteland/legion)
@@ -76787,6 +93769,14 @@
/obj/machinery/processor/chopping_block,
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/z)
+"xxN" = (
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/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{
@@ -76806,6 +93796,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"
@@ -76834,13 +93830,9 @@
},
/area/f13/building/powered)
"xyq" = (
-/obj/structure/closet/crate/bin,
-/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)
+/obj/structure/barricade/wooden/strong,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
"xys" = (
/turf/open/indestructible/ground/outside/road{
dir = 1;
@@ -76872,14 +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/turf_decal/weather/dirt{
- dir = 6
- },
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontalbottomborderbottom3"
},
-/area/f13/ncr)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"xyU" = (
/obj/structure/rack,
/obj/item/stack/sheet/metal/ten,
@@ -76914,17 +93911,14 @@
icon_state = "floorrusty"
},
/area/f13/followers)
+<<<<<<< Updated upstream
+=======
"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)
+/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{
@@ -76950,15 +93944,13 @@
},
/turf/open/floor/wood_common,
/area/f13/ambientlighting/building/c)
+<<<<<<< Updated upstream
+=======
"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)
+/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,
@@ -76994,15 +93986,29 @@
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
+<<<<<<< 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.";
+ 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)
+=======
+/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"
@@ -77087,7 +94093,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{
@@ -77120,6 +94128,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,
@@ -77128,14 +94143,14 @@
},
/turf/open/floor/plating,
/area/f13/bar)
+<<<<<<< Updated upstream
+=======
"xCz" = (
-/obj/structure/simple_door/metal/store{
- icon_state = "brokenstore"
- },
-/turf/open/floor/f13{
- icon_state = "floorrusty"
- },
-/area/f13/ambientlighting/building/g)
+/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"
@@ -77145,6 +94160,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,
@@ -77165,6 +94188,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{
@@ -77175,7 +94204,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,
@@ -77243,24 +94274,15 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/caves)
+<<<<<<< Updated upstream
+=======
"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"
+/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,
@@ -77291,6 +94313,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"
@@ -77315,12 +94343,17 @@
/turf/open/floor/plasteel/f13/stone/rugged,
/area/f13/building/abandoned/g)
"xEY" = (
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/item/trash/f13/porknbeans,
+>>>>>>> Stashed changes
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/ambientlighting/building/j)
"xFe" = (
/obj/effect/decal/cleanable/dirt{
@@ -77359,6 +94392,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,
@@ -77366,23 +94405,27 @@
"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,
-/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"
+<<<<<<< Updated upstream
+/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,
+=======
+/obj/structure/window/fulltile/ruins{
+ icon_state = "ruinswindowbroken"
},
-/area/f13/ncr)
+/obj/structure/barricade/wooden/planks/pregame,
+/turf/open/floor/f13/wood,
+>>>>>>> Stashed changes
+/area/f13/ambientlighting/building/m)
"xGx" = (
/obj/effect/decal/cleanable/greenglow,
/obj/effect/decal/cleanable/dirt,
@@ -77398,13 +94441,31 @@
/turf/open/floor/plasteel/f13/stone/rugged,
/area/f13/building/abandoned/g)
"xGA" = (
-/obj/structure/campfire/stove{
- pixel_y = 14
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -77454,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,
@@ -77463,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"
@@ -77488,12 +94559,25 @@
},
/area/f13/brotherhood)
"xHX" = (
-/obj/structure/window/fulltile/wood,
-/obj/structure/curtain{
- color = "#808080"
+<<<<<<< Updated upstream
+/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)
+=======
+/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,
@@ -77525,12 +94609,26 @@
},
/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'
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/blood{
+ icon_state = "gib1";
+ pixel_y = -6
},
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/ncr)
+/obj/effect/gibspawner/human/bodypartless,
+/turf/open/indestructible/ground/outside/dirt{
+ 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,
/obj/effect/decal/cleanable/dirt/dust,
@@ -77563,6 +94661,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
@@ -77575,19 +94678,24 @@
icon_state = "verticalinnermain2"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"xJn" = (
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/structure/junk/locker,
+/obj/item/storage/backpack/enclave,
+/obj/effect/turf_decal/weather/dirt{
dir = 5
},
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9;
- icon_state = "snow_corner"
+/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)
+>>>>>>> Stashed changes
"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,
@@ -77599,29 +94707,40 @@
/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/effect/decal/cleanable/dirt{
- color = "000000"
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "UBuild";
- layer = 11;
- name = "Gabriel's U-Build"
+/obj/item/mine/shrapnel,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "outermaincornerinner";
+ dir = 8
},
-/turf/closed/wall/f13/tentwall,
-/area/f13/ambientlighting/building/j)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"xKk" = (
/obj/structure/table/wood,
/turf/open/floor/f13/wood{
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{
@@ -77711,18 +94830,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{
@@ -77760,12 +94876,22 @@
/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"
+<<<<<<< Updated upstream
+"xMY" = (
+/obj/effect/decal/cleanable/glass,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood_common{
+ icon_state = "common-broken3"
},
-/area/f13/ambientlighting/building/g)
+/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;
@@ -77792,6 +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{
@@ -77815,22 +94959,36 @@
},
/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,
+<<<<<<< Updated upstream
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13/wood,
+/area/f13/ambientlighting/building/m)
+"xNY" = (
+/obj/structure/chair/bench{
+ dir = 1;
+ pixel_y = -16
+ },
+/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"xOc" = (
-/obj/item/storage/money_stack/ncr{
- pixel_x = 5
+/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/dust,
-/turf/open/floor/wood_common/wood_common_dark,
+/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{
@@ -77841,11 +94999,20 @@
},
/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)
+<<<<<<< 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{
@@ -77899,17 +95066,14 @@
/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)
+"xPE" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/wood_wide,
+/area/f13/ambientlighting/building/j)
"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,
@@ -77954,6 +95118,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/ncr)
"xQq" = (
/obj/item/storage/trash_stack,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -77967,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
@@ -78038,6 +95219,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
@@ -78053,6 +95242,7 @@
icon_state = "housewood2"
},
/area/f13/building/abandoned/a)
+<<<<<<< Updated upstream
"xRQ" = (
/obj/machinery/camera/autoname{
dir = 8;
@@ -78069,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
@@ -78076,28 +95274,45 @@
/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;
- icon_state = "snow_corner"
- },
-/turf/open/indestructible/ground/outside/graveldirt,
-/area/f13/ncr)
+<<<<<<< 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/chair/wood{
- dir = 8
+/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
},
-/obj/effect/landmark/start/f13/ncrcombatmedic,
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/ncr)
+/area/f13/wasteland)
+"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,
@@ -78121,15 +95336,26 @@
/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,
+<<<<<<< Updated upstream
+/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,
+/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;
@@ -78189,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,
@@ -78206,18 +95459,22 @@
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"
+<<<<<<< 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,
@@ -78276,6 +95533,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;
@@ -78362,11 +95625,15 @@
},
/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)
+"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{
@@ -78430,6 +95697,13 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+"xXr" = (
+/obj/structure/cable/outdoors{
+ icon_state = "4-8"
+ },
+/obj/effect/overlay/desert/sonora/edge,
+/turf/open/floor/wood_common,
+/area/f13/wasteland)
"xXx" = (
/turf/open/indestructible/ground/outside/grass,
/area/f13/wasteland)
@@ -78441,9 +95715,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" = (
@@ -78482,13 +95754,17 @@
/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"
+<<<<<<< Updated upstream
+/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/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
@@ -78527,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"
@@ -78581,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,
@@ -78589,12 +95879,18 @@
icon_state = "yellowrustychess"
},
/area/f13/ambientlighting/building/m)
+<<<<<<< Updated upstream
+"yae" = (
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain2right"
+=======
"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)
+/obj/structure/wreck/trash/bus_door,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontalbottomborderbottom0"
+>>>>>>> Stashed changes
+ },
+/area/f13/wasteland)
"yau" = (
/obj/item/flag/khan,
/obj/structure/fence/corner{
@@ -78626,10 +95922,26 @@
icon_state = "whitegreenrustychess"
},
/area/f13/ambientlighting/building/i)
+<<<<<<< Updated upstream
"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,
+=======
+"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,
@@ -78648,10 +95960,17 @@
},
/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)
+<<<<<<< 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,
@@ -78691,24 +96010,36 @@
/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,
-/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)
"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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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{
@@ -78767,16 +96098,19 @@
icon_state = "dirt"
},
/area/f13/wasteland)
+<<<<<<< Updated upstream
+=======
"ycu" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/ghoul/reaver,
-/obj/effect/decal/cleanable/dirt{
- color = "000000"
+/obj/structure/destructible/tribal_torch/wall/lit{
+ dir = 4;
+ light_color = "#f4e3b0"
},
-/turf/open/floor/f13{
- icon_state = "floorrusty"
+/obj/item/storage/trash_stack,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "verticalrightborderright0"
},
-/area/f13/ambientlighting/building/g)
+/area/f13/wasteland)
+>>>>>>> Stashed changes
"ycx" = (
/obj/structure/sink{
dir = 1;
@@ -78789,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;
@@ -78797,6 +96139,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/ncr)
"ycP" = (
/obj/structure/barricade/wooden/strong,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -78862,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,
@@ -78931,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,
@@ -79049,20 +96418,15 @@
icon_state = "oakfloor1"
},
/area/f13/followers)
+<<<<<<< Updated upstream
+=======
"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"
+/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,
@@ -79109,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
@@ -79118,12 +96494,26 @@
},
/area/f13/wasteland)
"yhZ" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/indestructible/ground/outside/dirt{
- dir = 4;
- icon_state = "dirt"
+<<<<<<< Updated upstream
+/obj/structure/bed/mattress{
+ icon_state = "mattress4";
+ pixel_x = -8;
+ pixel_y = 6
+ },
+/obj/item/bedsheet/blanket{
+ pixel_y = 1
+ },
+/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;
@@ -79156,15 +96546,18 @@
/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
+<<<<<<< Updated upstream
+/obj/structure/barricade/wooden,
+/turf/closed/indestructible/rock,
+/area/f13/caves)
+=======
+/obj/structure/chair/wood/wings{
+ dir = 4
},
-/turf/open/indestructible/ground/outside/snow,
-/area/f13/wasteland)
+/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{
@@ -79186,16 +96579,21 @@
/obj/structure/table/wood,
/turf/open/floor/carpet,
/area/f13/ambientlighting/building/d)
+<<<<<<< Updated upstream
+=======
"yjb" = (
-/obj/structure/railing/corner{
- color = "#A47449";
- dir = 8
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood_common/wood_common_dark{
- icon_state = "common_dark-broken4"
+/obj/effect/turf_decal/weather/dirt{
+ dir = 10
},
-/area/f13/ncr)
+/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,
@@ -79203,6 +96601,15 @@
icon_state = "whitegreenrustychess"
},
/area/f13/ambientlighting/building/w)
+"yjj" = (
+/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" = (
/obj/structure/debris/v2,
/turf/closed/mineral/random/low_chance,
@@ -79212,36 +96619,59 @@
/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)
+<<<<<<< Updated upstream
+/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)
+=======
+/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/toilet{
- dir = 8
+/obj/structure/table/wood/junk,
+/obj/item/pen/red,
+/obj/item/pen/charcoal,
+/obj/item/pen,
+/obj/machinery/light/small{
+ dir = 8;
+ brightness = 9
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/f13{
- icon_state = "bar"
+/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
},
-/area/f13/ambientlighting/building/g)
+/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,
/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,
@@ -79253,22 +96683,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)
-"yke" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 2
- },
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
+/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."
},
-/turf/open/indestructible/ground/outside/grass,
-/area/f13/wasteland)
+/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,
@@ -79353,29 +96783,39 @@
icon_state = "outerpavement"
},
/area/f13/caves)
+"ylL" = (
+/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" = (
+/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)
+<<<<<<< Updated upstream
+/obj/structure/simple_door/metal/fence,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
"ymf" = (
-/obj/structure/rack,
-/obj/item/clothing/head/fedora{
- pixel_x = -3;
- pixel_y = 10
- },
-/obj/machinery/light/small/broken{
+/obj/structure/debris/v4,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/wasteland)
+=======
+/obj/structure/fluff/paper/stack{
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)
+/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
@@ -79468,6 +96908,8 @@ rkv
rkv
rkv
rkv
+gXH
+gXH
rkv
rkv
rkv
@@ -79595,10 +97037,6 @@ rkv
rkv
rkv
rkv
-gXH
-gXH
-rkv
-rkv
rkv
rkv
rkv
@@ -79614,6 +97052,8 @@ rkv
rkv
rkv
rkv
+gXH
+gXH
rkv
rkv
rkv
@@ -79751,6 +97191,7 @@ yfv
yfv
yfv
yfv
+rkv
yfv
yfv
yfv
@@ -79768,30 +97209,46 @@ yfv
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
+ylR
+ylR
+ylR
+ylR
+ylR
+=======
+vTF
+vTF
+vTF
+vTF
+vTF
+vTF
+vTF
+vTF
+>>>>>>> Stashed changes
yfv
yfv
yfv
yfv
-yfv
-yfv
-yfv
-yfv
-yfv
-yfv
-yfv
-yfv
-yfv
-yfv
-yfv
-yfv
-yfv
-yfv
+rkv
yfv
yfv
yfv
@@ -79874,57 +97331,62 @@ 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
+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
+<<<<<<< Updated upstream
+eFC
+eFC
+=======
kIF
-lsU
-vnO
-rtj
-rtj
-rtj
-rtj
-rtj
-rtj
-rtj
-aHq
+kIF
+>>>>>>> Stashed changes
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
eyn
eyn
eyn
@@ -80053,6 +97515,7 @@ aTW
aTW
aTW
aTW
+rkv
aTW
aTW
aTW
@@ -80070,30 +97533,44 @@ aTW
aTW
aTW
aTW
+ufo
+akv
+<<<<<<< Updated upstream
+mQK
+=======
+cDp
+>>>>>>> Stashed changes
+ufo
aTW
aTW
aTW
aTW
aTW
aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-yfv
-aTW
-aTW
-aTW
-aTW
+<<<<<<< Updated upstream
+hkO
+tse
+huh
+nVA
+xQm
+nVA
+rnh
+huh
+=======
+fJE
+kAL
+uSv
+mvy
+hcZ
+mvy
+ozC
+uSv
+>>>>>>> Stashed changes
aTW
yfv
yfv
yfv
-yfv
+rkv
yfv
yfv
yfv
@@ -80175,59 +97652,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
@@ -80239,12 +97667,66 @@ 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
+<<<<<<< Updated upstream
+eFC
+eFC
+=======
+kIF
+kIF
+>>>>>>> Stashed changes
+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
@@ -80355,56 +97837,89 @@ aTW
aTW
aTW
aTW
+rkv
aTW
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
+srQ
+mQK
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+nVA
+hta
+oos
+hta
+oos
+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
-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
+rkv
aTW
neZ
-bwE
+taO
taO
taO
vwf
taO
taO
-bwE
+taO
neZ
aTW
aTW
@@ -80475,62 +97990,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
@@ -80541,12 +98005,6 @@ eyn
eyn
eyn
eyn
-vFU
-htm
-rOv
-xdg
-mjH
-vFU
eyn
eyn
eyn
@@ -80557,7 +98015,69 @@ eyn
eyn
eyn
eyn
-rRz
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+eFC
+eFC
+eFC
+=======
+kIF
+kIF
+kIF
+>>>>>>> Stashed changes
+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
rRz
azA
azA
@@ -80579,6 +98099,7 @@ azA
azA
azA
azA
+azA
eyn
eyn
eyn
@@ -80656,47 +98177,74 @@ aTW
aTW
aTW
aTW
+azA
+sqv
+azA
+azA
+azA
aTW
aTW
+<<<<<<< Updated upstream
+hkO
+eer
+rdi
+ewm
+hkO
+hkO
+=======
+fJE
+iEF
+qoG
+fyd
+fJE
+fJE
+>>>>>>> Stashed changes
aTW
aTW
+azA
+azA
+azA
+xic
+azA
+<<<<<<< Updated upstream
+hZK
+iOE
+jwS
+kyD
+rVP
+rVP
+qHg
+ahk
+aQs
+jwS
+jwS
+=======
+hDE
+lAR
+dZG
+tOp
+bgd
+bgd
+xaY
+fOf
+lFO
+dZG
+dZG
+>>>>>>> Stashed changes
+uaE
+uaE
+uaE
+xXA
+uaE
+uaE
+uaE
+<<<<<<< Updated upstream
+hkO
+=======
+fJE
+>>>>>>> Stashed changes
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
@@ -80744,7 +98292,7 @@ yfv
xjs
slS
qWW
-gQn
+qWW
slS
slS
oyh
@@ -80777,62 +98325,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
@@ -80843,12 +98341,6 @@ eyn
eyn
eyn
eyn
-vFU
-qMo
-pDW
-qMo
-bDA
-vFU
eyn
eyn
eyn
@@ -80859,8 +98351,69 @@ eyn
eyn
eyn
eyn
-rRz
-rRz
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+eFC
+eFC
+=======
+kIF
+kIF
+>>>>>>> Stashed changes
+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
@@ -80957,48 +98510,86 @@ aTW
aTW
aTW
aTW
+azA
+azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
+azA
+azA
+azA
+azA
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
+<<<<<<< Updated upstream
+hkO
+uaE
+akN
+mmm
+rdi
+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
+rBR
+rVP
+rVP
+rVP
+rVP
+mnl
+uQU
+uaE
+uhL
+mmm
+ned
+ned
+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
vwf
@@ -81016,11 +98607,11 @@ lFj
dJF
pjw
neZ
-bwE
taO
taO
taO
-bwE
+taO
+taO
neZ
aHq
aHq
@@ -81078,64 +98669,36 @@ eyn
eyn
eyn
eyn
-aHq
-aHq
eyn
eyn
eyn
eyn
eyn
eyn
-rtj
-rtj
-rtj
-wAK
-oJi
-qrf
-lbC
-lsU
-xln
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+lxh
+jeL
+fOf
+rie
+=======
+xfJ
sks
-bqb
-cpw
-qnM
-nYQ
+xqz
+qwC
+>>>>>>> Stashed changes
+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
@@ -81145,12 +98708,6 @@ eyn
eyn
eyn
eyn
-vFU
-hxj
-qMo
-kYn
-oZf
-vFU
eyn
eyn
eyn
@@ -81161,9 +98718,55 @@ eyn
eyn
eyn
eyn
-rRz
-rRz
-rRz
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+eFC
+eFC
+=======
+kIF
+kIF
+>>>>>>> Stashed changes
+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
@@ -81259,51 +98862,93 @@ 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
-aTW
-aTW
-aTW
-aTW
+azA
+azA
+<<<<<<< Updated upstream
+wRi
+azA
+qLk
+eRO
+eRO
+eRO
+cMj
+hkO
+rrO
+hkO
+ffB
+hkO
+dAp
+azA
+raQ
+azA
+azA
+dWL
+azA
+akv
+mQK
+xic
+jwS
+vju
+uMS
+uMS
+rVP
+wXb
+mnl
+wJq
+lWz
+ffB
+lWz
+nQa
+hsD
+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
-cEy
+vwf
taO
vwf
vwf
@@ -81379,80 +99024,94 @@ eyn
eyn
eyn
eyn
-aHq
-aHq
eyn
eyn
+eyn
+<<<<<<< Updated upstream
+nzO
+=======
+rAT
+>>>>>>> Stashed changes
sQD
ryj
eyn
eyn
eyn
-rtj
-rtj
-rtj
-oxJ
-rFQ
-kVV
-gBE
+eyn
+<<<<<<< Updated upstream
+lxh
+=======
xfJ
+>>>>>>> Stashed changes
+eyn
+eyn
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+lxh
bqb
-bqb
-sJu
-bqb
-qav
-jdp
-oLn
-was
-sJu
-bqb
-ukT
-tDd
-odS
-vSX
-hvs
-bqb
-bqb
-aTG
-bqb
-sJu
-beU
-fDG
-fDG
-fDG
-xyS
-jxc
-rWU
-krJ
-vaH
-cso
+mhi
+=======
+xfJ
+pkq
+qIr
+>>>>>>> Stashed changes
+taO
+cfW
+taO
+taO
+taO
+taO
+<<<<<<< Updated upstream
+lxh
+=======
+xfJ
+>>>>>>> Stashed changes
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
vIm
-gOW
-nFZ
-mTs
-lsU
-lsU
-rtj
-rtj
-rtj
-rtj
-rtj
-rtj
-aHq
+vIm
+=======
+cso
+cso
+>>>>>>> Stashed changes
eyn
eyn
eyn
eyn
eyn
eyn
+<<<<<<< Updated upstream
+eGa
+taO
+vqD
+=======
+tty
+taO
+aAo
+>>>>>>> Stashed changes
eyn
eyn
-mLN
-aqx
-rqP
-lJh
-qMo
-vFU
eyn
eyn
eyn
@@ -81463,17 +99122,42 @@ eyn
eyn
eyn
eyn
-rRz
-rRz
-rRz
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+cyW
+<<<<<<< Updated upstream
+ayt
+=======
+gBQ
+>>>>>>> Stashed changes
azA
azA
azA
azA
+qmk
+qmk
+qmk
+qmk
+qmk
+qmk
+<<<<<<< Updated upstream
+glZ
+glZ
+glZ
+=======
+cIs
+cIs
+cIs
+>>>>>>> Stashed changes
azA
azA
azA
@@ -81560,49 +99244,91 @@ 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
-aTW
-aTW
-aTW
-aTW
-aTW
+azA
+azA
+azA
+<<<<<<< Updated upstream
+wRi
+azA
+eRO
+eRO
+eRO
+eRO
+eRO
+azA
+oQS
+cwi
+uSm
+cwi
+sCu
+gHu
+ntF
+kGR
+kVL
+svx
+svx
+rkZ
+shb
+svx
+vvf
+tzv
+cjF
+hdP
+rVP
+rVP
+ruJ
+kBR
+fwg
+ffB
+uaE
+hkO
+hkO
+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
taO
@@ -81657,7 +99383,7 @@ hqn
qBg
isk
eVf
-gQn
+qWW
qWW
npx
wUj
@@ -81681,80 +99407,52 @@ eyn
eyn
eyn
eyn
-aHq
+eyn
eyn
eyn
oHx
hRb
cHT
-jMc
eyn
-bqb
-rtj
-rtj
-sJu
-oxJ
-oxJ
-bqb
-vpp
-bNV
-nyh
-bpa
-vmi
-bqb
-xHX
+eyn
+cfW
+<<<<<<< Updated upstream
+lAR
+=======
+fVy
+>>>>>>> Stashed changes
+qoT
+taO
+taO
+taO
+taO
+taO
+taO
+taO
+taO
+<<<<<<< Updated upstream
+lbU
+imc
+taO
bBb
+lbU
+taO
+lxh
+=======
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
-eyn
+cRJ
+taO
+tOK
+xHX
+taO
+xfJ
+>>>>>>> Stashed changes
eyn
eyn
eyn
eyn
eyn
eyn
-vFU
-rqP
-ueJ
-uyU
-wwj
-vFU
eyn
eyn
eyn
@@ -81765,32 +99463,96 @@ eyn
eyn
eyn
eyn
-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
+eyn
+kex
+eyn
+eyn
+<<<<<<< Updated upstream
+eFC
+eFC
+=======
+kIF
+kIF
+>>>>>>> Stashed changes
+eyn
+eyn
+eyn
+eyn
+eyn
+taO
+taO
+<<<<<<< Updated upstream
+eFC
+eFC
+eFC
+=======
+kIF
+kIF
+kIF
+>>>>>>> Stashed changes
+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
+<<<<<<< Updated upstream
+nLc
+swK
+rfg
+qmk
+pAK
+hMS
+xSc
+glZ
+=======
+svI
+cXi
+hGN
+qmk
+gEl
+jVw
+fnF
+cIs
+>>>>>>> Stashed changes
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
eyn
eyn
eyn
@@ -81861,50 +99623,92 @@ 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
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
+azA
+azA
+azA
+azA
+<<<<<<< Updated upstream
+wRi
+azA
+yjj
+eRO
+lEm
+eRO
+lEm
+azA
+jpl
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+xic
+xXr
+mQK
+flK
+jwS
+sYW
+rVP
+fvX
+iXU
+dpT
+jwS
+jwS
+nwb
+qmJ
+jwS
+hkO
+uaE
+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
taO
@@ -81983,80 +99787,118 @@ eyn
eyn
eyn
eyn
-aHq
-kVV
+<<<<<<< Updated upstream
+nzO
+kIF
lbU
-ubI
+=======
+rAT
+kVV
+xHX
+>>>>>>> Stashed changes
+bFn
ryj
-xXA
+fDK
jeF
vur
-oWh
+taO
vCm
-nxr
-gXB
-vyT
+urR
+<<<<<<< Updated upstream
+mhi
+taO
+bBb
+=======
+qIr
+taO
tOK
-tZz
-vpp
-vSX
-xHX
+>>>>>>> Stashed changes
+taO
+taO
+taO
+oJW
iLM
-qnM
+<<<<<<< Updated upstream
+tDd
rie
-pKu
-cYL
+taO
+taO
+sJu
+wOi
+taO
+lxh
+=======
+gai
+qwC
+taO
+taO
hKK
-bqb
-wXr
-imc
-esJ
-iFv
-vpp
-vSX
-qCJ
-wjC
-wQl
+wOi
+taO
+xfJ
+>>>>>>> Stashed changes
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
cAe
-bLC
+dDN
bdX
-fDG
-hbU
-bqb
-kVV
-sJu
-bqb
+eGa
+fOW
+wXr
+cDz
+cDz
+cDz
+lCb
+rnY
+taO
+eFC
+eFC
+=======
+mCj
+dDN
+ddE
+tty
+fOW
+xQJ
+rMP
+rMP
+rMP
lCb
vaH
-hSf
-gOW
-dnw
-mFd
-nFZ
-mij
-lsU
-ikE
-rtj
-rtj
-rtj
-rtj
-rtj
-rtj
+taO
+kIF
+kIF
+>>>>>>> Stashed changes
eyn
-aHq
eyn
eyn
eyn
+taO
+fOW
+<<<<<<< Updated upstream
+eFC
+eFC
+eFC
+eFC
+eFC
+=======
+kIF
+kIF
+kIF
+kIF
+kIF
+>>>>>>> Stashed changes
+taO
eyn
eyn
eyn
eyn
-vFU
-bsp
-rqP
-oZf
-oZf
-vFU
eyn
eyn
eyn
@@ -82066,18 +99908,50 @@ eyn
eyn
eyn
eyn
-rRz
-rRz
-rRz
-rRz
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+<<<<<<< Updated upstream
+rav
+=======
+mZg
+>>>>>>> Stashed changes
+dzm
+cyW
+cyW
+cyW
+<<<<<<< Updated upstream
+glZ
+glZ
+glZ
+qmk
+qmk
+glZ
+glZ
+hMS
+jAK
+aaJ
+qmk
+lIs
+aFU
+cEy
+qjd
+=======
+cIs
+cIs
+cIs
+qmk
+qmk
+cIs
+cIs
+jVw
+wLl
+tWr
+qmk
+suY
+aOz
+jfb
+hNm
+>>>>>>> Stashed changes
azA
azA
azA
@@ -82162,51 +100036,85 @@ 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
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
+azA
+azA
+azA
+sqv
+ljW
+azA
+azA
+azA
+azA
+azA
+azA
+<<<<<<< Updated upstream
+jpl
+jwS
+gaX
+sUc
+uza
+jwS
+sdI
+owH
+iph
+jwS
+xic
+xXr
+mQK
+xic
+jwS
+igd
+rVP
+fvX
+sVj
+cdT
+jwS
+rOj
+hxD
+iZh
+jwS
+jwS
+uaE
+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
taO
@@ -82255,7 +100163,7 @@ xjs
slS
spB
slS
-vri
+slS
slS
slS
swY
@@ -82285,101 +100193,162 @@ eyn
eyn
eyn
eyn
-aHq
-dsU
+eyn
+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
+<<<<<<< Updated upstream
+lxh
+taO
+qoT
+taO
+sJu
bFn
-pBl
-lsU
-fMZ
-vpp
-odS
-lbC
-wjC
-wjC
+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
-dpi
-oxQ
-bqb
+ddE
+rDO
+rMP
+>>>>>>> Stashed changes
daT
-fdE
-qHE
-uKy
-fpI
-fpI
-fow
-bcQ
-gOW
-hTU
-wwS
-obz
-rtj
-rtj
-rtj
-rtj
-rtj
rtj
+qHE
+taO
+taO
+taO
+<<<<<<< Updated upstream
+eGa
+eFC
+eFC
+eFC
eyn
eyn
-aHq
-aHq
+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
-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
+eyn
+eyn
+<<<<<<< Updated upstream
+onB
+=======
+uAe
+>>>>>>> Stashed changes
+gmU
azA
+rls
+cyW
+cyW
+<<<<<<< Updated upstream
+glZ
+tOD
+xGA
+gMb
+hMS
+iNn
+qmk
+hMS
+hMS
+hMS
+glZ
+xGn
+nQN
+vkI
+qjd
+=======
+cIs
+rnV
+fKd
+vfb
+jVw
+wQl
+qmk
+jVw
+jVw
+jVw
+cIs
+jlb
+fyN
+cET
+hNm
+>>>>>>> Stashed changes
azA
azA
azA
@@ -82464,51 +100433,91 @@ 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
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
+azA
+azA
+<<<<<<< Updated upstream
+wRi
+jXw
+=======
+pxK
+nNR
+>>>>>>> Stashed changes
+azA
+azA
+azA
+azA
+azA
+<<<<<<< Updated upstream
+pYc
+xUw
+jwS
+qhU
+iDN
+qhU
+jwS
+cPG
+coK
+vbI
+jwS
+xic
+mgD
+mQK
+xic
+jwS
+eYx
+rVP
+beK
+tzv
+tzv
+vvf
+ktI
+guP
+neD
+gcN
+jwS
+ltz
+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
pjw
@@ -82587,101 +100596,180 @@ azA
eyn
eyn
eyn
-aHq
-oTg
+eyn
+dof
wai
-iiA
+dof
sbc
-iIa
-mmm
-uIB
+taO
+taO
+whm
iXz
-tbh
+<<<<<<< Updated upstream
+lAR
lbd
-bHY
-xXA
-nhC
+urR
+taO
+eGa
+=======
+fVy
+lbd
+urR
+taO
+tty
+>>>>>>> Stashed changes
wdx
-cDz
-vSX
-sJu
-bgn
+taO
+taO
+taO
+eyn
+<<<<<<< Updated upstream
lxh
-nYQ
+eyn
tum
-nEL
-nEL
-bqb
-mTQ
-klZ
-krJ
-hnJ
-odS
-odS
-vSX
-gFK
-bqb
-bqb
-kVV
-jxc
-jxc
-bqb
-wjC
+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
-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
+=======
+rMP
+rMP
+jOn
+mBk
+cfW
+taO
+taO
+kIF
+kIF
+kIF
+kIF
+kIF
+kIF
eyn
-aHq
-aHq
+qoT
eyn
eyn
+kIF
+kIF
+qoT
eyn
eyn
eyn
-vFU
-oZf
-qMo
-oZf
-oZf
-wer
-tyk
-cKR
-uKD
-fTI
-wmm
eyn
eyn
eyn
+>>>>>>> Stashed changes
eyn
eyn
-pis
-pmV
-cBf
-cBf
-nrq
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+uYC
+gZe
+jKr
azA
-ndZ
-rDi
-rDi
-uhS
+jzy
+dzm
+cyW
+cyW
+glZ
+hMS
+pkq
+pkq
+pkq
+uZz
+qmk
+hMS
+ckA
+ePf
+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
azA
@@ -82764,53 +100852,95 @@ 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
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+<<<<<<< Updated upstream
+wRi
+qhE
+mLi
+nSc
+odS
+odS
+hux
+jpl
+jwS
+jwS
+niz
+kYv
+qwi
+jwS
+qwi
+qwi
+qwi
+jwS
+jwS
+xXr
+mQK
+jRD
+jwS
+mnl
+uMS
+rVP
+rVP
+rVP
+bZp
+dOD
+sWI
+iZh
+mSa
+jwS
+hkO
+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
-kuV
nDk
uUN
-mcp
-azA
-azA
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
+kQC
+wAK
+kqB
+dZG
+fJE
+qMo
+aAm
+cad
+fJE
+>>>>>>> Stashed changes
+rkv
pjw
pjw
pjw
@@ -82819,7 +100949,7 @@ vwf
vwf
taO
taO
-bwE
+taO
pjw
pjw
pjw
@@ -82889,101 +101019,162 @@ azA
eyn
eyn
eyn
-aHq
+<<<<<<< Updated upstream
+nzO
+=======
+rAT
+>>>>>>> Stashed changes
oTg
-edX
-pJs
-aoD
+dof
+dof
+whm
eyn
-mtT
+fOW
dhI
-cjZ
+taO
pgi
+<<<<<<< Updated upstream
+nYQ
+nEL
+taO
+lAR
+=======
qPh
bqb
-cQi
-oxJ
-aTY
-rbr
+taO
+fVy
+>>>>>>> Stashed changes
+taO
+taO
ivX
-bqb
-bqb
-xHX
-wob
-xHX
-sJu
-nyh
-bqb
-yiF
-qjb
-vpp
-odS
-tsn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+mhi
+taO
+rie
+rnY
+taO
oJW
-odS
-lbC
-dXO
-lsU
-wWz
-yaS
-lsU
-lsU
-wWz
-mqN
-wjC
+tDd
+taO
+rnY
+taO
+uTy
+=======
+qIr
+taO
+qwC
+vaH
+taO
+oJW
+gai
+taO
+vaH
+taO
+sZZ
+>>>>>>> Stashed changes
+aHq
+eyn
+eyn
+aHq
+eyn
+eyn
kex
-wjC
-bOc
-bLC
+eyn
+eyn
+eyn
ijh
-bqb
-iFf
-wwS
-tgI
-ofg
-qOs
-rtj
-rtj
-rtj
+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
-aHq
eyn
eyn
eyn
eyn
eyn
-vFU
-tUc
-qMo
-rNx
-qMo
-hfR
-tyk
-qoT
-taO
-rDO
-aPP
eyn
eyn
+eyn
+cyW
+voU
+dzm
+<<<<<<< Updated upstream
+myC
+iRo
+dzm
+sHC
+cyW
+cyW
+qmk
+pyY
+pkq
+jmW
+jmW
+hMS
+qmk
+pVs
+qmk
+glZ
+glZ
+bLf
+hMS
+aoB
+=======
+amC
+uLU
+dzm
+rtI
+cyW
+cyW
+qmk
qzy
tqM
hMS
-kuV
-qfO
-qfO
-qfO
-nIX
-cjq
-ndZ
-qfO
-qfO
-nrq
-azA
+hMS
+jVw
+qmk
+hMe
+qmk
+cIs
+cIs
+gMH
+jVw
+rfW
+>>>>>>> Stashed changes
+qmk
azA
azA
azA
@@ -83066,25 +101257,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
@@ -83092,26 +101264,86 @@ azA
azA
azA
azA
+<<<<<<< Updated upstream
+wRi
+pCk
+vbB
+odS
+odS
+mHY
+bgm
+jpl
+jwS
+cgu
+qhU
+smC
+qhU
+sEV
+qhU
+qhU
+qhU
+qhU
+jwS
+mgD
+mQK
azA
-rRz
-eyn
-eyn
-kuV
-kuV
-kuV
+jwS
+dVp
+rVP
+aaR
+wJx
+cEN
+jwS
+nTw
+dOD
+ifQ
+aMB
+gcN
+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
-efz
+dZG
qPf
-eyn
-uhS
-azA
-azA
-aTW
-aTW
-aTW
-aTW
-aTW
+uUN
+mLN
+vxu
+fWw
+dZG
+fJE
+fJE
+fJE
+>>>>>>> Stashed changes
+rkv
aTW
pjw
pjw
@@ -83191,101 +101423,163 @@ azA
eyn
eyn
eyn
-aHq
-aHq
eyn
-kVV
+<<<<<<< Updated upstream
+nzO
+nzO
+=======
+rAT
+rAT
+>>>>>>> Stashed changes
eyn
eyn
eyn
+eyn
+lSV
+taO
+<<<<<<< Updated upstream
+eGa
+taO
+vwC
+=======
+tty
+taO
oxJ
-nhC
-oxJ
-dGM
-oxJ
+>>>>>>> Stashed changes
fDK
-voS
-lbC
-mER
-vpp
-plu
-hnJ
-odS
-odS
-vSX
-rIY
-lsU
-okQ
-qen
-hnJ
-odS
-mDw
-mhe
-mcv
-odS
-vSX
-xuQ
-tgI
+taO
+taO
+taO
+taO
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+taO
+<<<<<<< Updated upstream
+eGa
+qoT
+taO
+lxh
+cfW
+taO
+rnY
+yiF
+aHq
+bRy
+qIr
+=======
+tty
+qoT
+taO
+xfJ
+cfW
+taO
+vaH
lsU
-rWU
-qHu
+aHq
+cYT
gzM
-lsU
-mqN
-bqb
-srr
-cRj
-cRj
-pXQ
-vTF
-eDc
-fpI
-wwS
-wWz
-lsU
-nkI
-rtj
-rtj
-rtj
+>>>>>>> Stashed changes
+kex
+aHq
+aHq
+aHq
eyn
eyn
eyn
eyn
eyn
eyn
-aHq
+<<<<<<< Updated upstream
+eFC
+=======
+kIF
+>>>>>>> Stashed changes
eyn
eyn
eyn
eyn
+<<<<<<< Updated upstream
+cDz
+fMZ
+qKE
eyn
-vFU
-lLC
-rhY
-rhY
-rtI
-vFU
eyn
-muq
-whm
-xae
-taO
-tyk
-taO
-taO
-aPP
+eFC
+eFC
+=======
+rMP
+tbB
+iNn
+eyn
+eyn
+kIF
+kIF
+>>>>>>> Stashed changes
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+cyW
+<<<<<<< Updated upstream
+sHC
+sHC
+=======
+rtI
+rtI
+>>>>>>> Stashed changes
+azA
+ttF
+dzm
+cyW
+cyW
+cyW
+<<<<<<< Updated upstream
+xPY
+uSv
+hMS
+jmW
+gbF
+nSW
+nQN
+wer
+hMS
+bHY
+hMS
+hMS
+hMS
+hMS
+hwJ
+=======
+wAn
+iwR
+jVw
+hMS
knH
-mTb
+aQx
fyN
-aiJ
-cBf
+kVw
+jVw
ciV
-cBf
-jJJ
-pVs
-qfO
-nrq
-azA
+jVw
+jVw
+jVw
+jVw
+eIx
+>>>>>>> Stashed changes
+qmk
azA
azA
azA
@@ -83368,26 +101662,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
@@ -83395,25 +101669,86 @@ azA
azA
azA
azA
+<<<<<<< Updated upstream
+wRi
+aUc
azA
-eyn
-gAg
-oiF
-ecc
-oiF
-eyn
-eyn
-asc
-eyn
-eyn
-nrq
-mcp
+quf
+odS
+odS
+odS
+jpl
+lIh
+qhU
+qhU
+qkq
+dku
+dku
+dku
+dku
+dku
+ddQ
+lee
+qOY
+mQK
+jRD
+jwS
+jwS
+bZp
+jwS
+jwS
+jwS
+jwS
+jwS
+tOr
+dEw
+iZh
+dOD
+qOV
+jwS
+jwS
+jwS
+=======
+pxK
+aUc
azA
-aTW
-aTW
-aTW
-aTW
-aTW
+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
lqh
@@ -83494,60 +101829,70 @@ azA
eyn
eyn
eyn
-aHq
-aHq
eyn
eyn
eyn
eyn
eyn
eyn
-oMD
+eyn
+<<<<<<< Updated upstream
+oHW
+taO
+bBb
+eME
+taO
+rnY
+taO
+fOW
+lxh
+=======
+cGR
+taO
+tOK
+pBu
+taO
+vaH
+taO
+fOW
+xfJ
+>>>>>>> Stashed changes
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+lxh
+=======
+xfJ
+>>>>>>> Stashed changes
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
+<<<<<<< Updated upstream
+hLN
+vpp
+kqJ
+=======
krJ
-rPw
-bqb
-qeM
-cRj
-sXY
-cRj
-vCm
-pXQ
-qJO
-pMr
-lsU
-krJ
-hMe
-rtj
-rtj
+yaS
+rWU
+>>>>>>> Stashed changes
+aHq
eyn
eyn
eyn
@@ -83555,39 +101900,84 @@ eyn
eyn
eyn
eyn
-aHq
-aHq
eyn
eyn
eyn
+<<<<<<< Updated upstream
+eFC
+eFC
+eFC
+eFC
+eFC
+eFC
eyn
-vFU
-vFU
-vFU
-vFU
-vFU
-vFU
+eFC
+eFC
+=======
+kIF
+kIF
+kIF
+kIF
+kIF
+kIF
eyn
+kIF
+kIF
+>>>>>>> Stashed changes
eyn
-pVI
+eyn
+eyn
+eyn
+eyn
+eyn
+azA
+cyW
+cyW
+qmk
+qmk
+qmk
+qmk
+qmk
+qmk
+<<<<<<< Updated upstream
+ayt
+wde
+azA
+glZ
+hMS
+oAB
+nQN
+nQN
+czh
+gYw
+avs
+raf
+iva
+hMS
+hMS
+hMS
+fWM
+qjd
+=======
gBQ
-qoT
-tyk
-jfb
-rDO
+tLV
+azA
+cIs
+jVw
xae
-paG
-mTb
fyN
-cBf
-cBf
-uSL
-cBf
-cBf
-nFD
-qfO
-nrq
-azA
+fyN
+lDC
+ngc
+fDS
+raG
+vtQ
+jVw
+jVw
+jVw
+bdX
+hNm
+>>>>>>> Stashed changes
azA
azA
azA
@@ -83670,28 +102060,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
@@ -83699,23 +102067,85 @@ azA
azA
azA
azA
+sqv
+<<<<<<< Updated upstream
+cbD
azA
azA
azA
+quf
+mHY
+fmC
+jwS
+sNg
+rPe
+coK
+mdI
+xwC
+cKM
+ffw
+qsE
+cKM
+qha
+xXr
+qGg
+hPh
+tXn
+gvD
+gvD
+mab
+kLD
+mvF
+ofe
+jwS
+sgR
+mcV
+thp
+sWI
+dOD
+xOc
+rXw
+jwS
+=======
+qOr
azA
-snR
-eyn
-eyn
-eyn
-nDt
-ctN
azA
azA
-aTW
-aTW
-aTW
-aTW
-aTW
+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
vwf
@@ -83727,10 +102157,10 @@ pjw
neZ
taO
taO
-cEy
+vwf
vwf
hAb
-cEy
+vwf
vwf
mkQ
pjw
@@ -83797,59 +102227,72 @@ eyn
eyn
eyn
eyn
-aHq
eyn
eyn
eyn
eyn
-xvT
+eyn
+eyn
+<<<<<<< Updated upstream
+mhi
+lAR
+taO
+ddn
+taO
+mAQ
+taO
+lxh
+=======
qIr
fVy
+taO
+eyd
+taO
+mAQ
+taO
+xfJ
+>>>>>>> Stashed changes
eyn
eyn
-wDP
-mAQ
-fAj
-odS
-cDz
-cDz
-odS
-odS
-cDz
-odS
-hnJ
-eGk
-odS
-odS
-cDz
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+lxh
+ezC
+=======
+xfJ
nZP
-odS
-odS
-edn
-rDQ
-adi
-adi
-odS
-hnJ
-lbC
-lsU
-wWz
+>>>>>>> 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
-kbo
-gTS
-cRj
-cRj
-cRj
-hWU
-fUm
-yaS
-unT
-kqJ
-rtj
-rtj
-rtj
+aHq
eyn
eyn
eyn
@@ -83858,38 +102301,91 @@ eyn
eyn
eyn
eyn
-aHq
+eyn
+<<<<<<< Updated upstream
+eFC
+eFC
+eFC
eyn
eyn
eyn
+eFC
eyn
eyn
+eFC
+=======
+kIF
+kIF
+kIF
eyn
eyn
eyn
+kIF
eyn
eyn
+kIF
+>>>>>>> Stashed changes
eyn
eyn
eyn
-nNE
eyn
eyn
-iva
-gBQ
+azA
+azA
+dzm
+<<<<<<< Updated upstream
+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
+=======
+rtI
+qmk
+ofx
+nfd
+hgr
+qmk
+qmk
+nNE
+dzm
+wlS
+cIs
vfX
-aXd
-kuV
-qfO
+vfX
+qmk
+eJl
jVw
-cBf
-oWA
-cBf
-cBf
-qfO
-qfO
-nrq
-azA
+jVw
+jVw
+jVw
+jVw
+jVw
+jVw
+jVw
+eIx
+hNm
+>>>>>>> Stashed changes
azA
azA
azA
@@ -83979,45 +102475,86 @@ azA
azA
azA
azA
-azA
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-aTW
-azA
-jKr
-azA
-azA
-azA
+<<<<<<< Updated upstream
+wRi
+ljW
+fZL
+ivD
+fZL
azA
azA
+jpl
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+ofR
+sQJ
+sQJ
+lGm
+sQJ
+wIT
+uCa
+sFL
+foA
+uRF
+jwS
+sgR
+uIh
+sEn
+guP
+guP
+ktI
+xJc
+jwS
+=======
+pxK
+ljW
+fZL
+hox
+fZL
azA
azA
-ndZ
-rDi
-rDi
+mnX
+dZG
+dZG
+dZG
+dZG
+dZG
+dZG
+dZG
+dZG
+dZG
+dZG
+dZG
+soY
+kMT
+kMT
+qil
+kMT
yhZ
-uhS
-gAg
-wTQ
-wTQ
-eyn
-ctN
-azA
-azA
-azA
-azA
-azA
-aTW
-aTW
-aTW
+wsn
+icM
+faX
+qmg
+dZG
+pVI
+ucQ
+ckR
+bVN
+bVN
+ddY
+vBr
+dZG
+>>>>>>> Stashed changes
+rkv
aTW
taO
vwf
@@ -84099,58 +102636,30 @@ eyn
eyn
eyn
eyn
-aHq
-aHq
eyn
eyn
-wjC
-qOX
-xGn
-ayt
-neZ
eyn
-wKv
+eyn
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+lAR
+rnY
+taO
+taO
fDt
-hya
-rPw
-pxT
-fDn
-vpp
-vSX
-sEv
-shY
-cDz
-odS
-cDz
-vSX
-wWz
-wCM
-vpp
-hak
-qKf
-cKM
-iap
-pDb
-mca
-odS
-odS
-ewE
-ewE
-vSX
-sEs
-wjC
-bqb
-bqb
-cml
-cRj
-dUo
-bqb
-bZG
-bqb
-kVV
-bqb
-bqb
-rtj
+lxh
+=======
+fVy
+vaH
+taO
+taO
+fDt
+xfJ
+>>>>>>> Stashed changes
+eyn
+eyn
eyn
eyn
eyn
@@ -84158,40 +102667,130 @@ eyn
eyn
eyn
eyn
+<<<<<<< Updated upstream
+lxh
+taO
+mhi
+=======
+xfJ
+taO
+qIr
+>>>>>>> Stashed changes
+taO
+cwT
+dof
+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
+taO
+taO
+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
eyn
eyn
-eyn
+azA
+azA
+azA
+azA
+<<<<<<< Updated upstream
+glZ
+cym
+=======
+cIs
+nei
+>>>>>>> Stashed changes
+lQS
+qmk
+qmk
+qmk
+<<<<<<< Updated upstream
+vNq
+sLD
+rBH
+sPx
+aSp
+eww
+iSc
+kiH
+hMS
+hMS
+nQN
+nQN
+rGU
+iFi
+hMS
+hMS
+aFU
+=======
+eZS
+reP
+aJw
+xmv
aaJ
caI
-mTb
-kuV
-qfO
-jLT
-nvF
-qfO
-bYd
-cBf
-uwq
-cBf
-kiP
-uhS
+psk
+ocb
+jVw
+jVw
+fyN
+fyN
+wnE
+sLe
+jVw
+jVw
+aOz
+>>>>>>> Stashed changes
+qmk
azA
azA
azA
@@ -84281,45 +102880,71 @@ azA
azA
azA
azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
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
+wBl
+wsd
+wsd
+wpV
+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
+wsd
+ckK
+rOi
+rmK
+wsd
+wsd
+<<<<<<< Updated upstream
+bEf
+bEf
+ycM
+pBr
+dOD
+sWI
+fbM
+qft
+jwS
+=======
+xgV
+xgV
+btx
+sdP
+uUN
+kQC
+oGp
+wnP
+dZG
+>>>>>>> Stashed changes
+rkv
aTW
neZ
vwf
@@ -84402,100 +103027,160 @@ eyn
eyn
eyn
eyn
-aHq
-aHq
eyn
-qPh
-qPh
-qrK
+eyn
+eyn
+eyn
+eyn
+eyn
kHo
+<<<<<<< Updated upstream
+lxh
+taO
+taO
+kVV
+lxh
+=======
+xfJ
+taO
+taO
+mDT
+xfJ
+>>>>>>> Stashed changes
eyn
eyn
eyn
-wid
-xpW
-fGd
-tzN
-krJ
-iBL
-nXi
-wEO
-fGd
-reP
-ivX
-fGd
-shY
-lbC
+eyn
+eyn
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+lxh
+qoT
+pRi
+taO
+rWU
+rPw
+=======
+xfJ
+qoT
+nyh
+taO
sBk
raQ
-ugZ
-bzD
-fqh
-iap
-iap
-vGz
-odS
-vSX
-qHu
-hbo
-vpp
-hnJ
-hnJ
-lbC
-bqb
-kVV
-aZg
-wjC
-bqb
-rQn
-bqb
-tts
-dZa
-bqb
-bqb
-bqb
+>>>>>>> Stashed changes
eyn
-nzO
-vKH
-eFC
-bqb
eyn
eyn
eyn
eyn
+vGz
+taO
+taO
aHq
eyn
+<<<<<<< Updated upstream
+vpp
+gBE
+=======
+yaS
+hnJ
+>>>>>>> Stashed changes
eyn
eyn
eyn
+taO
+taO
+taO
+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
eyn
-eyn
-eyn
-rRz
-rRz
-mTb
-kuV
-qfO
-qfO
-qfO
-qfO
-cBf
-cBf
-cBf
-cBf
-cBf
-nrq
azA
azA
+azA
+azA
+azA
+<<<<<<< Updated upstream
+glZ
+bUW
+vAW
+qcJ
+lQS
+glZ
+sKj
+kaU
+sLD
+kaf
+aLq
+jKr
+wWn
+qmk
+dZQ
+qgV
+niG
+wCT
+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
+azA
foz
azA
mpc
@@ -84573,54 +103258,81 @@ 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
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
azA
azA
-azA
-azA
-azA
-dzm
-azA
-azA
-azA
-azA
-snR
-rRz
-rRz
-cBf
-kiP
-tDV
-azA
-azA
-azA
+ljW
+ahs
+<<<<<<< Updated upstream
+qmg
+ioi
+rma
+=======
+isI
+ioi
+eWg
+>>>>>>> Stashed changes
+eDX
+eAw
+eAw
+wwd
+gpB
+eDX
+eAw
+eAw
+<<<<<<< Updated upstream
+glf
+eAw
+lKQ
+=======
+eBB
+eAw
+qEp
+>>>>>>> Stashed changes
+eAw
+eAw
+eAw
+eAw
+eAw
+eAw
+eAw
+ioi
+eAw
+eAw
+eAw
+<<<<<<< Updated upstream
+ozi
+ndc
+gFV
+dOD
+sWI
+sWI
+pUW
+jwS
+=======
uKU
hZE
-rRz
-nrq
-azA
-azA
-azA
-aTW
+jbp
+uUN
+kQC
+kQC
+cjq
+dZG
+>>>>>>> Stashed changes
aTW
aTW
pjw
@@ -84705,98 +103417,181 @@ eyn
eyn
eyn
eyn
-aHq
+<<<<<<< Updated upstream
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
+eyn
+eyn
+eyn
+bdR
+wSO
+dof
+dof
+cRJ
+aHq
+eyn
+uTy
+uTy
+eyn
+eyn
+eGa
+fOW
lKN
-hqC
-fIO
-fIO
-udz
-wpV
-bqb
-bqb
+eyn
+taO
+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
+vyT
+eFC
+taO
eyn
+kIF
eyn
eyn
+jge
+kIF
+taO
eyn
eyn
+<<<<<<< Updated upstream
+=======
eyn
-rRz
-rRz
-rRz
-rRz
-pis
-qfO
-avw
-jJJ
-pis
-cBf
-cBf
-pis
-cBf
-nDt
-ctN
+>>>>>>> Stashed changes
+azA
+azA
+azA
+azA
azA
+<<<<<<< Updated upstream
+bnJ
+vOh
+xNV
+ijZ
+oWA
+glZ
+sKj
+sKj
+hrf
+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
azA
azA
azA
@@ -84885,48 +103680,78 @@ azA
azA
azA
azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
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
+qzA
+eDX
+eAw
+<<<<<<< Updated upstream
+lKQ
+=======
+qEp
+>>>>>>> Stashed changes
+arq
+tPS
+tPS
+tPS
+tPS
+tPS
+tPS
+tPS
+cNV
+cNV
+<<<<<<< Updated upstream
+nPi
+tPS
+tPS
+tPS
+nrn
+nrn
+nrn
+nrn
+=======
+xln
+tPS
+tPS
+tPS
+dqu
+dqu
+dqu
+dqu
+>>>>>>> Stashed changes
+tPS
+tPS
+tPS
+tPS
+<<<<<<< Updated upstream
+jEq
+heA
+sFe
+jGT
+gWT
+dOD
+tQX
+pEl
+=======
+nKO
+lZM
+rjG
+hyP
+skp
+uUN
+ozt
+nem
+>>>>>>> Stashed changes
aTW
aTW
pjw
-cEy
+vwf
taO
vwf
vwf
@@ -84937,13 +103762,13 @@ khZ
taO
taO
taO
-bwE
+taO
vwf
vwf
vwf
vwf
vwf
-bwE
+taO
neZ
iPb
mEB
@@ -85007,98 +103832,161 @@ eyn
eyn
eyn
eyn
-aHq
eyn
-bqb
-pXt
-oKZ
-kTQ
-fvm
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
mVp
+taO
+<<<<<<< Updated upstream
+kVV
+=======
+mDT
+>>>>>>> Stashed changes
+taO
eyn
-bqb
-uBz
-vkI
-wPK
-pkq
-jcO
-bqb
-eDU
-nMC
-bki
-xmD
-bki
-qwC
-shY
-vSX
-lsU
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+lxh
+eyn
+eyn
+cRj
+tNM
+sJu
+rDO
fop
+=======
+xfJ
+eyn
+eyn
+pxT
+tNM
+hKK
+rDO
shY
-xAJ
-vfL
-vwC
-odS
-vSX
-lsU
-wWz
-qHu
-pVG
-bpn
-cDz
-cDz
-odS
-cDz
-cDz
-odS
-odS
-rPw
-wYD
-fOW
-fIO
-udz
-nTz
-fSZ
-fIO
-qPa
-qob
-qob
-dzd
-bqb
+>>>>>>> Stashed changes
+eyn
eyn
eyn
eyn
+eyn
+<<<<<<< Updated upstream
+ggj
+wSO
+=======
+vfL
+vwC
+>>>>>>> Stashed changes
+dof
+dof
+dof
aHq
eyn
+taO
+qoT
+fOW
eyn
+iTe
+<<<<<<< Updated upstream
+sJu
+=======
+hKK
+>>>>>>> Stashed changes
+taO
eyn
eyn
+taO
+qoT
+taO
+taO
eyn
eyn
eyn
eyn
+<<<<<<< Updated upstream
+eFC
+eFC
eyn
+taO
+eFC
+eFC
eyn
eyn
eyn
+qHy
+goG
+=======
+kIF
+kIF
eyn
+taO
+kIF
+kIF
eyn
eyn
-rRz
-rRz
-rRz
-rRz
-wTQ
-ucV
-nAV
-jJJ
-jJJ
-cBf
-cBf
-rjL
-rjL
-nrq
+eyn
+hQq
+qwc
+>>>>>>> Stashed changes
+azA
+azA
azA
azA
+<<<<<<< Updated upstream
+bnJ
+ixw
+jsI
+suy
+lQS
+glZ
+glZ
+qmk
+ehF
+kaU
+jOa
+jOa
+diG
+qmk
+lSG
+mLN
+bGS
+qQM
+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
azA
azA
azA
@@ -85187,44 +104075,73 @@ azA
azA
azA
azA
+sqv
+qhE
azA
azA
-azA
-snR
-xey
-uSL
+xxH
+lmd
+<<<<<<< Updated upstream
+xAJ
+xxN
+=======
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
+dUX
+>>>>>>> Stashed changes
+eJc
+eJc
+tPS
+tPS
+tPS
+tPS
+tPS
+<<<<<<< Updated upstream
+nrn
+uVv
+nrn
+xxN
+tPS
+tPS
+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
+dan
+vDH
+dOD
+aZK
+uQU
+=======
+nKO
+sEN
+lAl
+bjZ
+pzj
+uUN
+wlq
+vgK
+>>>>>>> Stashed changes
aTW
rjL
taO
@@ -85309,98 +104226,172 @@ 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
+<<<<<<< Updated upstream
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
+=======
+qPh
+mDT
+tty
+>>>>>>> Stashed changes
+tJl
eyn
eyn
+taO
+<<<<<<< Updated upstream
+sry
eyn
eyn
-aHq
+rnY
+=======
+cRc
+eyn
+eyn
+vaH
+>>>>>>> Stashed changes
+taO
+taO
+taO
+eyn
eyn
eyn
eyn
+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
+taO
+eGa
+gbB
+fIO
+rnY
eyn
eyn
+eGa
+eFC
+eFC
+eFC
+eFC
+eFC
+eFC
eyn
eyn
-rRz
-rRz
-rRz
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
-jJJ
-jJJ
-jJJ
-cBf
+ucV
+ucV
+tSO
+rXx
tCm
-rjL
-nrq
+exm
+mZc
+cyW
+>>>>>>> Stashed changes
+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
@@ -85425,7 +104416,7 @@ azA
azA
azA
azA
-azA
+eyn
eyn
eyn
eyn
@@ -85489,44 +104480,75 @@ 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
+<<<<<<< Updated upstream
+wRi
+ljW
azA
-gAg
-jbl
-rRz
-rRz
-cBf
-nrq
azA
-pzj
-rRz
-rRz
-nDt
-ctN
+bpa
+lmd
+tPS
+soo
+=======
+pxK
+ljW
azA
azA
-aTW
-aTW
+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
+rmK
+iwB
+tPS
+tPS
+luk
+bho
+wsd
+wsd
+<<<<<<< Updated upstream
+ozi
+syx
+iZh
+dOD
+dOD
+dOD
+dOD
+wJq
+=======
+uKU
+hwp
+wAK
+uUN
+uUN
+uUN
+uUN
+nJY
+>>>>>>> Stashed changes
aTW
taO
taO
@@ -85612,95 +104634,155 @@ 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
+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
+taO
eyn
+aHq
eyn
+wOi
+wOi
+taO
eyn
eyn
+taO
+cfW
eyn
eyn
eyn
+taO
+<<<<<<< Updated upstream
+sJu
+urR
+rnY
eyn
eyn
+cfW
+eFC
+eFC
+eFC
+eFC
+eFC
+=======
+hKK
+urR
+vaH
eyn
eyn
+cfW
+kIF
+kIF
+kIF
+kIF
+kIF
+>>>>>>> Stashed changes
+fOW
eyn
eyn
-rRz
-rRz
-rRz
-rRz
-uhS
azA
-qfO
+azA
+<<<<<<< Updated upstream
+jpl
+=======
+mnX
+>>>>>>> Stashed changes
+azA
+azA
+azA
+azA
+azA
+<<<<<<< Updated upstream
+eTC
+tyt
+pev
+dJs
+cIs
+lQS
+eTC
+gXS
+wjo
+mag
+jKr
+mQG
+glZ
+jAz
+wwK
+tVb
+tVb
+pkU
+pqV
+lqA
+hpZ
+=======
+xGn
+nEL
+cgu
+dJs
+okx
+lQS
+xGn
+gXS
+sUt
+rDQ
+jKr
+ebh
+cIs
+lVo
jsI
-jJJ
-jJJ
-qfO
+qSB
+qSB
+ktB
aZV
-rjL
-rjL
-nrq
+jdp
+eUG
+>>>>>>> Stashed changes
+mZc
azA
azA
azA
@@ -85727,7 +104809,7 @@ azA
azA
azA
azA
-azA
+eyn
eyn
eyn
eyn
@@ -85789,46 +104871,79 @@ tey
bji
azA
azA
+ckU
azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
azA
azA
-azA
-azA
-snR
-eiU
-aCp
-avm
-cBf
-cBf
-rKE
-aXb
-xUu
-hUC
-cBf
-kiP
+qhE
+ahs
+lmd
+kdY
+<<<<<<< Updated upstream
+eJl
+=======
+wnb
+>>>>>>> Stashed changes
+kdY
+tPS
+eJc
+tPS
+ahs
+<<<<<<< Updated upstream
+pgX
+nht
+nht
+eHQ
+kge
+bSZ
+aTq
+hwA
+qZA
+lZG
+=======
+rYE
mur
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-gAg
-jbl
-rRz
-rRz
-nrq
-azA
-gAg
-wTQ
-wTQ
-ctN
-azA
-azA
-azA
-azA
-aTW
+mur
+cDX
+kge
+ufJ
+wQF
+hwA
+qZA
+mpv
+>>>>>>> Stashed changes
+lmd
+tPS
+eJc
+tPS
+xxH
+asH
+<<<<<<< Updated upstream
+slr
+jwS
+sht
+wzT
+lbu
+vnW
+sWI
+nDB
+kBR
+=======
+nDi
+dZG
+vCU
+eEd
+fBA
+bGr
+kQC
+kqQ
+dZQ
+>>>>>>> Stashed changes
aTW
taO
jhX
@@ -85914,95 +105029,150 @@ 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
+<<<<<<< Updated upstream
+lxh
+taO
+kVV
+taO
+rnY
+eyn
+tNM
+kST
+dof
+cgQ
+tDd
+=======
+xfJ
+taO
+mDT
+taO
+vaH
+eyn
+tNM
+xSm
+dof
+cNI
+gai
+>>>>>>> Stashed changes
+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
+<<<<<<< Updated upstream
+euK
+taO
eyn
eyn
+rnY
+eFC
+eFC
+eFC
eyn
+rbl
+=======
+vHR
+taO
eyn
eyn
+vaH
+kIF
+kIF
+kIF
eyn
+sWI
+>>>>>>> Stashed changes
eyn
eyn
-rRz
-rRz
-rRz
-cBf
-cBf
-nrq
-ndZ
-qfO
-qfO
-qfO
-qfO
-qfO
-jJJ
-cBf
-nDt
-ctN
+azA
+azA
+azA
+<<<<<<< Updated upstream
+jpl
+=======
+mnX
+>>>>>>> Stashed changes
+azA
+azA
+azA
+azA
+azA
+<<<<<<< Updated upstream
+mrl
+caI
+xrs
+lQS
+kSD
+mfx
+eTC
+kkF
+sdV
+azA
+nPV
+glZ
+glZ
+wwK
+wIC
+qhG
+sNB
+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
azA
@@ -86029,8 +105199,8 @@ azA
azA
azA
azA
-azA
-azA
+eyn
+eyn
eyn
eyn
eyn
@@ -86093,44 +105263,83 @@ dzm
azA
azA
azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
azA
+aUc
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
+<<<<<<< Updated upstream
+oiL
+btN
+kaI
+oKZ
+=======
+ueJ
+iED
+stT
+lJh
+>>>>>>> Stashed changes
+rVM
+tPS
+luk
+ahs
+<<<<<<< Updated upstream
+bGL
+jwS
+jwS
+waW
+jwS
+jwS
+lLc
+jwS
+jwS
+rkr
+bDr
+nrn
+qtr
+eJc
+aOB
+eAw
+aKG
+ozi
+fLu
+iZh
+eMZ
+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
@@ -86217,56 +105426,43 @@ azA
azA
eyn
eyn
-aHq
-aHq
-bqb
eyn
eyn
eyn
eyn
-bqb
-bqb
-bqb
-qiE
-gLH
-bGB
-bqb
-lsU
-cwT
-bki
-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
+taO
+<<<<<<< Updated upstream
+mLX
+lbU
+fDK
+eyn
+cce
+taO
+etj
+cQJ
+=======
+hKn
+xHX
+fDK
+eyn
+gLH
+taO
+iVA
+iVM
+>>>>>>> Stashed changes
+cwT
+taO
+xmD
+eyn
+eyn
+noM
+eyn
+eyn
+eyn
+<<<<<<< Updated upstream
+=======
eyn
eyn
eyn
@@ -86275,35 +105471,115 @@ eyn
eyn
eyn
aHq
+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
eyn
eyn
eyn
+dGM
+iTe
+taO
eyn
-rRz
-rRz
-rRz
-xIk
-cBf
-cBf
-nrq
-snR
-qfO
+eyn
+eyn
+eyn
+jpl
+azA
+azA
+azA
+jpl
+=======
+mnX
+azA
+azA
+azA
+mnX
+>>>>>>> Stashed changes
+azA
+azA
+azA
+azA
+hay
+qmk
+<<<<<<< Updated upstream
+fhl
+xDd
+tyt
+rIb
+kKl
+qmk
+ndw
+vNq
+nqp
+dzm
+glZ
+pwi
+wIC
+bGH
+fwZ
+tVb
+oEK
+sNB
+pdF
+=======
+rZe
+ayd
+nEL
+qMj
+hDp
+qmk
+swK
+eZS
+dnM
+dzm
+cIs
+kma
+ucV
sFB
-jJJ
-jJJ
+rnb
+qSB
xNV
-jJJ
-cBf
-nrq
+lCr
+nJv
+>>>>>>> Stashed changes
+qmk
azA
azA
azA
@@ -86331,8 +105607,8 @@ azA
azA
azA
azA
-azA
-azA
+eyn
+eyn
eyn
eyn
eyn
@@ -86395,44 +105671,84 @@ azA
azA
azA
azA
+<<<<<<< Updated upstream
+wRi
azA
+jUr
+aci
+myg
+lJf
+bjo
+kaI
+nZE
+=======
+pxK
azA
-azA
-ljW
-azA
-azA
-azA
-gAg
+jUr
+drR
+yap
+yjE
+esJ
+stT
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
+>>>>>>> Stashed changes
+tPS
+tPS
+luk
+cAr
+<<<<<<< Updated upstream
+bGL
+jwS
+iNl
+rhc
+iho
+enU
+tKO
+fYh
+jwS
+qBe
+ady
+nrn
+nrn
+tPS
+tPS
+nrn
+nrn
+sqk
+jGT
+lAJ
+blA
+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
@@ -86517,58 +105833,73 @@ azA
azA
azA
azA
-azA
+<<<<<<< Updated upstream
+eyn
+eyn
+eyn
+eyn
+eyn
+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
+eyn
eyn
eyn
aHq
aHq
-aHq
-aHq
-aHq
+eyn
+tyk
+uTy
+=======
eyn
eyn
eyn
-bqb
-bqb
+eyn
+eyn
+eyn
+eyn
+eyn
+taO
+mDT
+gai
+taO
+xfJ
nyh
-wjC
-bqb
-tgI
-oPU
+taO
+xfJ
+eyn
+eyn
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
-sWI
-blR
-fBA
-fIO
-fIO
-qnM
-fOW
-qPh
+taO
+taO
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
eyn
eyn
eyn
@@ -86578,11 +105909,24 @@ eyn
aHq
aHq
eyn
+tyk
+sZZ
+>>>>>>> Stashed changes
+taO
+taO
+taO
eyn
eyn
eyn
eyn
eyn
+<<<<<<< Updated upstream
+rnY
+eGa
+=======
+vaH
+tty
+>>>>>>> Stashed changes
eyn
eyn
eyn
@@ -86590,23 +105934,73 @@ eyn
eyn
eyn
eyn
-rRz
-rRz
-rRz
-xIk
-cBf
-nDt
+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
+qmk
+shL
+qmk
+bxu
+qmk
+sZP
+rOv
+aso
+sLD
+glZ
+bsp
+cHW
+wIC
+yka
+iwk
+pkU
+fLP
+ikE
+=======
+ezz
+qmk
+aFA
+qmk
+fMZ
+qmk
+aFA
+qmk
+bLe
+sKv
+uMY
+reP
cIs
-snR
-qfO
-jJJ
-cBf
-cBf
-jJJ
-jJJ
-cBf
-kiP
-uhS
+jCV
+xfn
+ucV
+gWU
+tjz
+ktB
+xvT
+yfI
+>>>>>>> Stashed changes
+qmk
+azA
azA
ndZ
uhS
@@ -86633,9 +106027,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
eyn
eyn
eyn
@@ -86697,47 +106091,82 @@ azA
gvU
azA
azA
+sqv
+qhE
azA
azA
-azA
-ndZ
-wfv
-wfv
-uhS
-azA
-gAg
-jbl
-cBf
-nDt
-bYm
+ahs
+<<<<<<< Updated upstream
+pMr
+bVN
+ikh
+pxT
+=======
+cqs
+aZg
+guj
+fne
+>>>>>>> Stashed changes
+tPS
+eJc
+eJc
+xxH
+<<<<<<< Updated upstream
+oMY
+nwb
+jau
+rhc
+bYl
+slq
+rhc
+rhc
+jwS
+dsv
+fPf
+tPS
+nrn
+tPS
+tPS
+nrn
+tPS
+sqk
+qTD
+nyy
+ste
+vDH
+dOD
+aZK
+jwS
+=======
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
+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
-jYM
+aRK
aRK
aRK
lSV
@@ -86820,56 +106249,43 @@ azA
azA
azA
azA
-azA
eyn
eyn
eyn
eyn
eyn
-aHq
-aHq
-aHq
+eyn
+<<<<<<< Updated upstream
+lxh
+udz
+mDT
+taO
+qlZ
+lxh
+vwC
+=======
+xfJ
+cof
+nxI
+taO
+vmi
+xfJ
+oxJ
+>>>>>>> Stashed changes
+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
-cMj
-mrF
-fOW
-tum
-wjC
eyn
eyn
eyn
@@ -86879,6 +106295,10 @@ eyn
aHq
aHq
eyn
+taO
+taO
+taO
+taO
eyn
eyn
eyn
@@ -86891,24 +106311,79 @@ eyn
eyn
eyn
eyn
-rRz
-rRz
-rRz
-xIk
-xIk
-cBf
-nrq
+qmk
+qmk
+qmk
+<<<<<<< Updated upstream
+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
+=======
+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
kiP
@@ -86935,10 +106410,10 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
eyn
eyn
eyn
@@ -86999,49 +106474,87 @@ wfv
wfv
uhS
azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
azA
azA
-azA
-snR
-rRz
-rRz
-nrq
-azA
-azA
-iSP
-wTQ
-ctN
-gAg
-ctN
-azA
-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
+rhc
+iNl
+sRW
+bwa
+rhc
+rOZ
+=======
+efb
+dZG
+lRK
+wJz
xAc
-jKr
-dzm
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-snR
-sPT
-cBf
-cBf
-nrq
-azA
-aTW
-aTW
+eWx
+mwN
+wJz
+tTv
+>>>>>>> Stashed changes
+uVn
+lmd
+cNV
+tPS
+<<<<<<< Updated upstream
+lDP
+oFi
+wsd
+xcO
+ozi
+tXN
+wcr
+ktI
+egt
+aMB
+dOD
+jwS
+=======
+xyS
+oYB
+wsd
+wvH
+uKU
+luj
+cHI
+ddY
+sgo
+vxu
+uUN
+dZG
+>>>>>>> Stashed changes
pjw
lSV
aRK
-jYM
-jYM
+aRK
+aRK
lSV
aTW
aTW
@@ -87053,7 +106566,7 @@ eqB
vwf
vwf
vwf
-bwE
+taO
hIl
aTW
aTW
@@ -87123,66 +106636,66 @@ mDq
mDq
upl
azA
-azA
eyn
eyn
eyn
eyn
eyn
+<<<<<<< Updated upstream
+lxh
+=======
+xfJ
+>>>>>>> Stashed changes
+qoT
+taO
+taO
+cfW
eyn
-aHq
-aHq
-aHq
-eyn
+<<<<<<< Updated upstream
+aJw
+=======
+ffZ
+>>>>>>> Stashed changes
+qoT
eyn
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
eyn
eyn
eyn
+taO
+cvT
+taO
+taO
eyn
eyn
-aHq
-aHq
+<<<<<<< Updated upstream
+bgw
+bgw
+bgw
+bgw
+bgw
+bgw
eyn
eyn
+fOW
+qlZ
+=======
+aVc
+aVc
+aVc
+aVc
+aVc
+aVc
eyn
eyn
+fOW
+vmi
+>>>>>>> Stashed changes
+taO
+taO
+taO
+taO
+taO
eyn
eyn
eyn
@@ -87193,28 +106706,88 @@ 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
+<<<<<<< Updated upstream
+rjo
+rjo
+mwN
+aaz
+snc
+mwN
+mwN
+mwN
+mwN
+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
+gjz
+wIC
+wIC
+dJl
+qhG
+pkU
+gTE
+dQI
+glZ
+=======
+abO
+qmk
+qmk
+dTy
+ucV
+ucV
+wSu
+iBY
+ktB
+qad
+qQz
+cIs
+>>>>>>> Stashed changes
+cyW
+cyW
snR
cBf
-cBf
+<<<<<<< Updated upstream
+nAU
+=======
+dTs
+>>>>>>> Stashed changes
cBf
kiP
uhS
@@ -87237,10 +106810,10 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
eyn
eyn
eyn
@@ -87301,44 +106874,80 @@ rRz
hYR
nrq
azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
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
+<<<<<<< Updated upstream
+lJf
+bjo
+xxN
+nZE
+=======
+yjE
+esJ
+dUX
+sEI
+>>>>>>> Stashed changes
+tPS
+eJc
+tPS
+ahs
+<<<<<<< Updated upstream
+bGL
+jwS
+vdF
+rhc
+rhc
+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
+bRO
+dOD
+dOD
+dOD
+gFQ
+jwS
+jwS
+=======
+dZG
+cTr
+dZG
+cEy
+uUN
+uUN
+uUN
+hqE
+dZG
+dZG
+>>>>>>> Stashed changes
pjw
lSV
aRK
@@ -87425,64 +107034,73 @@ azA
azA
oZJ
upl
-azA
-azA
-azA
-eyn
eyn
eyn
eyn
eyn
eyn
-aHq
-aHq
-eyn
eyn
-noM
-yaS
-fso
-lsU
-pxT
-bki
+fOW
+<<<<<<< Updated upstream
tlP
-nSW
-djf
-bki
-aaO
-nDc
-bgw
-xJn
-cvy
-vSX
-lsU
-jlb
-eyn
-eyn
+kVV
+taO
+lxh
+=======
+vTy
+mDT
+taO
+xfJ
+>>>>>>> Stashed changes
eyn
-wjC
-bqb
-bqb
-wjC
-wjC
+taO
eyn
eyn
eyn
-gfx
-sed
-xOc
-sJu
-qPh
eyn
+<<<<<<< Updated upstream
+cRj
+bki
+rnY
+taO
+bFX
+iTe
eyn
-aHq
-aHq
-aHq
-aHq
-aHq
-aHq
+bgw
+tUB
+uXK
+kxz
+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
@@ -87493,27 +107111,85 @@ eyn
eyn
eyn
eyn
-rRz
-rRz
-rRz
-rRz
-rRz
-qpU
+azA
+qmk
+<<<<<<< Updated upstream
+xxW
+sCa
+wmm
+wmm
+mwN
+nlw
+gnq
+xCw
+iJF
+wtn
+oTk
+hox
+rbV
+mwN
+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
+sEz
+wIC
+wwK
+wIC
+wIC
+wIC
+fYb
+qmk
+qmk
+glZ
+glZ
+=======
qpU
-wTQ
-ctN
-cyW
+fKQ
+fKQ
+sAI
+ucV
+jsI
+ucV
+ucV
+ucV
+cJZ
+qmk
+qmk
+cIs
+cIs
+>>>>>>> Stashed changes
cyW
cyW
-azA
-azA
-azA
-gAg
-wTQ
-wTQ
-wTQ
-ctN
-gDr
bce
cBf
cBf
@@ -87539,10 +107215,10 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
eyn
eyn
eyn
@@ -87603,43 +107279,80 @@ rRz
nDt
ctN
azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
+ljW
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
+qzA
+<<<<<<< Updated upstream
+xfJ
+pQD
+dfc
+rJc
+tPS
+uVv
+tPS
+ioi
+bGL
+jwS
+atA
+rhc
+rhc
+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
+dOD
+dOD
+gdm
+gdm
+nwb
+uof
+jwS
+=======
+ctC
+dZG
+wlq
+uUN
+uUN
+bqR
+bqR
+ucp
+aZv
+dZG
+>>>>>>> Stashed changes
vkP
vkP
vkP
@@ -87728,97 +107441,169 @@ azA
azA
oZJ
upl
-azA
-azA
-azA
-eyn
+<<<<<<< Updated upstream
+=======
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
+taO
+vTy
+mDT
+taO
+xfJ
+>>>>>>> Stashed changes
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
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
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
+<<<<<<< Updated upstream
+qnM
+pfL
+xFO
+uVi
+mwN
+uyX
+pcH
+mwN
+gHY
+fow
+jJZ
+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
+fwi
+fKQ
+fKQ
+fKQ
+qRH
+wIC
+edf
+oJc
+cHW
+qmk
+glZ
+glZ
+=======
+fqh
+fKQ
+fKQ
+nFZ
+fKQ
+fKQ
+fKQ
+jFg
+ucV
+kSD
+lkc
+xfn
+qmk
+cIs
+cIs
+>>>>>>> Stashed changes
+cyW
+cyW
+cyW
+cyW
azA
gAg
wTQ
-oeo
+jbl
nDt
wTQ
ctN
@@ -87841,11 +107626,11 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
eyn
eyn
rkv
@@ -87905,43 +107690,80 @@ nDt
ctN
azA
azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
+lbp
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
+qhE
+oDA
+<<<<<<< Updated upstream
+yae
+qid
+xxN
+=======
+ktI
+qid
+dUX
+>>>>>>> Stashed changes
+tPS
+eJc
+tPS
+luk
+oDA
+<<<<<<< Updated upstream
+dpM
+jwS
+jZl
+ael
+hql
+pFU
+rhc
+rhc
+uQU
+kEe
+pCa
+tPS
+tPS
+lIp
+qBe
+jwS
+dOD
+pHg
+tXN
+qEx
+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
@@ -88030,44 +107852,22 @@ 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
+<<<<<<< Updated upstream
+vfF
+taO
+mAQ
+qlZ
+=======
+bpn
+taO
+mAQ
+vmi
+>>>>>>> Stashed changes
eyn
eyn
eyn
@@ -88075,46 +107875,128 @@ eyn
eyn
eyn
eyn
+taO
+taO
+<<<<<<< Updated upstream
+nDc
+=======
+oWA
+>>>>>>> Stashed changes
+dof
+taO
+taO
eyn
+<<<<<<< Updated upstream
+bgw
+xjZ
+lQf
+oxb
+msO
+krJ
+taO
+taO
+rnY
+noM
eyn
aHq
aHq
+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
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
+<<<<<<< Updated upstream
+oml
+wmm
+mwN
+hOi
+pcH
+mwN
+jfx
+qOp
+hox
+vaS
+iJF
+hBL
+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
+glZ
+glZ
+glZ
+glZ
+=======
+was
+nFZ
+cIs
+cIs
+cIs
+cIs
+cIs
+>>>>>>> Stashed changes
+qmk
+qmk
+cyW
+cyW
+cyW
+cyW
iHx
azA
azA
@@ -88143,13 +108025,13 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(30,1,1) = {"
@@ -88207,49 +108089,85 @@ ctN
azA
azA
azA
+sqv
azA
+aUc
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
+<<<<<<< Updated upstream
+aOz
+lmd
+wvE
+xxN
+tPS
+tPS
+iKG
+rts
+sRg
+tbe
+jwS
+fVF
+feb
+aLM
+aKn
+rhc
+rhc
+wJq
+uVn
+eRG
+tPS
+tPS
+qxt
+uYI
+jwS
+dQY
+vPM
+dQY
+jwS
+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
olU
uYQ
-rjo
+uYQ
vkP
jZQ
oDd
@@ -88332,51 +108250,57 @@ 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
+<<<<<<< Updated upstream
+iOG
+=======
+vDa
+>>>>>>> Stashed changes
+taO
+taO
+taO
eyn
eyn
eyn
eyn
eyn
eyn
+tNM
+<<<<<<< Updated upstream
+vpp
+dMZ
+jwh
+taO
+lxh
eyn
eyn
+dvR
+jfg
+hmi
+qiI
+lQf
+bgw
+=======
+yaS
+rVG
+iXv
+taO
+xfJ
eyn
eyn
+dJC
+rPH
+uLb
+nHb
+vjP
+aVc
+>>>>>>> Stashed changes
+cfW
+taO
aHq
aHq
aHq
@@ -88388,38 +108312,87 @@ 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
+qmk
+<<<<<<< Updated upstream
+nhC
+cFH
+rlm
+gCl
+mwN
+mwN
+dWa
+mwN
+qMC
+hiz
+peM
+rTp
+hox
+sLw
+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
+bzD
+izz
+lVc
+rHn
+hxm
+glZ
azA
+jFD
+=======
+aMR
+jaO
+cIs
+jBp
+aXo
+kJH
+uJq
+oNu
+cIs
azA
+aaC
+>>>>>>> Stashed changes
azA
azA
iHx
azA
-tHX
+jKr
azA
azA
azA
@@ -88428,7 +108401,7 @@ azA
azA
azA
azA
-doc
+snR
uii
hhh
hhh
@@ -88445,13 +108418,13 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(31,1,1) = {"
@@ -88506,46 +108479,82 @@ 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
+<<<<<<< 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
+bBt
+kQP
+jyb
+rhc
+rhc
+kBR
+cpS
+lmd
+nrn
+nrn
+xdE
+uVn
+jwS
+jwS
+jwS
+jwS
+jwS
+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
@@ -88627,7 +108636,7 @@ lqb
azA
azA
azA
-doc
+snR
cBf
cBf
yjl
@@ -88635,53 +108644,56 @@ 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
+<<<<<<< Updated upstream
+rzh
+rnY
+=======
+aPS
+vaH
+>>>>>>> Stashed changes
+cfW
eyn
eyn
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
-aHq
-aHq
-aHq
-aHq
-aHq
-aHq
-aHq
-eyn
-eyn
eyn
eyn
eyn
@@ -88689,35 +108701,93 @@ eyn
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
+<<<<<<< Updated upstream
+pCk
+=======
+dpm
+>>>>>>> Stashed changes
azA
azA
azA
azA
azA
+qmk
+<<<<<<< Updated upstream
+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
+=======
+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
@@ -88730,7 +108800,7 @@ azA
azA
azA
azA
-hHf
+oUk
pmV
cBf
aWG
@@ -88747,13 +108817,13 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(32,1,1) = {"
@@ -88807,47 +108877,83 @@ uQH
uQH
uQH
uQH
-uQH
-mUB
+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
+rhc
+jZl
+vcb
+rhc
+rhc
+pEl
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
+vyg
+nrn
+tPS
+ahs
+aMd
+uVn
+jwS
+hDz
+rKn
+gaq
+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
@@ -88921,64 +109027,40 @@ cVP
nrq
azA
azA
-doc
-cBf
-gqa
-nrq
-azA
-azA
-azA
-azA
-doc
-cBf
-cBf
-cBf
+snR
cBf
-nrq
-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
+gqa
+nrq
+azA
+azA
+azA
+azA
+snR
+cBf
+cBf
+cBf
+cBf
+nrq
+hKk
+azA
+azA
+azA
eyn
eyn
eyn
eyn
eyn
+taO
+taO
+taO
+taO
+<<<<<<< Updated upstream
+mhi
+eGa
+=======
+qIr
+tty
+>>>>>>> Stashed changes
eyn
eyn
eyn
@@ -88988,28 +109070,32 @@ eyn
eyn
eyn
eyn
+<<<<<<< Updated upstream
+bgw
+iDY
+hmi
+qOb
+sVy
+bgw
+=======
+aVc
+ijs
+uLb
+enJ
+sjp
+aVc
+>>>>>>> Stashed changes
eyn
eyn
eyn
eyn
eyn
eyn
-rRz
-rRz
-rRz
-rRz
-azA
-doc
-cBf
-nrq
azA
azA
azA
azA
azA
-jKr
-jKr
-azA
azA
azA
azA
@@ -89018,6 +109104,76 @@ azA
azA
azA
azA
+qmk
+<<<<<<< Updated upstream
+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
+=======
+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
@@ -89032,7 +109188,7 @@ azA
azA
azA
azA
-doc
+snR
pmV
fzO
cBf
@@ -89050,12 +109206,12 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(33,1,1) = {"
@@ -89109,47 +109265,82 @@ uVn
uVn
uVn
uVn
-uVn
-uVn
-uVn
-vkP
+sLI
+azA
+azA
+azA
+<<<<<<< Updated upstream
+wRi
+=======
pxK
-lCN
-wZv
-tGE
-wbg
-rfr
-vkP
-oLh
-hxl
-vkP
-xMp
+>>>>>>> Stashed changes
+azA
+azA
+ljW
+ahs
+<<<<<<< Updated upstream
+nAb
+iKG
+tPS
+pRE
+cNV
+xhr
+sGJ
+wxd
+dxr
+jwS
+fXb
+rhc
+aLM
+cIz
+hNc
+rhc
+qEK
+=======
rfr
-tGE
-vkP
-lCN
-fLH
-vkP
-tGE
-xMp
-dqu
-vkP
-lCN
-fLH
-vkP
-tGE
-xMp
-dqu
-vkP
-lCN
+wbf
+tPS
+hYY
+cNV
+xhr
+aPP
+nHo
+hrM
+dZG
fLH
-vkP
-tGE
-tGE
+wJz
tGE
-vkP
-lCN
-fLH
+lYo
+aui
+wJz
+fwX
+>>>>>>> Stashed changes
+uVn
+vyg
+tPS
+tPS
+aOB
+nEj
+uVn
+<<<<<<< Updated upstream
+fMf
+gaq
+gaq
+gaq
+gaq
+ffy
+jwS
+jwS
+=======
+sUi
+fpJ
+fpJ
+fpJ
+fpJ
+rhY
+dZG
+dZG
+>>>>>>> Stashed changes
vkP
thA
fkM
@@ -89178,7 +109369,7 @@ dCA
wYW
xDo
dCA
-ufz
+dCA
wYW
qZA
qZA
@@ -89193,7 +109384,7 @@ azA
azA
azA
azA
-rvV
+uUe
nDM
cBf
wak
@@ -89223,7 +109414,7 @@ cVP
nrq
azA
azA
-doc
+snR
cBf
twD
nrq
@@ -89231,7 +109422,7 @@ xSB
azA
azA
azA
-doc
+snR
cBf
cBf
aiJ
@@ -89242,71 +109433,55 @@ 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
+taO
+taO
+taO
+<<<<<<< Updated upstream
+cDN
+taO
+taO
+taO
+lxh
+lxh
eyn
eyn
+mDZ
+mDZ
+mDZ
eyn
+bgw
+bfU
+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
-rRz
-rRz
-rRz
-rRz
-azA
-gAg
-wTQ
-ctN
-azA
-azA
-azA
azA
azA
azA
@@ -89314,11 +109489,89 @@ azA
azA
azA
azA
+qmk
+qmk
+<<<<<<< Updated upstream
+glZ
+glZ
+glZ
azA
azA
-dzm
+epF
+oPg
+qmk
+wmm
+hWz
+sCa
+wmm
+oCf
+qmk
+uhE
+rDJ
+lQS
+ciq
+lQS
+hRY
+lQS
+qmk
+fKQ
+fwi
+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
+bDA
+avq
+mOF
+iLb
+=======
+btN
+uQU
+rFQ
+oow
+moW
+nrR
+jPX
+>>>>>>> Stashed changes
+qmk
azA
azA
azA
@@ -89334,7 +109587,7 @@ uhS
azA
azA
azA
-doc
+snR
pmV
cBf
wxo
@@ -89352,12 +109605,12 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(34,1,1) = {"
@@ -89403,9 +109656,6 @@ xdw
xdw
xdw
xdw
-sAb
-ner
-uVn
bvo
bvo
cIM
@@ -89413,45 +109663,80 @@ bvo
cIM
bvo
bvo
-uVn
-vkP
-lCN
-lCN
-vkP
-tGE
-tGE
-tGE
-vkP
-hxl
-hxl
-vkP
-tGE
-tGE
-tGE
-kiK
-lCN
+bvo
+sLI
+azA
+azA
+azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
+qhE
+azA
+azA
+ahs
+weO
+uhp
+kdY
+<<<<<<< Updated upstream
+dfc
+bNM
+cNV
+tQE
+fPk
+fPk
+jwS
+hhn
+pjo
+jwS
+jwS
+slq
+fYh
+jwS
+cpS
+=======
+pEx
+nta
+cNV
+ewz
+shL
+shL
+dZG
lCN
-vkP
-tGE
-lbi
-tGE
+pnq
+dZG
+dZG
+qmW
qOK
-lCN
-lCN
-vkP
-tGE
-tGE
-lbi
-kiK
-lCN
-lCN
-vkP
-lbi
-tGE
-tGE
-kiK
-lCN
-lCN
+dZG
+wdV
+>>>>>>> Stashed changes
+lmd
+tPS
+tPS
+eJc
+ahs
+uVn
+<<<<<<< Updated upstream
+jwS
+eHh
+bgK
+mra
+tSg
+ffy
+jwS
+=======
+dZG
+hbU
+oPU
+vle
+tyI
+rhY
+dZG
+>>>>>>> Stashed changes
+azA
vkP
vkP
vkP
@@ -89495,7 +109780,7 @@ azA
azA
azA
azA
-bSF
+rEO
axb
cBf
cBf
@@ -89505,7 +109790,7 @@ cBf
cBf
nrq
puQ
-doc
+snR
ojV
qeg
rzI
@@ -89525,7 +109810,7 @@ cVP
nrq
azA
azA
-doc
+snR
cBf
cBf
ckE
@@ -89544,87 +109829,162 @@ 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
+<<<<<<< Updated upstream
+lxh
+rnY
+qlZ
+lbU
+iWu
+qoT
+taO
+qPa
+lxh
eyn
+gMH
+taO
+taO
eyn
+bgw
+bgw
+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
-rRz
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
azA
azA
azA
azA
azA
+<<<<<<< Updated upstream
+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
+ovN
+lnQ
+oPU
+soN
+fnW
+rHn
+mOF
+npm
+qmk
azA
-dzm
-jKr
-dzm
+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
@@ -89636,7 +109996,7 @@ nrq
azA
azA
azA
-doc
+snR
xtf
goM
hhh
@@ -89654,12 +110014,12 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(35,1,1) = {"
@@ -89705,9 +110065,6 @@ azA
azA
azA
azA
-azA
-ner
-uVn
bvo
jcc
inS
@@ -89715,46 +110072,82 @@ inS
inS
iFx
bvo
+bvo
+sLI
+azA
+azA
+azA
+sqv
+azA
+<<<<<<< Updated upstream
+jFD
+=======
+aaC
+>>>>>>> Stashed changes
+azA
+xxH
+arq
+tPS
+ijL
+<<<<<<< Updated upstream
+gZg
+sRT
+vQZ
+xxN
+jwS
+bSi
+ylL
+jTw
+uRi
+uRi
+jwS
+mDw
+rhc
+jwS
uVn
-vkP
-yjB
-aBw
-vkP
-tGE
-tGE
-tGE
-kiK
-mnX
-mnX
+wnU
+=======
+bkV
kiK
-tGE
-tGE
-tGE
-vkP
-uEc
-yjB
-vkP
-vln
-gkE
-tGE
-vkP
-uEc
-yjB
-vkP
-tGE
-tGE
-tGE
-ept
-hgr
+soo
+dUX
+dZG
+xOc
+pTi
yjB
-vkP
-gZY
-tGE
+unx
+unx
+dZG
+rJd
+wJz
+dZG
+uVn
+flZ
+>>>>>>> Stashed changes
+tPS
+tPS
+luk
+uXT
+nEj
+<<<<<<< Updated upstream
+jwS
+jwS
+jwS
+jwS
+hRc
+hRc
+jEU
+=======
+dZG
+dZG
+dZG
+dZG
+xMp
xMp
-vkP
uEc
-tOp
-vkP
+>>>>>>> Stashed changes
+azA
+azA
nmy
rhZ
smK
@@ -89797,7 +110190,7 @@ azA
azA
azA
azA
-bSF
+rEO
axb
cBf
cBf
@@ -89807,7 +110200,7 @@ cBf
cBf
nrq
aAO
-doc
+snR
ojV
hjp
xFA
@@ -89827,7 +110220,7 @@ cVP
kiP
uhS
azA
-doc
+snR
oXm
okX
nrq
@@ -89846,42 +110239,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
@@ -89890,40 +110247,137 @@ eyn
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
eyn
eyn
eyn
eyn
+<<<<<<< Updated upstream
+bLZ
+=======
+reH
+>>>>>>> Stashed changes
eyn
-rRz
-rRz
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-jKr
-dzm
-azA
azA
azA
+qmk
+qmk
+qmk
+<<<<<<< Updated upstream
+glZ
+glZ
+rhA
+hWP
+kHO
+aPP
+aPP
+rup
+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
+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
+=======
+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
@@ -89933,7 +110387,7 @@ azA
oMd
olu
dPr
-cBf
+hYR
nrq
azA
azA
@@ -89956,12 +110410,12 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(36,1,1) = {"
@@ -90007,9 +110461,6 @@ azA
azA
azA
azA
-dzm
-ner
-uVn
bvo
gLa
inS
@@ -90017,47 +110468,83 @@ 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
+bvo
+sLI
+azA
+azA
+azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
+azA
+ljW
+qhE
+xxH
+lcl
+tPS
+tPS
+<<<<<<< Updated upstream
+xxN
+veM
+tPS
+xxN
+nfC
+aXP
+hnG
+gEy
+byy
+uRi
+nwb
+slq
+rhc
+qEK
+=======
+dUX
+fTI
+tPS
+dUX
+bYu
+fOj
ept
-vkP
-vkP
-vkP
-vln
-gPN
-nzI
-vkP
-vkP
-vkP
-vkP
+xNE
+hxj
+unx
+ucp
+qmW
+wJz
+fwX
+>>>>>>> Stashed changes
+uVn
+izU
+tPS
+tPS
+eJc
+<<<<<<< Updated upstream
+qtr
+uXT
+nEj
+izU
+hpE
+rAg
+wsd
+wsd
+ixI
+=======
+flS
+uXT
+nEj
+izU
aaI
-dqu
-tGE
-vkP
-vkP
-vkP
-vkP
-rhc
+aJW
+wsd
+wsd
+khi
+>>>>>>> Stashed changes
+wsd
+wsd
+jQw
rhZ
kqU
smK
@@ -90074,7 +110561,7 @@ bRM
nVH
bRM
wYW
-ufz
+dCA
aQC
dCA
wYW
@@ -90099,7 +110586,7 @@ azA
azA
fJI
azA
-nwj
+jjl
axb
grD
kPD
@@ -90109,7 +110596,7 @@ jzu
cBf
nrq
ojt
-doc
+snR
pNe
bmg
xFA
@@ -90148,43 +110635,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
@@ -90194,37 +110644,140 @@ eyn
eyn
eyn
eyn
+<<<<<<< Updated upstream
+akT
+taO
+taO
+rie
+taO
+taO
+qKf
+vnO
+rfW
+jcO
+=======
+jcO
+taO
+taO
+qwC
+taO
+taO
+wth
+aWT
+mGU
+mTb
+>>>>>>> Stashed changes
eyn
eyn
eyn
eyn
eyn
eyn
-rRz
-rRz
-rRz
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
+<<<<<<< Updated upstream
+nZP
azA
azA
+qmk
+nUb
+xaK
+fjU
+vtA
+rhA
+aPP
+aPP
+neu
+fzU
+hDi
+nvF
+nfh
+oeF
+aeE
azA
-jKr
+quf
+tyG
+tyG
+hwE
+hfm
+wmm
+qmk
+rTE
+lQS
+laY
+blR
+lQS
+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
+ihM
+aBR
+tbh
+tQx
+tbh
+qmk
+mOF
+rHn
+avq
+=======
+pod
+tUK
+miU
+uqT
+rbH
+vDy
+wPK
+vDy
+qmk
+nrR
+uJq
+moW
+>>>>>>> Stashed changes
+qmk
azA
azA
azA
@@ -90258,12 +110811,12 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(37,1,1) = {"
@@ -90309,9 +110862,6 @@ azA
azA
jWe
azA
-azA
-ner
-uVn
hnd
nwV
fgO
@@ -90319,48 +110869,88 @@ nwV
kqf
inS
bvo
+bvo
+sLI
+azA
+azA
+azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
+azA
+fZL
+azA
+ahs
+hwA
+<<<<<<< Updated upstream
+ign
+myt
+xxN
+cNV
+unH
+phi
+nfC
+vOv
+uRi
+oNG
+uRi
+uRi
+ftP
+slq
+rhc
+qEK
uVn
-vkP
-pvt
-gPB
-vkP
-tGE
-xMp
-xMp
-vkP
-hxl
-mnX
-vkP
-vln
+yae
+tPS
+tPS
+nrn
+=======
+qcr
+jvX
+dUX
+cNV
+iMI
gkE
-xMp
-vkP
-vig
+bYu
+fAj
+unx
teQ
-vkP
-tGE
-tGE
-tGE
-vkP
+unx
+unx
+oLN
+qmW
+wJz
fwX
-aQx
-vkP
-gkE
-atw
+uVn
+ktI
+tPS
+tPS
dqu
-vkP
-bAG
-lxY
-vkP
-tGE
+>>>>>>> Stashed changes
+eJc
+cNV
+qzA
+ioi
+<<<<<<< Updated upstream
+hpE
+nXi
+eAw
+eAw
+mVY
+ybD
+=======
+aaI
nzI
-tGE
-vkP
+eAw
+eAw
jIl
tHr
-vkP
-hwA
-rhZ
+>>>>>>> Stashed changes
+eAw
+gXS
+quO
kqU
smK
smK
@@ -90401,7 +110991,7 @@ azA
azA
azA
azA
-rvV
+uUe
axb
ojV
lSt
@@ -90411,12 +111001,12 @@ fri
cBf
nrq
mcp
-doc
+snR
pNe
wDv
wDv
lSy
-yka
+wDv
kHg
cBf
cBf
@@ -90426,7 +111016,7 @@ uzn
azA
azA
gwF
-doc
+snR
myl
nDM
kiP
@@ -90450,34 +111040,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
@@ -90487,50 +111049,145 @@ 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
-jKr
-azA
-azA
-azA
-azA
-azA
-azA
+<<<<<<< Updated upstream
+sks
+rnY
+oJW
+qZF
+jtd
+itr
+cDz
+qJO
+dHZ
+=======
+qeM
+vaH
+oJW
+yjb
+ndW
+bQF
+rMP
+tJZ
+paH
+>>>>>>> Stashed changes
+cBf
+cBf
+cBf
+cBf
+<<<<<<< Updated upstream
+fKM
+ush
+cBf
+nZP
azA
azA
+qmk
+sXC
+sJE
+nSG
+hKw
+rhA
+aPP
+neu
+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
+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
+=======
+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
azA
+ljW
iHx
azA
gAg
@@ -90560,12 +111217,12 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(38,1,1) = {"
@@ -90611,9 +111268,6 @@ dzm
azA
azA
azA
-azA
-ner
-uVn
cIM
hUb
inS
@@ -90621,48 +111275,85 @@ nbJ
inS
inS
bvo
-uVn
-vkP
-nqu
-nqu
-kiK
-nzI
-nzI
-lbi
-vkP
-hxl
+bvo
+sLI
+azA
+azA
+azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
+azA
+qhE
+azA
+ahs
+ioi
+<<<<<<< Updated upstream
+myt
+myt
+xxN
+eJc
+lRB
+cJB
+nfC
+cZH
+uRi
+uRi
+uRi
+uRi
+jwS
+slq
+rhc
+jwS
+cpS
+dCE
+=======
+jvX
+jvX
dUX
-vkP
-vln
+eJc
vln
-tGE
-kiK
-wOu
-wOu
-vkP
-oNu
-dqu
-tGE
+gFJ
+bYu
+yjr
+unx
+unx
+unx
+unx
+dZG
+qmW
wJz
dZG
wdV
-vkP
-dWQ
-tGE
-tGE
-kiK
-cJZ
-cJZ
-vkP
+cVI
+>>>>>>> Stashed changes
+wsd
+iwB
+tPS
+tPS
+cNV
+tPS
+tPS
+<<<<<<< Updated upstream
+vfa
+smK
+smK
+smK
+uaS
+uaS
+=======
dWQ
-uWm
-tGE
-kiK
+smK
+smK
+smK
oVp
-fze
-vkP
-qwc
-rhZ
+oVp
+>>>>>>> Stashed changes
+smK
+smK
+smK
kqU
kqU
smK
@@ -90703,7 +111394,7 @@ azA
azA
azA
azA
-bSF
+rEO
nDM
ojV
lrM
@@ -90728,7 +111419,7 @@ azA
azA
azA
gwF
-doc
+snR
cBf
nDM
nDM
@@ -90753,32 +111444,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
@@ -90788,62 +111453,151 @@ eyn
eyn
eyn
eyn
+<<<<<<< Updated upstream
+lxh
+=======
+xfJ
+>>>>>>> Stashed changes
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
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
+<<<<<<< Updated upstream
+gOW
+wSu
+oWZ
+=======
+rPw
+oup
+vmd
+>>>>>>> Stashed changes
+cBf
+cBf
+cBf
+cBf
+<<<<<<< Updated upstream
+dwn
+cBf
+cBf
+jrB
azA
azA
+qmk
+gDS
+vGg
+tCm
+mxW
+rhA
+aPP
+aPP
+aPP
+neu
+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
+qmk
+qmk
+qmk
+qmk
+qmk
+qmk
+qmk
+qmk
+<<<<<<< Updated upstream
+kmB
+uVn
+uVn
+jVw
+qmk
+get
+mBp
+lIQ
+oqo
+glZ
+dfA
+hgn
+jwi
+qmk
+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
azA
iHx
azA
dzm
azA
azA
-gAg
+<<<<<<< Updated upstream
+vGk
+=======
+mrF
+>>>>>>> Stashed changes
wTQ
ctN
isX
azA
-doc
+snR
cBf
cBf
cBf
@@ -90862,12 +111616,12 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(39,1,1) = {"
@@ -90913,9 +111667,6 @@ azA
ndZ
wfv
wfv
-uhS
-ner
-uVn
hnd
lIV
inS
@@ -90923,48 +111674,83 @@ inS
inS
oPH
bvo
-uVn
-vkP
-fmr
-jnj
-vkP
-tGE
-tGE
-vTy
-ept
-mnX
+bvo
+sLI
+azA
+azA
+azA
+<<<<<<< Updated upstream
+wRi
+=======
+pxK
+>>>>>>> Stashed changes
+ljW
+azA
+azA
+ioi
+ioi
+ioi
+wsd
+<<<<<<< Updated upstream
+xKp
+wsd
+wsd
+wfN
+jwS
+jxg
+uRi
+vaZ
+vlI
+dQz
+jwS
+slq
+rhc
+jwS
+=======
hxl
-vkP
-tGE
-tGE
-tGE
-vkP
-wwO
+wsd
+wsd
+rCC
+dZG
+sIp
+unx
tDI
-vkP
+emi
lbi
-tGE
-tGE
-vkP
-yap
-tpA
-vkP
-tGE
-tGE
-xMp
-vkP
-onJ
-vCa
-vkP
-tGE
-nzI
-xMp
-vkP
-cva
-irI
-vkP
-izU
-rhZ
+dZG
+qmW
+wJz
+dZG
+>>>>>>> Stashed changes
+uVn
+nQO
+uVn
+lmd
+tPS
+tPS
+<<<<<<< Updated upstream
+nrn
+tPS
+nrn
+vfa
+smK
+smK
+uaS
+uaS
+=======
+dqu
+tPS
+dqu
+dWQ
+smK
+smK
+oVp
+oVp
+>>>>>>> Stashed changes
+luk
+smK
+smK
+smK
kqU
smK
smK
@@ -91005,7 +111791,7 @@ azA
azA
azA
vJH
-bSF
+rEO
nDM
ojV
cDh
@@ -91057,19 +111843,6 @@ azA
azA
azA
azA
-azA
-azA
-azA
-rRz
-rRz
-rRz
-eyn
-eyn
-eyn
-eyn
-eyn
-eyn
-eyn
eyn
eyn
eyn
@@ -91080,60 +111853,132 @@ 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
-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
+cBf
+cBf
+<<<<<<< Updated upstream
+hKK
+bUo
+=======
+krO
+lVJ
+>>>>>>> Stashed changes
+cBf
+cBf
+cBf
+kFh
+cBf
+cBf
+cBf
+cBf
+<<<<<<< Updated upstream
+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
+=======
+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
+iqM
+pMC
+glZ
+bNp
+lKJ
+qsV
+qmk
+hdM
+kXc
+glZ
+glZ
+=======
+bUW
+iKz
+amw
+bzD
+qWA
+cIs
+fqX
+lll
+sgz
+qmk
+hHP
+rSs
+cIs
+cIs
+>>>>>>> Stashed changes
azA
azA
+qhE
azA
iHx
azA
@@ -91145,7 +111990,7 @@ azA
azA
gwF
azA
-doc
+snR
cBf
cBf
cBf
@@ -91164,12 +112009,12 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(40,1,1) = {"
@@ -91215,9 +112060,6 @@ azA
snR
rRz
rRz
-nrq
-ner
-uVn
hnd
hUb
inS
@@ -91225,46 +112067,83 @@ 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
+aUc
+ioi
+<<<<<<< Updated upstream
+uJs
+kna
+kna
+phR
+weF
+eND
+jgy
+jwS
+rmr
+wsr
+rmr
+dYH
+wsr
+jwS
+gzE
+rOZ
+jwS
+rOZ
+rOZ
+jwS
+sqF
+bok
+djp
+fcu
+fqh
+srf
+hpE
+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
rhZ
smK
@@ -91307,7 +112186,7 @@ mDq
mDq
sAb
azA
-bSF
+rEO
nDM
wak
ljz
@@ -91316,7 +112195,7 @@ ljz
akl
nrq
aQq
-doc
+snR
cBf
cBf
cBf
@@ -91361,81 +112240,135 @@ 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
-azA
-azA
-azA
-azA
-azA
-azA
-azA
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
azA
azA
+glZ
+oRn
+xaK
+tCm
+azN
+syM
+hdr
+xom
+bgM
+aPP
+rwc
+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
+asH
+uVn
+uVn
+uVn
+uVn
+<<<<<<< Updated upstream
+kdx
+yae
+ioi
+ioi
+ehF
+=======
+umH
+ktI
+ioi
+ioi
+wln
+>>>>>>> Stashed changes
+ioi
+ioi
+izU
+uVn
+uVn
+uVn
+xNr
+<<<<<<< Updated upstream
+sVO
+xEs
+mBp
+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
+ljW
azA
lPN
lPN
@@ -91467,11 +112400,11 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(41,1,1) = {"
@@ -91516,10 +112449,7 @@ tEg
ndZ
rRz
rRz
-nDt
-ctN
-ner
-uVn
+rRz
bvo
wnv
inS
@@ -91527,47 +112457,84 @@ jPD
inS
uhe
bvo
-uVn
-uVn
-uVn
-uVn
-uVn
-uVn
-uVn
-vkP
-hxl
-hxl
-hxl
+bvo
+bvo
+bvo
+bvo
+bvo
+bvo
+bvo
+azA
+azA
+azA
+<<<<<<< Updated upstream
+jpl
+odS
+odS
+azA
+jpl
+azA
+jwS
+jwS
+oKo
+dYH
+uRi
+qyA
+uRi
+jwS
+slq
+rhc
+byE
+rhc
+rhc
+jwS
+jwS
+bYe
+eAw
+nsN
+gpB
+nsN
+hpE
+jak
+eAw
+eAw
+mVY
+=======
mnX
-hxl
-oLh
-oLh
-oLh
+odS
+odS
+azA
mnX
-hxl
-vtH
-hxl
-uGX
-hxl
-hxl
-hxl
-hxl
-hxl
-vtH
-hxl
-ovf
-oLh
+azA
+dZG
+dZG
oLh
-hxl
-hxl
-hxl
-mnX
-uGX
-hxl
+let
+unx
vtH
-bNB
-vkP
-ktI
+unx
+dZG
+qmW
+wJz
+iEH
+wJz
+wJz
+dZG
+dZG
+ovf
+eAw
+dXO
+gpB
+dXO
+aaI
+lcR
+eAw
+eAw
+jIl
+>>>>>>> Stashed changes
+eAw
+eAw
+nEj
weO
smK
eLo
@@ -91665,80 +112632,139 @@ 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
-azA
-azA
-azA
-azA
-azA
-azA
-azA
azA
azA
+<<<<<<< Updated upstream
+aoD
+=======
+trr
+>>>>>>> Stashed changes
+gAg
+jbl
+cBf
+cBf
+cBf
+<<<<<<< Updated upstream
+aUl
+=======
+pUf
+>>>>>>> Stashed changes
+cBf
+cBf
+cBf
+cBf
+cBf
+nDt
+cvJ
azA
azA
+<<<<<<< Updated upstream
+glZ
+glZ
+sLe
+qmk
+vuy
+aPP
+aPP
+rPH
+aPP
+wCM
+qmk
+qmk
+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
+shg
+ioi
+gXS
+aSp
+aeE
+yho
+fSs
+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
+pXt
+vfS
+vtL
azA
+pbH
azA
+iRT
azA
+vfS
+=======
+nTz
+gpX
+dUo
+vAW
+pBl
+bNr
azA
+xlt
azA
+iRT
azA
+pBl
+>>>>>>> Stashed changes
lPN
cdo
isQ
@@ -91769,11 +112795,11 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
+eyn
rkv
"}
(42,1,1) = {"
@@ -91817,10 +112843,7 @@ azA
tEg
rRz
rRz
-cBf
-nrq
-azA
-azA
+rRz
bvo
bvo
bvo
@@ -91835,41 +112858,79 @@ bvo
bvo
bvo
bvo
-uVn
-vkP
-hxl
-qTE
-hxl
-hxl
-ycu
-hxl
-mnX
-mnX
-mnX
-hxl
-hxl
-hxl
+bvo
+azA
+azA
+<<<<<<< Updated upstream
+vMj
+nov
+czG
+czG
+mRd
+jpl
+lhS
+jwS
+qng
+rci
+ael
+uRi
+uRi
+mVy
+muo
+slq
+rhc
+cpU
+rhc
+rhc
+cLN
+jwS
+vaB
+azA
+mbj
+azA
+hpE
+hpE
+uJH
+cyW
+rLN
+rLN
+=======
+cKR
+mzf
+fvm
+fvm
+egv
mnX
+lhS
+dZG
+rmi
+qgV
+kBr
+unx
+unx
+yiF
+pMr
qmW
-mnX
-mnX
-mnX
-hxl
-hxl
-hxl
-mnX
-mnX
-mnX
-mnX
-mnX
-mnX
-mnX
-hxl
-mnX
-vtH
-hxl
-xCz
-hwA
+wJz
+kfy
+wJz
+wJz
+ewS
+dZG
+eQh
+azA
+rNx
+azA
+aaI
+aaI
+pDW
+cyW
+iMj
+iMj
+>>>>>>> Stashed changes
+azA
+azA
+ahs
arq
smK
kqU
@@ -91967,79 +113028,136 @@ 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
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
azA
+eyn
azA
azA
azA
+iHx
azA
+<<<<<<< Updated upstream
+spP
+wTQ
+jbl
+ufJ
+=======
+dGM
+wTQ
+jbl
+lNw
+>>>>>>> Stashed changes
+cBf
+cBf
+cBf
+xcD
+cBf
+nDt
+ctN
+<<<<<<< Updated upstream
+aoD
+kXs
azA
+jBq
+kjL
+cKC
+uyr
+qmk
+bgM
+aPP
+kHN
+aPP
+gng
+qmk
+fZZ
+wsd
+jQw
+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
+uVn
+weO
+dsH
+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
@@ -92072,10 +113190,10 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
rkv
"}
(43,1,1) = {"
@@ -92120,9 +113238,6 @@ tEg
snR
rRz
rRz
-nrq
-azA
-azA
bvo
jwc
rJx
@@ -92131,47 +113246,87 @@ sOC
jgd
rJx
bvo
-cbF
+<<<<<<< Updated upstream
+xCG
+=======
+amQ
+>>>>>>> Stashed changes
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
+bvo
+azA
+azA
+<<<<<<< Updated upstream
+eQj
+juY
+cjq
+sRv
+ufp
+jpl
+azA
+jwS
+jJE
+vJr
+tZw
+paK
+kid
+wPF
+dQz
+slq
+rhc
+hso
+neN
+neN
+gAE
+jwS
+azA
+pCk
+chp
+dLJ
+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
-mnX
-mnX
-mnX
-hxl
-oLh
-jhP
-ovf
-bNB
-vkP
-hwA
+xhW
+gzB
+aaI
+cyW
+iMj
+>>>>>>> Stashed changes
+cyW
+azA
+azA
+azA
+ahs
lcl
kqU
eLo
@@ -92262,65 +113417,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
@@ -92334,15 +113430,123 @@ aFL
klm
aFL
lbW
+<<<<<<< Updated upstream
+dxK
+fAj
+=======
+wdk
+jpQ
+>>>>>>> Stashed changes
+rzH
+gAg
+wTQ
+wTQ
+<<<<<<< Updated upstream
+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
+=======
+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
+tfP
+bTA
+jqt
+jqt
+<<<<<<< Updated upstream
+bqo
+=======
+iwd
+>>>>>>> Stashed changes
+jqt
+jqt
+gTs
+xEu
+kyc
azA
+nLA
+ahs
+uVn
+sqF
+ckK
+jQw
+uVn
+uVn
+<<<<<<< Updated upstream
+qMo
+=======
+qFc
+>>>>>>> Stashed changes
+uVn
+uVn
+uVn
+isS
+<<<<<<< Updated upstream
+fBy
+=======
+uuN
+>>>>>>> Stashed changes
+ckK
+ckK
+eSw
+elf
azA
+ljW
azA
azA
+<<<<<<< Updated upstream
+dsH
+=======
+qqz
+>>>>>>> Stashed changes
jDe
pav
pAA
@@ -92374,10 +113578,10 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
rkv
"}
(44,1,1) = {"
@@ -92422,9 +113626,6 @@ tEg
snR
vtr
nDt
-ctN
-azA
-azA
bvo
jwc
inS
@@ -92439,40 +113640,75 @@ uNU
uNU
eWZ
bvo
-uVn
-vkP
-hxl
-mnX
-hxl
+bvo
+azA
+azA
+<<<<<<< Updated upstream
+rOB
+oew
+czG
+czG
+rOB
+jpl
+azA
+kBK
+yhZ
+fTn
+jZl
+uRi
+uRi
+qxp
+uRi
+slq
+rhc
+oxJ
+eKW
+eUG
+uKK
+jwS
+wYZ
+kxf
+azA
+aUc
+azA
+mBX
+rLN
+=======
+ihO
+jMO
+fvm
+fvm
+ihO
mnX
-hxl
-vkP
-vkP
-wOQ
-wOQ
+azA
+hWc
+xdg
+wQC
wOQ
-vkP
-vkP
unx
unx
-vkP
-vkP
+klZ
+unx
+qmW
+wJz
+pOa
fKH
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
+tHX
+osc
+dZG
+pXt
+dPn
+azA
+aUc
+azA
+eOv
+iMj
+>>>>>>> Stashed changes
+cyW
+azA
+azA
+ljW
+azA
aSa
kUI
kqU
@@ -92539,7 +113775,7 @@ wTQ
wTQ
wTQ
ctN
-rvV
+uUe
yfB
fFj
cBf
@@ -92560,65 +113796,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
@@ -92635,13 +113812,124 @@ dDG
jQV
cDB
jrq
-ptb
+gon
+<<<<<<< Updated upstream
+rCU
+aTG
azA
azA
+nyh
+=======
+jeV
+mND
+azA
azA
+lgB
+>>>>>>> Stashed changes
azA
-dzm
+puQ
+gAg
+jbl
+cBf
+kiP
+<<<<<<< Updated upstream
+tzE
+vZc
+azA
+azA
+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
+uVn
+uVn
+uVn
+uVn
+uVn
+<<<<<<< Updated upstream
+oWi
+uVn
+uVn
+uVn
+bDg
+yae
+ioi
+gXS
+aeE
+nLA
+gwE
+=======
+wEO
+uVn
+uVn
+uVn
+ssJ
+ktI
+ioi
+gXS
+bCH
+nLA
+okT
+>>>>>>> Stashed changes
azA
azA
azA
@@ -92660,7 +113948,11 @@ uZd
uZd
lxE
lPN
-uZd
+<<<<<<< Updated upstream
+gzM
+=======
+uGd
+>>>>>>> Stashed changes
ruw
uZd
glX
@@ -92676,10 +113968,10 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
rkv
"}
(45,1,1) = {"
@@ -92724,9 +114016,6 @@ tEg
gAg
wTQ
ctN
-azA
-azA
-azA
ntt
xvQ
inS
@@ -92741,40 +114030,74 @@ oVW
uNU
kiv
bvo
-uVn
-vkP
-mnX
-hxl
-hxl
+bvo
+azA
+azA
+<<<<<<< Updated upstream
+rfs
+wrX
+dlS
+czG
+rLZ
+jpl
+azA
+kKP
+gGH
+oah
+rOZ
+rhc
+rhc
+rhc
+rhc
+slq
+rhc
+jwS
+jwS
+nwb
+jwS
+jwS
+wYZ
+oMd
+azA
+urs
+azA
+mBX
+=======
+qDT
+oGh
+rCl
+fvm
+dvN
mnX
-hxl
-vkP
-dcd
-dcd
+azA
+xtt
+gtb
+imq
tTv
-ejo
-vkP
-sWE
-sWE
-sWE
-sWE
-vkP
-ucp
+wJz
+wJz
+wJz
+wJz
+qmW
+wJz
+dZG
+dZG
ucp
-vkP
-vkP
-sgn
-qMB
-qMB
-qMB
-qMB
-qMB
-qMB
-qMB
-qMB
-qMB
-ydO
-ahs
+dZG
+dZG
+pXt
+oMd
+azA
+prW
+azA
+eOv
+>>>>>>> Stashed changes
+cyW
+azA
+azA
+azA
+azA
+azA
aSa
arq
smK
@@ -92804,101 +114127,34 @@ dCA
aQC
dCA
eGI
-qZA
-qZA
-qZA
-hwA
-fye
-qZA
-qZA
-xNS
-cRm
-azA
-azA
-azA
-rEO
-rAh
-wDv
-kZE
-wDv
-rAh
-mPI
-azA
-azA
-azA
-azA
-doc
-cBf
-cBf
-nrq
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-bSF
-wFd
-cBf
-pGM
-aiJ
-wFd
-mPI
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-hKk
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
+qZA
+qZA
+qZA
+hwA
+fye
+qZA
+qZA
+xNS
+cRm
azA
azA
azA
+rEO
+rAh
+wDv
+kZE
+wDv
+rAh
+mPI
azA
azA
azA
azA
+snR
+cBf
+cBf
+nrq
azA
-rRz
-rRz
-rRz
-rRz
-rRz
-rRz
-rRz
-rRz
-rRz
-rRz
-rRz
-rRz
-rRz
-rRz
-rRz
-rRz
azA
azA
azA
@@ -92908,6 +114164,13 @@ azA
azA
azA
azA
+rEO
+wFd
+cBf
+pGM
+aiJ
+wFd
+mPI
azA
azA
azA
@@ -92921,6 +114184,7 @@ azA
azA
azA
azA
+hKk
rRG
pqv
wSD
@@ -92937,15 +114201,122 @@ cBf
dDG
tgG
cIT
-ptb
+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
+nwK
+iVB
+dUJ
+ayd
+lCr
+lCr
+fGa
+qmk
+vgK
+vgK
+=======
+xvV
+aBw
+pFZ
+fFk
+biF
+wxY
+gxH
+kYn
+kYn
+hBx
+qmk
+edo
+edo
+>>>>>>> Stashed changes
+ahs
+ioi
+lmd
azA
+aUc
+ahs
+cpq
+<<<<<<< Updated upstream
+shY
+jGd
+jqt
+acP
+jqt
+daY
+vXj
+thF
+=======
+gqA
+rbr
+jqt
+acP
+jqt
+lqJ
+tsY
+vkI
+>>>>>>> Stashed changes
+arq
+qhE
azA
-dzm
-jKr
+ahs
+<<<<<<< Updated upstream
+hle
+=======
+pLl
+>>>>>>> Stashed changes
+uVn
+uVn
+uVn
+uVn
+mUY
+uVn
+uVn
+uVn
+uVn
+uVn
+isS
+uVn
+<<<<<<< Updated upstream
+ajU
+vSR
+rpZ
+=======
+lez
+vSR
+qlZ
+>>>>>>> Stashed changes
azA
azA
azA
+ljW
azA
lPN
alq
@@ -92962,7 +114333,11 @@ rKu
kNn
lxE
lPN
-uZd
+<<<<<<< Updated upstream
+anA
+=======
+ttg
+>>>>>>> Stashed changes
uZd
uZd
bxC
@@ -92978,10 +114353,10 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
rkv
"}
(46,1,1) = {"
@@ -93026,9 +114401,6 @@ tEg
azA
azA
azA
-azA
-azA
-azA
hnd
xiV
inS
@@ -93043,44 +114415,83 @@ veW
uNU
hoi
bvo
-uVn
-vkP
-hxl
-mnX
-hxl
-mnX
-vtH
-wOQ
+bvo
+mUU
+<<<<<<< Updated upstream
+azA
+unA
+czG
+dlS
+jVW
+tJF
+qHy
+svx
+gYy
+byQ
+bBt
+pXA
+sAQ
+bBt
+bBt
+bBt
+lHR
+rhc
+jwS
+aYE
+cMW
+ivI
+jwS
+bra
+azA
+qbB
+cJw
+azA
+mBX
+=======
+azA
+mBm
+fvm
+rCl
+mhe
+pre
+hQq
+ecK
+woy
rhO
-vPQ
-vPQ
-vPQ
-vkP
sWE
+gPB
+eGa
sWE
sWE
sWE
-vkP
+nqu
+wJz
+dZG
qHt
bjI
dqC
-vkP
-sLI
-rVP
+dZG
+mcv
azA
+mdu
+jip
azA
-jXc
+eOv
+>>>>>>> Stashed changes
azA
+ljW
azA
azA
azA
azA
-ner
ahs
-hwA
nbU
smK
-smK
+<<<<<<< Updated upstream
+jWa
+=======
+nuz
+>>>>>>> Stashed changes
smK
yky
mUU
@@ -93129,7 +114540,7 @@ azA
azA
gwF
xIf
-doc
+snR
cBf
cBf
nrq
@@ -93143,7 +114554,7 @@ azA
azA
azA
azA
-bSF
+rEO
wFd
cBf
pis
@@ -93164,65 +114575,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
@@ -93239,16 +114591,128 @@ cBf
dDG
eKs
wKZ
-ptb
+gon
+azA
azA
azA
azA
azA
+gwF
+azA
+azA
+azA
+ecE
+cBf
+ctN
+azA
+azA
+qmk
+<<<<<<< Updated upstream
+knH
+knH
+qmk
+qmk
+glZ
+nFD
+lCr
+xgL
+xnp
+lCr
+qmk
+oLn
+lpb
+ahs
+yae
+lmd
+pbH
+xOi
+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
+oUX
+ahs
+bDg
+uVn
+lfS
+daW
+=======
+uNV
+lcl
+azA
+lcg
+ahs
+ssJ
+uVn
+rCg
+cfY
+>>>>>>> Stashed changes
+eAw
+nEj
+eDX
+cPp
+<<<<<<< Updated upstream
+iWm
+lsU
+uVn
+lsU
+cPp
+rEg
+cPp
+pCP
+ePc
+azA
azA
azA
+laZ
+=======
+hBy
+ete
+uVn
+ete
+cPp
+xrL
+cPp
+pTK
+cgt
azA
azA
azA
+dMN
+>>>>>>> Stashed changes
jDe
ouF
jns
@@ -93264,7 +114728,11 @@ kNn
mGO
lxE
lPN
-uZd
+<<<<<<< Updated upstream
+fOJ
+=======
+hMj
+>>>>>>> Stashed changes
til
uZd
bxC
@@ -93280,10 +114748,10 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
rkv
"}
(47,1,1) = {"
@@ -93328,9 +114796,6 @@ tEg
ong
azA
azA
-azA
-azA
-azA
hnd
baM
inS
@@ -93345,41 +114810,78 @@ fhG
uNU
soe
bvo
-uVn
-vkP
-oLh
-hxl
-hxl
-hxl
-uGX
+bvo
+azA
+azA
+<<<<<<< Updated upstream
+fSI
+rLZ
+rLZ
+dlb
+pty
+qhE
+azA
+kKP
+fsB
+rJp
+ivO
+qyA
+uRi
+qxp
+uRi
+hvC
+bBt
+tJx
+fVQ
+gaq
+gaq
+jwS
+jwS
+jwS
+cXl
+mSP
+oJp
+hpE
+lwP
+lwP
+qSG
+=======
+fFQ
+dvN
+dvN
+hpV
+vZc
+qhE
+azA
xtt
dcd
vPQ
-vPQ
-kQC
-vkP
-sWE
-sWE
-sWE
+pnN
+vtH
+unx
+klZ
+unx
+lxh
sWE
-vkP
+gfx
dtH
fpJ
-dtH
-vkP
-sLI
+fpJ
+dZG
+dZG
+dZG
+cXl
+tts
+wid
+aaI
+rOv
+rOv
+keO
+>>>>>>> Stashed changes
+azA
azA
-ndZ
-rDi
-pWt
-dzm
-ndZ
-uhS
azA
-ohQ
-ner
ahs
-hwA
kPz
smK
smK
@@ -93431,7 +114933,7 @@ azA
azA
gwF
gwF
-doc
+snR
cBf
cBf
nrq
@@ -93445,7 +114947,7 @@ azA
azA
azA
azA
-bSF
+rEO
wFd
cBf
cBf
@@ -93466,65 +114968,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
@@ -93541,15 +114984,128 @@ cBf
nSu
cBf
iWE
-ptb
+gon
+gwF
+azA
+ldt
+azA
+gwF
+gwF
+azA
+<<<<<<< Updated upstream
+kXs
+=======
+qrK
+>>>>>>> Stashed changes
+azA
+ecE
+pka
+gwF
azA
azA
+<<<<<<< Updated upstream
+glZ
+fOT
+jkv
+xbC
+nFD
+pNV
+qcL
+lCr
+sra
+aXd
+yjr
+rnV
+gcP
+lpb
+=======
+cIs
+hvs
+jnj
+ghw
+wbg
+qnM
+iFf
+kYn
+mIK
+avw
+dia
+qaQ
+goi
+wHC
+>>>>>>> Stashed changes
+ahs
+uVn
+lmd
+nLA
azA
+ahs
+cpq
+<<<<<<< Updated upstream
+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
+=======
+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
jDe
pav
@@ -93582,10 +115138,10 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
rkv
"}
(48,1,1) = {"
@@ -93630,9 +115186,6 @@ tEg
tuY
wfv
uhS
-azA
-azA
-azA
ntt
iuf
inS
@@ -93647,41 +115200,78 @@ pPx
uNU
soe
bvo
-uVn
-vkP
-oLh
-hxl
-hxl
-hxl
-hxl
-ups
-vPQ
+bvo
+azA
+azA
+<<<<<<< Updated upstream
+kiz
+jHT
+pty
+dlS
+lFC
+azA
+azA
+jwS
+oTO
+eGN
+ael
+paK
+dQz
+kid
+wPF
+rhc
+fYh
+jwS
+hyn
+gaq
+gaq
+uCY
+hyn
+jwS
+hWF
+kxf
+pCk
+azA
+azA
+azA
+mBX
+=======
+rce
+ofg
+vZc
+rCl
+xav
+azA
+azA
+dZG
+pOL
aRb
-vPQ
+kBr
hpE
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-sLI
+lbi
+tAd
+kuS
+wJz
+qOK
+dZG
+gqN
+fpJ
+fpJ
+nUf
+gqN
+dZG
+jFe
+dPn
+dpm
+azA
+azA
+azA
+eOv
+>>>>>>> Stashed changes
+azA
azA
-doc
-gMR
-kiP
-rDi
-uer
-nrq
-dzm
azA
-ner
ahs
-hwA
kPz
smK
smK
@@ -93733,7 +115323,7 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
nrq
@@ -93747,7 +115337,7 @@ azA
vJH
azA
azA
-nwj
+jjl
yfB
mgO
mgO
@@ -93770,22 +115360,22 @@ azA
hKk
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
+ieA
+oUb
+odq
+fIm
+kQp
+snd
+wNG
+vkS
+dgm
+wcu
+cBf
+vNZ
+uMf
+cBf
+kyN
+qrK
azA
azA
azA
@@ -93796,63 +115386,133 @@ 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
-azA
-azA
-azA
-azA
-azA
-azA
-dzm
-azA
-azA
-azA
-azA
-ner
-uVn
-uVn
-uVn
-uVn
-uVn
-uVn
-uVn
+ahs
uVn
-sLI
-aUc
+voC
+voU
azA
+fwA
+ufz
+jle
+fwA
+qmk
+jiV
+nLc
+tBb
+<<<<<<< Updated upstream
+kXs
azA
azA
azA
azA
azA
azA
-ieA
-oUb
-odq
-fIm
-kQp
-snd
-wNG
-vkS
-dgm
-wcu
-cBf
-vNZ
-uMf
-cBf
-tBb
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
+=======
+hVY
+muq
+nLc
+sDy
+gSK
+iRT
+fZL
azA
+>>>>>>> Stashed changes
+xTy
lPN
xYN
lxE
@@ -93884,10 +115544,10 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
rkv
"}
(49,1,1) = {"
@@ -93932,9 +115592,6 @@ tEg
snR
qky
nrq
-azA
-azA
-azA
bvo
wDT
inS
@@ -93949,41 +115606,71 @@ oVW
uNU
xBk
bvo
-uVn
-vkP
-oLh
-hxl
-hxl
-mnX
-hxl
+bvo
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+<<<<<<< Updated upstream
+jwS
+nwz
+tTv
+jZl
+uRi
+wPF
+bSj
+uRi
+rhc
+rhc
+jwS
+qen
+gaq
+gaq
+gaq
+osB
+jwS
+urs
+azA
+hqe
+azA
+nBj
+dWL
+mBX
+=======
+dZG
+atw
+vrA
wOQ
-vPQ
-vPQ
-vPQ
-bhz
-vkP
-sgn
-qMB
-qMB
-qMB
-qMB
-qMB
-uAe
-qMB
-qMB
-nqZ
-shi
-gAg
-woz
-cBf
-joe
-avm
-nrq
+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
-ner
ahs
-hwA
rhZ
kqU
smK
@@ -94035,7 +115722,7 @@ azA
azA
dzm
azA
-doc
+snR
cBf
cBf
nrq
@@ -94070,65 +115757,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
@@ -94145,13 +115773,127 @@ kkQ
cBf
eGt
cBf
-ptb
+gon
+azA
+azA
+azA
+azA
+<<<<<<< Updated upstream
+kXs
+=======
+qrK
+>>>>>>> Stashed changes
+azA
+azA
+azA
+azA
+ecE
+pka
azA
azA
+oMd
+<<<<<<< Updated upstream
+knH
+wqV
+nFD
+nFD
+avt
+rCC
+jkv
+jXk
+nFD
+nFD
+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
+tvQ
+oLo
+jqt
+jqt
+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
+ohj
+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
@@ -94186,10 +115928,10 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
rkv
"}
(50,1,1) = {"
@@ -94234,9 +115976,6 @@ tEg
gAg
wTQ
ctN
-azA
-azA
-azA
bvo
hxN
inS
@@ -94251,41 +115990,77 @@ uNU
uNU
voi
bvo
-uVn
-vkP
-hxl
-hxl
-hxl
-hxl
-hxl
-vkP
-vkP
-vkP
-vkP
-vkP
-vkP
-sLI
-azA
-jXc
+bvo
+<<<<<<< Updated upstream
+pKM
+pKM
+pKM
+pKM
+pKM
+pKM
+pKM
+pKM
+pKM
+jwS
+tyQ
+dTC
+tZw
+uRi
+uYN
+frG
+qyA
+rhc
+rhc
+jwS
+kqB
+tSg
+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
-ndZ
-rDi
-uhS
+mUU
+<<<<<<< Updated upstream
+mBX
+=======
+eOv
+>>>>>>> Stashed changes
azA
-ndZ
-mZx
-gap
-cBf
-gMR
-nrq
-jXc
+aUc
azA
-ner
ahs
-hwA
rhZ
kqU
smK
@@ -94337,7 +116112,7 @@ azA
azA
azA
sHv
-doc
+snR
cBf
cBf
nrq
@@ -94372,6 +116147,24 @@ ipk
uhS
azA
hKk
+qgq
+gJN
+qlf
+tnb
+cPp
+rlA
+sAV
+eAw
+jUm
+xdx
+miw
+wcu
+fxC
+kkQ
+cBf
+cBf
+gon
+<<<<<<< Updated upstream
azA
azA
azA
@@ -94379,31 +116172,67 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-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
+=======
azA
azA
azA
@@ -94411,52 +116240,68 @@ 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
-ner
+afB
+ahs
+tfP
+jqt
+jqt
+jqt
+jqt
+jqt
+hqC
+jqt
+unT
+lmd
+uOD
+mUU
+gZu
uVn
-egT
-cRC
-wEh
-wkQ
-egT
-egT
+eDX
uVn
-sLI
-azA
-azA
-azA
-azA
-azA
-azA
-qgq
-gJN
-qlf
-tnb
-cPp
-rlA
-sAV
-eAw
-jUm
-xdx
-miw
-wcu
-fxC
-kkQ
-cBf
-cBf
+rjg
+uAQ
+gfq
+voS
+deN
+qmk
+nZE
+rhP
ptb
+qmk
+wmc
+vxq
+cIs
+vAW
+pBl
+sXY
azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
+>>>>>>> Stashed changes
+afB
azA
azA
azA
@@ -94488,10 +116333,10 @@ azA
azA
azA
azA
-azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
+eyn
rkv
"}
(51,1,1) = {"
@@ -94536,9 +116381,6 @@ tEg
azA
azA
gvU
-azA
-azA
-azA
rUx
naX
inS
@@ -94553,41 +116395,71 @@ cbF
lox
mji
bvo
-uVn
-vkP
-hxl
-vmd
-mnX
-vtH
-hxl
-vkP
-uVn
-uVn
-uVn
-uVn
-uVn
-sLI
+bvo
+azA
+qhE
azA
azA
azA
azA
+qhE
azA
azA
+<<<<<<< Updated upstream
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+jwS
+rOZ
+rOZ
+jwS
+kEW
+mlH
+kEW
+jwS
+jwS
+jwS
+pKM
+pKM
+pKM
+hpE
+pKM
+pKM
+hpE
+=======
+dZG
+dZG
+dZG
+dZG
+dZG
+dZG
+dZG
+dZG
+tTv
+tTv
+dZG
sik
-gMR
-nrq
+aXd
+sik
+dZG
+dZG
+dZG
+ncc
+ncc
+ncc
+aaI
+ncc
+ncc
+aaI
+>>>>>>> Stashed changes
+azA
azA
-nIu
-wTQ
-gXD
-wTQ
-wTQ
-vGi
azA
-dzm
-ner
ahs
-hwA
rhZ
kqU
smK
@@ -94639,12 +116511,12 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
nrq
azA
-doc
+snR
cBf
cBf
cBf
@@ -94674,65 +116546,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
@@ -94759,9 +116572,116 @@ azA
azA
azA
azA
+ecE
+pka
+azA
+azA
+oMd
+<<<<<<< Updated upstream
+knH
+vfX
+lCr
+nFD
+nNE
+xVr
+nFD
+nFD
+gTM
+uOD
+tqM
+mBm
+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
+jyj
+piH
+jGd
+aaC
+jBW
+=======
+rJc
+lxY
+jqt
+qTx
+mlJ
+rbr
+ecc
+jGR
+>>>>>>> Stashed changes
+lmd
azA
azA
+ahs
+uVn
+<<<<<<< Updated upstream
+lLC
+hxj
+hxj
+pZJ
+uBz
+uBz
+hak
+qmk
+lCr
+dFN
+wXk
+eCW
+eIL
+ecx
+kAC
+=======
+mDZ
+vgW
+vgW
+fwA
+voS
+voS
+eEx
+qmk
+kYn
+qob
+qsZ
+tsU
+jDg
+gOW
+bMM
+>>>>>>> Stashed changes
+ndZ
+rDi
+rDi
+rDi
+rDi
+rDi
+rDi
+uhS
azA
azA
azA
@@ -94791,9 +116711,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
rkv
"}
(52,1,1) = {"
@@ -94838,9 +116758,6 @@ tEg
azA
azA
azA
-azA
-azA
-azA
xNb
xiV
inS
@@ -94855,41 +116772,73 @@ bvo
bvo
bvo
bvo
-uVn
-vkP
-mnX
-mnX
-hxl
-hxl
-oLh
-vkP
-uVn
-uVn
-uVn
-axO
-axO
+bvo
+azA
+azA
+ljW
+azA
+aUc
+azA
+azA
+azA
+<<<<<<< Updated upstream
+hOl
+lmd
+tfP
+gDP
+smK
+gDP
+smK
+piZ
+uQU
+rhc
+rhc
+vPt
+rhc
+rhc
+cpU
+gYV
+fLe
+jwS
+azA
+azA
+azA
+azA
+qwc
+azA
+azA
+azA
+=======
+iBL
+lmd
+tfP
+tdR
+smK
+tdR
+smK
ijk
vgK
-axO
-vgK
-ijk
-shL
-axO
-hUC
-uGc
+wJz
+wJz
+bBF
+wJz
+wJz
+kfy
+qQI
uyr
-lpb
+dZG
azA
azA
azA
-dzm
azA
-dzm
+uGX
+azA
+azA
+azA
+>>>>>>> Stashed changes
azA
azA
-ner
ahs
-hwA
rhZ
mjp
aMj
@@ -94941,12 +116890,12 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
nrq
azA
-doc
+snR
cBf
feD
snV
@@ -94976,65 +116925,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
@@ -95061,10 +116951,116 @@ azA
azA
azA
azA
+ecE
+pka
azA
-dzm
azA
azA
+qmk
+<<<<<<< Updated upstream
+cSH
+nFD
+nHo
+vxq
+iBY
+lCr
+lCr
+lCr
+lCr
+ayd
+muq
+lpb
+lpb
+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
+jqt
+etD
+lmd
+azA
+nLA
+jZF
+uVn
+jVw
+hxj
+hxj
+nUf
+bcP
+uBz
+fEU
+glZ
+aPG
+lQZ
+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
+qfO
+qfO
+qfO
+qfO
+qfO
+nrq
+azA
azA
azA
jDe
@@ -95093,9 +117089,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
rkv
"}
(53,1,1) = {"
@@ -95140,9 +117136,6 @@ tEg
azA
azA
azA
-azA
-azA
-azA
rUx
baM
inS
@@ -95151,6 +117144,9 @@ iUm
inS
jwc
bvo
+azA
+azA
+azA
sgn
qMB
qMB
@@ -95158,40 +117154,58 @@ qMB
qMB
qMB
ydO
-vkP
-oit
-hxl
-mnX
-hxl
-oLh
-vkP
-uVn
-uVn
-cgu
-axO
-wGw
-rdk
-rdk
-rdk
-rdk
-rdk
-kjL
+azA
+azA
+azA
+azA
+ljW
+ahs
+lmd
+tfP
+<<<<<<< Updated upstream
+gDP
+smK
+ekZ
+smK
+smK
+wJq
+mpj
+rhc
+nUt
+rhc
+rhc
+rhc
+rhc
+rhc
+jwS
+=======
+tdR
+smK
axO
-cBf
-avm
-cBf
-nrq
+smK
+smK
+nJY
+fow
+wJz
+glZ
+wJz
+wJz
+wJz
+wJz
+wJz
+dZG
+>>>>>>> Stashed changes
azA
-qtW
+azA
+azA
+azA
+ljW
azA
azA
azA
azA
azA
-slm
-ner
ahs
-hwA
rhZ
luk
nOi
@@ -95243,12 +117257,12 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
nrq
azA
-doc
+snR
cBf
cBf
cBf
@@ -95278,65 +117292,6 @@ wTQ
ctN
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
-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
@@ -95363,9 +117318,120 @@ azA
azA
azA
azA
+ecE
+pka
+azA
+azA
azA
+<<<<<<< Updated upstream
+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
+=======
+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
+eJw
+iHH
+wHI
+fbI
+nrq
azA
azA
azA
@@ -95395,9 +117461,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
rkv
"}
(54,1,1) = {"
@@ -95442,9 +117508,6 @@ tEg
azA
azA
azA
-azA
-azA
-azA
xNb
baM
vbj
@@ -95453,6 +117516,9 @@ inS
wMg
jwc
bvo
+azA
+azA
+azA
sLI
xUy
hYq
@@ -95460,40 +117526,70 @@ hYq
hYq
xUy
ner
-vkP
-jCz
-hxl
-hxl
-hxl
-oLh
-vkP
-uVn
-uVn
-uVn
+<<<<<<< Updated upstream
+huE
+=======
+pkU
+>>>>>>> Stashed changes
+azA
+azA
+azA
+bho
+jQw
+lmd
+tfP
+<<<<<<< Updated upstream
+gDP
+smK
+gDP
+smK
+smK
+kBR
+nVV
+nVV
+vPt
+rhc
+rhc
+ljY
+fiF
+iBf
+jwS
+azA
+aUc
+azA
+umk
+azA
+azA
+azA
+wSh
+=======
tdR
-yjr
-rdk
+smK
+tdR
+smK
+smK
dZQ
-nLc
+qjd
qjd
bBF
-yba
-axO
-axO
-axO
-axO
-axO
-axO
-vgK
-ijk
-axO
-axO
-vgK
-ijk
-axO
-mUB
+wJz
+wJz
+dsU
+aoD
+fov
+dZG
+azA
+aUc
+azA
+fwp
+azA
+azA
+azA
+dhC
+>>>>>>> Stashed changes
+azA
+azA
ahs
-hwA
rhZ
gtc
lxu
@@ -95544,108 +117640,53 @@ azA
azA
azA
azA
-ojt
-doc
-cBf
-cBf
-nrq
-ojt
-doc
-cBf
-ofC
-fzw
-nrq
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-ndZ
-rdf
-cBf
-cBf
-cBf
-eax
-cBf
-cBf
-nrq
-gwF
-azA
-azA
-hKk
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-ndZ
-rDi
-rDi
-rDi
-rDi
-rDi
-rDi
-uhS
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-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
+ojt
+snR
+cBf
+cBf
+nrq
+ojt
+snR
+cBf
+ofC
+fzw
+nrq
+azA
+azA
+azA
+azA
+azA
azA
azA
azA
azA
+azA
+azA
+azA
+ndZ
+rdf
+cBf
+cBf
+cBf
+eax
+cBf
+cBf
+nrq
+gwF
+azA
+azA
+hKk
qgq
mWm
kYf
aZm
lLM
ine
-tOD
+<<<<<<< Updated upstream
+rdk
+=======
+cNq
+>>>>>>> Stashed changes
cNV
aZm
smK
@@ -95665,12 +117706,119 @@ azA
azA
azA
azA
-lPN
-lPN
-lPN
-lPN
-lPN
-lPN
+ecE
+pka
+azA
+azA
+<<<<<<< Updated upstream
+glZ
+glZ
+glZ
+qmk
+qmk
+qmk
+glZ
+qmk
+qmk
+qmk
+glZ
+glZ
+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
+jqt
+jqt
+jqt
+jqt
+jqt
+jqt
+lmd
+azA
+<<<<<<< Updated upstream
+lbC
+jZF
+uVn
+weO
+hxj
+wwj
+eOR
+eOv
+uBz
+cBO
+mGu
+uBz
+nFm
+oCk
+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
+azA
+azA
lPN
tOk
rin
@@ -95697,9 +117845,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
rkv
"}
(55,1,1) = {"
@@ -95744,9 +117892,6 @@ tEg
jKr
azA
azA
-azA
-azA
-azA
bvo
pVT
inS
@@ -95755,6 +117900,9 @@ uPX
inS
lBY
bvo
+azA
+azA
+azA
sLI
hYq
mWz
@@ -95762,40 +117910,57 @@ mWz
hra
hYq
ner
-vkP
-jCz
-hxl
-mnX
-hxl
-hxl
-vkP
+azA
+ljW
+<<<<<<< Updated upstream
+qmc
+=======
+pvt
+>>>>>>> Stashed changes
+azA
+ahs
uVn
-axO
-axO
-axO
-iNn
-rdk
-suy
-jBW
-ngc
+lmd
+tfP
+cNV
+cNV
+smK
+smK
+smK
+<<<<<<< Updated upstream
+jwS
+rOd
+rOd
+sMT
+uJz
+uJz
+nwb
+rOd
+rOd
+jwS
+=======
+dZG
+xvq
+xvq
fGa
yba
-rdk
-qAP
-ggF
+yba
+ucp
xvq
-aeE
-eco
-vxq
-cSH
-ymf
-qrg
-mBm
-xom
-eTC
-axO
+xvq
+dZG
+>>>>>>> Stashed changes
+azA
+azA
+azA
+ndZ
+rDi
+rDi
+uhS
+azA
+ljW
+azA
ahs
-hwA
kPz
gtc
ybl
@@ -95826,9 +117991,13 @@ uMn
wYW
azA
azA
-azA
-azA
-azA
+ndZ
+rDi
+<<<<<<< Updated upstream
+eMO
+=======
+aUl
+>>>>>>> Stashed changes
azA
azA
azA
@@ -95847,12 +118016,12 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
nrq
azA
-doc
+snR
cBf
mXD
cBf
@@ -95882,22 +118051,22 @@ gwF
azA
azA
hKk
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-snR
-qfO
-qfO
-qfO
-qfO
-qfO
-qfO
-nrq
+qgq
+gLK
+cNV
+jnY
+cNV
+gyC
+cNV
+cNV
+aZm
+kYf
+hmE
+wpN
+pOK
+vyH
+sbq
+ieA
azA
azA
azA
@@ -95912,68 +118081,116 @@ ecE
pka
azA
azA
-azA
-azA
-azA
-ner
-uVn
-egT
-egT
-egT
-egT
-egT
+<<<<<<< Updated upstream
+glZ
+adR
+olg
+xty
+mOk
+mOF
+qmk
+mOF
+uhs
+qWI
+nUe
+rHn
+tlK
+=======
+cIs
+emw
+ryi
+rtN
+jGd
+nrR
+qmk
+nrR
+lSG
+tqF
sra
uJq
-uJq
-egT
-kge
-egT
-egT
-ncc
-ncc
-wEh
-iJF
-lki
-egT
-uVn
-sLI
+pQD
+>>>>>>> Stashed changes
+mZc
azA
+ahs
+uVn
+lmd
+mUU
+dzm
+ahs
+<<<<<<< Updated upstream
+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
+=======
+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
-qgq
-gLK
-cNV
-jnY
-cNV
-gyC
-cNV
-cNV
-aZm
-kYf
-hmE
-wpN
-pOK
-vyH
-sbq
-ieA
azA
azA
+snR
+qfO
+xkl
azA
-dzm
azA
-dzm
-dzm
+<<<<<<< Updated upstream
+tsU
+=======
+kNI
+>>>>>>> Stashed changes
+qfO
+nrq
azA
azA
azA
lPN
-nmA
-fwp
-fwp
-fwp
-cRJ
-lPN
alA
rin
hqY
@@ -95999,9 +118216,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
rkv
"}
(56,1,1) = {"
@@ -96016,11 +118233,11 @@ azA
azA
azA
eXq
-hfc
rFk
-eIL
rFk
-hKe
+rFk
+rFk
+rFk
eXq
azA
azA
@@ -96046,9 +118263,6 @@ tEg
dzm
azA
azA
-azA
-azA
-azA
bvo
jwc
inS
@@ -96057,6 +118271,9 @@ hUb
inS
gLw
bvo
+azA
+azA
+azA
sLI
hYq
jFm
@@ -96064,39 +118281,61 @@ mWz
hra
hYq
ner
-vkP
-rek
-mnX
-hxl
-hxl
-mnX
-vkP
+<<<<<<< Updated upstream
+cJw
+azA
+azA
+jwI
+=======
+jip
+azA
+azA
+qiE
+>>>>>>> Stashed changes
+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
+cNV
+cNV
+smK
+smK
+<<<<<<< Updated upstream
+pDU
+lmd
+azA
+jVC
+snR
+nrq
+jVC
+qhE
+azA
+qwc
+azA
+pbH
+=======
+gMf
+lmd
+azA
+qOs
+snR
+nrq
+qOs
+qhE
+azA
+uGX
+azA
+xlt
+>>>>>>> Stashed changes
+ndZ
+dPr
+cBf
+cBf
+kiP
+uhS
+azA
+azA
aSa
rhZ
luk
@@ -96128,15 +118367,22 @@ aqO
wYW
azA
azA
-azA
-azA
-azA
-azA
+<<<<<<< Updated upstream
+sik
+=======
+yaP
+>>>>>>> Stashed changes
+gMR
+nrq
dzm
+ndZ
+uhS
+<<<<<<< Updated upstream
azA
+=======
+>>>>>>> Stashed changes
azA
-azA
-azA
+ohQ
azA
azA
azA
@@ -96149,12 +118395,12 @@ omf
omf
omf
uhS
-doc
+snR
cBf
cBf
nrq
azA
-doc
+snR
cBf
feD
cBf
@@ -96184,22 +118430,22 @@ gwF
azA
azA
hKk
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-snR
-qfO
-nDt
-eJw
-iHH
-wHI
-fbI
-nrq
+qgq
+pBX
+smK
+aZm
+hLk
+smK
+smK
+cNV
+aZm
+fqV
+ieA
+ieA
+mNa
+ycb
+stJ
+rRG
azA
azA
azA
@@ -96214,68 +118460,106 @@ ecE
pka
azA
azA
-azA
-azA
-azA
-ner
-qZA
-egT
-ixw
+<<<<<<< Updated upstream
+glZ
+bqM
+rHn
+udU
+mOF
+hQM
+qmk
+rEV
+tGc
+qil
+kVy
+avq
+rHn
+mZc
+jJH
+=======
+cIs
+tyt
+uJq
+dGb
+nrR
+cMJ
+qmk
nUb
mOF
tqr
mNW
+moW
uJq
-oQd
-egT
+mZc
kHN
-lQf
-egT
-wEh
-avt
-rnV
-jUl
-wEh
-egT
+>>>>>>> Stashed changes
+ahs
uVn
-sLI
-ndZ
-rDi
-rDi
-uhS
-qgq
-pBX
-smK
-aZm
-hLk
-smK
-smK
-cNV
-aZm
-fqV
-ieA
-ieA
-mNa
-ycb
-stJ
-rRG
+lmd
azA
+nLA
+ahs
+tfP
+jqt
+jqt
+jqt
+jqt
+<<<<<<< Updated upstream
+nmF
+=======
+xhh
+>>>>>>> Stashed changes
+jqt
+jqt
+jqt
+lmd
azA
azA
+<<<<<<< Updated upstream
+jZF
+isS
+weO
+hxj
+hxj
+nUf
+hPz
+hPz
+uBz
+rOQ
+mGu
+uBz
+tcf
+=======
+kjL
+isS
+weO
+vgW
+vgW
+hrQ
+fcs
+fcs
+voS
+srr
+cjZ
+voS
+vYE
+>>>>>>> Stashed changes
+qmk
azA
azA
+ndZ
+dPr
+qfO
+qfO
+cyW
azA
-dzm
+qfO
+qfO
+nrq
azA
azA
azA
lPN
-stT
-fwp
-hPz
-fwp
-fwp
-lPN
uZd
rin
hqY
@@ -96301,9 +118585,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
rkv
"}
(57,1,1) = {"
@@ -96318,11 +118602,11 @@ azA
azA
azA
eXq
-aaz
rFk
rFk
rFk
-hKe
+rFk
+rFk
eXq
azA
azA
@@ -96348,9 +118632,6 @@ tEg
jWe
azA
azA
-azA
-azA
-azA
xNb
baM
inS
@@ -96359,6 +118640,9 @@ iUm
inS
sPl
bvo
+azA
+azA
+azA
sLI
hYq
mWz
@@ -96366,40 +118650,58 @@ mWz
mWz
hYq
ner
-vkP
-hxl
-mnX
-hxl
-hxl
-hxl
-vkP
+<<<<<<< Updated upstream
+boK
+=======
+reW
+>>>>>>> Stashed changes
+qhE
+azA
+azA
+ahs
uVn
-axO
-pyY
-rdk
-ozC
-rdk
-jCV
-jZF
-swK
-mOk
-vxq
-rdk
-mOk
-wsn
-gMb
+lmd
+tfP
+smK
+smK
+cNV
+smK
+smK
+ahs
+lmd
+azA
+<<<<<<< Updated upstream
+bGj
+=======
mOk
-gtb
-rdk
-rup
-flS
+>>>>>>> Stashed changes
+snR
+kiP
+rDi
+rDi
+rDi
+rDi
+rDi
+rDi
+dPr
+<<<<<<< Updated upstream
+xiG
+mgC
+xNY
+cBf
+nrq
+azA
+dYy
+=======
+xnp
fpo
rdk
-jkv
-rdk
-nvC
+cBf
+nrq
+azA
wWn
-hwA
+>>>>>>> Stashed changes
+ahs
rhZ
hiH
kFH
@@ -96430,15 +118732,19 @@ tZU
wYW
azA
azA
+snR
+gMR
+kiP
+rDi
+uer
+nrq
+dzm
azA
+<<<<<<< Updated upstream
azA
-azA
-azA
-azA
-azA
-azA
-azA
+=======
jHW
+>>>>>>> Stashed changes
azA
dzm
azA
@@ -96451,12 +118757,12 @@ wVv
eZQ
eZQ
nrq
-doc
+snR
cBf
cBf
nrq
azA
-doc
+snR
cBf
cBf
cBf
@@ -96486,22 +118792,22 @@ gwF
azA
azA
hKk
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-snR
-qfO
-nrq
-azA
-wNx
-aWT
-fbI
-nrq
+qgq
+fKR
+smK
+smK
+dhA
+syo
+kNN
+smK
+kYf
+smK
+kvi
+nev
+hAs
+gTD
+xhq
+rRG
azA
azA
azA
@@ -96516,68 +118822,117 @@ ecE
pka
azA
azA
-azA
-azA
-azA
-ner
-qZA
-egT
-fhl
-rHn
-rHn
+qmk
+<<<<<<< Updated upstream
+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
+=======
+tSv
+nQN
+ndP
+jMh
+lSG
+cIs
+xiF
+bNV
+bNV
hpp
-egT
+nrR
tyt
-egT
-egT
-ioi
-egT
-vOh
+sqv
+rnE
+fze
+uVn
+lmd
vfS
-wEh
-ncc
+nml
+ahs
cpq
-egT
-qZA
-sLI
-doc
-hYR
+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
cBf
+cBx
nrq
-qgq
-fKR
-smK
-smK
-dhA
-syo
-kNN
-smK
-kYf
-smK
-kvi
-nev
-hAs
-gTD
-xhq
-rRG
azA
azA
-ndZ
-rDi
-rDi
-rDi
-uhS
+uzn
+gAg
+ctN
azA
azA
azA
lPN
-nVz
-fwp
-fwp
-dhC
-fwp
-lPN
azq
rin
gEH
@@ -96603,9 +118958,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
rkv
"}
(58,1,1) = {"
@@ -96620,11 +118975,11 @@ jKr
azA
azA
eXq
-kib
rFk
rFk
rFk
-tQx
+rFk
+rFk
eXq
azA
azA
@@ -96650,9 +119005,6 @@ tEg
azA
azA
azA
-azA
-azA
-azA
rUx
baM
wMg
@@ -96661,6 +119013,9 @@ inS
lCY
rug
bvo
+azA
+azA
+azA
sLI
hYq
hra
@@ -96668,40 +119023,46 @@ 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
+lmd
+tfP
+smK
+kYf
+smK
+smK
+smK
+ahs
+lmd
+azA
+azA
+snR
+cBf
+cBf
+cBf
+cBf
+cBf
+cBf
+cBf
+cBf
+<<<<<<< Updated upstream
+xiG
+mgC
+xNY
+=======
xnp
+fpo
rdk
-rdk
-rdk
-rdk
-ybL
-xaK
-hwA
+>>>>>>> Stashed changes
+cBf
+nrq
+azA
+azA
+ahs
rhZ
smK
kqU
@@ -96732,12 +119093,12 @@ aqO
wYW
azA
azA
-azA
-azA
-azA
-azA
-azA
-azA
+gAg
+woz
+cBf
+joe
+avm
+nrq
azA
azA
azA
@@ -96753,7 +119114,7 @@ xCc
gBk
eZQ
nrq
-doc
+snR
cBf
cBf
nrq
@@ -96788,72 +119149,17 @@ gwF
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
-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
+<<<<<<< Updated upstream
+jCV
+=======
+oEK
+>>>>>>> Stashed changes
smK
smK
smK
@@ -96865,20 +119171,127 @@ tWk
ieA
azA
azA
-snR
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+ecE
+pka
+azA
+oMd
+<<<<<<< Updated upstream
+laF
+idu
+rHn
+uAs
+rHn
+mOF
+rod
+rHn
+mOF
+qUT
+mOF
+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
+svH
+jqt
+vfR
+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
+hxj
+hxj
+glZ
+hak
+hak
+uBz
+uBz
+uBz
+uBz
+oCk
+glZ
+=======
+fze
+uVn
+weO
+vgW
+vgW
+cIs
+eEx
+eEx
+voS
+voS
+voS
+voS
+kmB
+cIs
+>>>>>>> Stashed changes
+ndZ
+dPr
cBf
cBf
cBf
-kJH
+nrq
+azA
+ndZ
+wfv
+uhS
+azA
azA
azA
azA
-lPN
-fwp
-fwp
-bFY
-fwp
-fwp
lPN
xRp
uZd
@@ -96905,9 +119318,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
rkv
"}
(59,1,1) = {"
@@ -96922,11 +119335,11 @@ dzm
azA
azA
eXq
-oCy
rFk
rFk
rFk
-xPY
+rFk
+rFk
eXq
azA
jWe
@@ -96952,9 +119365,6 @@ tEg
azA
azA
azA
-azA
-azA
-azA
xNb
baM
inS
@@ -96963,6 +119373,9 @@ inS
inS
gLw
bvo
+azA
+azA
+azA
sLI
hYq
jgs
@@ -96970,40 +119383,48 @@ mWz
mWz
hYq
ner
-vkP
-bNB
-hxl
-iVA
-hxl
-bNB
-vkP
-uVn
-axO
-fnx
-qjq
-laY
-rdk
-rdk
-yba
-rdk
+azA
+qhE
+azA
+azA
+aOB
+nEj
+lmd
+tfP
+smK
+kYf
+kYf
+smK
+smK
+ahs
+lmd
+azA
+<<<<<<< Updated upstream
+ryf
+=======
rNa
-rdk
-rdk
-rdk
-vxq
-rdk
-rdk
-rdk
-rdk
-rdk
-ozC
-rdk
-kjL
-pyY
-fOT
-axO
-axO
-hwA
+>>>>>>> Stashed changes
+snR
+nDt
+wTQ
+wTQ
+wTQ
+wTQ
+wTQ
+wTQ
+jbl
+cBf
+cBf
+nDt
+wTQ
+ctN
+<<<<<<< Updated upstream
+dOi
+=======
+cay
+>>>>>>> Stashed changes
+azA
+ahs
rhZ
smK
kqU
@@ -97034,13 +119455,13 @@ wYW
wYW
azA
azA
-azA
-azA
-azA
-dzm
-azA
-azA
-dzm
+ndZ
+mZx
+gap
+cBf
+gMR
+nrq
+jXc
azA
azA
azA
@@ -97055,7 +119476,7 @@ uyy
eZQ
eZQ
nrq
-doc
+snR
cBf
cBf
nrq
@@ -97090,22 +119511,22 @@ gwF
azA
azA
hKk
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-snR
-qfO
-qfO
-cyW
-azA
-qfO
-qfO
-nrq
+qgq
+lcl
+waD
+smK
+pWQ
+hLk
+kYf
+smK
+smK
+smK
+pdG
+mfV
+nmU
+dNt
+mlw
+ieA
azA
azA
azA
@@ -97119,69 +119540,123 @@ azA
ecE
pka
azA
-azA
-azA
-azA
-azA
-ner
+oMd
+<<<<<<< Updated upstream
+laF
+xMY
+gyr
+udU
dwV
-egT
-rHn
-uJq
rHn
+bqM
+mOF
+oHa
+mOF
+=======
+uyA
+iFu
+ejo
+dGb
+dwV
uJq
-uJq
-egT
-udU
+tyt
+nrR
+nxg
+nrR
+>>>>>>> Stashed changes
+mKb
+mKb
+qmk
bYA
-egT
-sLe
-egT
-bDm
-egT
+<<<<<<< Updated upstream
+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
+cBf
+cBf
+cBf
+jMn
+=======
+bvB
+ahs
+uVn
+lmd
+qOr
uOD
-egT
+ahs
bDm
-egT
-fKQ
-sLI
-azA
-azA
-azA
-azA
-qgq
-lcl
-waD
-smK
-pWQ
-hLk
-kYf
-smK
-smK
-smK
-pdG
-mfV
-nmU
-dNt
-mlw
-ieA
-azA
+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
-pMm
+cBf
cBf
cBf
xty
-azA
+>>>>>>> Stashed changes
+ctN
+ndZ
+hUC
+cBf
+kiP
+wfv
+uhS
azA
azA
lPN
-fwp
-dhC
-fwp
-fwp
-fwp
-rLk
uZd
uZd
uZd
@@ -97207,9 +119682,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
rkv
"}
(60,1,1) = {"
@@ -97223,12 +119698,12 @@ azA
azA
azA
azA
-eXq
-tQx
+ueJ
+rFk
+rFk
rFk
rFk
rFk
-oCy
eXq
azA
jXc
@@ -97254,9 +119729,6 @@ tEg
azA
azA
azA
-azA
-azA
-azA
bvo
kim
baM
@@ -97265,6 +119737,9 @@ baM
baM
ogu
bvo
+azA
+azA
+azA
sLI
xUy
hYq
@@ -97272,40 +119747,52 @@ 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
+aUc
+<<<<<<< Updated upstream
+mEj
+=======
+iob
+>>>>>>> Stashed changes
+azA
+azA
+qhE
+ahs
+lmd
+tfP
+eJc
+kYf
+kYf
+kYf
+smK
+ahs
+lmd
+azA
+aUc
+snR
+nrq
+azA
+azA
+<<<<<<< Updated upstream
+jFD
+=======
aaC
-nkV
-ayd
-qil
-uQU
-aso
-rdk
-uQU
-kSD
-axO
-axO
+>>>>>>> Stashed changes
+azA
+azA
+azA
+gAg
+wTQ
+wTQ
+ctN
+ljW
+azA
+aUc
+<<<<<<< Updated upstream
+cbD
+=======
qOr
-hwA
+>>>>>>> Stashed changes
+ahs
kPz
kqU
kqU
@@ -97336,14 +119823,18 @@ mUU
loW
azA
azA
+nIu
+wTQ
+gXD
+wTQ
+wTQ
+vGi
azA
+<<<<<<< Updated upstream
+dzm
+=======
azA
-azA
-azA
-azA
-azA
-azA
-azA
+>>>>>>> Stashed changes
azA
azA
azA
@@ -97357,7 +119848,7 @@ omf
omf
omf
ctN
-doc
+snR
cBf
cBf
nrq
@@ -97392,22 +119883,22 @@ azA
azA
azA
hKk
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-snR
-cBx
-nrq
-azA
-azA
-uzn
-gAg
-ctN
+qgq
+ght
+smK
+kYf
+smK
+waD
+kYf
+smK
+waD
+bho
+ieA
+uOA
+jHC
+bmV
+bmV
+ieA
azA
azA
azA
@@ -97422,68 +119913,106 @@ ecE
pka
azA
azA
-azA
-azA
-azA
-ner
+qmk
+<<<<<<< Updated upstream
+tCQ
+wsX
+mOF
+mOF
+mOF
+hot
+piG
+rHn
+rHn
+enA
+uhs
+eDa
+vmR
uVn
-egT
+wid
+uVn
+sqF
+bpA
+grJ
+jQw
+hfR
+erZ
+=======
+lbU
+fDG
+nrR
+nrR
+nrR
hot
rHn
-mNW
-mNW
+uJq
+uJq
ajU
-egT
+lSG
eDa
rjg
-egT
-fKQ
uVn
-fRi
+qlk
+uVn
+sqF
+hVn
+oQd
+jQw
+ixI
+pjC
+>>>>>>> Stashed changes
+acP
+jqt
+jqt
+jqt
+jqt
+jqt
+<<<<<<< Updated upstream
+dnB
+uVn
+bpA
+grJ
+apx
ioi
-xNr
-qZA
-fRi
-qZA
-fKQ
-sLI
+uoK
+hKX
+hKX
+prA
+=======
+wby
+uVn
+hVn
+oQd
+cva
+ioi
+wpJ
+cuA
+cuA
+rqP
+>>>>>>> Stashed changes
+azA
+voU
azA
azA
azA
azA
-qgq
-ght
-smK
-kYf
-smK
-waD
-kYf
-smK
-waD
-bho
-ieA
-uOA
-jHC
-bmV
-bmV
-ieA
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
@@ -97509,9 +120038,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
rkv
"}
(61,1,1) = {"
@@ -97527,9 +120056,9 @@ azA
azA
eXq
eXq
-ulJ
-ulJ
-ulJ
+rFk
+rFk
+rFk
eXq
eXq
lhS
@@ -97556,9 +120085,6 @@ tEg
azA
azA
azA
-azA
-azA
-azA
bvo
bvo
rUx
@@ -97567,6 +120093,9 @@ ajV
xNb
bvo
bvo
+azA
+azA
+azA
kAJ
uQH
uQH
@@ -97574,40 +120103,56 @@ 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
+cXl
+azA
+azA
+azA
+aUc
+ahs
+lmd
+tfP
+rVM
+<<<<<<< Updated upstream
+oXG
+kYf
+kYf
+kYf
+diZ
+=======
+nuS
+kYf
+kYf
+kYf
+uWH
+>>>>>>> Stashed changes
+lmd
+azA
+azA
+snR
+nrq
+azA
+ljW
+<<<<<<< Updated upstream
+boK
+azA
+azA
+aUc
+bLE
+=======
+reW
+azA
+azA
+aUc
+nml
+>>>>>>> Stashed changes
+azA
+azA
+azA
+azA
+azA
+azA
+mUU
+ahs
rhZ
kqU
kqU
@@ -97659,7 +120204,7 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
nrq
@@ -97694,22 +120239,22 @@ azA
azA
azA
hKk
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-gAg
-wTQ
-ctN
-azA
-azA
-azA
-azA
-azA
+qgq
+fLc
+jzv
+wMK
+wHU
+qqh
+acP
+jqt
+psN
+jvx
+ieA
+ppM
+pdS
+aid
+cGb
+ieA
azA
azA
azA
@@ -97724,67 +120269,105 @@ ecE
pka
azA
azA
-azA
-azA
-azA
-ner
-uVn
-egT
+qmk
+<<<<<<< Updated upstream
+gpT
+nIl
+isM
+pVI
+jUl
+mKb
mKb
-rHn
uJq
rHn
yjK
-egT
-lfS
+eWg
+qmk
lfS
-egT
+kbY
+=======
+mCS
+qRS
+weQ
+tkR
+rPS
+mKb
+mKb
+nWq
+uJq
+yjK
+scf
+qmk
+rCg
+hRn
+>>>>>>> Stashed changes
+ahs
uVn
-peg
-tZf
-pAh
-fKQ
-psn
-tZf
-nCG
-fKQ
-sLI
+eDX
+nAH
+<<<<<<< Updated upstream
+gBo
+nEj
+cpq
+xHX
+jGd
+mjp
+mjp
+jqt
+jBW
+jGd
+jlT
+uVn
+nAH
+gBo
+=======
+hct
+nEj
+cpq
+vWy
+rbr
+mjp
+mjp
+jqt
+jGR
+rbr
+kFt
+uVn
+nAH
+hct
+>>>>>>> Stashed changes
+nEj
+ioi
+eDX
azA
azA
azA
azA
-qgq
-fLc
-jzv
-wMK
-wHU
-qqh
-acP
-jqt
-psN
-jvx
-ieA
-ppM
-pdS
-aid
-cGb
-ieA
azA
azA
+voU
+azA
+<<<<<<< Updated upstream
+eyc
+=======
+gFK
+>>>>>>> Stashed changes
+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
@@ -97811,9 +120394,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
rkv
"}
(62,1,1) = {"
@@ -97826,13 +120409,13 @@ azA
azA
azA
azA
-azA
-ner
-lmd
-wMG
-tVb
+hay
+mUB
+uVn
smK
-ahs
+smK
+smK
+uVn
ilA
uQH
uQH
@@ -97881,6 +120464,16 @@ wsd
wsd
wsd
wsd
+jQw
+sqF
+elf
+wsh
+rVM
+smK
+smK
+bff
+jQw
+sqF
wsd
wsd
wsd
@@ -97899,17 +120492,7 @@ wsd
wsd
wsd
wsd
-wsd
-wsd
-wsd
-wsd
-wsd
-wsd
-wsd
-wsd
-wsd
-hwA
-hwA
+jQw
rhZ
smK
kqU
@@ -97961,7 +120544,7 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
nrq
@@ -97996,22 +120579,26 @@ azA
azA
azA
hKk
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
-azA
+<<<<<<< Updated upstream
+wnP
+=======
+hZw
+>>>>>>> Stashed changes
+xVJ
+xVJ
+xVJ
+hdW
+wVI
+nlf
+jqt
+bzf
+aOB
+rRG
+rRG
+ieA
+ieA
+ieA
+ieA
azA
azA
azA
@@ -98025,53 +120612,71 @@ azA
ecE
pka
azA
-azA
-azA
-azA
-azA
-mUB
uVn
-egT
-egT
+qmk
+<<<<<<< Updated upstream
+glZ
ebh
-pzF
-egT
+ebh
+qmk
+qmk
+ebh
+ebh
+qmk
+qmk
+ebh
+qmk
+qmk
+lfU
+lfU
+=======
+cIs
cbK
-egT
-egT
-egT
-egT
-uVn
-uVn
-uVn
+cbK
+qmk
+qmk
+cbK
+cbK
+qmk
+qmk
+cbK
+qmk
+qmk
+hNt
+hNt
+>>>>>>> Stashed changes
+ahs
uVn
-fKQ
-fKQ
-uYI
-fKQ
-fKQ
-kAJ
-uQH
-uQH
-uQH
-uQH
-olg
-xVJ
-xVJ
-xVJ
-hdW
-wVI
-nlf
+sqF
+tMH
+bff
+jQw
+tfP
jqt
-bzf
-qzA
-rRG
-rRG
-ieA
-ieA
-ieA
-ieA
+mjp
+cKE
+dkV
+mjp
+jqt
+<<<<<<< Updated upstream
+rcq
+=======
+rnj
+>>>>>>> Stashed changes
+jqt
+uVn
+tMH
+bff
+jQw
+<<<<<<< Updated upstream
+yae
+=======
+ktI
+>>>>>>> Stashed changes
+sqF
+azA
azA
+voU
azA
azA
azA
@@ -98080,13 +120685,20 @@ azA
azA
azA
azA
+gAg
+wTQ
+wTQ
+wTQ
+ctN
+wKh
+azA
+azA
+gAg
+wTQ
+ctN
+azA
azA
azA
-ahs
-dGA
-dGA
-dGA
-sJc
azA
azA
azA
@@ -98113,9 +120725,9 @@ azA
azA
azA
azA
-azA
-azA
-azA
+eyn
+eyn
+eyn
rkv
"}
(63,1,1) = {"
@@ -98128,13 +120740,13 @@ uQH
uQH
uQH
uQH
-uQH
mUB
-lmd
-wMG
+eAw
+eAw
smK
smK
-uXT
+smK
+eAw
eAw
eAw
eAw
@@ -98185,12 +120797,12 @@ eAw
eAw
eAw
eAw
-eAw
-eAw
-eAw
-eAw
-eAw
-nQB
+rZy
+dVN
+smK
+smK
+smK
+rzw
eAw
eAw
eAw
@@ -98303,10 +120915,14 @@ moC
moC
moC
moC
-aDJ
-moC
-moC
-moC
+<<<<<<< Updated upstream
+byK
+=======
+wiE
+>>>>>>> Stashed changes
+smK
+smK
+smK
bNO
moC
moC
@@ -98327,39 +120943,71 @@ moC
moC
moC
moC
-aDJ
-moC
-moC
-moC
-moC
-moC
-moC
-moC
-moC
-moC
-moC
-moC
-moC
moC
moC
moC
+<<<<<<< Updated upstream
+dgW
+dgW
moC
moC
+dgW
+dgW
+=======
+rag
+rag
moC
moC
+rag
+rag
+>>>>>>> Stashed changes
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
+<<<<<<< Updated upstream
+bDg
+=======
+ssJ
+>>>>>>> Stashed changes
+uVn
+uVn
+uVn
moC
+<<<<<<< Updated upstream
+fBy
+=======
+uuN
+>>>>>>> Stashed changes
+xcL
+xcL
+ckK
+ckK
+rOi
moC
moC
moC
@@ -98377,21 +121025,6 @@ moC
moC
moC
moC
-moC
-moC
-moC
-moC
-moC
-aDJ
-moC
-dGA
-dGA
-dGA
-dGA
-dGA
-moC
-moC
-moC
uXW
nMj
nMj
@@ -98487,7 +121120,11 @@ smK
smK
smK
pAX
-smK
+<<<<<<< Updated upstream
+kvH
+=======
+jJo
+>>>>>>> Stashed changes
smK
smK
smK
@@ -98653,11 +121290,11 @@ smK
cNV
smK
smK
-smK
-smK
-smK
-smK
-smK
+cNV
+cNV
+cKE
+cKE
+cKE
smK
smK
smK
@@ -98736,9 +121373,9 @@ smK
smK
smK
smK
-xeI
smK
-cNV
+smK
+smK
smK
smK
smK
@@ -98955,10 +121592,10 @@ lxu
cNV
cNV
cNV
-smK
-smK
-smK
-smK
+cNV
+cKE
+cKE
+cKE
cNV
cNV
smK
@@ -99039,8 +121676,8 @@ smK
smK
smK
smK
-lxu
-cNV
+smK
+smK
cNV
smK
smK
@@ -99260,7 +121897,7 @@ smK
cNV
cNV
smK
-smK
+kds
smK
smK
smK
@@ -99337,12 +121974,12 @@ cNV
smK
cNV
cNV
-oAa
-gnk
-gnk
-lXj
-nFK
-obF
+smK
+smK
+smK
+smK
+smK
+smK
smK
smK
smK
@@ -100622,12 +123259,12 @@ urm
urm
urm
urm
+tMH
+eUj
+eUj
urm
-urm
-urm
-urm
-qac
-urm
+eUj
+eUj
jAp
urm
urm
@@ -100918,27 +123555,39 @@ eUj
eUj
ahs
xmb
-rrR
-rrR
-lMg
-lMg
-rCg
+eAw
+eAw
+eAw
+eAw
+<<<<<<< Updated upstream
+lfS
rCg
lMg
-rrR
-rrR
-qyt
-rrR
+nWo
+wKj
qyt
-rrR
-rrR
-lMg
-qEp
-qEp
-qEp
+fVP
+wlq
+lfS
+=======
+rCg
+aXb
lMg
-rrR
-rrR
+bHs
+wKj
+tkT
+hya
+qyt
+rCg
+>>>>>>> Stashed changes
+eAw
+eAw
+eAw
+eAw
+eAw
+eAw
+eAw
+eAw
iQz
eAw
eAw
@@ -101219,29 +123868,39 @@ eUj
eUj
eUj
ahs
-rrR
-tqQ
-mUz
-vrB
-jYg
-xEY
-efV
-hAK
-hAK
-efV
-fDS
-efV
-efV
+azA
+azA
+azA
+azA
+azA
+nQM
+<<<<<<< Updated upstream
+nNx
+bLe
efV
-hAK
efV
-clg
-vrB
+eUj
jJo
efV
-vrB
-rrR
-rrR
+=======
+vMM
+cym
+kIO
+kIO
+eUj
+rSg
+kIO
+>>>>>>> Stashed changes
+nvv
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
azA
myG
nmO
@@ -101521,29 +124180,39 @@ vVz
vVz
qHK
ahs
-rrR
-jvX
-tFr
-efV
-efV
-hAK
-hAK
-hAK
-ihu
-efV
-efV
+azA
+azA
+azA
+azA
+azA
+loW
+<<<<<<< Updated upstream
+dyA
+bLe
+jJo
efV
efV
efV
efV
-clg
-xSF
-bjZ
-fDS
-aPS
-jJo
-vrB
-rrR
+=======
+mTQ
+cym
+rSg
+kIO
+kIO
+kIO
+kIO
+>>>>>>> Stashed changes
+loW
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
+azA
azA
myG
aIi
@@ -101823,29 +124492,54 @@ vVz
vVz
qHK
ahs
-lMg
-vrB
-efV
-efV
-rPS
-fJE
-hAK
-hAK
-hAK
-hAK
-hAK
-hAK
-efV
-efV
-hAK
+<<<<<<< Updated upstream
+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
+=======
+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
skL
@@ -102125,29 +124819,54 @@ eUj
eUj
eUj
ahs
-lMg
-efV
+<<<<<<< Updated upstream
+hGZ
+hNt
+jmU
+wpI
+hmV
+toH
+uVn
+qDT
+eUj
+eUj
+eUj
+oBZ
efV
+evI
+gqX
+bTn
dgF
+hGZ
+bJW
+csd
+bJW
+toH
+=======
+tqe
+iVf
+gYJ
+nAU
hmV
-sSb
-lnd
-hAK
-hAK
-hAK
-hWa
+aSu
+uVn
+lIE
+eUj
+eUj
+eUj
fQd
-hAK
-hAK
-ihu
-hAK
+kIO
+evI
+wtd
+iWX
dgF
-hmV
-sSb
+tqe
+kNu
een
-efV
-vrB
-cJU
+kNu
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
wHL
@@ -102306,7 +125025,7 @@ azA
azA
azA
azA
-dzm
+azA
azA
azA
azA
@@ -102427,29 +125146,54 @@ mZo
eUj
eUj
ahs
-rCg
+<<<<<<< Updated upstream
+hGZ
xEY
-efV
+lUM
+jxe
+exB
+xqi
+gbA
+qDT
+emX
+eUj
+eUj
+eUj
+mIS
+evI
+tba
+jja
+mRm
+hGZ
+mOh
+toH
+roC
+toH
+=======
+tqe
+hNN
+hfR
jxe
exB
xqi
uBI
-hAK
-hAK
-hAK
-tUK
-tqQ
-rrR
+lIE
+tZz
+eUj
+eUj
+eUj
+kKl
evI
-hAK
-hAK
+wlf
+hvT
xYk
-ivH
+tqe
xoR
-rSs
+aSu
hMU
-vrB
-cJU
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
skL
@@ -102729,29 +125473,53 @@ eUj
eUj
eUj
ahs
-rCg
+<<<<<<< Updated upstream
+toH
+jYg
+mmI
+vrB
+nsX
+xqi
+lFV
+qDT
+=======
+aSu
jYg
xEY
-dgF
+ylX
nsX
-nWo
+xqi
klW
-hAK
-hAK
-hAK
-uLE
+lIE
+>>>>>>> Stashed changes
+eUj
+eUj
+eUj
+eUj
+<<<<<<< Updated upstream
jeV
+eJx
+irl
+bJW
+bJW
+toH
+toH
+toH
+bJW
+hGZ
+=======
hWa
-hAK
-hAK
-hAK
-dgF
-nsX
-nWo
-een
-efV
-vrB
-cJU
+btv
+lzH
+kNu
+kNu
+aSu
+aSu
+aSu
+kNu
+tqe
+>>>>>>> Stashed changes
+azA
azA
myG
hhB
@@ -103031,30 +125799,55 @@ eUj
eUj
ybl
ahs
-rCg
-efV
-hAK
-hAK
-hGZ
+<<<<<<< Updated upstream
+toH
+eUm
+rag
+ggY
+kWV
hGZ
-hAK
-hAK
-hAK
-hAK
-hAK
-hAK
-hAK
-hAK
-hAK
-hAK
-hAK
+qFu
+lmd
+qoG
+qUA
+rrE
+eUj
+vTP
+pjC
+xoR
+bJW
+bJW
+bJW
+cXt
+xoR
+bJW
hGZ
+=======
+aSu
+wKv
+bIP
+ehv
hGZ
-hAK
-hAK
-sdX
-lMg
-kcn
+tqe
+aZA
+lmd
+ihu
+qUA
+dhi
+eUj
+pCD
+eJx
+blT
+kNu
+kNu
+kNu
+uEr
+blT
+kNu
+tqe
+>>>>>>> Stashed changes
+azA
+azA
myG
aIi
uhB
@@ -103333,29 +126126,54 @@ eUj
eUj
eUj
ahs
-tqQ
-hAK
-hAK
-fQd
-hAK
-hAK
-hAK
-hAK
-rrE
-qSB
+<<<<<<< Updated upstream
+toH
+toH
+toH
+hGZ
+hGZ
+hGZ
+lFV
+bLe
+eUj
+eUj
rrE
-hAK
+eUj
+ijH
+pjC
+hpV
+xoR
+bJW
+toH
+iWK
+bJW
+bJW
+hGZ
+=======
+aSu
+aSu
+aSu
+tqe
+tqe
+tqe
+klW
+cym
+eUj
+eUj
+dhi
+eUj
ijH
eJx
pHY
-hAK
-hAK
-hAK
-hAK
-fQd
-hAK
-aZv
-tqQ
+blT
+kNu
+aSu
+uNG
+kNu
+kNu
+tqe
+>>>>>>> Stashed changes
+azA
azA
myG
myG
@@ -103509,11 +126327,11 @@ azA
azA
azA
azA
-ndZ
-rDi
-rDi
-rDi
-uhS
+azA
+azA
+azA
+azA
+azA
azA
azA
azA
@@ -103635,29 +126453,54 @@ eUj
eUj
eUj
ahs
-rrR
-rrR
-rrR
-rrR
-rrR
-rrR
-qVq
-qVq
-ifN
+<<<<<<< Updated upstream
+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
+=======
+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
hCF
@@ -103812,7 +126655,7 @@ azA
azA
azA
snR
-hjd
+cBf
cBf
cBf
nrq
@@ -103936,30 +126779,56 @@ lmd
eUj
lxu
eUj
-ahs
-rrR
+<<<<<<< Updated upstream
+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
+toH
+toH
+toH
+hGZ
+hGZ
+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
-wUi
-rrR
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
tGe
@@ -104239,29 +127108,54 @@ eUj
eUj
eUj
ahs
-rrR
+<<<<<<< Updated upstream
+toH
+aGP
+gPd
+gPd
+lsm
+vQc
+cDQ
+lmd
+eUj
+eUj
+ete
+eUj
+qUA
+toH
+fOj
+tjb
+nyg
+toH
+bJW
+xoR
+xoR
+toH
+=======
+aSu
hoq
cSa
cSa
-cSa
+biB
vQc
-qVq
-hAK
-hAK
-rUE
-lSW
-qDT
-woy
+rbl
+lmd
+eUj
+eUj
+rlB
+eUj
+qUA
aSu
-efV
-hAK
-qVq
-oWl
-ohg
-xgP
-rtC
-toH
-eUm
+qCJ
+cZx
+bTU
+aSu
+kNu
+blT
+blT
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
jkq
@@ -104541,29 +127435,53 @@ eUj
eUj
eUj
ahs
-rrR
-jCe
+<<<<<<< Updated upstream
+toH
+frc
+wGk
+cSa
+hoq
+hNV
+lnd
+oje
+omc
+=======
+aSu
+frc
sBd
-jCe
-jCe
+xpW
+xuQ
yhi
pwi
-hAK
-efV
-hEG
-vxu
-iaE
-voC
+qGO
+rfB
+>>>>>>> Stashed changes
+eUj
+eUj
+eUj
+eUj
+<<<<<<< Updated upstream
+xqH
+tjb
+dGQ
+iBz
+toH
+adp
+bJW
+fDM
+toH
+=======
mzq
-efV
-ihu
-qVq
-oWl
+cZx
+hlS
+sOQ
+aSu
ksz
-rGf
-rtC
-rtC
-eUm
+kNu
+wUi
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
aIi
@@ -104764,42 +127682,42 @@ 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
-ftA
+igE
smK
smK
smK
@@ -104843,29 +127761,53 @@ eUj
eUj
eUj
ahs
-rrR
-jCe
+<<<<<<< Updated upstream
+toH
+iVL
+bCu
+gPd
+nqo
+toH
+oeN
+idG
+eJV
+=======
+aSu
+ayt
kLc
+cSa
jCe
-jCe
-xKg
+aSu
qVq
-hAK
+qEv
uvL
-xms
-efV
-sKv
-hAK
-wlf
-efV
-hAK
-qVq
-vDy
-ppH
-rtC
-sRm
+>>>>>>> Stashed changes
+eUj
+eUj
+eUj
+eUj
+<<<<<<< Updated upstream
+tjb
+tjb
+dGQ
+dGQ
toH
-uGd
+xPE
+bJW
+lvw
+toH
+=======
+cZx
+cZx
+hlS
+hlS
+aSu
+wSe
+kNu
+sRm
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
jkq
@@ -104972,7 +127914,7 @@ azA
azA
azA
eTU
-hfm
+tlA
pwX
qVm
tMl
@@ -105066,42 +128008,42 @@ 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
-ftA
+igE
smK
smK
smK
@@ -105145,29 +128087,51 @@ eUj
eUj
eUj
ahs
-rrR
-mvy
-tSO
-wtd
-biB
-xKg
-idG
-hAK
-wED
-nSn
-dvN
-efV
-iYV
+<<<<<<< Updated upstream
+toH
+toH
+toH
+toH
+toH
+toH
+rMR
+=======
+aSu
+aSu
+aSu
+aSu
+aSu
+aSu
+qyx
+>>>>>>> Stashed changes
+lmd
+eUj
+eUj
+eUj
+eUj
+eUj
+<<<<<<< Updated upstream
+rjf
+tjb
+tjb
+dGQ
+fwA
+gUF
+bJW
+xoR
+toH
+=======
uLw
-efV
-hAK
-idG
+cZx
+cZx
+hlS
pXy
fjo
-gEl
-rtC
-lUM
-rrR
+kNu
+blT
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
tGe
@@ -105368,42 +128332,42 @@ 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
-ftA
+igE
smK
smK
smK
@@ -105447,29 +128411,52 @@ eUj
ybl
eUj
ahs
-rrR
-rtC
-rtC
+<<<<<<< Updated upstream
+toH
+vAd
+tIa
dPJ
peC
cgg
-idG
-imq
-pMM
-hKn
-hZw
-hsI
-kIO
-dpm
-uvL
+tKC
+=======
+aSu
+vpN
+ymf
+dPJ
+peC
+cgg
+pRo
+>>>>>>> Stashed changes
+lmd
+eUj
+eUj
+eUj
+eUj
+<<<<<<< Updated upstream
efV
-idG
-gqA
-jDg
-rGf
-rtC
+hGZ
+tjb
+vgW
+upA
+hGZ
+dGQ
+xoR
+xoR
toH
-rrR
+=======
+kIO
+tqe
+cZx
+wGw
+fzy
+tqe
+hlS
+blT
+blT
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
hCF
@@ -105670,42 +128657,42 @@ 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
-ftA
+igE
smK
smK
smK
@@ -105749,29 +128736,53 @@ eUj
eUj
eUj
ahs
-rrR
+<<<<<<< Updated upstream
+toH
kZz
-tjb
+uaM
+dGQ
+mOQ
+toH
+qTP
+=======
+aSu
kZz
-rag
-rrR
-suz
-hAK
-efV
-efV
-hAK
-efV
-efV
-efV
-hAK
+tjb
+hlS
+sFi
+aSu
+okR
+>>>>>>> Stashed changes
+lmd
+eUj
+qUA
+eUj
+<<<<<<< Updated upstream
efV
-idZ
-rrR
-rrR
-rrR
-rrR
-rrR
-rrR
+tVf
+mlF
+mlF
+hGZ
+hGZ
+hGZ
+cQL
+dGQ
+rbn
+toH
+=======
+kIO
+iOp
+vxC
+vxC
+tqe
+tqe
+tqe
+nnl
+hlS
+tUw
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
gGA
@@ -105878,7 +128889,7 @@ azA
azA
azA
lyR
-dUJ
+icG
pwX
fZC
nrD
@@ -105972,42 +128983,42 @@ 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
-ftA
+igE
smK
smK
cNV
@@ -106051,29 +129062,50 @@ eUj
rru
eUj
ahs
-rrR
+<<<<<<< Updated upstream
+toH
iSM
+tjb
+sOQ
+dGQ
+=======
+aSu
+iSM
+cZx
rtC
-rtC
-rtC
+hlS
+>>>>>>> Stashed changes
jUO
-suz
-idG
-hAK
-efV
-efV
-hAK
-hAK
-hAK
-hAK
-efV
-qVq
-rAT
-jiW
-sOQ
-vCA
-sOQ
-rrR
+uVn
+lmd
+eUj
+eUj
+qUA
+eUj
+<<<<<<< Updated upstream
+okR
+dGQ
+lXA
+dGQ
+pRo
+hGZ
+hGZ
+dGQ
+dGQ
+toH
+=======
+qhm
+hlS
+oJi
+hlS
+bck
+tqe
+tqe
+hlS
+hlS
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
uhB
@@ -106274,42 +129306,42 @@ 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
-ftA
+igE
smK
smK
cNV
@@ -106353,29 +129385,52 @@ eUj
eUj
eUj
ahs
-rrR
+<<<<<<< Updated upstream
+hGZ
kZV
-rtC
+tjb
fEe
dGQ
-hqE
+toH
+oJh
+=======
+tqe
+kZV
+cZx
+fEe
+hlS
+aSu
idG
-imq
-lIE
-bTU
-pOj
-ete
-ete
-hAK
-hAK
-hAK
-qVq
-rAT
+>>>>>>> Stashed changes
+lmd
+eUj
+eUj
+eUj
+eUj
+<<<<<<< Updated upstream
+uvL
+dGQ
+dGQ
+pOm
+fDO
+toH
+tjb
+tjb
+dGQ
+toH
+=======
+mcC
+hlS
+hlS
+wob
+qcV
+aSu
+cZx
cZx
-sOQ
hlS
-vgW
-rrR
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
uhB
@@ -106482,7 +129537,7 @@ azA
azA
azA
nnU
-svH
+tlA
pwX
pwX
pRT
@@ -106576,38 +129631,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
@@ -106655,29 +129710,52 @@ eUj
eUj
eUj
ahs
-rrR
-rtC
-lzH
+<<<<<<< Updated upstream
+hGZ
+tjb
+tjb
ldI
hFm
-tGl
-qVq
-imq
-miU
-mQK
-hYY
-hYY
-hYY
-hYY
-pre
-hAK
-qVq
-eQh
-sOQ
-ufX
+toH
+ecK
+=======
+tqe
+cZx
+cZx
+ldI
+hFm
+aSu
+eUM
+>>>>>>> Stashed changes
+lmd
+eUj
+eUj
+qUA
+eUj
+<<<<<<< Updated upstream
+uvL
+dGQ
+tjb
+tjb
+fJj
+toH
+tjb
+nyg
+iBz
+toH
+=======
+mcC
+hlS
+cZx
+cZx
+uWm
+aSu
+cZx
+bTU
sOQ
-fWw
-rrR
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
uhB
@@ -106785,7 +129863,7 @@ azA
azA
rmL
tRA
-fhs
+dcB
vHT
jjj
iQM
@@ -106878,38 +129956,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
@@ -106957,29 +130035,54 @@ eUj
eUj
mZo
ahs
-rrR
-dXR
-hpV
-pCD
-cCJ
-vJN
+<<<<<<< Updated upstream
+hGZ
+hGZ
+hGZ
+hGZ
+toH
+toH
suz
-hAK
+lmd
+ete
+eUj
+qUA
+eUj
+uvL
+gxH
+tjb
+dGQ
+dGQ
+cQL
+ihE
+dGQ
+dGQ
+toH
+=======
+tqe
+tqe
+tqe
+tqe
+aSu
+aSu
+suz
+lmd
rlB
-fOj
-fOj
-mcC
-mcC
+eUj
+qUA
+eUj
mcC
-wxY
-bTU
-qVq
+jZF
+cZx
+hlS
+hlS
nnl
mmI
-dvp
-mmI
-qFu
-rrR
+hlS
+hlS
+aSu
+>>>>>>> Stashed changes
+kcn
azA
myG
uhB
@@ -107180,36 +130283,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
@@ -107259,29 +130362,50 @@ eUj
eUj
eUj
ahs
-rrR
+<<<<<<< Updated upstream
+toH
izB
+hIh
+blT
dXR
+toH
+=======
+aSu
+izB
+dGq
+rri
dXR
-dXR
-btx
-qVq
-hAK
-hAK
-hAK
-hAK
-imq
+aSu
+>>>>>>> Stashed changes
+uVn
+lmd
+eUj
+eUj
+eUj
+eUj
nfN
+<<<<<<< Updated upstream
+mlF
+nBs
+nyg
+dGQ
+hGZ
+dGQ
+wVz
+bJW
+toH
+=======
vxC
ein
bTU
-qVq
-nnl
-gTy
-gTy
+hlS
+tqe
+hlS
gTy
-okR
-rrR
+kNu
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
uhB
@@ -107482,36 +130606,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
@@ -107561,29 +130685,50 @@ eUj
eUj
eUj
ahs
-rrR
-xzj
-hXB
+<<<<<<< Updated upstream
+toH
hIh
-vAd
+hIh
+hIh
+wfR
qaQ
-idG
-hAK
-hAK
-fUa
-efV
-efV
-imq
-hAK
-bTU
-hAK
-qVq
-iKX
-lhV
+=======
+aSu
+dGq
+dGq
+dGq
+vAd
+tVf
+>>>>>>> Stashed changes
+uVn
+lmd
+eUj
+eUj
+eUj
+qUA
+eUj
+<<<<<<< Updated upstream
+dGQ
+dGQ
+mlF
+hGZ
+hGZ
+dGQ
+bJW
+bJW
+toH
+=======
+hlS
+hlS
+vxC
+tqe
+tqe
+hlS
kNu
-lhV
-dyA
-rrR
+kNu
+aSu
+>>>>>>> Stashed changes
+azA
azA
myG
uhB
@@ -107784,36 +130929,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
@@ -107863,29 +131008,54 @@ 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
+<<<<<<< Updated upstream
+toH
+cqy
+psk
+hIh
+hIh
+oNY
+uup
+lmd
+eUj
+tYG
+xms
+qUA
+eUj
+dGQ
+dGQ
+dGQ
+tjb
+hGZ
+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
msj
@@ -108086,36 +131256,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
@@ -108165,30 +131335,51 @@ eUj
eUj
ybl
ahs
-rrR
-uQv
-hAK
+<<<<<<< Updated upstream
+toH
+hIh
+vxC
+hIh
+hIh
+qaQ
+=======
+aSu
+dGq
+pJs
+dGq
dGq
-hAK
tVf
-qVq
-hAK
-efV
-nCx
+>>>>>>> Stashed changes
+uup
+vyg
+eUj
+eUj
tpE
-xtj
-gHE
-wlq
-hAK
-hAK
-qVq
-gxH
-tCj
-fgw
-eIx
-uRd
-rrR
-kcn
+eUj
+eUj
+<<<<<<< Updated upstream
+dGQ
+dGQ
+dGQ
+dGQ
+toH
+adp
+bJW
+bJW
+hGZ
+=======
+hlS
+hlS
+hlS
+hlS
+aSu
+ksz
+kNu
+kNu
+tqe
+>>>>>>> Stashed changes
+azA
+azA
myG
myG
myG
@@ -108388,36 +131579,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
@@ -108467,29 +131658,51 @@ eUj
eUj
eUj
ahs
-rrR
+<<<<<<< Updated upstream
+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
+=======
+tqe
+wAz
+dGq
+ggF
+uTy
+tqe
+obz
+>>>>>>> Stashed changes
+vyg
+eUj
+eUj
+eUj
+eUj
+eUj
+<<<<<<< Updated upstream
+dGQ
+dGQ
+dGQ
+dGQ
+toH
+bJW
+bJW
+bJW
+hGZ
+=======
+hlS
+hlS
+hlS
+hlS
+aSu
+kNu
+kNu
+kNu
+tqe
+>>>>>>> Stashed changes
+azA
azA
snR
cBf
@@ -108690,36 +131903,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
@@ -108769,29 +131982,52 @@ eUj
eUj
eUj
ahs
-rrR
-hAK
-hAK
-hAK
-hAK
-lqJ
-qVq
-efV
-hAK
+<<<<<<< Updated upstream
+hGZ
+toH
+toH
+toH
+hGZ
+toH
+eIx
+nJY
+=======
+tqe
+aSu
+aSu
+aSu
+tqe
+aSu
+jeL
+bwE
+>>>>>>> Stashed changes
+eUj
xms
-hAK
-tqQ
-hAK
-wlf
-efV
-efV
-qVq
+eUj
+eUj
+eUj
+<<<<<<< Updated upstream
+dGQ
+dGQ
+dGQ
+dGQ
fwA
-wpI
-pOa
-rLQ
-uRd
-rrR
+bJW
+bJW
+xPE
+toH
+=======
+hlS
+hlS
+hlS
+hlS
+pXy
+kNu
+kNu
+wSe
+aSu
+>>>>>>> Stashed changes
+azA
azA
gAg
wTQ
@@ -108992,36 +132228,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
@@ -109071,29 +132307,54 @@ vVz
qHK
vVz
ahs
-rrR
-jUe
+<<<<<<< Updated upstream
+hGZ
+fjV
fjV
gzV
-hAK
-lqJ
-qVq
-efV
-hAK
-kfy
-rtC
-rtC
+fDS
+hGZ
+jCl
+vyg
+eUj
+eUj
+omc
+eUj
rtC
-ggY
-hAK
-hMU
-qVq
-fwA
-hAK
-uRd
-uRd
-hAK
-rrR
+hGZ
+dJX
+hBx
+tjb
+toH
+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
azA
@@ -109294,36 +132555,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
@@ -109373,29 +132634,49 @@ vVz
qHK
vVz
ahs
-rrR
-frP
+<<<<<<< Updated upstream
+toH
dGq
-hAK
-hAK
+dGq
+fAD
+cJj
+=======
+aSu
+frP
+frP
+iCd
+pru
+>>>>>>> Stashed changes
gBO
-qVq
-hAK
-efV
-hNt
-pjC
-fTt
+uup
+lmd
+eUj
+eUj
+eUj
+eUj
tlh
+<<<<<<< Updated upstream
+hGZ
+hGZ
+mLQ
+hGZ
+toH
+kNa
+xoR
+dGQ
+imq
+=======
tqe
-hAK
-efV
-qVq
-fwA
+tqe
+bUo
+tqe
+aSu
uRd
blT
-fFk
+hlS
lCJ
-rrR
+>>>>>>> Stashed changes
+azA
azA
azA
ndZ
@@ -109596,36 +132877,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
@@ -109675,29 +132956,52 @@ eUj
eUj
eUj
ahs
-rrR
+<<<<<<< Updated upstream
+toH
xLF
-emi
-gWG
-hAK
-rrR
-vui
-hAK
-hAK
-hAK
-hAK
-hAK
-hAK
+dGq
+=======
+aSu
+xLF
+frP
+>>>>>>> Stashed changes
+gBO
+gBO
+gBO
+uup
+lmd
+<<<<<<< Updated upstream
+njU
+eUj
+eUj
+eUj
+pcb
+hGZ
+ocL
+pbR
+rxq
+toH
+xPE
+doy
+iLG
imq
+=======
+kJc
+eUj
+eUj
+eUj
+xom
+tqe
hAD
-efV
-qVq
-rrR
+ghi
+tOD
+aSu
wSe
-hAK
+uwU
wPM
-uRd
-rrR
+lCJ
+>>>>>>> Stashed changes
+azA
azA
ndZ
dPr
@@ -109898,36 +133202,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
@@ -109976,30 +133280,52 @@ eUj
eUj
eUj
eUj
-ahs
-rrR
-rrR
-rrR
-rrR
-rrR
-rrR
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
+<<<<<<< Updated upstream
+xav
+toH
+gWG
+lbs
+gBO
+dGq
+gWG
+=======
+mER
+aSu
+hDZ
+hzu
+gBO
+frP
+hDZ
+>>>>>>> Stashed changes
+uVn
+lNB
+eUj
+eUj
+qUA
+qUA
+eUj
+<<<<<<< Updated upstream
+aWH
+oPv
+iEK
+jQt
+toH
+dGQ
+tjb
+ikU
+oPv
+=======
+rrE
+tIH
sPF
qmb
-rrR
-rrR
-rrR
-rrR
-rrR
-rrR
+aSu
+hlS
+cZx
+nvF
+tIH
+>>>>>>> Stashed changes
+azA
azA
snR
cBf
@@ -110046,7 +133372,7 @@ cAZ
oUO
vYt
nLx
-psg
+nLx
cAZ
azA
azA
@@ -110157,7 +133483,7 @@ gSF
qxS
dZM
gIe
-xPy
+fiL
uow
voV
aYI
@@ -110200,36 +133526,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
@@ -110279,29 +133605,50 @@ eUj
eUj
eUj
ahs
-rrR
-tIH
-tIH
-rrR
+<<<<<<< Updated upstream
+hGZ
tIH
-rrR
-xyq
+cpn
+ivH
+mUz
+toH
+=======
+tqe
+pXQ
+gdH
+hbo
+nzH
+aSu
+>>>>>>> Stashed changes
xyq
-hAK
-hAK
-hAK
-efV
-efV
-rrE
-rrE
+lmd
+eUj
+eUj
+qUA
+eUj
+eUj
+<<<<<<< Updated upstream
+aWH
+oPv
+pFb
+bzq
+hGZ
+wsu
+dGQ
+tjb
+oPv
+=======
rrE
-efV
-rrR
tIH
+wZv
+sdX
+tqe
+ddn
+hlS
+cZx
tIH
-rrR
-tIH
-rrR
+>>>>>>> Stashed changes
+azA
azA
gAg
rRz
@@ -110502,35 +133849,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
@@ -110579,31 +133926,53 @@ 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
+<<<<<<< Updated upstream
+hGZ
+hGZ
+toH
+toH
+toH
+hGZ
+jMh
+=======
+tqe
+tqe
+aSu
+aSu
+aSu
+tqe
+fnx
+>>>>>>> Stashed changes
+lmd
+eUj
+qUA
+eUj
+eUj
+eUj
+<<<<<<< Updated upstream
+fXu
+iBz
+vAU
+pFb
+gIY
+dGQ
+dGQ
+tjb
+imq
+=======
+cqU
+sOQ
+jVg
+wZv
+xey
+hlS
+hlS
+cZx
+lCJ
+>>>>>>> Stashed changes
+azA
azA
azA
azA
@@ -110804,35 +134173,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
@@ -110881,32 +134250,55 @@ qNZ
eUj
eUj
eUj
-eUj
+uvL
ahs
-rrR
-qVq
-eRc
-qVq
-qVq
+<<<<<<< Updated upstream
+ylX
+uVn
+caq
+tFr
+gNZ
gNZ
uvn
-rrR
-hAK
-hAK
-hAK
-hAK
-hAK
-efV
-hAK
-hAK
-hAK
-rrR
+=======
+iOE
+uVn
+eRc
+trv
+gNZ
+gNZ
+lgJ
+>>>>>>> Stashed changes
+lmd
+eUj
+eUj
+eUj
+eUj
+eUj
+<<<<<<< Updated upstream
+hGZ
+iVJ
+lhX
+lSi
+hGZ
+hCp
+mOQ
+mOQ
+hGZ
+evZ
+=======
+tqe
+bFY
+mTP
+qlb
+tqe
hDe
-tAd
sFi
-eGT
-rrR
-ndZ
+sFi
+tqe
+vvu
+>>>>>>> Stashed changes
+azA
rDi
rDi
rDi
@@ -111106,35 +134498,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
@@ -111185,30 +134577,49 @@ eUj
eUj
eUj
rzw
-rrR
-uvn
-qVq
-qVq
-qVq
-adp
-qVq
-rrR
-hAK
-hAK
+<<<<<<< Updated upstream
+clg
+=======
+rIY
+>>>>>>> Stashed changes
+eAw
+eAw
+eAw
+eAw
+eAw
+eAw
+qwL
+eUj
+eUj
+<<<<<<< Updated upstream
+qoG
+eUj
+eUj
+hGZ
+hGZ
+toH
+toH
+hGZ
+waN
+vXQ
+xSF
+hGZ
+=======
ihu
-hAK
-hAK
-efV
-hAK
-hAK
-hAK
-rrR
-eGT
-eGT
-eGT
+eUj
+eUj
+tqe
+tqe
+aSu
+aSu
+tqe
+sEv
eGT
-rrR
-doc
+mQK
+tqe
+>>>>>>> Stashed changes
+azA
+azA
avm
rRz
cBf
@@ -111408,42 +134819,42 @@ 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
azA
azA
-ftA
+igE
cNV
cNV
smK
@@ -111486,31 +134897,51 @@ eUj
tjL
eUj
eUj
-eUj
+<<<<<<< Updated upstream
+mYq
oBZ
+xYk
+ifN
+eUj
+mYq
+=======
+oPv
+fQd
wzW
-qVq
-psk
+gsK
+eUj
oPv
-nzH
-jCl
-rrR
-pOj
-hAK
-hAK
-hAK
-sIp
+>>>>>>> Stashed changes
+eUj
+eUj
+eUj
+eUj
+eUj
+eUj
+eUj
+eUj
tqQ
+<<<<<<< Updated upstream
hWa
+tUK
+lzH
+toH
+bJW
+bJW
+bJW
+hGZ
+=======
+soJ
hAK
-efV
-amw
-eGT
-eGT
-eGT
-gRu
-rrR
-doc
+bXa
+aSu
+kNu
+kNu
+kNu
+tqe
+>>>>>>> Stashed changes
+azA
+azA
tey
rRz
rRz
@@ -111710,42 +135141,42 @@ 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
azA
azA
-ftA
+igE
smK
smK
smK
@@ -111789,30 +135220,44 @@ eUj
eUj
eUj
eUj
-aZt
+eUj
+<<<<<<< Updated upstream
wzW
-qVq
-let
-jle
-pOi
-qVq
-rrR
-lkc
-hAK
-lZM
-hAK
-hWa
-tqQ
-iFu
-ihu
-efV
-rrR
-rrR
-rrR
-rrR
-rrR
-rrR
-doc
+mYq
+=======
+nzO
+oPv
+>>>>>>> Stashed changes
+eUj
+eUj
+eUj
+eUj
+eUj
+eUj
+eUj
+eUj
+eUj
+eUj
+ahs
+uVn
+uup
+uup
+<<<<<<< Updated upstream
+hGZ
+dHc
+bJW
+kNa
+hGZ
+hGZ
+=======
+tqe
+llj
+kNu
+uRd
+tqe
+tqe
+>>>>>>> Stashed changes
+azA
cBf
rRz
cBf
@@ -112012,42 +135457,42 @@ 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
azA
jXc
-ftA
+igE
smK
smK
smK
@@ -112091,30 +135536,49 @@ eUj
eUj
eUj
eUj
+<<<<<<< Updated upstream
+jqz
+=======
aZt
-wzW
-qVq
-sQJ
-oPv
-let
-qVq
-rrR
+>>>>>>> Stashed changes
+wsd
+wsd
+tMH
+qUA
+qUA
+qUA
+<<<<<<< Updated upstream
+sSb
+=======
+evg
+>>>>>>> Stashed changes
eTF
-eyd
-hBx
-hAK
-hAK
-tqQ
-hAK
-efV
+wsd
+tMH
+eUj
+eUj
+ahs
+uVn
+<<<<<<< Updated upstream
+wAU
+uup
+hGZ
+hGZ
+bJW
+bJW
+adp
+hGZ
+=======
efV
-keO
-cDp
-ecK
-deN
-gCo
-rrR
-gAg
+uup
+tqe
+tqe
+kNu
+kNu
+ksz
+tqe
+>>>>>>> Stashed changes
+azA
wTQ
wTQ
wTQ
@@ -112314,42 +135778,42 @@ 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
azA
azA
azA
-ftA
+igE
cKE
smK
smK
@@ -112393,29 +135857,43 @@ eUj
mjp
eUj
eUj
-rrR
+<<<<<<< Updated upstream
+sPF
+=======
+lmw
+>>>>>>> Stashed changes
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
+<<<<<<< Updated upstream
+wuE
+hGZ
+hGZ
+xoR
+bJW
+bJW
+hGZ
+=======
+jUl
+tqe
+tqe
+blT
+kNu
+kNu
+tqe
+>>>>>>> Stashed changes
azA
azA
azA
@@ -112616,42 +136094,42 @@ 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
azA
azA
azA
-ftA
+igE
cKE
cKE
smK
@@ -112695,29 +136173,44 @@ wKj
smK
eUj
eUj
+<<<<<<< Updated upstream
aZt
-wzW
-qVq
-oPv
-let
-xav
-adp
-rrR
-ncO
-ncO
-ncO
-qCk
-hAK
-hAK
-hAK
-hAK
-hAK
-rrR
-krt
+wlf
+sIp
+=======
+lxW
+kfT
+rLQ
+>>>>>>> Stashed changes
+nAH
+eUj
+eUj
+eUj
+rzw
+eAw
+eAw
+nAH
+eUj
+eUj
+rzw
+eAw
+nEj
+uVn
+<<<<<<< Updated upstream
+hGZ
+hGZ
+pVH
+xoR
+xoR
+toH
+=======
+tqe
+tqe
nNx
-hGq
-sRm
-rrR
+blT
+blT
+aSu
+>>>>>>> Stashed changes
azA
azA
wNx
@@ -112918,42 +136411,42 @@ 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
azA
azA
-ftA
+igE
smK
cKE
cKE
@@ -112996,31 +136489,48 @@ qNZ
eUj
mZo
eUj
+<<<<<<< Updated upstream
+mYq
eUj
-aZt
wzW
-qVq
-nzH
+eUj
+mYq
+=======
oPv
+eUj
+nzO
+eUj
oPv
-jCl
-ptJ
-tqQ
-ylX
-rrR
-tqQ
-tqQ
-fVP
-rrR
-rrR
-rrR
-rrR
-rrR
-rrR
-rrR
-rrR
-rrR
-rrR
+>>>>>>> Stashed changes
+qUA
+qUA
+qUA
+qUA
+qUA
+eUj
+eUj
+qUA
+qUA
+qUA
+eUj
+ahs
+uVn
+<<<<<<< Updated upstream
+eRc
+toH
+xoR
+xoR
+bJW
+toH
+=======
+lAb
+aSu
+blT
+blT
+kNu
+aSu
+>>>>>>> Stashed changes
+azA
azA
ndZ
rRz
@@ -113220,42 +136730,42 @@ 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
azA
-ftA
+igE
smK
smK
smK
@@ -113299,30 +136809,45 @@ eUj
eUj
eUj
eUj
-aZt
-wzW
-qVq
-oPv
+<<<<<<< Updated upstream
+oBZ
+mYq
+miU
+=======
+fQd
oPv
-let
-qVq
-ptJ
-qVq
-qVq
-qVq
-jqz
-xoA
-wAU
-qVq
-qVq
-kuS
-qVq
-qVq
-qVq
-qVq
-ljx
-qVq
-rrR
+bGB
+>>>>>>> Stashed changes
+eUj
+eUj
+eUj
+eUj
+nfN
+eUj
+eUj
+eUj
+eUj
+eUj
+qUA
+eUj
+ahs
+uVn
+<<<<<<< Updated upstream
+uBI
+gAX
+bJW
+bJW
+bJW
+toH
+=======
+tDd
+rCG
+kNu
+kNu
+kNu
+aSu
+>>>>>>> Stashed changes
+azA
azA
snR
cBf
@@ -113522,42 +137047,42 @@ 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
azA
-ftA
+igE
smK
smK
smK
@@ -113601,30 +137126,56 @@ eUj
eUj
eUj
bff
-rrR
-qVq
+<<<<<<< Updated upstream
+amQ
+lIE
+lIE
+cCJ
+cCJ
+nzH
+vDy
+anp
+eyd
+aBg
+tMH
+eUj
+eUj
+prC
+prC
qVq
+lfS
+eGT
+toH
+mNN
+bnW
+mNN
+toH
+=======
+htm
+bhz
+bhz
uvn
-qVq
-qVq
-qVq
+uvn
+cIW
+ycu
cgv
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-qVq
-jMh
+rKh
+qMR
+tMH
+eUj
+eUj
+bpa
+bpa
+nQx
+rCg
+oWh
+aSu
+sNv
+cMj
+sNv
+aSu
+>>>>>>> Stashed changes
+azA
azA
snR
bnn
@@ -113824,42 +137375,42 @@ 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
-ftA
+igE
smK
smK
smK
@@ -113903,30 +137454,55 @@ wKj
eUj
uGQ
ahs
-rrR
-qVq
-adp
-qVq
-qVq
-qVq
-qVq
+<<<<<<< Updated upstream
+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
+=======
+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
jbl
@@ -114126,42 +137702,42 @@ 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
azA
-ftA
+igE
smK
smK
cNV
@@ -114205,30 +137781,50 @@ pKJ
eUj
jfW
ahs
-rrR
-qVq
-pFb
-jGR
-rMR
+<<<<<<< Updated upstream
+gqA
+azA
+azA
+toH
+bJW
+sfz
+bJW
+ptJ
+bJW
+rpw
+toH
+ddY
+gGf
+azA
+tkV
+rvZ
+dmf
+=======
+fUa
+azA
+azA
+aSu
+kNu
qTP
-qVq
+kNu
ptJ
-aUi
+kNu
wAU
-qVq
-ddY
-udB
-xmv
-rrR
+aSu
+vaU
+bJW
+azA
+noR
adz
mfw
-mfw
-bSY
-rrR
-qVq
-qVq
+>>>>>>> Stashed changes
+azA
+azA
+azA
+azA
+lhS
umY
-rrR
+azA
azA
azA
gAg
@@ -114428,30 +138024,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
@@ -114463,7 +138059,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -114507,30 +138103,55 @@ eUj
eUj
uGQ
ahs
-rrR
-qVq
-sjp
-hpR
-lYf
-aPL
-qVq
-rrR
-kGP
-qVq
-uvn
-ddY
+<<<<<<< Updated upstream
+gqA
+azA
+azA
+toH
bJW
-uhh
-rrR
+bJW
+jja
+vPH
+jkI
+ure
+toH
+ddY
+reW
+azA
+pli
+faq
+pka
+azA
+azA
+aUc
+boK
+azA
+=======
+fUa
+azA
+azA
+aSu
+kNu
+kNu
+hvT
+vjl
+kGP
+tbh
+aSu
+vaU
+xnL
+azA
+aWQ
gqh
-amQ
-nbB
-mfw
-rrR
+pka
+azA
+azA
+aUc
reW
-nqo
-nqo
-rrR
+azA
+>>>>>>> Stashed changes
+shl
+azA
azA
vNp
vNp
@@ -114730,30 +138351,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
@@ -114765,7 +138386,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
cKE
smK
@@ -114809,30 +138430,54 @@ eUj
eUj
jfW
ahs
-rrR
-qVq
-tYG
-qVq
-qVq
+<<<<<<< Updated upstream
+gqA
+azA
+azA
+toH
+btY
+gox
+pVA
+jKa
+hZy
+toc
+toH
+ddY
+gGf
+azA
+azA
+pli
+tQf
+azA
+jXc
+azA
+pbH
+=======
+fUa
+azA
+azA
+aSu
+xGZ
tYG
-uvn
+gPd
rrR
nbO
idZ
-qVq
+aSu
vaU
bJW
-qCz
-rrR
+azA
+azA
aWQ
bve
-ltA
-bHs
-rrR
+azA
+jXc
+azA
xlt
-iDS
-qoG
-rrR
+>>>>>>> Stashed changes
+azA
+aVw
+azA
azA
azA
azA
@@ -114914,7 +138559,7 @@ dKv
fRa
ckK
iwB
-doc
+snR
aiJ
cBf
kiP
@@ -115032,17 +138677,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
@@ -115056,6 +138696,11 @@ azA
azA
azA
azA
+igE
+mjH
+hWU
+rqP
+nuY
azA
azA
azA
@@ -115067,7 +138712,7 @@ azA
azA
azA
azA
-ftA
+igE
cNV
eJc
cKE
@@ -115111,30 +138756,56 @@ 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
+<<<<<<< Updated upstream
+ltA
+lNW
+lNW
+toH
+toH
+toH
+toH
+toH
+toH
+toH
+toH
+qCk
+qmb
+lNW
+lNW
+lNW
+lNW
+lNW
+lNW
+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
oND
@@ -115216,7 +138887,7 @@ ssm
hyb
hyb
lmd
-doc
+snR
dOy
okX
cBf
@@ -115334,15 +139005,10 @@ rkv
"}
(120,1,1) = {"
rkv
-yfv
-yfv
-yfv
-yfv
-azA
-azA
-azA
-azA
-azA
+tDJ
+tDJ
+tDJ
+tDJ
azA
azA
azA
@@ -115359,6 +139025,11 @@ azA
azA
azA
azA
+hHA
+mjH
+hWU
+hWU
+yky
azA
azA
azA
@@ -115369,7 +139040,7 @@ azA
azA
azA
azA
-ftA
+igE
eJc
cNV
eJc
@@ -115518,7 +139189,7 @@ cQV
kgs
hyb
lmd
-doc
+snR
uAt
dOy
cBf
@@ -115636,13 +139307,9 @@ rkv
"}
(121,1,1) = {"
rkv
-yfv
-rRz
-rRz
-azA
-azA
-azA
-azA
+tDJ
+tDJ
+tDJ
azA
azA
azA
@@ -115661,6 +139328,10 @@ azA
azA
azA
azA
+waj
+hHA
+hfc
+yky
azA
azA
azA
@@ -115671,7 +139342,7 @@ azA
azA
azA
azA
-ftA
+igE
eJc
cNV
eJc
@@ -115820,7 +139491,7 @@ jjU
ioi
vXl
lmd
-doc
+snR
kwy
orl
dEx
@@ -115938,9 +139609,8 @@ rkv
"}
(122,1,1) = {"
rkv
-rRz
-rRz
-rDi
+tDJ
+tDJ
rDi
rDi
rDi
@@ -115962,6 +139632,7 @@ rDi
rDi
rDi
rDi
+weQ
rDi
rDi
rDi
@@ -116122,7 +139793,7 @@ tlA
tlA
ktw
lmd
-doc
+snR
cBf
asG
cBf
@@ -116240,8 +139911,8 @@ rkv
"}
(123,1,1) = {"
rkv
-rRz
-cBf
+tDJ
+nPH
cBf
cBf
cBf
@@ -116813,7 +140484,7 @@ azA
azA
azA
tEg
-doc
+snR
cBf
hYR
vbX
@@ -117115,7 +140786,7 @@ azA
azA
azA
tEg
-doc
+snR
cBf
hZS
vIW
@@ -117417,7 +141088,7 @@ azA
azA
azA
tEg
-doc
+snR
cBf
cBf
oLu
@@ -119158,7 +142829,7 @@ cKE
sJc
sLI
azA
-doc
+snR
cBf
cBf
kiP
@@ -119417,7 +143088,7 @@ dCa
ori
pzp
gwF
-doc
+snR
cBf
nrq
eNA
@@ -119460,7 +143131,7 @@ smK
sJc
sLI
azA
-doc
+snR
cBf
cBf
cBf
@@ -119762,7 +143433,7 @@ smK
sJc
sLI
azA
-doc
+snR
cBf
cBf
geq
@@ -120073,7 +143744,7 @@ wTQ
ctN
azA
azA
-doc
+snR
cBf
nrq
azA
@@ -120375,7 +144046,7 @@ vFX
mZc
mZc
azA
-doc
+snR
cBf
kiP
uhS
@@ -120625,7 +144296,7 @@ xsl
ixa
pzp
kJn
-doc
+snR
cBf
nrq
eNA
@@ -120677,7 +144348,7 @@ iYG
dcB
mZc
azA
-doc
+snR
cBf
cBf
nrq
@@ -120700,7 +144371,7 @@ azA
azA
azA
azA
-doc
+snR
cBf
rRz
cBf
@@ -120927,7 +144598,7 @@ lpg
ixa
pzp
bGM
-doc
+snR
cBf
nrq
eNA
@@ -120979,7 +144650,7 @@ uyw
iYG
mZc
azA
-doc
+snR
cBf
cBf
kiP
@@ -120994,7 +144665,7 @@ rRq
uOQ
fRo
hAE
-jJH
+oJa
rRq
mvc
azA
@@ -121002,7 +144673,7 @@ azA
azA
azA
azA
-doc
+snR
kFh
rRz
cBf
@@ -121105,7 +144776,7 @@ xXx
xXx
xXx
xXx
-rxs
+hrk
bff
tMH
fLp
@@ -121229,7 +144900,7 @@ xsl
xsl
pzp
kJn
-doc
+snR
cBf
nrq
eNA
@@ -121281,7 +144952,7 @@ azA
uyw
mZc
azA
-doc
+snR
cBf
cBf
cBf
@@ -121291,7 +144962,7 @@ azA
azA
azA
mvc
-nPV
+uOQ
rRq
dYT
rRq
@@ -121304,7 +144975,7 @@ azA
azA
azA
azA
-doc
+snR
rRz
rRz
rRz
@@ -121531,14 +145202,14 @@ gaw
pzp
dTv
xQq
-doc
+snR
cBf
nrq
eNA
msE
amS
vKh
-doc
+snR
kGt
uVn
sqC
@@ -121583,7 +145254,7 @@ afB
azA
tlA
azA
-doc
+snR
cBf
nDt
bfq
@@ -121833,7 +145504,7 @@ tEA
jxw
aHV
lmd
-doc
+snR
cBf
dxL
eNA
@@ -121885,7 +145556,7 @@ pxi
tUU
mZc
azA
-doc
+snR
cBf
nrq
gAg
@@ -121898,7 +145569,7 @@ vBQ
cBf
cBf
nDt
-aFU
+wTQ
wTQ
wTQ
wTQ
@@ -122135,7 +145806,7 @@ jem
aHQ
pzp
hKZ
-doc
+snR
cBf
nrq
eNA
@@ -122177,7 +145848,7 @@ dzm
xOE
sJc
mUx
-wjo
+eIF
pxi
azA
azA
@@ -122187,7 +145858,7 @@ iMH
hBN
mZc
azA
-doc
+snR
cBf
nrq
azA
@@ -122196,7 +145867,7 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
dEl
@@ -122489,7 +146160,7 @@ mZc
fPH
mZc
azA
-doc
+snR
cBf
nXa
ndZ
@@ -122507,7 +146178,7 @@ azA
qhT
xSB
azA
-doc
+snR
cBf
cBf
cBf
@@ -122743,9 +146414,9 @@ mjp
mjp
mjp
mjp
-cYh
+msE
nrq
-doc
+snR
dEx
kiP
nZj
@@ -122791,7 +146462,7 @@ azA
azA
mZc
azA
-doc
+snR
cBf
kiP
hUC
@@ -123093,7 +146764,7 @@ azA
dzm
azA
azA
-doc
+snR
cBf
cBf
avm
@@ -123697,7 +147368,7 @@ azA
azA
mZc
azA
-doc
+snR
cBf
cBf
cBf
@@ -123992,7 +147663,7 @@ jio
nqd
vFX
vFX
-hfm
+tlA
pxi
azA
azA
@@ -124240,7 +147911,7 @@ pLm
cBf
nDt
ctN
-doc
+snR
cBf
cBf
dCa
@@ -124302,7 +147973,7 @@ azA
mZc
azA
azA
-doc
+snR
cBf
dEl
azA
@@ -124542,7 +148213,7 @@ cBf
nDt
ctN
azA
-doc
+snR
cBf
cBf
ori
@@ -124624,7 +148295,7 @@ azA
azA
azA
azA
-doc
+snR
gkD
cBf
nQv
@@ -124686,7 +148357,7 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
nrq
@@ -124844,7 +148515,7 @@ wTQ
ctN
azA
azA
-doc
+snR
cBf
rjn
pzp
@@ -124926,7 +148597,7 @@ azA
azA
azA
azA
-doc
+snR
cBf
rRz
rRz
@@ -124988,7 +148659,7 @@ azA
azA
azA
gDr
-doc
+snR
cBf
cBf
kiP
@@ -125892,7 +149563,7 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
dEx
@@ -126194,7 +149865,7 @@ azA
azA
jWe
azA
-doc
+snR
cBf
cBf
iSY
@@ -126828,7 +150499,7 @@ xXx
yjy
cUl
pgM
-mzb
+nre
wMd
ttG
jDh
@@ -127201,7 +150872,7 @@ xXx
nNW
xXx
xXx
-liJ
+qfV
rlV
wuZ
xXx
@@ -127503,7 +151174,7 @@ xXx
xXx
vLn
xXx
-liJ
+qfV
rlV
wuZ
xXx
@@ -127696,7 +151367,7 @@ cBf
czD
dEl
dzm
-doc
+snR
cBf
cBf
dbJ
@@ -127805,7 +151476,7 @@ xXx
xXx
xXx
vLn
-liJ
+qfV
rlV
wuZ
xXx
@@ -127950,7 +151621,7 @@ azA
azA
azA
azA
-doc
+snR
nrq
azA
gAg
@@ -128107,7 +151778,7 @@ tkN
jxR
xXx
xXx
-liJ
+qfV
rlV
wuZ
xXx
@@ -128374,7 +152045,7 @@ gOy
wwh
cAr
lmd
-yke
+aNG
bPg
nYs
kEf
@@ -128409,7 +152080,7 @@ mPo
tkN
mPo
mPo
-liJ
+qfV
rlV
wuZ
mPo
@@ -128639,13 +152310,13 @@ xXx
xXx
yjy
qFp
-tqs
+dyZ
fyb
haU
haU
nre
nre
-bpA
+jUa
jUa
hcr
yjy
@@ -128711,7 +152382,7 @@ xXx
pfB
xXx
ouW
-liJ
+qfV
rlV
wuZ
xXx
@@ -128753,7 +152424,7 @@ oZJ
mDq
mDq
upl
-doc
+snR
kuV
kOP
axj
@@ -128852,7 +152523,7 @@ azA
azA
azA
azA
-doc
+snR
fpB
nrq
azA
@@ -129013,7 +152684,7 @@ xXx
xXx
xXx
xXx
-liJ
+qfV
rlV
wuZ
xXx
@@ -129055,7 +152726,7 @@ rDi
rDi
uhS
hKk
-doc
+snR
kuV
kuV
eyn
@@ -129251,7 +152922,7 @@ bxj
fyb
hZa
hZa
-bpA
+jUa
nre
uTh
yjy
@@ -129280,7 +152951,7 @@ tkd
dvG
uVn
lcl
-rxs
+hrk
kZg
kPG
kPG
@@ -129301,9 +152972,9 @@ pVX
uta
nzT
qku
-qrd
-qrd
-qrd
+wVL
+wVL
+wVL
gmz
wuZ
xXx
@@ -129315,7 +152986,7 @@ xXx
vLn
xXx
pfB
-liJ
+qfV
rlV
wuZ
xXx
@@ -129394,7 +153065,7 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
cBf
@@ -129559,7 +153230,7 @@ nre
vsz
dyZ
fyb
-dsH
+fyb
dyZ
idX
nNa
@@ -129617,7 +153288,7 @@ bVk
xOt
xOt
gAO
-liJ
+qfV
rlV
ivA
blp
@@ -130159,7 +153830,7 @@ quR
ymg
xMi
mOc
-bpA
+jUa
ekf
lxe
fyb
@@ -130203,9 +153874,9 @@ rlV
dfk
cuo
cuo
-qrd
+wVL
cuo
-qrd
+wVL
cuo
wuZ
xXx
@@ -130499,9 +154170,9 @@ rlV
vIu
cuo
cuo
-qrd
+wVL
qHJ
-qrd
+wVL
vaI
rlV
rlV
@@ -130610,7 +154281,7 @@ azA
azA
eaR
azA
-doc
+snR
dsF
rEX
rEX
@@ -130661,7 +154332,7 @@ gwF
azA
azA
azA
-ftA
+igE
odS
odS
yky
@@ -130758,9 +154429,9 @@ fyb
dyZ
qXD
dcR
-mzb
+nre
+pol
pol
-cKD
pol
pol
nre
@@ -130768,7 +154439,7 @@ ekf
sXf
dyZ
fyb
-dsH
+fyb
cGO
yjy
arq
@@ -130825,7 +154496,7 @@ hde
emD
hci
urq
-liJ
+qfV
rlV
sli
nAl
@@ -130912,7 +154583,7 @@ azA
azA
baQ
azA
-doc
+snR
cBf
cBf
cBf
@@ -130963,7 +154634,7 @@ gwF
azA
azA
azA
-ftA
+igE
odS
odS
yky
@@ -130972,7 +154643,7 @@ azA
azA
fhT
azA
-doc
+snR
cBf
iPw
tkj
@@ -131274,7 +154945,7 @@ fag
fag
rQw
azA
-doc
+snR
cBf
tBE
cBf
@@ -131429,7 +155100,7 @@ xXx
xXx
xXx
xXx
-liJ
+qfV
rlV
wuZ
xXx
@@ -131483,7 +155154,7 @@ azA
azA
azA
azA
-doc
+snR
qRw
rRz
igR
@@ -131731,7 +155402,7 @@ lkq
lkq
lkq
iMf
-liJ
+qfV
rlV
wuZ
xXx
@@ -132385,7 +156056,7 @@ azA
azA
azA
azA
-doc
+snR
rdh
nrq
hKk
@@ -132939,7 +156610,7 @@ pDe
iHf
iHf
aEW
-liJ
+qfV
rlV
wuZ
xXx
@@ -133126,7 +156797,7 @@ rRz
rRz
azA
azA
-doc
+snR
rRz
rRz
rRz
@@ -133428,7 +157099,7 @@ rRz
rRz
azA
azA
-doc
+snR
cBf
cBf
cBf
@@ -133730,7 +157401,7 @@ rRz
azA
azA
azA
-doc
+snR
cBf
cBf
nDt
@@ -134092,7 +157763,7 @@ xCm
xCm
rlV
oeA
-rxs
+hrk
kyc
snK
fPb
@@ -134348,7 +158019,7 @@ azA
azA
azA
azA
-doc
+snR
qQX
dBZ
cUb
@@ -134394,7 +158065,7 @@ udM
xCm
wuZ
xXx
-rxs
+hrk
arq
snK
eJc
@@ -134696,7 +158367,7 @@ tDK
xCm
aDY
xXx
-rxs
+hrk
rhZ
vYk
eJc
@@ -134925,7 +158596,7 @@ azA
azA
azA
azA
-doc
+snR
irs
cBf
rWb
@@ -134998,7 +158669,7 @@ hQv
xCm
ijD
xXx
-rxs
+hrk
rhZ
tfP
eJc
@@ -135227,7 +158898,7 @@ azA
azA
azA
azA
-doc
+snR
wfq
cBf
cBf
@@ -135300,7 +158971,7 @@ pbS
xCm
gKS
xXx
-rxs
+hrk
rhZ
tfP
eJc
@@ -135602,7 +159273,7 @@ ujr
xCm
aDY
sXi
-rxs
+hrk
rhZ
tfP
eJc
@@ -135904,7 +159575,7 @@ xNh
bdw
lgL
sNK
-rxs
+hrk
arq
gaI
smK
@@ -136273,7 +159944,7 @@ hWJ
hWJ
jde
dtR
-fwi
+rlV
svq
aJr
rlV
@@ -137716,7 +161387,7 @@ vlb
gwI
lgL
aDY
-rxs
+hrk
rhZ
snK
eJc
@@ -138018,7 +161689,7 @@ sbw
bof
tCM
ijD
-rxs
+hrk
eeo
gTY
wsh
@@ -138320,7 +161991,7 @@ wVs
aqa
tCM
aDY
-rxs
+hrk
azA
dzm
xOE
@@ -138622,7 +162293,7 @@ lzc
aqa
tCM
gKS
-rxs
+hrk
bbF
hGQ
dVN
@@ -138924,7 +162595,7 @@ bUm
wCn
bdw
wuZ
-rxs
+hrk
arq
gaI
eJc
@@ -139226,7 +162897,7 @@ tCM
bdw
bdw
wuZ
-rxs
+hrk
kyc
snK
cKE
@@ -139528,7 +163199,7 @@ fMD
nAl
nAl
oeA
-rxs
+hrk
kyc
snK
cKE
@@ -139698,7 +163369,7 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
cBf
@@ -139830,7 +163501,7 @@ xXx
xXx
xXx
vLn
-rxs
+hrk
hpH
vYk
eJc
@@ -139861,7 +163532,7 @@ omK
jVM
xXx
hrk
-fwi
+rlV
uVo
ykH
xrw
@@ -140000,7 +163671,7 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
cBf
@@ -140132,7 +163803,7 @@ xXx
xXx
xXx
xXx
-rxs
+hrk
rhZ
tfP
smK
@@ -140163,7 +163834,7 @@ vBZ
jVM
xXx
hrk
-fwi
+rlV
wQf
fYB
flI
@@ -140302,7 +163973,7 @@ azA
azA
azA
azA
-doc
+snR
cBf
cBf
cBf
@@ -140582,9 +164253,9 @@ gHO
slu
dzm
umv
-dDp
-dDp
-dDp
+mDq
+mDq
+mDq
upl
azA
jKr
@@ -141038,7 +164709,7 @@ cvW
jmq
iws
jJf
-dnd
+kRX
gvc
tfP
smK
@@ -141186,9 +164857,9 @@ wli
slu
azA
umv
-dDp
-dDp
-dDp
+mDq
+mDq
+mDq
vgc
xdw
xdw
@@ -141942,7 +165613,7 @@ jJf
cXo
vBY
arn
-cQx
+jmq
jJf
hrk
lmd
@@ -143137,7 +166808,7 @@ xXx
xXx
xXx
feo
-liJ
+qfV
rlV
rlV
rlV
@@ -144134,7 +167805,7 @@ cBf
cBf
nDt
ctN
-xsF
+mIv
iaS
lan
lan
@@ -144279,7 +167950,7 @@ ptU
pIU
nrq
azA
-doc
+snR
cBf
sAl
sAl
@@ -144581,7 +168252,7 @@ mQw
bKe
amS
azA
-doc
+snR
cBf
qkT
wus
@@ -144883,7 +168554,7 @@ ipF
rQF
amS
azA
-doc
+snR
cBf
wus
enf
@@ -145185,7 +168856,7 @@ ipF
bKe
amS
azA
-doc
+snR
cBf
oPV
oPV
@@ -145193,7 +168864,7 @@ cBf
nXa
azA
azA
-doc
+snR
nrq
azA
azA
@@ -145495,7 +169166,7 @@ wTQ
hdp
azA
azA
-doc
+snR
nrq
azA
azA
@@ -146181,7 +169852,7 @@ qrS
smK
eJc
lnD
-baS
+rCK
rlV
rlV
rlV
@@ -146552,7 +170223,7 @@ yfv
lmd
snK
eUj
-jBl
+lwj
eUj
eUj
cKE
@@ -147162,7 +170833,7 @@ nYw
nYw
jGh
jOI
-uAZ
+ihh
cKE
cKE
xnd
@@ -147823,7 +171494,7 @@ iWl
nNb
fKj
qRs
-jMn
+qRs
iWl
nNb
fKj
@@ -147833,7 +171504,7 @@ iWl
nNb
fKj
qRs
-jMn
+qRs
iWl
uVn
uVn
@@ -148176,7 +171847,7 @@ vcB
mKy
dzm
azA
-doc
+snR
tkj
dai
wfq
@@ -148362,7 +172033,7 @@ azA
azA
azA
lmd
-iUj
+wMG
uKr
akf
wfe
@@ -148478,7 +172149,7 @@ bAm
vcB
azA
azA
-doc
+snR
lVe
plm
wTq
@@ -149235,7 +172906,7 @@ cBf
cBf
cBf
cBf
-bGH
+cBf
cBf
nDt
fMj
@@ -149342,7 +173013,7 @@ smK
smK
smK
smK
-dJl
+smK
uVn
aQW
uVn
@@ -149580,7 +173251,7 @@ xdb
xdb
ihh
ahG
-niA
+eUj
eUj
cKE
ahs
@@ -149640,7 +173311,7 @@ eUj
smK
smK
smK
-hfm
+tlA
uVn
uVn
uVn
@@ -149991,7 +173662,7 @@ avG
avG
avG
avG
-hiN
+pYn
dAV
avG
avG
@@ -150144,7 +173815,7 @@ azA
azA
azA
azA
-erZ
+azA
azA
azA
azA
@@ -150478,7 +174149,7 @@ azA
lmd
snK
bNL
-hbn
+jYA
sWz
bEl
ahG
@@ -150546,7 +174217,7 @@ smK
smK
tlA
tlA
-lKJ
+pdJ
qRs
xRN
qRs
@@ -150591,9 +174262,9 @@ rvE
dAV
rvE
rvE
-hiN
+pYn
ppb
-hiN
+pYn
rvE
rvE
dAV
@@ -151154,7 +174825,7 @@ uUG
iWl
iJW
pIe
-jMn
+qRs
qRs
iWl
uVn
@@ -151204,7 +174875,7 @@ qUI
rvE
rvE
rvE
-hiN
+pYn
gsh
uKY
guM
@@ -151982,7 +175653,7 @@ qUU
ckV
ula
rhJ
-iRq
+ojP
gxZ
gxZ
ocH
@@ -152042,7 +175713,7 @@ uUG
iWl
iWl
iWl
-doc
+snR
cBf
gqa
nrq
@@ -152053,7 +175724,7 @@ qRs
qRs
iWl
qRs
-jMn
+qRs
qRs
iWl
tNu
@@ -152284,7 +175955,7 @@ hzY
uSB
dHA
ruG
-iRq
+ojP
gxZ
gxZ
ipX
@@ -152344,7 +176015,7 @@ jjQ
iWl
qWB
azA
-doc
+snR
cBf
twD
nrq
@@ -152356,7 +176027,7 @@ wqz
iWl
qRs
qRs
-jMn
+qRs
iWl
fKO
tNu
@@ -152646,7 +176317,7 @@ uSl
iWl
azA
azA
-doc
+snR
cBf
cBf
ckE
@@ -152703,7 +176374,7 @@ azA
gsh
rvE
rvE
-jLb
+rvE
rvE
xhZ
avG
@@ -152932,7 +176603,7 @@ ahs
qoc
izU
izO
-eqx
+uyr
eCG
koU
foe
@@ -152948,7 +176619,7 @@ vhA
iWl
azA
azA
-doc
+snR
cBf
okX
nrq
@@ -153256,7 +176927,7 @@ wTQ
ctN
azA
iWl
-mcI
+tNu
qlh
uxg
qRs
@@ -153268,7 +176939,7 @@ tNu
uxg
pGz
cnS
-niG
+cnS
kdI
iWl
uVn
@@ -153615,7 +177286,7 @@ gsh
odS
odS
ioj
-doc
+snR
wfq
tkj
nrq
@@ -153917,7 +177588,7 @@ gsh
odS
odS
ioj
-doc
+snR
cBf
mTU
gFm
@@ -154468,7 +178139,7 @@ cnS
cnS
huo
qza
-gHY
+lYp
nnK
cnS
ikv
@@ -154542,10 +178213,10 @@ azA
azA
hAI
odS
-uJV
+qTg
+odS
odS
odS
-sHC
sVG
odS
odS
@@ -155148,7 +178819,7 @@ hAI
odS
odS
ciI
-sHC
+odS
fap
odS
odS
@@ -155837,7 +179508,7 @@ nDt
wTQ
wTQ
ctN
-ftA
+igE
smK
smK
smK
@@ -156139,7 +179810,7 @@ yfv
yfv
azA
azA
-ftA
+igE
smK
smK
smK
@@ -156355,11 +180026,11 @@ rRz
hAI
lNo
odS
-sHC
+odS
pCb
odS
odS
-sHC
+odS
raj
azA
gcH
@@ -156441,7 +180112,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
uFP
@@ -156743,7 +180414,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -156892,7 +180563,7 @@ cnS
cnS
atI
cnS
-niG
+cnS
fYN
iWl
uVn
@@ -156962,7 +180633,7 @@ odS
odS
odS
odS
-sHC
+odS
odS
raj
azA
@@ -157045,7 +180716,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -157347,7 +181018,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -157649,7 +181320,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -157798,7 +181469,7 @@ nNb
hJa
iJb
sFI
-oTk
+ikv
cyj
cei
uVn
@@ -157951,7 +181622,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -158253,7 +181924,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -158555,7 +182226,7 @@ dzm
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -158776,7 +182447,7 @@ azA
azA
azA
azA
-doc
+snR
pIU
pIU
pIU
@@ -158857,7 +182528,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -158997,7 +182668,7 @@ azA
azA
azA
azA
-ftA
+igE
uVn
iWl
nSA
@@ -159078,7 +182749,7 @@ azA
azA
azA
azA
-doc
+snR
pIU
hXl
kIA
@@ -159159,7 +182830,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -159299,7 +182970,7 @@ pwY
xTy
azA
azA
-ftA
+igE
uVn
iWl
iWl
@@ -159380,7 +183051,7 @@ azA
azA
azA
azA
-doc
+snR
pIU
nFF
ipF
@@ -159461,7 +183132,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
lxu
smK
@@ -159601,7 +183272,7 @@ azA
azA
azA
azA
-ftA
+igE
uVn
uVn
uVn
@@ -159682,7 +183353,7 @@ rRz
rRz
azA
azA
-doc
+snR
pIU
xAl
ipF
@@ -159763,7 +183434,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -159963,7 +183634,7 @@ odS
ioj
azA
azA
-doc
+snR
tvG
cBf
cBf
@@ -159984,7 +183655,7 @@ rRz
rRz
azA
azA
-doc
+snR
pIU
hcJ
ipF
@@ -160065,7 +183736,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -160080,7 +183751,7 @@ aOn
jHe
sct
sct
-iRq
+ojP
gxZ
kRA
rOF
@@ -160265,7 +183936,7 @@ odS
ioj
azA
azA
-doc
+snR
cBf
rWb
cBf
@@ -160286,7 +183957,7 @@ rRz
rRz
azA
azA
-doc
+snR
pIU
kpZ
ipF
@@ -160367,7 +184038,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -160567,7 +184238,7 @@ odS
ioj
azA
azA
-doc
+snR
cBf
cxW
cBf
@@ -160588,7 +184259,7 @@ rRz
rRz
azA
azA
-doc
+snR
pIU
cpe
ipF
@@ -160669,7 +184340,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
cNV
@@ -160869,7 +184540,7 @@ odS
ioj
azA
azA
-doc
+snR
cBf
cBf
kFh
@@ -160890,7 +184561,7 @@ rRz
rRz
azA
azA
-doc
+snR
pIU
pIU
xyK
@@ -160971,7 +184642,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
mfA
@@ -161102,10 +184773,10 @@ azA
azA
opY
mSO
-drA
pJS
pJS
-drA
+pJS
+pJS
iPu
opY
azA
@@ -161171,7 +184842,7 @@ odS
ioj
azA
azA
-doc
+snR
cBf
cBf
cBf
@@ -161273,7 +184944,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
cKE
cKE
@@ -161473,7 +185144,7 @@ odS
ioj
azA
azA
-doc
+snR
hYR
tvG
cBf
@@ -161495,7 +185166,7 @@ rRz
rRz
rRz
azA
-doc
+snR
pIU
pIU
pIU
@@ -161575,7 +185246,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
cKE
mJM
@@ -161775,7 +185446,7 @@ odS
ioj
azA
azA
-oxz
+obu
cBf
cBf
cBf
@@ -161797,7 +185468,7 @@ rRz
rRz
rRz
azA
-doc
+snR
cBf
cBf
aiJ
@@ -161877,7 +185548,7 @@ azA
azA
azA
azA
-ftA
+igE
eJc
cKE
vjT
@@ -162011,7 +185682,7 @@ qqW
ski
pJS
jgc
-wIC
+jgc
jgc
opY
fag
@@ -162179,7 +185850,7 @@ azA
azA
azA
azA
-ftA
+igE
eJc
mJM
xys
@@ -162481,7 +186152,7 @@ sfw
azA
azA
azA
-ftA
+igE
eJc
vjT
jKr
@@ -162783,7 +186454,7 @@ sfw
sfw
yfv
azA
-ftA
+igE
eJc
gTs
dcx
@@ -162915,7 +186586,7 @@ azA
opY
jgc
jgc
-wIC
+jgc
jgc
opY
opY
@@ -163006,7 +186677,7 @@ rRz
rRz
azA
azA
-doc
+snR
cBf
gqa
nrq
@@ -163085,7 +186756,7 @@ sSl
sSl
dzm
azA
-ftA
+igE
eJc
mfA
vjT
@@ -163308,7 +186979,7 @@ rRz
rRz
azA
azA
-doc
+snR
cBf
twD
nrq
@@ -163387,7 +187058,7 @@ hDu
hDu
jKr
jKr
-ftA
+igE
eJc
eJc
vjT
@@ -163450,7 +187121,7 @@ sct
sct
sct
sct
-iRq
+ojP
ruG
xqq
avH
@@ -163610,7 +187281,7 @@ rRz
rRz
azA
azA
-doc
+snR
cBf
cBf
ckE
@@ -163689,7 +187360,7 @@ hDu
sSl
yfv
dzm
-ftA
+igE
smK
vgd
gTs
@@ -163752,7 +187423,7 @@ sct
sct
owY
sct
-iRq
+ojP
ruG
klx
aOn
@@ -163912,7 +187583,7 @@ rRz
rRz
rRz
azA
-doc
+snR
cBf
okX
nrq
@@ -163991,7 +187662,7 @@ sfw
sfw
azA
azA
-ftA
+igE
smK
fPb
cKE
@@ -164054,7 +187725,7 @@ mfr
mfr
mfr
mfr
-iRq
+ojP
ruG
avH
vNK
@@ -164293,7 +187964,7 @@ xFH
azA
azA
azA
-ftA
+igE
smK
smK
cKE
@@ -164356,7 +188027,7 @@ aOn
rcP
cCM
mfr
-iRq
+ojP
ruG
xqq
lJC
@@ -164595,7 +188266,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
eJc
@@ -164658,7 +188329,7 @@ aOn
rcP
rcP
mfr
-iRq
+ojP
ruG
xqq
sHF
@@ -164725,7 +188396,7 @@ azA
azA
xTy
azA
-doc
+snR
cBf
dEx
cBf
@@ -164897,7 +188568,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
eJc
@@ -164960,7 +188631,7 @@ pfI
aOn
jQU
mfr
-iRq
+ojP
ruG
xqq
coa
@@ -165199,7 +188870,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -165262,7 +188933,7 @@ kkK
aOn
uel
mfr
-iRq
+ojP
ruG
avH
rSi
@@ -165501,7 +189172,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -165564,7 +189235,7 @@ kkK
trd
qpN
mfr
-iRq
+ojP
ruG
avH
ecq
@@ -165803,7 +189474,7 @@ azA
azA
azA
ida
-ftA
+igE
smK
smK
smK
@@ -165866,7 +189537,7 @@ kkK
trd
alc
mfr
-iRq
+ojP
ruG
xqq
avH
@@ -166168,7 +189839,7 @@ kkK
trd
qpN
mfr
-iRq
+ojP
eLC
vsE
vsE
@@ -166470,7 +190141,7 @@ kkK
trd
vTo
mfr
-iRq
+ojP
gxZ
gxZ
gxZ
@@ -166772,7 +190443,7 @@ vkz
aOn
fNz
mfr
-iRq
+ojP
mqq
mqq
mqq
@@ -167011,7 +190682,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -167074,7 +190745,7 @@ aOn
aOn
aOn
mfr
-iRq
+ojP
gxZ
gxZ
gxZ
@@ -167313,7 +190984,7 @@ azA
azA
azA
azA
-ftA
+igE
smK
smK
smK
@@ -167376,7 +191047,7 @@ aOn
aOn
qpN
mfr
-iRq
+ojP
gxZ
gxZ
gxZ
@@ -167615,7 +191286,7 @@ yfv
azA
azA
azA
-ftA
+igE
fnE
smK
smK
@@ -167678,7 +191349,7 @@ mfr
mfr
mfr
mfr
-iRq
+ojP
gxZ
gxZ
gxZ
@@ -167917,7 +191588,7 @@ yfv
azA
azA
jWe
-ftA
+igE
smK
smK
smK
@@ -167980,7 +191651,7 @@ sct
sct
jcP
hVV
-iRq
+ojP
gxZ
gxZ
gxZ
@@ -168219,7 +191890,7 @@ yfv
azA
azA
azA
-ftA
+igE
smK
smK
smK