diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm index e5d91fb33f8..c1fb05bfd6a 100644 --- a/code/__DEFINES/dcs/signals/signals_global.dm +++ b/code/__DEFINES/dcs/signals/signals_global.dm @@ -39,7 +39,7 @@ #define COMSIG_GLOB_PRE_RANDOM_EVENT "!pre_random_event" /// Do not allow this random event to continue. #define CANCEL_PRE_RANDOM_EVENT (1<<0) -/// Called by (/datum/round_event_control/RunEvent). +/// Called by (/datum/round_event_control/run_event). #define COMSIG_GLOB_RANDOM_EVENT "!random_event" /// Do not allow this random event to continue. #define CANCEL_RANDOM_EVENT (1<<0) diff --git a/code/__HELPERS/events.dm b/code/__HELPERS/events.dm index 114f67c87f3..9b5f939de15 100644 --- a/code/__HELPERS/events.dm +++ b/code/__HELPERS/events.dm @@ -49,4 +49,22 @@ return pick(possible_spawns) +/proc/force_event(event_typepath, cause) + var/datum/round_event_control/our_event = locate(event_typepath) in SSevents.control + if(!our_event) + CRASH("Attempted to force event [event_typepath], but the event path could not be found!") + our_event.run_event(event_cause = cause) + +/proc/force_event_async(event_typepath, cause) + var/datum/round_event_control/our_event = locate(event_typepath) in SSevents.control + if(!our_event) + CRASH("Attempted to force event [event_typepath], but the event path could not be found!") + INVOKE_ASYNC(our_event, TYPE_PROC_REF(/datum/round_event_control, run_event), event_cause = cause) + +/proc/force_event_after(event_typepath, cause, duration) + var/datum/round_event_control/our_event = locate(event_typepath) in SSevents.control + if(!our_event) + CRASH("Attempted to force event [event_typepath], but the event path could not be found!") + addtimer(CALLBACK(our_event, TYPE_PROC_REF(/datum/round_event_control, run_event), FALSE, null, FALSE, cause), duration) + #undef UNLIT_AREA_BRIGHTNESS diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index 7342e369c92..c5223ca6963 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -96,7 +96,7 @@ SUBSYSTEM_DEF(events) if(. == EVENT_CANT_RUN)//we couldn't run this event for some reason, set its max_occurrences to 0 E.max_occurrences = 0 else if(. == EVENT_READY) - E.runEvent(random = TRUE) + E.run_event(random = TRUE) /datum/controller/subsystem/events/proc/toggleWizardmode() diff --git a/code/game/gamemodes/dynamic/dynamic_unfavorable_situation.dm b/code/game/gamemodes/dynamic/dynamic_unfavorable_situation.dm index 1a117d5553a..584d80c260e 100644 --- a/code/game/gamemodes/dynamic/dynamic_unfavorable_situation.dm +++ b/code/game/gamemodes/dynamic/dynamic_unfavorable_situation.dm @@ -17,9 +17,7 @@ var/delay = rand(20 SECONDS, 1 MINUTES) log_dynamic_and_announce("An unfavorable situation was requested, but no heavy rulesets could be drafted. Spawning [initial(round_event_control_type.name)] in [DisplayTimeText(delay)] instead.") - - var/datum/round_event_control/round_event_control = new round_event_control_type - addtimer(CALLBACK(round_event_control, TYPE_PROC_REF(/datum/round_event_control, runEvent)), delay) + force_event_after(round_event_control_type, "an unfavorable situation", delay) else var/datum/dynamic_ruleset/midround/heavy_ruleset = pick_weight(possible_heavies) log_dynamic_and_announce("An unfavorable situation was requested, spawning [initial(heavy_ruleset.name)]") diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 0af75d8048f..4751bbc1498 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -904,11 +904,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) "Attention crew: sector monitoring reports a massive jump-trace from an enemy vessel destined for your system. Prepare for imminent hostile contact.", "[command_name()] High-Priority Update", ) - - var/datum/round_event_control/pirates/pirate_event = locate() in SSevents.control - if(!pirate_event) - CRASH("hack_console() attempted to run pirates, but could not find an event controller!") - addtimer(CALLBACK(pirate_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)), rand(20 SECONDS, 1 MINUTES)) + force_event_after(/datum/round_event_control/pirates, "[hacker] hacking a communications console", rand(20 SECONDS, 1 MINUTES)) if(HACK_FUGITIVES) // Triggers fugitives, which can cause confusion / chaos as the crew decides which side help priority_announce( @@ -916,10 +912,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) "[command_name()] High-Priority Update", ) - var/datum/round_event_control/fugitives/fugitive_event = locate() in SSevents.control - if(!fugitive_event) - CRASH("hack_console() attempted to run fugitives, but could not find an event controller!") - addtimer(CALLBACK(fugitive_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)), rand(20 SECONDS, 1 MINUTES)) + force_event_after(/datum/round_event_control/fugitives, "[hacker] hacking a communications console", rand(20 SECONDS, 1 MINUTES)) if(HACK_THREAT) // Force an unfavorable situation on the crew priority_announce( diff --git a/code/modules/admin/force_event.dm b/code/modules/admin/force_event.dm index 1c97936ac48..4affec2f0c2 100644 --- a/code/modules/admin/force_event.dm +++ b/code/modules/admin/force_event.dm @@ -95,6 +95,6 @@ return var/always_announce_chance = 100 var/no_announce_chance = 0 - event.runEvent(announce_chance_override = announce_event ? always_announce_chance : no_announce_chance, admin_forced = TRUE) + event.run_event(announce_chance_override = announce_event ? always_announce_chance : no_announce_chance, admin_forced = TRUE) message_admins("[key_name_admin(usr)] has triggered an event. ([event.name])") log_admin("[key_name(usr)] has triggered an event. ([event.name])") diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 0ced146db38..629d02a8898 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -207,12 +207,11 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) if("Make Your Own") AdminCreateVirus(holder) if("Random") - var/datum/round_event_control/disease_outbreak/DC = locate(/datum/round_event_control/disease_outbreak) in SSevents.control - E = DC.runEvent() + force_event(/datum/round_event_control/disease_outbreak) if("Choose") var/virus = input("Choose the virus to spread", "BIOHAZARD") as null|anything in sort_list(typesof(/datum/disease), GLOBAL_PROC_REF(cmp_typepaths_asc)) var/datum/round_event_control/disease_outbreak/DC = locate(/datum/round_event_control/disease_outbreak) in SSevents.control - var/datum/round_event/disease_outbreak/DO = DC.runEvent() + var/datum/round_event/disease_outbreak/DO = DC.run_event() DO.virus_type = virus E = DO if("allspecies") diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 54204b11dc7..49ac747b622 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -1039,52 +1039,37 @@ structure_check() searches for nearby cultist structures required for the invoca var/outcome = rand(1,100) switch(outcome) if(1 to 10) - var/datum/round_event_control/disease_outbreak/covid_2562_event = locate() in SSevents.control - INVOKE_ASYNC(covid_2562_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) - var/datum/round_event_control/mice_migration/stuart_big_event = locate() in SSevents.control - INVOKE_ASYNC(stuart_big_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) - + force_event_async(/datum/round_event_control/disease_outbreak, "an apocalypse rune") + force_event_async(/datum/round_event_control/mice_migration, "an apocalypse rune") if(11 to 20) - var/datum/round_event_control/radiation_storm/my_skin_feels_funny_event = locate() in SSevents.control - INVOKE_ASYNC(my_skin_feels_funny_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) + force_event_async(/datum/round_event_control/radiation_storm, "an apocalypse rune") if(21 to 30) - var/datum/round_event_control/brand_intelligence/product_placement_gone_rogue_event = locate() in SSevents.control - INVOKE_ASYNC(product_placement_gone_rogue_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) + force_event_async(/datum/round_event_control/brand_intelligence, "an apocalypse rune") if(31 to 40) - var/datum/round_event_control/immovable_rod/huge_rod_event = locate() in SSevents.control //you've - INVOKE_ASYNC(huge_rod_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) //got - INVOKE_ASYNC(huge_rod_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) //a - INVOKE_ASYNC(huge_rod_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) //huge... + force_event_async(/datum/round_event_control/immovable_rod, "an apocalypse rune") + force_event_async(/datum/round_event_control/immovable_rod, "an apocalypse rune") + force_event_async(/datum/round_event_control/immovable_rod, "an apocalypse rune") if(41 to 50) - var/datum/round_event_control/meteor_wave/dinosaur_purge_event = locate() in SSevents.control - INVOKE_ASYNC(dinosaur_purge_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) + force_event_async(/datum/round_event_control/meteor_wave, "an apocalypse rune") if(51 to 60) - var/datum/round_event_control/spider_infestation/creepy_crawly_event = locate() in SSevents.control - INVOKE_ASYNC(creepy_crawly_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) + force_event_async(/datum/round_event_control/spider_infestation, "an apocalypse rune") if(61 to 70) - var/datum/round_event_control/anomaly/anomaly_flux/flux_event = locate() in SSevents.control - INVOKE_ASYNC(flux_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) - var/datum/round_event_control/anomaly/anomaly_grav/grav_event = locate() in SSevents.control - INVOKE_ASYNC(grav_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) - var/datum/round_event_control/anomaly/anomaly_pyro/pyro_event = locate() in SSevents.control - INVOKE_ASYNC(pyro_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) - var/datum/round_event_control/anomaly/anomaly_vortex/vortex_event = locate() in SSevents.control - INVOKE_ASYNC(vortex_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) + force_event_async(/datum/round_event_control/anomaly/anomaly_flux, "an apocalypse rune") + force_event_async(/datum/round_event_control/anomaly/anomaly_grav, "an apocalypse rune") + force_event_async(/datum/round_event_control/anomaly/anomaly_pyro, "an apocalypse rune") + force_event_async(/datum/round_event_control/anomaly/anomaly_vortex, "an apocalypse rune") if(71 to 80) - var/datum/round_event_control/spacevine/ivy_event = locate() in SSevents.control - INVOKE_ASYNC(ivy_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) - var/datum/round_event_control/grey_tide/grey_tide_nation_wide = locate() in SSevents.control - INVOKE_ASYNC(grey_tide_nation_wide, TYPE_PROC_REF(/datum/round_event_control, runEvent)) + force_event_async(/datum/round_event_control/spacevine, "an apocalypse rune") + force_event_async(/datum/round_event_control/grey_tide, "an apocalypse rune") if(81 to 100) - var/datum/round_event_control/portal_storm_narsie/total_not_a_xen_storm_event = locate() in SSevents.control - INVOKE_ASYNC(total_not_a_xen_storm_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) + force_event_async(/datum/round_event_control/portal_storm_narsie, "an apocalypse rune") qdel(src) diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/beer_nuke.dm b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/beer_nuke.dm index bd45c770595..2ed8787316f 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/beer_nuke.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/beer_nuke.dm @@ -70,7 +70,7 @@ //if it's always hooked in it'll override admin choices RegisterSignal(overflow_control, COMSIG_CREATED_ROUND_EVENT, PROC_REF(on_created_round_event)) disarm_nuke() - overflow_control.runEvent() + overflow_control.run_event(event_cause = "a beer nuke") /// signal sent from overflow control when it fires an event /obj/machinery/nuclearbomb/beer/proc/on_created_round_event(datum/round_event_control/source_event_control, datum/round_event/scrubber_overflow/every_vent/created_event) diff --git a/code/modules/antagonists/traitor/objectives/final_objective/space_dragon.dm b/code/modules/antagonists/traitor/objectives/final_objective/space_dragon.dm index 127d4b28ac5..f5bdd176d87 100644 --- a/code/modules/antagonists/traitor/objectives/final_objective/space_dragon.dm +++ b/code/modules/antagonists/traitor/objectives/final_objective/space_dragon.dm @@ -11,8 +11,7 @@ /datum/traitor_objective/ultimate/space_dragon/on_objective_taken(mob/user) . = ..() - var/datum/round_event_control/carp_migration/carp_event = locate(/datum/round_event_control/carp_migration) in SSevents.control - carp_event.runEvent() + force_event(/datum/round_event_control/carp_migration, "[handler.owner]'s final objective") /datum/traitor_objective/ultimate/space_dragon/generate_objective(datum/mind/generating_for, list/possible_duplicates) var/list/possible_areas = GLOB.the_station_areas.Copy() diff --git a/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm b/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm index 80eb6cccd1d..f697388e049 100644 --- a/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm +++ b/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm @@ -181,7 +181,7 @@ return var/datum/round_event_control/final_event = pick (possible_events) - final_event.runEvent() + final_event.run_event(event_cause = "a Grand Ritual Rune") to_chat(user, span_notice("Your released magic afflicts the crew: [final_event.name]!")) /// Applies some local side effects to the area diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 339847c6d2f..e1366ed0e04 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -103,7 +103,7 @@ triggering = TRUE - // We sleep HERE, in pre-event setup (because there's no sense doing it in runEvent() since the event is already running!) for the given amount of time to make an admin has enough time to cancel an event un-fitting of the present round. + // We sleep HERE, in pre-event setup (because there's no sense doing it in run_event() since the event is already running!) for the given amount of time to make an admin has enough time to cancel an event un-fitting of the present round. // SKYRAT EDIT REMOVAL BEGIN - Event notification /** if(alert_observers) @@ -164,7 +164,7 @@ Runs the event * - random: shows if the event was triggered randomly, or by on purpose by an admin or an item * - announce_chance_override: if the value is not null, overrides the announcement chance when an admin calls an event */ -/datum/round_event_control/proc/runEvent(random = FALSE, announce_chance_override = null, admin_forced = FALSE) +/datum/round_event_control/proc/run_event(random = FALSE, announce_chance_override = null, admin_forced = FALSE, event_cause) /* * We clear our signals first so we dont cancel a wanted event by accident, * the majority of time the admin will probably want to cancel a single midround spawned random events @@ -199,7 +199,7 @@ Runs the event log_game("[random ? "Random" : "Forced"] Event triggering: [name] ([typepath]).") if(alert_observers) - round_event.announce_deadchat(random) + round_event.announce_deadchat(random, event_cause) SSblackbox.record_feedback("tally", "event_ran", 1, "[round_event]") return round_event @@ -246,8 +246,8 @@ Runs the event return ///Annouces the event name to deadchat, override this if what an event should show to deadchat is different to its event name. -/datum/round_event/proc/announce_deadchat(random) - deadchat_broadcast(" has just been[random ? " randomly" : ""] triggered!", "[control.name]", message_type=DEADCHAT_ANNOUNCEMENT) //STOP ASSUMING IT'S BADMINS! +/datum/round_event/proc/announce_deadchat(random, cause) + deadchat_broadcast(" has just been[random ? " randomly" : ""] triggered[cause ? " by [cause]" : ""]!", "[control.name]", message_type=DEADCHAT_ANNOUNCEMENT) //STOP ASSUMING IT'S BADMINS! //Called when the tick is equal to the start_when variable. //Allows you to start before announcing or vice versa. diff --git a/code/modules/events/scrubber_overflow.dm b/code/modules/events/scrubber_overflow.dm index 897d0711031..e9bf0c8b582 100644 --- a/code/modules/events/scrubber_overflow.dm +++ b/code/modules/events/scrubber_overflow.dm @@ -60,11 +60,11 @@ ) //needs to be chemid unit checked at some point -/datum/round_event/scrubber_overflow/announce_deadchat(random) +/datum/round_event/scrubber_overflow/announce_deadchat(random, cause) if(!forced_reagent_type) //nothing out of the ordinary, so default announcement return ..() - deadchat_broadcast(" has just been[random ? " randomly" : ""] triggered!", "Scrubber Overflow: [initial(forced_reagent_type.name)]", message_type=DEADCHAT_ANNOUNCEMENT) + deadchat_broadcast(" has just been[random ? " randomly" : ""] triggered[cause ? " by [cause]" : ""]!", "Scrubber Overflow: [initial(forced_reagent_type.name)]", message_type=DEADCHAT_ANNOUNCEMENT) /datum/round_event/scrubber_overflow/announce(fake) priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert") diff --git a/code/modules/spells/spell_types/right_and_wrong.dm b/code/modules/spells/spell_types/right_and_wrong.dm index c2c6b20edb2..fb6a132abfa 100644 --- a/code/modules/spells/spell_types/right_and_wrong.dm +++ b/code/modules/spells/spell_types/right_and_wrong.dm @@ -168,7 +168,7 @@ GLOBAL_LIST_INIT(summoned_magic_objectives, list( else message_admins("Summon Ghosts was triggered!") log_game("Summon Ghosts was triggered!") - ghost_event.runEvent() + ghost_event.run_event(event_cause = "a wizard's incantation") else stack_trace("Unable to run summon ghosts, due to being unable to locate the associated event.") if(user) diff --git a/code/modules/station_goals/meteor_shield.dm b/code/modules/station_goals/meteor_shield.dm index b0b42725aeb..3a37ec9de9f 100644 --- a/code/modules/station_goals/meteor_shield.dm +++ b/code/modules/station_goals/meteor_shield.dm @@ -159,10 +159,7 @@ priority_announce("Warning. Tampering of meteor satellites puts the station at risk of exotic, deadly meteor collisions. Please intervene by checking your GPS devices for strange signals, and dismantling the tampered meteor shields.", "Strange Meteor Signal Warning") if(EMAGGED_METEOR_SHIELD_THRESHOLD_FOUR) say("Warning. Warning. Dark Matt-eor on course for station.") - var/datum/round_event_control/dark_matteor/dark_matteor_event = locate() in SSevents.control - if(!dark_matteor_event) - CRASH("meteor shields tried to spawn a dark matteor, but there was no dark matteor event in SSevents.control?") - INVOKE_ASYNC(dark_matteor_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) + force_event_async(/datum/round_event_control/dark_matteor, "an array of tampered meteor satellites") /obj/machinery/satellite/meteor_shield/proc/change_meteor_chance(mod) // Update the weight of all meteor events diff --git a/code/modules/uplink/uplink_items/stealthy_tools.dm b/code/modules/uplink/uplink_items/stealthy_tools.dm index 48001edb955..6cc5a12bd97 100644 --- a/code/modules/uplink/uplink_items/stealthy_tools.dm +++ b/code/modules/uplink/uplink_items/stealthy_tools.dm @@ -104,8 +104,7 @@ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) /datum/uplink_item/stealthy_tools/telecomm_blackout/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source) - var/datum/round_event_control/event = locate(/datum/round_event_control/communications_blackout) in SSevents.control - event.runEvent() + force_event(/datum/round_event_control/communications_blackout, "a syndicate virus") return source //For log icon /datum/uplink_item/stealthy_tools/blackout @@ -120,6 +119,5 @@ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) /datum/uplink_item/stealthy_tools/blackout/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source) - var/datum/round_event_control/event = locate(/datum/round_event_control/grid_check) in SSevents.control - event.runEvent() + force_event(/datum/round_event_control/grid_check, "a syndicate virus") return source //For log icon diff --git a/modular_skyrat/master_files/code/modules/events/_event.dm b/modular_skyrat/master_files/code/modules/events/_event.dm index 292153252df..91a5fd72f8d 100644 --- a/modular_skyrat/master_files/code/modules/events/_event.dm +++ b/modular_skyrat/master_files/code/modules/events/_event.dm @@ -4,7 +4,7 @@ if(intensity_restriction && !GLOB.intense_event_credits) return FALSE -/datum/round_event_control/runEvent(random = FALSE, announce_chance_override = null, admin_forced = FALSE) +/datum/round_event_control/run_event(random = FALSE, announce_chance_override = null, admin_forced = FALSE, event_cause) . = ..() log_game("ICES: [src.name] is our next event.") if(intensity_restriction && GLOB.intense_event_credits) diff --git a/modular_skyrat/modules/assault_operatives/code/goldeneye.dm b/modular_skyrat/modules/assault_operatives/code/goldeneye.dm index 888c17ac211..9264d07a01b 100644 --- a/modular_skyrat/modules/assault_operatives/code/goldeneye.dm +++ b/modular_skyrat/modules/assault_operatives/code/goldeneye.dm @@ -59,7 +59,7 @@ SUBSYSTEM_DEF(goldeneye) /datum/controller/subsystem/goldeneye/proc/fire_icarus() var/datum/round_event_control/icarus_sunbeam/event_to_start = new() - event_to_start.runEvent() + event_to_start.run_event() /// Checks if a mind(target_mind) is a head and if they aren't in the goldeneye_extracted_minds list. /datum/controller/subsystem/goldeneye/proc/check_goldeneye_target(datum/mind/target_mind) diff --git a/modular_skyrat/modules/contractor/code/datums/contractor_items.dm b/modular_skyrat/modules/contractor/code/datums/contractor_items.dm index 853ef35a53f..c0e16dcedda 100644 --- a/modular_skyrat/modules/contractor/code/datums/contractor_items.dm +++ b/modular_skyrat/modules/contractor/code/datums/contractor_items.dm @@ -169,7 +169,7 @@ if(!.) return var/datum/round_event_control/event = locate(/datum/round_event_control/communications_blackout) in SSevents.control - event.runEvent() + event.run_event() /datum/contractor_item/mod_baton_holster name = "Baton Holster Module" diff --git a/modular_skyrat/modules/opposing_force/code/equipment/services.dm b/modular_skyrat/modules/opposing_force/code/equipment/services.dm index 6221cd2e762..3d99830ce12 100644 --- a/modular_skyrat/modules/opposing_force/code/equipment/services.dm +++ b/modular_skyrat/modules/opposing_force/code/equipment/services.dm @@ -37,7 +37,7 @@ /datum/opposing_force_equipment/service/power_outage/on_issue() var/datum/round_event_control/event = locate(/datum/round_event_control/grid_check) in SSevents.control - event.runEvent() + event.run_event() /datum/opposing_force_equipment/service/telecom_outage name = "Telecomms Outage" @@ -48,7 +48,7 @@ /datum/opposing_force_equipment/service/telecom_outage/on_issue() var/datum/round_event_control/event = locate(/datum/round_event_control/communications_blackout) in SSevents.control - event.runEvent() + event.run_event() /datum/opposing_force_equipment/service/market_crash name = "Market Crash" @@ -59,7 +59,7 @@ /datum/opposing_force_equipment/service/market_crash/on_issue() var/datum/round_event_control/event = locate(/datum/round_event_control/market_crash) in SSevents.control - event.runEvent() + event.run_event() /datum/opposing_force_equipment/service/give_exploitables name = "Exploitables Access"