mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 09:54:52 +00:00
A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused.
This commit is contained in:
@@ -84,7 +84,19 @@
|
|||||||
category = CAT_WEAPONRY
|
category = CAT_WEAPONRY
|
||||||
subcategory = CAT_MELEE
|
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"
|
name = "Training Wakizashi Bokken"
|
||||||
result = /obj/item/melee/bokken/waki
|
result = /obj/item/melee/bokken/waki
|
||||||
tools = list(TOOL_SCREWDRIVER)
|
tools = list(TOOL_SCREWDRIVER)
|
||||||
@@ -95,6 +107,17 @@
|
|||||||
category = CAT_WEAPONRY
|
category = CAT_WEAPONRY
|
||||||
subcategory = CAT_MELEE
|
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
|
/datum/crafting_recipe/bola
|
||||||
name = "Bola"
|
name = "Bola"
|
||||||
result = /obj/item/restraints/legcuffs/bola
|
result = /obj/item/restraints/legcuffs/bola
|
||||||
@@ -478,9 +501,9 @@
|
|||||||
category = CAT_WEAPONRY
|
category = CAT_WEAPONRY
|
||||||
subcategory = CAT_PARTS
|
subcategory = CAT_PARTS
|
||||||
|
|
||||||
/datum/crafting_recipe/bokken_ironblade
|
/datum/crafting_recipe/bokken_steelblade
|
||||||
name = "Training Ironwood Bokken Blade"
|
name = "Training Ironwood Bokken Blade"
|
||||||
result = /obj/item/bokken_ironblade
|
result = /obj/item/bokken_steelblade
|
||||||
tools = list(/obj/item/hatchet, TOOL_WELDER)
|
tools = list(/obj/item/hatchet, TOOL_WELDER)
|
||||||
reqs = list(/obj/item/grown/log/steel = 2)
|
reqs = list(/obj/item/grown/log/steel = 2)
|
||||||
time = 20
|
time = 20
|
||||||
@@ -489,7 +512,7 @@
|
|||||||
|
|
||||||
/datum/crafting_recipe/wakibokken_blade
|
/datum/crafting_recipe/wakibokken_blade
|
||||||
name = "Training Wakizashi Ironwood Bokken Blade"
|
name = "Training Wakizashi Ironwood Bokken Blade"
|
||||||
result = /obj/item/wakibokken_ironblade
|
result = /obj/item/wakibokken_steelblade
|
||||||
tools = list(/obj/item/hatchet, TOOL_WELDER)
|
tools = list(/obj/item/hatchet, TOOL_WELDER)
|
||||||
reqs = list(/obj/item/grown/log/steel = 1)
|
reqs = list(/obj/item/grown/log/steel = 1)
|
||||||
time = 20
|
time = 20
|
||||||
|
|||||||
@@ -412,11 +412,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
|
|||||||
if(burnt)
|
if(burnt)
|
||||||
. += " Burned into the \"blade\" is [burned_in]."
|
. += " Burned into the \"blade\" is [burned_in]."
|
||||||
|
|
||||||
/obj/item/melee/bokken/ironwood
|
/obj/item/melee/bokken/steelwood
|
||||||
name = "ironwood bokken"
|
name = "steelwood 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."
|
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_iron"
|
icon_state = "bokken_steel"
|
||||||
item_state = "bokken_iron"
|
item_state = "bokken_steel"
|
||||||
force = 12
|
force = 12
|
||||||
stamina_damage_increment = 3
|
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
|
/datum/block_parry_data/bokken/waki/quick_parry/proj
|
||||||
parry_efficiency_perfect_override = list()
|
parry_efficiency_perfect_override = list()
|
||||||
|
|
||||||
/obj/item/melee/bokken/waki/ironwood
|
/obj/item/melee/bokken/waki/steelwood
|
||||||
name = "wakizashi ironwood bokken"
|
name = "wakizashi steelwood 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."
|
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_iron"
|
icon_state = "wakibokken_steel"
|
||||||
item_state = "wakibokken_iron"
|
item_state = "wakibokken_steel"
|
||||||
force = 8
|
force = 8
|
||||||
stamina_damage_increment = 2
|
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'
|
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
|
||||||
w_class = WEIGHT_CLASS_NORMAL
|
w_class = WEIGHT_CLASS_NORMAL
|
||||||
|
|
||||||
/obj/item/bokken_ironblade
|
/obj/item/bokken_steelblade
|
||||||
name = "training bokken ironwood blade"
|
name = "training bokken steelwood blade"
|
||||||
desc = "The blade piece of a ironwood bokken katana."
|
desc = "The blade piece of a steelwood bokken katana."
|
||||||
icon = 'icons/obj/smith.dmi'
|
icon = 'icons/obj/smith.dmi'
|
||||||
icon_state = "bokken_iron"
|
icon_state = "bokken_steel"
|
||||||
item_state = "switchblade_ext"
|
item_state = "switchblade_ext"
|
||||||
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
|
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
|
||||||
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.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'
|
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
|
||||||
w_class = WEIGHT_CLASS_NORMAL
|
w_class = WEIGHT_CLASS_NORMAL
|
||||||
|
|
||||||
/obj/item/wakibokken_ironblade
|
/obj/item/wakibokken_steelblade
|
||||||
name = "training bokken ironwood wakizashi blade"
|
name = "training bokken steelwood wakizashi blade"
|
||||||
desc = "The blade piece of a ironwood bokken katana."
|
desc = "The blade piece of a steelwood bokken katana."
|
||||||
icon = 'icons/obj/smith.dmi'
|
icon = 'icons/obj/smith.dmi'
|
||||||
icon_state = "wakibokken_iron"
|
icon_state = "wakibokken_steel"
|
||||||
item_state = "switchblade_ext"
|
item_state = "switchblade_ext"
|
||||||
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
|
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
|
||||||
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
|
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 125 KiB After Width: | Height: | Size: 125 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
Reference in New Issue
Block a user