tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The nuke must be anchored to arm. (#9898)

Browse Source
This commit is contained in:
Moony
2022-07-19 22:57:05 -05:00
committed by GitHub
parent ed3578b0a1
commit a2d26ac0ca
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Nuke/NukeMenu.xaml.cs
View File

@@ -106,7 +106,7 @@ namespace Content.Client.Nuke
EjectButton.Disabled = !state.DiskInserted || state.Status == NukeStatus.ARMED; EjectButton.Disabled = !state.DiskInserted || state.Status == NukeStatus.ARMED;
AnchorButton.Disabled = state.Status == NukeStatus.ARMED; AnchorButton.Disabled = state.Status == NukeStatus.ARMED;
AnchorButton.Pressed = state.IsAnchored; AnchorButton.Pressed = state.IsAnchored;
ArmButton.Disabled = !state.AllowArm; ArmButton.Disabled = !state.AllowArm || !state.IsAnchored;
} }
private string VisualizeCode(int codeLength, int maxLength) private string VisualizeCode(int codeLength, int maxLength)

2
Content.Server/Nuke/NukeSystem.cs
View File

@@ -202,7 +202,7 @@ namespace Content.Server.Nuke
if (!component.DiskSlot.HasItem) if (!component.DiskSlot.HasItem)
return; return;
if (component.Status == NukeStatus.AWAIT_ARM) if (component.Status == NukeStatus.AWAIT_ARM && Transform(uid).Anchored)
{ {
ArmBomb(uid, component); ArmBomb(uid, component);
} }