diff --git a/code/__DEFINES/~monkestation/storytellers.dm b/code/__DEFINES/~monkestation/storytellers.dm index a706f3804d87..ce06c4ed58db 100644 --- a/code/__DEFINES/~monkestation/storytellers.dm +++ b/code/__DEFINES/~monkestation/storytellers.dm @@ -24,6 +24,8 @@ #define TAG_SPACE "space" /// When the event requires the station to be on planetary. #define TAG_PLANETARY "planetary" +/// When the event is an external threat(meteors, nukies). +#define TAG_EXTERNAL "external" #define EVENT_TRACK_MUNDANE "Mundane" #define EVENT_TRACK_MODERATE "Moderate" diff --git a/code/modules/events/anomaly/_anomaly.dm b/code/modules/events/anomaly/_anomaly.dm index eaa9f4122787..665dec680dc9 100644 --- a/code/modules/events/anomaly/_anomaly.dm +++ b/code/modules/events/anomaly/_anomaly.dm @@ -24,7 +24,7 @@ impact_area = get_area(spawn_location) else impact_area = placer.findValidArea() - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/anomaly/announce(fake) priority_announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert") diff --git a/code/modules/events/anomaly/anomaly_vortex.dm b/code/modules/events/anomaly/anomaly_vortex.dm index d8eb0b6459ca..53096bc6e131 100644 --- a/code/modules/events/anomaly/anomaly_vortex.dm +++ b/code/modules/events/anomaly/anomaly_vortex.dm @@ -4,7 +4,7 @@ min_players = 20 max_occurrences = 2 - weight = 10 + weight = 4 //monkestation edit: 10 ==> 4 description = "This anomaly sucks in and detonates items." min_wizard_trigger_potency = 3 max_wizard_trigger_potency = 7 diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index 83b3612b9b2a..faf6eb735d03 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -6,10 +6,8 @@ earliest_start = 5 MINUTES category = EVENT_CATEGORY_FRIENDLY description = "A colourful display can be seen through select windows. And the kitchen." - track = EVENT_TRACK_MUNDANE - tags = list(TAG_COMMUNAL, TAG_POSITIVE, TAG_SPACE) -/datum/round_event_control/aurora_caelus/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/aurora_caelus/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE if(!SSmapping.empty_space) return FALSE return ..() diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm index 40df052b1ecd..77d17ce5ecbb 100644 --- a/code/modules/events/brain_trauma.dm +++ b/code/modules/events/brain_trauma.dm @@ -6,8 +6,6 @@ description = "A crewmember gains a random trauma." min_wizard_trigger_potency = 2 max_wizard_trigger_potency = 6 - track = EVENT_TRACK_MUNDANE - tags = list(TAG_TARGETED) /datum/round_event/brain_trauma fakeable = FALSE diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index 689878896eeb..d9d2984785bf 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -9,8 +9,6 @@ min_wizard_trigger_potency = 2 max_wizard_trigger_potency = 6 admin_setup = list(/datum/event_admin_setup/listed_options/brand_intelligence) - track = EVENT_TRACK_MODERATE - tags = list(TAG_DESTRUCTIVE, TAG_COMMUNAL) /datum/round_event/brand_intelligence announce_when = 21 @@ -48,7 +46,7 @@ kill() return origin_machine = pick_n_take(vending_machines) - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/brand_intelligence/announce(fake) priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please inspect any [origin_machine] brand vendors for aggressive marketing tactics, and reboot them if necessary.", "Machine Learning Alert") diff --git a/code/modules/events/bureaucratic_error.dm b/code/modules/events/bureaucratic_error.dm index 6b9b62efd945..0c031cdd9667 100644 --- a/code/modules/events/bureaucratic_error.dm +++ b/code/modules/events/bureaucratic_error.dm @@ -5,8 +5,6 @@ weight = 5 category = EVENT_CATEGORY_BUREAUCRATIC description = "Randomly opens and closes job slots, along with changing the overflow role." - track = EVENT_TRACK_MAJOR // if you've ever dealt with 10 mimes you understand why. - tags = list(TAG_COMMUNAL) /datum/round_event/bureaucratic_error announce_when = 1 @@ -24,11 +22,11 @@ var/datum/job/current = job if(!current.allow_bureaucratic_error) continue - var/ran = rand(-2,4) - current.total_positions = max(current.total_positions + ran, 1) + var/ran = rand(-2,4) //MONKESTATION CHANGE: REMOVE(current.total_positions = 0) ADD: var/ran = rand(-2,4) + current.total_positions = max(current.total_positions + ran, 1) //MONKESTATION ADDITION else // Adds/removes a random amount of job slots from all jobs. for(var/datum/job/current as anything in jobs) if(!current.allow_bureaucratic_error) continue var/ran = rand(-2,4) - current.total_positions = max(current.total_positions + ran, 1) + current.total_positions = max(current.total_positions + ran, 1) //MONKESTATION CHANGE: ran, 0) ==> ran, 1) diff --git a/code/modules/events/camerafailure.dm b/code/modules/events/camerafailure.dm index 7459a575dc05..453b919c5b88 100644 --- a/code/modules/events/camerafailure.dm +++ b/code/modules/events/camerafailure.dm @@ -6,8 +6,6 @@ alert_observers = FALSE category = EVENT_CATEGORY_ENGINEERING description = "Turns off a random amount of cameras." - track = EVENT_TRACK_MUNDANE - tags = list(TAG_COMMUNAL, TAG_SPOOKY) /datum/round_event/camera_failure fakeable = FALSE diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index 17f083a97d4d..821a01446406 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -10,8 +10,6 @@ min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 3 admin_setup = list(/datum/event_admin_setup/carp_migration) - track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL) /datum/round_event_control/carp_migration/New() . = ..() @@ -37,7 +35,7 @@ /datum/round_event/carp_migration/setup() start_when = rand(40, 60) - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/carp_migration/announce(fake) priority_announce("[fluff_signal] have been detected near [station_name()], please stand-by.", "Lifesign Alert") diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index f0e7c4694aa0..0747998e6744 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -6,8 +6,6 @@ description = "Heavily emps all telecommunication machines, blocking all communication for a while." min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 3 - track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL, TAG_SPOOKY) /datum/round_event/communications_blackout announce_when = 1 diff --git a/code/modules/events/creep_awakening.dm b/code/modules/events/creep_awakening.dm index a519ee9430bd..648c2cc9db04 100644 --- a/code/modules/events/creep_awakening.dm +++ b/code/modules/events/creep_awakening.dm @@ -5,8 +5,6 @@ min_players = 20 category = EVENT_CATEGORY_HEALTH description = "A random crewmember becomes obsessed with another." - track = EVENT_TRACK_MODERATE - tags = list(TAG_CREW_ANTAG, TAG_TARGETED) /datum/round_event/obsessed fakeable = FALSE diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 7348875be007..09994933c398 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -32,10 +32,8 @@ admin_setup = list(/datum/event_admin_setup/minimum_candidate_requirement/disease_outbreak, /datum/event_admin_setup/listed_options/disease_outbreak) ///Disease recipient candidates var/list/disease_candidates = list() - track = EVENT_TRACK_MUNDANE - tags = list(TAG_TARGETED) -/datum/round_event_control/disease_outbreak/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/disease_outbreak/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE . = ..() if(!.) return . @@ -102,7 +100,7 @@ /datum/round_event/disease_outbreak/setup() announce_when = ADV_ANNOUNCE_DELAY - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/disease_outbreak/start() var/datum/round_event_control/disease_outbreak/disease_event = control @@ -144,7 +142,7 @@ name = "Disease Outbreak: Advanced" typepath = /datum/round_event/disease_outbreak/advanced category = EVENT_CATEGORY_HEALTH - weight = 15 + weight = 7 //monkestation change 15 ==> 7 min_players = 35 // To avoid shafting lowpop earliest_start = 15 MINUTES // give the chemist a chance description = "An 'advanced' disease will infect some members of the crew." @@ -258,7 +256,7 @@ /datum/round_event/disease_outbreak/advance/setup() announce_when = ADV_ANNOUNCE_DELAY - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /** * Generate advanced virus diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index 71f97a4e2fbc..2874273e9906 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -2,14 +2,12 @@ name = "Space Dust: Minor" typepath = /datum/round_event/space_dust weight = 200 // why the hell was this so much - max_occurrences = 10 + max_occurrences = 10 //MONKESTATION CHANGE: 1000 ==> 10 earliest_start = 0 MINUTES alert_observers = FALSE category = EVENT_CATEGORY_SPACE description = "A single space dust is hurled at the station." map_flags = EVENT_SPACE_ONLY - track = EVENT_TRACK_MUNDANE - tags = list(TAG_DESTRUCTIVE, TAG_SPACE) /datum/round_event/space_dust start_when = 1 diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index 8ec4e485bcbc..1309887d4b73 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -8,8 +8,6 @@ description = "Destroys all lights in a large area." min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 4 - track = EVENT_TRACK_MUNDANE - tags = list(TAG_SPOOKY) /datum/round_event/electrical_storm var/lightsoutAmount = 1 diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm index 36ce68dd61cf..fb6bfd5be975 100644 --- a/code/modules/events/fake_virus.dm +++ b/code/modules/events/fake_virus.dm @@ -4,8 +4,6 @@ weight = 20 category = EVENT_CATEGORY_HEALTH description = "Some crewmembers suffer from temporary hypochondria." - track = EVENT_TRACK_MUNDANE - tags = list(TAG_TARGETED) /datum/round_event/fake_virus/start() var/list/fake_virus_victims = list() diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm index ff0be53939f2..d18e204b9852 100644 --- a/code/modules/events/false_alarm.dm +++ b/code/modules/events/false_alarm.dm @@ -6,8 +6,6 @@ category = EVENT_CATEGORY_BUREAUCRATIC description = "Fakes an event announcement." admin_setup = list(/datum/event_admin_setup/listed_options/false_alarm) - track = EVENT_TRACK_MUNDANE - tags = list(TAG_COMMUNAL) /datum/round_event_control/falsealarm/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() diff --git a/code/modules/events/ghost_role/abductor.dm b/code/modules/events/ghost_role/abductor.dm index 5188f3ef6293..f6928222cfdc 100644 --- a/code/modules/events/ghost_role/abductor.dm +++ b/code/modules/events/ghost_role/abductor.dm @@ -7,9 +7,6 @@ dynamic_should_hijack = TRUE category = EVENT_CATEGORY_INVASION description = "One or more abductor teams spawns, and they plan to experiment on the crew." - track = EVENT_TRACK_MAJOR - tags = list(TAG_TARGETED, TAG_SPOOKY) - checks_antag_cap = TRUE /datum/round_event/ghost_role/abductor minimum_required = 2 diff --git a/code/modules/events/ghost_role/alien_infestation.dm b/code/modules/events/ghost_role/alien_infestation.dm index e76e8c8ccb11..32083b535fd5 100644 --- a/code/modules/events/ghost_role/alien_infestation.dm +++ b/code/modules/events/ghost_role/alien_infestation.dm @@ -5,15 +5,12 @@ min_players = 35 //monkie edit: 10 to 35 (tg what the fuck) - earliest_start = 60 MINUTES //monkie edit: 20 to 90 + earliest_start = 60 MINUTES //monkie edit: 20 to 60 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES description = "A xenomorph larva spawns on a random vent." - track = EVENT_TRACK_MAJOR - tags = list(TAG_COMBAT) - checks_antag_cap = TRUE -/datum/round_event_control/alien_infestation/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/alien_infestation/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE . = ..() if(!.) return . @@ -37,7 +34,7 @@ announce_when = rand(announce_when, announce_when + 50) if(prob(50)) spawncount++ - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/ghost_role/alien_infestation/announce(fake) var/living_aliens = FALSE for(var/mob/living/carbon/alien/A in GLOB.player_list) diff --git a/code/modules/events/ghost_role/blob.dm b/code/modules/events/ghost_role/blob.dm index 2278ca8cca18..45b91e367ca3 100644 --- a/code/modules/events/ghost_role/blob.dm +++ b/code/modules/events/ghost_role/blob.dm @@ -6,15 +6,12 @@ min_players = 35 //monkie edit: 20 to 35 - earliest_start = 60 MINUTES //monkie edit: 20 to 90 + earliest_start = 60 MINUTES //monkie edit: 20 to 60 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES description = "Spawns a new blob overmind." - track = EVENT_TRACK_MAJOR - tags = list(TAG_DESTRUCTIVE, TAG_COMBAT) - checks_antag_cap = TRUE -/datum/round_event_control/blob/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/blob/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE if(EMERGENCY_PAST_POINT_OF_NO_RETURN) // no blobs if the shuttle is past the point of no return return FALSE diff --git a/code/modules/events/ghost_role/changeling_event.dm b/code/modules/events/ghost_role/changeling_event.dm index 3bd3770da4b7..570a6166093d 100644 --- a/code/modules/events/ghost_role/changeling_event.dm +++ b/code/modules/events/ghost_role/changeling_event.dm @@ -14,9 +14,6 @@ dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES description = "A meteor containing a changeling is summoned and thrown at the exterior of the station." - track = EVENT_TRACK_MAJOR - tags = list(TAG_COMBAT) - checks_antag_cap = TRUE /datum/round_event/ghost_role/changeling minimum_required = 1 diff --git a/code/modules/events/ghost_role/fugitive_event.dm b/code/modules/events/ghost_role/fugitive_event.dm index 08f1390889aa..24aa4798c79c 100644 --- a/code/modules/events/ghost_role/fugitive_event.dm +++ b/code/modules/events/ghost_role/fugitive_event.dm @@ -9,9 +9,6 @@ category = EVENT_CATEGORY_INVASION description = "Fugitives will hide on the station, followed by hunters." map_flags = EVENT_SPACE_ONLY - track = EVENT_TRACK_MAJOR - tags = list(TAG_COMBAT) - checks_antag_cap = TRUE /datum/round_event/ghost_role/fugitives minimum_required = 1 diff --git a/code/modules/events/ghost_role/morph_event.dm b/code/modules/events/ghost_role/morph_event.dm index 8ec6b9a0d72c..e0b75119c282 100644 --- a/code/modules/events/ghost_role/morph_event.dm +++ b/code/modules/events/ghost_role/morph_event.dm @@ -7,9 +7,6 @@ description = "Spawns a hungry shapeshifting blobby creature." min_wizard_trigger_potency = 4 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_ROLESET - tags = list(TAG_COMBAT, TAG_SPOOKY) - checks_antag_cap = TRUE /datum/round_event/ghost_role/morph minimum_required = 1 diff --git a/code/modules/events/ghost_role/nightmare.dm b/code/modules/events/ghost_role/nightmare.dm index 20a70e542454..57b942988cdb 100644 --- a/code/modules/events/ghost_role/nightmare.dm +++ b/code/modules/events/ghost_role/nightmare.dm @@ -8,9 +8,6 @@ description = "Spawns a nightmare, aiming to darken the station." min_wizard_trigger_potency = 6 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_ROLESET - tags = list(TAG_COMBAT, TAG_SPOOKY) - checks_antag_cap = TRUE /datum/round_event/ghost_role/nightmare minimum_required = 1 diff --git a/code/modules/events/ghost_role/operative.dm b/code/modules/events/ghost_role/operative.dm index 4a8d4d668fd9..4cf8da639bb5 100644 --- a/code/modules/events/ghost_role/operative.dm +++ b/code/modules/events/ghost_role/operative.dm @@ -5,9 +5,6 @@ max_occurrences = 1 category = EVENT_CATEGORY_INVASION description = "A single nuclear operative assaults the station." - track = EVENT_TRACK_MAJOR - tags = list(TAG_DESTRUCTIVE, TAG_COMBAT) - checks_antag_cap = TRUE /datum/round_event/ghost_role/operative minimum_required = 1 diff --git a/code/modules/events/ghost_role/revenant_event.dm b/code/modules/events/ghost_role/revenant_event.dm index 0de546c567f4..e4b8b4a75fe2 100644 --- a/code/modules/events/ghost_role/revenant_event.dm +++ b/code/modules/events/ghost_role/revenant_event.dm @@ -11,9 +11,6 @@ description = "Spawns an angry, soul sucking ghost." min_wizard_trigger_potency = 4 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_ROLESET - tags = list(TAG_DESTRUCTIVE, TAG_SPOOKY) - checks_antag_cap = TRUE /datum/round_event/ghost_role/revenant var/ignore_mobcheck = FALSE diff --git a/code/modules/events/ghost_role/sentience.dm b/code/modules/events/ghost_role/sentience.dm index 289c259643e7..7c58e6e7e928 100644 --- a/code/modules/events/ghost_role/sentience.dm +++ b/code/modules/events/ghost_role/sentience.dm @@ -28,8 +28,6 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list( description = "An animal or robot becomes sentient!" min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL, TAG_SPOOKY) /datum/round_event/ghost_role/sentience diff --git a/code/modules/events/ghost_role/sentient_disease.dm b/code/modules/events/ghost_role/sentient_disease.dm index b8e769ab27fe..662f6de22c8a 100644 --- a/code/modules/events/ghost_role/sentient_disease.dm +++ b/code/modules/events/ghost_role/sentient_disease.dm @@ -9,9 +9,6 @@ description = "Spawns a sentient disease, who wants to infect as many people as possible." min_wizard_trigger_potency = 4 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_MAJOR - tags = list(TAG_COMBAT, TAG_DESTRUCTIVE) - checks_antag_cap = TRUE /datum/round_event/ghost_role/sentient_disease role_name = "sentient disease" diff --git a/code/modules/events/ghost_role/slaughter_event.dm b/code/modules/events/ghost_role/slaughter_event.dm index b9892fb5cecc..8cb2b729aa4e 100644 --- a/code/modules/events/ghost_role/slaughter_event.dm +++ b/code/modules/events/ghost_role/slaughter_event.dm @@ -10,9 +10,6 @@ description = "Spawns a slaughter demon, to hunt by travelling through pools of blood." min_wizard_trigger_potency = 6 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_MAJOR - tags = list(TAG_COMBAT, TAG_SPOOKY) - checks_antag_cap = TRUE /datum/round_event/ghost_role/slaughter minimum_required = 1 diff --git a/code/modules/events/ghost_role/space_dragon.dm b/code/modules/events/ghost_role/space_dragon.dm index f29eade80971..e3aa02ad465d 100644 --- a/code/modules/events/ghost_role/space_dragon.dm +++ b/code/modules/events/ghost_role/space_dragon.dm @@ -10,9 +10,6 @@ description = "Spawns a space dragon, which will try to take over the station." min_wizard_trigger_potency = 6 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_ROLESET - tags = list(TAG_COMBAT) - checks_antag_cap = TRUE /datum/round_event/ghost_role/space_dragon minimum_required = 1 diff --git a/code/modules/events/ghost_role/space_ninja.dm b/code/modules/events/ghost_role/space_ninja.dm index 894e092a1c21..a14511b72779 100644 --- a/code/modules/events/ghost_role/space_ninja.dm +++ b/code/modules/events/ghost_role/space_ninja.dm @@ -8,9 +8,6 @@ dynamic_should_hijack = TRUE category = EVENT_CATEGORY_INVASION description = "A space ninja infiltrates the station." - track = EVENT_TRACK_ROLESET - tags = list(TAG_COMBAT) - checks_antag_cap = TRUE /datum/round_event/ghost_role/space_ninja minimum_required = 1 diff --git a/code/modules/events/gravity_generator_blackout.dm b/code/modules/events/gravity_generator_blackout.dm index 6384c8030656..657cfdb2b3e6 100644 --- a/code/modules/events/gravity_generator_blackout.dm +++ b/code/modules/events/gravity_generator_blackout.dm @@ -6,10 +6,8 @@ description = "Turns off the gravity generator." min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 4 - track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL, TAG_SPACE) -/datum/round_event_control/gravity_generator_blackout/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/gravity_generator_blackout/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE . = ..() if(!.) return . diff --git a/code/modules/events/grey_tide.dm b/code/modules/events/grey_tide.dm index d09f76ebe393..cdbde4fb0417 100644 --- a/code/modules/events/grey_tide.dm +++ b/code/modules/events/grey_tide.dm @@ -8,8 +8,6 @@ description = "Bolts open all doors in one or more departments." min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_MODERATE - tags = list(TAG_DESTRUCTIVE, TAG_SPOOKY) /datum/round_event/grey_tide announce_when = 50 @@ -23,7 +21,7 @@ announce_when = rand(50, 60) end_when = rand(20, 30) severity = rand(1,3) - setup = TRUE + setup = TRUE //MONKESTATION ADDITION var/list/potential_areas = list(/area/station/command, /area/station/engineering, diff --git a/code/modules/events/grid_check.dm b/code/modules/events/grid_check.dm index 2743c4d839d9..ecc70df98bcd 100644 --- a/code/modules/events/grid_check.dm +++ b/code/modules/events/grid_check.dm @@ -10,8 +10,6 @@ /// Cooldown for the announement associated with this event. /// Necessary due to the fact that this event is player triggerable. COOLDOWN_DECLARE(announcement_spam_protection) - track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL, TAG_SPOOKY) /datum/round_event/grid_check announce_when = 1 diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index 4980225e7836..46f1ae3857de 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -11,10 +11,8 @@ admin_setup = list(/datum/event_admin_setup/minimum_candidate_requirement/heart_attack, /datum/event_admin_setup/input_number/heart_attack) ///Candidates for recieving a healthy dose of heart disease var/list/heart_attack_candidates = list() - track = EVENT_TRACK_MODERATE - tags = list(TAG_TARGETED) -/datum/round_event_control/heart_attack/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/heart_attack/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE . = ..() if(!.) return . diff --git a/code/modules/events/immovable_rod/immovable_rod_event.dm b/code/modules/events/immovable_rod/immovable_rod_event.dm index 0b8437cf4f9d..63d2e79b3911 100644 --- a/code/modules/events/immovable_rod/immovable_rod_event.dm +++ b/code/modules/events/immovable_rod/immovable_rod_event.dm @@ -11,8 +11,6 @@ min_wizard_trigger_potency = 6 max_wizard_trigger_potency = 7 admin_setup = list(/datum/event_admin_setup/set_location/immovable_rod, /datum/event_admin_setup/question/immovable_rod) - track = EVENT_TRACK_MODERATE - tags = list(TAG_DESTRUCTIVE) /datum/round_event/immovable_rod announce_when = 5 diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index f2edeac485a6..772d1576cdc0 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -7,8 +7,6 @@ description = "Gives the AI a new, randomized law." min_wizard_trigger_potency = 2 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_MODERATE - tags = list(TAG_TARGETED) /datum/round_event/ion_storm var/replaceLawsetChance = 25 //chance the AI's lawset is completely replaced with something else per config weights diff --git a/code/modules/events/mass_hallucination.dm b/code/modules/events/mass_hallucination.dm index 2e2baf9a85f7..85b1ef024775 100644 --- a/code/modules/events/mass_hallucination.dm +++ b/code/modules/events/mass_hallucination.dm @@ -9,8 +9,6 @@ min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 2 admin_setup = list(/datum/event_admin_setup/mass_hallucination) - track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL) /datum/round_event/mass_hallucination fakeable = FALSE diff --git a/code/modules/events/meteors/meteor_wave_events.dm b/code/modules/events/meteors/meteor_wave_events.dm index 475e3265b8c8..e45c2b3fda97 100644 --- a/code/modules/events/meteors/meteor_wave_events.dm +++ b/code/modules/events/meteors/meteor_wave_events.dm @@ -10,8 +10,6 @@ category = EVENT_CATEGORY_SPACE description = "A regular meteor wave." map_flags = EVENT_SPACE_ONLY - track = EVENT_TRACK_MAJOR - tags = list(TAG_COMMUNAL, TAG_SPACE, TAG_DESTRUCTIVE) /datum/round_event/meteor_wave start_when = 6 diff --git a/code/modules/events/meteors/stray_meteor_event.dm b/code/modules/events/meteors/stray_meteor_event.dm index 849be38b6a09..53daff1ac8a1 100644 --- a/code/modules/events/meteors/stray_meteor_event.dm +++ b/code/modules/events/meteors/stray_meteor_event.dm @@ -11,8 +11,6 @@ max_wizard_trigger_potency = 7 admin_setup = list(/datum/event_admin_setup/listed_options/stray_meteor) map_flags = EVENT_SPACE_ONLY - track = EVENT_TRACK_MODERATE - tags = list(TAG_DESTRUCTIVE, TAG_SPACE) /datum/round_event/stray_meteor announce_when = 1 diff --git a/code/modules/events/mice_migration.dm b/code/modules/events/mice_migration.dm index 038ee8bcb193..e7f31567f4c9 100644 --- a/code/modules/events/mice_migration.dm +++ b/code/modules/events/mice_migration.dm @@ -4,8 +4,6 @@ weight = 10 category = EVENT_CATEGORY_ENTITIES description = "A horde of mice arrives, and perhaps even the Rat King themselves." - track = EVENT_TRACK_MUNDANE - tags = list(TAG_DESTRUCTIVE) /datum/round_event/mice_migration var/minimum_mice = 5 diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm index 86e6a3e6f74d..1edf99e3400d 100644 --- a/code/modules/events/portal_storm.dm +++ b/code/modules/events/portal_storm.dm @@ -3,12 +3,10 @@ typepath = /datum/round_event/portal_storm/syndicate_shocktroop weight = 2 min_players = 15 - max_occurrences = 5 + max_occurrences = 1 //MONKESTATION ADDITION earliest_start = 30 MINUTES category = EVENT_CATEGORY_ENTITIES description = "Syndicate troops pour out of portals." - track = EVENT_TRACK_MAJOR - tags = list(TAG_COMBAT) /datum/round_event/portal_storm/syndicate_shocktroop boss_types = list(/mob/living/basic/trooper/syndicate/melee/space/stormtrooper = 2) @@ -72,7 +70,7 @@ hostiles_spawn += get_random_station_turf() next_boss_spawn = start_when + CEILING(2 * number_of_hostiles / number_of_bosses, 1) - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/portal_storm/announce(fake) set waitfor = 0 diff --git a/code/modules/events/processor_overload.dm b/code/modules/events/processor_overload.dm index 9a18da1bd3c9..ebcbb27f2781 100644 --- a/code/modules/events/processor_overload.dm +++ b/code/modules/events/processor_overload.dm @@ -5,8 +5,6 @@ min_players = 20 category = EVENT_CATEGORY_ENGINEERING description = "Emps the telecomm processors, scrambling radio speech. Might blow up a few." - track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL) /datum/round_event/processor_overload announce_when = 1 diff --git a/code/modules/events/radiation_leak.dm b/code/modules/events/radiation_leak.dm index a94c8fe03e1a..a193676c3db5 100644 --- a/code/modules/events/radiation_leak.dm +++ b/code/modules/events/radiation_leak.dm @@ -8,8 +8,6 @@ category = EVENT_CATEGORY_ENGINEERING min_wizard_trigger_potency = 3 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL) /datum/round_event/radiation_leak start_when = 1 // 2 seconds in @@ -49,7 +47,7 @@ // We found something, we can just return now picked_machine_ref = WEAKREF(sick_device) return - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/radiation_leak/announce(fake) var/obj/machinery/the_source_of_our_problems = picked_machine_ref?.resolve() diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 8d4be6c8299b..afd24a061a56 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -1,13 +1,11 @@ /datum/round_event_control/radiation_storm name = "Radiation Storm" typepath = /datum/round_event/radiation_storm - max_occurrences = 2 //monkestation edit - STORYTELLERS + max_occurrences = 2 //monkestation edit - STORYTELLERS 1 ==> 2 category = EVENT_CATEGORY_SPACE description = "Radiation storm affects the station, forcing the crew to escape to maintenance." min_wizard_trigger_potency = 3 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL) /datum/round_event/radiation_storm @@ -16,7 +14,7 @@ start_when = 3 end_when = start_when + 1 announce_when = 1 - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/radiation_storm/announce(fake) priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", ANNOUNCER_RADIATION) diff --git a/code/modules/events/sandstorm.dm b/code/modules/events/sandstorm.dm index fc141315bb4b..7a308fc457a0 100644 --- a/code/modules/events/sandstorm.dm +++ b/code/modules/events/sandstorm.dm @@ -19,8 +19,6 @@ max_wizard_trigger_potency = 7 admin_setup = list(/datum/event_admin_setup/listed_options/sandstorm) map_flags = EVENT_SPACE_ONLY - track = EVENT_TRACK_MODERATE - tags = list(TAG_DESTRUCTIVE) /datum/round_event/sandstorm start_when = 60 @@ -32,7 +30,7 @@ /datum/round_event/sandstorm/setup() start_when = rand(70, 90) end_when = rand(110, 140) - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/sandstorm/announce(fake) if(!start_side) diff --git a/code/modules/events/scrubber_clog.dm b/code/modules/events/scrubber_clog.dm index 7a332e67cf5d..3247d3f6be7c 100644 --- a/code/modules/events/scrubber_clog.dm +++ b/code/modules/events/scrubber_clog.dm @@ -6,8 +6,6 @@ earliest_start = 5 MINUTES category = EVENT_CATEGORY_JANITORIAL description = "Harmless mobs climb out of a scrubber." - track = EVENT_TRACK_MUNDANE - tags = list(TAG_COMMUNAL) /datum/round_event/scrubber_clog announce_when = 10 @@ -42,7 +40,7 @@ end_when = rand(300, 600) maximum_spawns = rand(3, 5) spawn_delay = rand(10, 15) - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/scrubber_clog/start() //Sets the scrubber up for unclogging/mob production. scrubber.clog() @@ -89,7 +87,7 @@ scrubber_list += scrubber return pick(scrubber_list) -/datum/round_event_control/scrubber_clog/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/scrubber_clog/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE . = ..() if(!.) return @@ -187,6 +185,7 @@ /mob/living/basic/carp, /mob/living/basic/bee/toxin, /mob/living/basic/cockroach/glockroach, + /mob/living/basic/bear, //monkestation addition ) return pick(mob_list) @@ -213,7 +212,7 @@ /datum/round_event/scrubber_clog/strange/get_mob() var/static/list/mob_list = list( /mob/living/basic/lightgeist, - /mob/living/basic/bear, + ///mob/living/basic/bear, monkestation removal /mob/living/basic/mushroom, /mob/living/simple_animal/hostile/retaliate/goose, //Janitors HATE geese. /mob/living/simple_animal/pet/gondola, diff --git a/code/modules/events/scrubber_overflow.dm b/code/modules/events/scrubber_overflow.dm index 353293a6e3df..94f23751b5d1 100644 --- a/code/modules/events/scrubber_overflow.dm +++ b/code/modules/events/scrubber_overflow.dm @@ -7,8 +7,6 @@ category = EVENT_CATEGORY_JANITORIAL description = "The scrubbers release a tide of mostly harmless froth." admin_setup = list(/datum/event_admin_setup/listed_options/scrubber_overflow) - track = EVENT_TRACK_MUNDANE - tags = list(TAG_COMMUNAL) /datum/round_event/scrubber_overflow announce_when = 1 @@ -86,9 +84,9 @@ if(!scrubbers.len) return kill() - setup = TRUE + setup = TRUE //MONKESTATION ADDITION -/datum/round_event_control/scrubber_overflow/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/scrubber_overflow/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE . = ..() if(!.) return diff --git a/code/modules/events/shuttle_catastrophe.dm b/code/modules/events/shuttle_catastrophe.dm index 9c8332cadebe..41f195e8e7cf 100644 --- a/code/modules/events/shuttle_catastrophe.dm +++ b/code/modules/events/shuttle_catastrophe.dm @@ -6,10 +6,8 @@ category = EVENT_CATEGORY_BUREAUCRATIC description = "Replaces the emergency shuttle with a random one." admin_setup = list(/datum/event_admin_setup/warn_admin/shuttle_catastrophe, /datum/event_admin_setup/listed_options/shuttle_catastrophe) - track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL) -/datum/round_event_control/shuttle_catastrophe/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/shuttle_catastrophe/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE . = ..() if(!.) return . @@ -48,7 +46,7 @@ if(!isnull(template.who_can_purchase) && template.credit_cost < INFINITY) //if we could get it from the communications console, it's cool for us to get it here valid_shuttle_templates += template new_shuttle = pick(valid_shuttle_templates) - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/shuttle_catastrophe/start() if(SSshuttle.shuttle_insurance) diff --git a/code/modules/events/shuttle_insurance.dm b/code/modules/events/shuttle_insurance.dm index e3709f0308c5..63d4202619e9 100644 --- a/code/modules/events/shuttle_insurance.dm +++ b/code/modules/events/shuttle_insurance.dm @@ -1,15 +1,11 @@ - - /datum/round_event_control/shuttle_insurance name = "Shuttle Insurance" typepath = /datum/round_event/shuttle_insurance max_occurrences = 1 category = EVENT_CATEGORY_BUREAUCRATIC description = "A sketchy but legit insurance offer." - track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL) -/datum/round_event_control/shuttle_insurance/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/shuttle_insurance/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE . = ..() if(!.) return . @@ -41,7 +37,7 @@ break if(!insurance_evaluation) insurance_evaluation = 5000 //gee i dunno - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/shuttle_insurance/start() insurance_message = new("Shuttle Insurance", "Hey, pal, this is the [ship_name]. Can't help but notice you're rocking a wild and crazy shuttle there with NO INSURANCE! Crazy. What if something happened to it, huh?! We've done a quick evaluation on your rates in this sector and we're offering [insurance_evaluation] to cover for your shuttle in case of any disaster.", list("Purchase Insurance.","Reject Offer.")) diff --git a/code/modules/events/space_vines/vine_event.dm b/code/modules/events/space_vines/vine_event.dm index 825244ad7f3b..c3d6e03754a0 100644 --- a/code/modules/events/space_vines/vine_event.dm +++ b/code/modules/events/space_vines/vine_event.dm @@ -3,7 +3,7 @@ typepath = /datum/round_event/spacevine weight = 15 max_occurrences = 3 - min_players = 10 + min_players = 25 //MONKESTATION CHANGE: 10 ==> 25 category = EVENT_CATEGORY_ENTITIES description = "Kudzu begins to overtake the station. Might spawn man-traps." min_wizard_trigger_potency = 4 @@ -14,9 +14,6 @@ /datum/event_admin_setup/input_number/spacevine_potency, /datum/event_admin_setup/input_number/spacevine_production, ) - track = EVENT_TRACK_MAJOR - tags = list(TAG_COMMUNAL, TAG_COMBAT) - checks_antag_cap = TRUE /datum/round_event/spacevine fakeable = FALSE diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index 8a600da626ea..cb3a7f8f4806 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -10,8 +10,6 @@ description = "Spawns spider eggs, ready to hatch." min_wizard_trigger_potency = 5 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_ROLESET - tags = list(TAG_COMBAT) /datum/round_event/spider_infestation announce_when = 400 @@ -19,7 +17,7 @@ /datum/round_event/spider_infestation/setup() announce_when = rand(announce_when, announce_when + 50) - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/spider_infestation/announce(fake) priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", ANNOUNCER_ALIENS) diff --git a/code/modules/events/stray_cargo.dm b/code/modules/events/stray_cargo.dm index b2ec87736f3b..b819e27a7db6 100644 --- a/code/modules/events/stray_cargo.dm +++ b/code/modules/events/stray_cargo.dm @@ -8,8 +8,6 @@ category = EVENT_CATEGORY_BUREAUCRATIC description = "A pod containing a random supply crate lands on the station." admin_setup = list(/datum/event_admin_setup/set_location/stray_cargo, /datum/event_admin_setup/listed_options/stray_cargo) - track = EVENT_TRACK_MUNDANE - tags = list(TAG_COMMUNAL) /datum/event_admin_setup/set_location/stray_cargo input_text = "Aim pod at turf we're on?" @@ -68,7 +66,7 @@ var/datum/supply_pack/pack_type = pack if(initial(pack_type.special)) stray_spawnable_supply_packs -= pack - setup = TRUE + setup = TRUE //MONKESTATION ADDITION ///Spawns a random supply pack, puts it in a pod, and spawns it on a random tile of the selected area /datum/round_event/stray_cargo/start() diff --git a/code/modules/events/tram_malfunction.dm b/code/modules/events/tram_malfunction.dm index 698b88171d69..31f7e5ad2cf0 100644 --- a/code/modules/events/tram_malfunction.dm +++ b/code/modules/events/tram_malfunction.dm @@ -11,11 +11,9 @@ description = "Tram crossing signals malfunction, tram collision damage is increased." min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 3 - track = EVENT_TRACK_MODERATE - tags = list(TAG_DESTRUCTIVE) //Check if there's a tram we can cause to malfunction. -/datum/round_event_control/tram_malfunction/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/tram_malfunction/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE . = ..() if (!.) return FALSE @@ -35,7 +33,7 @@ /datum/round_event/tram_malfunction/setup() end_when = rand(TRAM_MALFUNCTION_TIME_LOWER, TRAM_MALFUNCTION_TIME_UPPER) - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/tram_malfunction/announce() priority_announce("Our automated control system has lost contact with the tram's on board computer. Please take extra care while we diagnose and resolve the issue. Signals and emergency braking may not be available during this time.", "CentCom Engineering Division") diff --git a/code/modules/events/wisdomcow.dm b/code/modules/events/wisdomcow.dm index 7aa24b45a27f..02251917fb6a 100644 --- a/code/modules/events/wisdomcow.dm +++ b/code/modules/events/wisdomcow.dm @@ -10,8 +10,6 @@ /datum/event_admin_setup/listed_options/wisdom_cow, /datum/event_admin_setup/input_number/wisdom_cow, ) - track = EVENT_TRACK_MUNDANE - tags = list(TAG_COMMUNAL, TAG_POSITIVE) /datum/round_event/wisdomcow ///Location override that, if set causes the cow to spawn in a pre-determined locaction instead of randomly. diff --git a/code/modules/events/wizard/embeddies.dm b/code/modules/events/wizard/embeddies.dm index ee4f803699a6..689e48b4641a 100644 --- a/code/modules/events/wizard/embeddies.dm +++ b/code/modules/events/wizard/embeddies.dm @@ -9,7 +9,7 @@ max_wizard_trigger_potency = 7 ///behold... the only reason sticky is a subtype... -/datum/round_event_control/wizard/embedpocalypse/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/wizard/embedpocalypse/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE . = ..() if(!.) return . diff --git a/code/modules/events/wizard/identity_spoof.dm b/code/modules/events/wizard/identity_spoof.dm index bdad88e9ab84..88f0ed26e5cd 100644 --- a/code/modules/events/wizard/identity_spoof.dm +++ b/code/modules/events/wizard/identity_spoof.dm @@ -5,7 +5,7 @@ max_occurrences = 1 description = "Makes everyone dressed up like a wizard." -/datum/round_event_control/wizard/identity_spoof/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) +/datum/round_event_control/wizard/identity_spoof/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) //MONKESTATION ADDITION: fake_check = FALSE . = ..() if(!.) return . diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm index ee96155468c4..37ad8afec98c 100644 --- a/code/modules/events/wormholes.dm +++ b/code/modules/events/wormholes.dm @@ -10,8 +10,6 @@ GLOBAL_LIST_EMPTY(all_wormholes) // So we can pick wormholes to teleport to description = "Space time anomalies appear on the station, randomly teleporting people who walk into them." min_wizard_trigger_potency = 3 max_wizard_trigger_potency = 7 - track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL) /datum/round_event/wormholes announce_when = 10 @@ -25,7 +23,7 @@ GLOBAL_LIST_EMPTY(all_wormholes) // So we can pick wormholes to teleport to /datum/round_event/wormholes/setup() announce_when = rand(0, 20) end_when = rand(40, 80) - setup = TRUE + setup = TRUE //MONKESTATION ADDITION /datum/round_event/wormholes/start() for(var/turf/open/floor/T in world) diff --git a/monkestation/code/modules/antagonists/florida_man/florida_events.dm b/monkestation/code/modules/antagonists/florida_man/florida_events.dm index 1055348961ea..2cb54c226321 100644 --- a/monkestation/code/modules/antagonists/florida_man/florida_events.dm +++ b/monkestation/code/modules/antagonists/florida_man/florida_events.dm @@ -3,8 +3,8 @@ typepath = /datum/round_event/ghost_role/florida_man weight = 14 max_occurrences = 3 - track = EVENT_TRACK_MUNDANE - tags = list(TAG_COMMUNAL, TAG_COMBAT) + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_EXTERNAL) checks_antag_cap = TRUE /datum/round_event/ghost_role/florida_man diff --git a/monkestation/code/modules/antagonists/slasher/ghost_role.dm b/monkestation/code/modules/antagonists/slasher/ghost_role.dm index a10fe8c00c5c..c3bcb3140536 100644 --- a/monkestation/code/modules/antagonists/slasher/ghost_role.dm +++ b/monkestation/code/modules/antagonists/slasher/ghost_role.dm @@ -4,7 +4,7 @@ weight = 14 // for now max_occurrences = 2 track = EVENT_TRACK_MODERATE - tags = list(TAG_SPOOKY, TAG_COMBAT) + tags = list(TAG_SPOOKY, TAG_COMBAT, TAG_EXTERNAL) checks_antag_cap = TRUE /datum/round_event/ghost_role/slasher diff --git a/monkestation/code/modules/storytellers/converted_events/event_overrides.dm b/monkestation/code/modules/storytellers/converted_events/event_overrides.dm new file mode 100644 index 000000000000..0c74026d92e9 --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/event_overrides.dm @@ -0,0 +1,231 @@ +/datum/round_event_control/abductor + track = EVENT_TRACK_MAJOR + tags = list(TAG_TARGETED, TAG_SPOOKY, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/anomaly + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE) + +/datum/round_event_control/alien_infestation + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT, TAG_DESTRUCTIVE, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/aurora_caelus + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL, TAG_POSITIVE, TAG_SPACE) + +/datum/round_event_control/blob + track = EVENT_TRACK_MAJOR + tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/brain_trauma + track = EVENT_TRACK_MUNDANE + tags = list(TAG_TARGETED) + +/datum/round_event_control/brand_intelligence + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE, TAG_COMMUNAL) + +/datum/round_event_control/bureaucratic_error + track = EVENT_TRACK_MAJOR // if you've ever dealt with 10 mimes you understand why. + tags = list(TAG_COMMUNAL) + +/datum/round_event_control/camera_failure + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL, TAG_SPOOKY) + +/datum/round_event_control/carp_migration + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_SPACE, TAG_EXTERNAL) + +/datum/round_event_control/changeling //THIS IS THE METEOR EVENT, IT NEEDS TO BE A METEOR, DO NOT SPAWN THIS ON PLANETARY MAPS + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT, TAG_SPACE, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/communications_blackout + max_occurrences = 2 + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL, TAG_SPOOKY) + +/datum/round_event_control/disease_outbreak + track = EVENT_TRACK_MAJOR + tags = list(TAG_TARGETED, TAG_COMMUNAL, TAG_EXTERNAL) + +/datum/round_event_control/electrical_storm + track = EVENT_TRACK_MUNDANE + tags = list(TAG_SPOOKY) + +/datum/round_event_control/fake_virus + track = EVENT_TRACK_MUNDANE + tags = list(TAG_TARGETED) + +/datum/round_event_control/falsealarm + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL) + +/datum/round_event_control/fugitives + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/gravity_generator_blackout + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL, TAG_SPACE) + +/datum/round_event_control/grey_tide + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE, TAG_SPOOKY) + +/datum/round_event_control/grid_check + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL, TAG_SPOOKY) + +/datum/round_event_control/heart_attack + track = EVENT_TRACK_MODERATE + tags = list(TAG_TARGETED) + +/datum/round_event_control/immovable_rod + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE, TAG_EXTERNAL) + +/datum/round_event_control/ion_storm + track = EVENT_TRACK_MODERATE + tags = list(TAG_TARGETED) + +/datum/round_event_control/mass_hallucination + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) + +/datum/round_event_control/meteor_wave + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMMUNAL, TAG_SPACE, TAG_DESTRUCTIVE, TAG_EXTERNAL) + +/datum/round_event_control/mice_migration + track = EVENT_TRACK_MUNDANE + tags = list(TAG_DESTRUCTIVE) + +/datum/round_event_control/morph + track = EVENT_TRACK_ROLESET + tags = list(TAG_COMBAT, TAG_SPOOKY, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/nightmare + track = EVENT_TRACK_ROLESET + tags = list(TAG_COMBAT, TAG_SPOOKY, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/obsessed + track = EVENT_TRACK_MODERATE + tags = list(TAG_CREW_ANTAG, TAG_TARGETED) + +/datum/round_event_control/operative + track = EVENT_TRACK_MAJOR + tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/portal_storm_syndicate + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT, TAG_EXTERNAL) + +/datum/round_event_control/processor_overload + max_occurrences = 2 + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) + +/datum/round_event_control/radiation_leak + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) + +/datum/round_event_control/radiation_storm + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) + +/datum/round_event_control/revenant + track = EVENT_TRACK_ROLESET + tags = list(TAG_DESTRUCTIVE, TAG_SPOOKY, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/sandstorm + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE, TAG_EXTERNAL) + +/datum/round_event_control/scrubber_clog + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL) + +/datum/round_event_control/scrubber_clog/critical + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMMUNAL, TAG_COMBAT, TAG_EXTERNAL) + +/datum/round_event_control/scrubber_overflow + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL) + +/datum/round_event_control/sentience + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL, TAG_SPOOKY) + +/datum/round_event_control/sentient_disease + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT, TAG_DESTRUCTIVE, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/shuttle_catastrophe + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) + +/datum/round_event_control/shuttle_insurance + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) + +/datum/round_event_control/slaughter + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT, TAG_SPOOKY, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/space_dust + track = EVENT_TRACK_MUNDANE + tags = list(TAG_DESTRUCTIVE, TAG_SPACE, TAG_EXTERNAL) + +/datum/round_event_control/space_dragon + track = EVENT_TRACK_ROLESET + tags = list(TAG_COMBAT, TAG_SPACE, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/space_ninja + track = EVENT_TRACK_ROLESET + tags = list(TAG_COMBAT, TAG_DESTRUCTIVE, TAG_EXTERNAL) + checks_antag_cap = TRUE + +/datum/round_event_control/spacevine + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT, TAG_DESTRUCTIVE) + checks_antag_cap = TRUE + +/datum/round_event_control/spider_infestation + track = EVENT_TRACK_ROLESET + tags = list(TAG_COMBAT, TAG_DESTRUCTIVE, TAG_EXTERNAL) + +/datum/round_event_control/stray_cargo + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL) + +/datum/round_event_control/stray_meteor + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE, TAG_SPACE, TAG_EXTERNAL) + +/datum/round_event_control/tram_malfunction + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL) + +/datum/round_event_control/wisdomcow + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL, TAG_POSITIVE) + +/datum/round_event_control/wormholes + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm b/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm index e19bd8f800f3..d981c6eab709 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm @@ -1,6 +1,6 @@ /datum/round_event_control/antagonist/solo/clockcult name = "Clock Cult" - tags = list(TAG_SPOOKY, TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG) + tags = list(TAG_SPOOKY, TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG, TAG_EXTERNAL) antag_flag = ROLE_CLOCK_CULTIST antag_datum = /datum/antagonist/clock_cultist typepath = /datum/round_event/antagonist/solo/clockcult diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm index 488c6adc5222..fb2893a9d7c4 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm @@ -1,6 +1,6 @@ /datum/round_event_control/antagonist/solo/clown_operative name = "Roundstart Clown Operative" - tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG) + tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG, TAG_EXTERNAL) antag_flag = ROLE_CLOWN_OPERATIVE antag_datum = /datum/antagonist/nukeop/clownop typepath = /datum/round_event/antagonist/solo/clown_operative diff --git a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm index 4043e891dec0..797166c51d42 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm @@ -1,6 +1,6 @@ /datum/round_event_control/antagonist/solo/from_ghosts/nuclear_operative name = "Nuclear Assault" - tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG) + tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG, TAG_EXTERNAL) antag_flag = ROLE_OPERATIVE_MIDROUND antag_datum = /datum/antagonist/nukeop typepath = /datum/round_event/antagonist/solo/ghost/nuclear_operative diff --git a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/wizard.dm b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/wizard.dm index a8720fcf90fa..ca8147459457 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/wizard.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/wizard.dm @@ -1,6 +1,6 @@ /datum/round_event_control/antagonist/solo/from_ghosts/wizard name = "Ghost Wizard" - tags = list(TAG_COMBAT, TAG_DESTRUCTIVE) + tags = list(TAG_COMBAT, TAG_DESTRUCTIVE, TAG_EXTERNAL) typepath = /datum/round_event/antagonist/solo/ghost/wizard antag_flag = ROLE_WIZARD antag_datum = /datum/antagonist/wizard diff --git a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm index 8a5df4ff4942..2debe9aac4a7 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm @@ -1,6 +1,6 @@ /datum/round_event_control/antagonist/solo/nuclear_operative name = "Roundstart Nuclear Operative" - tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG) + tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG, TAG_EXTERNAL) antag_flag = ROLE_OPERATIVE antag_datum = /datum/antagonist/nukeop typepath = /datum/round_event/antagonist/solo/nuclear_operative diff --git a/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm b/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm index a0069ece6634..717ac57e73e1 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm @@ -1,6 +1,6 @@ /datum/round_event_control/antagonist/solo/wizard name = "Wizard" - tags = list(TAG_COMBAT, TAG_DESTRUCTIVE) + tags = list(TAG_COMBAT, TAG_DESTRUCTIVE, TAG_EXTERNAL) typepath = /datum/round_event/antagonist/solo/wizard antag_flag = ROLE_WIZARD antag_datum = /datum/antagonist/wizard diff --git a/monkestation/code/modules/storytellers/storytellers/ghost.dm b/monkestation/code/modules/storytellers/storytellers/ghost.dm index b5f697567ae7..439f83572816 100644 --- a/monkestation/code/modules/storytellers/storytellers/ghost.dm +++ b/monkestation/code/modules/storytellers/storytellers/ghost.dm @@ -3,4 +3,4 @@ name = "The Ghost" desc = "The Ghost will not run a single event or create an antagonist." disable_distribution = TRUE - population_max = 10 + population_max = 25 diff --git a/monkestation/code/modules/storytellers/storytellers/hermit.dm b/monkestation/code/modules/storytellers/storytellers/hermit.dm new file mode 100644 index 000000000000..964c3b379499 --- /dev/null +++ b/monkestation/code/modules/storytellers/storytellers/hermit.dm @@ -0,0 +1,12 @@ +/datum/storyteller/hermit + name = "The Hermit" + desc = "The Hermit will create mostly internal conflict around the station, and rarely any external threats." + event_repetition_multiplier = 0.7 //Hermit has a smaller event pool, let it repeat a bit more + point_gains_multipliers = list( + EVENT_TRACK_MUNDANE = 1.2, + EVENT_TRACK_MODERATE = 1.1, + EVENT_TRACK_MAJOR = 0.9, + EVENT_TRACK_ROLESET = 0.9, + EVENT_TRACK_OBJECTIVES = 1 + ) + tag_multipliers = list(TAG_EXTERNAL = 0.2) diff --git a/monkestation/code/modules/storytellers/storytellers/jester.dm b/monkestation/code/modules/storytellers/storytellers/jester.dm index de7ef07e901c..5ed61b45663c 100644 --- a/monkestation/code/modules/storytellers/storytellers/jester.dm +++ b/monkestation/code/modules/storytellers/storytellers/jester.dm @@ -1,4 +1,3 @@ - /datum/storyteller/jester name = "The Jester" desc = "The Jester will create much more events, with higher possibilities of them repeating." @@ -10,5 +9,5 @@ EVENT_TRACK_ROLESET = 1, EVENT_TRACK_OBJECTIVES = 1 ) - population_min = 10 + population_min = 40 ignores_roundstart = TRUE diff --git a/monkestation/code/modules/storytellers/storytellers/nobleman.dm b/monkestation/code/modules/storytellers/storytellers/nobleman.dm new file mode 100644 index 000000000000..7948d886c4db --- /dev/null +++ b/monkestation/code/modules/storytellers/storytellers/nobleman.dm @@ -0,0 +1,11 @@ +/datum/storyteller/nobleman + name = "The Nobleman" + desc = "The Nobleman enjoys a good fight but abhors senseless destruction. Prefers heavy hits on single targets." + point_gains_multipliers = list( + EVENT_TRACK_MUNDANE = 1, + EVENT_TRACK_MODERATE = 1.2, + EVENT_TRACK_MAJOR = 1.15, + EVENT_TRACK_ROLESET = 1, + EVENT_TRACK_OBJECTIVES = 1 + ) + tag_multipliers = list(TAG_COMBAT = 1.4, TAG_DESTRUCTIVE = 0.4) diff --git a/monkestation/code/modules/storytellers/storytellers/sleeper.dm b/monkestation/code/modules/storytellers/storytellers/sleeper.dm index f21c55cdfd73..d2de014f453d 100644 --- a/monkestation/code/modules/storytellers/storytellers/sleeper.dm +++ b/monkestation/code/modules/storytellers/storytellers/sleeper.dm @@ -1,4 +1,3 @@ - /datum/storyteller/sleeper name = "The Sleeper" desc = "The Sleeper will create less impactful events, especially ones involving combat or destruction. The chill experience." diff --git a/monkestation/code/modules/storytellers/storytellers/warrior.dm b/monkestation/code/modules/storytellers/storytellers/warrior.dm index d1eb510aac66..3a10a4451f59 100644 --- a/monkestation/code/modules/storytellers/storytellers/warrior.dm +++ b/monkestation/code/modules/storytellers/storytellers/warrior.dm @@ -9,4 +9,4 @@ EVENT_TRACK_OBJECTIVES = 1 ) tag_multipliers = list(TAG_COMBAT = 1.5) - population_min = 10 + population_min = 40 diff --git a/tgstation.dme b/tgstation.dme index 3c89303ef55d..23eed72c065b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6490,6 +6490,7 @@ #include "monkestation\code\modules\storytellers\gamemode_subsystem.dm" #include "monkestation\code\modules\storytellers\scheduled_events.dm" #include "monkestation\code\modules\storytellers\converted_events\_base_event.dm" +#include "monkestation\code\modules\storytellers\converted_events\event_overrides.dm" #include "monkestation\code\modules\storytellers\converted_events\solo\bloodcult.dm" #include "monkestation\code\modules\storytellers\converted_events\solo\bloodsuckers.dm" #include "monkestation\code\modules\storytellers\converted_events\solo\changeling.dm" @@ -6506,7 +6507,9 @@ #include "monkestation\code\modules\storytellers\converted_events\solo\ghosts\wizard.dm" #include "monkestation\code\modules\storytellers\storytellers\_storyteller.dm" #include "monkestation\code\modules\storytellers\storytellers\ghost.dm" +#include "monkestation\code\modules\storytellers\storytellers\hermit.dm" #include "monkestation\code\modules\storytellers\storytellers\jester.dm" +#include "monkestation\code\modules\storytellers\storytellers\nobleman.dm" #include "monkestation\code\modules\storytellers\storytellers\sleeper.dm" #include "monkestation\code\modules\storytellers\storytellers\vote.dm" #include "monkestation\code\modules\storytellers\storytellers\warrior.dm"