diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs index fd9cf67c5a..0fa82c303f 100644 --- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs +++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs @@ -176,7 +176,7 @@ public sealed partial class DockingSystem // Check if there's no intersecting grids (AKA oh god it's docking at cargo). grids.Clear(); _mapManager.FindGridsIntersecting(targetGridXform.MapID, dockedBounds, ref grids); - if (grids.Any(o => o.Owner != targetGrid)) + if (grids.Any(o => o.Owner != targetGrid && o.Owner != targetGridXform.MapUid)) { continue; }