cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds checks for antags being dead or SSD

Browse Source
This commit is contained in:
HarpyEagle
2015-10-12 13:25:42 -04:00
committed by Mike
parent c0dc32d60c
commit ffb26a6f87
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/antagonist/antagonist_helpers.dm
View File

@@ -21,7 +21,15 @@
return current_antagonists ? current_antagonists.len : 0 return current_antagonists ? current_antagonists.len : 0
/datum/antagonist/proc/get_active_antag_count() /datum/antagonist/proc/get_active_antag_count()
return get_antag_count() //TODO var/active_antags = 0
for(var/datum/mind/player in current_antagonists)
var/mob/living/L = player.current
if(!L || L.stat == DEAD)
continue //no mob or dead
if(!L.client && !L.teleop)
continue //SSD
active_antags++
return active_antags
/datum/antagonist/proc/is_antagonist(var/datum/mind/player) /datum/antagonist/proc/is_antagonist(var/datum/mind/player)
if(player in current_antagonists) if(player in current_antagonists)