Merge branch 'main' of https://github.com/StoneHedgeSS13/StoneHedge

StoneHedgeSS13 · Dec 27, 2024 · d8737d7 · d8737d7
2 parents 417ad9e + f891e05
commit d8737d7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/code/game/objects/items/rogueweapons/melee/flail.dm b/code/game/objects/items/rogueweapons/melee/flail.dm
@@ -132,7 +132,6 @@
 
 /obj/item/rogueweapon/whip
 	force = 21
-	possible_item_intents = list(/datum/intent/whip/crack, /datum/intent/whip/lash, /datum/intent/whip/punish)
 	name = "whip"
 	desc = "A leather whip, built to last with an sharp stone for a tip."
 	icon_state = "whip"
@@ -142,6 +141,7 @@
 	wlength = WLENGTH_NORMAL
 	w_class = WEIGHT_CLASS_NORMAL
 	slot_flags = ITEM_SLOT_HIP | ITEM_SLOT_BELT
+	possible_item_intents = list(/datum/intent/whip/crack, /datum/intent/whip/lash, /datum/intent/whip/punish)
 	associated_skill = /datum/skill/combat/whipsflails
 	sewrepair = TRUE
 	embedding = list("embedded_pain_multiplier" = 0, "embed_chance" = 0, "embedded_fall_chance" = 0)
@@ -162,8 +162,12 @@
 				return list("shrink" = 0.5,"sx" = -10,"sy" = -3,"nx" = 11,"ny" = -2,"wx" = -7,"wy" = -3,"ex" = 3,"ey" = -3,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 22,"sturn" = -23,"wturn" = -23,"eturn" = 29,"nflip" = 0,"sflip" = 8,"wflip" = 8,"eflip" = 0)
 			if("onbelt")
 				return list("shrink" = 0.3,"sx" = -2,"sy" = -5,"nx" = 4,"ny" = -5,"wx" = 0,"wy" = -5,"ex" = 2,"ey" = -5,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0)
+/obj/item/rogueweapon/whip/Initialize()
+    . = ..()
 
-
+/obj/item/rogueweapon/whip/attack(mob/living/target, mob/living/user)
+	 force = 21
+	 . = ..()
 /obj/item/rogueweapon/whip/antique
 	force = 29
 	name = "Repenta En"

diff --git a/code/modules/roguetown/roguecrafting/leather.dm b/code/modules/roguetown/roguecrafting/leather.dm
@@ -323,7 +323,8 @@
 /datum/crafting_recipe/roguetown/leather/whip
 	name = "leather whip"
 	result = /obj/item/rogueweapon/whip
-	reqs = list(/obj/item/natural/hide = 2,/obj/item/natural/stone = 1)
+	reqs = list(/obj/item/natural/hide/cured = 2,
+				/obj/item/natural/stone = 1)
 	sellprice = 26	//Costs about ~14 to make, resells very well.
 	craftdiff = 3	//Harder craft.
 

diff --git a/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/weapons.dm b/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/weapons.dm
@@ -255,6 +255,14 @@
 	craftdiff = 3
 	i_type = "Weapons"
 
+/datum/anvil_recipe/weapons/beardedaxe
+	name = "Bearded Axe (+2 Steel Ingot, +1 Small Log)"
+	req_bar = /obj/item/ingot/steel
+	additional_items = list(/obj/item/ingot/steel, /obj/item/grown/log/tree/small, /obj/item/ingot/steel)
+	created_item = /obj/item/rogueweapon/greataxe/bearded
+	craftdiff = 4
+	i_type = "Weapons"
+
 /datum/anvil_recipe/weapons/zweihander
 	name = "Zweihander (+2 Iron)"
 	req_bar = /obj/item/ingot/iron