From a6e75de239e80c8d502c6ceb62be0f18bf22b44e Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 20 Aug 2013 18:46:25 -0400 Subject: [PATCH] Rev Gamemode Fixes --- code/game/gamemodes/objective.dm | 2 +- code/game/gamemodes/revolution/revolution.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 3d154485133..0653bc353ab 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -79,7 +79,7 @@ datum/objective/mutiny check_completion() if(target && target.current) - if(target.current.stat == DEAD || !ishuman(target.current) || !target.current.ckey) + if(target.current.stat == DEAD || !ishuman(target.current) || !target.current.ckey || !target.current.client) 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/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index e94baa3ede0..bc750dd9b36 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -321,7 +321,7 @@ ////////////////////////// /datum/game_mode/revolution/proc/check_rev_victory() for(var/datum/mind/rev_mind in head_revolutionaries) - for(var/datum/objective/objective in rev_mind.objectives) + for(var/datum/objective/mutiny/objective in rev_mind.objectives) if(!(objective.check_completion())) return 0 @@ -333,7 +333,7 @@ /datum/game_mode/revolution/proc/check_heads_victory() for(var/datum/mind/rev_mind in head_revolutionaries) var/turf/T = get_turf(rev_mind.current) - if((rev_mind) && (rev_mind.current) && (rev_mind.current.stat != 2) && T && (T.z == 1)) + if((rev_mind) && (rev_mind.current) && (rev_mind.current.stat != 2) && rev_mind.current.client && T && (T.z == 1)) if(ishuman(rev_mind.current)) return 0 return 1