From 6d3a0c6298310ce681063e898f36a2eae3f7f494 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 16 Jun 2020 08:36:44 -0400
Subject: [PATCH] Update aurora_caelus.dm

---
 code/modules/events/aurora_caelus.dm | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm
index d6e3a9d1cf..d1672e51cd 100644
--- a/code/modules/events/aurora_caelus.dm
+++ b/code/modules/events/aurora_caelus.dm
@@ -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
\ No newline at end of file
+	return