From 7e776497368b4faeb83742a86d0f8fe2d0184f2e Mon Sep 17 00:00:00 2001 From: Zwei <35403274+Gottfrei@users.noreply.github.com> Date: Fri, 23 Aug 2024 13:39:58 +0300 Subject: [PATCH] bugfix: Storage Afterattack Fix (#5791) Storage Afterattack Fix --- code/game/objects/items/weapons/extinguisher.dm | 2 +- code/game/objects/items/weapons/storage/storage.dm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index acb7e7906bf..bf6b3406a17 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -107,7 +107,7 @@ /obj/item/extinguisher/afterattack(atom/target, mob/user, flag, params) . = ..() //TODO; Add support for reagents in water. - if(target.loc == user || isstorage(loc))//No more spraying yourself when putting your extinguisher away + if(target.loc == user)//No more spraying yourself when putting your extinguisher away return if(safety) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 52633f3c4ac..a145c446b2a 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -506,19 +506,19 @@ return . if(istype(I, /obj/item/hand_labeler)) var/obj/item/hand_labeler/labeler = I - if(labeler.mode) + if(labeler.mode) // labeling with afterattack return . - . |= ATTACK_CHAIN_BLOCKED if(isrobot(user)) - return .|ATTACK_CHAIN_NO_AFTERATTACK //Robots can't interact with storage items. + return .|ATTACK_CHAIN_BLOCKED_ALL //Robots can't interact with storage items. if(!can_be_inserted(I)) if(length(contents) >= storage_slots) //don't use items on the backpack if they don't fit - return .|ATTACK_CHAIN_NO_AFTERATTACK + return .|ATTACK_CHAIN_BLOCKED_ALL return . handle_item_insertion(I) + return .|ATTACK_CHAIN_BLOCKED_ALL /obj/item/storage/attack_hand(mob/user)