From 27388d52ccec8dd2f431c39a6ba276ae6cdde084 Mon Sep 17 00:00:00 2001 From: "mport2004@gmail.com" Date: Thu, 22 Sep 2011 07:10:45 +0000 Subject: [PATCH] Fix for a rev mode bug where people in lockers would count as off the Z level. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2248 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/objective.dm | 3 ++- code/game/gamemodes/revolution/revolution.dm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index ddab87ebb80..e1340074c8a 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -80,9 +80,10 @@ datum/objective/mutiny check_completion() if(target && target.current) + var/turf/T = get_turf(target.current) if(target.current.stat == 2) return 1 - else if(target.current.z != 1)//If they leave the station they count as dead for this + else if((T) && (T.z != 1))//If they leave the station they count as dead for this return 2 else return 0 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index bbf6d3271d6..1daa61a137c 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -352,10 +352,11 @@ var/list/names = new for(var/datum/mind/i in heads) if(i.current) + var/turf/T = get_turf(i.current) var/hstatus = "" if(i.current.stat == 2) hstatus = "Dead" - else if(i.current.z != 1) + else if((T) && (T.z != 1)) hstatus = "Abandoned the station" names += i.current.real_name + " ([hstatus])" + ((i in targets)?"(target)":"") else