bugfix: Storage Afterattack Fix (ss220-space#5791)

Storage Afterattack Fix
Den109G · Aug 23, 2024 · 7e77649 · 7e77649
1 parent 18f7139
commit 7e77649
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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)