From f083c109bf1fa650453c37968bec8d1c483b75dd Mon Sep 17 00:00:00 2001
From: CIB <cib123@googlemail.com>
Date: Tue, 10 Jul 2012 13:09:15 +0300
Subject: [PATCH] Fix issue #1449

---
 code/modules/mob/living/carbon/human/examine.dm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 9af7efb9040..eed012791e7 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -211,17 +211,19 @@
 				for(var/mob/O in viewers(usr.loc, null))
 					O.show_message("[usr] checks [src]'s pulse.", 1)
 			spawn(15)
-				if(!src.client)
-					var/foundghost = 0
+				var/foundghost = 0
+				if(src.client)
+					foundghost = 1
+				else
 					for(var/mob/dead/observer/G in world)
 						if(G.client)
 							if(G.corpse == src)
 								foundghost++
 								break
-					if(!foundghost)
-						usr << "<span class='deadsay'>[t_He] has no pulse and [t_his] soul has departed...</span>"
-					else
-						usr << "<span class='deadsay'>[t_He] has no pulse...</span>"
+				if(!foundghost)
+					usr << "<span class='deadsay'>[t_He] has no pulse and [t_his] soul has departed...</span>"
+				else
+					usr << "<span class='deadsay'>[t_He] has no pulse...</span>"
 
 	msg += "<span class='warning'>"