Revert "Revert "Merge remote-tracking branch 'upstream/master'""

This reverts commit 1509d9d183.

code/modules/events/_event.dm

@@ -57,7 +57,7 @@
 
 /datum/round_event_control/wizard/canSpawnEvent(var/players_amt, var/gamemode)
 	if(istype(SSticker.mode, /datum/game_mode/dynamic))
-		var/var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/datum/game_mode/dynamic/mode = SSticker.mode
 		if (locate(/datum/dynamic_ruleset/midround/from_ghosts/wizard) in mode.executed_rules)
 			return can_be_midround_wizard && ..()
 	return ..()

code/modules/events/major_dust.dm

@@ -2,6 +2,7 @@
 	name = "Major Space Dust"
 	typepath = /datum/round_event/meteor_wave/major_dust
 	weight = 8
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/meteor_wave/major_dust
 	wave_name = "space dust"

code/modules/events/meteor_wave.dm

@@ -10,6 +10,7 @@
 	min_players = 15
 	max_occurrences = 3
 	earliest_start = 25 MINUTES
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/meteor_wave
 	startWhen		= 6

code/modules/events/processor_overload.dm

@@ -3,6 +3,7 @@
 	typepath = /datum/round_event/processor_overload
 	weight = 15
 	min_players = 20
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/processor_overload
 	announceWhen	= 1