From 92517638bc033a1f1ed73efbc18e0b9477f62100 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Wed, 6 Mar 2013 01:31:40 +1000 Subject: [PATCH] removed double announcement for grid checks Signed-off-by: Cael_Aislinn --- code/game/gamemodes/events/power_failure.dm | 27 ++++++++++++--------- code/modules/events/grid_check.dm | 7 ++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/code/game/gamemodes/events/power_failure.dm b/code/game/gamemodes/events/power_failure.dm index 8ecc4083e41..19c009356b7 100644 --- a/code/game/gamemodes/events/power_failure.dm +++ b/code/game/gamemodes/events/power_failure.dm @@ -1,8 +1,9 @@ -/proc/power_failure() - command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure") - for(var/mob/M in player_list) - M << sound('sound/AI/poweroff.ogg') +/proc/power_failure(var/announce = 1) + if(announce) + command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure") + for(var/mob/M in player_list) + M << sound('sound/AI/poweroff.ogg') for(var/obj/machinery/power/smes/S in world) if(istype(get_area(S), /area/turret_protected) || S.z != 1) continue @@ -47,11 +48,12 @@ C.cell.charge = 0 -/proc/power_restore() +/proc/power_restore(var/announce = 1) - command_alert("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal") - for(var/mob/M in player_list) - M << sound('sound/AI/poweron.ogg') + if(announce) + command_alert("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal") + for(var/mob/M in player_list) + M << sound('sound/AI/poweron.ogg') for(var/obj/machinery/power/apc/C in world) if(C.cell && C.z == 1) C.cell.charge = C.cell.maxcharge @@ -70,11 +72,12 @@ A.power_environ = 1 A.power_change() -/proc/power_restore_quick() +/proc/power_restore_quick(var/announce = 1) - command_alert("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal") - for(var/mob/M in player_list) - M << sound('sound/AI/poweron.ogg') + if(announce) + command_alert("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal") + for(var/mob/M in player_list) + M << sound('sound/AI/poweron.ogg') for(var/obj/machinery/power/smes/S in world) if(S.z != 1) continue diff --git a/code/modules/events/grid_check.dm b/code/modules/events/grid_check.dm index 6122e41acc9..6f4f11b05f8 100644 --- a/code/modules/events/grid_check.dm +++ b/code/modules/events/grid_check.dm @@ -1,11 +1,11 @@ /datum/event/grid_check //NOTE: Times are measured in master controller ticks! - startWhen = 5 + announceWhen = 5 /datum/event/grid_check/setup() endWhen = rand(90,600) /datum/event/grid_check/start() - power_failure(1) + power_failure(0) /datum/event/grid_check/announce() command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Automated Grid Check") @@ -13,7 +13,4 @@ M << sound('sound/AI/poweroff.ogg') /datum/event/grid_check/end() - command_alert("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal") - for(var/mob/M in player_list) - M << sound('sound/AI/poweron.ogg') power_restore()