From 01ce1db6ffaa7963e04c8af0705dd83a0abe8786 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Fri, 18 Jul 2014 17:35:35 -0400
Subject: [PATCH] Fix drag and drop climbing, finally

---
 code/game/objects/structures.dm                        | 6 ++++--
 code/game/objects/structures/crates_lockers/closets.dm | 1 +
 code/game/objects/structures/tables_racks.dm           | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 12e57637a9f..58ed1202e64 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -40,8 +40,10 @@
 
 	do_climb(usr)
 
-/obj/structure/MouseDrop_T(atom/over_object)
-	do_climb(usr)
+/obj/structure/MouseDrop_T(var/atom/movable/C, mob/user as mob)
+	if(C == user)
+		do_climb(user)
+
 
 /obj/structure/proc/do_climb(var/mob/living/user)
 
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index d6e142aa1ea..bd6a2472562 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -286,6 +286,7 @@
 	return
 
 /obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
+	..()
 	if(istype(O, /obj/screen))	//fix for HUD elements making their way into the world	-Pete
 		return
 	if(O.loc == user)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 8aff2138920..7811235114b 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -352,6 +352,7 @@
 	return 1
 
 /obj/structure/table/MouseDrop_T(obj/O as obj, mob/user as mob)
+	..()
 	if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
 		return
 	if(isrobot(user))