From 561bdd08adfc85f0ad88ec231eeb97d3fa735ddd Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Mon, 16 May 2016 11:04:27 -0400 Subject: [PATCH] Dead cultists no longer show up in the target list for 'Summon Cultist' (#17664) --- code/game/gamemodes/cult/runes.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index fd97b4f73a8..64b6e1c6517 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -759,7 +759,7 @@ var/list/teleport_runes = list() var/mob/living/user = invokers[1] var/list/cultists = list() for(var/datum/mind/M in ticker.mode.cult) - if(!(M.current in invokers)) + if(!(M.current in invokers) && M.current.stat != DEAD) cultists |= M.current var/mob/living/cultist_to_summon = input(user, "Who do you wish to call to [src]?", "Followers of the Geometer") as null|anything in cultists if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated()) @@ -769,10 +769,15 @@ var/list/teleport_runes = list() fail_invoke() log_game("Summon Cultist rune failed - no target") return + if(cultist_to_summon.stat == DEAD) + user << "[cultist_to_summon] has died!" + fail_invoke() + log_game("Summon Cultist rune failed - target died") + return if(!iscultist(cultist_to_summon)) user << "[cultist_to_summon] is not a follower of the Geometer!" fail_invoke() - log_game("Summon Cultist rune failed - no target") + log_game("Summon Cultist rune failed - target was deconverted") return if(cultist_to_summon.z > ZLEVEL_SPACEMAX) user << "[cultist_to_summon] is not in our dimension!"