Merge pull request #13339 from Putnam3145/dynamic-event-decouples

Completely decouples events from dynamic.
2020-09-05 02:12:00 -07:00
parent c0917de446 4ef4220c88
commit a58a67f90c
29 changed files with 5 additions and 558 deletions
@@ -3,7 +3,6 @@
 	name = "Spawn Sentient Disease"
 	typepath = /datum/round_event/ghost_role/sentient_disease
 	weight = 7
-	gamemode_blacklist = list("dynamic")
 	max_occurrences = 1
 	min_players = 5

@@ -4,7 +4,6 @@
 	name = "Spawn Revenant" // Did you mean 'griefghost'?
 	typepath = /datum/round_event/ghost_role/revenant
 	weight = 7
-	gamemode_blacklist = list("dynamic")
 	max_occurrences = 1
 	min_players = 5

@@ -5,7 +5,6 @@
 	max_occurrences = 1 //Only once okay fam
 	earliest_start = 30 MINUTES
 	min_players = 35
-	gamemode_blacklist = list("dynamic")


 /datum/round_event/spawn_swarmer
@@ -4,7 +4,6 @@

 	max_occurrences = 1
 	weight = 5
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/anomaly/anomaly_bluespace
 	startWhen = 3
@@ -5,7 +5,6 @@
 	min_players = 10
 	max_occurrences = 5
 	weight = 20
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/anomaly/anomaly_flux
 	startWhen = 10
@@ -4,7 +4,6 @@

 	max_occurrences = 5
 	weight = 20
-	gamemode_blacklist = list("dynamic")


 /datum/round_event/anomaly/anomaly_grav
@@ -4,7 +4,6 @@

 	max_occurrences = 5
 	weight = 20
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/anomaly/anomaly_pyro
 	startWhen = 3
@@ -5,7 +5,6 @@
 	min_players = 20
 	max_occurrences = 2
 	weight = 5
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/anomaly/anomaly_vortex
 	startWhen = 10
@@ -5,7 +5,6 @@

 	min_players = 15
 	max_occurrences = 1
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/brand_intelligence
 	announceWhen	= 21
@@ -5,7 +5,6 @@
 	min_players = 2
 	earliest_start = 10 MINUTES
 	max_occurrences = 6
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/carp_migration
 	announceWhen	= 3
@@ -2,7 +2,6 @@
 	name = "Communications Blackout"
 	typepath = /datum/round_event/communications_blackout
 	weight = 30
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/communications_blackout
 	announceWhen	= 1
@@ -5,7 +5,6 @@
 	max_occurrences = 1000
 	earliest_start = 0 MINUTES
 	alert_observers = FALSE
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/space_dust
 	startWhen		= 1
@@ -29,4 +28,4 @@
 	fakeable = FALSE

 /datum/round_event/sandstorm/tick()
-	spawn_meteors(10, GLOB.meteorsC)
+	spawn_meteors(10, GLOB.meteorsC)
@@ -5,7 +5,6 @@
 	min_players = 5
 	weight = 40
 	alert_observers = FALSE
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/electrical_storm
 	var/lightsoutAmount	= 1
@@ -4,7 +4,6 @@
 	weight = 20
 	max_occurrences = 2
 	min_players = 40 // To avoid shafting lowpop
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/heart_attack/start()
 	var/list/heart_attack_contestants = list()
@@ -20,4 +19,4 @@
 		var/mob/living/carbon/human/winner = pickweight(heart_attack_contestants)
 		var/datum/disease/D = new /datum/disease/heart_failure()
 		winner.ForceContractDisease(D, FALSE, TRUE)
-		announce_to_ghosts(winner)
+		announce_to_ghosts(winner)
@@ -3,7 +3,6 @@
 /datum/round_event_control/ion_storm
 	name = "Ion Storm"
 	typepath = /datum/round_event/ion_storm
-	gamemode_blacklist = list("dynamic")
 	weight = 15
 	min_players = 2

@@ -2,7 +2,6 @@
 	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"
@@ -10,7 +10,6 @@
 	min_players = 15
 	max_occurrences = 3
 	earliest_start = 25 MINUTES
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/meteor_wave
 	startWhen		= 6
@@ -2,7 +2,6 @@
 	name = "Spawn Nightmare"
 	typepath = /datum/round_event/ghost_role/nightmare
 	max_occurrences = 1
-	gamemode_blacklist = list("dynamic")
 	min_players = 20

 /datum/round_event/ghost_role/nightmare
@@ -5,7 +5,7 @@
 	max_occurrences = 1
 	min_players = 10
 	earliest_start = 30 MINUTES
-	gamemode_blacklist = list("nuclear","dynamic")
+	gamemode_blacklist = list("nuclear")

 /datum/round_event_control/pirates/preRunEvent()
 	if (!SSmapping.empty_space)
@@ -4,7 +4,6 @@
 	weight = 2
 	min_players = 15
 	earliest_start = 30 MINUTES
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/portal_storm/syndicate_shocktroop
 	boss_types = list(/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper = 2)
@@ -3,7 +3,6 @@
 	typepath = /datum/round_event/processor_overload
 	weight = 15
 	min_players = 20
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/processor_overload
 	announceWhen	= 1
@@ -2,7 +2,6 @@
 	name = "Radiation Storm"
 	typepath = /datum/round_event/radiation_storm
 	max_occurrences = 1
-	gamemode_blacklist = list("dynamic")

 /datum/round_event/radiation_storm

@@ -2,7 +2,6 @@
 	name = "Spider Infestation"
 	typepath = /datum/round_event/spider_infestation
 	weight = 5
-	gamemode_blacklist = list("dynamic")
 	max_occurrences = 1
 	min_players = 15

@@ -3,7 +3,6 @@
 	typepath = /datum/round_event/vent_clog
 	weight = 10
 	max_occurrences = 3
-	gamemode_blacklist = list("dynamic")
 	min_players = 25

 /datum/round_event/vent_clog
@@ -4,7 +4,6 @@
 	max_occurrences = 3
 	weight = 2
 	min_players = 2
-	gamemode_blacklist = list("dynamic")


 /datum/round_event/wormholes