diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 0383c3f1ee..a73545c685 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -247,6 +247,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\ new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \ new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),\ + new/datum/stack_recipe("training bokken", /obj/item/melee/bokken, 10, time = 15),\ null, \ new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood/, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("winged wooden chair", /obj/structure/chair/wood/wings, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 56737cd1a9..f94140db3c 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -249,6 +249,118 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 playsound(src, 'sound/weapons/bladeslice.ogg', 50, 1) return(BRUTELOSS) +/obj/item/melee/bokken // parrying stick + name = "bokken" + desc = "A space-Japanese training sword made of wood and shaped like a katana." + icon_state = "bokken" + item_state = "bokken" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK + w_class = WEIGHT_CLASS_BULKY + force = 9 + throwforce = 10 + damtype = STAMINA + attack_verb = list("whacked", "smacked", "struck") + total_mass = TOTAL_MASS_MEDIEVAL_WEAPON + hitsound = 'sound/weapons/grenadelaunch.ogg' // no good wood thunk sounds + var/harm = FALSE // TRUE = brute, FALSE = stam + var/reinforced = FALSE + var/burnt = FALSE + var/burned_in // text you burned in (with a welder) + var/quick_parry = FALSE // false = default parry, true = really small parry window + item_flags = ITEM_CAN_PARRY + block_parry_data = /datum/block_parry_data/bokken + bare_wound_bonus = 0 + wound_bonus = 0 + +/datum/block_parry_data/bokken // fucked up parry data, emphasizing quicker, shorter parries + parry_stamina_cost = 8 // be wise about when you parry, though, else you won't be able to fight enough to make it count + parry_time_windup = 0 + parry_time_active = 10 // small parry window + parry_time_spindown = 0 + // parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK // bokken users can no longer strike while parrying + parry_time_perfect = 1.5 + parry_time_perfect_leeway = 1 + parry_imperfect_falloff_percent = 7.5 + parry_efficiency_to_counterattack = 100 + parry_efficiency_considered_successful = 65 // VERY generous + parry_efficiency_perfect = 120 + parry_failed_stagger_duration = 3 SECONDS + parry_data = list(PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5) // 7*2.5 = 17.5, 8*2.5 = 20, 9*2.5 = 22.5, 10*2.5 = 25 + +/datum/block_parry_data/bokken/quick_parry // emphasizing REALLY SHORT PARRIES + parry_stamina_cost = 6 // still more costly than most parries, but less than a full bokken parry + parry_time_active = 5 // REALLY small parry window + parry_time_perfect = 2.5 // however... + parry_time_perfect_leeway = 2.5 // the entire time, the parry is perfect + parry_failed_stagger_duration = 1 SECONDS + parry_failed_clickcd_duration = 1 SECONDS // more forgiving punishments for missed parries + // still, don't fucking miss your parries or you're down stamina and staggered to shit + +/obj/item/melee/bokken/Initialize() + . = ..() + AddElement(/datum/element/sword_point) + +/obj/item/melee/bokken/attack_self(mob/user) + harm = !harm + if(harm) + force -= 2 + damtype = BRUTE + attack_verb = list("bashed", "smashed", "attacked") + bare_wound_bonus = 15 // having your leg smacked by a wooden stick is probably not great for it if it's naked + wound_bonus = 0 + else + force += 2 + damtype = STAMINA + attack_verb = list("whacked", "smacked", "struck") + bare_wound_bonus = 0 + wound_bonus = 0 + to_chat(user, "[src] is now [harm ? "harmful" : "not quite as harmful"].") + +/obj/item/melee/bokken/AltClick(mob/user) + . = ..() + quick_parry = !quick_parry + if(quick_parry) + block_parry_data = /datum/block_parry_data/bokken/quick_parry + else + block_parry_data = /datum/block_parry_data/bokken + to_chat(user, "[src] is now [quick_parry ? "emphasizing shorter parries, forcing you to riposte or be staggered" : "emphasizing longer parries, with a shorter window to riposte but more forgiving parries"].") + +/obj/item/melee/bokken/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 + if(I.tool_behaviour == TOOL_WELDER) + var/new_burn = stripped_input(user, "What do you wish to burn into [src]?", "Burnt Inscription","", 140) + if(new_burn) + burned_in = new_burn + if(!burnt) + icon_state += "_burnt" + item_state += "_burnt" + burnt = TRUE + update_icon() + update_icon_state() + if(istype(I, /obj/item/stack/rods)) + var/obj/item/stack/rods/R = I + if(!reinforced) + if(R.use(1)) + force++ + reinforced = TRUE + to_chat(user, "You slide a metal rod into [src]\'s hilt. It feels a little heftier in your hands.") + else + to_chat(user, "[src] already has a weight slid into the hilt.") + +/obj/item/melee/bokken/examine(mob/user) + . = ..() + if(quick_parry) + . += " [src] is gripped in a way to emphasize quicker parries." + if(reinforced) + . += " There's a metal rod shoved into the base." + if(burnt) + . += " Burned into the \"blade\" is [burned_in]." + /obj/item/wirerod name = "wired rod" desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index b06636ea2e..dd03eea66f 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -45,8 +45,8 @@ REMOVE_TRAIT(user, secondary_trait, GLOVE_TRAIT) if(ishuman(user)) var/mob/living/carbon/human/H = user - H.dna.species.punchdamagehigh = initial(H.dna.species.punchdamagehigh) - H.dna.species.punchdamagelow = initial(H.dna.species.punchdamagelow) + H.dna.species.punchdamagehigh -= enhancement + H.dna.species.punchdamagelow -= enhancement return ..() /obj/item/clothing/gloves/fingerless/pugilist/chaplain diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index ae2889e8a2..8097d243de 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( singular_name = "marker beacon" desc = "Prism-brand path illumination devices. Used by miners to mark paths and warn of danger." icon = 'icons/obj/lighting.dmi' - icon_state = "markerbronze" + icon_state = "marker" merge_type = /obj/item/stack/marker_beacon max_amount = 100 novariants = TRUE diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm index 8141603f64..4fd2459e70 100644 --- a/code/modules/mob/living/living_active_parry.dm +++ b/code/modules/mob/living/living_active_parry.dm @@ -256,7 +256,7 @@ var/datum/block_parry_data/data = get_parry_data() if(data.parry_sounds) playsound(src, pick(data.parry_sounds), 75) - visible_message("[src] parries \the [attack_text][length(effect_text)? ", [english_list(effect_text)] [attacker]" : ""]!") + visible_message("[src] parries [attack_text][length(effect_text)? ", [english_list(effect_text)] [attacker]" : ""]!") /// Run counterattack if any /mob/living/proc/run_parry_countereffects(atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list = list(), parry_efficiency) diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 00cffd9006..ae8e6221c6 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index fd3016ac89..52ef75020c 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi index 1e48d57ac7..0ca36ad43d 100644 Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi index 5a5ee6f3db..59d7bbce69 100644 Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index cf7a87d28b..84bba1a578 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index 675005da91..c3ca67eeae 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ