From fb93f88fcae390d5cf27e2c4331a116a4e79c22a Mon Sep 17 00:00:00 2001
From: phil235 <phil235@users.noreply.github.com>
Date: Thu, 28 Apr 2016 01:45:44 +0200
Subject: [PATCH] Fixes weird shit happening when clickdragging things from
 your inventory into a closet to stuff it in. You can now only stuff mobs and
 items into closet, and you cannot stuff things that are inside something
 (mostly your inventory).

---
 .../structures/crates_lockers/closets.dm        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index a1e5baf8450..9dad7dabba2 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -266,13 +266,19 @@
 		return
 	if(user == O) //try to climb onto it
 		return ..()
-	if(!opened || istype(O, /obj/structure/closet))
+	if(!opened)
+		return
+	if(!isturf(O.loc))
 		return
 
+	var/actuallyismob = 0
+	if(isliving(O))
+		actuallyismob = 1
+	else if(!istype(O, /obj/item))
+		return
+	var/turf/T = get_turf(src)
 	var/list/targets = list(O, src)
 	add_fingerprint(user)
-	var/mob/living/L = O
-	var/actuallyismob = istype(L)
 	user.visible_message("<span class='warning'>[user] [actuallyismob ? "tries to ":""]stuff [O] into [src].</span>", \
 				 	 	"<span class='warning'>You [actuallyismob ? "try to ":""]stuff [O] into [src].</span>", \
 				 	 	"<span class='italics'>You hear clanging.</span>")
@@ -281,12 +287,13 @@
 			user.visible_message("<span class='notice'>[user] stuffs [O] into [src].</span>", \
 							 	 "<span class='notice'>You stuff [O] into [src].</span>", \
 							 	 "<span class='italics'>You hear a loud metal bang.</span>")
+			var/mob/living/L = O
 			if(!issilicon(L))
 				L.Weaken(2)
-			O.forceMove(get_turf(src))
+			O.forceMove(T)
 			close()
 	else
-		O.forceMove(get_turf(src))
+		O.forceMove(T)
 	return 1
 
 /obj/structure/closet/relaymove(mob/user)