diff --git a/code/modules/events/aurora_aquilae.dm b/code/modules/events/aurora_aquilae.dm index c08ef6dd..0d9ab671 100644 --- a/code/modules/events/aurora_aquilae.dm +++ b/code/modules/events/aurora_aquilae.dm @@ -16,17 +16,37 @@ endWhen = 100 var/list/aurora_colors = list("#ffc8bc", "#ed927f", "#d5745f", "#bf3a1d", "#c71414", "#FF3131", "#ee0808", "#ff0000") var/aurora_progress = 0 //this cycles from 1 to 8, slowly grading towards a bright red - var/list/area/areasToFlicker = list(/area/hallway/primary, + var/list/area/areasToFlicker = list(/area/hallway/primary/aft, + /area/hallway/primary/fore, + /area/hallway/primary/starboard/aft, + /area/hallway/primary/starboard/fore, + /area/hallway/primary/port/aft, + /area/hallway/primary/port/fore, + /area/hallway/primary/central, /area/security, /area/science) +/datum/round_event/aurora_aquilae/proc/flicker_lights() + message_admins("flicker lights aquilae") + for(var/area/A in areasToFlicker) + for(var/obj/machinery/light/L in A) + L.flicker(30) + +/datum/round_event/aurora_aquilae/proc/break_lights() + message_admins("break lights aquilae") + for(var/obj/O in areasToFlicker) + if(istype(O, /obj/machinery/power/apc)) + var/obj/machinery/power/apc/temp = O + temp.overload_lighting() + /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") - for(var/area/A in areasToFlicker) - for(var/obj/machinery/light/L in A) - L.flicker(30) + addtimer(CALLBACK(src, .proc/flicker_lights), 5 SECONDS) + message_admins("announce aurora aquilae") + addtimer(CALLBACK(src, .proc/break_lights), 35 SECONDS) + /datum/round_event/aurora_aquilae/start() for(var/area in GLOB.sortedAreas) var/area/A = area @@ -35,11 +55,13 @@ S.set_light(S.light_range * 10, S.light_power * 1) for(var/V in GLOB.player_list) var/mob/M = V - if(is_station_level(M.z)) + if(is_station_level(M.z)) M.playsound_local(M, 'sound/ambience/aurora_aquilae.ogg', 20, FALSE, pressure_affected = FALSE) //ogg is "In the presence of a King" by Heaven Pierce Her, used in the videogame ULTRAKILL. All respects and credits to the equivalent artists who worked on it. + message_admins("start aurora aquilae") + /datum/round_event/aurora_aquilae/tick() - if(activeFor % 10 == 0) + if(activeFor % 7 == 0) aurora_progress++ var/aurora_color = aurora_colors[aurora_progress] for(var/area in GLOB.sortedAreas) @@ -48,6 +70,7 @@ 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) @@ -96,11 +119,6 @@ if(activeFor == 60) for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) new /datum/hallucination/fire(H) - if(activeFor == 60) - for(var/obj/O in areasToFlicker) - if(istype(O, /obj/machinery/power/apc)) - var/obj/machinery/power/apc/temp = O - temp.overload_lighting() /datum/round_event/aurora_aquilae/end() for(var/area in GLOB.sortedAreas)