Fixes #7722

code/modules/mob/living/carbon/human/say.dm

@@ -12,8 +12,14 @@
 
 	message = trim_strip_html_properly(message)
 
-	if(stat == 2)
-		return say_dead(message)
+	if(stat)
+		if(stat == 2)
+			return say_dead(message)
+		return
+
+	if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
+		src << "<span class='danger'>You're muzzled and cannot speak!</span>"
+		return
 
 	var/message_mode = parse_message_mode(message, "headset")
 
@@ -52,9 +58,6 @@
 		if(ending=="?")
 			verb="asks"
 
-	if (istype(wear_mask, /obj/item/clothing/mask/muzzle))
-		return
-
 	message = trim(message)
 
 	if(speech_problem_flag)
@@ -63,7 +66,7 @@
 		verb = handle_r[2]
 		speech_problem_flag = handle_r[3]
 
-	if(!message || stat)
+	if(!message || message == "")
 		return
 
 	var/list/obj/item/used_radios = new
@@ -265,45 +268,46 @@
 	return verb
 
 /mob/living/carbon/human/proc/handle_speech_problems(var/message)
+
 	var/list/returns[3]
 	var/verb = "says"
 	var/handled = 0
-	if(silent)
+	if(silent || (sdisabilities & MUTE))
 		message = ""
 		handled = 1
-	if(sdisabilities & MUTE)
-		message = ""
-		handled = 1
-	if(wear_mask)
-		if(istype(wear_mask, /obj/item/clothing/mask/horsehead))
-			var/obj/item/clothing/mask/horsehead/hoers = wear_mask
-			if(hoers.voicechange)
-				if(mind && mind.changeling && department_radio_keys[copytext(message, 1, 3)] != "changeling")
-					message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
-					verb = pick("whinnies","neighs", "says")
-					handled = 1
+	if(istype(wear_mask, /obj/item/clothing/mask/horsehead))
+		var/obj/item/clothing/mask/horsehead/hoers = wear_mask
+		if(hoers.voicechange)
+			if(mind && mind.changeling && department_radio_keys[copytext(message, 1, 3)] != "changeling")
+				message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
+				verb = pick("whinnies","neighs", "says")
+				handled = 1
 
-	if((HULK in mutations) && health >= 25 && length(message))
-		message = "[uppertext(message)]!!!"
-		verb = pick("yells","roars","hollers")
-		handled = 1
-	if(slurring)
-		message = slur(message)
-		verb = pick("stammers","stutters")
-		handled = 1
-
-	var/braindam = getBrainLoss()
-	if(braindam >= 60)
-		handled = 1
-		if(prob(braindam/4))
+	if(message != "")
+		if((HULK in mutations) && health >= 25 && length(message))
+			message = "[uppertext(message)]!!!"
+			verb = pick("yells","roars","hollers")
+			handled = 1
+		if(slurring)
+			message = slur(message)
+			verb = pick("slobbers","slurs")
+			handled = 1
+		if(stuttering)
 			message = stutter(message)
-			verb = pick("stammers", "stutters")
-		if(prob(braindam))
-			message = uppertext(message)
-			verb = pick("yells like an idiot","says rather loudly")
+			verb = pick("stammers","stutters")
+			handled = 1
+
+		var/braindam = getBrainLoss()
+		if(braindam >= 60)
+			handled = 1
+			if(prob(braindam/4))
+				message = stutter(message)
+				verb = pick("stammers", "stutters")
+			if(prob(braindam))
+				message = uppertext(message)
+				verb = "yells loudly"
 
 	returns[1] = message
 	returns[2] = verb
 	returns[3] = handled
-
 	return returns

code/modules/mob/living/carbon/human/whisper.dm

@@ -5,7 +5,7 @@
 	if(say_disabled)	//This is here to try to identify lag problems
 		usr << "\red Speech is currently admin-disabled."
 		return
-        
+
 	message = trim_strip_html_properly(message)
 	log_whisper("[src.name]/[src.key] : [message]")
 
@@ -36,6 +36,11 @@
 
 //This is used by both the whisper verb and human/say() to handle whispering
 /mob/living/carbon/human/proc/whisper_say(var/message, var/datum/language/speaking = null, var/alt_name="", var/verb="whispers")
+
+	if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
+		src << "<span class='danger'>You're muzzled and cannot speak!</span>"
+		return
+
 	var/message_range = 1
 	var/eavesdropping_range = 2
 	var/watching_range = 5
@@ -55,17 +60,19 @@
 
 	message = capitalize(trim(message))
 
-	//TODO: handle_speech_problems for silent
-	if (!message || silent || miming)
-		return
+	if(speech_problem_flag)
+		var/list/handle_r = handle_speech_problems(message)
+		message = handle_r[1]
+		verb = handle_r[2]
+		if(verb == "yells loudly")
+			verb = "slurs emphatically"
+		else
+			var/adverb = pick("quietly", "softly")
+			verb = "[verb] [adverb]"
 
-	// Mute disability
-	//TODO: handle_speech_problems
-	if (src.sdisabilities & MUTE)
-		return
+		speech_problem_flag = handle_r[3]
 
-	//TODO: handle_speech_problems
-	if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
+	if(!message || message=="")
 		return
 
 	//looks like this only appears in whisper. Should it be elsewhere as well? Maybe handle_speech_problems?
@@ -102,10 +109,6 @@
 			message = replacetext(message, "u", "<22>")
 			message = replacetext(message, "b", "<22>")
 
-	//TODO: handle_speech_problems
-	if (src.stuttering)
-		message = stutter(message)
-
 	var/list/listening = hearers(message_range, src)
 	listening |= src