From bea72106b74c46db46f594466d8816fdd6071d80 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:05:04 -0400 Subject: [PATCH] Fix nuke disk erroneously being marked 'left behind' (#31602) Fix erroneous 'disk left behind' objective --- Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs index 5f49557bed..57239ee8c1 100644 --- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs @@ -215,9 +215,10 @@ public sealed class NukeopsRuleSystem : GameRuleSystem var diskAtCentCom = false; var diskQuery = AllEntityQuery(); - while (diskQuery.MoveNext(out _, out var transform)) + while (diskQuery.MoveNext(out var diskUid, out _, out var transform)) { diskAtCentCom = transform.MapUid != null && centcomms.Contains(transform.MapUid.Value); + diskAtCentCom |= _emergency.IsTargetEscaping(diskUid); // TODO: The target station should be stored, and the nuke disk should store its original station. // This is fine for now, because we can assume a single station in base SS14. -- 2.51.2