diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index afb90d31d0..3064234b50 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -100,8 +100,6 @@ qdel(SM) CHECK_TICK -// -// Overmap version of the event! -// -/datum/event/carp_migration/overmap - announceWhen = 1 // Announce much faster! +// Overmap version +/datum/event/carp_migration/overmap/announce() + return diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index 7acdb00784..b608fd0ace 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -28,3 +28,7 @@ if(EVENT_LEVEL_MAJOR) return "super" return "weak" + +// Overmap version +/datum/event/dust/overmap/announce() + return \ No newline at end of file diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index dbf935326f..b7040258de 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -59,3 +59,7 @@ if(prob(0.2 * severity)) T.emagged = 1 T.update_icon() + +// Overmap version +/datum/event/electrical_storm/overmap/announce() + return \ No newline at end of file diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 592c963be8..8bacf9c830 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -72,6 +72,10 @@ spawn(rand(5000,8000)) command_announcement.Announce("It has come to our attention that \the [location_name()] passed through an ion storm. Please monitor all electronic equipment for malfunctions.", "Anomaly Alert") +// Overmap version +/datum/event/ionstorm/overmap/announce() + return + /* /proc/IonStorm(botEmagChance = 10) diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index db799f186a..7a501b4315 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -64,12 +64,15 @@ else return meteors_normal - +// Overmap version /datum/event/meteor_wave/overmap next_meteor_lower = 5 next_meteor_upper = 10 next_meteor = 0 +/datum/event/meteor_wave/overmap/announce() + return + /datum/event/meteor_wave/overmap/tick() if(victim && !victim.is_still()) // Meteors mostly fly in your face start_side = prob(90) ? victim.fore_dir : pick(GLOB.cardinal) diff --git a/code/modules/overmap/events/overmap_event.dm b/code/modules/overmap/events/overmap_event.dm index 091146dfd9..7529adb032 100644 --- a/code/modules/overmap/events/overmap_event.dm +++ b/code/modules/overmap/events/overmap_event.dm @@ -52,7 +52,7 @@ /obj/effect/overmap/event/electric name = "electrical storm" - events = list(/datum/event/electrical_storm) + events = list(/datum/event/electrical_storm/overmap) opacity = 0 event_icon_states = list("electrical1", "electrical2", "electrical3", "electrical4") difficulty = EVENT_LEVEL_MAJOR @@ -60,13 +60,13 @@ /obj/effect/overmap/event/dust name = "dust cloud" - events = list(/datum/event/dust) + events = list(/datum/event/dust/overmap) event_icon_states = list("dust1", "dust2", "dust3", "dust4") weaknesses = OVERMAP_WEAKNESS_MINING | OVERMAP_WEAKNESS_EXPLOSIVE | OVERMAP_WEAKNESS_FIRE /obj/effect/overmap/event/ion name = "ion cloud" - events = list(/datum/event/ionstorm) + events = list(/datum/event/ionstorm/overmap) opacity = 0 event_icon_states = list("ion1", "ion2", "ion3", "ion4") difficulty = EVENT_LEVEL_MAJOR