cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4845 from CHOMPStation2/upstream-merge-13660

Browse Source 
[MIRROR] Bugfix Palooza
This commit is contained in:
Nadyr
2022-09-04 18:40:29 -04:00
committed by GitHub
parent 1d132f5aec 33581397f3
commit a06f70b32b
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/power/lighting.dm
View File

@@ -422,6 +422,7 @@ var/global/list/light_type_cache = list()
if(!shows_alerts)
return
current_alert = "atmos"
light_color = "#6D6DFC"
brightness_color = "#6D6DFC"
update()
@@ -429,6 +430,7 @@ var/global/list/light_type_cache = list()
if(!shows_alerts)
return
current_alert = "fire"
light_color = "#FF3030"
brightness_color = "#FF3030"
update()
@@ -462,6 +464,10 @@ var/global/list/light_type_cache = list()
var/correct_range = nightshift_enabled ? brightness_range_ns : brightness_range
var/correct_power = nightshift_enabled ? brightness_power_ns : brightness_power
var/correct_color = nightshift_enabled ? brightness_color_ns : brightness_color
if(current_alert) //Oh no, we're on fire! Or the atmos is bad! Let's change the color
correct_range = brightness_range
correct_power = brightness_power
correct_color = brightness_color
if(light_range != correct_range || light_power != correct_power || light_color != correct_color)
if(!auto_flicker)
switchcount++
@@ -490,8 +496,7 @@ var/global/list/light_type_cache = list()
else
update_use_power(USE_POWER_IDLE)
set_light(0)
update_icon()
update_light() //VOREStation Edit - Makes lights update when their color is changed.
update_active_power_usage((light_range * light_power) * LIGHTING_POWER_FACTOR)
/obj/machinery/light/proc/nightshift_mode(var/state)