From 88729b22a515114d4c3e8adf8ded4fbc91afa723 Mon Sep 17 00:00:00 2001 From: Mars Date: Thu, 22 Mar 2018 11:01:27 +0100 Subject: [PATCH] Tail whip logic+logging Were only able to tail whip while being both restrained and buckled, when the intention was neither restrained nor buckled. Also adds the logging for the tail whip attack. --- code/modules/mob/living/carbon/human/species/station.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index abeb10d0e1f..8d0d01b788a 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -93,7 +93,7 @@ /datum/action/innate/tail_lash/Activate() var/mob/living/carbon/human/user = owner - if(!user.restrained() || !user.buckled) + if(user.restrained() || user.buckled) to_chat(user, "You need freedom of movement to tail lash!") return if(user.getStaminaLoss() >= 50) @@ -108,6 +108,7 @@ 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") @@ -1071,4 +1072,4 @@ "metabolic strainer" = /obj/item/organ/internal/liver/drask, "eyes" = /obj/item/organ/internal/eyes/drask, //5 darksight. "brain" = /obj/item/organ/internal/brain/drask - ) \ No newline at end of file + )