From bda2616409c7779febc072f0e89bcf1a1b23d545 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sun, 20 Mar 2022 19:47:37 +0100 Subject: [PATCH] fixes --- code/controllers/subsystems/evacuation/evacuation.dm | 2 +- code/defines/procs/announce.dm | 2 +- code/modules/events/communications_blackout.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystems/evacuation/evacuation.dm b/code/controllers/subsystems/evacuation/evacuation.dm index 2eadf2b7547..5a6aaaaa170 100644 --- a/code/controllers/subsystems/evacuation/evacuation.dm +++ b/code/controllers/subsystems/evacuation/evacuation.dm @@ -93,7 +93,7 @@ var/datum/evacuation_controller/evacuation_controller if(istype(A, /area/hallway)) A.readyalert() if(!skip_announce) - priority_announcement.Announce(replacetext(replacetext(current_map.emergency_shuttle_called_message, "%dock%", "[current_map.dock_name]"), "%ETA%", "[round(get_eta()/60)] minute\s"), new_sound = 'sound/AI/emergencyshuttlecalled.ogg') + priority_announcement.Announce(replacetext(replacetext(current_map.emergency_shuttle_called_message, "%dock%", "[current_map.dock_name]"), "%ETA%", "[round(get_eta()/60)] minute\s"), new_sound = 'sound/AI/emergency_shuttle_docked.ogg') else if(!skip_announce) priority_announcement.Announce(replacetext(replacetext(current_map.shuttle_called_message, "%dock%", "[current_map.dock_name]"), "%ETA%", "[round(get_eta()/60)] minute\s"), new_sound = 'sound/AI/shuttlecalled.ogg') diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index 69106f6473c..10dacdcaf5c 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -105,7 +105,7 @@ return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name /proc/level_seven_announcement() - command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/level_seven_biohazard.ogg') + command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/level_7_biohazard.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") diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index fff5cd0c7e5..a1969fe61be 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -16,7 +16,7 @@ to_chat(A, "
") if(prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. - command_announcement.Announce(alert, volume=25) + command_announcement.Announce(alert) return return 1