From a2d26ac0cad4f52ee4e19db6aca59f1f40eb944d Mon Sep 17 00:00:00 2001 From: Moony Date: Tue, 19 Jul 2022 22:57:05 -0500 Subject: [PATCH] The nuke must be anchored to arm. (#9898) --- Content.Client/Nuke/NukeMenu.xaml.cs | 2 +- Content.Server/Nuke/NukeSystem.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Client/Nuke/NukeMenu.xaml.cs b/Content.Client/Nuke/NukeMenu.xaml.cs index 644513a4a7..a71d410e8b 100644 --- a/Content.Client/Nuke/NukeMenu.xaml.cs +++ b/Content.Client/Nuke/NukeMenu.xaml.cs @@ -106,7 +106,7 @@ namespace Content.Client.Nuke EjectButton.Disabled = !state.DiskInserted || state.Status == NukeStatus.ARMED; AnchorButton.Disabled = state.Status == NukeStatus.ARMED; AnchorButton.Pressed = state.IsAnchored; - ArmButton.Disabled = !state.AllowArm; + ArmButton.Disabled = !state.AllowArm || !state.IsAnchored; } private string VisualizeCode(int codeLength, int maxLength) diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs index d41191c2b3..a44883d065 100644 --- a/Content.Server/Nuke/NukeSystem.cs +++ b/Content.Server/Nuke/NukeSystem.cs @@ -202,7 +202,7 @@ namespace Content.Server.Nuke if (!component.DiskSlot.HasItem) return; - if (component.Status == NukeStatus.AWAIT_ARM) + if (component.Status == NukeStatus.AWAIT_ARM && Transform(uid).Anchored) { ArmBomb(uid, component); }