From 42a521dd502a968d202d63ad18b91ae38cae4383 Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Fri, 20 Jan 2023 19:04:33 -0500 Subject: [PATCH] mime greys begone (#20144) --- code/game/dna/mutations/powers.dm | 6 +++++- code/modules/mob/language.dm | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/dna/mutations/powers.dm b/code/game/dna/mutations/powers.dm index 107c19cc9ca..b23c12d8874 100644 --- a/code/game/dna/mutations/powers.dm +++ b/code/game/dna/mutations/powers.dm @@ -929,7 +929,11 @@ return new /datum/spell_targeting/telepathic /obj/effect/proc_holder/spell/remotetalk/cast(list/targets, mob/user = usr) - if(!ishuman(user)) return + if(!ishuman(user)) + return + if(user.mind?.miming) // Dont let mimes telepathically talk + to_chat(user,"You can't communicate without breaking your vow of silence.") + return var/say = input("What do you wish to say") as text|null if(!say || usr.stat) return diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index ada30b1cdb9..a14df05fdb4 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -338,6 +338,9 @@ ..(speaker,message,speaker.real_name) /datum/language/grey/check_can_speak(mob/living/speaker) + if(speaker.mind?.miming) // Because its a hivemind, mimes would be able to speak otherwise + to_chat(speaker,"You can't communicate without breaking your vow of silence.") + return FALSE if(ishuman(speaker)) var/mob/living/carbon/human/S = speaker var/obj/item/organ/external/rhand = S.get_organ("r_hand")