From 2ae4e807321b81bc0861e39e20f7541e1dc5c856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Ueti?= <52474532+Mirino97@users.noreply.github.com> Date: Mon, 27 Jun 2022 01:36:20 -0300 Subject: [PATCH] Fixes jetpacks not shutting off on lack of fuel (#9206) * Push * tolerance and reduced moles Co-authored-by: metalgearsloth --- Content.Server/Movement/Systems/JetpackSystem.cs | 5 +---- Content.Shared/Movement/Components/JetpackComponent.cs | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Content.Server/Movement/Systems/JetpackSystem.cs b/Content.Server/Movement/Systems/JetpackSystem.cs index 7a6db3c1d2..a25155dd80 100644 --- a/Content.Server/Movement/Systems/JetpackSystem.cs +++ b/Content.Server/Movement/Systems/JetpackSystem.cs @@ -1,10 +1,7 @@ using Content.Server.Atmos.Components; -using Content.Server.Atmos.EntitySystems; -using Content.Server.Movement.Components; using Content.Shared.Movement.Components; using Content.Shared.Movement.Systems; using Robust.Shared.Collections; -using Robust.Shared.GameStates; namespace Content.Server.Movement.Systems; @@ -31,7 +28,7 @@ public sealed class JetpackSystem : SharedJetpackSystem active.Accumulator -= UpdateCooldown; 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); continue; diff --git a/Content.Shared/Movement/Components/JetpackComponent.cs b/Content.Shared/Movement/Components/JetpackComponent.cs index d41999c087..c9c90a8706 100644 --- a/Content.Shared/Movement/Components/JetpackComponent.cs +++ b/Content.Shared/Movement/Components/JetpackComponent.cs @@ -8,7 +8,7 @@ namespace Content.Shared.Movement.Components; public sealed class JetpackComponent : Component { [ViewVariables(VVAccess.ReadWrite), DataField("moleUsage")] - public float MoleUsage = 0.048f; + public float MoleUsage = 0.012f; [ViewVariables, DataField("toggleAction", required: true)] public InstantAction ToggleAction = new();