From c8129e24fb3aeb43b4ce51964321a089908061fe Mon Sep 17 00:00:00 2001 From: Leshana Date: Tue, 17 Mar 2020 20:58:27 -0400 Subject: [PATCH] Restrict dust, meteors and space carp events to space z-levels only. --- code/modules/events/carp_migration.dm | 4 ++++ code/modules/events/dust.dm | 4 ++++ code/modules/events/event.dm | 2 +- code/modules/events/meteors.dm | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index 53efc99e8d..6c20d9039b 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -10,6 +10,10 @@ endWhen += severity * 25 carp_cap = 2 + 3 ** severity // No more than this many at once regardless of waves. (5, 11, 29) +/datum/event/carp_migration/start() + affecting_z -= global.using_map.sealed_levels // Space levels only please! + ..() + /datum/event/carp_migration/announce() var/announcement = "" if(severity == EVENT_LEVEL_MAJOR) diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index 54a1ec8baf..7acdb00784 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -2,6 +2,10 @@ startWhen = 10 endWhen = 30 +/datum/event/carp_migration/start() + affecting_z -= global.using_map.sealed_levels // Space levels only please! + ..() + /datum/event/dust/announce() if(victim) command_announcement.Announce("The [location_name()] is now passing through a belt of space dust.", "[location_name()] Sensor Array") diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm index 9718f821b2..33c211485c 100644 --- a/code/modules/events/event.dm +++ b/code/modules/events/event.dm @@ -162,7 +162,7 @@ startedAt = world.time if(!affecting_z) - affecting_z = using_map.station_levels + affecting_z = using_map.station_levels.Copy() setup() ..() diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index a57ca87576..db799f186a 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -19,6 +19,10 @@ start_side = pick(cardinal) endWhen = worst_case_end() +/datum/event/meteor_wave/start() + affecting_z -= global.using_map.sealed_levels // Space levels only please! + ..() + /datum/event/meteor_wave/announce() switch(severity) if(EVENT_LEVEL_MAJOR)