brings bacjUpdate food.dm

_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

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"

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,

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,

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)

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
 

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

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"

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
 	)

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,

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"

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."

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

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),

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."