cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes alarm sound from air alarm.

Browse Source
This commit is contained in:
Zuhayr
2014-07-12 09:23:39 +09:30
parent 7defd73d98
commit 6632cf7be0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/machinery/alarm.dm
View File

@@ -104,7 +104,7 @@
var/phoron_dangerlevel = 0 var/phoron_dangerlevel = 0
var/temperature_dangerlevel = 0 var/temperature_dangerlevel = 0
var/other_dangerlevel = 0 var/other_dangerlevel = 0
var/alarm_sound_cooldown = 200 var/alarm_sound_cooldown = 200
var/last_sound_time = 0 var/last_sound_time = 0
@@ -173,7 +173,6 @@
if(!istype(location)) return//returns if loc is not simulated 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) 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 last_sound_time = world.time
var/datum/gas_mixture/environment = location.return_air() var/datum/gas_mixture/environment = location.return_air()
@@ -324,11 +323,11 @@
if((stat & (NOPOWER|BROKEN)) || shorted) if((stat & (NOPOWER|BROKEN)) || shorted)
icon_state = "alarmp" icon_state = "alarmp"
return return
var/icon_level = danger_level var/icon_level = danger_level
if (alarm_area.atmosalm) 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 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) switch(icon_level)
if (0) if (0)
icon_state = "alarm0" icon_state = "alarm0"
@@ -728,7 +727,7 @@ Toxins: <span class='dl[phoron_dangerlevel]'>[phoron_percent]</span>%<br>
output += "<span class='dl1'>Fire alarm in area</span>" output += "<span class='dl1'>Fire alarm in area</span>"
else else
output += "No alerts" output += "No alerts"
return output return output
/obj/machinery/alarm/proc/rcon_text() /obj/machinery/alarm/proc/rcon_text()