From 2c0abe3f709f78e25e9159b75b93c5470f6efedf Mon Sep 17 00:00:00 2001
From: Alex S <43192081+MemeProof@users.noreply.github.com>
Date: Sun, 19 Jul 2020 16:32:04 -0400
Subject: [PATCH] Fixes the ability to unweld inside containers (#1360)

---
 .../Components/Items/Storage/EntityStorageComponent.cs     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
index db6683ba39..04c103c2bf 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
+++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
@@ -357,12 +357,19 @@ namespace Content.Server.GameObjects.Components
             if (!CanWeldShut)
                 return false;
 
+            if (_contents.Contains(eventArgs.User))
+            {
+                Owner.PopupMessage(eventArgs.User, Loc.GetString("It's too Cramped!"));
+                return false;
+            }
+
             if (!eventArgs.Using.TryGetComponent(out WelderComponent tool))
                 return false;
 
             if (!tool.UseTool(eventArgs.User, Owner, ToolQuality.Welding, 1f))
                 return false;
 
+
             IsWeldedShut ^= true;
             return true;
         }