From 99db1990bc129f9e9dfc7ab79161ae8a4c38b3a5 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Tue, 16 Jun 2020 00:28:14 -0700 Subject: [PATCH] Add the Aurora Caelus Event! --- code/modules/events/aurora_caelus.dm | 8 ++++++++ code/modules/events/event_container.dm | 1 + 2 files changed, 9 insertions(+) diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index 49c2d1d720..d6e3a9d1cf 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -10,7 +10,11 @@ During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. \ Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. \ You will have approximately two minutes before the ions begin to reach the hull. \ +<<<<<<< HEAD We hope you enjoy the lights.", "Nanotrasen Meteorology Division", new_sound = 'sound/AI/aurora.ogg') +======= + We hope you enjoy the lights.", "Nanotrasen Meteorology Division", new_sound = 'sound/misc/notice2.ogg') +>>>>>>> d83d5cb... Merge pull request #7282 from Rykka-Stormheart/shep-dev-aurora-upstream /datum/event/aurora_caelus/start() affecting_z -= global.using_map.sealed_levels // Space levels only please! @@ -29,7 +33,11 @@ command_announcement.Announce("The Aurora Caelus event is now ending. Starlight conditions have returned to normal, and the cloud has dissipated. \ Please return to your workplace and continue work as normal. \ Have a pleasant shift, [station_name()], and thank you for watching with us.", +<<<<<<< HEAD "Nanotrasen Meteorology Division", new_sound = 'sound/AI/aurora_end.ogg') +======= +"Nanotrasen Meteorology Division", new_sound = 'sound/misc/notice2.ogg') +>>>>>>> d83d5cb... Merge pull request #7282 from Rykka-Stormheart/shep-dev-aurora-upstream ..() /datum/event/aurora_caelus/overmap/announce() diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index 458fe9fb56..5df114c8f4 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -145,6 +145,7 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Lore News", /datum/event/lore_news, 400), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Vermin Infestation",/datum/event/infestation, 100, list(ASSIGNMENT_JANITOR = 100)), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Wallrot", /datum/event/wallrot, 0, list(ASSIGNMENT_ENGINEER = 30, ASSIGNMENT_GARDENER = 50)), + new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Aurora Caelus", /datum/event/aurora_caelus, 2, list(), 1), ) /datum/event_container/moderate