Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490

2019-12-30 16:06:16 +01:00
parent f93077e730 cef4fc9fdd
commit 49f1176170
80 changed files with 681 additions and 318 deletions
@@ -447,7 +447,7 @@
 	var/list/candidates = list()

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

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