From 9ff6937e212ec7e16953fca51c7010fbcc72a950 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Sat, 26 May 2012 00:13:32 +0100 Subject: [PATCH] TG: Fixed being able to pull hud objects out of the hud through morgue trays how many times are we going to have to fix this mousedrop proc for morgue trays? is it even that important to have? Revision: r3656 Author: quartz235 --- code/game/machinery/morgue.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/morgue.dm b/code/game/machinery/morgue.dm index 8c65e0a72f3..0e9f9bdc02a 100644 --- a/code/game/machinery/morgue.dm +++ b/code/game/machinery/morgue.dm @@ -123,7 +123,7 @@ return /obj/structure/m_tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) - if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src))) + if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O))) return if (!ismob(O) && !istype(O, /obj/structure/closet/body_bag)) return @@ -316,7 +316,9 @@ return /obj/structure/c_tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) - if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || istype(user, /mob/dead))) + if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O))) + return + if (!ismob(O) && !istype(O, /obj/structure/closet/body_bag)) return O.loc = src.loc if (user != O)