From 88729b22a515114d4c3e8adf8ded4fbc91afa723 Mon Sep 17 00:00:00 2001 From: Mars Date: Thu, 22 Mar 2018 11:01:27 +0100 Subject: [PATCH 1/5] 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 + ) From ddc102b6cd63a616360f33b2fe7d5db4038b23e4 Mon Sep 17 00:00:00 2001 From: Mars Date: Fri, 23 Mar 2018 08:39:44 +0100 Subject: [PATCH 2/5] More checks for correct status+weaken chance while cuffed --- code/modules/mob/living/carbon/human/species/station.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 8d0d01b788a..a8ba476ca47 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -90,10 +90,11 @@ name = "Tail lash" icon_icon = 'icons/effects/effects.dmi' button_icon_state = "tail" + check_flags = AB_CHECK_LYING | AB_CHECK_CONSCIOUS | AB_CHECK_STUNNED /datum/action/innate/tail_lash/Activate() var/mob/living/carbon/human/user = owner - if(user.restrained() || user.buckled) + if((user.restrained() && user.pulledby) || user.buckled) to_chat(user, "You need freedom of movement to tail lash!") return if(user.getStaminaLoss() >= 50) @@ -107,6 +108,10 @@ user.adjustStaminaLoss(15) C.apply_damage(5, BRUTE, E) user.spin(20, 1) + 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") From 2990f50a49603d76a2ad2e0d28f6f63fafd465de Mon Sep 17 00:00:00 2001 From: Mars Date: Fri, 13 Apr 2018 13:48:29 +0200 Subject: [PATCH 3/5] 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) From bf6bbff103bf534e1d952ecbc1121fe3e86cf4b3 Mon Sep 17 00:00:00 2001 From: Mars Date: Thu, 14 Jun 2018 10:10:38 +0200 Subject: [PATCH 4/5] Textchange --- code/modules/mob/living/carbon/human/species/station.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 270612c1218..1c0c32e77bc 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -116,7 +116,7 @@ user.visible_message("[src] lost their balance! ", "You lost your balance!") 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.") + to_chat(user, "You run out of momentum!") return From f0a1db0ce97c8fd3d53699e07a6d00c8294a2782 Mon Sep 17 00:00:00 2001 From: Mars Date: Mon, 25 Jun 2018 11:50:28 +0200 Subject: [PATCH 5/5] Textchange --- code/modules/mob/living/carbon/human/species/station.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 1c0c32e77bc..e43fa4175cf 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -113,7 +113,7 @@ if(user.restrained()) if(prob(50)) user.Weaken(5) - user.visible_message("[src] lost their balance! ", "You lost your balance!") + user.visible_message("[src] loses [p_their()] balance!", "You lose your balance!") 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 run out of momentum!")