From 093c76128a06ac760e0e333616c0fe0bb1ac5c5e Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Wed, 1 Aug 2012 15:22:39 +0000 Subject: [PATCH] Changeling mimes can now speak through hivemind. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4270 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/carbon/human/say.dm | 16 ++++++++++++---- code/modules/mob/living/silicon/say.dm | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 151e5f74609..8a3f0000c84 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -3,10 +3,18 @@ if (silent) return - //Mimes dont speak! - if (length(message) >= 1) - if (miming && copytext(message, 1, 2) != "*") - return + //Mimes dont speak! Changeling hivemind and emotes are allowed. + if (miming) + if(length(message) >= 2) + if(src.changeling) + if(copytext(message, 1, 2) != "*" && copytext(message, 1, 3) != ":g" && copytext(message, 1, 3) != ":G" && copytext(message, 1, 3) != ":ï") + return + else + return ..(message) + + if(length(message) >= 1) //In case people forget the '*help' command, this will slow them the message and prevent people from saying one letter at a time + if (copytext(message, 1, 2) != "*") + return if(src.mutantrace == "lizard") if(copytext(message, 1, 2) != "*") diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 2e326aca519..83d821f5afc 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -13,7 +13,7 @@ message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) return say_dead(message) - // wtf? + //Must be concious to speak if (stat) return