From 5de30d13790300e70796f850d3913a186f9502b9 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 5 Mar 2024 21:08:44 +1100 Subject: [PATCH] Fix shuttle disabling on ftl (#25859) Branch moment. (cherry picked from commit 574c625d124ba086f03d327be28d961c680dbd73) --- .../Shuttles/Systems/ShuttleSystem.FasterThanLight.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index 7b0c1b7484a..f9ceab8f7b1 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -480,8 +480,10 @@ private void UpdateFTLArriving(Entity entity) { Disable(uid, component: body); } - - Enable(uid, component: body, shuttle: entity.Comp2); + else + { + Enable(uid, component: body, shuttle: entity.Comp2); + } } _thruster.DisableLinearThrusters(entity.Comp2);