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

Merge pull request #7066 from Citadel-Station-13/upstream-merge-38366

Browse Source 
[MIRROR] Replace area-wide fire overlay with reddening the lights
This commit is contained in:
LetterJay
2018-06-12 07:38:13 -05:00
committed by GitHub
parent 158bf09a8d 0e9fd73bd7
commit e20db49269
4 changed files with 50 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/lighting.dm
+12 -4
View File
@@ -296,7 +296,8 @@
cut_overlays()
switch(status) // set icon_states
if(LIGHT_OK)
if(emergency_mode)
var/area/A = get_area(src)
if(emergency_mode || (A && A.fire))
icon_state = "[base_state]_emergency"
else
icon_state = "[base_state]"
@@ -319,9 +320,16 @@
on = FALSE
emergency_mode = FALSE
if(on)
var/BR = nightshift_enabled? nightshift_brightness : brightness
var/PO = nightshift_enabled? nightshift_light_power : bulb_power
var/CO = nightshift_enabled? nightshift_light_color : bulb_colour
var/BR = brightness
var/PO = bulb_power
var/CO = bulb_colour
var/area/A = get_area(src)
if (A && A.fire)
CO = bulb_emergency_colour
else if (nightshift_enabled)
BR = nightshift_brightness
PO = nightshift_light_power
CO = nightshift_light_color
var/matching = light && BR == light.light_range && PO == light.light_power && CO == light.light_color
if(!matching)
switchcount++