Merge pull request #749 from ArchieBeepBoop/dead

I'm fixing this objective and nobody can stop me
This commit is contained in:
Dahlular
2020-12-06 17:16:00 -07:00
committed by GitHub
@@ -140,11 +140,10 @@
var/objcount = 0
var/list/counted_roles = list() // So you can't have more than one Captain count.
for(var/datum/antagonist/vassal/V in antagdatum.vassals)
if (!V || !V.owner) // Must exist somewhere, and as a vassal.
if (!V || !V.owner || !V.owner.current) // Must exist somewhere, as a vassal and have a living body.
continue
var/thisRole = "none"
// Mind Assigned
if ((V.owner.assigned_role in valid_jobs) && !(V.owner.assigned_role in counted_roles))
//to_chat(owner, "<span class='userdanger'>PROTEGE OBJECTIVE: (MIND ROLE)</span>")