juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make FTL constants in ShuttleSystem into cvars (#27706)

Browse Source 
* Make FTL constants in ShuttleSystem into cvars

* Fix tests
This commit is contained in:
DrSmugleaf
2024-05-11 00:00:15 -07:00
committed by GitHub
parent c81c1c1f1e
commit eed560bf3e
8 changed files with 84 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
View File

@@ -1,10 +1,8 @@
using System.Threading;
using Content.Server.DeviceNetwork;
using Content.Server.DeviceNetwork.Components;
using Content.Server.Screens.Components;
using Content.Server.Shuttles.Components;
using Content.Server.Shuttles.Events;
using Content.Shared.UserInterface;
using Content.Shared.Access;
using Content.Shared.CCVar;
using Content.Shared.Database;
@@ -13,6 +11,7 @@ using Content.Shared.Popups;
using Content.Shared.Shuttles.BUIStates;
using Content.Shared.Shuttles.Events;
using Content.Shared.Shuttles.Systems;
using Content.Shared.UserInterface;
using Robust.Shared.Map;
using Robust.Shared.Player;
using Timer = Robust.Shared.Timing.Timer;
@@ -131,7 +130,7 @@ public sealed partial class EmergencyShuttleSystem
private void UpdateEmergencyConsole(float frameTime)
{
// Add some buffer time so eshuttle always first.
var minTime = -(TransitTime - (ShuttleSystem.DefaultStartupTime + ShuttleSystem.DefaultTravelTime + 1f));
var minTime = -(TransitTime - (_shuttle.DefaultStartupTime + _shuttle.DefaultTravelTime + 1f));
// TODO: I know this is shit but I already just cleaned up a billion things.
@@ -157,7 +156,7 @@ public sealed partial class EmergencyShuttleSystem
}
// Imminent departure
if (!_launchedShuttles && _consoleAccumulator <= ShuttleSystem.DefaultStartupTime)
if (!_launchedShuttles && _consoleAccumulator <= _shuttle.DefaultStartupTime)
{
_launchedShuttles = true;