Merge branch 'master' into hook-kill-v10-final-ultimate-final

code/controllers/subsystem/events.dm

@@ -90,7 +90,7 @@ SUBSYSTEM_DEF(events)
 		if(E.isRunning)
 			message += "and is still running."
 		else
-			if(E.endedAt - E.startedAt > MinutesToTicks(5)) // Only mention end time if the entire duration was more than 5 minutes
+			if(E.endedAt - E.startedAt > 5 MINUTES) // Only mention end time if the entire duration was more than 5 minutes
 				message += "and ended at [station_time_timestamp("hh:mm:ss", E.endedAt)]."
 			else
 				message += "and ran to completion."

code/controllers/subsystem/ticker.dm

@@ -296,8 +296,13 @@ SUBSYSTEM_DEF(ticker)
 		SSjobs.LoadJobs("config/jobs_highpop.txt")
 	else
 		log_debug("Playercount: [playercount] versus trigger: [highpop_trigger] - keeping standard job config");
+
+	#ifdef UNIT_TESTS
+	RunUnitTests()
+	#endif
 	return TRUE
 
+
 /datum/controller/subsystem/ticker/proc/station_explosion_cinematic(station_missed = 0, override = null)
 	if(cinematic)
 		return	//already a cinematic in progress!