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

Merge pull request #10854 from Seris02/meteoralertchange

Browse Source 
Makes a proc for meteor string gen
This commit is contained in:
Ghom
2020-02-04 08:15:32 +01:00
committed by GitHub
parent 1dfd149ab6 0e13afc10f
commit d451115bf1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/meteor_wave.dm
+4 -1
View File
@@ -61,6 +61,9 @@
kill()
/datum/round_event/meteor_wave/announce(fake)
priority_announce(generateMeteorString(startWhen,TRUE,direction), "Meteor Alert", "meteors")
/proc/generateMeteorString(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 "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))
code/modules/flufftext/Hallucination.dm
+1 -1
View File
@@ -895,7 +895,7 @@ 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>")
to_chat(target, "<br><br><span class='alert'>[generateMeteorString(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')