From 33448513dccfa43ce32c8c3ad2eaf55afae2feb9 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sun, 15 Oct 2023 21:25:22 -0400 Subject: [PATCH] fixes --- code/modules/bitrunning/event.dm | 2 +- code/modules/events/aurora_caelus.dm | 2 +- code/modules/events/disease_outbreak.dm | 2 +- code/modules/events/false_alarm.dm | 2 +- code/modules/events/ghost_role/alien_infestation.dm | 2 +- code/modules/events/ghost_role/blob.dm | 2 +- code/modules/events/gravity_generator_blackout.dm | 2 +- code/modules/events/heart_attack.dm | 2 +- code/modules/events/scrubber_clog.dm | 2 +- code/modules/events/scrubber_overflow.dm | 2 +- code/modules/events/shuttle_catastrophe.dm | 2 +- code/modules/events/shuttle_insurance.dm | 2 +- code/modules/events/shuttle_loan/shuttle_loan_event.dm | 2 +- code/modules/events/tram_malfunction.dm | 2 +- code/modules/events/wizard/embeddies.dm | 2 +- code/modules/events/wizard/identity_spoof.dm | 2 +- .../code/modules/storytellers/converted_events/_base_event.dm | 4 ++-- .../code/modules/storytellers/converted_events/solo/wizard.dm | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/code/modules/bitrunning/event.dm b/code/modules/bitrunning/event.dm index 0ac35a2df8f2..daae0d15c09e 100644 --- a/code/modules/bitrunning/event.dm +++ b/code/modules/bitrunning/event.dm @@ -18,7 +18,7 @@ ROLE_CYBER_POLICE, ) -/datum/round_event_control/bitrunning_glitch/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/bitrunning_glitch/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index c4094d0a9909..83b3612b9b2a 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -9,7 +9,7 @@ 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) +/datum/round_event_control/aurora_caelus/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) if(!SSmapping.empty_space) return FALSE return ..() diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index fdaeb012c2fc..7934ed0ae016 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -35,7 +35,7 @@ track = EVENT_TRACK_MUNDANE tags = list(TAG_TARGETED) -/datum/round_event_control/disease_outbreak/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/disease_outbreak/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm index 303425f7a8c0..ff0be53939f2 100644 --- a/code/modules/events/false_alarm.dm +++ b/code/modules/events/false_alarm.dm @@ -9,7 +9,7 @@ track = EVENT_TRACK_MUNDANE tags = list(TAG_COMMUNAL) -/datum/round_event_control/falsealarm/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/falsealarm/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/ghost_role/alien_infestation.dm b/code/modules/events/ghost_role/alien_infestation.dm index 0d0036ac910d..5d4dcbe19893 100644 --- a/code/modules/events/ghost_role/alien_infestation.dm +++ b/code/modules/events/ghost_role/alien_infestation.dm @@ -12,7 +12,7 @@ track = EVENT_TRACK_MAJOR tags = list(TAG_COMBAT) -/datum/round_event_control/alien_infestation/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/alien_infestation/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/ghost_role/blob.dm b/code/modules/events/ghost_role/blob.dm index 560612a782b3..5bc8ed7a6009 100644 --- a/code/modules/events/ghost_role/blob.dm +++ b/code/modules/events/ghost_role/blob.dm @@ -13,7 +13,7 @@ track = EVENT_TRACK_MAJOR tags = list(TAG_DESTRUCTIVE, TAG_COMBAT) -/datum/round_event_control/blob/can_spawn_event(players, allow_magic = FALSE) +/datum/round_event_control/blob/can_spawn_event(players, allow_magic = FALSE, 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/gravity_generator_blackout.dm b/code/modules/events/gravity_generator_blackout.dm index 7992f52bb75a..6384c8030656 100644 --- a/code/modules/events/gravity_generator_blackout.dm +++ b/code/modules/events/gravity_generator_blackout.dm @@ -9,7 +9,7 @@ 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) +/datum/round_event_control/gravity_generator_blackout/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index eb995acefdb1..4980225e7836 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -14,7 +14,7 @@ track = EVENT_TRACK_MODERATE tags = list(TAG_TARGETED) -/datum/round_event_control/heart_attack/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/heart_attack/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/scrubber_clog.dm b/code/modules/events/scrubber_clog.dm index bb236e166e2b..2d48d25d8eff 100644 --- a/code/modules/events/scrubber_clog.dm +++ b/code/modules/events/scrubber_clog.dm @@ -88,7 +88,7 @@ scrubber_list += scrubber return pick(scrubber_list) -/datum/round_event_control/scrubber_clog/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/scrubber_clog/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return diff --git a/code/modules/events/scrubber_overflow.dm b/code/modules/events/scrubber_overflow.dm index 507c5d046509..ab8d925a7d65 100644 --- a/code/modules/events/scrubber_overflow.dm +++ b/code/modules/events/scrubber_overflow.dm @@ -87,7 +87,7 @@ if(!scrubbers.len) return kill() -/datum/round_event_control/scrubber_overflow/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/scrubber_overflow/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return diff --git a/code/modules/events/shuttle_catastrophe.dm b/code/modules/events/shuttle_catastrophe.dm index 28b9571a9e19..6092d3e2f2b9 100644 --- a/code/modules/events/shuttle_catastrophe.dm +++ b/code/modules/events/shuttle_catastrophe.dm @@ -9,7 +9,7 @@ track = EVENT_TRACK_MODERATE tags = list(TAG_COMMUNAL) -/datum/round_event_control/shuttle_catastrophe/can_spawn_event(players, allow_magic = FALSE) +/datum/round_event_control/shuttle_catastrophe/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/shuttle_insurance.dm b/code/modules/events/shuttle_insurance.dm index d00875ead0ca..bac5acbe20e4 100644 --- a/code/modules/events/shuttle_insurance.dm +++ b/code/modules/events/shuttle_insurance.dm @@ -9,7 +9,7 @@ track = EVENT_TRACK_MODERATE tags = list(TAG_COMMUNAL) -/datum/round_event_control/shuttle_insurance/can_spawn_event(players, allow_magic = FALSE) +/datum/round_event_control/shuttle_insurance/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/shuttle_loan/shuttle_loan_event.dm b/code/modules/events/shuttle_loan/shuttle_loan_event.dm index 96db32c044d6..dfebbc0cd020 100644 --- a/code/modules/events/shuttle_loan/shuttle_loan_event.dm +++ b/code/modules/events/shuttle_loan/shuttle_loan_event.dm @@ -10,7 +10,7 @@ admin_setup = list(/datum/event_admin_setup/listed_options/shuttle_loan) var/list/run_situations = list() -/datum/round_event_control/shuttle_loan/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/shuttle_loan/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() for(var/datum/round_event/running_event in SSevents.running) if(istype(running_event, /datum/round_event/shuttle_loan)) //Make sure two of these don't happen at once. diff --git a/code/modules/events/tram_malfunction.dm b/code/modules/events/tram_malfunction.dm index 312d045512ea..d1eb6028bdc1 100644 --- a/code/modules/events/tram_malfunction.dm +++ b/code/modules/events/tram_malfunction.dm @@ -15,7 +15,7 @@ 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) +/datum/round_event_control/tram_malfunction/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if (!.) return FALSE diff --git a/code/modules/events/wizard/embeddies.dm b/code/modules/events/wizard/embeddies.dm index ea8c5fd176bc..ee4f803699a6 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) +/datum/round_event_control/wizard/embedpocalypse/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/wizard/identity_spoof.dm b/code/modules/events/wizard/identity_spoof.dm index dcd923c2776a..bdad88e9ab84 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) +/datum/round_event_control/wizard/identity_spoof/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/monkestation/code/modules/storytellers/converted_events/_base_event.dm b/monkestation/code/modules/storytellers/converted_events/_base_event.dm index 2f45798d6117..40bd92c1d650 100644 --- a/monkestation/code/modules/storytellers/converted_events/_base_event.dm +++ b/monkestation/code/modules/storytellers/converted_events/_base_event.dm @@ -43,7 +43,7 @@ if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_roles |= protected_roles -/datum/round_event_control/antagonist/can_spawn_event(popchecks = TRUE, allow_magic) +/datum/round_event_control/antagonist/can_spawn_event(popchecks = TRUE, allow_magic, fake_check = FALSE) . = ..() if(!check_enemies()) return FALSE @@ -78,7 +78,7 @@ candidates = trim_candidates(candidates) return candidates -/datum/round_event_control/antagonist/solo/can_spawn_event(popchecks = TRUE, allow_magic) +/datum/round_event_control/antagonist/solo/can_spawn_event(popchecks = TRUE, allow_magic, fake_check = FALSE) . = ..() if(!.) return diff --git a/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm b/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm index 081dbf45f4f3..52061be9352c 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm @@ -13,7 +13,7 @@ min_players = 35 max_occurrences = 1 -/datum/round_event_control/antagonist/solo/wizard/can_spawn_event(popchecks = TRUE, allow_magic) +/datum/round_event_control/antagonist/solo/wizard/can_spawn_event(popchecks = TRUE, allow_magic, fake_check = FALSE) . = ..() if(!.) return