From 3f66d897a2a90490b5f1480a3efb1bbcf304bfd7 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Mon, 4 Jun 2012 22:19:59 +0000 Subject: [PATCH] - Only humans can now use the 'pick up' verb - 'pick up' verb now checks if you hands are actually empty before executing an attack_hand() on the item it's tied to. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3740 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 98ff3eca882..a5a0d6ec33f 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -311,12 +311,18 @@ /obj/item/verb/verb_pickup() set src in oview(1) set category = "Object" - set name = "Pickup" + set name = "Pick up" if(!usr.canmove || usr.stat || usr.restrained()) return - src.attack_hand(usr) + if(ishuman(usr)) + 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." /obj/item/device icon = 'device.dmi'