From 623b2a101a5e4f0df51f9ec4ae46a5a69121c1f8 Mon Sep 17 00:00:00 2001
From: Kara <lunarautomaton6@gmail.com>
Date: Fri, 6 May 2022 03:59:03 -0700
Subject: [PATCH] Fix storage interactions not preventing afterinteract for the
 item (#7973)

---
 Content.Server/Storage/EntitySystems/StorageSystem.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Storage/EntitySystems/StorageSystem.cs b/Content.Server/Storage/EntitySystems/StorageSystem.cs
index 847695f0ed..0b013babfc 100644
--- a/Content.Server/Storage/EntitySystems/StorageSystem.cs
+++ b/Content.Server/Storage/EntitySystems/StorageSystem.cs
@@ -185,6 +185,9 @@ namespace Content.Server.Storage.EntitySystems
         /// <returns>true if inserted, false otherwise</returns>
         private void OnInteractUsing(EntityUid uid, ServerStorageComponent storageComp, InteractUsingEvent args)
         {
+            if (args.Handled)
+                return;
+
             if (!storageComp.ClickInsert)
                 return;
 
@@ -193,7 +196,8 @@ namespace Content.Server.Storage.EntitySystems
             if (HasComp<PlaceableSurfaceComponent>(uid))
                 return;
 
-            PlayerInsertHeldEntity(uid, args.User, storageComp);
+            if (PlayerInsertHeldEntity(uid, args.User, storageComp))
+                args.Handled = true;
         }
 
         /// <summary>