From 0a610c3df6a70bfce47e2ea52df1596f11600b88 Mon Sep 17 00:00:00 2001
From: "petethegoat@gmail.com"
 <petethegoat@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sun, 18 Nov 2012 21:43:53 +0000
Subject: [PATCH] Fixes issue 1063. Catatonic revheads count as alive in terms
 of the round not ending Catatonic players now count as dead for assassinate
 and mutiny objectives.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5115 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/gamemodes/objective.dm | 4 ++--
 html/changelog.html              | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 19218424a04..8b67c225468 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -52,7 +52,7 @@ datum/objective/assassinate
 
 	check_completion()
 		if(target && target.current)
-			if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
+			if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
 				return 1
 			return 0
 		return 1
@@ -79,7 +79,7 @@ datum/objective/mutiny
 
 	check_completion()
 		if(target && target.current)
-			if(target.current.stat == DEAD || !ishuman(target.current))
+			if(target.current.stat == DEAD || !ishuman(target.current) || !target.current.ckey)
 				return 1
 			var/turf/T = get_turf(target.current)
 			if(T && (T.z != 1))			//If they leave the station they count as dead for this
diff --git a/html/changelog.html b/html/changelog.html
index 008596ef3bb..2fed4772af2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -49,6 +49,14 @@ should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
+<div class="commit sansserif">
+	<h2 class="date">18 November 2012</h2>
+	<h3 class="author">Petethegoat updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">Catatonic people (those that have ghosted while alive) now count as dead for assasinate objectives.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">17 November 2012</h2>
 	<h3 class="author">Donkie updated:</h3>