cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Batch 2.

Browse Source
This commit is contained in:
ESwordTheCat
2014-05-25 03:45:41 -08:00
parent 67d7da52c3
commit 84a8b2056d
18 changed files with 144 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/WorkInProgress/Mini/atmos_control.dm
View File

@@ -89,12 +89,12 @@
var/list/alarms=list()
for(var/obj/machinery/alarm/alarm in (machines)) // removing sortAtom because nano updates it just enough for the lag to happen
if(!is_in_filter(alarm.alarm_area.type))
if(!is_in_filter(alarm.areaMaster.type))
continue // NO ACCESS 4 U
var/list/alarm_data=list()
alarm_data["ID"]="\ref[alarm]"
alarm_data["danger"] = max(alarm.local_danger_level, alarm.alarm_area.atmosalm-1)
alarm_data["danger"] = max(alarm.local_danger_level, alarm.areaMaster.atmosalm-1)
alarm_data["name"] = "[alarm]"
alarms+=list(alarm_data)
data["alarms"]=alarms
@@ -235,14 +235,14 @@
if(href_list["atmos_alarm"])
current.alarmActivated=1
current.alarm_area.updateDangerLevel()
current.areaMaster.updateDangerLevel()
spawn(1)
src.updateUsrDialog()
current.update_icon()
return
if(href_list["atmos_reset"])
current.alarmActivated=0
current.alarm_area.updateDangerLevel()
current.areaMaster.updateDangerLevel()
spawn(1)
src.updateUsrDialog()
current.update_icon()