Holy shit air alarms work properly now. Yes, this time it's tested.

* Area air alerts are the maximum of all air alarm local danger levels.
* Doors are no longer fumbled and close upon alert level 2, and when all alert levels clear, the DOORS OPEN AUTOMATICALLY OH MY GOD
* Air alarm icons refresh properly and only show red in actually dangerous areas.  (Area alerts only cause yellow icons)
* Alerts clear automatically
* Silicons can set thresholds now (someone forgot an !)
This commit is contained in:
Rob Nelson
2013-12-14 02:39:10 -08:00
parent 29b25bbbe5
commit ccf649fea4
5 changed files with 89 additions and 358 deletions

View File

@@ -106,7 +106,7 @@
var/list/alarm_data=list()
alarm_data["ID"]="\ref[alarm]"
alarm_data["danger"] = max(alarm.danger_level, alarm.alarm_area.atmosalm)
alarm_data["danger"] = max(alarm.local_danger_level, alarm.alarm_area.atmosalm-1)
alarm_data["name"] = "[alarm]"
alarms+=list(alarm_data)
data["alarms"]=alarms
@@ -241,15 +241,15 @@
current.air_doors_open(1)
if(href_list["atmos_alarm"])
if (current.alarm_area.atmosalert(2))
current.apply_danger_level(2)
current.alarmActivated=1
current.alarm_area.updateDangerLevel()
spawn(1)
src.updateUsrDialog()
current.update_icon()
return
if(href_list["atmos_reset"])
if (current.alarm_area.atmosalert(0))
current.apply_danger_level(0)
current.alarmActivated=0
current.alarm_area.updateDangerLevel()
spawn(1)
src.updateUsrDialog()
current.update_icon()