diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index 556a739841..dae685b08f 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -84,7 +84,19 @@ category = CAT_WEAPONRY subcategory = CAT_MELEE -/datum/crafting_recipe/bokken +/datum/crafting_recipe/bokken_steelwood + name = "Training Bokken" + result = /obj/item/melee/bokken/steelwood + tools = list(TOOL_SCREWDRIVER) + reqs = list(/obj/item/bokken_steelblade = 1, + /obj/item/bokken_hilt = 1, + /obj/item/stack/sheet/cloth = 2, + /obj/item/stack/sheet/leather = 1) + time = 60 + category = CAT_WEAPONRY + subcategory = CAT_MELEE + +/datum/crafting_recipe/wakibokken name = "Training Wakizashi Bokken" result = /obj/item/melee/bokken/waki tools = list(TOOL_SCREWDRIVER) @@ -95,6 +107,17 @@ category = CAT_WEAPONRY subcategory = CAT_MELEE +/datum/crafting_recipe/wakibokken_steelwood + name = "Training Wakizashi Steelwood Bokken" + result = /obj/item/melee/bokken/waki/steelwood + tools = list(TOOL_SCREWDRIVER) + reqs = list(/obj/item/wakibokken_steelblade = 1, + /obj/item/bokken_hilt = 1, + /obj/item/stack/sheet/cloth = 1) + time = 40 + category = CAT_WEAPONRY + subcategory = CAT_MELEE + /datum/crafting_recipe/bola name = "Bola" result = /obj/item/restraints/legcuffs/bola @@ -478,9 +501,9 @@ category = CAT_WEAPONRY subcategory = CAT_PARTS -/datum/crafting_recipe/bokken_ironblade +/datum/crafting_recipe/bokken_steelblade name = "Training Ironwood Bokken Blade" - result = /obj/item/bokken_ironblade + result = /obj/item/bokken_steelblade tools = list(/obj/item/hatchet, TOOL_WELDER) reqs = list(/obj/item/grown/log/steel = 2) time = 20 @@ -489,7 +512,7 @@ /datum/crafting_recipe/wakibokken_blade name = "Training Wakizashi Ironwood Bokken Blade" - result = /obj/item/wakibokken_ironblade + result = /obj/item/wakibokken_steelblade tools = list(/obj/item/hatchet, TOOL_WELDER) reqs = list(/obj/item/grown/log/steel = 1) time = 20 diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 554e30d651..07900d6bbf 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -412,11 +412,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 if(burnt) . += " Burned into the \"blade\" is [burned_in]." -/obj/item/melee/bokken/ironwood - name = "ironwood bokken" - desc = "A misnomer of sorts, this is effectively a blunt katana made from ironwood, a dense organic wood derived from ironcaps. Why ironwood? Druids can use it. Duh." - icon_state = "bokken_iron" - item_state = "bokken_iron" +/obj/item/melee/bokken/steelwood + name = "steelwood bokken" + desc = "A misnomer of sorts, this is effectively a blunt katana made from steelwood, a dense organic wood derived from steelcaps. Why steelwood? Druids can use it. Duh." + icon_state = "bokken_steel" + item_state = "bokken_steel" force = 12 stamina_damage_increment = 3 @@ -463,11 +463,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /datum/block_parry_data/bokken/waki/quick_parry/proj parry_efficiency_perfect_override = list() -/obj/item/melee/bokken/waki/ironwood - name = "wakizashi ironwood bokken" - desc = "A misnomer of sorts, this is effectively a blunt wakizashi made from ironwood, a dense organic wood derived from ironcaps. Why ironwood? Druids can use it. Duh." - icon_state = "wakibokken_iron" - item_state = "wakibokken_iron" +/obj/item/melee/bokken/waki/steelwood + name = "wakizashi steelwood bokken" + desc = "A misnomer of sorts, this is effectively a blunt wakizashi made from steelwood, a dense organic wood derived from steelcaps. Why steelwood? Druids can use it. Duh." + icon_state = "wakibokken_steel" + item_state = "wakibokken_steel" force = 8 stamina_damage_increment = 2 @@ -510,11 +510,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' w_class = WEIGHT_CLASS_NORMAL -/obj/item/bokken_ironblade - name = "training bokken ironwood blade" - desc = "The blade piece of a ironwood bokken katana." +/obj/item/bokken_steelblade + name = "training bokken steelwood blade" + desc = "The blade piece of a steelwood bokken katana." icon = 'icons/obj/smith.dmi' - icon_state = "bokken_iron" + icon_state = "bokken_steel" item_state = "switchblade_ext" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' @@ -530,11 +530,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' w_class = WEIGHT_CLASS_NORMAL -/obj/item/wakibokken_ironblade - name = "training bokken ironwood wakizashi blade" - desc = "The blade piece of a ironwood bokken katana." +/obj/item/wakibokken_steelblade + name = "training bokken steelwood wakizashi blade" + desc = "The blade piece of a steelwood bokken katana." icon = 'icons/obj/smith.dmi' - icon_state = "wakibokken_iron" + icon_state = "wakibokken_steel" item_state = "switchblade_ext" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' diff --git a/icons/obj/clothing/belt_overlays.dmi b/icons/obj/clothing/belt_overlays.dmi index 132da43d37..1178588ee7 100644 Binary files a/icons/obj/clothing/belt_overlays.dmi and b/icons/obj/clothing/belt_overlays.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index dbcbd1aaa3..119e612c40 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/smith.dmi b/icons/obj/smith.dmi index cc53459266..dcf4a77131 100644 Binary files a/icons/obj/smith.dmi and b/icons/obj/smith.dmi differ