Merge pull request #3394 from EtheoBoxxman/wicker

wicker? hardly know 'er
ARF-SS13 · Oct 12, 2023 · 6873286 · 6873286
2 parents 4395e86 + e1a04d7
commit 6873286
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/code/datums/components/crafting/recipes/recipes_primal.dm b/code/datums/components/crafting/recipes/recipes_primal.dm
@@ -163,6 +163,14 @@
 	result = /obj/structure/punji_sticks
 	category = CAT_PRIMAL
 
+/datum/crafting_recipe/wickerdoll
+	name = "Wicker Doll"
+	time = 15
+	reqs = list(
+			/obj/item/stack/sheet/hay = 25)
+	result = /obj/item/voodoo
+	category = CAT_PRIMAL
+
 /datum/crafting_recipe/tribal_pa
 	name = "Tribal Salvaged Power Armor"
 	time = 120

diff --git a/code/modules/jobs/job_types/tribals.dm b/code/modules/jobs/job_types/tribals.dm
@@ -170,6 +170,7 @@ Tribal Shaman
 	..()
 	if(visualsOnly)
 		return
+	H.mind.teach_crafting_recipe(/datum/crafting_recipe/wickerdoll)
 	ADD_TRAIT(H, TRAIT_BLINDFAITH, src)
 	ADD_TRAIT(H, TRAIT_SURGERY_LOW, src)
 	ADD_TRAIT(H, TRAIT_SURGERY_MID, src)
@@ -316,6 +317,7 @@ Druid
 	..()
 	if(visualsOnly)
 		return
+	H.mind.teach_crafting_recipe(/datum/crafting_recipe/wickerdoll)
 	ADD_TRAIT(H, TRAIT_BLINDFAITH, src)
 	ADD_TRAIT(H, TRAIT_SURGERY_LOW, src)
 	ADD_TRAIT(H, TRAIT_DNAWHIZ, src)
@@ -505,6 +507,7 @@ Hunter
 	..()
 	if(visualsOnly)
 		return
+	H.mind.teach_crafting_recipe(/datum/crafting_recipe/wickerdoll)
 	ADD_TRAIT(H, TRAIT_TRAPPER, src)
 
 

diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -662,6 +662,15 @@
 	new /obj/item/gun_upgrade/muzzle/silencer(src)
 	new /obj/item/radio(src)
 
+/datum/gear/donator/kits/jademanique
+	name = "Ifanse's Trinkets"
+	path = /obj/item/storage/box/large/custom_kit/jademanique
+	ckeywhitelist = list("jademanique")
+
+/obj/item/storage/box/large/custom_kit/jademanique/PopulateContents()
+	new /obj/item/voodoo(src)
+	new /obj/item/clothing/mask/chameleon(src)
+
 /datum/gear/donator/kits/jaggachi
 	name = "Scug Industries Kit"
 	path = /obj/item/storage/box/large/custom_kit/jaggachi