From a4514f939430b894810844d42112806312aec2b7 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 11 Jun 2022 01:08:34 -0700 Subject: [PATCH 1/2] Update coiling.dm --- .../mob/living/carbon/human/innate_abilities/coiling.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm b/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm index 52e2a87a7d..6c74ec9909 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm @@ -30,6 +30,10 @@ currently_coiled.pixel_x = 12 /datum/action/innate/ability/coiling/proc/coil_mob(var/mob/living/carbon/human/H) + if(currently_coiling) + to_chat(owner, SPAN_WARNING("You are already coiling someone!")) + return + // begin the coiling action H.visible_message("[owner] coils [H] with their tail!", \ "[owner] coils you with their tail!") @@ -58,6 +62,9 @@ /datum/action/innate/ability/coiling/proc/cancel_coil() var/mob/living/carbon/human/H = owner + + if(!currently_coiling) + return // cancel the coiling action by removing the overlay currently_coiled.pixel_x = 0 From 08b532ff424153abb5de9257870b405fcba6bee4 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 11 Jun 2022 01:13:46 -0700 Subject: [PATCH 2/2] Update coiling.dm --- .../modules/mob/living/carbon/human/innate_abilities/coiling.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm b/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm index 6c74ec9909..2cfbf9fb73 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm @@ -31,7 +31,7 @@ /datum/action/innate/ability/coiling/proc/coil_mob(var/mob/living/carbon/human/H) if(currently_coiling) - to_chat(owner, SPAN_WARNING("You are already coiling someone!")) + to_chat(owner, span_warning("You are already coiling someone!")) return // begin the coiling action