From 04cd32c9609d6cc8bc7c954ac2085a7a5479ae14 Mon Sep 17 00:00:00 2001
From: haiwwkes <49613070+rhailrake@users.noreply.github.com>
Date: Wed, 30 Oct 2024 12:41:30 +0500
Subject: [PATCH] fix phys on shuttles (#543)

---
 Content.Server/GameTicking/GameTicker.RoundFlow.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 5640e53d8dc..228b5b874e0 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -5,6 +5,7 @@
 using Content.Server.Ghost;
 using Content.Server.Maps;
 using Content.Server.Roles;
+using Content.Server.Shuttles.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.GameTicking;
@@ -194,6 +195,9 @@ public IReadOnlyList<EntityUid> LoadGameMap(GameMapPrototype map, MapId targetMa
                 var grids = _mapManager.GetAllMapGrids(targetMapId);
                 foreach (var grid in grids)
                 {
+                    if (HasComp<ShuttleComponent>(grid.Owner))
+                        continue;
+
                     _physics.SetBodyType(grid.Owner, BodyType.Static);
                 }
             }