From cfbd9d77b585cd5edca9b981c9541966d115f89b Mon Sep 17 00:00:00 2001
From: nemvar <47324920+nemvar@users.noreply.github.com>
Date: Thu, 30 May 2019 10:48:10 +0200
Subject: [PATCH] Update lighting.dm (#44164)

---
 code/modules/power/lighting.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 71d0aecce99..5ba594b8dce 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -353,7 +353,8 @@
 		else if (nightshift_enabled)
 			BR = nightshift_brightness
 			PO = nightshift_light_power
-			CO = nightshift_light_color
+			if(!color)
+				CO = nightshift_light_color
 		var/matching = light && BR == light.light_range && PO == light.light_power && CO == light.light_color
 		if(!matching)
 			switchcount++