Merge pull request #14166 from KorPhaeron/ghosts

Fixes offer control to ghosts not working on mindless mobs
This commit is contained in:
tkdrg
2015-12-31 15:07:58 -03:00
+2 -2
View File
@@ -613,9 +613,9 @@ body
log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.")
message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(M)]) to ghosts")
var/poll_message = "Do you want to play as [M.real_name]?"
if(M.mind.assigned_role)
if(M.mind && M.mind.assigned_role)
poll_message = "[poll_message] Job:[M.mind.assigned_role]."
if(M.mind.special_role)
if(M.mind && M.mind.special_role)
poll_message = "[poll_message] Status:[M.mind.special_role]."
var/list/mob/dead/observer/candidates = pollCandidates(poll_message, "pAI", null, FALSE, 100)
var/mob/dead/observer/theghost = null