From 2d9ecd54a9e6f48da75fa920f2e02c02fb9ceaa7 Mon Sep 17 00:00:00 2001
From: Kyle Spier-Swenson <kyleshome@gmail.com>
Date: Mon, 30 Nov 2015 17:26:58 -0800
Subject: [PATCH] FIXES DEAD CHAT QUICK MERGE PLS

---
 code/modules/mob/say.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 28a6839fccac..98cf5034202e 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -44,7 +44,7 @@
 
 	for(var/mob/M in player_list)
 		var/adminoverride = 0
-		if(M.client || M.client.holder || (M.client.prefs.chat_toggles & CHAT_DEAD))
+		if(M.client && M.client.holder && (M.client.prefs.chat_toggles & CHAT_DEAD))
 			adminoverride = 1
 		if(istype(M, /mob/new_player) && !adminoverride)
 			continue