From 4c2e702d7a0cdbda0271c35a4acd62caed8006f6 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Sun, 2 Feb 2020 13:18:26 +0800 Subject: [PATCH 1/4] yee --- code/modules/events/meteor_wave.dm | 5 ++++- code/modules/flufftext/Hallucination.dm | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) 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') From 659110ac8c73e32c5ce516fc49ae1554bca26d03 Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Sun, 2 Feb 2020 13:44:45 +0800 Subject: [PATCH 2/4] yee again --- code/modules/events/meteor_wave.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index 0004791c75..98e337dc1d 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -74,7 +74,7 @@ directionstring = " towards starboard" if(WEST) directionstring = " towards port" - 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." : ""]" + return "[wave_name == "catastrophic" ? "An entire asteroid field has" : wave_name == "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)) From 8f70bd304df615e8a31abce33df5b626f4d67ae1 Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Tue, 4 Feb 2020 13:24:30 +0800 Subject: [PATCH 3/4] yee --- code/modules/events/meteor_wave.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index 98e337dc1d..6ecc1d9d42 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -61,9 +61,9 @@ kill() /datum/round_event/meteor_wave/announce(fake) - priority_announce(generateMeteorString(wave_name,startWhen,TRUE,direction), "Meteor Alert", "meteors") + priority_announce(generateMeteorString(startWhen,TRUE,direction), "Meteor Alert", "meteors") -/proc/generateMeteorString(wave_name,startWhen,syndiealert,direction) +/proc/generateMeteorString(startWhen,syndiealert,direction) var/directionstring switch(direction) if(NORTH) @@ -74,7 +74,7 @@ directionstring = " towards starboard" if(WEST) directionstring = " towards port" - return "[wave_name == "catastrophic" ? "An entire asteroid field has" : wave_name == "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." : ""]" + return "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)) From 0e13afc10fadad02a1195dd7b654fc7a3177ee2d Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Tue, 4 Feb 2020 13:25:14 +0800 Subject: [PATCH 4/4] yeet --- code/modules/flufftext/Hallucination.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 78df995665..150f066886 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -895,11 +895,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( SEND_SOUND(target, get_announcer_sound("aimalf")) if("meteors") //Meteors inbound! to_chat(target, "

Meteor Alert

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

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

") + to_chat(target, "

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

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