cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dead cultists no longer show up in the target list for 'Summon Cultist' (#17664)

Browse Source
This commit is contained in:
Joan Lung
2016-05-16 10:04:27 -05:00
committed by KorPhaeron
parent dd2c91ca64
commit 561bdd08ad
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/cult/runes.dm
+7 -2
View File
@@ -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 << "<span class='cultitalic'>[cultist_to_summon] has died!</span>"
fail_invoke()
log_game("Summon Cultist rune failed - target died")
return
if(!iscultist(cultist_to_summon))
user << "<span class='cultitalic'>[cultist_to_summon] is not a follower of the Geometer!</span>"
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 << "<span class='cultitalic'>[cultist_to_summon] is not in our dimension!</span>"