Fix drag and drop climbing, finally

This commit is contained in:
ZomgPonies
2014-07-18 17:35:35 -04:00
parent 19d2d549e2
commit 01ce1db6ff
3 changed files with 6 additions and 2 deletions
+4 -2
View File
@@ -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)
@@ -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)
@@ -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))