Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06:00
parent 545ac04b78 1f7deabbfb
commit 6286f4d4c2
625 changed files with 27981 additions and 20284 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