From 61779bda6e7df40816471eb449aed1ca5d79ada7 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sun, 21 Jan 2024 15:55:23 -0500 Subject: [PATCH] fixes an 8 year old krav sound / visual bug (#23681) * fixes an 8 year old krav sound bug * Update code/modules/martial_arts/krav_maga.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/modules/martial_arts/krav_maga.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * So true bestie * Update code/modules/martial_arts/krav_maga.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * moves the apply * removes kick from muscle implant --------- Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --- code/modules/martial_arts/krav_maga.dm | 10 +++++----- code/modules/martial_arts/muscle_implant.dm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/martial_arts/krav_maga.dm b/code/modules/martial_arts/krav_maga.dm index 1c59f19ea12..7b018bbca56 100644 --- a/code/modules/martial_arts/krav_maga.dm +++ b/code/modules/martial_arts/krav_maga.dm @@ -108,15 +108,15 @@ if(IS_HORIZONTAL(D)) bonus_damage += 5 picked_hit_type = "stomps on" - D.apply_damage(bonus_damage, BRUTE) - if(picked_hit_type == "kicks" || picked_hit_type == "stomps") + if(picked_hit_type == "kicks" || IS_HORIZONTAL(D)) A.do_attack_animation(D, ATTACK_EFFECT_KICK) - playsound(get_turf(D), 'sound/effects/hit_kick.ogg', 50, 1, -1) + playsound(get_turf(D), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) else A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) - playsound(get_turf(D), 'sound/effects/hit_punch.ogg', 50, 1, -1) + playsound(get_turf(D), 'sound/effects/hit_punch.ogg', 50, TRUE, -1) D.visible_message("[A] [picked_hit_type] [D]!", \ "[A] [picked_hit_type] you!") + D.apply_damage(bonus_damage, BRUTE) return TRUE /datum/martial_art/krav_maga/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) @@ -132,7 +132,7 @@ else D.visible_message("[A] attempted to disarm [D]!", \ "[A] attempted to disarm [D]!") - playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(D, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1) return TRUE //Krav Maga Gloves diff --git a/code/modules/martial_arts/muscle_implant.dm b/code/modules/martial_arts/muscle_implant.dm index a048708ddbf..bae6f2d6609 100644 --- a/code/modules/martial_arts/muscle_implant.dm +++ b/code/modules/martial_arts/muscle_implant.dm @@ -12,7 +12,7 @@ if(HAS_TRAIT(user, TRAIT_PACIFISM)) to_chat(user, "You don't want to hurt [target]!") return FALSE - var/picked_hit_type = pick("punch", "smash", "kick") + var/picked_hit_type = pick("punch", "smash") if(ishuman(target) && target.check_shields(user, punch_damage, "[user]'s' [picked_hit_type]")) user.do_attack_animation(target) playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)