Merge pull request #3674 from Citadel-Station-13/upstream-merge-32154

[MIRROR] Events take pre-game lobby time into account
2017-10-29 15:52:13 -04:00
parent 5a92bafa75 24072bfdd7
commit 66245d9451
1 changed files with 1 additions and 1 deletions
@@ -40,7 +40,7 @@
 /datum/round_event_control/proc/canSpawnEvent(var/players_amt, var/gamemode)
 	if(occurrences >= max_occurrences)
 		return FALSE
-	if(earliest_start >= world.time)
+	if(earliest_start >= world.time-SSticker.round_start_time)
 		return FALSE
 	if(wizardevent != SSevents.wizardmode)
 		return FALSE