diff --git a/Content.Shared/_DV/Containers/ContentContainerSystem.cs b/Content.Shared/_DV/Containers/ContentContainerSystem.cs index 787adca8ae..d61eda059a 100644 --- a/Content.Shared/_DV/Containers/ContentContainerSystem.cs +++ b/Content.Shared/_DV/Containers/ContentContainerSystem.cs @@ -1,5 +1,6 @@ using System.Linq; using Content.Shared._DV.Polymorph; +using Content.Shared.Body.Organ; using Content.Shared.Intellicard; using Content.Shared.Mind.Components; using Robust.Shared.Containers; @@ -39,6 +40,14 @@ public sealed class ContentContainerSystem : EntitySystem { foreach (var entity in container.ContainedEntities) { + // We will end up recursing over each of our body parts, so + // we need to make sure that we don't end up dropping our + // own brain, since that can gain a MindContainer if it was + // operated on. + if (TryComp(entity, out var organ) + && organ.Body.HasValue) // Yeah so that's KINDA in use. + continue; + if (HasComp(entity)) { _found.Add(entity);