diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs index 4932613d0e640d..157a3839cb6d5f 100644 --- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs @@ -321,6 +321,13 @@ public bool CanInsert(EntityUid toInsert, EntityUid container, SharedEntityStora if (component.Contents.ContainedEntities.Count >= component.Capacity) return false; + // SS220 fix #1121 begin + SharedEntityStorageComponent? insertedComp = null; + + if (ResolveStorage(toInsert, ref insertedComp)) + return false; + // SS220 fix #1121 end + return CanFit(toInsert, container, component); }