From 397f440e10008b64aea4ab5956d6944cb3788902 Mon Sep 17 00:00:00 2001 From: XDTM Date: Wed, 4 Jan 2017 15:18:16 +0100 Subject: [PATCH] Fixes pockets --- code/game/objects/items/weapons/storage/storage.dm | 2 +- code/modules/clothing/clothing.dm | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index ea3016f92d0..a3b71e7a733 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -392,7 +392,7 @@ return //Robots can't interact with storage items. if(!can_be_inserted(W, 0 , user)) - return + return 0 handle_item_insertion(W, 0 , user) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 3e6a01c213c..1d79bcc2195 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -79,9 +79,10 @@ user << "You fix the damages on [src] with [C]." return 1 if(pockets) - return pockets.attackby(W, user, params) - else - return ..() + var/i = pockets.attackby(W, user, params) + if(i) + return i + return ..() /obj/item/clothing/AltClick(mob/user) if(pockets && pockets.quickdraw && pockets.contents.len && !user.incapacitated())