From b9db87ac2be0bd7c92df32ebc22930bd48a66677 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Mon, 28 Nov 2022 15:33:59 +1300
Subject: [PATCH] Fix Implant exception (#12785)

---
 Content.Shared/Implants/SharedSubdermalImplantSystem.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
index 858748255d..58ec2348a2 100644
--- a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
+++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
@@ -56,18 +56,19 @@ public abstract class SharedSubdermalImplantSystem : EntitySystem
 
     private void OnRemove(EntityUid uid, SubdermalImplantComponent component, EntGotRemovedFromContainerMessage args)
     {
-        if (component.ImplantedEntity == null)
+        if (component.ImplantedEntity == null || Terminating(component.ImplantedEntity.Value))
             return;
 
-        var entCoords = Transform(component.ImplantedEntity.Value).Coordinates;
-
         if (component.ImplantAction != null)
             _actionsSystem.RemoveProvidedActions(component.ImplantedEntity.Value, uid);
 
         if (!_container.TryGetContainer(uid, BaseStorageId, out var storageImplant))
             return;
 
-        _container.EmptyContainer(storageImplant, moveTo: entCoords);
+        var entCoords = Transform(component.ImplantedEntity.Value).Coordinates;
+
+        // TODO add variant of empty container that dumpes entities into parent containers OR grid OR Map
+        _container.EmptyContainer(storageImplant, true, entCoords, true, EntityManager);
     }
 
     /// <summary>