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

Update aurora_caelus.dm

Browse Source
This commit is contained in:
Novacat
2020-06-16 08:36:44 -04:00
committed by GitHub
parent 99db1990bc
commit 6d3a0c6298
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,11 +10,7 @@
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
We hope you enjoy the lights.", "Nanotrasen Meteorology Division", new_sound = 'sound/AI/aurora.ogg') //VOREStation Edit
/datum/event/aurora_caelus/start()
affecting_z -= global.using_map.sealed_levels // Space levels only please!
@@ -33,12 +29,8 @@
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
"Nanotrasen Meteorology Division", new_sound = 'sound/AI/aurora_end.ogg') //VOREStation Edit
..()
/datum/event/aurora_caelus/overmap/announce()
return
return