Squashed, totally. (#660)

Vanderlin-Tales-Of-Wine · Feb 5, 2025 · 3adb5dc · 3adb5dc
1 parent 865ce20
commit 3adb5dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/code/game/objects/items/rogueweapons/melee/blunt.dm b/code/game/objects/items/rogueweapons/melee/blunt.dm
@@ -321,7 +321,7 @@
 
 //................ Shillelagh ............... //
 /obj/item/rogueweapon/mace/goden/shillelagh		// The Briar signature weapon. Sturdy oak war club.
-	gripped_intents = list(/datum/intent/mace/smash/heavy)
+	gripped_intents = list(/datum/intent/mace/smash/wood)
 	name = "shillelagh"
 	desc = "Big old oak branch, carved to a deadly weapon."
 	icon_state = "shillelagh"

diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm
@@ -45,6 +45,7 @@
 		H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE)
 		H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
 		H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE)
+		H.mind.teach_crafting_recipe(/datum/crafting_recipe/dendor/shillelagh)
 
 		if(H.age == AGE_OLD)
 			H.mind?.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE)
@@ -94,6 +95,14 @@
 	verbage_tp = "consecrates"
 	craftsound = 'sound/foley/Building-01.ogg'
 
+/datum/crafting_recipe/dendor/shillelagh
+	name = "Shillelagh (unique)"
+	result = /obj/item/rogueweapon/mace/goden/shillelagh
+	reqs = list(/obj/item/grown/log/tree/small = 1,
+				/obj/item/ash = 1,
+				/obj/item/reagent_containers/food/snacks/fat =1 )
+	craftdiff = 2
+
 /datum/crafting_recipe/dendor/shrine/saiga
 	name = "stinging shrine to Dendor (unique)"
 	reqs = list(/obj/item/grown/log/tree/small = 1,