diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index 636470e2e5..fedebce3e3 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -6,6 +6,7 @@ using Content.Server.Shuttles.Events; using Content.Server.Station.Systems; using Content.Shared.Body.Components; using Content.Shared.Buckle.Components; +using Content.Shared.Clothing; using Content.Shared.Doors.Components; using Content.Shared.Ghost; using Content.Shared.Maps; @@ -506,6 +507,11 @@ public sealed partial class ShuttleSystem if (!_buckleQuery.TryGetComponent(child, out var buckle) || buckle.Buckled) continue; + // WD + if (_inventory.TryGetSlotEntity(child, "shoes", out var shoes) && + TryComp(shoes, out var magboots) && magboots.On) + continue; + toKnock.Add(child); } } diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs index 3e941e67b4..43799acadc 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs @@ -5,6 +5,7 @@ using Content.Server.Shuttles.Components; using Content.Server.Station.Systems; using Content.Server.Stunnable; using Content.Shared.GameTicking; +using Content.Shared.Inventory; using Content.Shared.Mobs.Systems; using Content.Shared.Shuttles.Systems; using Content.Shared.Throwing; @@ -48,6 +49,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem [Dependency] private readonly ThrowingSystem _throwing = default!; [Dependency] private readonly ThrusterSystem _thruster = default!; [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; + [Dependency] private readonly InventorySystem _inventory = default!; // WD public const float TileMassMultiplier = 0.5f;