From 141093b9a39f1a9c3d3d2abd54b29a589f4b5b8a Mon Sep 17 00:00:00 2001
From: joep van der velden <joepvelden@hotmail.com>
Date: Sun, 6 Sep 2020 15:45:22 +0200
Subject: [PATCH] Dead can't whisper. Dead say code consolidation

---
 code/modules/mob/dead/observer/say.dm | 14 ++------------
 code/modules/mob/living/say.dm        |  2 --
 code/modules/mob/say.dm               | 23 ++++++++++++++++-------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm
index 2f5627e8413..4d003753876 100644
--- a/code/modules/mob/dead/observer/say.dm
+++ b/code/modules/mob/dead/observer/say.dm
@@ -1,20 +1,10 @@
-/mob/dead/observer/say(var/message)
+/mob/dead/observer/say(message)
 	message = sanitize(copytext(message, 1, MAX_MESSAGE_LEN))
 
 	if(!message)
 		return
 
-	log_ghostsay(message, src)
-
-	if(src.client)
-		if(src.client.prefs.muted & MUTE_DEADCHAT)
-			to_chat(src, "<span class='warning'>You cannot talk in deadchat (muted).</span>")
-			return
-
-		if(src.client.handle_spam_prevention(message,MUTE_DEADCHAT))
-			return
-
-	. = src.say_dead(message)
+	return say_dead(message)
 
 
 /mob/dead/observer/emote(act, type, message, force)
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index d4546f4f6bc..e944e692887 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -351,8 +351,6 @@ proc/get_radio_key_from_channel(var/channel)
 			return
 
 	if(stat)
-		if(stat == DEAD)
-			return say_dead(message_pieces)
 		return
 
 	if(is_muzzled())
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 41032185c3b..7a26de718b6 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -44,18 +44,27 @@
 		usr.emote(message)
 
 
-/mob/proc/say_dead(var/message)
-	if(!(client && client.holder))
-		if(!config.dsay_allowed)
-			to_chat(src, "<span class='danger'>Deadchat is globally muted.</span>")
+/mob/proc/say_dead(message)
+	if(client)
+		if(!client.holder)
+			if(!config.dsay_allowed)
+				to_chat(src, "<span class='danger'>Deadchat is globally muted.</span>")
+				return
+
+		if(client.prefs.muted & MUTE_DEADCHAT)
+			to_chat(src, "<span class='warning'>You cannot talk in deadchat (muted).</span>")
 			return
 
-	if(client && !(client.prefs.toggles & CHAT_DEAD))
-		to_chat(usr, "<span class='danger'>You have deadchat muted.</span>")
-		return
+		if(!(client.prefs.toggles & CHAT_DEAD))
+			to_chat(src, "<span class='danger'>You have deadchat muted.</span>")
+			return
+
+		if(client.handle_spam_prevention(message, MUTE_DEADCHAT))
+			return
 
 	say_dead_direct("[pick("complains", "moans", "whines", "laments", "blubbers", "salts")], <span class='message'>\"[message]\"</span>", src)
 	create_log(DEADCHAT_LOG, message)
+	log_ghostsay(message, src)
 
 /mob/proc/say_understands(var/mob/other, var/datum/language/speaking = null)
 	if(stat == DEAD)