Merge pull request #5382 from mwerezak/air-alarm

A couple small things
This commit is contained in:
Zuhayr
2014-07-01 02:24:26 +09:30
3 changed files with 307 additions and 298 deletions
+7
View File
@@ -104,6 +104,9 @@
var/phoron_dangerlevel = 0
var/temperature_dangerlevel = 0
var/other_dangerlevel = 0
var/alarm_sound_cooldown = 200
var/last_sound_time = 0
/obj/machinery/alarm/server/New()
..()
@@ -169,6 +172,10 @@
var/turf/simulated/location = loc
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()
//Handle temperature adjustment here.
+300 -298
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.