shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7600 from Poojawa/fire_alarm_vis

Browse Source 
Fire Alarms are visible in the dark
This commit is contained in:
deathride58
2018-09-28 20:21:49 -04:00
committed by GitHub
parent 7740369d10 0bb40b3317
commit 141e47ea66
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/firealarm.dm
+20 -17
View File
@@ -57,32 +57,35 @@
/obj/machinery/firealarm/update_icon()
cut_overlays()
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
var/area/A = src.loc
A = A.loc
if(panel_open)
icon_state = "fire_b[buildstage]"
return
else
if(stat & BROKEN)
icon_state = "firex"
return
if(stat & NOPOWER)
icon_state = "fire0"
return
if(stat & BROKEN)
icon_state = "firex"
return
if(is_station_level(z))
add_overlay("overlay_[GLOB.security_level]")
SSvis_overlays.add_vis_overlay(src, icon, "overlay_[GLOB.security_level]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
else
add_overlay("overlay_[SEC_LEVEL_GREEN]")
SSvis_overlays.add_vis_overlay(src, icon, "overlay_[SEC_LEVEL_GREEN]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
if(stat & NOPOWER)
return
if(is_station_level(z))
add_overlay("overlay_[GLOB.security_level]")
else
add_overlay("overlay_[SEC_LEVEL_GREEN]")
if(detecting)
add_overlay("overlay_[A.fire ? "fire" : "clear"]")
else
add_overlay("overlay_fire")
if(detecting)
add_overlay("overlay_[A.fire ? "fire" : "clear"]")
SSvis_overlays.add_vis_overlay(src, icon, "overlay_[A.fire ? "fire" : "clear"]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
else
add_overlay("overlay_fire")
SSvis_overlays.add_vis_overlay(src, icon, "overlay_fire", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
/obj/machinery/firealarm/emp_act(severity)
. = ..()