cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes an 8 year old krav sound / visual bug (#23681)

Browse Source 
* 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>
This commit is contained in:
Qwertytoforty
2024-01-21 15:55:23 -05:00
committed by GitHub
parent 5bf3d99160
commit 61779bda6e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/martial_arts/krav_maga.dm
+5 -5
View File
@@ -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("<span class='danger'>[A] [picked_hit_type] [D]!</span>", \
"<span class='userdanger'>[A] [picked_hit_type] you!</span>")
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("<span class='danger'>[A] attempted to disarm [D]!</span>", \
"<span class='userdanger'>[A] attempted to disarm [D]!</span>")
playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(D, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
return TRUE
//Krav Maga Gloves
code/modules/martial_arts/muscle_implant.dm
+1 -1
View File
@@ -12,7 +12,7 @@
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, "<span class='warning'>You don't want to hurt [target]!</span>")
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)