From 1bbe63c33bbd5a0cd0ede3f10dcac9612c9aa102 Mon Sep 17 00:00:00 2001
From: Metis <100518708+sheepishgoat@users.noreply.github.com>
Date: Fri, 25 Oct 2024 00:44:31 -0400
Subject: [PATCH 1/2] sweet relief

---
 code/datums/emotes.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index 5683367c55..f9c7b5bfe8 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -58,7 +58,7 @@
 	msg = "<span class='emote'><b>[user]</b> [msg]</span>"
 
 	for(var/mob/M in GLOB.dead_mob_list)
-		if(!M.client || isnewplayer(M))
+		if(!M.client || isnewplayer(M) || !user.client)
 			continue
 		var/T = get_turf(user)
 		if(M.stat == DEAD && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) && !(M in viewers(T, null)))

From b072a63cea727b9a1903296e2a3df1c1744209c1 Mon Sep 17 00:00:00 2001
From: Metis <100518708+sheepishgoat@users.noreply.github.com>
Date: Sat, 26 Oct 2024 18:48:16 -0400
Subject: [PATCH 2/2] Update emotes.dm

---
 code/datums/emotes.dm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index f9c7b5bfe8..8d9f6170bd 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -57,12 +57,13 @@
 	user.log_message(msg, LOG_EMOTE)
 	msg = "<span class='emote'><b>[user]</b> [msg]</span>"
 
-	for(var/mob/M in GLOB.dead_mob_list)
-		if(!M.client || isnewplayer(M) || !user.client)
-			continue
-		var/T = get_turf(user)
-		if(M.stat == DEAD && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) && !(M in viewers(T, null)))
-			M.show_message(msg)
+	if(user.client)
+		for(var/mob/M in GLOB.dead_mob_list)
+			if(!M.client || isnewplayer(M))
+				continue
+			var/T = get_turf(user)
+			if(M.stat == DEAD && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) && !(M in viewers(T, null)))
+				M.show_message(msg)
 
 	if(emote_type == EMOTE_AUDIBLE)
 		user.audible_message(msg)