cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 10:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm
This commit is contained in:
Mloc-Argent
2014-06-30 23:44:46 +01:00
parent 1bc57b81a3 8724779dbf
commit 6630e4838e
13 changed files with 1748 additions and 1770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,12 +156,14 @@
src.updateUsrDialog()
return
if(href_list["atmos_unlock"])
switch(href_list["atmos_unlock"])
if("0")
current.air_doors_close(1)
if("1")
current.air_doors_open(1)
//commenting this out because it causes compile errors
//I tried fixing it but wasn't sucessful.
//if(href_list["atmos_unlock"])
// switch(href_list["atmos_unlock"])
// if("0")
// current.alarm_area.air_doors_close()
// if("1")
// current.alarm_area.air_doors_open()
if(href_list["atmos_alarm"])
if (current.alarm_area.atmosalert(2))