Skip to content

Commit

Permalink
Makes Random Events a bit more lore friendly.
Browse files Browse the repository at this point in the history
  • Loading branch information
M11gamer committed Oct 14, 2018
1 parent b78758e commit ae15fbe
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions code/modules/events/communications_blackout.dm
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/datum/event/communications_blackout/announce()
var/alert = pick( "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you*%fj00)`5vc-BZZT", \
"Ionospheric anomalies detected. Temporary telecommunication failu*3mga;b4;'1v¬-BZZZT", \
"Ionospheric anomalies detected. Temporary telec#MCi46:5.;@63-BZZZZT", \
"Ionospheric anomalies dete'fZ\\kg5_0-BZZZZZT", \
"Ionospheri:%£ MCayj^j<.3-BZZZZZZT", \
var/alert = pick( "Warning! System failure, local telecommunications tower power net undergoing failure, please remain calm as the system reboots.", \
"Warn*w7ng! System ###lure, local telecommunications tower {39810} undergoing fail----ure, please remain calm as the system )(*$%¨$#.", \
"Warn*w7ng! System failure, local tel&%$#%¨$@", \
"Failu341241re, local telecommunications tower'fZ\\kg5_0-BZZZZZT", \
"teleco:%£ MCayj^j<.3-BZZZZZZT", \
"#4nd%;f4y6,>£%-BZZZZZZZT")

for(var/mob/living/silicon/ai/A in GLOB.player_list) //AIs are always aware of communication blackouts.
Expand Down
6 changes: 3 additions & 3 deletions code/modules/events/meteors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
if(EVENT_LEVEL_MAJOR)
command_announcement.Announce(replacetext(GLOB.using_map.meteor_detected_message, "%STATION_NAME%", location_name()), "[location_name()] Sensor Array", new_sound = GLOB.using_map.meteor_detected_sound, zlevels = affecting_z)
else
command_announcement.Announce("The [location_name()] is now in a meteor shower.", "[location_name()] Sensor Array", zlevels = affecting_z)
command_announcement.Announce("Warning! The underground cave system is now under collapse, [location_name()] facility may be hit by falling debris.", "[location_name()] Alert Sensors", zlevels = affecting_z)

/datum/event/meteor_wave/tick()
// Begin sending the alarm signals to shield diffusers so the field is already regenerated (if it exists) by the time actual meteors start flying around.
Expand Down Expand Up @@ -50,9 +50,9 @@
/datum/event/meteor_wave/end()
switch(severity)
if(EVENT_LEVEL_MAJOR)
command_announcement.Announce("The [location_name()] has cleared the meteor storm.", "[location_name()] Sensor Array", zlevels = affecting_z)
command_announcement.Announce("The underground cave system has recuperated his structural integrity.", "[location_name()] Alert Sensors", zlevels = affecting_z)
else
command_announcement.Announce("The [location_name()] has cleared the meteor shower", "[location_name()] Sensor Array", zlevels = affecting_z)
command_announcement.Announce("The underground cave system has recuperated his structural integrity.", "[location_name()] Alert Sensors", zlevels = affecting_z)

/datum/event/meteor_wave/proc/get_meteors()
switch(severity)
Expand Down
5 changes: 2 additions & 3 deletions code/modules/events/spider_infestation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
announceWhen = 90
var/spawncount = 1

datum/event/spider_infestation/announce()
command_announcement.Announce("Containment breach of object class Euclid SCP-525 detected. multiple instances detected.", "Biohazard Alert")

/datum/event/spider_infestation/setup()
announceWhen = rand(announceWhen, announceWhen + 60)
spawncount = rand(4 * severity, 6 * severity) //spiderlings only have a 50% chance to grow big and strong
sent_spiders_to_station = 0

/datum/event/spider_infestation/announce()
GLOB.using_map.unidentified_lifesigns_announcement()

/datum/event/spider_infestation/start()
var/list/vents = list()
for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in SSmachines.all_machinery)
Expand Down
3 changes: 2 additions & 1 deletion maps/site53/site53_announcements.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
grid_restored_message = "Site power will be restored at this time"
grid_restored_sound = sound('sound/AI/announcer/poweron.ogg', volume = 150)

meteor_detected_sound = sound('sound/AI/torch/meteors.ogg', volume = 45)
meteor_detected_message = "Warning! The underground cave system is now under collapse,The facility may be hit by falling debris.."
meteor_detected_sound = sound('sound/AI/announcer/industrialalarm.ogg', volume = 45)

radiation_detected_message = "Radioactive object class SAFE containment breach detected. Please report to the medical bay if you feel strange."
radiation_detected_sound = sound('sound/AI/torch/radiation.ogg', volume = 45)
Expand Down
Binary file added sound/AI/announcer/industrialalarm.ogg
Binary file not shown.
Binary file added sound/AI/announcer/rocks.ogg
Binary file not shown.

0 comments on commit ae15fbe

Please sign in to comment.