Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@dwasint
dwasint committed Oct 16, 2023
1 parent 2162170 commit 3344851
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion code/modules/bitrunning/event.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/aurora_caelus.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/disease_outbreak.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/false_alarm.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/ghost_role/alien_infestation.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/ghost_role/blob.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/gravity_generator_blackout.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/heart_attack.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/scrubber_clog.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/scrubber_overflow.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/shuttle_catastrophe.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/shuttle_insurance.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/shuttle_loan/shuttle_loan_event.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/tram_malfunction.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/wizard/embeddies.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/wizard/identity_spoof.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
4 changes: 2 additions & 2 deletions monkestation/code/modules/storytellers/converted_events/_base_event.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion monkestation/code/modules/storytellers/converted_events/solo/wizard.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3344851

Please sign in to comment.