-Reverted my change with the camera in Misc Research. I'm sorry I didn't know it was used for the nearby telescreen.

-General improvements to the flare and I decreased the flare fuel. I keep under-estimating how long it lasts and I'm sorry for always changing it. I tested it in game and I'm happy with the duration.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5219 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/items/devices/flashlight.dm

@@ -39,10 +39,10 @@
 /obj/item/device/flashlight/attack_self(mob/user)
 	if(!isturf(user.loc))
 		user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities.
-		return
+		return 0
 	on = !on
 	update_brightness(user)
-	return
+	return 1
 
 
 /obj/item/device/flashlight/attack(mob/living/M as mob, mob/living/user as mob)
@@ -153,12 +153,13 @@
 	var/produce_heat = 1500
 
 /obj/item/device/flashlight/flare/New()
-	fuel = rand(1500, 2000) // Last 10 to 15 minutes.
+	fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
 	..()
 
 /obj/item/device/flashlight/flare/process()
 	var/turf/pos = get_turf(src)
-	pos.hotspot_expose(produce_heat, 5)
+	if(pos)
+		pos.hotspot_expose(produce_heat, 5)
 	fuel = max(fuel - 1, 0)
 	if(!fuel || !on)
 		turn_off()
@@ -177,19 +178,18 @@
 		update_brightness(null)
 
 /obj/item/device/flashlight/flare/attack_self(mob/user)
+
 	// Usual checks
-	if(loc != usr)
-		return
 	if(!fuel)
 		user << "<span class='notice'>It's out of fuel.</span>"
 		return
-	if(!on)
-		user.visible_message("<span class='notice'>[user] activates the flare.</span>", "<span class='notice'>You pull the cord on the flare, activating it!</span>")
-	else
+	if(on)
 		return
+
+	. = ..()
 	// All good, turn it on.
-	on = 1
-	update_brightness(user)
-	src.force = on_damage
-	src.damtype = "fire"
-	processing_objects += src
+	if(.)
+		user.visible_message("<span class='notice'>[user] activates the flare.</span>", "<span class='notice'>You pull the cord on the flare, activating it!</span>")
+		src.force = on_damage
+		src.damtype = "fire"
+		processing_objects += src