From 2aeac3166fd635ffd9b8759f60afbc9a7b32a09d Mon Sep 17 00:00:00 2001 From: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Wed, 10 Feb 2021 18:15:17 +0000 Subject: [PATCH] Cowabunga it is (#15487) --- code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm b/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm index 0269c9bed4d..61dc8759f39 100644 --- a/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm +++ b/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm @@ -8,7 +8,8 @@ user.do_attack_animation(target, ATTACK_EFFECT_PUNCH) target.visible_message("[user] elbow drops [target]!", \ "[user] piledrives you with [user.p_their()] elbow!") - target.death() //FINISH HIM! + if(target.health <= 0) //so it actually checks for crit now + target.death() //FINISH HIM! target.apply_damage(50, BRUTE, "chest") playsound(get_turf(target), 'sound/weapons/punch1.ogg', 75, 1, -1) add_attack_logs(user, target, "Melee attacked with martial-art [src] : Elbow Drop", ATKLOG_ALL)