From 3555fffa80db0bd1def33aeaff65d159c0c4955d Mon Sep 17 00:00:00 2001 From: hal9000PR Date: Sun, 10 Jan 2021 12:41:38 +0000 Subject: [PATCH] fixes elbow drop. --- code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 87533a84b14..61dc8759f39 100644 --- a/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm +++ b/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm @@ -1,14 +1,15 @@ /datum/martial_combo/sleeping_carp/elbow_drop name = "Elbow Drop" steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_HARM) - explaination_text = "Opponent must be on the ground. Deals huge damage, instantly kills anyone." + explaination_text = "Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition." /datum/martial_combo/sleeping_carp/elbow_drop/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) if(target.IsWeakened() || target.resting || target.stat) 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)