diff --git a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs index a39f6ba8ec..3797aa51a6 100644 --- a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs @@ -502,6 +502,17 @@ namespace Content.Server.GameObjects.Components.GUI return; } + var isOwnerContained = ContainerHelpers.TryGetContainer(Owner, out var ownerContainer); + var isPullableContained = ContainerHelpers.TryGetContainer(pullable.Owner, out var pullableContainer); + + if (isOwnerContained || isPullableContained) + { + if (ownerContainer != pullableContainer) + { + return; + } + } + if (IsPulling) { StopPull();