Merge pull request #9453 from Ghommie/Ghommie-cit226

Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
2019-11-14 15:47:18 -07:00
parent c56a303d50 4c1eba0d81
commit af0962088c
20 changed files with 124 additions and 52 deletions
@@ -446,7 +446,7 @@
 	var/list/candidates = list()

 	for(var/mob/dead/observer/G in GLOB.player_list)
-		if(G.can_reenter_round)
+		if(G.reenter_round_timeout < world.realtime)
 			candidates += G

 	return pollCandidates(Question, jobbanType, gametypeCheck, be_special_flag, poll_time, ignore_category, flashwindow, candidates)