Fix some announcement sounds (#57192)

This commit is contained in:
MrMelbert
2021-02-26 17:09:59 -06:00
committed by GitHub
parent 3573c63f61
commit 042dc5ccdf
3 changed files with 6 additions and 5 deletions
+4 -2
View File
@@ -3,8 +3,10 @@
return
var/announcement
if(!istype(sound, /sound))
sound = SSstation.announcer.event_sounds[sound] || SSstation.announcer.get_rand_alert_sound()
if(!sound)
sound = SSstation.announcer.get_rand_alert_sound()
else if(SSstation.announcer.event_sounds[sound])
sound = SSstation.announcer.event_sounds[sound]
if(type == "Priority")
announcement += "<h1 class='alert'>Priority Announcement</h1>"
+1 -2
View File
@@ -30,7 +30,7 @@
/proc/power_restore()
priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", ANNOUNCER_POWEROFF)
priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", ANNOUNCER_POWERON)
for(var/obj/machinery/power/apc/C in GLOB.machines)
if(C.cell && is_station_level(C.z))
C.cell.charge = C.cell.maxcharge
@@ -63,4 +63,3 @@
S.output_attempt = TRUE
S.update_appearance()
S.power_change()
+1 -1
View File
@@ -560,7 +560,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/announce_command_report = TRUE
switch(confirm)
if("Yes")
priority_announce(input, null, SSstation.announcer.get_rand_report_sound())
priority_announce(input, null, SSstation.announcer.get_rand_report_sound(), has_important_message = TRUE)
announce_command_report = FALSE
if("Cancel")
return