From 2990f50a49603d76a2ad2e0d28f6f63fafd465de Mon Sep 17 00:00:00 2001 From: Mars Date: Fri, 13 Apr 2018 13:48:29 +0200 Subject: [PATCH] Stops tail lashing if interrupted by falling down or a lack of energy --- code/modules/mob/living/carbon/human/species/station.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index a8ba476ca47..270612c1218 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -108,13 +108,16 @@ user.adjustStaminaLoss(15) C.apply_damage(5, BRUTE, E) user.spin(20, 1) + playsound(user.loc, 'sound/weapons/slash.ogg', 50, 0) + add_logs(user, C, "tail whipped") if(user.restrained()) if(prob(50)) user.Weaken(5) user.visible_message("[src] lost their balance! ", "You lost your balance!") - playsound(user.loc, 'sound/weapons/slash.ogg', 50, 0) - add_logs(user, C, "tail whipped") - + return + if(user.getStaminaLoss() >= 60) //Bit higher as you don't need to start, just would need to keep going with the tail lash. + to_chat(user, "You did hit quite a few people with your tail, and lost the energy to continue.") + return /datum/species/unathi/handle_death(var/mob/living/carbon/human/H)