From 6632cf7be032fa939a6dfa9f137b92c74af6bdaf Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 12 Jul 2014 09:23:39 +0930 Subject: [PATCH] Removes alarm sound from air alarm. --- code/game/machinery/alarm.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index ad70d7ca01..fe868e82b5 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -104,7 +104,7 @@ var/phoron_dangerlevel = 0 var/temperature_dangerlevel = 0 var/other_dangerlevel = 0 - + var/alarm_sound_cooldown = 200 var/last_sound_time = 0 @@ -173,7 +173,6 @@ if(!istype(location)) return//returns if loc is not simulated if ((alarm_area.fire || alarm_area.atmosalm >= 2) && world.time > last_sound_time + alarm_sound_cooldown) - playsound(src.loc, 'sound/machines/airalarm.ogg', 40, 0, 5) last_sound_time = world.time var/datum/gas_mixture/environment = location.return_air() @@ -324,11 +323,11 @@ if((stat & (NOPOWER|BROKEN)) || shorted) icon_state = "alarmp" return - + var/icon_level = danger_level if (alarm_area.atmosalm) icon_level = max(icon_level, 1) //if there's an atmos alarm but everything is okay locally, no need to go past yellow - + switch(icon_level) if (0) icon_state = "alarm0" @@ -728,7 +727,7 @@ Toxins: [phoron_percent]%
output += "Fire alarm in area" else output += "No alerts" - + return output /obj/machinery/alarm/proc/rcon_text()