From e03585898dac183463d5beaecfa4aba869a82736 Mon Sep 17 00:00:00 2001
From: HarpyEagle <mwerezak@gmail.com>
Date: Mon, 24 Aug 2015 16:23:30 -0400
Subject: [PATCH] Cleans up flashlight fix

Moves icon state changes into update_icon(), less duplicated code. Also
makes glowing slime extracts less dumb.
---
 code/game/objects/items/devices/flashlight.dm | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index c9de89d29c..609bacc6c1 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -16,14 +16,9 @@
 
 /obj/item/device/flashlight/initialize()
 	..()
-	if(on)
-		icon_state = "[initial(icon_state)]-on"
-		set_light(brightness_on)
-	else
-		icon_state = "[initial(icon_state)]"
-		set_light(0)
+	update_icon()
 
-/obj/item/device/flashlight/proc/update_brightness(var/mob/user = null)
+/obj/item/device/flashlight/update_icon()
 	if(on)
 		icon_state = "[initial(icon_state)]-on"
 		set_light(brightness_on)
@@ -36,7 +31,7 @@
 		user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities.
 		return 0
 	on = !on
-	update_brightness(user)
+	update_icon()
 	return 1
 
 
@@ -165,11 +160,7 @@
 	on = 0
 	src.force = initial(src.force)
 	src.damtype = initial(src.damtype)
-	if(ismob(loc))
-		var/mob/U = loc
-		update_brightness(U)
-	else
-		update_brightness(null)
+	update_icon()
 
 /obj/item/device/flashlight/flare/attack_self(mob/user)
 
@@ -200,10 +191,11 @@
 	on = 1 //Bio-luminesence has one setting, on.
 
 /obj/item/device/flashlight/slime/New()
+	..()
 	set_light(brightness_on)
-	spawn(1) //Might be sloppy, but seems to be necessary to prevent further runtimes and make these work as intended... don't judge me!
-		update_brightness()
-		icon_state = initial(icon_state)
+
+/obj/item/device/flashlight/slime/update_icon()
+	return
 
 /obj/item/device/flashlight/slime/attack_self(mob/user)
 	return //Bio-luminescence does not toggle.