Update recipes_tailoring.dm

_maps/map_files/Pahrump/Pahrump-Surface-2.dmm

@@ -27283,6 +27283,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,
@@ -45986,6 +45990,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,
@@ -70261,7 +70272,7 @@ wvV
 bAo
 dlI
 dlI
-dlR
+kXS
 ehN
 ubg
 ehN
@@ -119314,7 +119325,7 @@ mvv
 doX
 cWG
 cWG
-cWG
+tch
 cWS
 nvr
 nvr

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/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,
@@ -2162,7 +2161,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/items/granters.dm

@@ -838,6 +838,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/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/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

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

code/modules/clothing/suits/f13armor.dm

@@ -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

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

code/modules/clothing/under/f13.dm

@@ -1681,9 +1681,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"

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,4 @@
 	tastes = list("beef luncheon loaf" = 3, "jalapeno peppers and spices" = 2)
 	trash = /obj/item/trash/f13/k_ration
 	foodtype = MEAT
+

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

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
 */