Adds the Kanabo Weapon (#4462)

* Kanabo Items - Missing Inhands

* Inhand Icons for Kanabo

* Resolves Conflict.

* Minor typo correction.

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -130,6 +130,18 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_MELEE
 
+/datum/crafting_recipe/kanabo
+	name = "Kanabo"
+	result = /obj/item/melee/kanabo
+	tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH)
+	reqs = list(/obj/item/kanabo_shaft = 1,
+				/obj/item/kanabo_studs = 1,
+				/obj/item/stack/material/cloth = 3,
+				/obj/item/stack/material/leather = 2)
+	time = 100
+	category = CAT_WEAPONRY
+	subcategory = CAT_MELEE
+
 /datum/crafting_recipe/knuckle_dusters
 	name = "Brass Knuckles"
 	result = /obj/item/clothing/gloves/knuckledusters
@@ -585,3 +597,22 @@
 	time = 20
 	category = CAT_WEAPONRY
 	subcategory = CAT_PARTS
+
+// KANABO CRAFTING
+/datum/crafting_recipe/kanabo_shaft
+	name = "Kanabo Shaft"
+	result = /obj/item/kanabo_shaft
+	tools = list(/obj/item/material/knife/machete/hatchet)
+	reqs = list(/obj/item/stack/material/wood = 20,
+				/obj/item/stack/material/cloth = 2)
+	time = 30
+	category = CAT_WEAPONRY
+	subcategory = CAT_PARTS
+
+/datum/crafting_recipe/kanabo_studs
+	name = "Kanabo Studs"
+	result = /obj/item/kanabo_studs
+	reqs = list(/obj/item/stack/material/steel = 5)
+	time = 10
+	category = CAT_WEAPONRY
+	subcategory = CAT_PARTS

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -332,3 +332,31 @@
 		if(prob(25))
 			(INVOKE_ASYNC(src, .proc/jedi_spin, user))
 			return ..()
+
+//Kanabo
+/obj/item/melee/kanabo // parrying stick
+	name = "kanabo"
+	desc = "A heavy wooden club reinforced with metal studs. Ancient Terran Oni were often depicted carrying this weapon."
+	icon_state = "kanabo"
+	slot_flags = SLOT_BACK
+	damtype = BRUTE
+	force = 15
+	throw_force = 5
+	attack_verb = list("battered", "hammered", "struck")
+	hitsound = 'sound/weapons/genhit3.ogg'
+
+/obj/item/melee/kanabo/attackby(obj/item/I, mob/living/user, params)
+	if(istype(I, /obj/item/pen))
+		var/new_name = stripped_input(user, "What do you wish to name [src]?", "New Name", "bokken", 30)
+		if(new_name)
+			name = new_name
+
+/obj/item/kanabo_shaft
+	name = "kanabo shaft"
+	desc = "A hefty wooden club, not dissimilar to an oversized baseball bat."
+	icon_state = "kanabo_shaft"
+
+/obj/item/kanabo_studs
+	name = "kanabo studs"
+	desc = "A handful of octahedral studs. Fashioned out of steel, these studs are designed to be driven into solid wood."
+	icon_state = "kanabo_studs"