From e8c475fd450f2ddcec027da09a31a6e27c33d7ac Mon Sep 17 00:00:00 2001
From: CygnusB <39594514+MalricB@users.noreply.github.com>
Date: Wed, 9 Dec 2020 19:42:47 -0300
Subject: [PATCH] Update aurora_aquilae.dm

---
 code/modules/events/aurora_aquilae.dm | 30 +++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/code/modules/events/aurora_aquilae.dm b/code/modules/events/aurora_aquilae.dm
index f72ea5eb..31a62d5b 100644
--- a/code/modules/events/aurora_aquilae.dm
+++ b/code/modules/events/aurora_aquilae.dm
@@ -48,13 +48,30 @@
 				for(var/obj/machinery/power/apc/temp in A)
 					temp.overload_lighting()
 
+/datum/round_event/aurora_aquilae/proc/battleflashbacksone()
+	message_admins("battleflashbacks1 aquilae")
+	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
+		new /datum/hallucination/fire(H)
+
+/datum/round_event/aurora_aquilae/proc/battleflashbackstwo()
+	message_admins("battleflashbacks2 aquilae")
+	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
+		new /datum/hallucination/delusion(H)
+		new /datum/hallucination/battle(H)
+		for(var/i in 1 to 50)
+			new /datum/hallucination/stray_pistol_bullet(H)
+			new /datum/hallucination/battle(H)
+			sleep(2.5)
+
 /datum/round_event/aurora_aquilae/announce()
 	priority_announce("[station_name()]: A ·#HARMLESS#· cloud of ·|$% GLORY AND GUTS¬€#· ions is approaching your ·|%$ station, and will exhaust their energy battering the hull. Kinaris Command has approved a short break for all employees to relax and observe this very rare event. During this time, starlight will be bright but %%%BRUTAL·$ª, shifting between %$$%!ªTHE COMPLETE AND UTTER DESTRUCTION OF THE SENSES$ and %%THE ASHES OF THE GREAT AL-SHAIN%. Any staff who would like to view the %%PRESENCE OF A KING%$ for themselves may proceed to the nearest area with viewing ports to open space.",
 	sound = 'sound/misc/interference.ogg',
 	sender_override = "Kin]·|Aari$s Meteo%&rology DivD··isio#n")
 	addtimer(CALLBACK(src, .proc/flicker_lights), 5 SECONDS)
+	addtimer(CALLBACK(src, .proc/battleflashbacksone), 5 SECONDS)
 	message_admins("announce aurora aquilae")
 	addtimer(CALLBACK(src, .proc/break_lights), 35 SECONDS)
+	addtimer(CALLBACK(src, .proc/battleflashbackstwo), 45 SECONDS)
 
 /datum/round_event/aurora_aquilae/tick()
 	if(activeFor % 5 == 0)
@@ -65,19 +82,6 @@
 			if(initial(A.dynamic_lighting) == DYNAMIC_LIGHTING_IFSTARLIGHT)
 				for(var/turf/open/space/S in A)
 					S.set_light(l_color = aurora_color)
-	if(activeFor == 75)
-		message_admins("battle aquilae")
-		for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
-			new /datum/hallucination/delusion(H)
-			new /datum/hallucination/battle(H)
-			sleep (100)
-			for(var/i in 1 to 50)
-				new /datum/hallucination/stray_pistol_bullet(H)
-				new /datum/hallucination/battle(H)
-				sleep(2.5)
-	if(activeFor == 60)
-		for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
-			new /datum/hallucination/fire(H)
 
 /datum/round_event/aurora_aquilae/end()
 	for(var/area in GLOB.sortedAreas)