From e2793017bcbf4bdbbac4661c471cb00205f46e34 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Mon, 5 Apr 2021 12:46:43 -0400 Subject: [PATCH] preventions and fixes (#15726) --- code/modules/surgery/organs/vocal_cords.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 6e118068127..51267c859b9 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -112,6 +112,9 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby")) if(check_flags & AB_CHECK_CONSCIOUS) if(owner.stat) return FALSE + if(istype(owner.loc, /obj/effect/dummy/spell_jaunt)) + to_chat(owner, "No one can hear you when you are jaunting, no point in talking now!") + return FALSE return TRUE /datum/action/item_action/organ_action/colossus/Trigger() @@ -139,12 +142,15 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby")) return FALSE if(owner.stat) return FALSE + if(istype(owner.loc, /obj/effect/dummy/spell_jaunt)) + to_chat(owner, "No one can hear you when you are jaunting, no point in talking now!") + return FALSE return TRUE /obj/item/organ/internal/vocal_cords/colossus/handle_speech(message) spans = "colossus yell" //reset spans, just in case someone gets deculted or the cords change owner if(iscultist(owner)) - spans += " narsiesmall" + spans += "narsiesmall" return "[uppertext(message)]" /obj/item/organ/internal/vocal_cords/colossus/speak_with(message)