tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes jetpacks not shutting off on lack of fuel (#9206)

Browse Source 
* Push

* tolerance and reduced moles

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Júlio César Ueti
2022-06-27 01:36:20 -03:00
committed by GitHub
parent a73a6042d7
commit 2ae4e80732
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Movement/Systems/JetpackSystem.cs
View File

@@ -1,10 +1,7 @@
using Content.Server.Atmos.Components; using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Movement.Components;
using Content.Shared.Movement.Components; using Content.Shared.Movement.Components;
using Content.Shared.Movement.Systems; using Content.Shared.Movement.Systems;
using Robust.Shared.Collections; using Robust.Shared.Collections;
using Robust.Shared.GameStates;
namespace Content.Server.Movement.Systems; namespace Content.Server.Movement.Systems;
@@ -31,7 +28,7 @@ public sealed class JetpackSystem : SharedJetpackSystem
active.Accumulator -= UpdateCooldown; active.Accumulator -= UpdateCooldown;
var air = gasTank.RemoveAir(comp.MoleUsage); var air = gasTank.RemoveAir(comp.MoleUsage);
if (air == null || !MathHelper.CloseTo(air.TotalMoles, comp.MoleUsage, 0.1f)) if (air == null || !MathHelper.CloseTo(air.TotalMoles, comp.MoleUsage, 0.001f))
{ {
toDisable.Add(comp); toDisable.Add(comp);
continue; continue;

2
Content.Shared/Movement/Components/JetpackComponent.cs
View File

@@ -8,7 +8,7 @@ namespace Content.Shared.Movement.Components;
public sealed class JetpackComponent : Component public sealed class JetpackComponent : Component
{ {
[ViewVariables(VVAccess.ReadWrite), DataField("moleUsage")] [ViewVariables(VVAccess.ReadWrite), DataField("moleUsage")]
public float MoleUsage = 0.048f; public float MoleUsage = 0.012f;
[ViewVariables, DataField("toggleAction", required: true)] [ViewVariables, DataField("toggleAction", required: true)]
public InstantAction ToggleAction = new(); public InstantAction ToggleAction = new();