Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix magboots FTL (#197)

Browse Source
This commit is contained in:
Aviu00
2023-07-12 19:36:43 +03:00
committed by Aviu00
parent 77fc40241b
commit 026c5fce0b
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
View File

@@ -6,6 +6,7 @@ using Content.Server.Shuttles.Events;
using Content.Server.Station.Systems; using Content.Server.Station.Systems;
using Content.Shared.Body.Components; using Content.Shared.Body.Components;
using Content.Shared.Buckle.Components; using Content.Shared.Buckle.Components;
using Content.Shared.Clothing;
using Content.Shared.Doors.Components; using Content.Shared.Doors.Components;
using Content.Shared.Ghost; using Content.Shared.Ghost;
using Content.Shared.Maps; using Content.Shared.Maps;
@@ -506,6 +507,11 @@ public sealed partial class ShuttleSystem
if (!_buckleQuery.TryGetComponent(child, out var buckle) || buckle.Buckled) if (!_buckleQuery.TryGetComponent(child, out var buckle) || buckle.Buckled)
continue; continue;
// WD
if (_inventory.TryGetSlotEntity(child, "shoes", out var shoes) &&
TryComp<MagbootsComponent>(shoes, out var magboots) && magboots.On)
continue;
toKnock.Add(child); toKnock.Add(child);
} }
} }

2
Content.Server/Shuttles/Systems/ShuttleSystem.cs
View File

@@ -5,6 +5,7 @@ using Content.Server.Shuttles.Components;
using Content.Server.Station.Systems; using Content.Server.Station.Systems;
using Content.Server.Stunnable; using Content.Server.Stunnable;
using Content.Shared.GameTicking; using Content.Shared.GameTicking;
using Content.Shared.Inventory;
using Content.Shared.Mobs.Systems; using Content.Shared.Mobs.Systems;
using Content.Shared.Shuttles.Systems; using Content.Shared.Shuttles.Systems;
using Content.Shared.Throwing; using Content.Shared.Throwing;
@@ -48,6 +49,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
[Dependency] private readonly ThrowingSystem _throwing = default!; [Dependency] private readonly ThrowingSystem _throwing = default!;
[Dependency] private readonly ThrusterSystem _thruster = default!; [Dependency] private readonly ThrusterSystem _thruster = default!;
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!; [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
[Dependency] private readonly InventorySystem _inventory = default!; // WD
public const float TileMassMultiplier = 0.5f; public const float TileMassMultiplier = 0.5f;