diff --git a/code/modules/antagonists/revenant/revenant_spawn_event.dm b/code/modules/antagonists/revenant/revenant_spawn_event.dm index b188e0c79c..655a116b7f 100644 --- a/code/modules/antagonists/revenant/revenant_spawn_event.dm +++ b/code/modules/antagonists/revenant/revenant_spawn_event.dm @@ -4,7 +4,7 @@ name = "Spawn Revenant" // Did you mean 'griefghost'? typepath = /datum/round_event/ghost_role/revenant weight = 7 - max_occurrences = 1 + max_occurrences = 0 //GS13 tweak - no antags, thanks min_players = 5 category = EVENT_CATEGORY_ENTITIES description = "Spawns an angry, soul sucking ghost." diff --git a/code/modules/antagonists/slaughter/slaughterevent.dm b/code/modules/antagonists/slaughter/slaughterevent.dm index 8d1f92faac..bc9b1fb6ff 100644 --- a/code/modules/antagonists/slaughter/slaughterevent.dm +++ b/code/modules/antagonists/slaughter/slaughterevent.dm @@ -2,7 +2,7 @@ name = "Spawn Slaughter Demon" typepath = /datum/round_event/ghost_role/slaughter weight = 1 //Very rare - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks earliest_start = 1 HOURS min_players = 20 category = EVENT_CATEGORY_ENTITIES diff --git a/code/modules/antagonists/swarmer/swarmer_event.dm b/code/modules/antagonists/swarmer/swarmer_event.dm index 460ce687a6..083363a22e 100644 --- a/code/modules/antagonists/swarmer/swarmer_event.dm +++ b/code/modules/antagonists/swarmer/swarmer_event.dm @@ -2,7 +2,7 @@ name = "Spawn Swarmer Shell" typepath = /datum/round_event/spawn_swarmer weight = 7 - max_occurrences = 1 //Only once okay fam + max_occurrences = 0 //GS13 - no antags, thanks earliest_start = 30 MINUTES min_players = 35 dynamic_should_hijack = TRUE diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm index c539899f0e..d2b136408a 100755 --- a/code/modules/events/abductor.dm +++ b/code/modules/events/abductor.dm @@ -2,7 +2,7 @@ name = "Abductors" typepath = /datum/round_event/ghost_role/abductor weight = 10 - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks min_players = 30 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_INVASION diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm index cf94253bbb..6428ed35f9 100644 --- a/code/modules/events/alien_infestation.dm +++ b/code/modules/events/alien_infestation.dm @@ -3,7 +3,7 @@ typepath = /datum/round_event/ghost_role/alien_infestation weight = 5 min_players = 25 - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES description = "A xenomorph larva spawns on a random vent." diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index 70b92d071d..82958ff921 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -10,8 +10,8 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 /datum/round_event_control/immovable_rod name = "Immovable Rod" typepath = /datum/round_event/immovable_rod - min_players = 20 //GS13 - tweaked min players and occurences - max_occurrences = 2 + min_players = 25 //GS13 - tweaked min players and occurences + max_occurrences = 1 //GS13 - one is enough as is var/atom/special_target category = EVENT_CATEGORY_SPACE description = "The station passes through an immovable rod." diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index 42a122cc08..bf2c81e9da 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 = 16 //GS13 - tweaked all meteor waves to nerf them a bit + min_players = 20 //GS13 - tweaked all meteor waves to nerf them a bit max_occurrences = 2 earliest_start = 40 MINUTES category = EVENT_CATEGORY_SPACE diff --git a/code/modules/events/nightmare.dm b/code/modules/events/nightmare.dm index a1cc9c9029..066552c3a5 100644 --- a/code/modules/events/nightmare.dm +++ b/code/modules/events/nightmare.dm @@ -1,7 +1,7 @@ /datum/round_event_control/nightmare name = "Spawn Nightmare" typepath = /datum/round_event/ghost_role/nightmare - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks min_players = 25 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm index 53b79a9456..90f571a4d5 100644 --- a/code/modules/events/operative.dm +++ b/code/modules/events/operative.dm @@ -2,7 +2,7 @@ name = "Lone Operative" typepath = /datum/round_event/ghost_role/operative weight = 0 //Admin only - max_occurrences = 0 //GS13 tweak + max_occurrences = 0 //GS13 - just in case category = EVENT_CATEGORY_INVASION description = "A single nuclear operative assaults the station." diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 3266bb70bf..31eb07080c 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -2,7 +2,7 @@ name = "Space Pirates" typepath = /datum/round_event/pirates weight = 8 - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks min_players = 20 earliest_start = 50 MINUTES dynamic_should_hijack = TRUE diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm index 1628566557..081a1bce89 100644 --- a/code/modules/events/portal_storm.dm +++ b/code/modules/events/portal_storm.dm @@ -3,6 +3,7 @@ typepath = /datum/round_event/portal_storm/syndicate_shocktroop weight = 2 min_players = 20 + max_occurrences = 0 //GS13 - no antags, thanks earliest_start = 60 MINUTES category = EVENT_CATEGORY_ENTITIES description = "Syndicate troops pour out of portals." diff --git a/code/modules/events/space_dragon.dm b/code/modules/events/space_dragon.dm index 50d7433f4c..c93376ddbf 100644 --- a/code/modules/events/space_dragon.dm +++ b/code/modules/events/space_dragon.dm @@ -2,7 +2,7 @@ name = "Spawn Space Dragon" typepath = /datum/round_event/ghost_role/space_dragon weight = 8 - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks min_players = 25 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES diff --git a/code/modules/events/space_ninja.dm b/code/modules/events/space_ninja.dm index 5fd019fa56..7e7ae751af 100644 --- a/code/modules/events/space_ninja.dm +++ b/code/modules/events/space_ninja.dm @@ -1,7 +1,7 @@ /datum/round_event_control/space_ninja name = "Spawn Space Ninja" typepath = /datum/round_event/ghost_role/space_ninja - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks weight = 10 earliest_start = 20 MINUTES min_players = 25 diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 9c68add145..5badf86774 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -3,7 +3,7 @@ typepath = /datum/round_event/spacevine weight = 15 max_occurrences = 3 - min_players = 18 + min_players = 15 //GS13 - should be enough players category = EVENT_CATEGORY_ENTITIES description = "Kudzu begins to overtake the station. Might spawn man-traps." diff --git a/code/modules/events/stray_cargo.dm b/code/modules/events/stray_cargo.dm index e77602d71e..71aeb058d5 100644 --- a/code/modules/events/stray_cargo.dm +++ b/code/modules/events/stray_cargo.dm @@ -3,7 +3,7 @@ name = "Stray Cargo Pod" typepath = /datum/round_event/stray_cargo weight = 5 - max_occurrences = 6 + max_occurrences = 6 //GS13 - increase the amount of possible strays earliest_start = 10 MINUTES category = EVENT_CATEGORY_BUREAUCRATIC description = "A pod containing a random supply crate lands on the station." diff --git a/code/modules/events/supernova.dm b/code/modules/events/supernova.dm index 6549d4c591..ea1e48898a 100644 --- a/code/modules/events/supernova.dm +++ b/code/modules/events/supernova.dm @@ -2,7 +2,7 @@ name = "Supernova" typepath = /datum/round_event/supernova weight = 5 - max_occurrences = 0 + max_occurrences = 0 //GS13 - fuck no (this is just more intense radstorm) min_players = 2 category = EVENT_CATEGORY_SPACE description = "Several modified radstorms hit the station." diff --git a/code/modules/events/travelling_trader.dm b/code/modules/events/travelling_trader.dm index 98ff3184ae..7be23c215f 100644 --- a/code/modules/events/travelling_trader.dm +++ b/code/modules/events/travelling_trader.dm @@ -2,7 +2,7 @@ name = "Travelling Trader" typepath = /datum/round_event/travelling_trader weight = 8 - max_occurrences = 6 //GS13 because why not + max_occurrences = 6 //GS13 - more occurences, because why not earliest_start = 10 MINUTES category = EVENT_CATEGORY_FRIENDLY description = "A mysterious figure requests something to the crew and rewards them with something for getting it done." diff --git a/code/modules/events/untie_shoes.dm b/code/modules/events/untie_shoes.dm index 17dd2ca8b2..98245280a6 100644 --- a/code/modules/events/untie_shoes.dm +++ b/code/modules/events/untie_shoes.dm @@ -2,7 +2,7 @@ name = "Untied Shoes" typepath = /datum/round_event/untied_shoes weight = 50 - max_occurrences = 10 + max_occurrences = 0 - //GS13 - tedious and lame alert_observers = FALSE category = EVENT_CATEGORY_HEALTH description = "Unties people's shoes, with a chance to knot them as well." diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index de23b9347d..ee5f4e83f3 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -2,8 +2,8 @@ name = "Clogged Vents: Normal" typepath = /datum/round_event/vent_clog weight = 10 - max_occurrences = 3 - min_players = 10 + max_occurrences = 2 //GS13 - pain in the ass, occurences nerfed until a less disruptive variant is made + min_players = 16 //GS13 - pain in the ass, occurences nerfed until a less disruptive variant is made category = EVENT_CATEGORY_HEALTH description = "All the scrubbers onstation spit random chemicals in smoke form." diff --git a/code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm b/code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm index 9c4becbdcf..462c826df9 100644 --- a/code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm +++ b/code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm @@ -4,7 +4,7 @@ weight = 15 max_occurrences = 2 earliest_start = 20 MINUTES - min_players = 5 + min_players = 8 //GS13 - really annoying on low-lowpop considering they jolt back and forth category = EVENT_CATEGORY_ENTITIES description = "Annoying little creatures go around the station causing havoc and hacking everything." diff --git a/hyperstation/code/modules/events/crystalline_reentry.dm b/hyperstation/code/modules/events/crystalline_reentry.dm index f3a6d1e05a..029a08c110 100644 --- a/hyperstation/code/modules/events/crystalline_reentry.dm +++ b/hyperstation/code/modules/events/crystalline_reentry.dm @@ -2,7 +2,7 @@ name = "Crystalline Asteroid" typepath = /datum/round_event/crystalline_reentry min_players = 15 - max_occurrences = 5 + max_occurrences = 0 //GS13 - removed... for now var/atom/special_target /datum/round_event_control/crystalline_reentry/admin_setup() @@ -253,7 +253,7 @@ var/turf/open/chasm/cloud/M = F M.TerraformTurf(/turf/open/floor/plating/asteroid/layenia, /turf/open/floor/plating/asteroid/layenia) gps = new /obj/item/gps/internal(src) - addtimer(CALLBACK(src,PROC_REF(delayedInitialize)), 4 SECONDS) + addtimer(CALLBACK(src,PROC_REF(delayedInitialize)), 4 SECONDS) /obj/structure/spawner/crystalline/deconstruct(disassembled) new /obj/effect/cloud_collapse(loc)