From dbcc4efb7c80fd9dbbd34e955c9ca7547b89b49c Mon Sep 17 00:00:00 2001 From: Lorwp Date: Wed, 11 Apr 2018 21:07:10 +1000 Subject: [PATCH] Cleans up Event messages Mainly just adding [station_name()] when needed --- code/defines/procs/announce.dm | 2 +- code/game/gamemodes/events.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 4 ++-- code/modules/events/dust.dm | 4 ++-- code/modules/events/meteors.dm | 8 ++++---- code/modules/events/radiation_storm.dm | 2 +- code/modules/events/solar_storm.dm | 2 +- code/modules/events/viral_infection.dm | 2 +- code/modules/events/wallrot.dm | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index 22fa3438ca..4b39c47656 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -122,7 +122,7 @@ datum/announcement/proc/Log(message as text, message_title as text) command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') /proc/ion_storm_announcement() - command_announcement.Announce("It has come to our attention that the station passed through an ion storm. Please monitor all electronic equipment for malfunctions.", "Anomaly Alert") + command_announcement.Announce("It has come to our attention that the [station_name()] passed through an ion storm. Please monitor all electronic equipment for malfunctions.", "Anomaly Alert") /proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank, var/join_message) if (ticker.current_state == GAME_STATE_PLAYING) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 0169cd3f00..b046516343 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -164,7 +164,7 @@ var/hadevent = 0 randmutg(H) domutcheck(H,null,MUTCHK_FORCED) sleep(100) - command_announcement.Announce("High levels of radiation detected near the station. Please report to the Med-bay if you feel strange.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') + command_announcement.Announce("High levels of radiation detected near the [station_name()]. Please report to the Med-bay if you feel strange.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 9536f830fb..676ceeb9b8 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -219,7 +219,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No") if(show_log == "Yes") - command_announcement.Announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", new_sound = 'sound/AI/ionstorm.ogg') + command_announcement.Announce("Ion storm detected near the [station_name()]. Please check all AI-controlled equipment for errors.", "Anomaly Alert", new_sound = 'sound/AI/ionstorm.ogg') IonStorm(0) feedback_add_details("admin_verb","ION") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -522,7 +522,7 @@ Traitors and the like can also be revived with the previous role mostly intact. var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No") if(show_log == "Yes") - command_announcement.Announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", new_sound = 'sound/AI/ionstorm.ogg') + command_announcement.Announce("Ion storm detected near the [station_name()]. Please check all AI-controlled equipment for errors.", "Anomaly Alert", new_sound = 'sound/AI/ionstorm.ogg') feedback_add_details("admin_verb","IONC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_rejuvenate(mob/living/M as mob in mob_list) diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index e70a18ae21..6493f2cd94 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -3,13 +3,13 @@ endWhen = 30 /datum/event/dust/announce() - command_announcement.Announce("Debris resulting from activity on another nearby asteroid is approaching your colony.", "Dust Alert") + command_announcement.Announce("Debris resulting from activity on another nearby asteroid is approaching [station_name()]", "Dust Alert") /datum/event/dust/start() dust_swarm(get_severity()) /datum/event/dust/end() - command_announcement.Announce("The colony is no longer in danger of impact from space debris.", "Dust Notice") + command_announcement.Announce("The [station_name()] is no longer in danger of impact from space debris.", "Dust Notice") /datum/event/dust/proc/get_severity() switch(severity) diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index 6ffb6011ef..5947cb1204 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -13,9 +13,9 @@ /datum/event/meteor_wave/announce() switch(severity) if(EVENT_LEVEL_MAJOR) - command_announcement.Announce("Meteors have been detected on collision course with the colony.", "Meteor Alert", new_sound = 'sound/AI/meteors.ogg') + command_announcement.Announce("Meteors have been detected on collision course with the [station_name()].", "Meteor Alert", new_sound = 'sound/AI/meteors.ogg') else - command_announcement.Announce("The colony is now in a meteor shower.", "Meteor Alert") + command_announcement.Announce("The [station_name()] is now in a meteor shower.", "Meteor Alert") /datum/event/meteor_wave/tick() if(waves && activeFor >= next_meteor) @@ -32,9 +32,9 @@ /datum/event/meteor_wave/end() switch(severity) if(EVENT_LEVEL_MAJOR) - command_announcement.Announce("The colony has cleared the meteor storm.", "Meteor Alert") + command_announcement.Announce("The [station_name()] has cleared the meteor storm.", "Meteor Alert") else - command_announcement.Announce("The colony has cleared the meteor shower", "Meteor Alert") + command_announcement.Announce("The [station_name()] has cleared the meteor shower", "Meteor Alert") /datum/event/meteor_wave/proc/get_meteors() switch(severity) diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index bf2dec5e4e..46a616f7ec 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -9,7 +9,7 @@ var/postStartTicks = 0 /datum/event/radiation_storm/announce() - command_announcement.Announce("High levels of radiation detected near the station. Please evacuate into one of the shielded maintenance tunnels.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') + command_announcement.Announce("High levels of radiation detected near the [station_name()]. Please evacuate into one of the shielded maintenance tunnels.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') /datum/event/radiation_storm/start() make_maint_all_access() diff --git a/code/modules/events/solar_storm.dm b/code/modules/events/solar_storm.dm index afaa01ed95..742547dbb6 100644 --- a/code/modules/events/solar_storm.dm +++ b/code/modules/events/solar_storm.dm @@ -9,7 +9,7 @@ endWhen = startWhen + rand(30,90) + rand(30,90) //2-6 minute duration /datum/event/solar_storm/announce() - command_announcement.Announce("A solar storm has been detected approaching the station. Please halt all EVA activites immediately and return to the interior of the station.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') + command_announcement.Announce("A solar storm has been detected approaching the [station_name()]. Please halt all EVA activites immediately and return to the interior of the station.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') adjust_solar_output(1.5) /datum/event/solar_storm/proc/adjust_solar_output(var/mult = 1) diff --git a/code/modules/events/viral_infection.dm b/code/modules/events/viral_infection.dm index 828233ea5f..5c89fc5c6b 100644 --- a/code/modules/events/viral_infection.dm +++ b/code/modules/events/viral_infection.dm @@ -28,7 +28,7 @@ datum/event/viral_infection/announce() level = "five" if (severity == EVENT_LEVEL_MAJOR || prob(60)) - command_announcement.Announce("Confirmed outbreak of level [level] biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak5.ogg') + command_announcement.Announce("Confirmed outbreak of level [level] biohazard aboard the [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak5.ogg') datum/event/viral_infection/start() if(!viruses.len) return diff --git a/code/modules/events/wallrot.dm b/code/modules/events/wallrot.dm index 5aede8a894..18c7c65c3a 100644 --- a/code/modules/events/wallrot.dm +++ b/code/modules/events/wallrot.dm @@ -15,7 +15,7 @@ /datum/event/wallrot/announce() if(center) - command_announcement.Announce("Harmful fungi detected on the colony nearby [center.loc.name]. Station structures may be contaminated.", "Biohazard Alert") + command_announcement.Announce("Harmful fungi detected on the [station_name()] nearby [center.loc.name]. Station structures may be contaminated.", "Biohazard Alert") /datum/event/wallrot/start() spawn()