]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Allow shuttles on planets to make FTL jump (#33507)
authorMilenVolf <63782763+MilenVolf@users.noreply.github.com>
Sun, 24 Nov 2024 08:11:47 +0000 (11:11 +0300)
committerGitHub <noreply@github.com>
Sun, 24 Nov 2024 08:11:47 +0000 (11:11 +0300)
This check conflicts with an attempt to FTL from the planet before expedition ends

Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
Resources/Locale/en-US/shuttles/console.ftl

index d0aab9aad559b84d3e4a797b903fe72fb0f78752..c02d2564a9b9b31947416d786188a253445d196e 100644 (file)
@@ -234,12 +234,6 @@ public sealed partial class ShuttleSystem
 
         if (TryComp<PhysicsComponent>(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)
index 6143c9955296481b5f0c51a82b64b88947e28aea..80e61a281266db817e6cb51c2b7aacdc2caefbb7 100644 (file)
@@ -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