From 3ede5303078bffe2878199fa0c300aae86f44b5c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 25 Jul 2017 17:34:18 -0500 Subject: [PATCH] Romerol zombies count as dead for assassinate and maroon objectives. (#2130) --- code/game/gamemodes/objective.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index eb4543101b..33590b0ccd 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -89,7 +89,10 @@ /datum/objective/assassinate/check_completion() if(target && target.current) - 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 + var/mob/living/carbon/human/H + if(ishuman(target.current)) + H = target.current + if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey || (H && H.dna.species.id == "memezombies")) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite return 1 return 0 return 1 @@ -152,7 +155,10 @@ /datum/objective/maroon/check_completion() if(target && target.current) - 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 + var/mob/living/carbon/human/H + if(ishuman(target.current)) + H = target.current + if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey || (H && H.dna.species.id == "memezombies")) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite return 1 if(target.current.onCentcom() || target.current.onSyndieBase()) return 0