]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix nuke disk erroneously being marked 'left behind' (#31602)
authorthemias <89101928+themias@users.noreply.github.com>
Wed, 28 Aug 2024 20:05:04 +0000 (16:05 -0400)
committerGitHub <noreply@github.com>
Wed, 28 Aug 2024 20:05:04 +0000 (14:05 -0600)
Fix erroneous 'disk left behind' objective

Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs

index 5f49557bed85c46ffd86310ac33cecf7863ea6d8..57239ee8c153c0d3af649520f9ec67c9975aa614 100644 (file)
@@ -215,9 +215,10 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
 
         var diskAtCentCom = false;
         var diskQuery = AllEntityQuery<NukeDiskComponent, TransformComponent>();
-        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.