From 03dc2700065bc09feb0d9e8ebb32f05b951fb91c Mon Sep 17 00:00:00 2001
From: Erthilo <erthilo@gmail.com>
Date: Mon, 21 May 2012 20:42:15 +0100
Subject: [PATCH] TG: Fix for dragging HUD elements into lockers. Revision:
 r3635 Author: 	 petethegoat

---
 code/game/objects/closets.dm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/closets.dm b/code/game/objects/closets.dm
index 1345a4183a..88091cd034 100644
--- a/code/game/objects/closets.dm
+++ b/code/game/objects/closets.dm
@@ -168,6 +168,10 @@
 	return
 
 /obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
+	if(istype(O, /obj/screen) || istype(O, /obj/hud))	//fix for HUD elements making their way into the world	-Pete
+		return
+	if(O.loc == user)
+		return
 	if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis)
 		return
 	if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)))
@@ -182,7 +186,7 @@
 		return
 	step_towards(O, src.loc)
 	if(user != O)
-		user.show_viewers(text("\red [] stuffs [] into []!", user, O, src))
+		user.show_viewers("\red [user] stuffs [O] into [src]!")
 	src.add_fingerprint(user)
 	return