From 07fb3f1eb8a7530d1501607da8ada58a7126e64a Mon Sep 17 00:00:00 2001 From: CaelAislinn Date: Fri, 13 Jan 2012 21:51:16 +1000 Subject: [PATCH] fixed error from using a grab on a disposal chute Signed-off-by: CaelAislinn --- code/modules/recycling/disposal.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index f225048346..897f472a2d 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -44,6 +44,10 @@ if(stat & BROKEN) return + //robots shouldn't be able to grab/carry stuff anyway + if(isrobot(user)) + return + if(istype(I, /obj/item/weapon/melee/energy/blade)) user << "You can't place that item inside the disposal unit." return @@ -91,10 +95,6 @@ for (var/mob/C in viewers(src)) C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3) del(G) - - if(isrobot(user)) - return - else if(!I || isnull(I)) //CRASH("disposal/attackby() was called, but I was nulled before calling user.drop_item()")