From 626313be1c6a3cc13df788f2130258137e16ed4b Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 22 Nov 2023 12:02:02 +1100
Subject: [PATCH] Fix docking FTL to planets being impossible (#21780)

---
 Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
                    }