diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index 3d10644a336..911792c8e84 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -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 += "

Priority Announcement

" diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index b8afc2db56e..34f44b97d56 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -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() - diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index c1446047b33..3fb30fcf892 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -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