shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yee

Browse Source
This commit is contained in:
Seris02
2020-02-02 13:18:26 +08:00
parent 55a0e4e55d
commit 4c2e702d7a
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/events/meteor_wave.dm
View File

@@ -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))

6
code/modules/flufftext/Hallucination.dm
View File

@@ -895,7 +895,11 @@ GLOBAL_LIST_INIT(hallucination_list, list(
SEND_SOUND(target, get_announcer_sound("aimalf"))
if("meteors") //Meteors inbound!
to_chat(target, "<h1 class='alert'>Meteor Alert</h1>")
to_chat(target, "<br><br><span class='alert'>Meteors have been detected on collision course with the station. Estimated time until impact: [round(rand(180,360)/60)] minutes.</span><br><br>")
var/wave_name = pickweight(list(
"normal" = 50,
"threatening" = 40,
"catastrophic" = 10))
to_chat(target, "<br><br><span class='alert'>[generateMeteorString(wave_name,rand(60, 90),FALSE,pick(GLOB.cardinals))]</span><br><br>")
SEND_SOUND(target, get_announcer_sound("meteors"))
if("supermatter")
SEND_SOUND(target, 'sound/magic/charge.ogg')