From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 12 Feb 2023 01:14:02 +0000 (+1300)
Subject: Don't remove item slots when terminating. (#14042)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e0dd65983eda9a32226e73e450f8b9a00d7c5b12;p=space-station-14.git

Don't remove item slots when terminating. (#14042)
---

diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
index f20fa53c60..059bf5cb4f 100644
--- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
+++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
@@ -111,7 +111,7 @@ namespace Content.Shared.Containers.ItemSlots
         /// </summary>
         public void RemoveItemSlot(EntityUid uid, ItemSlot slot, ItemSlotsComponent? itemSlots = null)
         {
-            if (slot.ContainerSlot == null)
+            if (Terminating(uid) || slot.ContainerSlot == null)
                 return;
 
             slot.ContainerSlot.Shutdown();