Fixes Baystation12#8009

Fixed flaslights producing infinite light/
apophis775 · Feb 9, 2015 · 5496c7b · 5496c7b
1 parent 20da846
commit 5496c7b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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