Skip to content

Commit

Permalink
Random event cleanup (#16330)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lumipharon authored Jul 13, 2024
1 parent 0912b85 commit 816cf2e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion code/modules/events/hive_threat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
weight = 10
earliest_start = 30 MINUTES

gamemode_blacklist = list("Combat Patrol","Sensor Capture", "Crash")
gamemode_blacklist = list("Crash", "Combat Patrol", "Sensor Capture", "Campaign")

/datum/round_event/hive_threat
///The human target for this event
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/intel_computer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
typepath = /datum/round_event/intel_computer
weight = 25

gamemode_blacklist = list("Crash", "Combat Patrol", "Sensor Capture")
gamemode_blacklist = list("Crash", "Combat Patrol", "Sensor Capture", "Campaign")

/datum/round_event_control/intel_computer/can_spawn_event(players_amt, gamemode)
if(length(GLOB.intel_computers) <= 0)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/ion_storm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
earliest_start = 60 MINUTES
max_occurrences = 1

gamemode_blacklist = list("Crash")
gamemode_blacklist = list("Crash", "Combat Patrol", "Sensor Capture", "Campaign")

/datum/round_event_control/ion_storm/can_spawn_event(players_amt, gamemode)
return ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/stock_uptick.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
earliest_start = 30 MINUTES
max_occurrences = 10

gamemode_blacklist = list("Crash","Combat Patrol","Sensor Capture")
gamemode_blacklist = list("Crash", "Combat Patrol", "Sensor Capture", "Campaign")

/datum/round_event_control/stock_uptick/can_spawn_event(players_amt, gamemode)
if(SSpoints.supply_points[FACTION_TERRAGOV] >= 300)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/supply_drop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
weight = 10
earliest_start = 5 MINUTES

gamemode_whitelist = list("Combat Patrol","Sensor Capture")
gamemode_whitelist = list("Combat Patrol", "Sensor Capture")

/datum/round_event/supply_drop
///How long between the event firing and the supply drop actually landing
Expand Down

0 comments on commit 816cf2e

Please sign in to comment.