From fc76ac01e0d2e4ae531a6bbf01b70bbc906a1338 Mon Sep 17 00:00:00 2001
From: Chinsky <krauchinsky@gmail.com>
Date: Wed, 18 Jun 2014 20:38:33 +0400
Subject: [PATCH] Nextgen lighting #2: Lights Can paint light tubes and bulbs
 with paint and stick in sockets to get colored lights.

---
 code/game/objects/items/weapons/paint.dm | 5 +++++
 code/modules/power/lighting.dm           | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm
index c3b00ed58c4..9802b76018d 100644
--- a/code/game/objects/items/weapons/paint.dm
+++ b/code/game/objects/items/weapons/paint.dm
@@ -177,6 +177,11 @@ datum/reagent/paint
 			return
 		T.color = color
 
+	reaction_obj(var/obj/O, var/volume)
+		..()
+		if(istype(O,/obj/item/weapon/light))
+			O.color = color
+
 	red
 		name = "Red Paint"
 		id = "paint_red"
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index baf5734db83..14a603c50c6 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -356,6 +356,7 @@
 				switchcount = L.switchcount
 				rigged = L.rigged
 				brightness = L.brightness
+				l_color = L.color
 				on = has_power()
 				update()
 
@@ -514,6 +515,7 @@
 	L.status = status
 	L.rigged = rigged
 	L.brightness = src.brightness
+	L.color = l_color
 
 	// light item inherits the switchcount, then zero it
 	L.switchcount = switchcount
@@ -540,6 +542,7 @@
 	L.status = status
 	L.rigged = rigged
 	L.brightness = brightness
+	L.color = l_color
 
 	// light item inherits the switchcount, then zero it
 	L.switchcount = switchcount