From bff8bbc48d7b2ef70c92a1101ffc49dbf64f54cd Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Fri, 3 Aug 2012 17:34:45 +0000 Subject: [PATCH] -Fixed Issue 590, the pick up verb will now use Click() instead of bypassing all the checks. This will stop people being able to pick up items that are on the other side of a window. -Fixed Issue 391, I've added the mule bot to the get_mobs_in_view() proc. But like most other atoms that has a mob inside it's contents, the mob will be unable to see emotes such as "X has punched Y". git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4303 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj.dm | 6 +++++- code/defines/procs/gamehelpers.dm | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 95334e908e3..45f7c304dfc 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -350,14 +350,18 @@ set category = "Object" set name = "Pick up" - if(!usr.canmove || usr.stat || usr.restrained()) + if(!usr.canmove || usr.stat || usr.restrained() || !in_range(src, usr)) return if(ishuman(usr)) + if(usr.get_active_hand() == null) + src.Click() // Let me know if this has any problems -Giacom + /* if(usr.get_active_hand() == null) src.attack_hand(usr) else usr << "\red You already have something in your hand." + */ else usr << "\red This mob type can't use this verb." diff --git a/code/defines/procs/gamehelpers.dm b/code/defines/procs/gamehelpers.dm index 8106f179712..7f71dc3a4f3 100644 --- a/code/defines/procs/gamehelpers.dm +++ b/code/defines/procs/gamehelpers.dm @@ -133,6 +133,14 @@ if(M.client) hear += M + // Search for Mulebots. A person might be riding in it's load. + for(var/obj/machinery/bot/mulebot/C in V) + if(C.load && ismob(C.load)) + if(isInSight(source,C)) + var/mob/M = C.load + if(M.client) + hear += M + // Cryos: for(var/obj/machinery/atmospherics/unary/cryo_cell/C in V) if(C.occupant)