cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22948 from Mervill/firealarm_real

Browse Source 
Fire alarms not on z-level one will always have green security status
This commit is contained in:
oranges
2017-01-14 11:51:14 +13:00
committed by GitHub
parent 08f830c416 904afda2bd
commit ed06acafd8
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/firealarm.dm
+11 -2
View File
@@ -62,7 +62,12 @@
if(stat & NOPOWER)
return
add_overlay("overlay_[security_level]")
if(src.z == ZLEVEL_STATION)
add_overlay("overlay_[security_level]")
else
//var/green = SEC_LEVEL_GREEN
add_overlay("overlay_[SEC_LEVEL_GREEN]")
if(detecting)
add_overlay("overlay_[A.fire ? "fire" : "clear"]")
else
@@ -115,7 +120,11 @@
/obj/machinery/firealarm/ui_data(mob/user)
var/list/data = list()
data["emagged"] = emagged
data["seclevel"] = get_security_level()
if(src.z == ZLEVEL_STATION)
data["seclevel"] = get_security_level()
else
data["seclevel"] = "green"
var/area/A = get_area(src)
data["alarm"] = A.fire