From 070bd8d17d559e9d3b6d638a42f22717ec48ca4a Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Sun, 28 Feb 2016 23:31:53 -0500
Subject: [PATCH] tweaks

---
 code/modules/mob/living/carbon/human/emote.dm | 4 ++--
 code/modules/mob/living/carbon/human/say.dm   | 2 +-
 code/modules/mob/living/say.dm                | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 4302195b1f0..14013b59294 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -21,9 +21,9 @@
 		if (I.implanted)
 			I.trigger(act, src)
 
-	var/miming=0
+	var/miming = 0
 	if(mind)
-		miming=mind.miming
+		miming = mind.miming
 
 	//Emote Cooldown System (it's so simple!)
 	// proc/handle_emote_CD() located in [code\modules\mob\emote.dm]
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index c5b116036e5..f736a17af22 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -111,7 +111,7 @@
 	var/list/returns[3]
 	var/speech_problem_flag = 0
 
-	if(silent || (sdisabilities & MUTE) || !IsVocal())
+	if(silent || (sdisabilities & MUTE))
 		message = ""
 		speech_problem_flag = 1
 
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 72035ee078b..7e12928a26c 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -71,6 +71,8 @@ proc/get_radio_key_from_channel(var/channel)
 	var/list/returns[3]
 	var/speech_problem_flag = 0
 
+
+
 	if((HULK in mutations) && health >= 25 && length(message))
 		message = "[uppertext(message)]!!!"
 		verb = pick("yells","roars","hollers")
@@ -88,9 +90,12 @@ proc/get_radio_key_from_channel(var/channel)
 	if(GREY in mutations)
 		message = "<span class='grey'>[message]</span>"
 
-	else if(COMIC in mutations)
+	if(COMIC in mutations)
 		message = "<span class='sans'>[message]</span>"
 
+	if(!IsVocal())
+		message = ""
+		speech_problem_flag = 1
 
 	returns[1] = message
 	returns[2] = verb