diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index d4eb6ded4c..0004791c75 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -61,6 +61,9 @@ kill() /datum/round_event/meteor_wave/announce(fake) + priority_announce(generateMeteorString(wave_name,startWhen,TRUE,direction), "Meteor Alert", "meteors") + +/proc/generateMeteorString(wave_name,startWhen,syndiealert,direction) var/directionstring switch(direction) if(NORTH) @@ -71,7 +74,7 @@ directionstring = " towards starboard" if(WEST) directionstring = " towards port" - priority_announce("Meteors have been detected on collision course with the station[directionstring]. Estimated time until impact: [round((startWhen * SSevents.wait) / 10, 0.1)] seconds.[GLOB.singularity_counter ? " Warning: Anomalous gravity pulse detected, Syndicate technology interference likely." : ""]", "Meteor Alert", "meteors") + return "[wave_name == "catastrophic" ? "An entire asteroid field has" : wave_type == "threatening" ? "An abundance of meteors have" : "Meteors have"] been detected on a collision course with the station[directionstring]. Estimated time until impact: [round((startWhen * SSevents.wait) / 10, 0.1)] seconds.[GLOB.singularity_counter && syndiealert ? " Warning: Anomalous gravity pulse detected, Syndicate technology interference likely." : ""]" /datum/round_event/meteor_wave/tick() if(ISMULTIPLE(activeFor, 3)) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 83dbad0246..78df995665 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -895,7 +895,11 @@ GLOBAL_LIST_INIT(hallucination_list, list( SEND_SOUND(target, get_announcer_sound("aimalf")) if("meteors") //Meteors inbound! to_chat(target, "

Meteor Alert

") - to_chat(target, "

Meteors have been detected on collision course with the station. Estimated time until impact: [round(rand(180,360)/60)] minutes.

") + var/wave_name = pickweight(list( + "normal" = 50, + "threatening" = 40, + "catastrophic" = 10)) + to_chat(target, "

[generateMeteorString(wave_name,rand(60, 90),FALSE,pick(GLOB.cardinals))]

") SEND_SOUND(target, get_announcer_sound("meteors")) if("supermatter") SEND_SOUND(target, 'sound/magic/charge.ogg')