diff --git a/_maps/map_files/Pahrump/Pahrump-Above-3.dmm b/_maps/map_files/Pahrump/Pahrump-Above-3.dmm
index fa40ef4b2d..a00c917a55 100644
--- a/_maps/map_files/Pahrump/Pahrump-Above-3.dmm
+++ b/_maps/map_files/Pahrump/Pahrump-Above-3.dmm
@@ -16,6 +16,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/f13/vault_floor/dark,
/area/f13/brotherhood/surface)
+"ao" = (
+/obj/structure/chair/wood/worn,
+/turf/open/floor/wood/f13/stage_t,
+/area/f13/wasteland)
+"ap" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"ar" = (
/obj/structure/railing{
color = "#A47449";
@@ -60,6 +71,13 @@
},
/turf/closed/wall/f13/store,
/area/f13/building)
+"aD" = (
+/obj/structure/chair/wood/worn{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/wasteland)
"aI" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/kirbyplants{
@@ -110,6 +128,9 @@
},
/turf/open/floor/carpet/red,
/area/f13/building)
+"bj" = (
+/turf/open/floor/wood/f13/stage_t,
+/area/f13/wasteland)
"bo" = (
/obj/effect/decal/fakelattice{
density = 1;
@@ -163,6 +184,11 @@
},
/turf/open/floor/plasteel/grimy,
/area/f13/brotherhood/surface)
+"bM" = (
+/obj/structure/chair/wood/worn,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/stage_r,
+/area/f13/wasteland)
"bQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/reinforced,
@@ -187,6 +213,11 @@
},
/turf/open/floor/plasteel/f13/vault_floor/red,
/area/f13/brotherhood/surface)
+"ch" = (
+/obj/structure/table/wood/poker,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"cl" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13/wood{
@@ -200,6 +231,13 @@
/obj/structure/decoration/rag,
/turf/closed/wall/f13/wood/house,
/area/f13/raiders)
+"cs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/wood/worn{
+ dir = 4
+ },
+/turf/open/floor/wood/f13/stage_b/outdoors,
+/area/f13/wasteland)
"ct" = (
/obj/machinery/vending/coffee,
/turf/open/floor/f13{
@@ -308,6 +346,13 @@
},
/turf/open/floor/f13,
/area/f13/brotherhood/surface)
+"dA" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/f13/erpdress,
+/obj/item/melee/unarmed/brass,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"dB" = (
/obj/structure/chair{
dir = 4
@@ -330,6 +375,13 @@
icon_state = "floorrusty"
},
/area/f13/building)
+"dR" = (
+/obj/structure/mopbucket,
+/obj/item/reagent_containers/glass/bucket/plastic,
+/obj/item/mop,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"dS" = (
/obj/effect/decal/remains/human,
/turf/open/floor/f13{
@@ -394,6 +446,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/f13/vault_floor/neutral,
/area/f13/brotherhood/surface)
+"eC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/glass{
+ pixel_x = 12
+ },
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"eE" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -413,6 +472,19 @@
/obj/structure/sign/poster/contraband/revolver,
/turf/closed/wall/mineral/wood,
/area/f13/ncr)
+"eP" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
+"eR" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/transparent/openspace{
+ name = "air";
+ sunlight_state = 1
+ },
+/area/f13/wasteland)
"eS" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
@@ -424,6 +496,14 @@
"eU" = (
/turf/closed/mineral/random/low_chance,
/area/f13/wasteland)
+"eX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+ dir = 1;
+ pixel_x = -10
+ },
+/turf/open/floor/wood/f13/oak,
+/area/f13/wasteland)
"fg" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/fo13colored/Red{
@@ -434,6 +514,11 @@
dir = 4
},
/area/f13/brotherhood/surface)
+"fl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"fo" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
@@ -454,6 +539,13 @@
icon_state = "neutralrustyfull"
},
/area/f13/building)
+"fC" = (
+/obj/structure/table/snooker{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"fE" = (
/obj/structure/table,
/obj/item/newspaper{
@@ -519,6 +611,13 @@
},
/turf/open/floor/carpet/royalblack,
/area/f13/ncr)
+"gO" = (
+/obj/structure/chair/wood/worn{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"gT" = (
/obj/structure/campfire/barrel,
/turf/open/indestructible/ground/inside/mountain,
@@ -593,6 +692,14 @@
icon_state = "neutralrustyfull"
},
/area/f13/building)
+"hK" = (
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_y = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/wasteland)
"hM" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -605,6 +712,11 @@
},
/turf/closed/wall/rust,
/area/f13/building)
+"hW" = (
+/obj/structure/chair/wood/worn,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/stage_t,
+/area/f13/wasteland)
"hZ" = (
/obj/structure/railing{
color = "#A47449";
@@ -738,6 +850,10 @@
/obj/structure/destructible/tribal_torch/lit,
/turf/open/floor/f13/wood,
/area/f13/wasteland)
+"jg" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"jj" = (
/obj/structure/table/wood/fancy/black,
/obj/structure/displaycase/trophy{
@@ -780,6 +896,28 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/f13/vault_floor/neutral,
/area/f13/brotherhood/surface)
+"jy" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/computer/arcade/orion_trail,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/arcade,
+/area/f13/bar)
+"jG" = (
+/obj/structure/table/wood/settler,
+/obj/item/soap/deluxe,
+/obj/item/toy/plush/mr_buckety,
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = -8;
+ pixel_y = 11
+ },
+/obj/machinery/light/small{
+ pixel_x = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"jI" = (
/obj/structure/chair/wood,
/obj/effect/decal/cleanable/dirt,
@@ -863,10 +1001,44 @@
"kC" = (
/turf/closed/mineral/random/low_chance,
/area/f13/caves)
+"kF" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/wood/worn{
+ dir = 1
+ },
+/turf/open/floor/wood/f13/oak,
+/area/f13/wasteland)
+"kI" = (
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_y = 9
+ },
+/turf/open/transparent/openspace{
+ name = "air";
+ sunlight_state = 1
+ },
+/area/f13/bar)
"kO" = (
/obj/structure/sign/poster/prewar/poster72,
/turf/closed/wall/f13/store,
/area/f13/building)
+"kV" = (
+/obj/structure/railing{
+ dir = 10;
+ layer = 4.1
+ },
+/obj/item/key,
+/obj/item/key,
+/obj/structure/table/wood/fancy,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
+"la" = (
+/obj/structure/safe,
+/obj/item/locked_box/misc/money/ncr/low,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"lc" = (
/obj/structure/window/fulltile/house{
dir = 2;
@@ -876,6 +1048,20 @@
icon_state = "floorrusty"
},
/area/f13/building)
+"ll" = (
+/obj/structure/table/wood/settler,
+/obj/item/candle{
+ pixel_x = 7;
+ pixel_y = 13
+ },
+/obj/item/candle{
+ pixel_x = -6;
+ pixel_y = 13
+ },
+/obj/item/trash/plate,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"lr" = (
/obj/structure/sign/poster/prewar/poster60,
/turf/closed/wall/f13/store,
@@ -892,6 +1078,25 @@
name = "grimy tile"
},
/area/f13/brotherhood/surface)
+"lw" = (
+/obj/structure/table/wood/poker,
+/obj/item/toy/cards/deck/unum{
+ pixel_y = 11
+ },
+/obj/item/toy/cards/deck/cas/black{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/item/toy/cards/deck/cas{
+ pixel_x = -9;
+ pixel_y = 3
+ },
+/obj/item/toy/cards/deck{
+ pixel_y = -4;
+ pixel_x = 5
+ },
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"ly" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -949,6 +1154,14 @@
"mu" = (
/turf/closed/wall/f13/wood,
/area/f13/ncr)
+"mC" = (
+/obj/machinery/light/small{
+ dir = 1;
+ pixel_x = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"mE" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/office{
@@ -974,9 +1187,22 @@
icon_state = "neutralrustyfull"
},
/area/f13/building)
+"mW" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/wasteland)
"nb" = (
/turf/open/floor/wood/f13/oak,
/area/f13/building)
+"nd" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/transparent/openspace{
+ name = "air";
+ sunlight_state = 1
+ },
+/area/f13/wasteland)
"no" = (
/obj/structure/destructible/tribal_torch/wall/lit,
/obj/effect/decal/cleanable/dirt,
@@ -987,6 +1213,10 @@
/obj/item/mop,
/turf/open/floor/wood/f13/oak,
/area/f13/building)
+"nw" = (
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"nE" = (
/obj/structure/railing{
color = "#A47449";
@@ -997,6 +1227,14 @@
sunlight_state = 1
},
/area/f13/wasteland)
+"nH" = (
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_x = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"nL" = (
/obj/structure/fireplace,
/obj/effect/decal/cleanable/dirt,
@@ -1030,6 +1268,15 @@
icon_state = "floorrusty"
},
/area/f13/building)
+"nZ" = (
+/obj/structure/railing{
+ layer = 4.1
+ },
+/turf/open/transparent/openspace{
+ name = "air";
+ sunlight_state = 1
+ },
+/area/f13/wasteland)
"oc" = (
/obj/structure/chair/sofa/right{
dir = 4
@@ -1089,6 +1336,9 @@
sunlight_state = 1
},
/area/f13/wasteland)
+"om" = (
+/turf/closed/wall/f13/wood,
+/area/f13/bar)
"or" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/remains/human,
@@ -1107,10 +1357,23 @@
/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2,
/turf/open/indestructible/ground/outside/woodalt,
/area/f13/legion)
+"ow" = (
+/obj/structure/table/wood/settler,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/stage_r,
+/area/f13/wasteland)
"oE" = (
/obj/structure/sign/poster/contraband/scum,
/turf/closed/wall/f13/store,
/area/f13/building)
+"oI" = (
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_y = -7
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"oJ" = (
/turf/open/floor/carpet,
/area/f13/building)
@@ -1135,6 +1398,15 @@
icon_state = "floorrusty"
},
/area/f13/building)
+"pf" = (
+/obj/structure/junk/arcade,
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_y = -7
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/arcade,
+/area/f13/bar)
"pi" = (
/obj/structure/sign/plaques/golden/captain{
desc = "To be Efficient is not an action or a way of life, but a mental state. Only those with the force of Will strong enough to act during a crisis, are truly Efficient. Stay Efficient, Robert.";
@@ -1156,6 +1428,11 @@
},
/turf/open/floor/carpet/royalblack,
/area/f13/ncr)
+"pt" = (
+/obj/structure/chair/wood/worn,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/wasteland)
"pu" = (
/obj/structure/chair/wood{
dir = 4
@@ -1257,6 +1534,13 @@
/obj/structure/barricade/wooden/planks/pregame,
/turf/open/indestructible/ground/outside/woodalt,
/area/f13/raiders)
+"qO" = (
+/obj/structure/table/snooker{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"qW" = (
/obj/structure/sign/poster/prewar/poster63,
/turf/closed/wall/f13/store,
@@ -1300,6 +1584,11 @@
icon_state = "neutralrustyfull"
},
/area/f13/building)
+"rF" = (
+/obj/structure/dresser,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"rG" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/remains/human,
@@ -1319,6 +1608,9 @@
},
/turf/open/floor/wood/f13/oak,
/area/f13/building)
+"sd" = (
+/turf/open/floor/wood/f13/oak,
+/area/f13/wasteland)
"sg" = (
/obj/structure/easel,
/obj/item/canvas/nineteenXnineteen,
@@ -1334,6 +1626,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible/ground/outside/woodalt,
/area/f13/wasteland)
+"sx" = (
+/obj/structure/table/wood/fancy/orange,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"sz" = (
/obj/structure/table,
/obj/machinery/computer/terminal{
@@ -1345,6 +1642,12 @@
icon_state = "neutralrustyfull"
},
/area/f13/building)
+"sB" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"sD" = (
/turf/closed/wall/f13/wood,
/area/f13/building)
@@ -1382,6 +1685,13 @@
/obj/structure/bed/old,
/turf/open/floor/f13/wood,
/area/f13/legion)
+"sQ" = (
+/obj/structure/chair/wood/worn{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"sR" = (
/obj/structure/chair/sofa,
/obj/effect/decal/cleanable/dirt,
@@ -1441,6 +1751,13 @@
icon_state = "neutralrustyfull"
},
/area/f13/building)
+"tD" = (
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_y = -7
+ },
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"tE" = (
/obj/structure/table,
/obj/item/paper/crumpled/muddy/fluff/elephant_graveyard/rnd_notes{
@@ -1466,6 +1783,9 @@
sunlight_state = 1
},
/area/f13/building)
+"tR" = (
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"tT" = (
/obj/structure/chair{
dir = 8
@@ -1493,6 +1813,16 @@
icon_state = "housewood3-broken"
},
/area/f13/wasteland)
+"up" = (
+/obj/structure/safe,
+/obj/item/stack/arcadeticket/thirty,
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_y = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"us" = (
/obj/structure/chair,
/obj/effect/decal/cleanable/dirt,
@@ -1500,12 +1830,32 @@
icon_state = "neutralrustyfull"
},
/area/f13/building)
+"uB" = (
+/obj/structure/rack,
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_x = 6
+ },
+/obj/item/circuitboard/computer/arcade/battle,
+/obj/item/circuitboard/computer/arcade/orion_trail,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"uF" = (
/turf/open/transparent/openspace,
/area/f13/legion)
"uI" = (
/turf/open/floor/carpet/black,
/area/f13/building)
+"uK" = (
+/obj/structure/rack/shelf_metal,
+/obj/structure/railing{
+ dir = 9;
+ layer = 4.1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"uU" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -1529,10 +1879,30 @@
dir = 4
},
/area/f13/brotherhood/surface)
+"vq" = (
+/obj/structure/barricade/bars,
+/obj/structure/table/wood/poker,
+/obj/item/stack/f13Cash/ncr,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
+"vs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/wood/worn{
+ dir = 8
+ },
+/turf/open/floor/wood/f13/stage_b/outdoors,
+/area/f13/wasteland)
"vB" = (
/obj/structure/barricade/sandbags,
/turf/open/indestructible/ground/outside/roof,
/area/f13/wasteland)
+"vF" = (
+/obj/structure/simple_door/room,
+/obj/structure/barricade/wooden/planks/pregame,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/old,
+/area/f13/bar)
"vJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/fluff/paper/stack{
@@ -1607,6 +1977,12 @@
},
/turf/open/floor/f13,
/area/f13/brotherhood/surface)
+"ws" = (
+/obj/machinery/light/small{
+ pixel_x = 10
+ },
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"ww" = (
/obj/structure/dresser,
/turf/open/floor/f13/wood,
@@ -1640,6 +2016,12 @@
name = "grimy tile"
},
/area/f13/brotherhood/surface)
+"wG" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"wH" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
@@ -1734,6 +2116,13 @@
},
/turf/open/floor/plasteel/f13/vault_floor/dark,
/area/f13/brotherhood/surface)
+"xA" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"xN" = (
/obj/structure/chair/right{
dir = 1
@@ -1743,6 +2132,12 @@
},
/turf/open/floor/carpet/red,
/area/f13/building)
+"xO" = (
+/obj/structure/rack,
+/obj/item/vending_refill/cola,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"xP" = (
/turf/open/floor/f13{
icon_state = "darkrusty"
@@ -1763,6 +2158,13 @@
/obj/structure/closet/crate/bin/trashbin,
/turf/open/floor/wood/wood_large,
/area/f13/ncr)
+"xX" = (
+/obj/structure/chair/sofa/right{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"yd" = (
/turf/open/transparent/openspace,
/area/f13/building)
@@ -1859,6 +2261,13 @@
},
/turf/open/indestructible/ground/outside/woodalt,
/area/f13/legion)
+"zt" = (
+/obj/structure/sign/poster/contraband/smoke{
+ pixel_y = -32
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"zx" = (
/obj/structure/table/wood,
/obj/item/paper/crumpled/ruins,
@@ -1874,6 +2283,13 @@
"zN" = (
/turf/open/floor/wood/wood_large,
/area/f13/ncr)
+"zW" = (
+/obj/structure/railing{
+ layer = 4.1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"zY" = (
/obj/effect/overlay/junk/curtain{
layer = 4
@@ -1883,6 +2299,12 @@
},
/turf/open/indestructible/ground/outside/woodalt,
/area/f13/building)
+"zZ" = (
+/turf/open/transparent/openspace{
+ name = "air";
+ sunlight_state = 1
+ },
+/area/f13/bar)
"Ab" = (
/obj/effect/spawner/lootdrop/trash,
/turf/open/indestructible/ground/outside/woodalt,
@@ -1893,6 +2315,12 @@
icon_state = "neutralrustyfull"
},
/area/f13/building)
+"Ak" = (
+/obj/structure/chair/wood/worn{
+ dir = 4
+ },
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"Al" = (
/turf/closed/indestructible/rock,
/area/f13/caves)
@@ -1921,10 +2349,23 @@
icon_state = "darkrusty"
},
/area/f13/building)
+"Ax" = (
+/obj/structure/chair/wood/fancy{
+ dir = 4
+ },
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"AD" = (
/obj/structure/sign/poster/prewar/poster81,
/turf/closed/wall/f13/store,
/area/f13/brotherhood/surface)
+"AF" = (
+/obj/structure/chair/wood/worn{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"AH" = (
/obj/structure/chair/sofa/left,
/obj/effect/decal/cleanable/dirt,
@@ -1965,6 +2406,15 @@
icon_state = "housewood2-broken"
},
/area/f13/building)
+"AW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/light/small/broken{
+ dir = 4;
+ icon_state = "bulb-broken"
+ },
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"Bj" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/black,
@@ -2072,6 +2522,13 @@
"BY" = (
/turf/closed/wall/f13/tentwall,
/area/f13/building)
+"Ca" = (
+/obj/structure/barricade/bars,
+/obj/structure/table/wood/poker,
+/obj/item/stack/f13Cash/caps,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"Cc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light{
@@ -2085,6 +2542,14 @@
"Cj" = (
/turf/open/indestructible/ground/outside/roof,
/area/f13/caves)
+"Cl" = (
+/obj/machinery/light/small{
+ brightness = 3;
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"Cn" = (
/obj/effect/turf_decal/trimline/yellow/line{
dir = 4;
@@ -2098,6 +2563,11 @@
},
/turf/open/floor/carpet/royalblack,
/area/f13/ncr)
+"Co" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/wood/worn,
+/turf/open/floor/wood/f13/oak,
+/area/f13/wasteland)
"Cp" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood/settler,
@@ -2116,6 +2586,13 @@
"CC" = (
/turf/open/indestructible/ground/outside/roof,
/area/f13/wasteland)
+"CD" = (
+/obj/structure/table/snooker{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"CG" = (
/turf/open/floor/f13/wood{
icon_state = "housewood4-broken"
@@ -2145,6 +2622,11 @@
icon_state = "housewood3-broken"
},
/area/f13/raiders)
+"CO" = (
+/obj/item/chair/stool,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"CQ" = (
/obj/structure/window/fulltile/house{
dir = 2;
@@ -2174,6 +2656,15 @@
},
/turf/open/floor/f13,
/area/f13/brotherhood/surface)
+"Df" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/transparent/openspace{
+ name = "air";
+ sunlight_state = 1
+ },
+/area/f13/wasteland)
"Dk" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/fo13colored/Red{
@@ -2208,6 +2699,21 @@
icon_state = "floorrusty"
},
/area/f13/building)
+"DJ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
+"DQ" = (
+/obj/structure/rack,
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_x = 6
+ },
+/obj/item/vending_refill/coffee,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"DS" = (
/obj/structure/table,
/obj/item/paper_bin,
@@ -2236,6 +2742,21 @@
icon_state = "neutralrustyfull"
},
/area/f13/building)
+"Ec" = (
+/obj/structure/table/snooker{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
+"Eh" = (
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_y = -7
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"Ei" = (
/obj/structure/closet/crate/footlocker{
anchored = 1;
@@ -2273,6 +2794,18 @@
"EK" = (
/turf/open/floor/carpet/royalblack,
/area/f13/building)
+"ES" = (
+/turf/closed/wall/f13/wood/house,
+/area/f13/bar)
+"EV" = (
+/obj/machinery/light/small{
+ dir = 1;
+ pixel_x = 8
+ },
+/obj/structure/dresser,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"EX" = (
/turf/open/indestructible/ground/outside/woodalt,
/area/f13/building)
@@ -2296,6 +2829,23 @@
},
/turf/open/floor/f13,
/area/f13/brotherhood/surface)
+"Fm" = (
+/obj/structure/barricade/bars,
+/obj/structure/table/wood/poker,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
+"Fx" = (
+/obj/structure/janitorialcart,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
+"Fz" = (
+/obj/structure/safe,
+/obj/item/stack/arcadeticket/thirty,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"FK" = (
/obj/structure/simple_door/wood,
/turf/open/floor/wood/f13/oak,
@@ -2471,6 +3021,13 @@
icon_state = "hydrofloor"
},
/area/f13/building)
+"Hl" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/f13/housewifedress50s,
+/obj/item/melee/onehanded/club/fryingpan,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"Hm" = (
/obj/structure/noticeboard/captain{
desc = "The final Evidence Board shows a location of the Yuma Sewers circled many times in red, looks like the police found something there..";
@@ -2480,6 +3037,13 @@
},
/turf/closed/wall/f13/store,
/area/f13/building)
+"Ho" = (
+/obj/structure/chair/sofa/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"Hp" = (
/obj/structure/window/fulltile/house{
icon_state = "storewindowhorizontal"
@@ -2588,6 +3152,10 @@
},
/turf/open/floor/f13,
/area/f13/brotherhood/surface)
+"IS" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/closed/wall/f13/tentwall,
+/area/f13/building)
"IT" = (
/obj/structure/simple_door/wood,
/obj/effect/decal/cleanable/dirt,
@@ -2620,6 +3188,12 @@
/obj/structure/barricade/wooden,
/turf/open/indestructible/ground/outside/woodalt,
/area/f13/legion)
+"Jk" = (
+/obj/structure/bed,
+/obj/effect/spawner/lootdrop/bedsheet,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"Jl" = (
/obj/structure/chair/office/dark,
/turf/open/floor/f13/wood{
@@ -2755,6 +3329,13 @@
/obj/machinery/light,
/turf/open/floor/wood/wood_large,
/area/f13/ncr)
+"KH" = (
+/obj/machinery/light/small{
+ pixel_x = -10
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"KI" = (
/obj/effect/decal/cleanable/cobweb,
/turf/open/transparent/openspace{
@@ -2762,6 +3343,20 @@
sunlight_state = 1
},
/area/f13/raiders)
+"KK" = (
+/obj/structure/table/wood/settler,
+/obj/item/candle{
+ pixel_x = -6;
+ pixel_y = 13
+ },
+/obj/item/candle{
+ pixel_x = 7;
+ pixel_y = 13
+ },
+/obj/item/trash/plate,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"KQ" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
@@ -2784,6 +3379,13 @@
},
/turf/open/indestructible/ground/outside/woodalt,
/area/f13/wasteland)
+"Lg" = (
+/obj/machinery/light/small{
+ dir = 1;
+ pixel_x = -10
+ },
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"Li" = (
/obj/structure/barricade/wooden,
/turf/closed/wall/rust,
@@ -2878,6 +3480,18 @@
icon_state = "neutralrustyfull"
},
/area/f13/building)
+"LY" = (
+/mob/living/simple_animal/hostile/raider,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
+"Ma" = (
+/obj/structure/rack,
+/obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
+/obj/item/circuitboard/machine/chem_dispenser/drinks,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"Mc" = (
/obj/structure/noticeboard{
desc = "A board for pinning important items upon.";
@@ -2911,6 +3525,11 @@
/obj/item/binoculars,
/turf/open/floor/wood/wood_large,
/area/f13/ncr)
+"Mz" = (
+/obj/structure/railing/corner,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"MC" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/reinforced,
@@ -2936,6 +3555,11 @@
sunlight_state = 1
},
/area/f13/wasteland)
+"MK" = (
+/obj/structure/table/snooker,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"MS" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/dogbed,
@@ -2950,6 +3574,11 @@
},
/turf/open/floor/f13/wood,
/area/f13/raiders)
+"MW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/wood/settler,
+/turf/open/floor/wood/f13/stage_b/outdoors,
+/area/f13/wasteland)
"Na" = (
/obj/structure/simple_door/metal/store{
name = "Chief's Office"
@@ -2958,6 +3587,10 @@
icon_state = "darkrusty"
},
/area/f13/building)
+"Nc" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/stage_b/outdoors,
+/area/f13/wasteland)
"Nd" = (
/obj/structure/table/booth,
/turf/open/floor/carpet/red,
@@ -2967,6 +3600,11 @@
/obj/item/binoculars,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
+"Nf" = (
+/obj/structure/table/wood/fancy,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"Nj" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
@@ -2980,6 +3618,17 @@
/obj/structure/window/spawner/north,
/turf/open/floor/f13,
/area/f13/brotherhood/surface)
+"Nl" = (
+/obj/machinery/light/small{
+ dir = 1;
+ pixel_x = 8
+ },
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
+"Nr" = (
+/obj/structure/table/wood/settler,
+/turf/open/floor/wood/f13/oak,
+/area/f13/wasteland)
"NA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/stool{
@@ -3020,6 +3669,15 @@
/obj/item/kirbyplants/random,
/turf/open/floor/wood/wood_large,
/area/f13/ncr)
+"NN" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/arcade,
+/area/f13/bar)
+"NO" = (
+/obj/structure/table/wood/settler,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/wasteland)
"NP" = (
/obj/structure/simple_door/room,
/obj/structure/barricade/wooden{
@@ -3085,6 +3743,13 @@
icon_state = "neutralrustyfull"
},
/area/f13/building)
+"Od" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"Of" = (
/obj/structure/barricade/wooden,
/turf/closed/wall/f13/wood,
@@ -3097,12 +3762,25 @@
/obj/structure/simple_door/wood,
/turf/open/floor/f13/wood,
/area/f13/legion)
+"On" = (
+/obj/structure/dresser,
+/obj/machinery/light/small{
+ pixel_x = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"Op" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13/wood{
icon_state = "housewood2-broken"
},
/area/f13/wasteland)
+"OC" = (
+/obj/structure/closet/cabinet,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"OE" = (
/obj/structure/simple_door/metal/store,
/obj/effect/decal/cleanable/dirt,
@@ -3140,6 +3818,11 @@
/obj/structure/window/spawner/north,
/turf/open/floor/f13,
/area/f13/brotherhood/surface)
+"Pd" = (
+/obj/structure/chair/stool,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"Ph" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/grimy,
@@ -3169,6 +3852,35 @@
sunlight_state = 1
},
/area/f13/wasteland)
+"PC" = (
+/obj/machinery/light/small{
+ pixel_x = -10
+ },
+/obj/structure/chair/sofa/left{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
+"PE" = (
+/obj/structure/window/fulltile/house,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
+"PG" = (
+/obj/structure/rack,
+/obj/item/vending_refill/cigarette,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
+"PI" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/transparent/openspace{
+ name = "air";
+ sunlight_state = 1
+ },
+/area/f13/wasteland)
"PK" = (
/obj/structure/table/wood,
/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2,
@@ -3188,6 +3900,18 @@
/obj/structure/simple_door/metal/dirtystore,
/turf/open/floor/plasteel/f13/vault_floor/dark,
/area/f13/brotherhood/surface)
+"PZ" = (
+/obj/structure/simple_door/room,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
+"Qd" = (
+/obj/structure/chair/wood/worn{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/stage_r,
+/area/f13/wasteland)
"Qe" = (
/obj/structure/filingcabinet{
density = 0;
@@ -3218,6 +3942,11 @@
/obj/item/binoculars,
/turf/open/floor/wood/f13/oak,
/area/f13/building)
+"Qr" = (
+/mob/living/simple_animal/hostile/raider/ranged,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"Qs" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -3243,9 +3972,26 @@
},
/turf/open/floor/carpet/royalblack,
/area/f13/ncr)
+"Qw" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/transparent/openspace{
+ name = "air";
+ sunlight_state = 1
+ },
+/area/f13/wasteland)
"Qx" = (
/turf/open/indestructible,
/area/f13/tcoms)
+"QI" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/junk/arcade,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/arcade,
+/area/f13/bar)
"QM" = (
/obj/structure/closet/cabinet/anchored,
/obj/item/clothing/under/f13/ranger,
@@ -3258,6 +4004,18 @@
/obj/item/clothing/head/f13/flatranger,
/turf/open/floor/wood/wood_large,
/area/f13/ncr)
+"QP" = (
+/obj/structure/simple_door/metal/barred,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
+"QQ" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/f13/picnicdress50s,
+/obj/effect/spawner/lootdrop/f13/weapon/melee/random,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"Ra" = (
/obj/structure/railing/corner,
/turf/open/transparent/openspace{
@@ -3306,6 +4064,11 @@
/obj/structure/table/wood/fancy/black,
/turf/open/floor/carpet/royalblack,
/area/f13/ncr)
+"Rf" = (
+/obj/structure/simple_door/room,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"Rg" = (
/turf/open/transparent/openspace{
name = "air";
@@ -3321,6 +4084,13 @@
},
/turf/open/indestructible/ground/outside/woodalt,
/area/f13/building)
+"Rm" = (
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_x = 6
+ },
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"Rr" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13,
@@ -3347,6 +4117,10 @@
/obj/structure/window/spawner/north,
/turf/open/floor/f13,
/area/f13/brotherhood/surface)
+"Rv" = (
+/obj/item/chair/stool/bar,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"Rw" = (
/obj/structure/decoration/smokeold{
pixel_y = 32
@@ -3458,6 +4232,12 @@
/obj/item/folder,
/turf/open/indestructible/ground/outside/woodalt,
/area/f13/building)
+"Sm" = (
+/obj/structure/simple_door/room,
+/obj/structure/barricade/wooden/planks/pregame,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"So" = (
/obj/structure/table,
/obj/item/crafting/abraxo{
@@ -3520,6 +4300,10 @@
},
/turf/open/floor/carpet/royalblack,
/area/f13/ncr)
+"SU" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/closed/wall/f13/wood/house,
+/area/f13/bar)
"SV" = (
/obj/effect/overlay/junk/toilet{
dir = 8
@@ -3587,6 +4371,18 @@
/obj/structure/sign/poster/ncr/loaded,
/turf/closed/wall/mineral/wood,
/area/f13/ncr)
+"TH" = (
+/obj/structure/junk/arcade,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/arcade,
+/area/f13/bar)
+"TI" = (
+/obj/machinery/light/small{
+ brightness = 3;
+ dir = 8
+ },
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"TU" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/f13/vault_floor/yellow/corner{
@@ -3668,6 +4464,11 @@
sunlight_state = 1
},
/area/f13/wasteland)
+"UN" = (
+/mob/living/simple_animal/hostile/raider/ranged,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"UR" = (
/obj/structure/closet/crate/bin,
/turf/open/floor/f13{
@@ -3760,6 +4561,16 @@
icon_state = "neutralrustyfull"
},
/area/f13/building)
+"VM" = (
+/obj/structure/table/snooker{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
+"VO" = (
+/turf/open/floor/wood/f13/stage_b/outdoors,
+/area/f13/wasteland)
"VR" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/f13/vault_floor/dark,
@@ -3818,6 +4629,11 @@
/obj/structure/sign/plaques/golden,
/turf/closed/wall/mineral/wood,
/area/f13/ncr)
+"WJ" = (
+/obj/structure/bed,
+/obj/effect/spawner/lootdrop/bedsheet,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"WN" = (
/obj/item/mop,
/obj/structure/mopbucket,
@@ -3867,6 +4683,9 @@
},
/turf/closed/wall/f13/wood/house,
/area/f13/raiders)
+"Xw" = (
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"XF" = (
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
name = "metal plating";
@@ -3959,6 +4778,7 @@
pixel_x = -4;
pixel_y = 12
},
+/obj/item/warpaint_bowl,
/turf/open/floor/f13/wood,
/area/f13/wasteland)
"YH" = (
@@ -4032,6 +4852,11 @@
/obj/structure/window/spawner/north,
/turf/open/floor/f13,
/area/f13/brotherhood/surface)
+"Zx" = (
+/obj/structure/table/wood/settler,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"ZB" = (
/obj/structure/bed/dogbed,
/mob/living/simple_animal/hostile/wolf/alpha{
@@ -14469,7 +15294,7 @@ kC
kC
kC
kC
-PL
+kC
PL
PL
PL
@@ -14726,7 +15551,7 @@ kC
kC
kC
kC
-PL
+kC
PL
PL
PL
@@ -17054,7 +17879,7 @@ PL
PL
BY
BY
-BY
+IS
BY
PL
PL
@@ -18123,11 +18948,11 @@ kC
kC
kC
kC
-PL
-PL
-PL
-PL
-PL
+ES
+ES
+ES
+ES
+ES
PL
PL
PL
@@ -18362,29 +19187,29 @@ kC
kC
kC
kC
-kC
-kC
-lH
-kC
-kC
-kC
-kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+ES
+jg
+oI
+Xw
+ES
PL
PL
PL
@@ -18619,29 +19444,29 @@ kC
kC
kC
kC
-kC
-kC
-kC
-kC
-kC
-kC
-kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+Zx
+zW
+zZ
+kI
+zZ
+Xw
+ES
+Xw
+Fx
+om
+gO
+TI
+QQ
+om
+Ak
+Cl
+Hl
+om
+gO
+Xw
+dA
+ES
PL
PL
PL
@@ -18876,29 +19701,29 @@ kC
kC
kC
kC
-kC
-kC
-kC
-kC
-kC
-kC
-kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+OC
+sB
+xA
+xA
+xA
+jg
+ES
+jg
+jG
+om
+KK
+jg
+WJ
+om
+KK
+jg
+Jk
+om
+ll
+Xw
+Jk
+ES
PL
PL
PL
@@ -19133,29 +19958,29 @@ kC
kC
kC
kC
-kC
-kC
-kC
-kC
-kC
-kC
-kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+EV
+jg
+Nf
+AF
+Xw
+jg
+ES
+Xw
+dR
+om
+sQ
+Xw
+rF
+om
+sQ
+Xw
+rF
+om
+sQ
+jg
+On
+ES
PL
PL
PL
@@ -19390,29 +20215,29 @@ kC
kC
kC
kC
-kC
-kC
-kC
-kC
-kC
-kC
-kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+Jk
+jg
+sQ
+jg
+UN
+PC
+ES
+vF
+ES
+ES
+SU
+vF
+ES
+ES
+ES
+vF
+ES
+ES
+ES
+Sm
+ES
+ES
PL
PL
PL
@@ -19647,29 +20472,29 @@ kC
kC
kC
kC
-kC
-kC
-kC
-kC
-kC
-kC
-kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+Zx
+jg
+jg
+Rm
+xX
+Ho
+ES
+fl
+tR
+tD
+tR
+tR
+eP
+Eh
+tR
+eP
+TH
+TH
+pf
+eP
+tR
+ES
PL
PL
PL
@@ -19884,42 +20709,10 @@ PL
PL
PL
PL
-BY
-BY
-BY
-PL
-PL
-PL
-PL
-PL
-PL
-PL
-PL
-PL
-PL
-PL
-kC
-kC
-kC
-kC
-kC
-kC
-kC
-kC
-kC
-kC
-kC
-kC
-kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
+BY
+BY
+BY
+PL
PL
PL
PL
@@ -19930,6 +20723,38 @@ PL
PL
PL
PL
+kC
+kC
+kC
+kC
+kC
+kC
+ES
+ES
+Rf
+ES
+ES
+ES
+ES
+ES
+CO
+Pd
+eP
+DJ
+eP
+LY
+eP
+eP
+tR
+NN
+NN
+NN
+tR
+zt
+ES
+PL
+PL
+PL
PL
PL
PL
@@ -20161,29 +20986,29 @@ kC
kC
kC
kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+la
+eP
+Fz
+up
+Fz
+ES
+lw
+ch
+ch
+Pd
+eP
+eP
+tR
+eP
+eC
+Mz
+QI
+jy
+QI
+ap
+LY
+ES
PL
PL
PL
@@ -20418,29 +21243,29 @@ kC
kC
kC
kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+sx
+Qr
+eP
+eP
+tR
+ES
+Lg
+Rv
+ch
+CO
+eP
+tR
+eP
+eP
+eP
+eP
+nw
+zZ
+zZ
+Od
+ws
+ES
PL
PL
PL
@@ -20675,29 +21500,29 @@ kC
kC
kC
kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+Nl
+eP
+Ax
+eP
+eP
+ES
+eP
+ch
+ch
+Pd
+eP
+fC
+VM
+eP
+uK
+eP
+kV
+zZ
+zZ
+wG
+tR
+ES
PL
PL
PL
@@ -20932,30 +21757,30 @@ kC
kC
kC
kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+QP
+Ca
+vq
+Ca
+Fm
+ES
+eP
+CO
+CO
+eP
+tR
+MK
+Ec
+DJ
+ES
+ES
+ES
+ES
+ES
+PZ
+PZ
+ES
+PI
PL
PL
PL
@@ -21189,30 +22014,30 @@ kC
kC
kC
kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+eP
+tR
+eP
+eP
+KH
+ES
+eP
+LY
+eP
+tR
+tR
+CD
+qO
+eP
+ES
+pt
+NO
+aD
+hK
+mW
+mW
+cs
+Df
PL
PL
PL
@@ -21446,30 +22271,30 @@ kC
kC
kC
kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+mC
+eP
+eP
+tR
+eP
+Rf
+eP
+AW
+eP
+eP
+tR
+eP
+nH
+eP
+ES
+Co
+Nr
+kF
+sd
+sd
+sd
+MW
+Df
PL
PL
PL
@@ -21703,30 +22528,30 @@ kC
kC
kC
kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+eP
+tR
+eP
+eP
+KH
+ES
+ES
+ES
+ES
+PZ
+ES
+ES
+ES
+ES
+ES
+eX
+sd
+sd
+mW
+sd
+mW
+vs
+Df
PL
PL
PL
@@ -21960,30 +22785,30 @@ kC
kC
kC
kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
+ES
+ES
+eP
+eP
+eP
+eP
+ES
+jg
+jg
+jg
+jg
+jg
+ES
PL
PL
+nZ
+bj
+sd
+sd
+sd
+sd
+sd
+VO
+Df
PL
PL
PL
@@ -22217,30 +23042,30 @@ PL
kC
kC
kC
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
-PL
-PL
-PL
-PL
-PL
+kC
+ES
+ES
+PE
+PE
+ES
+ES
+Ma
+uB
+PG
+DQ
+xO
+ES
PL
PL
+nZ
+ao
+NO
+aD
+pt
+NO
+aD
+Nc
+Df
PL
PL
PL
@@ -22471,33 +23296,33 @@ PL
PL
PL
PL
-PL
-PL
-PL
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-Wx
-PL
+kC
+kC
+kC
+eU
PL
PL
PL
PL
PL
+ES
+ES
+ES
+ES
+ES
+ES
+ES
PL
PL
+nZ
+hW
+ow
+Qd
+bM
+ow
+Qd
+Nc
+Df
PL
PL
PL
@@ -22746,15 +23571,15 @@ PL
PL
PL
PL
-PL
-PL
-PL
-PL
-PL
-PL
-PL
-PL
-PL
+eR
+Qw
+Qw
+Qw
+Qw
+Qw
+Qw
+Qw
+nd
PL
PL
PL
diff --git a/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm b/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm
index 2865f8eb93..f4afc605f5 100644
--- a/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm
+++ b/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm
@@ -122,16 +122,11 @@
},
/area/f13/village)
"acJ" = (
-/obj/machinery/light/small,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/remains{
- icon_state = "remains"
- },
-/turf/open/floor/plasteel/barber{
- icon = 'icons/turf/f13floors2.dmi';
- icon_state = "bluerustychess2"
+/obj/item/trash/sosjerky{
+ pixel_x = -6
},
-/area/f13/bar)
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"acK" = (
/obj/structure/simple_door/metal/store{
icon_state = "brokenstore"
@@ -254,6 +249,10 @@
icon_state = "horizontalbottombordertop2"
},
/area/f13/wasteland)
+"afR" = (
+/mob/living/simple_animal/hostile/cazador,
+/turf/open/indestructible/ground/outside/road,
+/area/f13/wasteland)
"agd" = (
/obj/structure/stacklifter,
/turf/open/indestructible/ground/outside/dirt,
@@ -384,9 +383,9 @@
/turf/open/floor/f13/wood,
/area/f13/building)
"ahP" = (
-/obj/item/trash/f13/tin,
-/turf/open/indestructible/ground/outside/desert,
-/area/f13/bar)
+/obj/item/twohanded/spear/scrapspear,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"aig" = (
/obj/item/bedsheet,
/obj/structure/bed/old,
@@ -398,9 +397,9 @@
},
/area/f13/village)
"aip" = (
+/obj/structure/table/wood/settler,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/coffee,
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/stage_tl,
/area/f13/bar)
"aix" = (
/obj/machinery/grill{
@@ -439,14 +438,9 @@
},
/area/f13/wasteland)
"ajr" = (
-/obj/effect/decal/remains{
- icon_state = "remains"
- },
-/obj/effect/decal/cleanable/blood/old{
- icon_state = "gibmid1"
- },
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/obj/structure/simple_door/room,
+/turf/open/floor/wood/f13/old,
+/area/f13/bar)
"ajy" = (
/obj/structure/decoration/hatch,
/turf/open/indestructible/ground/outside/road{
@@ -1622,6 +1616,10 @@
icon_state = "floorrusty"
},
/area/f13/building)
+"aGX" = (
+/obj/machinery/vending/cola/starkist,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"aHo" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/pill/patch/healingpowder,
@@ -1639,10 +1637,10 @@
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/building)
"aHz" = (
-/obj/structure/table/wood/settler,
-/obj/machinery/chem_dispenser/drinks,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/oak,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"aHN" = (
/obj/structure/fluff/beach_umbrella/security,
@@ -1783,6 +1781,16 @@
},
/turf/open/floor/f13/wood,
/area/f13/village)
+"aKL" = (
+/obj/structure/nest/mirelurk{
+ max_mobs = 4;
+ spawn_time = 10
+ },
+/obj/effect/decal/riverbank{
+ dir = 8
+ },
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"aKX" = (
/mob/living/simple_animal/hostile/cazador/young,
/turf/open/indestructible/ground/outside/dirt,
@@ -2162,6 +2170,10 @@
/obj/structure/fence,
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+"aUr" = (
+/obj/structure/simple_door/repaired,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"aUL" = (
/obj/structure/flora/grass/wasteland{
icon_state = "tall_grass_2";
@@ -2567,6 +2579,10 @@
"bcK" = (
/turf/closed/wall/f13/wood,
/area/f13/raiders)
+"bcL" = (
+/obj/structure/simple_door/room,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"bcV" = (
/turf/open/floor/plasteel/f13/vault_floor/blue/side,
/area/f13/village)
@@ -2631,6 +2647,13 @@
icon_state = "horizontalbottomborderbottom0"
},
/area/f13/wasteland)
+"bdW" = (
+/obj/structure/rack,
+/obj/item/flashlight/lantern,
+/obj/item/flashlight/lantern,
+/obj/item/flashlight/lantern,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"bea" = (
/obj/structure/flora/grass/wasteland{
icon_state = "tall_grass_3"
@@ -3094,10 +3117,10 @@
},
/area/f13/caves)
"bmO" = (
-/obj/structure/chair/f13chair1{
- dir = 4
- },
-/turf/open/floor/wood/f13/old/ruinedcornertl,
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"bmW" = (
/obj/machinery/light/small{
@@ -4389,13 +4412,9 @@
/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
/area/f13/ncr)
"bOO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/nest/radroach,
-/turf/open/floor/plasteel/barber{
- icon = 'icons/turf/f13floors2.dmi';
- icon_state = "bluerustychess2"
- },
-/area/f13/bar)
+/obj/machinery/smartfridge/bottlerack/grownbin,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"bOY" = (
/obj/structure/table/wood,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
@@ -4743,15 +4762,9 @@
/turf/closed/wall/f13/wood,
/area/f13/legion)
"bWg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/nest/protectron{
- layer = 3;
- max_mobs = 1;
- name = "bartender pod";
- pixel_y = 20
- },
-/turf/open/floor/wood/f13/oak,
-/area/f13/bar)
+/obj/item/trash/boritos,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"bWh" = (
/obj/structure/window/fulltile/house,
/turf/open/floor/f13{
@@ -4830,9 +4843,9 @@
/turf/open/indestructible/ground/outside/road,
/area/f13/building)
"bZe" = (
+/obj/structure/table/wood/settler,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/cigarette,
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/old,
/area/f13/bar)
"bZg" = (
/obj/machinery/door/unpowered/securedoor{
@@ -5010,6 +5023,20 @@
},
/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
/area/f13/ncr)
+"ccr" = (
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_x = 6
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/stairs{
+ icon = 'icons/obj/stairs.dmi';
+ icon_state = "stairs_t"
+ },
+/area/f13/bar)
"ccz" = (
/obj/structure/fence/corner,
/obj/structure/fence{
@@ -5030,12 +5057,8 @@
/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
/area/f13/brotherhood/surface)
"ccN" = (
-/obj/structure/table/reinforced,
-/obj/item/restraints/legcuffs/bola,
-/obj/item/restraints/legcuffs/bola,
-/obj/item/restraints/handcuffs/cable,
-/obj/item/restraints/handcuffs/cable,
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
+/obj/item/trash/pistachios,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"ccZ" = (
/obj/effect/decal/cleanable/dirt{
@@ -5922,11 +5945,11 @@
},
/area/f13/village)
"czH" = (
-/obj/structure/table/wood/settler,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/plate,
-/turf/open/floor/wood/f13/oak,
-/area/f13/bar)
+/obj/effect/decal/riverbank{
+ dir = 6
+ },
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"czN" = (
/obj/item/paper,
/obj/item/pen{
@@ -6342,12 +6365,11 @@
},
/area/f13/building)
"cIu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/curtain{
- color = "#5c131b";
+/obj/structure/sign/poster/contraband/pinup_funk{
pixel_y = -32
},
-/turf/open/floor/wood/f13/oak,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"cIM" = (
/obj/structure/chair/f13chair2{
@@ -6359,9 +6381,8 @@
},
/area/f13/wasteland)
"cIR" = (
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{
- icon_state = "darkdirtysolid"
- },
+/obj/structure/wreck/trash/brokenvendor,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"cJs" = (
/obj/item/trash/pistachios,
@@ -6632,10 +6653,12 @@
/turf/open/floor/wood/f13/oakbroken,
/area/f13/building)
"cRc" = (
-/turf/open/floor/plasteel/stairs{
- icon = 'icons/obj/stairs.dmi'
- },
-/area/f13/caves)
+/obj/structure/closet/cabinet,
+/obj/item/clothing/neck/petcollar,
+/obj/item/clothing/suit/f13/sexymaid,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"cRd" = (
/obj/structure/barricade/tentclothedge,
/turf/open/indestructible/ground/outside/dirt{
@@ -6691,15 +6714,11 @@
/turf/open/floor/f13/wood,
/area/f13/clinic)
"cSA" = (
-/obj/structure/closet/cardboard,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
+/turf/open/indestructible/ground/outside/sidewalk{
+ dir = 2;
+ icon_state = "outerpavementcorner"
},
-/area/f13/bar)
+/area/f13/wasteland)
"cSB" = (
/obj/structure/chair/bench{
pixel_x = 1
@@ -6745,10 +6764,9 @@
},
/area/f13/building)
"cTE" = (
-/obj/structure/table/wood/poker,
-/obj/item/dice,
-/turf/open/floor/wood/f13/old/ruinedstraightnorth,
-/area/f13/bar)
+/mob/living/simple_animal/hostile/ghoul/glowing/strong,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"cTN" = (
/obj/machinery/smartfridge/bottlerack/seedbin{
pixel_x = -2;
@@ -7269,9 +7287,13 @@
},
/area/f13/building)
"dgg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer/slot_machine,
-/turf/open/floor/wood/f13/oak,
+/obj/effect/overlay/junk/curtain,
+/obj/effect/decal/cleanable/dirt{
+ color = "#363636"
+ },
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
/area/f13/bar)
"dgl" = (
/obj/structure/obstacle/barbedwire/end{
@@ -7646,14 +7668,10 @@
},
/area/f13/followers)
"dmg" = (
-/obj/structure/closet,
-/obj/item/stack/sheet/metal{
- amount = 50
- },
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{
- icon_state = "darkdirtysolid"
- },
-/area/f13/caves)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/junk/jukebox,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"dmC" = (
/obj/effect/decal/fakelattice,
/obj/structure/fluff/railing{
@@ -7760,6 +7778,13 @@
/obj/structure/barricade/wooden/planks/pregame,
/turf/open/floor/plasteel/f13/vault_floor/floor,
/area/f13/village)
+"doi" = (
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#706891"
+ },
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"dol" = (
/obj/structure/chair,
/obj/effect/decal/cleanable/dirt,
@@ -7906,11 +7931,13 @@
/turf/open/floor/wood/wood_tiled,
/area/f13/building)
"dqQ" = (
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/hypospray/medipen/psycho,
-/turf/open/floor/wood/f13/old,
+/obj/effect/decal/cleanable/dirt{
+ color = "#363636"
+ },
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
/area/f13/bar)
"dqX" = (
/obj/structure/ladder/unbreakable{
@@ -7922,11 +7949,12 @@
},
/area/f13/wasteland)
"dre" = (
-/obj/structure/chair/wood{
- dir = 4
- },
-/turf/open/floor/wood/f13/old/ruinedcornertr,
-/area/f13/bar)
+/obj/structure/rack,
+/obj/item/stack/sheet/metal/ten,
+/obj/item/clothing/mask/gas/explorer,
+/obj/item/clothing/mask/gas/explorer,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"drr" = (
/obj/machinery/biogenerator,
/obj/machinery/light{
@@ -9088,11 +9116,11 @@
},
/area/f13/wasteland)
"dQq" = (
-/obj/structure/window/fulltile/house{
- dir = 2;
- icon_state = "ruinswindow"
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/f13{
+ icon_state = "stagestairs"
},
-/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"dQI" = (
/obj/structure/rack,
@@ -9392,7 +9420,7 @@
},
/area/f13/wasteland)
"dXQ" = (
-/obj/structure/dresser,
+/obj/item/stack/ore/iron,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"dXV" = (
@@ -9484,10 +9512,10 @@
/turf/open/floor/wood/f13/housewoodbroken,
/area/f13/building)
"dZS" = (
-/obj/structure/table,
+/obj/structure/table/wood/settler,
+/obj/effect/spawner/lootdrop/f13/armor/random,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey/empty,
-/turf/open/floor/wood/f13/carpet,
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"dZT" = (
/obj/machinery/computer/terminal{
@@ -10729,7 +10757,13 @@
/turf/open/floor/f13/wood,
/area/f13/village)
"ezC" = (
-/turf/open/floor/wood/f13/old/ruinedstraightnorth,
+/obj/structure/table/wood/fancy,
+/obj/machinery/reagentgrinder,
+/obj/structure/sign/poster/contraband/pinup_couch{
+ pixel_y = 32
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"ezG" = (
/obj/structure/barricade/wooden,
@@ -11522,6 +11556,15 @@
},
/turf/open/floor/wood/f13/oak,
/area/f13/building)
+"ePR" = (
+/obj/structure/table/wood/settler,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/structure/sign/poster/contraband/have_a_puff{
+ pixel_y = 32
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"ePY" = (
/obj/structure/rack,
/obj/item/stack/sheet/plasteel/twenty,
@@ -12020,11 +12063,9 @@
/turf/open/water,
/area/f13/caves)
"fak" = (
+/obj/structure/table/wood/settler,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/wood{
- dir = 8
- },
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/stage_l,
/area/f13/bar)
"faq" = (
/obj/effect/decal/cleanable/dirt,
@@ -12137,13 +12178,7 @@
/turf/open/floor/f13/wood,
/area/f13/village)
"fcI" = (
-/obj/structure/fluff/fokoff_sign,
-/obj/item/radio/intercom{
- frequency = 1365;
- name = "Vault Intercom";
- pixel_x = 1;
- pixel_y = 25
- },
+/obj/item/trash/f13/sugarbombs,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"fcK" = (
@@ -12397,12 +12432,21 @@
name = "metal plating"
},
/area/f13/building)
+"fhb" = (
+/obj/structure/closet/crate/large,
+/obj/item/book/granter/crafting_recipe/gunsmith_three,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"fhh" = (
/obj/effect/landmark/start/f13/legionary,
/obj/item/bedsheet/brown,
/obj/structure/bed/old,
/turf/open/floor/f13/wood,
/area/f13/legion)
+"fhl" = (
+/obj/structure/rack,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"fht" = (
/obj/structure/sign/poster/contraband/missing_gloves{
pixel_y = 32
@@ -12590,11 +12634,11 @@
},
/area/f13/building)
"flI" = (
-/obj/effect/decal/cleanable/glass,
-/obj/structure/window/fulltile/ruins{
- icon_state = "ruinswindowbroken"
+/obj/structure/chair/wood/worn{
+ dir = 8
},
-/turf/open/indestructible/ground/outside/desert,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"fmn" = (
/obj/structure/chair/wood{
@@ -13240,7 +13284,14 @@
},
/area/f13/clinic)
"fyV" = (
-/turf/open/floor/wood/f13/old/ruinedstraightwest,
+/obj/structure/stairs/south{
+ color = "#FFFFFF"
+ },
+/obj/structure/stairs/south{
+ color = "#A47449"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"fyX" = (
/obj/structure/chair/wood{
@@ -13473,6 +13524,10 @@
/obj/structure/flora/grass/wasteland,
/turf/open/indestructible/ground/outside/savannah,
/area/f13/wasteland)
+"fCR" = (
+/obj/item/trash/f13/dog,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"fCS" = (
/mob/living/simple_animal/hostile/cazador/young,
/turf/open/indestructible/ground/outside/dirt{
@@ -13762,9 +13817,11 @@
/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
/area/f13/ncr)
"fIJ" = (
+/obj/structure/table/wood/settler,
+/obj/item/paper_bin,
+/obj/item/pen,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/comfy/black,
-/turf/open/floor/wood/f13/carpet,
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"fIT" = (
/obj/structure/closet/crate,
@@ -14139,6 +14196,11 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+"fRh" = (
+/obj/machinery/smartfridge/bottlerack/alchemy_rack,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"fRj" = (
/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug,
/turf/open/floor/wood/f13/oak,
@@ -14170,8 +14232,7 @@
},
/area/f13/ncr)
"fRM" = (
-/obj/structure/table/wood/settler,
-/turf/open/indestructible/ground/outside/desert,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"fRN" = (
/obj/structure/chair/wood/worn{
@@ -14269,9 +14330,10 @@
/turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess/neutralchess2,
/area/f13/building)
"fTy" = (
-/obj/machinery/computer/slot_machine,
+/obj/machinery/light,
+/obj/structure/table/wood/settler,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"fTz" = (
/obj/structure/window/fulltile/ruins{
@@ -14533,6 +14595,13 @@
/mob/living/simple_animal/chicken,
/turf/open/indestructible/ground/outside/savannah,
/area/f13/wasteland)
+"fZj" = (
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/kitchen/knife,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"fZm" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks{
@@ -14541,10 +14610,11 @@
/turf/open/floor/wood/f13/oak,
/area/f13/building)
"fZr" = (
+/obj/structure/closet/cabinet,
+/obj/effect/spawner/lootdrop/f13/weapon/melee/random,
+/obj/item/clothing/under/stripeddress,
+/obj/item/clothing/suit/f13/sexymaid,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/wood{
- dir = 1
- },
/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"fZy" = (
@@ -14643,7 +14713,8 @@
},
/area/f13/building)
"gaV" = (
-/turf/closed/indestructible/vaultdoor,
+/obj/item/trash/f13/tin,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"gbh" = (
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
@@ -14785,13 +14856,9 @@
},
/area/f13/building)
"gem" = (
-/obj/item/trash/f13/tin,
-/obj/structure/curtain{
- color = "#5c131b";
- pixel_y = -32
- },
-/turf/open/indestructible/ground/outside/desert,
-/area/f13/bar)
+/obj/item/trash/candy,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"gew" = (
/obj/structure/rack,
/obj/effect/turf_decal/bot_red,
@@ -15066,12 +15133,13 @@
/turf/open/floor/wood/f13/oak,
/area/f13/building)
"giU" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/door/airlock/grunge/abandoned,
-/obj/machinery/door/airlock/grunge/abandoned,
-/obj/structure/decoration/rag,
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
-/area/f13/caves)
+/obj/structure/table/wood/settler,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"giZ" = (
/turf/closed/wall/f13/ruins,
/area/f13/building)
@@ -15427,6 +15495,11 @@
/obj/effect/spawner/lootdrop/f13/armor/random,
/turf/open/floor/f13/wood,
/area/f13/village)
+"gpM" = (
+/obj/structure/table/wood/settler,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/stage_r,
+/area/f13/bar)
"gpQ" = (
/obj/effect/overlay/junk/toilet{
dir = 8
@@ -16165,14 +16238,13 @@
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/building)
"gDe" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/overlay/junk/toilet{
- dir = 1
- },
-/turf/open/floor/plasteel/barber{
- icon = 'icons/turf/f13floors2.dmi';
- icon_state = "bluerustychess2"
+/obj/structure/reagent_dispensers/beerkeg,
+/obj/machinery/light/small{
+ brightness = 3;
+ dir = 8
},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"gDf" = (
/obj/structure/table/reinforced,
@@ -16199,9 +16271,10 @@
/turf/open/indestructible/ground/outside/road,
/area/f13/wasteland)
"gDL" = (
-/obj/structure/simple_door/metal/ventilation,
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
-/area/f13/caves)
+/turf/open/floor/f13{
+ icon_state = "stagestairs"
+ },
+/area/f13/bar)
"gDW" = (
/obj/structure/railing{
layer = 4.1
@@ -16743,6 +16816,14 @@
/obj/structure/chair/comfy/black,
/turf/open/floor/wood,
/area/f13/building)
+"gRG" = (
+/obj/effect/decal/remains{
+ icon_state = "remains"
+ },
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/clothing/head/ushanka,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"gRL" = (
/obj/structure/closet/cabinet/anchored,
/obj/item/stack/f13Cash/random/high,
@@ -16907,10 +16988,9 @@
/turf/open/floor/wood/f13/oak,
/area/f13/building)
"gWn" = (
-/obj/effect/decal/remains{
- icon_state = "remains"
- },
-/turf/open/indestructible/ground/outside/desert,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/wood/settler,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"gWo" = (
/turf/open/indestructible/ground/outside/road{
@@ -17132,8 +17212,16 @@
/turf/open/indestructible/ground/outside/savannah/topleft,
/area/f13/wasteland)
"hbg" = (
-/obj/structure/chair/stool/bar,
-/turf/open/indestructible/ground/outside/desert,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/effect/overlay/junk/urinal{
+ pixel_y = 32
+ },
+/obj/effect/decal/cleanable/dirt{
+ color = "#363636"
+ },
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
/area/f13/bar)
"hbj" = (
/obj/structure/window/fulltile/house{
@@ -17472,12 +17560,11 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"hft" = (
-/obj/structure/closet/crate/miningcar,
-/obj/item/shovel,
-/obj/item/stack/ore/iron,
-/obj/item/stack/ore/iron,
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/obj/structure/table/wood/settler,
+/obj/item/clothing/mask/muzzle,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"hfv" = (
/turf/open/floor/wood/f13/oakbroken,
/area/f13/ncr)
@@ -17623,12 +17710,11 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"hhG" = (
-/obj/structure/closet/crate/miningcar,
-/obj/item/pickaxe,
-/obj/item/stack/ore/iron,
-/obj/item/stack/ore/iron,
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/obj/structure/table/wood/poker,
+/obj/item/dice,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"hib" = (
/obj/machinery/vending/cola/random,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -18684,9 +18770,9 @@
/turf/open/floor/f13/wood,
/area/f13/building)
"hCN" = (
-/obj/machinery/light/broken,
-/obj/effect/decal/cleanable/glass,
-/turf/open/indestructible/ground/outside/desert,
+/mob/living/simple_animal/hostile/raider,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"hCY" = (
/obj/item/storage/trash_stack,
@@ -19028,11 +19114,8 @@
},
/area/f13/followers)
"hJv" = (
-/obj/structure/barricade/wooden/strong,
-/obj/structure/fence/wooden{
- dir = 4
- },
-/turf/closed/mineral/random/low_chance,
+/obj/item/trash/f13/blamco_large,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"hJB" = (
/obj/effect/decal/remains{
@@ -19232,10 +19315,10 @@
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"hNC" = (
-/obj/machinery/door/poddoor{
- id = "vaultelevator"
+/obj/structure/chair/wood/worn{
+ dir = 8
},
-/turf/closed/indestructible/vaultdoor,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"hNI" = (
/obj/machinery/mineral/wasteland_vendor/ammo,
@@ -19280,6 +19363,13 @@
icon_state = "verticalinnermain1"
},
/area/f13/wasteland)
+"hOr" = (
+/obj/structure/table/wood/settler,
+/obj/structure/frame/machine,
+/obj/item/stack/cable_coil/random/five,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"hOF" = (
/obj/item/reagent_containers/hypospray/medipen/stimpak,
/obj/machinery/iv_drip,
@@ -19535,10 +19625,11 @@
/turf/open/floor/plasteel/f13/vault_floor/dark,
/area/f13/brotherhood/surface)
"hUK" = (
-/obj/structure/table/wood/settler,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/turf/open/floor/wood/f13/oak,
+/obj/effect/decal/cleanable/blood/old{
+ icon_state = "floor2"
+ },
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"hUM" = (
/obj/structure/closet/crate/bin,
@@ -20380,6 +20471,19 @@
},
/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
/area/f13/building)
+"ikR" = (
+/obj/structure/barricade/wooden/strong,
+/obj/structure/decoration/rag{
+ icon_state = "skin"
+ },
+/obj/structure/decoration/rag,
+/obj/structure/decoration/rag{
+ icon_state = "skulls"
+ },
+/turf/open/floor/wood/f13/oak{
+ icon_state = "oakfloor3-broken"
+ },
+/area/f13/bar)
"ilf" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/cardboard,
@@ -20486,11 +20590,10 @@
},
/area/f13/building)
"imR" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/railing{
- dir = 8
+/obj/effect/decal/cleanable/blood/old{
+ icon_state = "gibmid1"
},
-/turf/open/floor/plasteel/elevatorshaft,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"imT" = (
/obj/structure/tires/five,
@@ -20633,11 +20736,10 @@
/turf/open/floor/carpet/black,
/area/f13/building)
"iqx" = (
-/obj/effect/decal/remains{
- icon_state = "remains"
- },
+/obj/structure/table/wood/poker,
+/obj/effect/holodeck_effect/cards,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"iqy" = (
/obj/machinery/light/broken{
@@ -20768,6 +20870,17 @@
/obj/structure/car/rubbish3,
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/wasteland)
+"ito" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/closet/crate/bin,
+/obj/structure/sign/poster/contraband/pinup_topless{
+ pixel_x = 32
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"itt" = (
/obj/structure/window/fulltile/house{
dir = 2
@@ -21081,11 +21194,8 @@
/turf/open/floor/f13,
/area/f13/building)
"iAU" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/railing{
- layer = 4.1
- },
-/turf/open/floor/plasteel/elevatorshaft,
+/obj/structure/wreck/trash/two_barrels,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"iBo" = (
/obj/structure/simple_door/bunker,
@@ -21239,6 +21349,17 @@
},
/turf/open/floor/f13/wood,
/area/f13/village)
+"iEh" = (
+/obj/effect/overlay/junk/toilet{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt{
+ color = "#363636"
+ },
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
+/area/f13/bar)
"iEp" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -22287,9 +22408,8 @@
/turf/open/floor/wood/wood_tiled,
/area/f13/building)
"iWp" = (
-/obj/structure/barricade/wooden/strong,
-/obj/structure/barricade/wooden/planks/pregame,
-/obj/structure/decoration/rag,
+/obj/structure/closet/fridge,
+/obj/item/reagent_containers/food/snacks/f13/canned/borscht,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"iWB" = (
@@ -22638,9 +22758,12 @@
},
/area/f13/building)
"jdw" = (
-/obj/effect/overlay/junk/urinal,
-/turf/closed/mineral/random/low_chance,
-/area/f13/bar)
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#706891"
+ },
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"jdA" = (
/obj/structure/table/reinforced,
/obj/machinery/microwave,
@@ -22743,6 +22866,10 @@
icon_state = "darkrustysolid"
},
/area/f13/building)
+"jfA" = (
+/obj/item/pickaxe,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"jfD" = (
/obj/effect/landmark/start/f13/pusher,
/obj/effect/decal/cleanable/dirt,
@@ -24300,8 +24427,9 @@
/turf/open/floor/f13/wood,
/area/f13/legion)
"jNA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table/wood/settler,
+/obj/effect/decal/cleanable/blood/old{
+ icon_state = "gibbear1"
+ },
/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"jNJ" = (
@@ -24553,13 +24681,8 @@
},
/area/f13/ncr)
"jSZ" = (
-/obj/machinery/power/smes,
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{
- icon_state = "darkrustysolid"
- },
+/obj/item/trash/f13/instamash,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"jTq" = (
/obj/structure/chair/wood,
@@ -24921,12 +25044,7 @@
/area/f13/wasteland)
"jZk" = (
/obj/structure/table/wood,
-/obj/item/trash/sosjerky{
- icon_state = "plate"
- },
-/obj/item/kitchen/knife{
- pixel_x = 5
- },
+/obj/item/mining_scanner,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"jZo" = (
@@ -25505,7 +25623,7 @@
},
/area/f13/wasteland)
"kkk" = (
-/obj/structure/simple_door/repaired,
+/obj/item/trash/f13/porknbeans,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"kkD" = (
@@ -26334,6 +26452,15 @@
icon_state = "floorrustysolid"
},
/area/f13/caves)
+"kDU" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/structure/spider/spiderling,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/communist_state{
+ pixel_y = 31
+ },
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"kEc" = (
/obj/machinery/door/poddoor/shutters{
armor = list("melee" = 40, "bullet" = 30, "laser" = 25, "energy" = 75, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70);
@@ -26470,9 +26597,10 @@
/turf/open/floor/f13/wood,
/area/f13/building)
"kGP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/old,
+/obj/structure/simple_door/room,
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
/area/f13/bar)
"kHg" = (
/obj/machinery/vending/clothing,
@@ -27098,11 +27226,7 @@
},
/area/f13/building)
"kUs" = (
-/obj/effect/decal/riverbank{
- dir = 4
- },
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/item/clothing/head/cone,
+/obj/item/trash/f13/tin_large,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"kUA" = (
@@ -27243,6 +27367,10 @@
icon_state = "plating"
},
/area/f13/ncr)
+"kXk" = (
+/obj/item/chair/wood,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"kXt" = (
/obj/structure/lattice/catwalk,
/turf/open/indestructible/ground/outside/ruins,
@@ -27283,6 +27411,10 @@
icon_state = "bluedirtychess2"
},
/area/f13/building)
+"kXS" = (
+/obj/machinery/mineral/ore_redemption,
+/turf/open/floor/f13/wood,
+/area/f13/ncr)
"kYp" = (
/obj/structure/safe,
/obj/effect/spawner/lootdrop/f13/armor/tier3,
@@ -27370,12 +27502,9 @@
/area/f13/building)
"kZU" = (
/obj/structure/table/wood/settler,
-/obj/machinery/chem_dispenser/drinks/beer,
+/obj/effect/spawner/lootdrop/f13/weapon/melee/random,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"lae" = (
/turf/open/indestructible/ground/outside/sidewalk{
@@ -27421,9 +27550,12 @@
},
/area/f13/ncr)
"lbM" = (
-/obj/structure/lattice/catwalk,
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
-/area/f13/caves)
+/obj/structure/sign/poster/contraband/pinup_ride{
+ pixel_y = 32
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"lbO" = (
/obj/structure/sign/poster/prewar/poster70{
pixel_x = -33
@@ -27765,8 +27897,14 @@
/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
/area/f13/brotherhood/surface)
"lhc" = (
-/turf/open/floor/wood/f13/old/ruinedcornertr,
-/area/f13/bar)
+/obj/structure/closet/crate/large,
+/obj/item/reagent_containers/food/snacks/f13/canned/porknbeans,
+/obj/item/reagent_containers/food/snacks/f13/canned/porknbeans,
+/obj/item/reagent_containers/food/snacks/beans,
+/obj/item/reagent_containers/food/condiment/bbqsauce,
+/obj/item/reagent_containers/food/condiment/bbqsauce,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"lhj" = (
/obj/structure/simple_door/house,
/turf/open/floor/plasteel/f13/vault_floor/red/side{
@@ -28562,13 +28700,10 @@
},
/area/f13/building)
"lAX" = (
-/obj/structure/simple_door/metal/store{
- icon_state = "brokenstore"
- },
-/obj/structure/decoration/rag{
- icon_state = "skin"
+/obj/structure/chair/wood/worn{
+ dir = 1
},
-/turf/open/floor/wood/f13/old/ruinedcornerendtr,
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"lBd" = (
/obj/effect/decal/cleanable/dirt/dust,
@@ -28627,20 +28762,12 @@
/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria,
/area/f13/village)
"lCc" = (
-/obj/machinery/button/door{
- id = "vaultelevator";
- name = "Blast Door Exit";
- pixel_y = 25
- },
-/obj/structure/ladder/unbreakable{
- height = 2;
- id = "surfacevaultelevatorladder";
- name = "maintenance ladder"
- },
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{
- icon_state = "darkrustysolid"
- },
-/area/f13/caves)
+/obj/structure/table/wood/fancy,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/item/storage/box/drinkingglasses,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"lCs" = (
/obj/structure/barricade/tentclothcorner{
dir = 4
@@ -28669,11 +28796,9 @@
},
/area/f13/wasteland)
"lDy" = (
+/mob/living/simple_animal/hostile/raider/ranged,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/wood/f13/carpet,
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"lDz" = (
/obj/structure/table/wood/settler,
@@ -28878,12 +29003,11 @@
},
/area/f13/raiders)
"lHF" = (
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/gun/ballistic/revolver/detective,
-/turf/open/floor/wood/f13/old,
-/area/f13/bar)
+/obj/effect/decal/riverbank{
+ dir = 8
+ },
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"lHK" = (
/obj/machinery/light,
/turf/open/floor/f13{
@@ -28981,12 +29105,9 @@
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/building)
"lLc" = (
-/obj/structure/car,
-/obj/item/storage/trash_stack{
- icon_state = "trash_2"
- },
-/turf/open/indestructible/ground/outside/road,
-/area/f13/wasteland)
+/obj/item/trash/plate,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"lLh" = (
/obj/machinery/light/small{
dir = 4
@@ -29125,9 +29246,9 @@
/turf/open/floor/f13/wood,
/area/f13/building)
"lNp" = (
-/obj/structure/barricade/wooden/strong,
/obj/structure/barricade/wooden/planks/pregame,
-/turf/open/indestructible/ground/inside/mountain,
+/obj/structure/barricade/wooden/strong,
+/turf/closed/wall/f13/wood,
/area/f13/caves)
"lNv" = (
/obj/structure/table/wood,
@@ -29178,10 +29299,9 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"lOZ" = (
-/obj/structure/reagent_dispensers/barrel/four,
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{
- icon_state = "darkrustysolid"
- },
+/obj/structure/lattice/catwalk,
+/obj/structure/flora/grass/jungle,
+/turf/open/indestructible/ground/outside/water,
/area/f13/caves)
"lPc" = (
/obj/machinery/light/small{
@@ -29262,11 +29382,12 @@
},
/area/f13/wasteland)
"lQA" = (
-/obj/structure/wreck/trash/machinepiletwo,
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{
- icon_state = "darkrustysolid"
- },
-/area/f13/caves)
+/obj/structure/simple_door/room,
+/obj/structure/barricade/wooden/planks/pregame,
+/obj/structure/barricade/wooden/planks/pregame,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"lQD" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood/old{
@@ -29587,13 +29708,9 @@
},
/area/f13/wasteland)
"lVG" = (
-/obj/structure/flora/grass/wasteland{
- icon_state = "tall_grass_6"
- },
-/turf/open/indestructible/ground/outside/dirt{
- icon_state = "dirtcorner"
- },
-/area/f13/wasteland)
+/obj/item/trash/can,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"lVS" = (
/obj/structure/table/wood/settler,
/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/superlow,
@@ -30032,11 +30149,9 @@
},
/area/f13/building)
"meQ" = (
-/obj/structure/simple_door,
-/obj/structure/barricade/wooden/planks/pregame,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/old,
-/area/f13/bar)
+/mob/living/simple_animal/hostile/mirelurk/hunter,
+/turf/open/indestructible/ground/outside/water,
+/area/f13/caves)
"meY" = (
/obj/machinery/light/small{
dir = 4;
@@ -30423,11 +30538,9 @@
},
/area/f13/village)
"mmM" = (
-/obj/machinery/smartfridge/bottlerack,
+/obj/machinery/vending/cigarette,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
- },
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"mmT" = (
/obj/structure/barricade/wooden,
@@ -30789,13 +30902,9 @@
},
/area/f13/wasteland)
"muK" = (
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{
- icon_state = "darkdirtysolid"
- },
-/area/f13/caves)
+/obj/machinery/vending/cola/random,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
"mvh" = (
/obj/structure/fence{
dir = 1
@@ -31124,6 +31233,10 @@
},
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
+"mDa" = (
+/obj/item/chair/stool,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"mEh" = (
/obj/structure/table/wood,
/obj/machinery/computer/terminal,
@@ -31682,6 +31795,15 @@
/obj/machinery/vending/medical,
/turf/open/floor/plasteel/f13/vault_floor/dark,
/area/f13/village)
+"mPF" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/decal/cleanable/dirt{
+ color = "#363636"
+ },
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
+/area/f13/bar)
"mPL" = (
/obj/item/poster/random_contraband,
/turf/open/floor/f13/wood,
@@ -31729,9 +31851,11 @@
/turf/open/floor/f13/wood,
/area/f13/building)
"mRD" = (
-/obj/structure/lattice/catwalk,
-/turf/open/floor/plasteel/elevatorshaft,
-/area/f13/caves)
+/obj/structure/bed,
+/obj/item/bedsheet/red,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"mRH" = (
/obj/structure/table/wood,
/obj/machinery/reagentgrinder,
@@ -32388,6 +32512,10 @@
icon_state = "horizontaloutermain0"
},
/area/f13/wasteland)
+"new" = (
+/obj/item/trash/f13/blamco,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"neP" = (
/obj/structure/car/rubbish2,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -32622,6 +32750,10 @@
/obj/item/clothing/under/f13/raiderharness,
/turf/open/floor/f13,
/area/f13/building)
+"njC" = (
+/obj/item/trash/f13/cram,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"nkp" = (
/turf/open/indestructible/ground/outside/sidewalk{
dir = 4;
@@ -32635,8 +32767,7 @@
/turf/open/floor/wood/f13/carpet,
/area/f13/building)
"nla" = (
-/obj/structure/mirelurkegg,
-/obj/structure/destructible/tribal_torch/wall,
+/obj/structure/simple_door/metal/fence,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"nlv" = (
@@ -33020,9 +33151,7 @@
/area/f13/building)
"nsg" = (
/obj/structure/table/wood/settler,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/glasses/regular,
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/stage_b,
/area/f13/bar)
"nsz" = (
/obj/effect/spawner/lootdrop/f13/medical/wasteland/meds/drug,
@@ -33436,6 +33565,14 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood/wood_tiled,
/area/f13/building)
+"nCD" = (
+/obj/effect/overlay/junk/toilet{
+ dir = 1
+ },
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
+/area/f13/bar)
"nCS" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/water_cooler,
@@ -33621,6 +33758,17 @@
icon_state = "horizontalinnermain1"
},
/area/f13/wasteland)
+"nGT" = (
+/obj/effect/decal/cleanable/dirt{
+ color = "#363636"
+ },
+/obj/effect/decal/cleanable/blood/old{
+ icon_state = "floor3"
+ },
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
+/area/f13/bar)
"nHi" = (
/obj/structure/nest/ghoul{
max_mobs = 2
@@ -33864,6 +34012,11 @@
icon_state = "housewood3-broken"
},
/area/f13/caves)
+"nMq" = (
+/obj/structure/closet/crate/trashcart,
+/obj/item/shovel,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
"nMs" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
@@ -33877,13 +34030,8 @@
},
/area/f13/building)
"nMY" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/ladder/unbreakable{
- height = 2;
- id = "surfacevaultladder";
- name = "maintenance ladder"
- },
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
+/obj/item/trash/f13/specialapples,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"nNn" = (
/obj/effect/decal/cleanable/dirt{
@@ -34590,14 +34738,9 @@
},
/area/f13/wasteland)
"odb" = (
+/obj/structure/reagent_dispensers/beerkeg,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/contraband/pinup_couch{
- pixel_y = 32
- },
-/obj/structure/mopbucket,
-/obj/item/mop,
-/turf/open/floor/wood/f13/old,
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"odh" = (
/obj/structure/closet,
@@ -34692,9 +34835,9 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"ofS" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/wood,
-/turf/open/floor/wood/f13/oak,
+/obj/structure/fence/pole_b,
+/obj/structure/table/wood/settler,
+/turf/open/floor/wood/f13/old,
/area/f13/bar)
"ofX" = (
/turf/open/indestructible/ground/outside/sidewalk{
@@ -34732,6 +34875,10 @@
/obj/item/seeds/soya,
/turf/open/indestructible/ground/inside/dirt,
/area/f13/wasteland)
+"ogP" = (
+/obj/item/trash/f13/steak,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"ogZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -35391,6 +35538,10 @@
icon_state = "housewood2"
},
/area/f13/village)
+"otP" = (
+/obj/machinery/light/sign/chiken_ranch,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
"otQ" = (
/obj/machinery/light{
dir = 1
@@ -35626,10 +35777,9 @@
/turf/open/floor/wood/f13/oak,
/area/f13/building)
"ozx" = (
-/obj/structure/table/wood/poker,
-/obj/effect/holodeck_effect/cards,
+/mob/living/simple_animal/hostile/raider/ranged,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"ozA" = (
/obj/structure/rack,
@@ -35723,6 +35873,15 @@
/obj/effect/spawner/lootdrop/f13/armor/tier2,
/turf/open/floor/f13/wood,
/area/f13/building)
+"oBt" = (
+/obj/structure/rack,
+/obj/item/seeds/cannabis,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/seeds/tobacco,
+/obj/item/cultivator,
+/obj/item/shovel/spade,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"oBw" = (
/obj/structure/table/wood,
/obj/item/folder/blue{
@@ -35876,6 +36035,10 @@
"oFP" = (
/turf/closed/wall/f13/tentwall,
/area/f13/building)
+"oGk" = (
+/obj/structure/window/fulltile/house,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"oGn" = (
/obj/effect/decal/cleanable/dirt{
color = "000000"
@@ -36109,15 +36272,11 @@
/turf/open/floor/plasteel/f13/vault_floor/red/white,
/area/f13/building)
"oKZ" = (
+/obj/structure/table/wood/settler,
+/obj/item/storage/box/ingredients/wildcard,
+/obj/item/storage/box/ingredients/sweets,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/overlay/junk/toilet{
- dir = 1
- },
-/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,
-/turf/open/floor/plasteel/barber{
- icon = 'icons/turf/f13floors2.dmi';
- icon_state = "bluerustychess2"
- },
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"oLg" = (
/obj/structure/statue/sandstone/gravestone{
@@ -36360,14 +36519,10 @@
},
/area/f13/wasteland)
"oQr" = (
-/obj/structure/table/reinforced,
-/obj/item/wirecutters{
- icon_state = "cutters"
- },
-/obj/item/storage/toolbox/electrical,
-/obj/item/clothing/gloves/color/yellow,
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
-/area/f13/caves)
+/obj/structure/table/wood/settler,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/stage_bl,
+/area/f13/bar)
"oQD" = (
/obj/structure/chair/wood{
dir = 8
@@ -36466,12 +36621,10 @@
},
/area/f13/wasteland)
"oSz" = (
-/obj/effect/decal/cleanable/glass,
-/obj/item/trash/f13/tin,
-/obj/structure/window/fulltile/ruins{
- icon_state = "ruinswindowbroken"
- },
-/turf/open/indestructible/ground/outside/desert,
+/obj/structure/table/wood/settler,
+/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier1,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"oSA" = (
/obj/machinery/light/small,
@@ -36533,6 +36686,11 @@
dir = 4
},
/area/f13/building)
+"oUe" = (
+/obj/structure/closet/crate/trashcart,
+/obj/effect/spawner/lootdrop/f13/crafting,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
"oUo" = (
/obj/structure/table,
/obj/item/reagent_containers/spray/cleaner,
@@ -36546,6 +36704,14 @@
icon_state = "horizontaloutermain1"
},
/area/f13/wasteland)
+"oUK" = (
+/obj/structure/table/wood/settler,
+/obj/structure/sign/poster/contraband/pinup_pink{
+ pixel_y = 32
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/stage_tr,
+/area/f13/bar)
"oUV" = (
/obj/machinery/mineral/wasteland_vendor/special,
/turf/open/indestructible/ground/outside/desert,
@@ -36676,6 +36842,15 @@
"oYb" = (
/turf/closed/indestructible/f13/matrix,
/area/f13/caves)
+"oYq" = (
+/obj/structure/table/wood/settler,
+/obj/item/lipstick/purple,
+/obj/item/lipstick/jade,
+/obj/item/lipstick/black,
+/obj/item/lipstick,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"oYA" = (
/obj/item/shovel,
/turf/open/indestructible/ground/inside/mountain,
@@ -36691,14 +36866,13 @@
},
/area/f13/ncr)
"oYS" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/poddoor/shutters{
- id = "shadybar";
- name = "Gin'n'Gout Shutters"
- },
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
+/obj/structure/table/wood/settler,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/structure/sign/poster/contraband/missing_gloves{
+ pixel_y = 32
},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"oYY" = (
/obj/structure/decoration/vent,
@@ -36743,6 +36917,13 @@
/obj/structure/chair/wood,
/turf/open/floor/wood,
/area/f13/building)
+"oZO" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old{
+ pixel_x = 12
+ },
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"oZX" = (
/obj/structure/sign/poster/contraband/eat,
/turf/closed/wall/f13/store{
@@ -36925,12 +37106,13 @@
},
/area/f13/village)
"pes" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/decoration/clock{
- pixel_y = 30
+/obj/structure/destructible/tribal_torch/wall,
+/obj/item/trash/f13/dog{
+ pixel_x = -6;
+ pixel_y = 14
},
-/turf/open/floor/wood/f13/carpet,
-/area/f13/bar)
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"peu" = (
/turf/open/indestructible/ground/outside/dirt,
/area/f13/village)
@@ -37387,7 +37569,7 @@
},
/area/f13/wasteland)
"pnI" = (
-/obj/item/storage/trash_stack,
+/mob/living/simple_animal/hostile/ghoul/legendary,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"pnQ" = (
@@ -37461,8 +37643,9 @@
},
/area/f13/ncr)
"ppm" = (
-/obj/structure/closet/fridge/meat,
-/obj/effect/spawner/lootdrop/f13/foodspawner,
+/obj/structure/rack,
+/obj/item/reagent_containers/food/snacks/f13/canned/dog,
+/obj/item/reagent_containers/food/snacks/f13/canned/borscht,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"ppn" = (
@@ -37560,11 +37743,12 @@
},
/area/f13/wasteland)
"psR" = (
-/obj/structure/flora/grass/jungle,
-/obj/structure/lattice/catwalk,
-/obj/item/fishingrod,
-/turf/open/indestructible/ground/outside/water,
-/area/f13/caves)
+/obj/structure/fence{
+ dir = 8;
+ icon_state = "straight"
+ },
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
"psT" = (
/obj/structure/debris/v4,
/turf/open/indestructible/ground/outside/road{
@@ -37682,6 +37866,13 @@
icon_state = "housewood2"
},
/area/f13/village)
+"pvF" = (
+/obj/effect/decal/riverbank{
+ dir = 9
+ },
+/obj/structure/chair/stool,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"pvL" = (
/obj/structure/showcase/cyborg/old,
/obj/effect/decal/cleanable/dirt,
@@ -38758,6 +38949,10 @@
icon_state = "verticalrightborderleft0"
},
/area/f13/wasteland)
+"pRW" = (
+/obj/machinery/vending/coffee,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"pSn" = (
/obj/structure/car/rubbish3,
/turf/open/indestructible/ground/outside/road{
@@ -39066,6 +39261,12 @@
},
/turf/open/indestructible/ground/outside/ruins,
/area/f13/village)
+"pYZ" = (
+/obj/structure/closet/cabinet,
+/obj/effect/spawner/lootdrop/f13/crafting,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"pZl" = (
/obj/structure/decoration/clock{
pixel_y = 21
@@ -39132,6 +39333,14 @@
/obj/item/mop,
/turf/open/floor/plasteel/floorgrime,
/area/f13/building)
+"qaP" = (
+/obj/structure/simple_door/room,
+/obj/structure/decoration/rag,
+/obj/structure/barricade/wooden/planks/pregame,
+/obj/structure/barricade/wooden/planks/pregame,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"qbe" = (
/obj/structure/table,
/obj/item/reagent_containers/hypospray/medipen/stimpak,
@@ -39181,6 +39390,10 @@
icon_state = "horizontalbottomborderbottom0"
},
/area/f13/wasteland)
+"qcc" = (
+/obj/item/trash/f13/c_ration_3,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"qci" = (
/obj/effect/decal/marking,
/turf/open/indestructible/ground/outside/road,
@@ -39496,9 +39709,11 @@
/turf/open/floor/f13/wood,
/area/f13/raiders)
"qiO" = (
-/obj/structure/chair/stool/bar,
+/obj/structure/table/wood/fancy,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"qiP" = (
/turf/open/indestructible/ground/outside/road{
@@ -39731,9 +39946,7 @@
/area/f13/village)
"qou" = (
/obj/structure/table/wood/settler,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low,
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/stage_br,
/area/f13/bar)
"qox" = (
/obj/structure/sign/painting/library{
@@ -40384,15 +40597,13 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"qCV" = (
-/obj/item/trash/sosjerky{
- pixel_x = -6
- },
-/obj/item/trash/sosjerky{
- pixel_x = 1;
- pixel_y = 10
+/obj/structure/sign/poster/contraband/pinup_vixen{
+ pixel_y = 32
},
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/obj/machinery/computer/slot_machine,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"qDb" = (
/obj/structure/barricade/wooden/strong,
/obj/structure/decoration/rag,
@@ -40494,12 +40705,7 @@
/turf/closed/wall/f13/wood,
/area/f13/village)
"qFM" = (
-/obj/structure/simple_door/metal/dirtystore,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/barber{
- icon = 'icons/turf/f13floors2.dmi';
- icon_state = "bluerustychess2"
- },
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"qFO" = (
/obj/structure/barricade/wooden,
@@ -40641,12 +40847,10 @@
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"qIk" = (
-/obj/structure/bed/mattress{
- icon_state = "mattress2";
- pixel_y = 7
- },
+/obj/structure/chair/stool/bar,
+/mob/living/simple_animal/hostile/raider/thief,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"qIn" = (
/obj/structure/barricade/wooden,
@@ -40760,7 +40964,8 @@
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/legion)
"qKG" = (
-/turf/open/floor/wood/f13/old/ruinedcornertl,
+/obj/structure/chair/stool/bar,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"qKU" = (
/obj/structure/chair/comfy/brown{
@@ -40925,12 +41130,12 @@
},
/area/f13/wasteland)
"qNK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/prewar/poster82{
- pixel_x = 32
+/obj/structure/barricade/wooden/strong,
+/obj/structure/spider/stickyweb{
+ icon_state = "stickyweb2"
},
-/turf/open/floor/wood/f13/oak,
-/area/f13/bar)
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"qNM" = (
/obj/effect/decal/riverbank{
dir = 9
@@ -41905,6 +42110,10 @@
},
/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria,
/area/f13/village)
+"rhM" = (
+/obj/item/trash/sosjerky,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"rhT" = (
/obj/structure/simple_door/interior,
/obj/structure/barricade/wooden/planks/pregame,
@@ -41965,7 +42174,9 @@
},
/area/f13/wasteland)
"rjE" = (
-/turf/open/floor/plasteel/elevatorshaft,
+/obj/structure/barricade/wooden/strong,
+/obj/structure/barricade/wooden/planks,
+/turf/closed/wall/f13/wood,
/area/f13/caves)
"rjH" = (
/obj/machinery/hydroponics/soil,
@@ -42065,14 +42276,19 @@
},
/area/f13/wasteland)
"rlZ" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/spawner/lootdrop/trash,
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{
- icon_state = "darkrustysolid"
+/obj/structure/rack,
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#706891"
},
-/area/f13/caves)
+/obj/item/clothing/under/f13/fprostitute,
+/obj/item/clothing/under/f13/fprostitute,
+/obj/item/clothing/under/f13/fprostitute,
+/obj/item/clothing/under/f13/mprostitute,
+/obj/item/clothing/under/f13/mprostitute,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"rmc" = (
/obj/structure/table/reinforced,
/obj/effect/spawner/lootdrop/f13/medical/vault/meds,
@@ -42191,9 +42407,8 @@
/turf/open/floor/f13,
/area/f13/building)
"rpI" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/remains/deadeyebot,
-/turf/open/floor/wood/f13/oak,
+/obj/machinery/light,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"rpO" = (
/obj/effect/decal/cleanable/dirt{
@@ -42452,14 +42667,11 @@
},
/area/f13/city)
"ryn" = (
-/obj/structure/closet/cardboard,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/hypospray/medipen/medx,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
+/obj/structure/chair/wood/worn{
+ dir = 1
},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"ryr" = (
/obj/effect/decal/cleanable/glass,
@@ -42628,6 +42840,10 @@
/obj/item/reagent_containers/food/drinks/beer,
/turf/open/floor/wood/f13,
/area/f13/building)
+"rCc" = (
+/obj/structure/mirelurkegg,
+/turf/open/indestructible/ground/outside/water,
+/area/f13/caves)
"rCt" = (
/obj/effect/spawner/lootdrop/trash,
/turf/open/indestructible/ground/outside/road,
@@ -42650,9 +42866,9 @@
/turf/open/floor/wood/f13/oak,
/area/f13/building)
"rCO" = (
-/obj/structure/chair/stool/bar,
-/turf/open/floor/wood/f13/old/ruinedstraightnorth,
-/area/f13/bar)
+/obj/item/trash/f13/dandyapples,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"rCQ" = (
/obj/structure/grille,
/obj/structure/window/fulltile,
@@ -42733,6 +42949,12 @@
/obj/item/stack/sheet/mineral/wood,
/turf/open/floor/wood/f13/oak,
/area/f13/building)
+"rEU" = (
+/obj/effect/decal/riverbank{
+ dir = 10
+ },
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"rFc" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/f13chair2{
@@ -42749,6 +42971,23 @@
/obj/effect/spawner/lootdrop/f13/weapon/melee/random,
/turf/open/floor/f13/wood,
/area/f13/village)
+"rGi" = (
+/obj/effect/overlay/junk/sink{
+ dir = 8;
+ pixel_x = -12
+ },
+/obj/effect/decal/cleanable/dirt{
+ color = "#363636"
+ },
+/obj/effect/overlay/junk/mirror{
+ pixel_x = -26;
+ pixel_y = -4
+ },
+/obj/effect/decal/cleanable/vomit/old,
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
+/area/f13/bar)
"rGl" = (
/obj/structure/chalkboard,
/obj/machinery/light/small/broken{
@@ -43348,6 +43587,11 @@
icon_state = "horizontaloutermain2"
},
/area/f13/wasteland)
+"rVB" = (
+/obj/structure/chair/wood/worn,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"rVK" = (
/obj/effect/landmark/poster_spawner/prewar,
/turf/closed/wall/f13/store,
@@ -44107,11 +44351,13 @@
},
/area/f13/caves)
"smk" = (
-/obj/structure/bed/old,
-/obj/item/newspaper,
-/obj/item/flashlight/lantern,
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/obj/effect/overlay/junk/shower{
+ dir = 4
+ },
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
+/area/f13/bar)
"smq" = (
/obj/structure/barricade/tentclothedge{
dir = 1;
@@ -44200,10 +44446,8 @@
},
/area/f13/building)
"soN" = (
-/obj/structure/railing{
- dir = 4
- },
-/turf/closed/indestructible/vaultdoor,
+/obj/machinery/smartfridge/bottlerack/seedbin,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"soY" = (
/obj/structure/fence{
@@ -44277,8 +44521,7 @@
},
/area/f13/wasteland)
"sqf" = (
-/obj/structure/bed/old,
-/obj/item/newspaper,
+/obj/item/trash/waffles,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"sqx" = (
@@ -44406,10 +44649,13 @@
/turf/open/floor/f13/wood,
/area/f13/village)
"str" = (
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{
- icon_state = "darkrustysolid"
+/obj/machinery/light/small{
+ brightness = 3;
+ dir = 8
},
-/area/f13/caves)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"stt" = (
/obj/effect/decal/cleanable/blood/old{
icon_state = "gib2-old"
@@ -44954,6 +45200,14 @@
/obj/effect/decal/remains/human,
/turf/open/floor/f13/wood,
/area/f13/village)
+"sGW" = (
+/obj/structure/barricade/wooden/strong,
+/obj/structure/fence/wooden{
+ dir = 4
+ },
+/obj/structure/destructible/tribal_torch/wall,
+/turf/closed/mineral/random/low_chance,
+/area/f13/caves)
"sHm" = (
/obj/structure/window/fulltile/store,
/obj/structure/barricade/wooden/planks/pregame,
@@ -45683,14 +45937,10 @@
},
/area/f13/building)
"sWe" = (
-/obj/structure/sign/poster/prewar/poster79{
- pixel_x = -32
- },
-/turf/open/indestructible/ground/outside/sidewalk{
- dir = 4;
- icon_state = "outerpavement"
- },
-/area/f13/wasteland)
+/obj/structure/dresser,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"sWg" = (
/obj/structure/rack,
/obj/item/paper/pamphlet{
@@ -45986,6 +46236,13 @@
/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
+"tch" = (
+/obj/machinery/mineral/ore_redemption,
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 4;
+ icon_state = "dirt"
+ },
+/area/f13/wasteland)
"tci" = (
/obj/structure/table/wood/settler,
/obj/item/reagent_containers/food/snacks/f13/steak,
@@ -46296,7 +46553,9 @@
/turf/open/floor/wood/wood_tiled,
/area/f13/building)
"tkd" = (
-/turf/open/floor/wood/f13/old/ruinedstraighteast,
+/obj/structure/chair/wood/worn,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"tkg" = (
/obj/structure/table/reinforced,
@@ -46603,15 +46862,11 @@
},
/area/f13/building)
"tqh" = (
-/obj/structure/barricade/wooden/strong,
-/obj/structure/decoration/rag,
-/obj/structure/decoration/rag{
- icon_state = "skulls"
- },
-/obj/structure/fence/wooden{
- dir = 4
+/obj/structure/fence{
+ dir = 8;
+ icon_state = "straight"
},
-/turf/closed/mineral/random/low_chance,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"tqu" = (
/obj/structure/barricade/wooden,
@@ -47035,11 +47290,9 @@
/turf/open/floor/carpet/royalblack,
/area/f13/building)
"tAj" = (
-/obj/structure/statue/wood/headstonewood{
- desc = "A wooden gravemarker, used to mark a burial site. It has a K scratched onto it."
- },
-/turf/open/indestructible/ground/outside/desert,
-/area/f13/wasteland)
+/obj/structure/table/wood,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"tAk" = (
/obj/structure/decoration/vent,
/obj/structure/curtain,
@@ -48080,11 +48333,11 @@
},
/area/f13/building)
"tZI" = (
-/obj/structure/table/wood/settler,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/oak,
-/area/f13/bar)
+/obj/effect/decal/remains{
+ icon_state = "remains"
+ },
+/turf/closed/mineral/random/low_chance,
+/area/f13/caves)
"tZT" = (
/obj/structure/closet/fridge{
anchored = 1
@@ -48098,10 +48351,6 @@
/obj/item/reagent_containers/food/snacks/f13/canned/porknbeans,
/obj/item/reagent_containers/food/snacks/beans,
/obj/item/reagent_containers/food/condiment/bbqsauce,
-/obj/item/reagent_containers/food/snacks/f13/canned/porknbeans,
-/obj/item/reagent_containers/food/snacks/f13/canned/porknbeans,
-/obj/item/reagent_containers/food/snacks/beans,
-/obj/item/reagent_containers/food/snacks/beans,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/raiders)
"tZW" = (
@@ -48192,6 +48441,10 @@
icon_state = "verticalinnermain1"
},
/area/f13/wasteland)
+"ubK" = (
+/obj/machinery/workbench/advanced,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"ubW" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/terminal{
@@ -48597,8 +48850,7 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"uke" = (
-/obj/effect/decal/riverbank,
-/obj/structure/flora/ausbushes/sparsegrass,
+/obj/item/trash/semki,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"ukg" = (
@@ -49056,11 +49308,15 @@
/turf/open/floor/f13/wood,
/area/f13/caves)
"urW" = (
-/obj/effect/decal/riverbank,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/item/clothing/head/cone,
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/obj/machinery/light/small{
+ brightness = 3;
+ dir = 8
+ },
+/obj/machinery/reagentgrinder,
+/obj/structure/table/wood/settler,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"usb" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -49083,20 +49339,22 @@
/turf/open/floor/f13/wood,
/area/f13/building)
"ush" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/pill/patch/healingpowder,
-/obj/item/reagent_containers/pill/patch/healingpowder,
-/obj/item/reagent_containers/pill/patch/healingpowder,
-/obj/item/reagent_containers/pill/patch/healingpowder,
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/obj/machinery/light/small{
+ brightness = 3;
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"usn" = (
-/obj/structure/closet/fridge/standard,
+/obj/structure/closet/cabinet,
+/obj/effect/spawner/bundle/costume/chicken,
+/obj/effect/spawner/lootdrop/f13/weapon/melee/random,
+/obj/item/clothing/suit/f13/sexymaid,
+/obj/item/clothing/head/helmet/f13/brahmincowboyhat,
+/obj/item/clothing/suit/armor/f13/brahmin_leather_duster,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/snacks/f13/bubblegum,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
- },
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"usx" = (
/turf/closed/wall/f13/store{
@@ -49129,7 +49387,8 @@
/area/f13/wasteland)
"utT" = (
/obj/structure/barricade/wooden/strong,
-/turf/closed/mineral/random/low_chance,
+/obj/structure/barricade/wooden/strong,
+/turf/closed/wall/f13/wood,
/area/f13/caves)
"utX" = (
/obj/effect/decal/cleanable/dirt,
@@ -49285,6 +49544,15 @@
/obj/structure/closet/cabinet,
/turf/open/floor/f13/wood,
/area/f13/building)
+"uxU" = (
+/obj/effect/overlay/junk/shower{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
+/area/f13/bar)
"uyc" = (
/obj/machinery/door/poddoor/shutters{
id = "hospitalgarage2";
@@ -49302,12 +49570,12 @@
},
/area/f13/building)
"uyn" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/empty,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
+/obj/effect/overlay/junk/mirror{
+ pixel_y = 32
},
+/obj/structure/table/wood/settler,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"uyp" = (
/obj/structure/fence/wooden{
@@ -49446,8 +49714,24 @@
/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
/area/f13/building)
"uAP" = (
-/turf/open/floor/wood/f13/old/ruinedcornerendtr,
+/obj/effect/overlay/junk/shower{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt{
+ color = "#363636"
+ },
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
/area/f13/bar)
+"uAT" = (
+/obj/structure/closet/crate/large,
+/obj/item/paper/secretrecipe,
+/obj/item/clothing/head/chefhat,
+/obj/item/clothing/neck/apron/chef,
+/obj/item/melee/onehanded/knife/cosmicdirty,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"uBx" = (
/obj/structure/table/wood/settler,
/obj/effect/decal/cleanable/dirt,
@@ -49494,10 +49778,11 @@
},
/area/f13/wasteland)
"uCt" = (
-/obj/machinery/light,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/oak,
-/area/f13/bar)
+/obj/effect/decal/remains{
+ icon_state = "remains"
+ },
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
"uCO" = (
/turf/closed/wall/f13/wood/interior,
/area/f13/building)
@@ -50069,16 +50354,9 @@
},
/area/f13/wasteland)
"uPa" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/button/door{
- id = "shadybar";
- name = "Gin'n'Gout Button"
- },
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
- },
-/area/f13/bar)
+/obj/structure/closet/crate/large,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"uPj" = (
/obj/structure/fence{
dir = 4
@@ -50153,10 +50431,9 @@
},
/area/f13/village)
"uPU" = (
-/obj/effect/decal/remains{
- icon_state = "remains"
- },
-/obj/effect/decal/cleanable/blood/old,
+/obj/item/pickaxe/drill,
+/obj/structure/rack,
+/obj/item/storage/bag/ore,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"uPY" = (
@@ -50221,11 +50498,8 @@
/turf/open/floor/plasteel/f13/vault_floor/white,
/area/f13/building)
"uQP" = (
-/obj/structure/chair/wood/worn{
- dir = 1
- },
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
+/turf/closed/wall/f13/wood,
+/area/f13/bar)
"uQY" = (
/obj/structure/chair/stool,
/obj/effect/decal/cleanable/dirt,
@@ -50900,12 +51174,9 @@
},
/area/f13/wasteland)
"vff" = (
-/obj/structure/table,
+/obj/structure/table/wood/poker,
/obj/effect/decal/cleanable/dirt,
-/obj/item/kitchen/knife,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
- },
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"vfn" = (
/obj/structure/rack,
@@ -50996,7 +51267,11 @@
/turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
/area/f13/brotherhood/surface)
"vhs" = (
-/obj/structure/vaultdoor,
+/obj/item/trash/f13/tin{
+ dir = 4;
+ pixel_x = 9;
+ pixel_y = 3
+ },
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"vht" = (
@@ -51085,14 +51360,9 @@
},
/area/f13/wasteland)
"vjd" = (
-/obj/structure/reagent_dispensers/beerkeg,
+/obj/machinery/vending/snack,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
- },
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"vjf" = (
/obj/effect/decal/cleanable/dirt,
@@ -51116,11 +51386,9 @@
},
/area/f13/building)
"vjE" = (
-/obj/effect/decal/cleanable/glass,
-/obj/structure/window/fulltile/ruins{
- icon_state = "ruinswindowdestroyed"
- },
-/turf/open/indestructible/ground/outside/desert,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"vjO" = (
/obj/effect/landmark/start/f13/pusher,
@@ -51342,27 +51610,24 @@
/turf/open/floor/plasteel/f13/vault_floor/red,
/area/f13/village)
"vpx" = (
-/obj/structure/closet/cardboard,
+/mob/living/simple_animal/hostile/raider,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/hypospray/medipen/psycho,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
- },
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"vpD" = (
/obj/effect/landmark/start/f13/druid,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"vpF" = (
-/obj/structure/flora/grass/wasteland{
- icon_state = "tall_grass_6"
- },
-/turf/open/indestructible/ground/outside/dirt{
- icon_state = "dirt"
- },
-/area/f13/wasteland)
+/obj/structure/rack,
+/obj/item/clothing/under/f13/fprostitute,
+/obj/item/clothing/under/f13/fprostitute,
+/obj/item/clothing/under/f13/fprostitute,
+/obj/item/clothing/under/f13/mprostitute,
+/obj/item/clothing/under/f13/mprostitute,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"vpJ" = (
/obj/structure/destructible/tribal_torch/wall/lit,
/turf/open/floor/carpet/red,
@@ -51448,10 +51713,12 @@
},
/area/f13/building)
"vsU" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/f13{
- icon_state = "platingdmg3"
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_y = 9
},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"vtb" = (
/obj/structure/fence{
@@ -51535,12 +51802,11 @@
/turf/open/floor/plasteel/freezer,
/area/f13/tunnel)
"vvi" = (
-/obj/structure/closet/cardboard,
/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/box/drinkingglasses,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
+/obj/effect/decal/cleanable/blood/old{
+ icon_state = "floor2"
},
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"vvl" = (
/obj/item/crowbar,
@@ -51583,10 +51849,9 @@
},
/area/f13/wasteland)
"vvV" = (
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
- },
-/area/f13/bar)
+/obj/structure/bed/old,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"vwn" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -51731,9 +51996,9 @@
/area/f13/wasteland)
"vzq" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/pen,
-/turf/open/floor/wood/f13/carpet,
+/obj/effect/decal/cleanable/glass,
+/obj/item/broken_bottle,
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"vzw" = (
/obj/effect/decal/remains/human,
@@ -51748,8 +52013,7 @@
/turf/open/water,
/area/f13/caves)
"vzB" = (
-/obj/structure/table/wood/poker,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small,
/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"vzG" = (
@@ -51925,10 +52189,10 @@
/turf/open/floor/carpet/black,
/area/f13/legion)
"vDm" = (
+/obj/structure/fence/pole_t,
+/obj/structure/table/wood/settler,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/superlow,
-/turf/open/floor/wood/f13/carpet,
+/turf/open/floor/wood/f13/old,
/area/f13/bar)
"vDq" = (
/obj/structure/flora/ausbushes/sparsegrass,
@@ -53246,15 +53510,12 @@
},
/area/f13/building)
"whO" = (
+/obj/structure/simple_door/room,
+/obj/structure/barricade/wooden/planks/pregame,
+/obj/structure/barricade/wooden/planks/pregame,
+/obj/structure/barricade/wooden/planks/pregame,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/wood{
- dir = 1
- },
-/obj/structure/curtain{
- color = "#5c131b";
- pixel_y = -32
- },
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"whP" = (
/obj/structure/wreck/trash/machinepile,
@@ -53293,6 +53554,10 @@
icon_state = "floorrusty"
},
/area/f13/building)
+"wiG" = (
+/obj/structure/flora/rock/jungle,
+/turf/open/indestructible/ground/outside/water,
+/area/f13/caves)
"wiU" = (
/obj/machinery/door/airlock/wood/glass{
req_one_access_txt = "62"
@@ -53385,9 +53650,9 @@
},
/area/f13/building)
"wkU" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/drone,
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
+/obj/structure/barricade/wooden/strong,
+/obj/structure/spider/stickyweb,
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"wlG" = (
/obj/effect/decal/marking{
@@ -53450,9 +53715,10 @@
/area/f13/wasteland)
"wmP" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/paper_bin,
-/turf/open/floor/wood/f13/carpet,
+/obj/effect/decal/cleanable/blood/old{
+ pixel_x = 12
+ },
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"wne" = (
/obj/structure/flora/rock/jungle,
@@ -53545,9 +53811,7 @@
},
/area/f13/building)
"woL" = (
-/obj/structure/closet/crate/miningcar,
-/obj/item/stack/ore/iron,
-/obj/item/stack/ore/iron,
+/obj/item/trash/f13/mechanist,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"woN" = (
@@ -53559,23 +53823,16 @@
},
/area/f13/building)
"woP" = (
-/obj/structure/closet/cardboard,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
- },
+/obj/structure/simple_door/room,
+/obj/structure/barricade/wooden/planks/pregame,
+/turf/open/floor/wood/f13/old,
/area/f13/bar)
"woS" = (
-/obj/structure/closet/cardboard,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/hypospray/medipen/psycho,
-/obj/item/reagent_containers/food/drinks/bottle/wine,
-/obj/item/reagent_containers/food/drinks/bottle/wine,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
+/obj/effect/decal/cleanable/blood/old{
+ icon_state = "floor3"
},
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"woT" = (
/obj/structure/closet/crate/trashcart,
@@ -54234,14 +54491,10 @@
},
/area/f13/legion)
"wDV" = (
-/obj/structure/flora/grass/wasteland{
- icon_state = "tall_grass_6"
- },
-/turf/open/indestructible/ground/outside/dirt{
- dir = 9;
- icon_state = "dirt"
- },
-/area/f13/wasteland)
+/obj/structure/barricade/wooden/strong,
+/obj/structure/barricade/wooden/planks/pregame,
+/turf/closed/wall/f13/wood,
+/area/f13/caves)
"wDW" = (
/obj/machinery/light/small{
dir = 4
@@ -54272,12 +54525,13 @@
/turf/open/indestructible/ground/inside/mountain,
/area/f13/tunnel)
"wEF" = (
-/obj/machinery/light/small{
- dir = 8
+/mob/living/simple_animal/hostile/raider,
+/obj/effect/decal/cleanable/dirt{
+ color = "#363636"
+ },
+/turf/open/floor/f13{
+ icon_state = "bar"
},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/old,
/area/f13/bar)
"wEO" = (
/obj/item/kirbyplants/random,
@@ -54533,11 +54787,11 @@
/turf/open/floor/wood/wood_large,
/area/f13/building)
"wLs" = (
-/obj/structure/curtain{
- color = "#5c131b";
- pixel_y = -32
+/obj/structure/chair/wood/worn{
+ dir = 1
},
-/turf/open/indestructible/ground/outside/desert,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"wLu" = (
/obj/structure/fence,
@@ -54568,17 +54822,10 @@
},
/area/f13/wasteland)
"wLC" = (
+/obj/structure/simple_door/room,
+/obj/structure/barricade/wooden/planks/pregame,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/overlay/junk/sink{
- pixel_y = 15
- },
-/obj/effect/overlay/junk/mirror{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/barber{
- icon = 'icons/turf/f13floors2.dmi';
- icon_state = "bluerustychess2"
- },
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"wLO" = (
/obj/structure/flora/grass/jungle/b,
@@ -54660,10 +54907,11 @@
/turf/open/floor/carpet,
/area/f13/building)
"wNq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/bin,
-/turf/open/floor/wood/f13/carpet,
-/area/f13/bar)
+/obj/structure/closet/crate/large,
+/obj/item/circuitboard/machine/chem_dispenser/drinks,
+/obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"wNv" = (
/obj/effect/decal/cleanable/dirt{
color = "#363636"
@@ -54690,11 +54938,7 @@
},
/area/f13/building)
"wNP" = (
-/obj/structure/rack,
-/obj/item/clothing/under/f13/rag,
-/obj/item/storage/backpack,
-/obj/item/storage/bag/ore,
-/obj/item/pickaxe/drill,
+/obj/structure/legion_extractor,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"wOb" = (
@@ -54757,17 +55001,18 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"wOL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
+/obj/structure/chair/stool/bar,
+/obj/machinery/light/small{
+ dir = 4
},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"wOP" = (
-/obj/structure/wreck/trash/machinepile,
-/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{
- icon_state = "darkrustysolid"
+/obj/structure/nest/ghoul{
+ max_mobs = 2
},
+/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"wOS" = (
/turf/open/indestructible/ground/outside/water,
@@ -54782,6 +55027,19 @@
},
/turf/open/floor/f13/wood,
/area/f13/building)
+"wPb" = (
+/obj/structure/closet/fridge/standard,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/effect/spawner/lootdrop/f13/foodspawner,
+/obj/effect/spawner/lootdrop/f13/foodspawner,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/effect/spawner/lootdrop/f13/alcoholspawner,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
+/area/f13/bar)
"wPl" = (
/turf/closed/wall/f13/ruins,
/area/f13/village)
@@ -55047,20 +55305,9 @@
},
/area/f13/tunnel)
"wTL" = (
-/obj/structure/barricade/wooden/strong,
-/obj/structure/destructible/tribal_torch/wall,
-/obj/structure/decoration/rag{
- icon_state = "skin"
- },
-/obj/structure/decoration/rag{
- icon_state = "skulls";
- pixel_x = 4;
- pixel_y = 2
- },
-/obj/structure/fence/wooden{
- dir = 4
- },
-/turf/closed/mineral/random/low_chance,
+/obj/structure/lattice/catwalk,
+/obj/item/fishingrod,
+/turf/open/indestructible/ground/outside/water,
/area/f13/caves)
"wUc" = (
/obj/machinery/light/small{
@@ -55282,11 +55529,9 @@
/turf/open/floor/f13/wood,
/area/f13/building)
"wXT" = (
+/obj/machinery/smartfridge/bottlerack,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/barber{
- icon = 'icons/turf/f13floors2.dmi';
- icon_state = "bluerustychess2"
- },
+/turf/open/floor/wood/f13/oak,
/area/f13/bar)
"wXW" = (
/obj/effect/spawner/lootdrop/f13/cash_random_high,
@@ -55420,7 +55665,9 @@
},
/area/f13/building)
"xbv" = (
-/turf/open/floor/wood/f13/old/ruinedcornerendtl,
+/obj/structure/chair/stool/bar,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"xbA" = (
/obj/machinery/light/small{
@@ -55897,14 +56144,9 @@
/turf/open/floor/f13/wood,
/area/f13/village)
"xkC" = (
-/obj/structure/closet/cardboard,
+/obj/structure/table/wood/settler,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/hypospray/medipen/medx,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/turf/open/floor/plasteel/f13{
- icon_state = "platingdmg2"
- },
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"xkI" = (
/obj/structure/chair/stool{
@@ -56016,15 +56258,9 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/wasteland)
"xnp" = (
-/obj/structure/closet/cardboard,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/bottle/wine,
-/obj/item/reagent_containers/food/drinks/bottle/wine,
-/obj/item/reagent_containers/food/drinks/bottle/wine,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
- },
-/area/f13/bar)
+/mob/living/simple_animal/chick,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"xnt" = (
/obj/structure/chair/f13foldupchair{
dir = 1
@@ -56194,9 +56430,9 @@
},
/area/f13/wasteland)
"xqs" = (
-/obj/structure/closet/crate/trashcart,
-/turf/open/indestructible/ground/outside/desert,
-/area/f13/wasteland)
+/obj/item/trash/f13/fancylads,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"xqw" = (
/turf/open/indestructible/ground/outside/road{
icon_state = "verticalleftborderright2bottom"
@@ -56228,15 +56464,16 @@
},
/area/f13/wasteland)
"xrh" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/decoration/smokeold{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/barber{
- icon = 'icons/turf/f13floors2.dmi';
- icon_state = "bluerustychess2"
- },
-/area/f13/bar)
+/obj/structure/closet/crate/large,
+/obj/item/storage/pill_bottle/chem_tin/radx,
+/obj/item/reagent_containers/blood/radaway,
+/obj/item/reagent_containers/hypospray/medipen/stimpak/imitation,
+/obj/item/reagent_containers/hypospray/medipen/stimpak/imitation,
+/obj/item/storage/fancy/rollingpapers,
+/obj/item/storage/fancy/rollingpapers,
+/obj/item/storage/fancy/rollingpapers,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"xrj" = (
/obj/structure/simple_door/metal/dirtystore,
/turf/open/floor/f13{
@@ -56564,11 +56801,9 @@
/turf/closed/wall,
/area/f13/building)
"xAX" = (
-/obj/structure/simple_door,
-/obj/structure/barricade/wooden/planks/pregame,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/carpet,
-/area/f13/bar)
+/obj/structure/campfire/barrel,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"xAZ" = (
/obj/structure/window{
dir = 1
@@ -56651,11 +56886,12 @@
},
/area/f13/building)
"xDA" = (
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/spray/cleaner,
-/turf/open/floor/wood/f13/old,
+/obj/effect/overlay/junk/urinal{
+ pixel_y = 32
+ },
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
/area/f13/bar)
"xDE" = (
/turf/open/floor/f13/wood{
@@ -56737,10 +56973,20 @@
},
/area/f13/village)
"xFO" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/flashlight/lamp/green,
-/turf/open/floor/wood/f13/carpet,
+/obj/machinery/light{
+ dir = 8;
+ icon_state = "tube"
+ },
+/obj/effect/spawner/lootdrop/f13/crafting,
+/obj/effect/decal/cleanable/dirt{
+ color = "#363636"
+ },
+/obj/structure/sign/poster/contraband/pinup_shower{
+ pixel_x = -32
+ },
+/turf/open/floor/f13{
+ icon_state = "bar"
+ },
/area/f13/bar)
"xFQ" = (
/obj/structure/barricade/wooden,
@@ -56947,12 +57193,12 @@
},
/area/f13/building)
"xIW" = (
-/obj/structure/simple_door,
+/obj/structure/simple_door/room,
/obj/structure/barricade/wooden/planks/pregame,
+/obj/structure/barricade/wooden/planks/pregame,
+/obj/structure/table/wood/settler,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
- },
+/turf/open/floor/wood/f13/old,
/area/f13/bar)
"xJe" = (
/obj/effect/turf_decal/stripes/white/line{
@@ -56966,12 +57212,17 @@
icon_state = "floorrusty"
},
/area/f13/building)
+"xJj" = (
+/obj/structure/destructible/tribal_torch/wall,
+/obj/item/trash/f13/specialapples,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"xJz" = (
-/obj/machinery/light/small,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/barber{
- icon = 'icons/turf/f13floors2.dmi';
- icon_state = "bluerustychess2"
+/obj/effect/decal/cleanable/dirt{
+ color = "#363636"
+ },
+/turf/open/floor/f13{
+ icon_state = "bar"
},
/area/f13/bar)
"xJA" = (
@@ -57336,6 +57587,12 @@
icon_state = "housewood4-broken"
},
/area/f13/building)
+"xSJ" = (
+/obj/structure/disposalpipe/broken{
+ dir = 1
+ },
+/turf/open/indestructible/ground/outside/water,
+/area/f13/caves)
"xTc" = (
/obj/structure/table,
/obj/item/kitchen/knife,
@@ -57369,14 +57626,9 @@
},
/area/f13/building)
"xTq" = (
-/obj/machinery/light/small/broken,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plasteel/barber{
- icon = 'icons/turf/f13floors2.dmi';
- icon_state = "bluerustychess2"
- },
-/area/f13/bar)
+/obj/structure/flora/wasteplant/wild_fungus,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"xTK" = (
/obj/structure/flora/grass/wasteland{
icon_state = "tall_grass_4"
@@ -57590,14 +57842,12 @@
},
/area/f13/farm)
"xZQ" = (
-/obj/structure/simple_door/metal/store{
- icon_state = "brokenstore"
+/obj/machinery/microwave/stove,
+/obj/structure/sign/poster/contraband/pinup_ride{
+ pixel_y = 32
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/barber{
- icon = 'icons/turf/f13floors2.dmi';
- icon_state = "bluerustychess2"
- },
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"yau" = (
/obj/structure/wreck/bus/rusted/segmented15,
@@ -57868,9 +58118,15 @@
},
/area/f13/wasteland)
"yeT" = (
+/obj/structure/table/wood/settler,
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#706891"
+ },
+/obj/structure/frame/machine,
+/obj/item/stack/cable_coil/random/five,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/junk/jukebox,
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"yfi" = (
/obj/structure/table,
@@ -57965,7 +58221,11 @@
/turf/open/indestructible/ground/inside/mountain,
/area/f13/tunnel)
"yhw" = (
-/turf/open/indestructible/ground/outside/desert,
+/obj/structure/chair/wood/worn{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"yhB" = (
/obj/structure/campfire,
@@ -57975,6 +58235,15 @@
/obj/machinery/light/small,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
+"yhL" = (
+/obj/structure/table/wood/settler,
+/obj/item/clothing/under/schoolgirl/green,
+/obj/item/clothing/under/schoolgirl,
+/obj/item/clothing/under/schoolgirl/orange,
+/obj/item/clothing/under/schoolgirl/red,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/oak,
+/area/f13/bar)
"yig" = (
/obj/effect/spawner/lootdrop/f13/traitbooks,
/obj/structure/table_frame,
@@ -58020,6 +58289,11 @@
/obj/item/stack/f13Cash/aureus,
/turf/open/floor/carpet/black,
/area/f13/legion)
+"yiD" = (
+/obj/structure/destructible/tribal_torch/wall,
+/obj/item/trash/can,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"yiG" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/nest/raider/melee{
@@ -58034,11 +58308,13 @@
/turf/open/floor/wood/wood_large,
/area/f13/building)
"yjn" = (
-/obj/effect/decal/marking,
-/turf/open/indestructible/ground/outside/road{
- icon_state = "horizontaltopborderbottom2right"
+/obj/structure/stairs/north,
+/obj/structure/railing{
+ dir = 4
},
-/area/f13/wasteland)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/wood_tiled,
+/area/f13/bar)
"yjz" = (
/obj/structure/rack,
/obj/item/crafting/wonderglue,
@@ -58088,12 +58364,10 @@
},
/area/f13/building)
"yko" = (
-/obj/machinery/computer/slot_machine,
-/obj/machinery/light{
- dir = 1
- },
+/obj/structure/table/wood/fancy,
+/obj/item/vending_refill/boozeomat,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/f13/oak,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"ykx" = (
/obj/item/clothing/head/ushanka,
@@ -58112,10 +58386,11 @@
/turf/open/floor/wood/f13/oak,
/area/f13/ncr)
"ykH" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/f13{
- icon_state = "plating"
+/obj/machinery/light/small{
+ dir = 4
},
+/obj/structure/table/wood/settler,
+/turf/open/floor/wood/f13/carpet,
/area/f13/bar)
"ykI" = (
/obj/structure/tires/two,
@@ -58164,8 +58439,9 @@
/turf/open/floor/f13/wood,
/area/f13/legion)
"yma" = (
-/obj/effect/overlay/junk/urinal,
-/turf/closed/wall/f13/wood/house,
+/obj/structure/table/wood/settler,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/f13/stage_b,
/area/f13/bar)
"ymb" = (
/obj/structure/wreck/bus/rusted/segmented16,
@@ -58310,7 +58586,7 @@ ktB
oYb
oYb
oYb
-oYb
+ktB
ktB
ktB
ktB
@@ -58545,26 +58821,25 @@ gcK
gcK
gcK
gcK
-gcK
-gcK
-gcK
-gcK
-gcK
+gbL
+gbL
+gbL
gcK
gcK
gcK
wOS
wOS
wOS
-hsj
-uke
-gcK
-hJv
-gcK
+wOS
+wOS
+wOS
+wOS
+wOS
+wOS
gcK
gcK
gcK
-ggK
+iOM
ggK
ggK
ggK
@@ -58575,6 +58850,7 @@ gcK
gcK
gcK
gcK
+gcK
ktB
gcK
gbL
@@ -58798,35 +59074,35 @@ gcK
gcK
gcK
ktB
-gcK
-gcK
-gcK
-gcK
-gcK
+bkr
+ggK
+gbL
+gbL
+gbL
gbL
gbL
gcK
-gcK
-gcK
-gcK
+dhG
+wOS
+wOS
may
wOS
oNR
-fzl
+csk
+wTL
kNT
-urW
-ggK
-ggK
-ggK
-ggK
-gAs
-ggK
+wOS
+gcK
+gcK
+dhG
ggK
ggK
ggK
+qNK
+qNK
+wkU
ggK
-mwO
-hJv
+gcK
gcK
gcK
gcK
@@ -59055,37 +59331,37 @@ gcK
fyf
gcK
ktB
-gcK
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gcK
-gcK
-gcK
+aKL
+lHF
+rEU
+wOS
+wiG
+hsj
+wOS
+wOS
+meQ
+wOS
kJu
wOS
wOS
-psR
-kNT
-pBX
-ggK
-ggK
-ggK
-ggK
+wOS
+wTL
+nhf
+mqp
+gcK
+gcK
ggK
ggK
ggK
+kkk
ggK
gcK
+wkU
ggK
-ggK
-hJB
-ggK
-ggK
-dcY
+nMY
+acJ
+gcK
+gcK
gcK
gcK
gcK
@@ -59312,38 +59588,38 @@ fyf
fyf
gcK
ktB
-gcK
-gbL
-gbL
-gbL
-gbL
-gcK
-gcK
+xSJ
+wOS
+hsj
+oNR
+wOS
+izB
+wOS
rpf
iyy
wOS
wOS
hsj
kNT
-kNT
+lOZ
qNM
-rOm
ggK
-mwO
-fbs
+xqs
ggK
ggK
ggK
-woL
-gcK
-gcK
-gcK
-ggK
-dcY
ggK
ggK
ggK
+gcK
+gcK
ggK
+jSZ
+bWg
+mwO
+dhG
+gcK
+gcK
gcK
gcK
ktB
@@ -59568,40 +59844,40 @@ fyf
fyf
fyf
gcK
-gcK
ktB
-gbL
-gbL
-gbL
-gbL
-gcK
-gcK
+ktB
+hsj
+rCc
+hsj
+iyy
+wOS
+wOS
hsj
izB
wOS
kNT
kNT
-nhf
+pvF
pBX
ggK
ggK
ggK
ggK
+ggK
+ggK
+ggK
+ggK
gcK
gcK
-gAs
-gAs
-gcK
gcK
gcK
+ggK
+hJv
+ogP
+rhM
gcK
gcK
gcK
-fbs
-rbj
-ggK
-ggK
-ggK
gcK
ktB
gcK
@@ -59829,36 +60105,36 @@ gcK
ktB
gbL
gbL
-gbL
-gbL
-gcK
-gcK
+dhG
+pBX
+mqp
+czH
wOS
gcK
gcK
-kUs
-mqp
+gcK
+pBX
+rOm
ggK
-bkr
ggK
-anb
ggK
ggK
ggK
+xJj
+wDV
gcK
gcK
gcK
gcK
gcK
-gaV
-gaV
-gaV
-gaV
-gcK
gcK
gcK
+hJB
ggK
ggK
+jIU
+gcK
+gcK
gcK
gcK
gcK
@@ -60087,35 +60363,35 @@ ktB
gbL
gbL
gcK
+anb
+ggK
gcK
gcK
-utT
-gcK
gcK
-fbs
+rjE
+ggK
+ggK
+ggK
+ggK
+ggK
+ggK
ggK
ggK
-nla
-gAs
-gcK
-gcK
ggK
ggK
-mwO
-hJv
gcK
gcK
gcK
-gaV
-nMY
-lbM
-gDL
-str
-gaV
gcK
+gbL
+ffA
gcK
ggK
+gaV
+wOP
ggK
+yiD
+dhG
gcK
gcK
gcK
@@ -60345,32 +60621,32 @@ gbL
gbL
gcK
gcK
-gAs
-ggK
+gcK
+gcK
+xAX
ggK
ggK
-gAs
ggK
ggK
-gAs
-gAs
gcK
gcK
-ggK
-ggK
+gcK
+gcK
+xAX
+lLc
ggK
ggK
gcK
gcK
gcK
-gaV
-soN
-soN
-soN
-cIR
-gaV
gcK
gcK
+gcK
+gcK
+gcK
+ggK
+ggK
+kUs
hJB
ggK
gcK
@@ -60602,12 +60878,12 @@ gbL
gbL
gcK
gcK
-gAs
-hft
+gcK
+ggK
+ggK
ggK
ggK
ggK
-gAs
gcK
gcK
gcK
@@ -60615,22 +60891,22 @@ gbL
gcK
gcK
gcK
-ggK
-ggK
-ggK
+aUr
+lNp
gcK
gcK
-gaV
-giU
-cRc
-cRc
-str
-gaV
+gcK
+gcK
+gcK
+gbL
+gcK
+gcK
+kkk
vhs
-wTL
ggK
-mwO
-tqh
+ggK
+lVG
+gcK
gcK
ktB
gcK
@@ -60859,34 +61135,34 @@ gbL
gbL
gcK
gcK
-gAs
+ggK
+ggK
ggK
ggK
ggK
ggK
gcK
gcK
-gcK
-gbL
gbL
gbL
gcK
gcK
-fbs
+gcK
ggK
+xKr
ggK
+iOM
gcK
gcK
-gaV
-jSZ
-rlZ
-muK
-cIR
-gaV
-ggK
-ggK
gcK
+gbL
+gbL
+gcK
+hJB
ggK
+fcI
+ggK
+xKr
gcK
gcK
ktB
@@ -61119,30 +61395,30 @@ eST
ggK
ggK
ggK
-dcY
ggK
-dcY
+ggK
+ggK
gcK
gbL
gbL
gbL
-gbL
-gbL
gcK
gcK
-lNp
+gcK
+gem
+ggK
kkk
+ggK
+fhl
+gcK
+gbL
gcK
gcK
-gaV
-lQA
-str
-str
cIR
-gaV
+new
ggK
+wOP
ggK
-gcK
ggK
gcK
gcK
@@ -61375,32 +61651,32 @@ gcK
lwj
ggK
ggK
-gAs
+gcK
ggK
-rbj
+nMY
ggK
gcK
gbL
gbL
gbL
-gbL
-gbL
gcK
gcK
+bdW
ggK
+hJv
+imR
ggK
+tAj
gcK
gcK
-gaV
-wOP
-cIR
-cIR
-wkU
-gaV
-lNp
-iWp
+gcK
+gcK
+gcK
+iOM
ggK
ggK
+qcc
+ggK
gcK
gcK
gbL
@@ -61632,32 +61908,32 @@ ktB
fbs
ggK
mwO
-hJv
+gcK
gcK
ggK
gcK
gcK
gbL
gbL
-gbL
-gbL
-gcK
gcK
-woL
-ggK
+sGW
+vvV
+ahI
+mDa
+wsq
+kXk
ggK
-iOM
+vvV
gcK
-gaV
-lOZ
-dmg
-ccN
-oQr
-gaV
-fcI
-ggK
-ggK
+gcK
+gcK
+gcK
+gcK
+gcK
+dhG
ggK
+pes
+dhG
gcK
ktB
ktB
@@ -61889,32 +62165,32 @@ gcK
gcK
ggK
ggK
+ggK
gcK
-gcK
-gcK
+rjE
gcK
gbL
gbL
gbL
gcK
-smk
-ggK
+spx
ggK
ggK
ggK
-ajr
+hNC
+rCO
ggK
+iWp
+gcK
+gcK
+gcK
+gcK
+gcK
gcK
gcK
-gaV
-gaV
-gaV
-gaV
-ggK
-ggK
ggK
ggK
-hJB
+tZI
gcK
gcK
gbL
@@ -62154,24 +62430,24 @@ gcK
gcK
gcK
gcK
-dXQ
+gcK
+iAU
ggK
-nHC
-wsq
+imR
ggK
ggK
ggK
-spx
+iOM
gcK
gcK
-ktB
gcK
gcK
gcK
-nHC
+gcK
+wNq
ggK
ggK
-gAs
+gcK
gcK
gcK
gbL
@@ -62401,34 +62677,34 @@ gcK
gbL
gcK
gcK
+eST
ggK
ggK
ggK
ggK
ggK
ggK
-ggK
-ggK
+xKr
+gcK
+gcK
gcK
gcK
-sqf
-jIU
uPU
-ggK
-pnI
ahI
+ggK
+ggK
ppm
gcK
gcK
gcK
-ktB
gcK
gcK
-gAs
+gcK
+uAT
+ahP
ggK
ggK
-nHC
-gAs
+xrh
gcK
gcK
gbL
@@ -62658,34 +62934,34 @@ gcK
gbL
gcK
fbs
-ggK
+lwj
mwO
-hJv
-ggK
-ggK
-ggK
+gcK
+iOM
ggK
+dXQ
+dcY
ggK
gcK
ktB
gcK
-ush
-uQP
+gcK
+gcK
+vvV
ggK
-qCV
jZk
gcK
gcK
gcK
-ktB
-ktB
gcK
+gcK
+gcK
+gcK
+lhc
ggK
ggK
-ahI
-ggK
ggK
-gcK
+uPa
gcK
gcK
gbL
@@ -62915,38 +63191,38 @@ ktB
gbL
gcK
gcK
-ggK
-ggK
+gAs
+gAs
+gcK
+gcK
gcK
-gaV
-gaV
-gaV
ggK
ggK
ggK
-gcK
+mwO
+rjE
ktB
gcK
-iOM
-nHC
-uAs
gcK
gcK
-ktB
-ktB
-ktB
gcK
gcK
-ggK
-ggK
-ggK
-ggK
gcK
gcK
gcK
gcK
gcK
gcK
+gcK
+ktB
+aGX
+xTq
+ggK
+ktB
+ktB
+gcK
+gbL
+gcK
gbL
gbL
gcK
@@ -63172,37 +63448,37 @@ ktB
gbL
gbL
gcK
-eST
-ggK
-gaV
-iAU
-rjE
-rjE
-gaV
-ggK
-ggK
+gAs
gcK
+gbL
gcK
-ktB
gcK
-wNP
+gcK
+ggK
+dXQ
+dcY
gcK
gcK
ktB
-ktB
gcK
gcK
gcK
gcK
-ggK
gcK
gcK
-ggK
gcK
gcK
gcK
ktB
ktB
+ktB
+gcK
+ggK
+gAs
+gcK
+ktB
+ktB
+gcK
gbL
gbL
gbL
@@ -63429,15 +63705,15 @@ ktB
gcK
gbL
gcK
-gAs
-ggK
-gaV
-iAU
-rjE
-rjE
-gaV
-ggK
+gcK
+gcK
+gcK
+gbL
+gbL
+gcK
+dhG
ggK
+jfA
ggK
gcK
ktB
@@ -63449,17 +63725,17 @@ ktB
gcK
gcK
gcK
+ktB
+ktB
gcK
gcK
gcK
gcK
-gcK
-gcK
-gcK
-gcK
+gAs
+dhG
gcK
ktB
-gbL
+ktB
gbL
gbL
ktB
@@ -63686,13 +63962,13 @@ ktB
gcK
ktB
gcK
-gAs
-lwj
-gaV
-lCc
-imR
-mRD
-gaV
+gcK
+gcK
+gcK
+gbL
+gcK
+gcK
+gcK
gAs
ggK
ggK
@@ -63706,21 +63982,21 @@ gcK
gcK
gcK
gcK
+ktB
gcK
gcK
-gbL
-gcK
+gAs
+ggK
+woL
+fCR
+gAs
gcK
-gbL
-gbL
-gbL
gcK
ktB
gbL
gbL
gbL
gbL
-gbL
gcK
gcK
gcK
@@ -63944,17 +64220,17 @@ gcK
gcK
ktB
gcK
-hhG
gcK
-gaV
-hNC
-gaV
+gcK
+gcK
+gcK
+gcK
+gcK
gAs
gAs
ggK
ggK
ggK
-ggK
gcK
ktB
ktB
@@ -63963,14 +64239,15 @@ gcK
gcK
gcK
gcK
+ktB
gcK
-gcK
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
+ubK
+ggK
+ggK
+cTE
+ggK
+uke
+ggK
gcK
ktB
gbL
@@ -63978,7 +64255,6 @@ gbL
gbL
gbL
gbL
-gbL
gcK
gcK
gcK
@@ -64202,37 +64478,37 @@ gcK
gcK
gcK
gcK
+gcK
ggK
-rbj
ggK
ggK
gAs
gAs
-gcK
+gAs
gcK
ggK
-ggK
-gcK
+mwO
+dhG
ktB
gcK
gcK
gcK
-gbL
gcK
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
gcK
-ktB
gcK
+ktB
gcK
+fhb
+ggK
+njC
+ggK
+pnI
+ggK
+ggK
gcK
+ktB
+gbL
+gbL
gcK
gcK
gcK
@@ -64460,11 +64736,11 @@ gcK
ktB
gcK
ggK
-dcY
ggK
+rbj
ggK
ggK
-gcK
+gAs
gcK
gcK
ggK
@@ -64475,20 +64751,20 @@ gcK
gcK
gcK
gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
gcK
+gbL
+ktB
gcK
+dre
+ggK
+wOP
+ggK
+ggK
+ccN
gcK
gcK
+ktB
+gbL
gcK
gcK
gcK
@@ -64716,7 +64992,7 @@ ktB
gcK
ktB
gcK
-hJB
+ggK
ggK
ggK
ggK
@@ -64734,18 +65010,18 @@ gcK
gbL
gbL
gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gcK
-gcK
+ktB
gcK
+dhG
+hJv
+ggK
+fcI
+aqZ
+sqf
gcK
+ktB
+ktB
+gbL
gcK
gcK
gcK
@@ -64973,14 +65249,14 @@ ktB
gcK
gcK
gcK
-gcK
-gcK
+ggK
+ggK
ggK
ggK
gcK
gcK
pFh
-utT
+dhG
ggK
mwO
utT
@@ -64991,17 +65267,17 @@ gcK
gbL
gbL
gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
+ktB
gcK
gcK
gcK
+aqZ
+ggK
+ggK
+dhG
+gcK
+ktB
+gbL
gcK
gcK
gcK
@@ -65245,20 +65521,20 @@ gcK
ktB
ktB
gcK
-gcK
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
gbL
gbL
gbL
+ktB
+ktB
+ktB
+gcK
+gcK
+gcK
gcK
gcK
gcK
+ktB
+gcK
gcK
gcK
gcK
@@ -65507,14 +65783,14 @@ gbL
gbL
gbL
gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gbL
-gcK
-gcK
+ktB
+ktB
+ktB
+ktB
+ktB
+ktB
+ktB
+ktB
gcK
gcK
gcK
@@ -65755,12 +66031,12 @@ fyf
fyf
fyf
fyf
-xXi
+vSS
gcK
ktB
gcK
gcK
-gcK
+gbL
gbL
gbL
gbL
@@ -66018,8 +66294,8 @@ ktB
gcK
gcK
gcK
-gcK
-gcK
+gbL
+gbL
gbL
gbL
gbL
@@ -66277,7 +66553,7 @@ gcK
gcK
gcK
gcK
-gcK
+gbL
gbL
gbL
gbL
@@ -66535,13 +66811,13 @@ gcK
gcK
gcK
gcK
-gcK
-gcK
gbL
gbL
gbL
gbL
-gcK
+gbL
+gbL
+gbL
gcK
gcK
gcK
@@ -66794,11 +67070,11 @@ gcK
gcK
gcK
gcK
-gcK
gbL
gbL
gbL
-gcK
+gbL
+gbL
gcK
gcK
gcK
@@ -67052,10 +67328,10 @@ gcK
gcK
gcK
gcK
-gcK
-gcK
-gcK
-gcK
+gbL
+gbL
+gbL
+gbL
gcK
gcK
gcK
@@ -69891,7 +70167,7 @@ gcK
gcK
gcK
gcK
-gcK
+spx
gcK
gcK
gbL
@@ -70147,10 +70423,11 @@ gcK
gcK
gcK
gcK
+ggK
+ggK
+uJa
gcK
gcK
-gcK
-kBU
kBU
kBU
kBU
@@ -70164,7 +70441,6 @@ gcK
gcK
gcK
gcK
-gcK
fyf
fyf
fyf
@@ -70261,7 +70537,7 @@ wvV
bAo
dlI
dlI
-dlR
+kXS
ehN
ubg
ehN
@@ -70404,20 +70680,20 @@ gcK
gcK
gcK
gcK
-gcK
-gcK
-gcK
-jdw
-wXT
-wXT
-wXT
+uJa
+ggK
+ggK
+pCx
+kBU
+kBU
+cDd
+urW
+kBU
+kBU
+kBU
kBU
kBU
kBU
-gcK
-gcK
-gcK
-gcK
gcK
gcK
gcK
@@ -70661,20 +70937,20 @@ gcK
gcK
gcK
gcK
-gcK
-gcK
-gcK
-kBU
+ggK
+ggK
+ggK
+uJa
kBU
-wXT
-wXT
+fRh
+qFM
qFM
oKZ
kBU
-gcK
-gcK
-gcK
-gcK
+uxU
+xJz
+smk
+kBU
gcK
gcK
gcK
@@ -70684,10 +70960,10 @@ fyf
fyf
fyf
fyf
-hll
fyf
fyf
-qTY
+fyf
+fyf
fyf
fyf
fyf
@@ -70913,20 +71189,24 @@ gcK
gcK
ktB
gcK
+ktB
gcK
-gcK
-gcK
-gcK
-gcK
-gcK
-gcK
-gcK
-yma
-bOO
-wXT
-acJ
+ggK
+ggK
+tqh
+ggK
+uJa
+uJa
+ggK
kBU
+oYS
+xuy
+vjE
+giU
kBU
+uAP
+xJz
+xJz
kBU
gcK
gcK
@@ -70934,10 +71214,6 @@ gcK
gcK
gcK
gcK
-gcK
-gcK
-gcK
-gcK
fyf
fyf
fyf
@@ -71170,26 +71446,26 @@ gcK
gcK
ktB
gcK
+ktB
gcK
-gcK
-gcK
-gcK
-gcK
-gcK
-gcK
-gcK
+xnp
+ggK
+tqh
+ggK
+ggK
+ggK
+ggK
+woP
+xuy
+vpx
+xuy
+giU
kBU
kBU
-xrh
-wXT
-qFM
-gDe
kBU
-gcK
-gcK
-gcK
-gcK
-gcK
+dgg
+kBU
+kBU
gcK
gcK
gcK
@@ -71201,7 +71477,7 @@ fyf
fyf
fyf
fyf
-fyf
+siJ
fyf
fyf
fyf
@@ -71429,29 +71705,29 @@ gcK
gcK
ktB
gcK
-gcK
-gcK
-gcK
-gcK
-gcK
-gcK
-yma
-wXT
-wXT
-xJz
+jdw
+ggK
+nla
+ggK
+uJa
+ggK
+uJa
kBU
+ePR
+xuy
+qFM
+giU
kBU
+rGi
+xFO
+xJz
+nCD
kBU
gcK
gcK
gcK
gcK
gcK
-gcK
-gcK
-gcK
-gcK
-gcK
uxC
uxC
uxC
@@ -71686,28 +71962,28 @@ gcK
gcK
ktB
gcK
-gcK
-gcK
-gcK
-gcK
-gcK
-gcK
-kBU
+ggK
+ggK
+tqh
+uJa
+ggK
+uJa
+bOO
kBU
wXT
+xuy
+vvi
wXT
-qFM
-gDe
-kBU
-kBU
kBU
+hbg
+nGT
+mPF
kBU
kBU
gcK
gcK
gcK
gcK
-gcK
fyf
fyf
fyf
@@ -71943,27 +72219,27 @@ gcK
gcK
ktB
gcK
-gcK
-gcK
-gcK
-gcK
-gcK
-gcK
+ggK
+xnp
+tqh
+ggK
+ggK
+ggK
+soN
+kBU
kBU
-wLC
-wXT
-xTq
kBU
+ajr
kBU
kBU
xDA
wEF
dqQ
+iEh
kBU
gcK
gcK
gcK
-gcK
fyf
fyf
fyf
@@ -71972,7 +72248,7 @@ fyf
fyf
fyf
fyf
-tAj
+fyf
fyf
fyf
fyf
@@ -72203,30 +72479,30 @@ gcK
gcK
gcK
gcK
-gcK
-gcK
-gcK
+oBt
+ggK
+ggK
+wNP
kBU
-wLC
-wXT
-wXT
-qFM
+kBU
+wPb
+suS
gDe
kBU
-odb
+kBU
kGP
-lHF
kBU
-gcK
-gcK
-gcK
-fyf
-fyf
-fyf
-fyf
+kBU
+kBU
+kBU
+kBU
+kBU
+kBU
+kBU
+kBU
+kBU
fyf
fyf
-hll
fyf
fyf
fyf
@@ -72459,28 +72735,29 @@ ktB
gcK
gcK
gcK
-gcK
-kBU
-kBU
-kBU
-kBU
-kBU
+uQP
+uQP
+qaP
+uQP
+uQP
+uQP
kBU
xZQ
+lbM
+fRM
+suS
+suS
+fRM
+ush
+dmg
+suS
+suS
+pRW
kBU
+hft
+ryn
+sWe
kBU
-kBU
-kBU
-meQ
-kBU
-kBU
-kBU
-uxC
-uxC
-wEo
-fyf
-fyf
-fyf
fyf
fyf
fyf
@@ -72490,7 +72767,6 @@ fyf
sqA
fyf
fyf
-fyf
uqa
rpu
olW
@@ -72716,28 +72992,29 @@ gcK
gcK
gcK
gcK
-gcK
+uQP
+odb
+xuy
+qFM
+str
+fyV
kBU
+hOr
+fRM
suS
+fZj
+qKG
suS
suS
+fRM
+yhw
+fRM
suS
-kBU
-xuy
-xuy
+wLC
xuy
xuy
-qKG
-fyV
-xbv
-yhw
+vzB
kBU
-xqs
-xqs
-xLY
-gSt
-bEw
-fyf
fyf
fyf
fyf
@@ -72747,7 +73024,6 @@ fyf
fyf
fyf
fyf
-fyf
uqa
cBc
tRP
@@ -72973,29 +73249,29 @@ ktB
gcK
gcK
gcK
-gcK
-kBU
-pes
-xFO
-vzq
-suS
+uQP
+odb
+xuy
+xuy
+xuy
+qFM
kBU
yeT
-xuy
+suS
ozx
bmO
xbv
-gWn
fRM
-wLs
+suS
+tkd
oSz
-fyf
-fyf
-dRo
-kGc
-dMW
-fyf
-fyf
+wLs
+suS
+kBU
+cRc
+qFM
+mRD
+kBU
fyf
fyf
fyf
@@ -73230,35 +73506,35 @@ ktB
gcK
gcK
gcK
-gcK
-kBU
+uQP
+rlZ
lDy
fIJ
-vDm
-suS
-xAX
-xuy
+qFM
xuy
-vzB
-cTE
-yhw
-yhw
+kBU
+ezC
+suS
fRM
-wLs
+bmO
+xbv
+suS
+fRM
+suS
flI
-fyf
-jJb
-xLY
-kGc
-dMW
-fyf
+suS
+rpI
+kBU
+uQP
+uQP
+uQP
+kBU
fyf
fyf
fyf
fyf
fyf
fyf
-hll
fyf
fyf
fyf
@@ -73487,27 +73763,33 @@ ktB
gcK
gcK
gcK
-gcK
-kBU
-suS
+uQP
+vpF
+rVB
dZS
wmP
-suS
+xuy
kBU
yko
-xuy
+lCc
qiO
-rCO
-hbg
-ahP
-yhw
+bmO
+xbv
+suS
+suS
hCN
+suS
+suS
+cIu
kBU
-giI
-feL
-iys
-hgX
-jkJ
+uBx
+lAX
+sWe
+kBU
+igz
+igz
+igz
+igz
igz
igz
igz
@@ -73517,12 +73799,6 @@ fyf
fyf
fyf
fyf
-fyf
-fyf
-fyf
-fyf
-fyf
-fyf
nlO
mfD
hCg
@@ -73744,41 +74020,41 @@ ktB
gcK
gcK
gcK
-gcK
-kBU
+uQP
+pYZ
+xuy
+uBx
+xuy
+xuy
+lQA
suS
suS
suS
-wNq
-kBU
-fTy
-xuy
-xuy
-dre
-uAP
-yhw
+suS
+fRM
+suS
yhw
-gem
-flI
-kGc
+suS
+suS
+woS
+fRM
+wLC
+qFM
+xuy
+vzB
+kBU
nPg
ybI
ybI
-ybI
-ybI
-ybI
-ybI
+sJw
+dkP
+dkP
+sJw
nkp
dMW
fyf
fyf
fyf
-lVG
-ada
-wDc
-fyf
-fyf
-fyf
fyf
fyf
fyf
@@ -74001,38 +74277,38 @@ ktB
gcK
gcK
gcK
-kBU
-kBU
-kBU
-kBU
-kBU
-kBU
+uQP
+uQP
+uQP
+uQP
+bcL
+uQP
kBU
aip
fak
-uBx
-jNA
-lhc
+oQr
+fRM
+suS
tkd
-uAP
+oSz
wLs
-vjE
-kGc
+fRM
+suS
+yhw
+kBU
+fZr
+qFM
+mRD
+kBU
unI
-qvQ
sQX
sQX
sQX
sQX
-gDs
+sQX
+sQX
koD
dMW
-fyf
-fyf
-fyf
-vpF
-wDV
-hCg
sqA
fyf
hll
@@ -74258,41 +74534,41 @@ gcK
gcK
gcK
gcK
-kBU
+uQP
usn
-ykH
+xuy
vpx
-ykH
-ykH
+xuy
+oYq
kBU
bZe
-rpI
+bZe
nsg
-fZr
-xuy
-xuy
-ezC
-fRM
+suS
+suS
+suS
+flI
+suS
+suS
+tkd
+fTy
+kBU
+uQP
+uQP
+ikR
kBU
-kGc
unI
-box
sQX
-rbe
sQX
sQX
sQX
+gGp
+sQX
koD
dMW
fyf
fyf
fyf
-nlO
-hCg
-fyf
-fyf
-fyf
-fyf
fyf
fyf
fyf
@@ -74515,39 +74791,39 @@ gcK
gcK
gcK
gcK
-kBU
+uQP
uyn
-ykH
-vsU
-ykH
-ykH
-xIW
-xuy
-ofS
-uBx
-dgg
xuy
+ryn
+jNA
xuy
-lhc
-tkd
-lAX
-kGc
-unI
+xIW
+vDm
+ofS
+yma
+suS
+yhw
+suS
+hUK
+fRM
+suS
+fRM
+suS
yjn
+vzq
+uQP
+gRG
+kBU
+unI
qci
-sQX
-sQX
qci
qci
+sQX
+sQX
+sQX
koD
dMW
fyf
-fyf
-fyf
-fyf
-fyf
-fyf
-fyf
qOV
cWG
cWG
@@ -74772,38 +75048,38 @@ gcK
gcK
gcK
gcK
-kBU
-uPa
-ykH
-ykH
-woP
-ykH
-kBU
-xuy
-xuy
-xuy
-xuy
-xuy
+uQP
+uBx
+doi
xuy
xuy
+yhL
+kBU
+bZe
+bZe
+yma
+hCN
+kZU
+wLs
+suS
+ito
+mmM
+suS
+fRM
+ccr
xuy
-pcC
-kGc
+uQP
+kDU
+kBU
unI
-qvQ
-lLc
sQX
-hOl
-sgz
-kjQ
+jYQ
+sQX
+dFQ
+bJB
+sQX
koD
dMW
-fyf
-fyf
-fyf
-fyf
-fyf
-fyf
qOV
daU
mvv
@@ -75029,38 +75305,38 @@ gcK
gcK
gcK
gcK
+uQP
kBU
-vff
-ykH
-ryn
-woS
-ykH
kBU
-xuy
-uBx
+kBU
+kBU
+kBU
+kBU
+oUK
+gpM
qou
-xuy
-xuy
-ofS
-uBx
-whO
-dQq
-kGc
+suS
+flI
+fRM
+suS
+kBU
+kBU
+oGk
+oGk
+kBU
+kBU
+kBU
+kBU
+kBU
unI
-qvQ
sQX
-hOl
-sgz
-kjQ
+sQX
+sQX
+dFQ
+bJB
sQX
koD
dMW
-fyf
-hll
-fyf
-fyf
-fyf
-fyf
tBN
mvv
mvv
@@ -75286,38 +75562,38 @@ gcK
gcK
gcK
gcK
-kBU
+uQP
vjd
-ykH
-ykH
+suS
+fRM
vsU
-wOL
-kBU
-bWg
-xuy
-hUK
-qiO
-xuy
-jNA
-czH
+suS
+suS
+fRM
+fRM
+suS
+suS
+fRM
+suS
+fRM
whO
dQq
-kGc
+cpK
+cpK
+psR
+nMq
+cpK
+cpK
+psR
unI
-eeh
qci
-sQX
-sQX
qci
qci
+ubg
+snB
+sRp
koD
dMW
-fyf
-hll
-qOV
-wDc
-fyf
-fyf
nlO
xGH
mvv
@@ -75543,39 +75819,39 @@ gcK
gcK
gcK
gcK
-kBU
-mmM
-ykH
-vvi
-ykH
-ykH
-kBU
-kZU
-xuy
+uQP
+qCV
+suS
+suS
+fRM
+suS
+oZO
+suS
+suS
hUK
-qiO
-xuy
-xuy
-xuy
+fRM
+suS
+aHz
+suS
+whO
+gDL
+cpK
+cpK
+psR
uCt
-kBU
-kGc
+bAh
+cpK
+psR
unI
-qvQ
-rbe
sQX
sQX
-ubg
-jYQ
+sQX
+sQX
+sQX
+rbe
koD
dMW
fyf
-fyf
-vpF
-doX
-wDc
-fyf
-fyf
nlO
xGH
mvv
@@ -75800,39 +76076,39 @@ gcK
gcK
gcK
gcK
-kBU
+uQP
mmM
-vsU
-cSA
-ykH
-ryn
+suS
+suS
+suS
+fRM
+suS
+suS
+xbv
+xbv
+xbv
+fRM
kBU
-aHz
-xuy
-uBx
-qiO
-xuy
-ofS
-uBx
-cIu
-dQq
-kGc
+kBU
+kBU
+pcC
+fTu
+cpK
+psR
+cpK
+cpK
+cpK
+psR
unI
-qvQ
+gGp
+sQX
sQX
sQX
sQX
-apk
sQX
koD
dMW
fyf
-sqA
-nlO
-xGH
-doX
-wDc
-fyf
fyf
nlO
mfD
@@ -76057,39 +76333,39 @@ gcK
gcK
gcK
gcK
-kBU
-mmM
-ykH
-ykH
+uQP
+uQP
+gWn
+xkC
ykH
xkC
kBU
-tZI
+fRM
iqx
-hUK
-xuy
-xuy
-xuy
-uBx
-whO
-dQq
-kGc
+hhG
+vff
+fRM
+kBU
+muK
+cpK
+cpK
+cpK
+cpK
+psR
+cpK
+cpK
+cpK
+cqy
unI
-eeh
qci
-ubg
-sQX
qci
qci
+afR
+sQX
+sQX
koD
dMW
fyf
-fyf
-qOV
-daU
-mvv
-doX
-wDc
hll
fyf
fyf
@@ -76314,39 +76590,39 @@ fyf
gcK
gcK
gcK
+gcK
kBU
-mmM
-ykH
-vvV
-ykH
-xnp
kBU
-cDd
+kBU
+kBU
+kBU
+kBU
+fRM
qIk
-uBx
-qiO
-qNK
-xuy
-xuy
-xuy
+wOL
+xbv
+fRM
kBU
-kGc
+muK
+cpK
+otP
+cpK
+cpK
+psR
+oUe
+cpK
+cpK
+psR
unI
-qvQ
+sQX
ybw
-apk
sQX
-rbe
+sQX
+sQX
sQX
koD
dMW
-qOV
-cWG
-daU
-aBH
-bni
-mfD
-hCg
+fyf
fyf
fyf
fyf
@@ -76567,19 +76843,16 @@ bpD
fyf
fyf
fyf
+lWZ
+gcK
+gcK
+gcK
+fyf
+fyf
+fyf
fyf
fyf
fyf
-lWZ
-kBU
-kBU
-oYS
-oYS
-oYS
-kBU
-kBU
-kBU
-kBU
kBU
kBU
kBU
@@ -76587,9 +76860,18 @@ kBU
kBU
kBU
kBU
-kGc
+muK
+cpK
+cpK
+qyR
+qnE
+kEh
+vap
+vap
+vap
+kEh
unI
-qvQ
+sQX
sQX
sQX
sQX
@@ -76597,12 +76879,6 @@ sQX
sQX
koD
dMW
-nlO
-mfD
-mfD
-hCg
-fyf
-fyf
fyf
fyf
fyf
@@ -76828,15 +77104,11 @@ fyf
fyf
fyf
fyf
-kGc
-ajD
-qvQ
-ybw
-sQX
-koD
-jkJ
+cSA
+igz
+igz
+igz
igz
-sWe
igz
igz
igz
@@ -76845,14 +77117,24 @@ igz
igz
igz
hgX
+cpK
+pqL
+qnE
+pqL
+wVn
+qnE
+qnE
+qnE
+qnE
+pqL
sIf
ees
+ees
muk
-qvQ
sQX
-geM
-ees
-sVF
+sQX
+sQX
+koD
jkJ
igz
igz
@@ -76865,12 +77147,6 @@ igz
igz
igz
igz
-igz
-igz
-igz
-igz
-igz
-igz
hgX
unI
rQh
@@ -77086,42 +77362,42 @@ cWG
cWG
wDc
kGc
-ajD
-qvQ
-sgz
-sQX
-fLc
+nPg
ybI
-hkW
+sTa
sJw
+sTa
+hkW
+ybI
ybI
ybI
+hkW
+hkW
ybI
ybI
-dkP
+hkW
+sJw
+sJw
sTa
sTa
-hkW
+dkP
+dkP
sJw
ybI
+ybI
+ybI
+ybI
onk
-qvQ
+sQX
+sQX
sQX
fLc
-sJw
ybI
ybI
ybI
ybI
ybI
ybI
-sJw
-ybI
-ybI
-dkP
-sTa
-hkW
-sJw
ybI
ybI
ybI
@@ -78131,16 +78407,16 @@ ees
ees
ees
ees
-dNT
-gQv
-gQv
-fsm
-fsm
-gQv
-lYi
-lYi
-lYi
-lYi
+ees
+ees
+ees
+ees
+ees
+ees
+ees
+ees
+ees
+ees
ees
ees
ees
@@ -119314,7 +119590,7 @@ mvv
doX
cWG
cWG
-cWG
+tch
cWS
nvr
nvr
diff --git a/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm b/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm
index eb87848a8e..337d875b69 100644
--- a/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm
+++ b/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm
@@ -1372,9 +1372,6 @@
brightness = 3;
dir = 8
},
-/obj/structure/handrail/g_central{
- pixel_y = -16
- },
/turf/open/floor/f13{
icon_state = "neutralrustyfull"
},
@@ -28936,15 +28933,6 @@
/obj/structure/closet/firecloset/full,
/turf/open/floor/plating/f13/inside,
/area/f13/brotherhood/mining)
-"tmc" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/handrail/g_central{
- pixel_y = -16
- },
-/turf/open/water{
- slowdown = 0
- },
-/area/f13/den)
"tmh" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt,
@@ -64456,7 +64444,7 @@ gIt
gIt
gIt
vkj
-tmc
+gkm
vrQ
vrQ
vrQ
diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
index 14592cd8be..0bf772cecb 100644
--- a/code/__DEFINES/loadout.dm
+++ b/code/__DEFINES/loadout.dm
@@ -39,6 +39,7 @@
#define LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS "Sweaters"
#define LOADOUT_SUBCATEGORY_UNIFORM_PANTS "Pants"
#define LOADOUT_SUBCATEGORY_UNIFORM_SHORTS "Shorts"
+#define LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND "Wasteland"
//suit
#define LOADOUT_CATEGORY_SUIT "Suit"
diff --git a/code/_globalvars/lists/loadout_categories.dm b/code/_globalvars/lists/loadout_categories.dm
index 0f0ac52214..fa7990e2ba 100644
--- a/code/_globalvars/lists/loadout_categories.dm
+++ b/code/_globalvars/lists/loadout_categories.dm
@@ -3,7 +3,7 @@ GLOBAL_LIST_INIT(loadout_categories, list(
LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL, LOADOUT_SUBCATEGORY_NECK_TIE, LOADOUT_SUBCATEGORY_NECK_SCARVES),
LOADOUT_CATEGORY_MASK = LOADOUT_SUBCATEGORIES_NONE,
LOADOUT_CATEGORY_HANDS = LOADOUT_SUBCATEGORIES_NONE,
- LOADOUT_CATEGORY_UNIFORM = list(LOADOUT_SUBCATEGORY_UNIFORM_GENERAL, LOADOUT_SUBCATEGORY_UNIFORM_JOBS, LOADOUT_SUBCATEGORY_UNIFORM_SUITS, LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS, LOADOUT_SUBCATEGORY_UNIFORM_DRESSES, LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS, LOADOUT_SUBCATEGORY_UNIFORM_PANTS, LOADOUT_SUBCATEGORY_UNIFORM_SHORTS),
+ LOADOUT_CATEGORY_UNIFORM = list(LOADOUT_SUBCATEGORY_UNIFORM_GENERAL, LOADOUT_SUBCATEGORY_UNIFORM_JOBS, LOADOUT_SUBCATEGORY_UNIFORM_SUITS, LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS, LOADOUT_SUBCATEGORY_UNIFORM_DRESSES, LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS, LOADOUT_SUBCATEGORY_UNIFORM_PANTS, LOADOUT_SUBCATEGORY_UNIFORM_SHORTS, LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND),
LOADOUT_CATEGORY_SUIT = list(LOADOUT_SUBCATEGORY_SUIT_GENERAL, LOADOUT_SUBCATEGORY_SUIT_COATS, LOADOUT_SUBCATEGORY_SUIT_JACKETS, LOADOUT_SUBCATEGORY_SUIT_JOBS),
LOADOUT_CATEGORY_HEAD = list(LOADOUT_SUBCATEGORY_HEAD_GENERAL, LOADOUT_SUBCATEGORY_HEAD_JOBS),
LOADOUT_CATEGORY_SHOES = LOADOUT_SUBCATEGORIES_NONE,
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index d8b4da530d..64835281d6 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -563,6 +563,7 @@ GLOBAL_LIST_INIT(loot_t4_range, list(
/obj/item/ammo_box/magazine/m556/rifle/assault,
/obj/item/gun/ballistic/automatic/marksman,
/obj/item/ammo_box/magazine/m556/rifle,
+ /obj/item/gun/ballistic/automatic/combat,
/obj/item/gun/ballistic/automatic/pistol/deagle,
/obj/item/ammo_box/magazine/m44,
/obj/item/gun/energy/laser/rcw,
@@ -891,6 +892,7 @@ GLOBAL_LIST_INIT(loot_attachment, list(
GLOBAL_LIST_INIT(loot_t1_blueprint, list(
/obj/item/book/granter/crafting_recipe/blueprint/marksman,
+ /obj/item/book/granter/crafting_recipe/blueprint/combatrifle,
/obj/item/book/granter/crafting_recipe/blueprint/plasmapistol,
/obj/item/book/granter/crafting_recipe/blueprint/brushgun,
/obj/item/book/granter/crafting_recipe/blueprint/aer9,
diff --git a/code/datums/armor.dm b/code/datums/armor.dm
index 7c83fd14ee..8ff350f609 100644
--- a/code/datums/armor.dm
+++ b/code/datums/armor.dm
@@ -2,7 +2,7 @@
#define ARMORID "armor-[melee]-[bullet]-[laser]-[energy]-[bomb]-[bio]-[rad]-[fire]-[acid]-[magic]-[wound]"
-/proc/getArmor(tier = 0, linemelee = 0, linebullet = 0, linelaser = 0, melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0, wound = 0)
+/proc/getArmor(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0, wound = 0)
. = locate(ARMORID)
if (!.)
. = new /datum/armor(melee, bullet, laser, energy, bomb, bio, rad, fire, acid, magic, wound)
diff --git a/code/datums/components/crafting/recipes/recipes_primal.dm b/code/datums/components/crafting/recipes/recipes_primal.dm
index 73ae505228..0fdf493419 100644
--- a/code/datums/components/crafting/recipes/recipes_primal.dm
+++ b/code/datums/components/crafting/recipes/recipes_primal.dm
@@ -234,6 +234,19 @@
/obj/item/advanced_crafting_components/alloys = 1,
/obj/item/stack/sheet/glass = 4)
category = CAT_TRIBAL
+
+/datum/crafting_recipe/tribalwar/yumi
+ name = "Yumi"
+ result = /obj/item/gun/ballistic/bow/yumi
+ time = 360
+ reqs = list(/obj/item/stack/sheet/mineral/wood = 10,
+ /obj/item/weaponcrafting/string = 6,
+ /obj/item/stack/sheet/mineral/bamboo = 30,
+ /obj/item/stack/sheet/sinew = 2,
+ /obj/item/stack/sheet/glass = 4,
+ /obj/item/stack/crafting/metalparts = 5)
+ category = CAT_TRIBAL
+ always_available = FALSE
//ARROWS
@@ -242,8 +255,7 @@
result = /obj/item/ammo_casing/caseless/arrow/burning
time = 30
reqs = list(/obj/item/ammo_casing/caseless/arrow = 1,
- /obj/item/reagent_containers/food/drinks/bottle = 1,
- /obj/item/reagent_containers/food/snacks/meat/slab/human/ghoul = 4)
+ /datum/reagent/fuel = 10)
category = CAT_TRIBAL
tools = list(TOOL_WORKBENCH)
@@ -273,7 +285,7 @@
time = 30
reqs = list(
/obj/item/ammo_casing/caseless/arrow = 1,
- /obj/item/reagent_containers/food/snacks/grown/nettle = 5,
+ /obj/item/reagent_containers/food/snacks/grown/feracactus = 1,
)
category = CAT_TRIBAL
tools = list(TOOL_WORKBENCH)
@@ -320,6 +332,19 @@
)
category = CAT_TRIBAL
tools = list(TOOL_WORKBENCH)
+
+/datum/crafting_recipe/tribalwar/arrowexplode
+ name = "Explosive Arrow"
+ result = /obj/item/ammo_casing/caseless/arrow/explosive
+ time = 15
+ reqs = list(
+ /obj/item/stack/rods = 1,
+ /obj/item/stack/crafting/goodparts = 2,
+ /obj/item/pressure_plate = 1,
+ /datum/reagent/blackpowder = 10
+ )
+ category = CAT_TRIBAL
+ tools = list(TOOL_WORKBENCH)
//MELEE
diff --git a/code/datums/components/crafting/recipes/recipes_tailoring.dm b/code/datums/components/crafting/recipes/recipes_tailoring.dm
index d02387c9e0..b21a37204e 100644
--- a/code/datums/components/crafting/recipes/recipes_tailoring.dm
+++ b/code/datums/components/crafting/recipes/recipes_tailoring.dm
@@ -121,6 +121,22 @@
category = CAT_CLOTHING
subcategory = CAT_ARMOR
+/datum/crafting_recipe/raiderpa
+ name = "Raider Power Armor"
+ result = /obj/item/clothing/suit/armor/f13/power_armor/raiderpa
+ reqs = list(/obj/item/clothing/suit/armor/f13/metalarmor = 1,
+ /obj/item/stack/crafting/armor_plate = 3,
+ /obj/item/crafting = 15,
+ /obj/item/ingot/gold = 1,
+ /obj/item/stock_parts/cell/ammo/mfc = 5,
+ /obj/item/stack/sheet/prewar = 20
+ )
+ tools = list(TOOL_WORKBENCH)
+ time = 600
+ category = CAT_CLOTHING
+ subcategory = CAT_ARMOR
+ always_available = FALSE
+
datum/crafting_recipe/steelbib
name = "Steel Breastplate"
result = /obj/item/clothing/suit/armor/f13/metalarmor/steelbib
@@ -534,6 +550,17 @@ datum/crafting_recipe/steelbib/heavy
category = CAT_CLOTHING
subcategory = CAT_ARMOR
+/datum/crafting_recipe/wastehound
+ name = "wastehound raider helmet"
+ result = /obj/item/clothing/head/helmet/f13/raider/wastehound
+ time = 120
+ reqs = list(/obj/item/stack/sheet/animalhide/human = 5,
+ /obj/item/stack/sheet/mineral/titanium = 5,
+ /obj/item/stack/sheet/cloth = 5)
+ category = CAT_CLOTHING
+ subcategory = CAT_ARMOR
+ always_available = FALSE
+
/datum/crafting_recipe/durathread_helmet
name = "Makeshift Durathread Helmet"
result = /obj/item/clothing/head/helmet/durathread
@@ -1069,22 +1096,6 @@ datum/crafting_recipe/steelbib/heavy
subcategory = CAT_MISCCLOTHING
/*
-/datum/crafting_recipe/durathread_vest
- name = "Makeshift Vest"
- result = /obj/item/clothing/suit/armor/vest/durathread
- reqs = list( /obj/item/stack/sheet/durathread = 5,
- /obj/item/stack/sheet/leather = 4)
- time = 50
- category = CAT_CLOTHING
- subcategory = CAT_GENCLOTHES
-/datum/crafting_recipe/durathread_helmet
- name = "Makeshift Helmet"
- result = /obj/item/clothing/head/helmet/durathread
- reqs = list( /obj/item/stack/sheet/durathread = 4,
- /obj/item/stack/sheet/leather = 5)
- time = 40
- category = CAT_CLOTHING
- subcategory = CAT_GENCLOTHES
/datum/crafting_recipe/fannypack
name = "Fannypack"
result = /obj/item/storage/belt/fannypack
diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
index becf97830b..0e4291edc7 100644
--- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
+++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
@@ -1017,6 +1017,20 @@
subcategory = CAT_WEAPON
always_available = FALSE
+//F4 combat rifle
+/datum/crafting_recipe/combatrifle
+ name = "Combat Rifle"
+ result = /obj/item/gun/ballistic/automatic/combat
+ reqs = list(/obj/item/stack/sheet/metal = 10,
+ /obj/item/advanced_crafting_components/assembly = 1,
+ /obj/item/stack/crafting/goodparts = 3
+ )
+ tools = list(TOOL_WORKBENCH)
+ time = 120
+ category = CAT_WEAPONRY
+ subcategory = CAT_WEAPON
+ always_available = FALSE
+
//r84 lmg
/datum/crafting_recipe/lmg
name = "R84 LMG"
diff --git a/code/game/objects/effects/spawners/f13lootdrop.dm b/code/game/objects/effects/spawners/f13lootdrop.dm
index 61781f3d20..86fe3307b0 100644
--- a/code/game/objects/effects/spawners/f13lootdrop.dm
+++ b/code/game/objects/effects/spawners/f13lootdrop.dm
@@ -805,7 +805,6 @@ obj/effect/spawner/lootdrop/f13/medical/rnd/good
/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/superlow
name = "very low tier non-hobo ballistic gun"
loot = list(/obj/effect/spawner/bundle/f13/ninemil,
- /obj/effect/spawner/bundle/f13/sig,
/obj/effect/spawner/bundle/f13/caravan_shotgun,
/obj/effect/spawner/bundle/f13/mosin,
/obj/effect/spawner/bundle/f13/remington,
@@ -1263,6 +1262,13 @@ obj/effect/spawner/lootdrop/f13/medical/rnd/good
/obj/item/ammo_box/magazine/m556/rifle/
)
+/obj/effect/spawner/bundle/f13/combat_rifle
+ name = "combat rifle and ammo spawner"
+ items = list(
+ /obj/item/gun/ballistic/automatic/combat,
+ /obj/item/ammo_box/magazine/greasegun/
+ )
+
/obj/effect/spawner/bundle/f13/rcw
name = "laser RCW and ammo spawner"
items = list(
@@ -2089,6 +2095,7 @@ obj/effect/spawner/lootdrop/f13/medical/rnd/good
/obj/item/book/granter/crafting_recipe/blueprint/r84,
/obj/item/book/granter/crafting_recipe/blueprint/deagle,
/obj/item/book/granter/crafting_recipe/blueprint/marksman,
+ /obj/item/book/granter/crafting_recipe/blueprint/combatrifle,
/obj/item/book/granter/crafting_recipe/blueprint/plasmapistol,
/obj/item/book/granter/crafting_recipe/blueprint/brushgun,
)
@@ -2162,7 +2169,6 @@ obj/effect/spawner/lootdrop/f13/medical/rnd/good
lootcount = 1
lootdoubles = FALSE
loot = list(
- /obj/effect/spawner/bundle/f13/sig,
/obj/effect/spawner/bundle/f13/beretta,
/obj/effect/spawner/bundle/f13/ninemil
)
diff --git a/code/game/objects/effects/spawners/themed_loot_tables.dm b/code/game/objects/effects/spawners/themed_loot_tables.dm
index 7e2c6a5659..93e5e22e34 100644
--- a/code/game/objects/effects/spawners/themed_loot_tables.dm
+++ b/code/game/objects/effects/spawners/themed_loot_tables.dm
@@ -243,6 +243,7 @@
/obj/item/gun/ballistic/automatic/pistol/ninemil = 15,
/obj/effect/spawner/bundle/f13/assault_rifle = 10,
/obj/item/gun/ballistic/automatic/marksman/sniper = 8,
+ /obj/effect/spawner/bundle/f13/combat_rifle = 6,
/obj/effect/spawner/bundle/f13/marksman = 6,
/obj/item/gun/ballistic/shotgun/trench = 6,
/obj/effect/spawner/bundle/f13/rangemaster = 5,
diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm
index 0a0bd85bd2..b931c06b7a 100644
--- a/code/game/objects/items/granters.dm
+++ b/code/game/objects/items/granters.dm
@@ -662,6 +662,11 @@
icon_state = "blueprint2"
crafting_recipe_types = list(/datum/crafting_recipe/marksmancarbine)
+/obj/item/book/granter/crafting_recipe/blueprint/combatrifle
+ name = "combat rifle blueprint"
+ icon_state = "blueprint2"
+ crafting_recipe_types = list(/datum/crafting_recipe/combatrifle)
+
/obj/item/book/granter/crafting_recipe/blueprint/r84
name = "r84 lmg blueprint"
icon_state = "blueprint2"
@@ -838,6 +843,11 @@
name = "gauss rifle blueprint"
icon_state = "blueprint2"
crafting_recipe_types = list(/datum/crafting_recipe/gaussrifle)
+
+/obj/item/book/granter/crafting_recipe/blueprint/yumi
+ name = "yumi blueprint"
+ icon_state = "blueprint2"
+ crafting_recipe_types = list(/datum/crafting_recipe/tribalwar/yumi)
/obj/item/book/granter/crafting_recipe/manual/denvr
name = "den vr configuration"
diff --git a/code/game/objects/items/melee/f13onehanded.dm b/code/game/objects/items/melee/f13onehanded.dm
index e0f8f55e63..74d3bdfd29 100644
--- a/code/game/objects/items/melee/f13onehanded.dm
+++ b/code/game/objects/items/melee/f13onehanded.dm
@@ -65,6 +65,14 @@
force = 36
block_chance = 10
+/obj/item/melee/onehanded/machete/ncrflag
+ name = "NCR Flagpole"
+ desc = "The proud standard of the New California Republic. Used as a tool by patriots, used as a weapon by legends."
+ icon_state = "flag-ncr"
+ item_state = "flag-ncr"
+ force = 36
+ block_chance = 10
+
/obj/item/melee/onehanded/machete/spatha
name = "spatha"
desc = "This long blade is favoured by Legion officers and leaders, a finely crafted weapon with good steel and hilt made from bronze and bone."
diff --git a/code/game/objects/items/storage/survivalkit.dm b/code/game/objects/items/storage/survivalkit.dm
index a1544c6865..62c989f842 100644
--- a/code/game/objects/items/storage/survivalkit.dm
+++ b/code/game/objects/items/storage/survivalkit.dm
@@ -75,8 +75,52 @@
new /obj/item/stack/medical/suture/medicated(src)
new /obj/item/stack/medical/mesh(src)
+/obj/item/storage/survivalkit/legionifak
+ name = "Legion Trauma Kit"
+ desc = "A plastic case containing a basic trauma kit for a wide variety of wounds."
+ icon_state = "ifak"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+
+/obj/item/storage/survivalkit/legionifak/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 5
+
+/obj/item/storage/survivalkit/legionifak/PopulateContents()
+ new /obj/item/reagent_containers/pill/patch/bitterdrink(src)
+ new /obj/item/stack/medical/gauze(src)
+ new /obj/item/stack/medical/suture(src)
+ new /obj/item/stack/medical/ointment(src)
+ new /obj/item/paper/legionifak(src)
+ new /obj/item/reagent_containers/food/drinks/bottle/xandertea(src)
+
+/obj/item/storage/survivalkit/ncrifak
+ name = "NCR Trauma Kit"
+ desc = "A plastic case containing a basic trauma kit for a wide variety of wounds."
+ icon_state = "ifak"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+
+/obj/item/storage/survivalkit/ncrifak/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 5
+
+/obj/item/storage/survivalkit/ncrifak/PopulateContents()
+ new /obj/item/reagent_containers/hypospray/medipen(src)
+ new /obj/item/stack/medical/gauze(src)
+ new /obj/item/stack/medical/suture(src)
+ new /obj/item/stack/medical/ointment(src)
+ new /obj/item/paper/ncrifak(src)
+
/obj/item/storage/survivalkit_empty
name = "survival kit"
desc = "A robust leather pouch containing the essentials for wasteland survival."
icon_state = "survivalkit"
w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/storage/survivalkit_empty/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 4
diff --git a/code/modules/WVM/wvm.dm b/code/modules/WVM/wvm.dm
index 42ad587305..d4c5839c36 100644
--- a/code/modules/WVM/wvm.dm
+++ b/code/modules/WVM/wvm.dm
@@ -827,7 +827,13 @@ GLOBAL_VAR_INIT(vendor_cash, 0)
new /datum/data/wasteland_equipment("Metal Sheets x 20", /obj/item/stack/sheet/metal/twenty, 50),
new /datum/data/wasteland_equipment("Metal Sheets x 50", /obj/item/stack/sheet/metal/fifty, 115),
new /datum/data/wasteland_equipment("Glass Sheets x 10", /obj/item/stack/sheet/glass/ten, 30),
- new /datum/data/wasteland_equipment("Glass Sheets x 50", /obj/item/stack/sheet/glass/fifty, 90)
+ new /datum/data/wasteland_equipment("Glass Sheets x 50", /obj/item/stack/sheet/glass/fifty, 90),
+ new /datum/data/wasteland_equipment("Wood Planks x 50", /obj/item/stack/sheet/mineral/wood/fifty, 50),
+ new /datum/data/wasteland_equipment("Wood Planks x 20", /obj/item/stack/sheet/mineral/wood/twenty, 20),
+ new /datum/data/wasteland_equipment("Art Canvas 19x19", /obj/item/canvas/nineteenXnineteen, 20),
+ new /datum/data/wasteland_equipment("Art Canvas 23x19", /obj/item/canvas/twentythreeXnineteen, 20),
+ new /datum/data/wasteland_equipment("Art Canvas 23x23", /obj/item/canvas/twentythreeXtwentythree, 20),
+ new /datum/data/wasteland_equipment("Spray Can", /obj/item/toy/crayon/spraycan, 75)
)
highpop_list = list(
new /datum/data/wasteland_equipment("High Quality Parts", /obj/item/stack/crafting/goodparts, 25),
diff --git a/code/modules/clothing/head/f13factionhead.dm b/code/modules/clothing/head/f13factionhead.dm
index cb28b0f506..ffef108ef2 100644
--- a/code/modules/clothing/head/f13factionhead.dm
+++ b/code/modules/clothing/head/f13factionhead.dm
@@ -72,6 +72,7 @@
/obj/item/clothing/head/helmet/f13/raider/wastehound
name = "wastehound raider helmet"
desc = "A sack hood made out of a suspicious leather with tufts of hair sticking out. This mask would make Leatherface proud."
+ mob_overlay_icon = 'icons/fallout/onmob/clothes/head.dmi'
icon_state = "wastehound_hood_icon"
item_state = "raider_wastehound_hood"
visor_flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
@@ -293,6 +294,13 @@
item_state = "legion-vex"
armor = list("melee" = 35, "bullet" = 35, "laser" = 15, "energy" = 10, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 25, "acid" = 0, "wound" = 40)
+/obj/item/clothing/head/helmet/f13/legion/vet/orator
+ name = "legion orator helmet"
+ desc = "It's a metal legion orator helmet, with a vertical plume."
+ icon_state = "legion-orator"
+ item_state = "legion-orator"
+ armor = list("melee" = 37, "bullet" = 37, "laser" = 20, "energy" = 15, "bomb" = 30, "bio" = 5, "rad" = 5, "fire" = 35, "acid" = 0, "wound" = 40)
+
/obj/item/clothing/head/helmet/f13/legion/vet/vexil
name = "legion fox vexillarius helmet"
desc = "This helmet is decorated with the pelt of a desert fox."
diff --git a/code/modules/clothing/neck/mantle.dm b/code/modules/clothing/neck/mantle.dm
index ffd7843baf..5027121833 100644
--- a/code/modules/clothing/neck/mantle.dm
+++ b/code/modules/clothing/neck/mantle.dm
@@ -48,10 +48,16 @@
desc = "Issued to the Elders of the Brotherhood. Style over substance is important. This one is designed to be worn over the shoulder."
icon_state = "bosshouldercape_r"
-/obj/item/clothing/neck/mantle/bos/paladin
- name = "Paladin cape"
- desc = "This stylish deep crimson cape is made to be worn below a power armor pauldron, a shoulder holster is added for utility."
- icon_state = "paladin"
+/obj/item/clothing/neck/mantle/bos/shortpaladin
+ name = "short paladin cape"
+ desc = "This stylish deep crimson cape is made to be worn below a power armor pauldron, a shoulder holster is added for utility. Shorter version."
+ icon_state = "palcapes"
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/bos/paladin
+
+/obj/item/clothing/neck/mantle/bos/longpaladin
+ name = "long paladin cape"
+ desc = "This stylish deep crimson cape is made to be worn below a power armor pauldron, a shoulder holster is added for utility. Longer version."
+ icon_state = "palcapel"
pocket_storage_component_path = /datum/component/storage/concrete/pockets/bos/paladin
/obj/item/clothing/neck/mantle/ranger
@@ -60,6 +66,12 @@
icon_state = "rangercape"
pocket_storage_component_path = /datum/component/storage/concrete/pockets/bos/paladin
+/obj/item/clothing/neck/mantle/rangerponcho
+ name = "NCR ranger poncho"
+ desc = "An old poncho used by rangers to protect from the natural elements. Most likely has a holster hidden underneath."
+ icon_state = "rangerponcho"
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/bos/paladin
+
/obj/item/clothing/neck/mantle/chief
name = "chieftains mantle"
desc = "A symbol of the authority of the Wayfarer Chief."
@@ -113,3 +125,15 @@
desc = "Plain and rugged piece of clothing, put it over your suit and make sure your gear don't get soaked through when it rains."
icon_state = "poncho"
body_parts_covered = CHEST|GROIN|ARMS
+
+/obj/item/clothing/neck/mantle/legionmantle
+ name = "Legion mantle"
+ desc = "A mantle made in the legion colors,with a golden wreath brooch. Most likely has a holster hidden underneath."
+ icon_state = "legionmantle"
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/bos/paladin
+
+/obj/item/clothing/neck/mantle/legiontoga
+ name = "Legion toga"
+ desc = "A toga made in the legion colors, with a golden wreath brooch. Most likely has a holster hidden underneath."
+ icon_state = "legiontoga"
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/bos/paladin
diff --git a/code/modules/clothing/suits/f13armor.dm b/code/modules/clothing/suits/f13armor.dm
index 6c1378ff41..6a4429c180 100644
--- a/code/modules/clothing/suits/f13armor.dm
+++ b/code/modules/clothing/suits/f13armor.dm
@@ -320,7 +320,7 @@
item_state = "t45bpowerarmor"
armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 20, "bomb" = 50, "bio" = 60, "rad" = 50, "fire" = 80, "acid" = 0, "wound" = 65)
requires_training = FALSE
- slowdown = 0.5
+ slowdown = 0.35
powered = FALSE
/obj/item/clothing/suit/armor/f13/power_armor/t45b/restored
@@ -339,12 +339,12 @@
/obj/item/clothing/suit/armor/f13/power_armor/raiderpa
powered = FALSE
- name = "raider T-45b power armor"
- desc = "An attempt by raider engineers to duplicate power armor. They failed miserably, but it is still pretty tough"
+ name = "raider power armor"
+ desc = "An attempt by raider engineers to duplicate power armor. They failed miserably, but it is still pretty tough."
icon_state = "raiderpa"
item_state = "raiderpa"
- armor = list("melee" = 65, "bullet" = 55, "laser" = 55, "energy" = 20, "bomb" = 50, "bio" = 60, "rad" = 50, "fire" = 80, "acid" = 0, "wound" = 65)
- slowdown = 0.25
+ armor = list("melee" = 65, "bullet" = 50, "laser" = 60, "energy" = 25, "bomb" = 50, "bio" = 50, "rad" = 70, "fire" = 80, "acid" = 0, "wound" = 65)
+ slowdown = 0.35
requires_training = FALSE
/obj/item/clothing/suit/armor/f13/power_armor/hotrod
@@ -391,7 +391,7 @@
desc = "The pinnacle of pre-war technology. This suit of power armor provides substantial protection to the wearer."
icon_state = "t51bpowerarmor"
item_state = "t51bpowerarmor"
- slowdown = 0.15 //+0.05 from helmet = total 0.175
+ slowdown = 0.2 //+0.05 from helmet = total 0.25
armor = list("melee" = 72.5, "bullet" = 72.5, "laser" = 72.5, "energy" = 30, "bomb" = 62, "bio" = 100, "rad" = 99, "fire" = 90, "acid" = 0, "wound" = 72)
/obj/item/clothing/suit/armor/f13/power_armor/t51green
@@ -399,7 +399,7 @@
desc = "The pinnacle of pre-war technology. This suit of power armor provides substantial protection to the wearer. It's plates have been chemially treated to be stronger."
icon_state = "t51green"
item_state = "t51green"
- slowdown = 0.15 //+0.05 from helmet = total 0.2
+ slowdown = 0.2 //+0.05 from helmet = total 0.25
armor = list("melee" = 75, "bullet" = 75, "laser" = 75, "energy" = 27, "bomb" = 64, "bio" = 100, "rad" = 99, "fire" = 90, "acid" = 0, "wound" = 75)
/obj/item/clothing/suit/armor/f13/power_armor/t51b/bos
diff --git a/code/modules/clothing/suits/f13factionarmor.dm b/code/modules/clothing/suits/f13factionarmor.dm
index 3281a66a80..8dbf9aceba 100644
--- a/code/modules/clothing/suits/f13factionarmor.dm
+++ b/code/modules/clothing/suits/f13factionarmor.dm
@@ -406,14 +406,14 @@
icon_state = "ncr_reinforced_vest"
item_state = "ncr_reinforced_vest"
armor = list("melee" = 32, "bullet" = 42, "laser" = 22, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40)
- slowdown = 0.12
+ slowdown = 0.1
/obj/item/clothing/suit/armor/f13/ncrarmor/mantle/reinforced
name = "NCR reinforced mantle vest"
desc = "A standard issue NCR Infantry vest reinforced with a groinpad and a mantle."
icon_state = "ncr_reinforced_mantle"
armor = list("melee" = 32, "bullet" = 42, "laser" = 22, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40)
- slowdown = 0.12
+ slowdown = 0.1
/obj/item/clothing/suit/armor/f13/ncrarmor/labcoat
name = "NCR medical labcoat"
diff --git a/code/modules/clothing/suits/f13suits.dm b/code/modules/clothing/suits/f13suits.dm
index 1b051dd267..b11b91da40 100644
--- a/code/modules/clothing/suits/f13suits.dm
+++ b/code/modules/clothing/suits/f13suits.dm
@@ -275,7 +275,7 @@
icon_state = "khan_jacket"
item_state = "khan_jacket"
body_parts_covered = CHEST|GROIN|ARMS|LEGS|HANDS|FEET
- armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 30, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 0)
+ armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 30, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 0, "wound" = 40)
slowdown = 0.05
pocket_storage_component_path = /datum/component/storage/concrete/pockets
@@ -290,7 +290,7 @@
icon_state = "khan_jacket_armored"
item_state = "khan_jacket_armored"
body_parts_covered = CHEST|GROIN|ARMS|LEGS|HANDS|FEET
- armor = list("melee" = 37, "bullet" = 37, "laser" = 40, "energy" = 25, "bomb" = 30, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 0)
+ armor = list("melee" = 37, "bullet" = 37, "laser" = 40, "energy" = 25, "bomb" = 30, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 0, "wound" = 45)
slowdown = 0.08
pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
@@ -305,7 +305,7 @@
icon_state = "khan_heavy"
item_state = "khan_heavy"
body_parts_covered = CHEST|GROIN|ARMS|LEGS|HANDS|FEET
- armor = list("melee" = 40, "bullet" = 40, "laser" = 47, "energy" = 25, "bomb" = 35, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 0)
+ armor = list("melee" = 45, "bullet" = 45, "laser" = 50, "energy" = 25, "bomb" = 35, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 0, "wound" = 50)
pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
slowdown = 0.2
@@ -320,7 +320,7 @@
desc = "A worn-down white labcoat with some wiring hanging from the right side.
Upon closer inspection, you can see an ancient bloodstains that could tell an entire story about thrilling adventures of a previous owner."
icon_state = "followers"
item_state = "labcoat"
- armor = list("melee" = 25, "bullet" = 15, "laser" = 20, "energy" = 25, "bomb" = 20, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
+ armor = list("melee" = 25, "bullet" = 15, "laser" = 20, "energy" = 25, "bomb" = 20, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0, "wound" = 33)
pocket_storage_component_path = /datum/component/storage/concrete/pockets/medical
/obj/item/clothing/suit/armor/f13/generaluniform
diff --git a/code/modules/clothing/under/f13.dm b/code/modules/clothing/under/f13.dm
index 352acf100a..5d9fb0d19a 100644
--- a/code/modules/clothing/under/f13.dm
+++ b/code/modules/clothing/under/f13.dm
@@ -360,6 +360,15 @@
fitted = FEMALE_UNIFORM_TOP
can_adjust = TRUE
+/obj/item/clothing/under/f13/legorat
+ name = "legionary tunic"
+ desc = "A black cotton tunic with some leather pants, of good quality."
+ icon_state = "legoratb"
+ item_state = "legoratb"
+ fitted = FEMALE_UNIFORM_TOP
+ var/sleeves_adjusted = 0
+ can_adjust = TRUE
+
/obj/item/clothing/under/f13/legskirt/tac
name = "\improper ''tactical'' combat skirt"
desc = "A leathery skirt below a thick, black, long-sleeve cotton shirt. Perfect for operatives favoring wardrobe malfunctions."
@@ -1681,9 +1690,9 @@
icon_state = "mutie_ranger_under"
item_state = "mutie_ranger_under"
-/obj/item/clothing/under/f13/desert_ranger_scout
- name = "desert ranger scouting uniform"
- desc = "A set of clothing worn by desert ranger scouts."
+/obj/item/clothing/under/f13/arizona_ranger_scout
+ name = "Arizona ranger scouting uniform"
+ desc = "A set of clothing worn by Arizona ranger scouts."
icon_state = "scoutclothes"
can_adjust = FALSE
item_state = "scoutclothes"
diff --git a/code/modules/fallout/obj/food_and_drinks/food.dm b/code/modules/fallout/obj/food_and_drinks/food.dm
index d616455a92..1239e3c5a6 100644
--- a/code/modules/fallout/obj/food_and_drinks/food.dm
+++ b/code/modules/fallout/obj/food_and_drinks/food.dm
@@ -578,7 +578,7 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 24)
filling_color = "B#22222"
foodtype = MEAT
-
+
/obj/item/reagent_containers/food/snacks/f13/mirelurkcake
name = "mirelurk cake"
desc = "A savory cake made from the meat of a Mirelurk. A popular dish from the coastlines."
@@ -859,3 +859,29 @@
tastes = list("beef luncheon loaf" = 3, "jalapeno peppers and spices" = 2)
trash = /obj/item/trash/f13/k_ration
foodtype = MEAT
+
+/obj/item/reagent_containers/food/snacks/kebab/f13
+ name = "generic kebab"
+ desc = "you goofed"
+ icon = 'icons/fallout/objects/food&drinks/food.dmi' //we need to start migrating more foods to this path
+
+/obj/item/reagent_containers/food/snacks/kebab/f13/gecko
+ name = "gecko kebab"
+ desc = "delicious bits of gecko on a metal skewer"
+ icon_state = "squirrelbits" //the gecko kebab sprite is ass, please change ASAP
+ list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/water = 5) //healthy, will slightly reduce bloodloss
+ tastes = list("meat" = 4, "scales" = 1)
+
+/obj/item/reagent_containers/food/snacks/kebab/f13/ghost
+ name = "kebab el fuego"
+ desc = "mutant ghost peppers on a skewer, feel the heat of a nuclear blast on your tastebuds."
+ icon_state = "squirrelbits" //placeholder, make new sprite
+ list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/condensedcapsaicin = 8)
+
+/obj/item/reagent_containers/food/snacks/kebab/f13/squirrelstick //heals on eat, has slight radiation
+ name = "squirrel on a stick"
+ desc = "It's a whole squirrel roasted on a stick. Tastes of home on the wastes."
+ icon_state = "squrrielstick"
+ list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/medicine/bicaridine = 2, /datum/reagent/radium = 1)
+ foodtype = MEAT
+
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index ec6a5e12f0..5051e5f65c 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -694,6 +694,11 @@
list_reagents = list(/datum/reagent/consumable/ethanol/nukashine = 100)
foodtype = NUKA
+/obj/item/reagent_containers/food/drinks/bottle/xandertea
+ name = "flask of xander tea"
+ desc = "A flask of xander tea, often drank by Legionaries and Tribals to deal with blood loss."
+ icon_state = "flask"
+ list_reagents = list(/datum/reagent/consumable/tea/xandertea = 50)
// Empty bottles
/obj/item/reagent_containers/food/drinks/bottle/brown/white
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm
index 7fce15ac6a..d13a3aa044 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm
@@ -76,7 +76,7 @@
/obj/item/reagent_containers/food/snacks/meat/steak/squirrel = 2,
/obj/item/stack/rods = 1
)
- result = /obj/item/reagent_containers/food/snacks/f13/squirrelstick
+ result = /obj/item/reagent_containers/food/snacks/kebab/f13/squirrelstick
subcategory = CAT_WASTEFOOD
/datum/crafting_recipe/food/squirrelstew
diff --git a/code/modules/jobs/job_types/bos.dm b/code/modules/jobs/job_types/bos.dm
index 7d99f44053..029356c2de 100644
--- a/code/modules/jobs/job_types/bos.dm
+++ b/code/modules/jobs/job_types/bos.dm
@@ -44,6 +44,8 @@ Main doors: ACCESS_CAPTAIN 20
H.mind.teach_crafting_recipe(/datum/crafting_recipe/boscombathelmetmk2)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/set_vrboard/bos)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/gate_bos)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/*
Elder
*/
@@ -431,7 +433,6 @@ Star Paladin
/obj/item/melee/onehanded/knife/hunting = 1,
/obj/item/reagent_containers/hypospray/medipen/stimpak = 2,
/obj/item/melee/unarmed/powerfist = 1,
- /obj/item/tank/internals/oxygen = 1,
)
/datum/outfit/loadout/spaladina
@@ -446,7 +447,6 @@ Star Paladin
name = "Frontline Senior Paladin"
backpack_contents = list(
/obj/item/gun/energy/laser/aer12 = 1,
- /obj/item/attachments/scope = 1,
/obj/item/stock_parts/cell/ammo/mfc = 2,
/obj/item/gun/ballistic/automatic/pistol/mk23 = 1,
/obj/item/ammo_box/magazine/m45exp = 2,
diff --git a/code/modules/jobs/job_types/followers.dm b/code/modules/jobs/job_types/followers.dm
index ad32042807..d1f88f4385 100644
--- a/code/modules/jobs/job_types/followers.dm
+++ b/code/modules/jobs/job_types/followers.dm
@@ -65,6 +65,9 @@ Administrator
ADD_TRAIT(H, TRAIT_CHEMWHIZ, src)
ADD_TRAIT(H, TRAIT_MEDICALEXPERT, src)
ADD_TRAIT(H, TRAIT_SURGERY_HIGH, src)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/datum/outfit/job/followers/f13leadpractitioner
name = "Followers Administrator"
@@ -119,6 +122,9 @@ Professor
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
ADD_TRAIT(H, TRAIT_GENERIC, src)
ADD_TRAIT(H, TRAIT_CHEMWHIZ, src)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/datum/outfit/job/followers/f13Professor
name = "Followers Scientist"
diff --git a/code/modules/jobs/job_types/legion.dm b/code/modules/jobs/job_types/legion.dm
index 2c2212a801..b97d6a87e6 100644
--- a/code/modules/jobs/job_types/legion.dm
+++ b/code/modules/jobs/job_types/legion.dm
@@ -198,6 +198,7 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
l_pocket = /obj/item/flashlight/lantern
box = /obj/item/storage/survivalkit/tribal/adv
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/restraints/legcuffs/bola = 1,
/obj/item/storage/bag/money/small/legion = 1,
/obj/item/warpaint_bowl = 1,
@@ -295,6 +296,7 @@ commented out pending rework*/
r_pocket = /obj/item/flashlight/lantern
box = /obj/item/storage/survivalkit/tribal/adv
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/ammo_box/a357 = 1,
/obj/item/gun/ballistic/revolver/colt357 = 1,
/obj/item/restraints/handcuffs = 1,
@@ -375,6 +377,7 @@ commented out pending rework*/
l_pocket = /obj/item/restraints/handcuffs
box = /obj/item/storage/survivalkit/tribal/adv
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/melee/onehanded/machete/gladius = 1,
/obj/item/storage/bag/money/small/legofficers = 1,
/obj/item/grenade/smokebomb = 1,
@@ -458,6 +461,7 @@ commented out pending rework*/
r_pocket = /obj/item/flashlight/lantern
l_pocket = /obj/item/storage/survivalkit/tribal
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/reagent_containers/pill/patch/healingpowder = 1,
/obj/item/restraints/handcuffs = 1,
/obj/item/storage/bag/money/small/legofficers = 1,
@@ -503,24 +507,30 @@ commented out pending rework*/
spawn_positions = 1
outfit = /datum/outfit/job/CaesarsLegion/Legionnaire/f13orator
display_order = JOB_DISPLAY_ORDER_ORATOR
+ exp_requirements = 900
access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND)
minimal_access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND)
-/datum/outfit/job/CaesarsLegion/Legionnaire/f13orator // 10mm Revolver, Spatha
+/datum/outfit/job/CaesarsLegion/Legionnaire/f13orator // Spatha, Automag
name = "Orator"
jobtype = /datum/job/CaesarsLegion/Legionnaire/f13orator
- neck = /obj/item/storage/belt/holster
+ neck = /obj/item/clothing/neck/mantle/legionmantle
suit = /obj/item/clothing/suit/armor/f13/legion/vet/orator
- head = null
+ mask = /obj/item/clothing/mask/bandana/legion/legvet
+ uniform = /obj/item/clothing/under/f13/legorat
+ head = /obj/item/clothing/head/helmet/f13/legion/vet/orator
id = /obj/item/card/id/dogtag/legveteran
- gloves = null
- shoes = /obj/item/clothing/shoes/roman
- suit_store = /obj/item/gun/ballistic/automatic/pistol/n99
+ shoes = /obj/item/clothing/shoes/f13/military/legion
+ gloves = /obj/item/clothing/gloves/legion
+ suit_store = /obj/item/melee/onehanded/machete/spatha
r_pocket = /obj/item/storage/bag/money/small/legofficers
l_pocket = /obj/item/flashlight/lantern
backpack_contents = list(
- /obj/item/ammo_box/magazine/m10mm_adv/simple = 2,
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/reagent_containers/pill/patch/bitterdrink = 1,
+ /obj/item/clothing/neck/mantle/legiontoga = 1,
+ /obj/item/gun/ballistic/automatic/pistol/automag = 1,
+ /obj/item/ammo_box/magazine/automag = 2,
)
/datum/outfit/job/CaesarsLegion/Legionnaire/f13orator/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -530,8 +540,8 @@ commented out pending rework*/
ADD_TRAIT(H, TRAIT_LIFEGIVER, src)
ADD_TRAIT(H, TRAIT_IRONFIST, src)
ADD_TRAIT(H, TRAIT_BIG_LEAGUES, src)
-
-
+
+
// VEXILLARIUS
/datum/job/CaesarsLegion/Legionnaire/f13vexillarius
@@ -581,6 +591,7 @@ commented out pending rework*/
gloves = /obj/item/clothing/gloves/legion/plated
r_pocket = /obj/item/flashlight/lantern
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/reagent_containers/pill/patch/healingpowder = 1,
/obj/item/restraints/handcuffs = 1,
/obj/item/megaphone/cornu = 1,
@@ -651,6 +662,7 @@ commented out pending rework*/
l_pocket = /obj/item/binoculars
suit_store = /obj/item/gun/ballistic/revolver/revolver45
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/ammo_box/c45/improvised = 1,
/obj/item/reagent_containers/pill/patch/healingpowder = 1,
/obj/item/storage/bag/money/small/legenlisted = 1,
@@ -732,6 +744,7 @@ commented out pending rework*/
shoes = /obj/item/clothing/shoes/f13/military/plated
r_pocket = /obj/item/flashlight/lantern
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/reagent_containers/pill/patch/healingpowder = 1,
/obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/restraints/handcuffs = 1,
@@ -824,6 +837,7 @@ commented out pending rework*/
r_pocket = /obj/item/flashlight/lantern
l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/reagent_containers/pill/patch/healingpowder = 1,
/obj/item/melee/onehanded/machete/forgedmachete = 1,
@@ -900,6 +914,7 @@ commented out pending rework*/
glasses = /obj/item/clothing/glasses/legiongoggles
r_pocket = /obj/item/flashlight/lantern
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/reagent_containers/pill/patch/healingpowder = 1,
/obj/item/melee/onehanded/machete = 1,
@@ -1018,7 +1033,10 @@ commented out pending rework*/
H.mind.teach_crafting_recipe(/datum/crafting_recipe/strongrocket)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/empgrenade)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/steeltower)
-
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalwar/yumi)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
+
// AUXILIA - Civilians with special training. Can sow new uniforms for soldiers who lost theirs, and are loyal so they would never abuse this.
@@ -1074,6 +1092,8 @@ commented out pending rework*/
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/tailor/legionuniform)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/warpaint)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/datum/outfit/loadout/auxassist
@@ -1119,7 +1139,7 @@ commented out pending rework*/
/obj/item/stack/sheet/prewar/twenty = 1,
/obj/item/weldingtool = 1,
/obj/item/book/granter/trait/explosives = 1
- )
+ )
// LEGION SLAVES - Servant cook, and assist with medical, low surgery. Worker farm and mine.
// Both get Mars teachings to help out when normal work is done.
diff --git a/code/modules/jobs/job_types/ncr.dm b/code/modules/jobs/job_types/ncr.dm
index c53e0bbf93..43084489cd 100644
--- a/code/modules/jobs/job_types/ncr.dm
+++ b/code/modules/jobs/job_types/ncr.dm
@@ -200,6 +200,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
/obj/item/lighter = 1,
/obj/item/reagent_containers/food/snacks/grown/tobacco/dried = 1,
+ /obj/item/storage/box/ration/menu_two = 1,
)
/datum/outfit/loadout/elcapitan
@@ -207,7 +208,6 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
suit_store = /obj/item/gun/ballistic/automatic/pistol/deagle/elcapitan
backpack_contents = list(
/obj/item/ammo_box/magazine/m14mm = 3,
- /obj/item/storage/box/ration/menu_two = 1,
/obj/item/melee/onehanded/knife/trench = 1,
)
@@ -217,7 +217,6 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
backpack_contents = list(
/obj/item/ammo_box/magazine/m44 = 3,
/obj/item/twohanded/sledgehammer/rockethammer/courtmartial = 1,
- /obj/item/storage/box/ration/menu_eight = 1,
)
@@ -260,12 +259,13 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
r_pocket = /obj/item/binoculars
suit_store = /obj/item/gun/ballistic/automatic/m1garand/republicspride
backpack_contents = list(
- /obj/item/melee/onehanded/knife/bayonet = 1, \
+ /obj/item/melee/onehanded/machete/ncrflag = 1, \
/obj/item/gun/ballistic/automatic/pistol/ninemil = 1, \
/obj/item/ammo_box/magazine/m9mmds = 2, \
/obj/item/storage/bag/money/small/ncrofficers = 1,
/obj/item/ammo_box/magazine/garand308 = 1,
/obj/item/grenade/smokebomb = 1,
+ /obj/item/storage/box/ration/menu_eight = 1
)
/datum/outfit/job/ncr/f13lieutenant/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -319,6 +319,10 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
backpack_contents = list(
/obj/item/storage/survivalkit/aid = 1,
/obj/item/storage/bag/money/small/ncrofficers = 1,
+ /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
+ /obj/item/ammo_box/magazine/m9mmds = 3,
+ /obj/item/storage/box/ration/menu_eight = 1,
+ /obj/item/book/granter/trait/trekking = 1,
)
/datum/outfit/loadout/sergeantrifleman
@@ -327,24 +331,19 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
head = /obj/item/clothing/head/f13/ncr
backpack_contents = list(
/obj/item/ammo_box/magazine/m5mm = 1,
- /obj/item/storage/box/ration/menu_two = 1,
- /obj/item/melee/onehanded/knife/bowie = 1,
- /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
- /obj/item/ammo_box/magazine/m9mmds = 3,
+ /obj/item/melee/onehanded/knife/trench = 1,
/obj/item/flashlight/seclite = 1,
/obj/item/grenade/f13/frag = 1,
)
/datum/outfit/loadout/sergeantrecon
name = "Recon"
- suit_store = /obj/item/gun/ballistic/automatic/m1carbine/compact
+ suit_store = /obj/item/gun/ballistic/automatic/smg/smg10mm
head = /obj/item/clothing/head/f13/ncr
backpack_contents = list(
/obj/item/ammo_box/magazine/m10mm_adv/ext = 2,
- /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
- /obj/item/ammo_box/magazine/m9mmds = 3,
+ /obj/item/melee/onehanded/knife/trench = 1,
/obj/item/storage/box/ration/menu_eight = 1,
- /obj/item/attachments/scope = 1,
/obj/item/book/granter/trait/trekking = 1,
/obj/item/grenade/f13/frag = 1,
)
@@ -354,12 +353,11 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
suit_store = /obj/item/gun/ballistic/shotgun/trench //Over thereee over thereeeee spread the spread the word over thereeee
head = /obj/item/clothing/head/f13/ncr/goggles
backpack_contents = list(
- /obj/item/ammo_box/shotgun/buck = 2,
+ /obj/item/ammo_box/shotgun/buck = 1,
+ /obj/item/ammo_box/shotgun/slug = 1,
/obj/item/clothing/mask/gas = 1,
/obj/item/grenade/smokebomb = 2,
/obj/item/melee/onehanded/knife/bayonet = 1,
- /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
- /obj/item/ammo_box/magazine/m9mmds = 3,
)
/datum/job/ncr/f13representative
@@ -683,7 +681,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/storage/survivalkit/aid = 1,
/obj/item/ammo_box/magazine/m9mmds = 2,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
- /obj/item/grenade/f13/frag = 1,
+ /obj/item/storage/box/ration/menu_two = 1,
+ /obj/item/grenade/f13/frag = 1
)
/datum/outfit/loadout/shockht
@@ -746,6 +745,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
H.mind.teach_crafting_recipe(/datum/crafting_recipe/huntingrifle)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/huntingshotgun)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/m1carbine)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
/datum/outfit/job/ncr/f13combatengineer
@@ -762,6 +763,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/shovel/trench = 1,
/obj/item/storage/survivalkit/aid = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/box/ration/menu_two = 1,
)
/datum/outfit/loadout/combatengineerbuilder
@@ -831,6 +833,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/ammo_box/magazine/m45 = 3,
/obj/item/storage/survivalkit/aid = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
/datum/outfit/job/ncr/f13mp/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -871,13 +874,14 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
mask = /obj/item/clothing/mask/surgical
gloves = /obj/item/clothing/gloves/color/latex/nitrile
accessory = /obj/item/clothing/accessory/armband/med/ncr
- suit_store = /obj/item/gun/ballistic/automatic/m1carbine/m1n
+ suit_store = /obj/item/gun/ballistic/automatic/service
backpack_contents = list(
- /obj/item/ammo_box/magazine/m10mm_adv/simple = 2,
+ /obj/item/ammo_box/magazine/m556/rifle = 2,
/obj/item/melee/onehanded/knife/survival = 1,
/obj/item/storage/survivalkit/aid/adv = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
/obj/item/storage/firstaid/regular = 1,
+ /obj/item/storage/box/ration/menu_one = 1,
)
/datum/outfit/job/ncr/f13combatmedic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -929,6 +933,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/melee/onehanded/knife/bayonet = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
/obj/item/storage/survivalkit/aid = 1,
+ /obj/item/storage/box/ration/menu_one = 1,
+ /obj/item/book/granter/trait/trekking = 1,
)
/datum/outfit/loadout/corporaldesignatedmarksman
@@ -936,14 +942,14 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
suit = /obj/item/clothing/suit/armor/f13/ncrarmor/mantle
head = /obj/item/clothing/head/f13/ncr/steelpot_bandolier
neck = /obj/item/storage/belt/holster/legholster
- suit_store = /obj/item/gun/ballistic/rifle/hunting/remington
+ suit_store = /obj/item/gun/ballistic/automatic/marksman
backpack_contents = list(
- /obj/item/attachments/scope = 1,
- /obj/item/ammo_box/a762 = 4,
+ /obj/item/ammo_box/magazine/m556/rifle = 2,
/obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
- /obj/item/ammo_box/magazine/m9mmds = 1,
+ /obj/item/ammo_box/magazine/m9mmds = 2,
+ /obj/item/storage/belt/holster/legholster = 1,
/obj/item/storage/box/ration/menu_two = 1,
- /obj/item/grenade/smokebomb = 1,
+ /obj/item/grenade/smokebomb = 1
)
/datum/outfit/loadout/corporalrifleman
@@ -955,7 +961,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/ammo_box/magazine/m556/rifle = 2,
/obj/item/storage/box/ration/menu_one = 1,
/obj/item/book/granter/trait/trekking = 1,
- /obj/item/grenade/f13/frag = 1,
+ /obj/item/grenade/f13/frag = 1
)
@@ -974,7 +980,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
loadout_options = list(
/datum/outfit/loadout/trooperrifleman, // Service Rifle, Bayonet
- /datum/outfit/loadout/trooperfiresupport, // M1/n carbine, Trench tool
+ /datum/outfit/loadout/trooperfiresupport, // Hunting Rifle
+ /datum/outfit/loadout/troopershotgun, // Hunting shotgun, Trench tool
)
matchmaking_allowed = list(
@@ -996,6 +1003,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
glasses = null
backpack_contents = list(
/obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/survivalkit/ncrifak = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
/datum/outfit/loadout/trooperrifleman
@@ -1004,16 +1013,25 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
backpack_contents = list(
/obj/item/ammo_box/magazine/m556/rifle = 2,
/obj/item/melee/onehanded/knife/bayonet = 1,
- /obj/item/storage/box/ration/menu_two = 1,
)
/datum/outfit/loadout/trooperfiresupport
+ name = "Sharpshooter"
+ suit_store = /obj/item/gun/ballistic/rifle/hunting
+ backpack_contents = list(
+ /obj/item/attachments/scope = 1,
+ /obj/item/ammo_box/a762 = 3,
+ /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
+ /obj/item/ammo_box/magazine/m9mmds = 2,
+ )
+
+/datum/outfit/loadout/troopershotgun
name = "Reservist"
- suit_store = /obj/item/gun/ballistic/automatic/m1carbine/m1n
+ suit_store = /obj/item/gun/ballistic/shotgun/hunting
backpack_contents = list(
- /obj/item/ammo_box/magazine/m10mm_adv/ext = 2,
+ /obj/item/ammo_box/shotgun/buck = 1,
+ /obj/item/ammo_box/shotgun/slug = 1,
/obj/item/shovel/trench = 1,
- /obj/item/storage/box/ration/menu_eight = 1,
)
@@ -1069,6 +1087,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/storage/survivalkit/aid/adv = 1,
/obj/item/storage/bag/money/small/ncrofficers = 1,
/obj/item/storage/firstaid/regular = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
/datum/outfit/job/ncr/f13medicalofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -1122,6 +1141,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
H.mind.teach_crafting_recipe(/datum/crafting_recipe/servicerifle)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/scoutcarbine)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
/datum/outfit/job/ncr/f13logisticsofficer // Grease Gun, 9mm sidearm, Survival knife, C-4 bomb, Extra materials, Full blueprints
@@ -1147,7 +1168,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/storage/bag/money/small/ncrofficers = 1,
/obj/item/stack/sheet/metal/twenty = 2,
/obj/item/stack/sheet/glass/ten = 2,
- /obj/item/book/granter/trait/explosives = 1
+ /obj/item/book/granter/trait/explosives = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
@@ -1201,6 +1223,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/ammo_box/magazine/m556/rifle/small = 2,
/obj/item/shovel/trench = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
// Technician Salvaging
@@ -1218,6 +1241,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/metaldetector = 1,
/obj/item/weldingtool/largetank = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
// Corpsman Chemistry, simple medical
@@ -1235,6 +1259,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/book/granter/trait/chemistry = 1,
/obj/item/book/granter/trait/lowsurgery = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
// Off-duty Snazzy jacket, saved up money for leave
diff --git a/code/modules/jobs/job_types/oasis.dm b/code/modules/jobs/job_types/oasis.dm
index c922c232f6..82cebe8c8c 100644
--- a/code/modules/jobs/job_types/oasis.dm
+++ b/code/modules/jobs/job_types/oasis.dm
@@ -56,6 +56,9 @@ Mayor
return
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
ADD_TRAIT(H, TRAIT_GENERIC, src)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/datum/outfit/job/den/f13mayor
name = "Mayor"
@@ -517,6 +520,9 @@ Mayor
return
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
ADD_TRAIT(H, TRAIT_GENERIC, src)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/*--------------------------------------------------------------*/
@@ -1049,6 +1055,8 @@ Mayor
H.mind.teach_crafting_recipe(/datum/crafting_recipe/uzi)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/smg10mm)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/datum/outfit/job/den/f13shopkeeper/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
diff --git a/code/modules/jobs/job_types/tribals.dm b/code/modules/jobs/job_types/tribals.dm
index 4abb83004a..7ebb2928bc 100644
--- a/code/modules/jobs/job_types/tribals.dm
+++ b/code/modules/jobs/job_types/tribals.dm
@@ -33,6 +33,7 @@
H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribal_pa)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribal_pa_helmet)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalwar/yumi)
/*
Tribal Chief
diff --git a/code/modules/jobs/job_types/wasteland.dm b/code/modules/jobs/job_types/wasteland.dm
index 62c796394c..1b04684f2c 100644
--- a/code/modules/jobs/job_types/wasteland.dm
+++ b/code/modules/jobs/job_types/wasteland.dm
@@ -241,7 +241,8 @@ Raider
if(visualsOnly)
return
ADD_TRAIT(H, TRAIT_LONGPORKLOVER, src)
-
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/wastehound)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/raiderpa)
H.social_faction = FACTION_RAIDERS
add_verb(H, /mob/living/proc/creategang)
@@ -427,6 +428,7 @@ Raider
/obj/item/melee/onehanded/knife/bone = 1,
/obj/item/radio/tribal = 1,
/obj/item/book/granter/trait/bigleagues = 1,
+ /obj/item/book/granter/crafting_recipe/blueprint/yumi = 1,
)
/datum/outfit/loadout/raider_mobster
@@ -494,7 +496,7 @@ Raider
/datum/outfit/loadout/warrior,
/datum/outfit/loadout/ncrcitizen,
/datum/outfit/loadout/legioncivilian,
- /datum/outfit/loadout/wastelander_desert_ranger)
+ /datum/outfit/loadout/wastelander_arizona_ranger)
/datum/outfit/job/wasteland/f13wastelander
name = "Wastelander"
@@ -645,9 +647,9 @@ Raider
backpack_contents = list(
/obj/item/ammo_box/magazine/m556/rifle=2)
-/datum/outfit/loadout/wastelander_desert_ranger
- name = "Desert Ranger Scout"
- uniform = /obj/item/clothing/under/f13/desert_ranger_scout
+/datum/outfit/loadout/wastelander_arizona_ranger
+ name = "Arizona Ranger Scout"
+ uniform = /obj/item/clothing/under/f13/arizona_ranger_scout
shoes = /obj/item/clothing/shoes/f13/cowboy
head = /obj/item/clothing/head/f13/cowboy
gloves = /obj/item/clothing/gloves/color/brown
@@ -955,7 +957,9 @@ Raider
..()
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
ADD_TRAIT(H, TRAIT_LIFEGIVER, src)
-
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
/datum/outfit/job/wasteland/f13mobboss/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -1024,6 +1028,9 @@ datum/job/wasteland/f13dendoctor
H.mind.teach_crafting_recipe(/datum/crafting_recipe/medx)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/buffout)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/set_vrboard/den)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
/datum/outfit/job/wasteland/f13dendoctor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -1251,7 +1258,9 @@ datum/job/wasteland/f13dendoctor
/datum/crafting_recipe/tribalwar/bracers,
/datum/crafting_recipe/tribal/bonetalisman,
/datum/crafting_recipe/tribal/bonebag,
- /datum/crafting_recipe/tribalwar/spearquiver
+ /datum/crafting_recipe/tribalwar/spearquiver,
+ /datum/crafting_recipe/tribalwar/yumi,
+ /datum/crafting_recipe/durathread_vest
)
for(var/datum/crafting_recipe/recipe as() in recipes)
H.mind.teach_crafting_recipe(recipe)
diff --git a/code/modules/mob/living/carbon/human/species_types/supermutant.dm b/code/modules/mob/living/carbon/human/species_types/supermutant.dm
index 816d9f2f92..facb5282e7 100644
--- a/code/modules/mob/living/carbon/human/species_types/supermutant.dm
+++ b/code/modules/mob/living/carbon/human/species_types/supermutant.dm
@@ -11,7 +11,7 @@
// Addself these only ones I know.
whitelist = list("ADanimator", "PilotBland", "Cythisia", "Kneesox", "Foxeye", "Oddbomber3768", "Poots13", "Scheveningen", "Akoy")
species_traits = list(NOEYES,NO_UNDERWEAR,NOTRANSSTING,NOGENITALS,NOAROUSAL)
- inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE, TRAIT_HEAVY_SLEEPER, TRAIT_POOR_AIM, TRAIT_STRONG_GRABBER, TRAIT_QUICK_CARRY, TRAIT_UNARMED_WEAPON, TRAIT_IRONFIST,TRAIT_BIG_LEAGUES)
+ inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE, TRAIT_MUTATION_STASIS, TRAIT_TOXINLOVER, TRAIT_LONGPORKLOVER, TRAIT_HARD_YARDS, TRAIT_GIANT, TRAIT_STUNIMMUNE, TRAIT_RESISTHEAT, TRAIT_PUSHIMMUNE, TRAIT_TASED_RESISTANCE, TRAIT_HEAVY_SLEEPER, TRAIT_POOR_AIM, TRAIT_STRONG_GRABBER, TRAIT_QUICK_CARRY, TRAIT_UNARMED_WEAPON, TRAIT_IRONFIST,TRAIT_BIG_LEAGUES)
inherent_biotypes = list(MOB_INORGANIC, MOB_HUMANOID)
punchstunthreshold = 20
punchdamagelow = 10
@@ -21,7 +21,6 @@
use_skintones = 0
sexes = 0
armor = 60 // Until armor is added in loot pools, then move down to 20-30
- speedmod = 0.75
liked_food = JUNKFOOD | FRIED | RAW
//TODO
// Disable Prosthetics or make custom ones
diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm
index e6e46165f7..5447b4be93 100644
--- a/code/modules/paperwork/paper_premade.dm
+++ b/code/modules/paperwork/paper_premade.dm
@@ -255,3 +255,23 @@
Mix the fermented results of Xander root, barrel cactii,broc flowers and Sarsaparilla together in a large glass beaker.
Bitter drink should be the result which can then be bottled by crafting. It is a very potent drink, so more than two should not be consumed."}
+
+/obj/item/paper/legionifak
+ name = "Legion Trauma Kit Instructions"
+ info = {"Bandages stop bleeding. Cut some bed sheets, or use some cloth to turn them into improvised gauze. You can then microwave them to get medical gauze.
+
+
Sutures close wounds with excessive use, and can also be used to heal brute damage. While closing wounds, you will keep bleeding so bandage yourself first. You can get more by using the method above, but instead of microwaving the gauze combine it with alcohol via medical crafting to make improvised sutures.
+
+
Ointment is used to treat burns. Apply the ointment to the burnt areas. Severe burn wounds will require you to bandage it then apply ointment. You can make more ointment through combining agave and gauze via crafting.
+
+
Xander tea will help you recover blood and slow down blood loss. You can get more xander tea by juicing xander roots in a grinder, adding twice the amount of water as xander juice and heating it in a microwave or using a lighter/zippo/welder on it."}
+
+/obj/item/paper/ncrifak
+ name = "NCR Trauma Kit Instructions"
+ info = {"Bandages stop bleeding. Cut some bed sheets, or use some cloth to turn them into improvised gauze. You can then microwave them to get medical gauze. You can then combine the gauze and sterilizine (found via medical vendor) to make improved gauze.
+
+
Sutures close wounds with excessive use, and can also be used to heal brute damage. While closing wounds, you will keep bleeding so bandage yourself first. You can get more by using the method above, but instead of microwaving the gauze combine it with alcohol or styptic powder (can be found in a medical vendor) via medical crafting to make improvised sutures and normal sutures respectively.
+
+
Ointment is used to treat burns. Apply the ointment to the burnt areas. Severe burn wounds will require you to bandage it then apply ointment. You can make more ointment through combining agave and gauze via crafting. You can make regenerative mesh through combining silver sulfadiazine (obtained via medical vendor) which is a superior ointment.
+
+
Epinephrine will clot excessive wounds, halting blood loss and preventing death in critical condition, preserve for when you're bleeding out. You can get more epipens from medical vendors in old ruins or general scavenging."}
diff --git a/code/modules/projectiles/ammunition/caseless/arrow.dm b/code/modules/projectiles/ammunition/caseless/arrow.dm
index bd6c265dff..fac7702cf6 100644
--- a/code/modules/projectiles/ammunition/caseless/arrow.dm
+++ b/code/modules/projectiles/ammunition/caseless/arrow.dm
@@ -73,3 +73,10 @@
desc = "An arrow made of wood, tipped with bronze. The tip is dense enough to provide some armor penetration."
icon_state = "bronzearrow"
projectile_type = /obj/item/projectile/bullet/reusable/arrow/bronze
+
+/obj/item/ammo_casing/caseless/arrow/explosive
+ name = "explosive arrow"
+ desc = "An arrow with a pressure-activated explosive charge at the end. Cannot be reused."
+ icon = 'icons/fallout/objects/guns/ammo.dmi'
+ icon_state = "arrow_explosive"
+ projectile_type = /obj/item/projectile/bullet/reusable/arrow/explosive
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
index ca34e8db51..7ad81a5e66 100644
--- a/code/modules/projectiles/ammunition/energy/laser.dm
+++ b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -191,7 +191,8 @@ also: most hitscan weapons have more charge than their normal projectile counter
/obj/item/ammo_casing/energy/laser/gatling/hitscan
projectile_type = /obj/item/projectile/beam/laser/gatling/hitscan
- e_cost = 10 //it's actually 240 shots now, as it fires in a burst of 5
+ e_cost = 13.33 //it's actually 240 shots now, as it fires in a burst of 5
+ fire_sound = 'sound/f13weapons/multiplas_rifle.ogg'
/obj/item/ammo_casing/energy/laser/laer
projectile_type = /obj/item/projectile/beam/laser/laer
diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm
index 84b9f9bc3b..0531a76e9e 100644
--- a/code/modules/projectiles/boxes_magazines/external/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm
@@ -169,7 +169,7 @@
/obj/item/ammo_box/magazine/m473/small
name = "4.7mm carbine magazine"
- icon_state = "473small"
+ icon_state = "46x30mmtA"
max_ammo = 20
/obj/item/ammo_box/magazine/m473/small/empty
diff --git a/code/modules/projectiles/boxes_magazines/internal/bow.dm b/code/modules/projectiles/boxes_magazines/internal/bow.dm
index 9f9f0ef219..8bc512f9e2 100644
--- a/code/modules/projectiles/boxes_magazines/internal/bow.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/bow.dm
@@ -28,3 +28,10 @@
//Crossbow Ammo
/obj/item/ammo_box/magazine/internal/bow/cross
max_ammo = 3 // 4 shots in total
+
+//Yumi Ammo
+/obj/item/ammo_box/magazine/internal/bow/yumi
+ name = "yumi internal magazine"
+ ammo_type = /obj/item/ammo_casing/caseless/arrow
+ caliber = "arrow"
+ max_ammo = 1 // 1 shots in total
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index e1c9790c2e..acdc09fd12 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -609,7 +609,8 @@
/obj/item/gun/ballistic/automatic/wt550
name = "WT-550"
desc = "A compact PDW derived from the G11, firing the same 4.73mm rounds."
- item_state = "WT550"
+ item_state = "m90"
+ icon_state = "WT550"
mag_type = /obj/item/ammo_box/magazine/m473/small
burst_size = 1
is_automatic = TRUE
@@ -617,8 +618,9 @@
extra_damage = 20
autofire_shot_delay = 1.75
extra_penetration = 0.2
+ slowdown = 0.2
w_class = WEIGHT_CLASS_NORMAL
- weapon_weight = WEAPON_MEDIUM
+ weapon_weight = WEAPON_HEAVY
spread = 0
fire_delay = 1
can_bayonet = TRUE
@@ -720,6 +722,25 @@
can_scope = FALSE
fire_sound = 'sound/weapons/Gunshot_large_silenced.ogg'
+
+//Combat Rifle Keywords: .45 Caliber Rifle, No Attachments (!)
+/obj/item/gun/ballistic/automatic/combat
+ name = "Combat Rifle"
+ desc = "A .45 semi-automatic combat rifle, produced pre-war for National Guard forces."
+ icon_state = "combat_rifle"
+ item_state = "combatrifle"
+ icon_prefix = "combatrifle"
+ mag_type = /obj/item/ammo_box/magazine/greasegun
+ fire_delay = 3
+ burst_size = 1
+ spread = 1
+ extra_damage = 32
+ slowdown = 0.3
+ can_attachments = FALSE
+ automatic_burst_overlay = FALSE
+ semi_auto = TRUE
+ fire_sound = 'sound/f13weapons/combatrifle.ogg'
+
//Service rifle Keywords: NCR, 5.56mm, Semi-auto, 20 (10-50) round magazine, 25dmg
/obj/item/gun/ballistic/automatic/service
name = "service rifle"
@@ -1091,24 +1112,31 @@
//R93 PDW Keywords: 5.56mm, Semi-Automatic, 20 (10-50) round magazine, Pistol grip
/obj/item/gun/ballistic/automatic/r93
- name = "R93 PDW"
- desc = "A lightweight assault rifle manufactured by the Brotherhood of Steel with a folding stock, based on weapons from the R-series platforms. It is generally issued to Brotherhood Knights for scouting missions."
+ name = "r93 assault rifle"
+ desc = "A lightweight assault rifle manufactured by the Brotherhood of Steel with a folding stock, based on weapons from the R-series platforms. It is generally issued to Brotherhood knights for most combat operations."
icon_state = "r93"
item_state = "r93"
mag_type = /obj/item/ammo_box/magazine/m556/rifle
- fire_delay = 3.25
- spread = 1
- extra_damage = 25
- burst_size = 1
- can_attachments = FALSE
- semi_auto = TRUE
- automatic_burst_overlay = FALSE
+ fire_delay = 2.5
+ slowdown = 0.3
+ spread = 10
+ extra_damage = 21
+ recoil = 0.125
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2.75
+ can_attachments = TRUE
+ can_bayonet = FALSE
can_scope = FALSE
zoomable = TRUE
- zoom_amt = 6
- zoom_out_amt = 9
- can_bayonet = FALSE
- fire_sound = 'sound/weapons/Gunshot_large_silenced.ogg'
+ zoom_amt = 9
+ zoom_out_amt = 10
+ can_suppress = TRUE
+ suppressor_x_offset = 0
+ suppressor_y_offset = 0
+ suppressor_state = "r93_suppressor"
+ actions_types = list(/datum/action/item_action/toggle_firemode)
+ fire_sound = 'sound/f13weapons/assaultrifle_fire.ogg'
//Type 93 Chinese rifle Keywords: 5.56mm, Automatic, 20 (10-50) round magazine
/obj/item/gun/ballistic/automatic/type93
@@ -1268,7 +1296,7 @@
name = "g11"
desc = "This experimental gun fires a caseless cartridge consisting of a block of propellant with a bullet buried inside. The weight and space savings allows for a very high magazine capacity. Chambered in 4.73mm."
icon_state = "g11"
- item_state = "g11"
+ item_state = "arg"
mag_type = /obj/item/ammo_box/magazine/m473
burst_size = 1
extra_damage = 22.5
diff --git a/code/modules/projectiles/guns/ballistic/bow.dm b/code/modules/projectiles/guns/ballistic/bow.dm
index c3e5939bf2..5c79a7b73a 100644
--- a/code/modules/projectiles/guns/ballistic/bow.dm
+++ b/code/modules/projectiles/guns/ballistic/bow.dm
@@ -145,3 +145,24 @@
zoom_amt = 10
zoom_out_amt = 13
can_scope = FALSE
+
+//Yumi
+/obj/item/gun/ballistic/bow/yumi
+ name = "Yumi"
+ desc = "A large, slow, unwieldy bow. While heavy and slow to fire, an arrow fired from it is likely to be devestating."
+ icon = 'icons/fallout/objects/guns/ballistic.dmi'
+ icon_state = "yumi"
+ item_state = "yumi"
+ icon_prefix = "yumi"
+ w_class = WEIGHT_CLASS_NORMAL
+ slowdown = 2
+ force = 30
+ extra_damage = 20
+ mag_type = /obj/item/ammo_box/magazine/internal/bow/yumi
+ fire_delay = 100
+ zoomable = TRUE
+ zoom_amt = 10
+ zoom_out_amt = 13
+ can_scope = FALSE
+ fire_sound = 'sound/weapons/bowfire.wav'
+ slot_flags = ITEM_SLOT_BACK
diff --git a/code/modules/projectiles/guns/ballistic/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm
index 634363007c..297df9c473 100644
--- a/code/modules/projectiles/guns/ballistic/minigun.dm
+++ b/code/modules/projectiles/guns/ballistic/minigun.dm
@@ -96,10 +96,9 @@
w_class = WEIGHT_CLASS_HUGE
burst_size = 1
automatic = 1
- autofire_shot_delay = 1.25
+ autofire_shot_delay = 1
burst_shot_delay = 1
fire_delay = 1
- ranged_attack_speed = CLICK_CD_RAPID
spread = 12
weapon_weight = WEAPON_HEAVY
extra_penetration = 0
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 986bdb2991..043606a6be 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -253,13 +253,13 @@
pump_sound = 'sound/weapons/boltpump.ogg'
fire_sound = 'sound/f13weapons/boltfire.ogg'
-//Lee-Enfield,SMLE Keywords: 7.62, Bolt-action, 5 rounds internal, very fast firing rate
+//Lee-Enfield,SMLE Keywords: 7.62, Bolt-action, 5 rounds internal, very fast firing rate, stamina cost on working bolt (do not remove this)
/obj/item/gun/ballistic/rifle/enfield
name = "Lee-Enfield rifle"
- desc = "A british rifle sometimes known as the SMLE. It seems to have been re-chambered in .308."
+ desc = "An antiquated rifle. It can punch well above its weight class, but drains stamina to work the bolt."
icon_state = "enfield2"
item_state = "308"
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/smle
+ mag_type = /obj/item/ammo_box/magazine/internal/boltaction
extra_damage = 40
extra_speed = 600
fire_delay = 6
@@ -275,6 +275,7 @@
knife_y_offset = 21
pump_sound = 'sound/weapons/boltpump.ogg'
fire_sound = 'sound/f13weapons/boltfire.ogg'
+ pump_stam_cost = 10
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index b6946f3987..da23a42def 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -339,7 +339,7 @@
return TRUE
return ..()
-/obj/item/gun/energy/AltClick(mob/user)
+/obj/item/gun/energy/attack_self(mob/living/user)
if (!ishuman(user))
return
if (get_dist(src, user)<2)
@@ -386,4 +386,4 @@
/obj/item/gun/energy/examine(mob/user)
. = ..()
if(can_charge == 1)
- . += span_notice("Alt-click to eject the battery.")
+ . += span_notice("Click to eject the battery.")
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index ae3c577ef4..6e4999bf86 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -603,11 +603,10 @@
burst_size = 1
burst_shot_delay = 1
automatic = 1
- autofire_shot_delay = 1.8
+ autofire_shot_delay = 1
spread = 6
fire_delay = 1
weapon_weight = WEAPON_HEAVY
- fire_sound = 'sound/weapons/laser.ogg'
ammo_type = list(/obj/item/ammo_casing/energy/laser/gatling/hitscan)
cell_type = /obj/item/stock_parts/cell/ammo/ecp
item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND
@@ -621,9 +620,6 @@
return ..()
-/obj/item/gun/energy/minigun/attack_self(mob/living/user)
- return
-
/obj/item/gun/energy/minigun/dropped(mob/user)
. = ..()
if(ammo_pack)
diff --git a/code/modules/projectiles/guns/energy/plasmaf13.dm b/code/modules/projectiles/guns/energy/plasmaf13.dm
index 4d3b775807..68b3ed94a7 100644
--- a/code/modules/projectiles/guns/energy/plasmaf13.dm
+++ b/code/modules/projectiles/guns/energy/plasmaf13.dm
@@ -157,6 +157,7 @@
name = "Plasma Cannon"
desc = "A refined design, taking the common wasteland plasma musket and improving upon it. Trash parts and safety hazards give way to proper stamped and machined construction. It's even been fitted with a scope and designed to take MFCs rather than shoddy plasma cans."
icon = 'icons/fallout/objects/guns/energy.dmi'
+ mob_overlay_icon = 'icons/fallout/onmob/backslot_weapon.dmi'
icon_state = "plasmasniper"
item_state = "plasmamusket"
slowdown = 0.3
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index ba9ccf2518..0d25b57e4c 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -2,7 +2,7 @@
name = "YK-42b Pulse Rifle"
desc = "The YK42B rifle is an electrical pulse weapon that was developed by the Yuma Flats Energy Consortium. It excels in damage against heavily armored opponents, especially power armor."
icon_state = "ionrifle"
- item_state = null //so the human update icon uses the icon_state instead.
+ item_state = "ionrifle"
can_flashlight = 1
w_class = WEIGHT_CLASS_BULKY
flags_1 = CONDUCT_1
diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm
index 9ffbaccba1..05ce2c52b7 100644
--- a/code/modules/projectiles/projectile/bullets/rifle.dm
+++ b/code/modules/projectiles/projectile/bullets/rifle.dm
@@ -215,7 +215,7 @@ heavy rifle calibers (12.7, 14mm, 7.62): Uranium, Contaminated, Incin
/obj/item/projectile/bullet/a473/incendiary
name = "4.73 tracer bullet"
- damage = -10
+ damage = -8
armour_penetration = 0.1
var/fire_stacks = 3
zone_accuracy_factor = 100
@@ -244,6 +244,7 @@ heavy rifle calibers (12.7, 14mm, 7.62): Uranium, Contaminated, Incin
/obj/item/projectile/bullet/a473/explosive
name = "4.73 explosive bullet"
+ damage = -10
/obj/item/projectile/bullet/a473/explosive/on_hit(atom/target, blocked = FALSE)
..()
diff --git a/code/modules/projectiles/projectile/reusable/arrow.dm b/code/modules/projectiles/projectile/reusable/arrow.dm
index 2229c0c5a4..49119c2b84 100644
--- a/code/modules/projectiles/projectile/reusable/arrow.dm
+++ b/code/modules/projectiles/projectile/reusable/arrow.dm
@@ -19,7 +19,7 @@
damage = 20
armour_penetration = 0.10
supereffective_damage = 40
- supereffective_faction = list("hostile", "ant", "supermutant", "deathclaw", "cazador", "raider", "china", "gecko", "wastebot")
+ supereffective_faction = list("hostile", "ant", "supermutant", "deathclaw", "cazador", "raider", "china", "gecko", "wastebot","radscorpion")
ammo_type = /obj/item/ammo_casing/caseless/arrow/bone
/obj/item/projectile/bullet/reusable/arrow/bronze //Just some AP shots
@@ -83,7 +83,7 @@
damage = 20
sharpness = SHARP_EDGED
ammo_type = /obj/item/ammo_casing/caseless/arrow/broadhead
- embedding = list(embed_chance=100, fall_chance=0, jostle_chance=3, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.2, pain_mult=3, jostle_pain_mult=5, rip_time=25, projectile_payload = /obj/item/ammo_casing/caseless/arrow/broadhead)
+ embedding = list(embed_chance=95, fall_chance=0, jostle_chance=3, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.2, pain_mult=3, jostle_pain_mult=5, rip_time=25, projectile_payload = /obj/item/ammo_casing/caseless/arrow/broadhead)
/obj/item/projectile/bullet/reusable/arrow/broadhead/on_hit(atom/target, blocked)
if(iscarbon(target))
@@ -99,3 +99,25 @@
armour_penetration = 0.05
damage = 30
ammo_type = /obj/item/ammo_casing/caseless/arrow/serrated
+
+/obj/item/projectile/bullet/reusable/arrow/explosive
+ name = "explosive arrow"
+ desc = "An arrow with a pressure-activated explosive charge at the end. Cannot be reused."
+ armour_penetration = 0.2
+ damage = 5
+ ammo_type = /obj/item/ammo_casing/caseless/arrow/explosive
+
+/obj/item/projectile/bullet/reusable/arrow/explosive/on_hit(atom/target, blocked=0)
+ . = ..()
+ if(!isliving(target)) //if the target isn't alive, so is a wall or something
+ explosion(target, 0, 0, 1, 1)
+ dropped = TRUE
+ else
+ explosion(target, 0, 0, 1, 1)
+ dropped = TRUE
+ new /obj/effect/temp_visual/explosion(get_turf(target))
+ return BULLET_ACT_HIT
+
+/obj/item/projectile/bullet/reusable/arrow/explosive/handle_drop()
+ if(!dropped)
+ dropped = FALSE
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 75fed4c26d..8bd2157941 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -433,6 +433,7 @@
reagent_state = LIQUID
color = "#6D6374"
metabolization_rate = 0.4 * REAGENTS_METABOLISM
+ overdose_threshold = 60
pH = 2.6
value = REAGENT_VALUE_COMMON
@@ -444,6 +445,11 @@
..()
return TRUE
+/datum/reagent/medicine/mine_salve/overdose_process(mob/living/M)
+ M.adjustToxLoss(2*REM, FALSE)
+ ..()
+ . = 1
+
/datum/reagent/medicine/mine_salve/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
if(method in list(INGEST, VAPOR, INJECT))
diff --git a/icons/fallout/clothing/armored_medium.dmi b/icons/fallout/clothing/armored_medium.dmi
index a79cd7faf5..ad25f14958 100644
Binary files a/icons/fallout/clothing/armored_medium.dmi and b/icons/fallout/clothing/armored_medium.dmi differ
diff --git a/icons/fallout/clothing/hats.dmi b/icons/fallout/clothing/hats.dmi
index d1817805a6..863733ce9f 100644
Binary files a/icons/fallout/clothing/hats.dmi and b/icons/fallout/clothing/hats.dmi differ
diff --git a/icons/fallout/clothing/mantles.dmi b/icons/fallout/clothing/mantles.dmi
index 769c631a7f..92489a13d4 100644
Binary files a/icons/fallout/clothing/mantles.dmi and b/icons/fallout/clothing/mantles.dmi differ
diff --git a/icons/fallout/clothing/uniforms.dmi b/icons/fallout/clothing/uniforms.dmi
index 53b6ed9097..ab42b0263c 100644
Binary files a/icons/fallout/clothing/uniforms.dmi and b/icons/fallout/clothing/uniforms.dmi differ
diff --git a/icons/fallout/objects/guns/ammo.dmi b/icons/fallout/objects/guns/ammo.dmi
index 878fcd2570..83a42d52c7 100644
Binary files a/icons/fallout/objects/guns/ammo.dmi and b/icons/fallout/objects/guns/ammo.dmi differ
diff --git a/icons/fallout/objects/guns/attachments.dmi b/icons/fallout/objects/guns/attachments.dmi
index 5312b27e0f..6463e01371 100644
Binary files a/icons/fallout/objects/guns/attachments.dmi and b/icons/fallout/objects/guns/attachments.dmi differ
diff --git a/icons/fallout/objects/guns/ballistic.dmi b/icons/fallout/objects/guns/ballistic.dmi
index fa829b3fa1..26c27f3c59 100644
Binary files a/icons/fallout/objects/guns/ballistic.dmi and b/icons/fallout/objects/guns/ballistic.dmi differ
diff --git a/icons/fallout/objects/guns/energy.dmi b/icons/fallout/objects/guns/energy.dmi
index b8af7d74cb..4d76dfeb44 100644
Binary files a/icons/fallout/objects/guns/energy.dmi and b/icons/fallout/objects/guns/energy.dmi differ
diff --git a/icons/fallout/onmob/backslot_weapon.dmi b/icons/fallout/onmob/backslot_weapon.dmi
index 1b281a3cdd..bc41e9f409 100644
Binary files a/icons/fallout/onmob/backslot_weapon.dmi and b/icons/fallout/onmob/backslot_weapon.dmi differ
diff --git a/icons/fallout/onmob/clothes/armor_medium.dmi b/icons/fallout/onmob/clothes/armor_medium.dmi
index e55c5ed7ef..3034e98f0b 100644
Binary files a/icons/fallout/onmob/clothes/armor_medium.dmi and b/icons/fallout/onmob/clothes/armor_medium.dmi differ
diff --git a/icons/fallout/onmob/clothes/head.dmi b/icons/fallout/onmob/clothes/head.dmi
index 8a954805dc..a56da8b891 100644
Binary files a/icons/fallout/onmob/clothes/head.dmi and b/icons/fallout/onmob/clothes/head.dmi differ
diff --git a/icons/fallout/onmob/clothes/mantle.dmi b/icons/fallout/onmob/clothes/mantle.dmi
index 9af42f41a8..41918ff705 100644
Binary files a/icons/fallout/onmob/clothes/mantle.dmi and b/icons/fallout/onmob/clothes/mantle.dmi differ
diff --git a/icons/fallout/onmob/clothes/uniform.dmi b/icons/fallout/onmob/clothes/uniform.dmi
index e836c8198b..957397db05 100644
Binary files a/icons/fallout/onmob/clothes/uniform.dmi and b/icons/fallout/onmob/clothes/uniform.dmi differ
diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi
index f3bd1abca6..3fcc853ae7 100644
Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
index 9563a8c4b3..267e079447 100644
Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
index cf940b4e6a..e7cda86ab3 100644
Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 2ee9f90c62..34123c581c 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 8caf0a860e..5d51b1a99e 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 183721af5d..6a001ebf08 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm
index 6171c94b68..5dbe6f99ef 100644
--- a/modular_citadel/code/modules/client/loadout/head.dm
+++ b/modular_citadel/code/modules/client/loadout/head.dm
@@ -400,3 +400,11 @@ datum/gear/head/steelpot_bandolier
cost = 2
restricted_desc = "KHAN"
restricted_roles = list("Great Khan")
+
+/datum/gear/head/raider_wastehound
+ name = "Raider Wastehound Helmet"
+ path = /obj/item/clothing/head/helmet/f13/raider/wastehound
+ cost = 2
+ restricted_desc = "OUTLAW"
+ restricted_roles = list("outlaw")
+
diff --git a/modular_citadel/code/modules/client/loadout/neck.dm b/modular_citadel/code/modules/client/loadout/neck.dm
index fcc0615de0..d15dc180fc 100644
--- a/modular_citadel/code/modules/client/loadout/neck.dm
+++ b/modular_citadel/code/modules/client/loadout/neck.dm
@@ -23,6 +23,62 @@
name = "ragged mantle"
path = /obj/item/clothing/neck/mantle/ragged
+/datum/gear/neck/mantle/palcapes
+ name = "short paladin cape"
+ path = /obj/item/clothing/neck/mantle/bos/shortpaladin
+ cost = 3
+ restricted_desc = "Paladins"
+ restricted_roles = list("Head Paladin",
+ "Senior Paladin",
+ "Paladin",
+ )
+
+/datum/gear/neck/mantle/palcapel
+ name = "long paladin cape"
+ path = /obj/item/clothing/neck/mantle/bos/longpaladin
+ cost = 3
+ restricted_desc = "Paladins"
+ restricted_roles = list("Head Paladin",
+ "Senior Paladin",
+ "Paladin",
+ )
+
+/datum/gear/neck/mantle/rangerponcho
+ name = "NCR ranger poncho"
+ path = /obj/item/clothing/neck/mantle/rangerponcho
+ cost = 3
+ restricted_desc = "Rangers"
+ restricted_roles = list("NCR Ranger",
+ "NCR Veteran Ranger",
+ )
+
+/datum/gear/neck/mantle/legionmantle
+ name = "Legion mantle"
+ path = /obj/item/clothing/neck/mantle/legionmantle
+ cost = 2
+ restricted_desc = "Legion Veteran+"
+ restricted_roles = list("Legion Orator",
+ "Legion Centurion",
+ "Legion Veteran Decanus",
+ "Legion Prime Decanus",
+ "Legion Recruit Decanus",
+ "Legion Vexillarius",
+ "Veteran Legionnaire"
+ )
+
+/datum/gear/neck/mantle/legiontoga
+ name = "Legion toga"
+ path = /obj/item/clothing/neck/mantle/legiontoga
+ cost = 2
+ restricted_desc = "Legion Veteran+"
+ restricted_roles = list("Legion Orator",
+ "Legion Centurion",
+ "Legion Veteran Decanus",
+ "Legion Prime Decanus",
+ "Legion Recruit Decanus",
+ "Legion Vexillarius",
+ "Veteran Legionnaire"
+ )
/datum/gear/neck/apron
name = "simple apron"
diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm
index a0365f9a9d..ca6d3a8c9d 100644
--- a/modular_citadel/code/modules/client/loadout/uniform.dm
+++ b/modular_citadel/code/modules/client/loadout/uniform.dm
@@ -329,14 +329,14 @@
name = "grey turtleneck"
path = /obj/item/clothing/under/suit/turtle/grey
cost = 2
-/*
+
/datum/gear/uniform/detbrown
name = "Brown Worn Suit"
path = /obj/item/clothing/under/rank/security/detective/brown
- subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
- restricted_desc = "Detective"
- restricted_roles = list("Detective")
+ cost = 2
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SUITS
+/*
/datum/gear/uniform/detbrown/detbrown2
name = "Padded Worn Suit"
path = /obj/item/clothing/under/rank/security/detective/brown/brown2
@@ -626,3 +626,399 @@
/datum/gear/uniform/ranger/vet
name = "ranger flannel outfit"
path = /obj/item/clothing/under/f13/ranger/vet
+
+/datum/gear/uniform/skirt/white
+ name = "white suitskirt"
+ path = /obj/item/clothing/under/suit/white_on_white/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/polychromic
+ name = "polychromic skirt"
+ path = /obj/item/clothing/under/dress/skirt/polychromic
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/polychromic/pleated
+ name = "polychromic pleated skirt"
+ path = /obj/item/clothing/under/dress/skirt/polychromic/pleated
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/plaid/red
+ name = "red plaid skirt"
+ path = /obj/item/clothing/under/dress/skirt/plaid
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/plaid/green
+ name = "green plaid skirt"
+ path = /obj/item/clothing/under/dress/skirt/plaid/green
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/plaid/blue
+ name = "blue plaid skirt"
+ path = /obj/item/clothing/under/dress/skirt/plaid/blue
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/plaid/purple
+ name = "purple plaid skirt"
+ path = /obj/item/clothing/under/dress/skirt/plaid/purple
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/black
+ name = "black skirt"
+ path = /obj/item/clothing/under/dress/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/vcity
+ name = "VTCC jumpskirt"
+ path = /obj/item/clothing/under/f13/vault/vcity/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/tac
+ name = "''tactical'' combat skirt"
+ path = /obj/item/clothing/under/f13/legskirt/tac
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/swept
+ name = "swept skirt"
+ path = /obj/item/clothing/under/dress/skirt/swept
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/red
+ name = "red skirt"
+ path = /obj/item/clothing/under/dress/skirt/red
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/blue
+ name = "blue skirt"
+ path = /obj/item/clothing/under/dress/skirt/blue
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/purple
+ name = "purple skirt"
+ path = /obj/item/clothing/under/dress/skirt/purple
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/denim
+ name = "denim skirt"
+ path = /obj/item/clothing/under/pants/denimskirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/curator
+ name = "sensible suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/curator/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/blue/suit
+ name = "blue suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/purple/suit
+ name = "purple suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/blue/lawyer
+ name = "blue lawyer suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/blue/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/red/lawyer
+ name = "red lawyer suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/red/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/executive/suit
+ name = "executive suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/really_black/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/black/female/suit
+ name = "black female suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/female/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/black/suit
+ name = "black lawyer suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/black/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/black/suit/alt
+ name = "black alt suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/black/alt/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/bartender
+ name = "bartender's skirt"
+ path = /obj/item/clothing/under/rank/civilian/bartender/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/wasteland/warboy
+ name = "War boy pants"
+ path = /obj/item/clothing/under/pants/f13/warboy
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/ghoul
+ name = "Ripped pants"
+ path = /obj/item/clothing/under/pants/f13/ghoul
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/caravan
+ name = "Caravanner pants"
+ path = /obj/item/clothing/under/pants/f13/caravan
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/clothing
+ name = "Cloth pants"
+ path = /obj/item/clothing/under/pants/f13/cloth
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/bone/dancer
+ name = "Bone dancer outfit"
+ path = /obj/item/clothing/under/f13/bone
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/sorrows
+ name = "Sorrows garb"
+ path = /obj/item/clothing/under/f13/sorrows
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/deadhorses
+ name = "Dead horses garb"
+ path = /obj/item/clothing/under/f13/deadhorses
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/rustwalker
+ name = "Rust walkers outfit"
+ path = /obj/item/clothing/under/f13/rustwalkers
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/whitelegs
+ name = "White legs outfit"
+ path = /obj/item/clothing/under/f13/whitelegs
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/masonduds
+ name = "Vagabond's gang attire"
+ path = /obj/item/clothing/under/f13/masonduds
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/helenduds
+ name = "Gambler's gang attire"
+ path = /datum/gear/uniform/wasteland
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/ikeduds
+ name = "Gunfighter's gang attire"
+ path = /obj/item/clothing/under/f13/ikeduds
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/marlowduds
+ name = "Marlow gang attire"
+ path = /obj/item/clothing/under/f13/marlowduds
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/locust
+ name = "Locust Uniform"
+ path = /obj/item/clothing/under/f13/locust
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/keksweater
+ name = "Red sweater"
+ path = /obj/item/clothing/under/f13/keksweater
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/jamrock
+ name = "Disco shirt and pants"
+ path = /obj/item/clothing/under/f13/jamrock
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/ravenharness
+ name = "Raven harness"
+ path = /obj/item/clothing/under/f13/ravenharness
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/raiderharness
+ name = "Raider harness"
+ path = /obj/item/clothing/under/f13/raiderharness
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/worn
+ name = "Worn outfit"
+ path = /obj/item/clothing/under/f13/worn
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/merchant
+ name = "Merchant outfit"
+ path = /obj/item/clothing/under/f13/merchant
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/caravaneer
+ name = "Caravaneer outfit"
+ path = /obj/item/clothing/under/f13/caravaneer
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/mechanic
+ name = "Worn blue jumpsuit"
+ path = /obj/item/clothing/under/f13/mechanic
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/mercharm
+ name = "Merc charmer outfit"
+ path = /obj/item/clothing/under/f13/merccharm
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/doctor
+ name = "Doctor fatigues"
+ path = /obj/item/clothing/under/f13/doctor
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/brahminskin
+ name = "brahmin skin outfit"
+ path = /obj/item/clothing/under/f13/brahminm
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/brahminskin/female
+ name = "female brahmin skin outfit"
+ path = /obj/item/clothing/under/f13/female/brahmin
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/rag
+ name = "Torn rags"
+ path = /obj/item/clothing/under/f13/rag
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/westender
+ name = "Classic tender outfit"
+ path = /obj/item/clothing/under/f13/westender
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/bodyguard
+ name = "Bodyguard outfit"
+ path = /obj/item/clothing/under/f13/bodyguard
+ cost = 2
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/formal
+ name = "Pre-war formal wear"
+ path = /obj/item/clothing/under/f13/formal
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/spring
+ name = "Pre-war spring outfit"
+ path = /obj/item/clothing/under/f13/spring
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/relax
+ name = "Pre-war relax outfit"
+ path = /obj/item/clothing/under/f13/relaxedwear
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/bennys
+ name = "Fancy suit"
+ path = /obj/item/clothing/under/f13/bennys
+ cost = 2
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/batter
+ name = "Worn baseball uniform"
+ path = /obj/item/clothing/under/f13/batter
+ cost = 2
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/cowboyt
+ name = "Dusty prospector outfit"
+ path = /obj/item/clothing/under/f13/cowboyt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/police
+ name = "Police uniform"
+ path = /obj/item/clothing/under/f13/police
+ cost = 3 //Its 3 because it has some small armor against damage
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/trooper
+ name = "State police uniform"
+ path = /obj/item/clothing/under/f13/police/trooper
+ cost = 2
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/formal
+ name = "Police formal uniform"
+ path = /obj/item/clothing/under/f13/police/formal
+ cost = 2
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/roving
+ name = "Roving trader outfit"
+ path = /obj/item/clothing/under/f13/roving
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/machinist
+ name = "Workman outfit"
+ path = /obj/item/clothing/under/f13/machinist
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
+
+/datum/gear/uniform/wasteland/sleazeball
+ name = "Loanshark outfit"
+ path = /obj/item/clothing/under/f13/sleazeball
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND
diff --git a/sound/f13weapons/combatrifle.ogg b/sound/f13weapons/combatrifle.ogg
new file mode 100644
index 0000000000..bd9dde9554
Binary files /dev/null and b/sound/f13weapons/combatrifle.ogg differ