cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the Aurora Caelus Event!

Browse Source
This commit is contained in:
Atermonera
2020-06-16 00:28:14 -07:00
committed by VirgoBot
parent bf5d9f1fc8
commit 99db1990bc
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/events/aurora_caelus.dm
View File

@@ -10,7 +10,11 @@
During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. \ 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. \ 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. \ 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/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() /datum/event/aurora_caelus/start()
affecting_z -= global.using_map.sealed_levels // Space levels only please! 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. \ 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. \ Please return to your workplace and continue work as normal. \
Have a pleasant shift, [station_name()], and thank you for watching with us.", 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/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() /datum/event/aurora_caelus/overmap/announce()

1
code/modules/events/event_container.dm
View File

@@ -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, "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, "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, "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 /datum/event_container/moderate