From 80fee95dab4ab852b43b711dd5828a2ce35048a8 Mon Sep 17 00:00:00 2001 From: John Ginnane Date: Wed, 4 Apr 2018 00:02:44 +0100 Subject: [PATCH 1/2] Fixed sometimes using items on full storage items (#36711) * Fixed sometimes using items on full storage items * Removed redundant code and fixed spray being used on container --- code/game/objects/items/storage/storage.dm | 4 +--- code/game/objects/structures/crates_lockers/closets.dm | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index 3c1789fb7f..ff1c1331e2 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -423,9 +423,7 @@ return //Robots can't interact with storage items. if(!can_be_inserted(W, 0 , user)) - if(contents.len >= storage_slots) //don't use items on the backpack if they don't fit - return 1 - return 0 + return 1 handle_item_insertion(W, 0 , user) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 8332f1b338..329de35307 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -207,7 +207,9 @@ /obj/structure/closet/attackby(obj/item/W, mob/user, params) if(user in src) return - if(!src.tool_interact(W,user)) + if(src.tool_interact(W,user)) + return 1 // No afterattack + else return ..() /obj/structure/closet/proc/tool_interact(obj/item/W, mob/user)//returns TRUE if attackBy call shouldnt be continued (because tool was used/closet was of wrong type), FALSE if otherwise