Merge pull request #2932 from Citadel-Station-13/upstream-merge-30959

[MIRROR] Allow AIs to greentext survive
This commit is contained in:
LetterJay
2017-09-25 12:55:33 -04:00
committed by GitHub
2 changed files with 11 additions and 3 deletions
+3 -3
View File
@@ -186,9 +186,9 @@
kill_objective.find_target()
add_objective(kill_objective)
var/datum/objective/survive/survive_objective = new
survive_objective.owner = owner
add_objective(survive_objective)
var/datum/objective/survive/exist/exist_objective = new
exist_objective.owner = owner
add_objective(exist_objective)
/datum/antagonist/traitor/proc/forge_single_objective()
return 0
/datum/antagonist/traitor/human/forge_single_objective() //Returns how many objectives are added
+8
View File
@@ -348,6 +348,14 @@
return FALSE
return TRUE
//Like survive, but works for silicons and zombies and such.
/datum/objective/survive/exist/considered_alive(var/datum/mind/M)
if(M && M.current)
if(isliving(M.current))
var/mob/living/L = M.current
return L.stat != DEAD
return FALSE
/datum/objective/martyr
explanation_text = "Die a glorious death."