From d4c8c14bb1783e4b1f1d05b28e485ea68d69c41c Mon Sep 17 00:00:00 2001
From: "giacomand@gmail.com"
 <giacomand@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Thu, 26 Jul 2012 01:58:23 +0000
Subject: [PATCH] -Fixed issue 658 -Changed the way light fixtures are
 constructed. You do not need a light to finish it and instead it will just
 create an empty light fixture, when you perform the final step.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4177 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/modules/power/lighting.dm | 58 ++++++++++++----------------------
 1 file changed, 21 insertions(+), 37 deletions(-)

diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index e0643937d0..49f7f63972 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -159,43 +159,18 @@
 			user.visible_message("[user.name] closes [src]'s casing.", \
 				"You close [src]'s casing.", "You hear a noise.")
 			playsound(src.loc, 'Screwdriver.ogg', 75, 1)
-			return
-		else if (src.stage == 3)
-			switch(fixture_type)
-				if ("tube")
-					src.icon_state = "tube-construct-stage2"
-				if("bulb")
-					src.icon_state = "bulb-construct-stage2"
-			user.visible_message("[user.name] opens [src]'s casing.", \
-				"You open [src]'s casing.", "You hear a noise.")
-			playsound(src.loc, 'Screwdriver.ogg', 75, 1)
-			src.stage = 2
-			return
 
-	if(istype(W, /obj/item/weapon/light/))
-		if (istype(W, /obj/item/weapon/light/tube) && !(fixture_type == "tube")) return
-		if (istype(W, /obj/item/weapon/light/bulb) && !(fixture_type == "bulb")) return
-		if (src.stage != 3) return
-		switch(fixture_type)
-			if("tube")
-				newlight = new /obj/machinery/light(src.loc)
-			if ("bulb")
-				newlight = new /obj/machinery/light/small(src.loc)
-		var/obj/item/weapon/light/L = W
-		newlight.status = L.status
-		newlight.switchcount = L.switchcount
-		newlight.rigged = L.rigged
-		newlight.brightness = L.brightness
-		newlight.dir = src.dir
-		newlight.on = newlight.has_power()
-		newlight.fingerprints = src.fingerprints
-		newlight.fingerprintshidden = src.fingerprintshidden
-		newlight.fingerprintslast = src.fingerprintslast
-		user.visible_message("[user.name] adds a light tube to [src], finishing it.", \
-			"You finish [src].")
-		del(W)
-		del(src)
-		return
+			switch(fixture_type)
+
+				if("tube")
+					newlight = new /obj/machinery/light/built(src.loc)
+				if ("bulb")
+					newlight = new /obj/machinery/light/small/built(src.loc)
+
+			newlight.dir = src.dir
+			src.transfer_fingerprints_to(newlight)
+			del(src)
+			return
 	..()
 
 /obj/machinery/light_construct/small
@@ -251,6 +226,15 @@
 	light_type = /obj/item/weapon/light/tube/large
 	brightness = 15
 
+/obj/machinery/light/built/New()
+	status = LIGHT_EMPTY
+	update(0)
+	..()
+
+/obj/machinery/light/small/built/New()
+	status = LIGHT_EMPTY
+	update(0)
+	..()
 
 // create a new lighting fixture
 /obj/machinery/light/New()
@@ -271,7 +255,7 @@
 				if(prob(25))
 					broken(1)
 		spawn(1)
-			update()
+			update(0)
 
 /obj/machinery/light/Del()
 	var/area/A = get_area(src)