From 64ddd6d2d9539a4d5c7431b48d097651606c7f3b Mon Sep 17 00:00:00 2001
From: "sieve32@gmail.com"
 <sieve32@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 23 Jul 2012 03:30:17 +0000
Subject: [PATCH] Fix for the lighting.dmi being misnamed, sorry about that

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4152 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/objects/devices/flashlight.dm |  2 +-
 code/game/objects/glowshroom.dm         |  2 +-
 code/modules/power/lighting.dm          | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm
index 1ae3a84b121..901216b5ff9 100644
--- a/code/game/objects/devices/flashlight.dm
+++ b/code/game/objects/devices/flashlight.dm
@@ -139,7 +139,7 @@
 /obj/item/device/flashlight/lamp
 	name = "desk lamp"
 	desc = "A desk lamp"
-	icon = 'icons/effects/lighting.dmi'
+	icon = 'icons/obj/lighting.dmi'
 	icon_state = "lamp0"
 	brightness_on = 5
 	icon_on = "lamp1"
diff --git a/code/game/objects/glowshroom.dm b/code/game/objects/glowshroom.dm
index 5f6b6466797..9a04308ccf7 100644
--- a/code/game/objects/glowshroom.dm
+++ b/code/game/objects/glowshroom.dm
@@ -5,7 +5,7 @@
 	anchored = 1
 	opacity = 0
 	density = 0
-	icon = 'icons/effects/lighting.dmi'
+	icon = 'icons/obj/lighting.dmi'
 	icon_state = "glowshroomf"
 	layer = 2.1
 	var/endurance = 30
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index a5fffd2b3cf..e0643937d06 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -14,7 +14,7 @@
 /obj/item/light_fixture_frame
 	name = "light fixture frame"
 	desc = "Used for building lights."
-	icon = 'icons/effects/lighting.dmi'
+	icon = 'icons/obj/lighting.dmi'
 	icon_state = "tube-construct-item"
 	flags = FPRINT | TABLEPASS| CONDUCT
 	var/fixture_type = "tube"
@@ -61,7 +61,7 @@
 /obj/item/light_fixture_frame/small
 	name = "small light fixture frame"
 	desc = "Used for building small lights."
-	icon = 'icons/effects/lighting.dmi'
+	icon = 'icons/obj/lighting.dmi'
 	icon_state = "bulb-construct-item"
 	flags = FPRINT | TABLEPASS| CONDUCT
 	fixture_type = "bulb"
@@ -70,7 +70,7 @@
 /obj/machinery/light_construct
 	name = "light fixture frame"
 	desc = "A light fixture under construction."
-	icon = 'icons/effects/lighting.dmi'
+	icon = 'icons/obj/lighting.dmi'
 	icon_state = "tube-construct-stage1"
 	anchored = 1
 	layer = 5
@@ -201,7 +201,7 @@
 /obj/machinery/light_construct/small
 	name = "small light fixture frame"
 	desc = "A small light fixture under construction."
-	icon = 'icons/effects/lighting.dmi'
+	icon = 'icons/obj/lighting.dmi'
 	icon_state = "bulb-construct-stage1"
 	anchored = 1
 	layer = 5
@@ -212,7 +212,7 @@
 // the standard tube light fixture
 /obj/machinery/light
 	name = "light fixture"
-	icon = 'icons/effects/lighting.dmi'
+	icon = 'icons/obj/lighting.dmi'
 	var/base_state = "tube"		// base description and icon_state
 	icon_state = "tube1"
 	desc = "A lighting fixture."
@@ -637,7 +637,7 @@
 // will fit into empty /obj/machinery/light of the corresponding type
 
 /obj/item/weapon/light
-	icon = 'icons/effects/lighting.dmi'
+	icon = 'icons/obj/lighting.dmi'
 	flags = FPRINT | TABLEPASS
 	force = 2
 	throwforce = 5