From 9b60d7b2636bbe42eccc71ac484fd8e6d8ab79a8 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 12 Apr 2023 19:05:55 +1000 Subject: [PATCH] Fix emergency docking config (#15346) --- Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs index 6efdaedc0a..5f4983cf98 100644 --- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs @@ -64,6 +64,8 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem private bool _emergencyShuttleEnabled; + private const string DockTag = "DockEmergency"; + public override void Initialize() { _sawmill = Logger.GetSawmill("shuttle.emergency"); @@ -125,7 +127,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem if (targetGrid == null) return; - var config = _dock.GetDockingConfig(stationData.EmergencyShuttle.Value, targetGrid.Value); + var config = _dock.GetDockingConfig(stationData.EmergencyShuttle.Value, targetGrid.Value, DockTag); if (config == null) return; @@ -162,7 +164,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem var xformQuery = GetEntityQuery(); - if (_shuttle.TryFTLDock(stationData.EmergencyShuttle.Value, shuttle, targetGrid.Value)) + if (_shuttle.TryFTLDock(stationData.EmergencyShuttle.Value, shuttle, targetGrid.Value, DockTag)) { if (TryComp(targetGrid.Value, out var targetXform)) { -- 2.51.2