diff --git a/code/modules/antagonists/revenant/revenant_spawn_event.dm b/code/modules/antagonists/revenant/revenant_spawn_event.dm index c9a892cd..37096e93 100644 --- a/code/modules/antagonists/revenant/revenant_spawn_event.dm +++ b/code/modules/antagonists/revenant/revenant_spawn_event.dm @@ -3,9 +3,9 @@ /datum/round_event_control/revenant name = "Spawn Revenant" // Did you mean 'griefghost'? typepath = /datum/round_event/ghost_role/revenant - weight = 7 + weight = 5 max_occurrences = 1 - min_players = 5 + min_players = 20 /datum/round_event/ghost_role/revenant diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 4800b61f..5883bdfb 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -2,7 +2,7 @@ name = "Disease Outbreak" typepath = /datum/round_event/disease_outbreak max_occurrences = 1 - min_players = 10 + min_players = 15 weight = 5 /datum/round_event/disease_outbreak diff --git a/code/modules/events/grid_check.dm b/code/modules/events/grid_check.dm index 8006d63b..3e97f541 100644 --- a/code/modules/events/grid_check.dm +++ b/code/modules/events/grid_check.dm @@ -2,7 +2,7 @@ name = "Grid Check" typepath = /datum/round_event/grid_check weight = 10 - max_occurrences = 3 + max_occurrences = 2 /datum/round_event/grid_check announceWhen = 1 @@ -16,4 +16,4 @@ for(var/P in GLOB.apcs_list) var/obj/machinery/power/apc/C = P if(C.cell && is_station_level(C.z)) - C.energy_fail(rand(30,120)) \ No newline at end of file + C.energy_fail(rand(30,120)) diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index 662053f8..3635c751 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -7,7 +7,7 @@ name = "Meteor Wave: Normal" typepath = /datum/round_event/meteor_wave weight = 4 - min_players = 15 + min_players = 20 max_occurrences = 3 earliest_start = 25 MINUTES @@ -66,9 +66,9 @@ /datum/round_event_control/meteor_wave/threatening name = "Meteor Wave: Threatening" typepath = /datum/round_event/meteor_wave/threatening - weight = 5 + weight = 4 min_players = 20 - max_occurrences = 3 + max_occurrences = 2 earliest_start = 35 MINUTES /datum/round_event/meteor_wave/threatening @@ -77,13 +77,13 @@ /datum/round_event_control/meteor_wave/catastrophic name = "Meteor Wave: Catastrophic" typepath = /datum/round_event/meteor_wave/catastrophic - weight = 7 + weight = 4 min_players = 25 - max_occurrences = 3 + max_occurrences = 1 earliest_start = 45 MINUTES /datum/round_event/meteor_wave/catastrophic wave_name = "catastrophic" #undef SINGULO_BEACON_DISTURBANCE -#undef SINGULO_BEACON_MAX_DISTURBANCE \ No newline at end of file +#undef SINGULO_BEACON_MAX_DISTURBANCE diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm index 5ef30d00..8b4c2ffa 100644 --- a/code/modules/events/portal_storm.dm +++ b/code/modules/events/portal_storm.dm @@ -2,8 +2,8 @@ name = "Portal Storm: Syndicate Shocktroops" typepath = /datum/round_event/portal_storm/syndicate_shocktroop weight = 2 - min_players = 15 - earliest_start = 30 MINUTES + min_players = 25 + earliest_start = 50 MINUTES /datum/round_event/portal_storm/syndicate_shocktroop boss_types = list(/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper = 2) diff --git a/code/modules/events/processor_overload.dm b/code/modules/events/processor_overload.dm index 356b5018..46fb4a58 100644 --- a/code/modules/events/processor_overload.dm +++ b/code/modules/events/processor_overload.dm @@ -1,7 +1,7 @@ /datum/round_event_control/processor_overload name = "Processor Overload" typepath = /datum/round_event/processor_overload - weight = 15 + weight = 10 min_players = 20 /datum/round_event/processor_overload diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 11a55264..3f4b7661 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -1,8 +1,8 @@ /datum/round_event_control/vent_clog name = "Clogged Vents: Normal" typepath = /datum/round_event/vent_clog - weight = 10 - max_occurrences = 3 + weight = 8 + max_occurrences = 1 min_players = 25 /datum/round_event/vent_clog @@ -44,10 +44,10 @@ "tiresolution", "sodiumchloride", "beer", - "hair_dye", "sugar", "white_glitter", - "growthserum", + "growthchem", + "shrinkchem", "cornoil", "uranium", "carpet",