From 5496c7bbf01fcbda862a3d7e03ac79ebc69565c7 Mon Sep 17 00:00:00 2001
From: Chinsky <krauchinsky@gmail.com>
Date: Mon, 9 Feb 2015 08:05:24 +0300
Subject: [PATCH] Fixes #8009 Fixed flaslights producing infinite light/

---
 code/game/objects/items.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 13081d6abb..ce0e53f4b0 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -141,9 +141,10 @@
 		if(isliving(src.loc))
 			return
 		user.next_move = max(user.next_move+2,world.time + 2)
-	src.pickup(user)
 	add_fingerprint(user)
 	user.put_in_active_hand(src)
+	if(src.loc == user)
+		src.pickup(user)
 	return