From: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Date: Sun, 24 Nov 2024 08:11:47 +0000 (+0300) Subject: Allow shuttles on planets to make FTL jump (#33507) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=aa80a88cc4c530178ab9971c87160c4d7b3c91ec;p=space-station-14.git Allow shuttles on planets to make FTL jump (#33507) This check conflicts with an attempt to FTL from the planet before expedition ends --- diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index d0aab9aad5..c02d2564a9 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -234,12 +234,6 @@ public sealed partial class ShuttleSystem if (TryComp(shuttleUid, out var shuttlePhysics)) { - // Static physics type is set when station anchor is enabled - if (shuttlePhysics.BodyType == BodyType.Static) - { - reason = Loc.GetString("shuttle-console-static"); - return false; - } // Too large to FTL if (FTLMassLimit > 0 && shuttlePhysics.Mass > FTLMassLimit) diff --git a/Resources/Locale/en-US/shuttles/console.ftl b/Resources/Locale/en-US/shuttles/console.ftl index 6143c99552..80e61a2812 100644 --- a/Resources/Locale/en-US/shuttles/console.ftl +++ b/Resources/Locale/en-US/shuttles/console.ftl @@ -4,7 +4,6 @@ shuttle-pilot-end = Stopped piloting shuttle-console-in-ftl = Currently in FTL shuttle-console-mass = Too large to FTL shuttle-console-prevent = You are unable to pilot this ship -shuttle-console-static = Grid is static # NAV