Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs

Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm

code/controllers/subsystem/air.dm

@@ -26,7 +26,7 @@ var/datum/subsystem/air/SSair
 
 	//Special functions lists
 	var/list/turf/active_super_conductivity = list()
-	var/list/turf/high_pressure_delta = list()
+	var/list/turf/open/high_pressure_delta = list()
 
 
 /datum/subsystem/air/New()
@@ -179,7 +179,8 @@ var/datum/subsystem/air/SSair
 		z_start = z_level
 		z_finish = z_level
 
-	var/list/turfs_to_init = block(locate(1, 1, z_start), locate(world.maxx, world.maxy, z_finish))
+	var/turf/open/space/S = /turf/open/space
+	var/list/turfs_to_init = block(locate(1, 1, z_start), locate(world.maxx, world.maxy, z_finish)) - S.space_turfs
 
 	for(var/thing in turfs_to_init)
 		var/turf/t = thing
@@ -189,9 +190,6 @@ var/datum/subsystem/air/SSair
 		if(t.blocks_air)
 			continue
 
-		if(istype(t, /turf/open/space))
-			continue //don't need to initialize these; just slows down roundstart without any real benefit
-
 		var/turf/open/T = t
 
 		T.excited = 0

code/controllers/subsystem/events.dm

@@ -70,19 +70,14 @@ var/datum/subsystem/events/SSevent
 //		if(E)	E.runEvent()
 		return
 
+	var/gamemode = ticker.mode.config_tag
+	var/players_amt = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1)
+	// Only alive, non-AFK human players count towards this.
+
 	var/sum_of_weights = 0
 	for(var/datum/round_event_control/E in control)
-		if(E.occurrences >= E.max_occurrences)
+		if(!E.canSpawnEvent(players_amt, gamemode))
 			continue
-		if(E.earliest_start >= world.time)
-			continue
-		if(E.gamemode_blacklist.len && (ticker.mode.config_tag in E.gamemode_blacklist))
-			continue
-		if(E.gamemode_whitelist.len && !(ticker.mode.config_tag in E.gamemode_whitelist))
-			continue
-		if(E.holidayID)
-			if(!holidays || !holidays[E.holidayID])
-				continue
 		if(E.weight < 0)						//for round-start events etc.
 			if(E.runEvent() == PROCESS_KILL)
 				E.max_occurrences = 0
@@ -96,17 +91,8 @@ var/datum/subsystem/events/SSevent
 	sum_of_weights = rand(0,sum_of_weights)	//reusing this variable. It now represents the 'weight' we want to select
 
 	for(var/datum/round_event_control/E in control)
-		if(E.occurrences >= E.max_occurrences)
+		if(!E.canSpawnEvent(players_amt, gamemode))
 			continue
-		if(E.earliest_start >= world.time)
-			continue
-		if(E.gamemode_blacklist.len && (ticker.mode.config_tag in E.gamemode_blacklist))
-			continue
-		if(E.gamemode_whitelist.len && !(ticker.mode.config_tag in E.gamemode_whitelist))
-			continue
-		if(E.holidayID)
-			if(!holidays || !holidays[E.holidayID])
-				continue
 		sum_of_weights -= E.weight
 
 		if(sum_of_weights <= 0)				//we've hit our goal

code/controllers/subsystem/lighting.dm

@@ -5,7 +5,12 @@ var/datum/subsystem/lighting/SSlighting
 /datum/subsystem/lighting
 	name = "Lighting"
 	priority = 1
-	wait = 6
+	wait = 1
+	dynamic_wait = 1
+	dwait_delta = 4
+	dwait_buffer = 0.1
+	dwait_lower = 1
+	dwait_upper = 5
 	display = 5
 
 	var/list/changed_lights = list()		//list of all datum/light_source that need updating