From 15cdc436d5da9d478c5c57692cdfad2bfbd3479e Mon Sep 17 00:00:00 2001
From: Toastical <20125180+Toastical@users.noreply.github.com>
Date: Tue, 12 Aug 2025 06:23:07 +0300
Subject: [PATCH] fix extinguishers not going into backpack when safety is off
 (#30055)

* fix extinguishers not going into backpack when safety is off

* Update code/game/objects/items/weapons/extinguisher.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Toastical <20125180+Toastical@users.noreply.github.com>

---------

Signed-off-by: Toastical <20125180+Toastical@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
---
 code/game/objects/items/weapons/extinguisher.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index b727ef688cc..c2cc74c0ed6 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -89,6 +89,9 @@
 
 /obj/item/extinguisher/interact_with_atom(atom/target, mob/living/user, list/modifiers)
 	. = ..()
+	if(isstorage(target) || istype(target, /atom/movable/screen))
+		return
+
 	if(attempt_refill(target, user))
 		return ITEM_INTERACT_COMPLETE