From 00034622c3f192c5d5822fd63092c804578909a0 Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:30:26 -0500 Subject: [PATCH] Nuke Now Requires the Disk to be Inserted to Toggle Anchor (#29565) * Nuke Now Requires the Disk to be Inserted to Toggle Anchor * message stating you need the disk to toggle floor bolts --- Content.Client/Nuke/NukeMenu.xaml.cs | 2 +- Content.Server/Nuke/NukeSystem.cs | 10 ++++++++++ Resources/Locale/en-US/nuke/nuke-component.ftl | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Content.Client/Nuke/NukeMenu.xaml.cs b/Content.Client/Nuke/NukeMenu.xaml.cs index b498d0e3bb..aa75758473 100644 --- a/Content.Client/Nuke/NukeMenu.xaml.cs +++ b/Content.Client/Nuke/NukeMenu.xaml.cs @@ -107,7 +107,7 @@ namespace Content.Client.Nuke FirstStatusLabel.Text = firstMsg; SecondStatusLabel.Text = secondMsg; - EjectButton.Disabled = !state.DiskInserted || state.Status == NukeStatus.ARMED; + EjectButton.Disabled = !state.DiskInserted || state.Status == NukeStatus.ARMED || !state.IsAnchored; AnchorButton.Disabled = state.Status == NukeStatus.ARMED; AnchorButton.Pressed = state.IsAnchored; ArmButton.Disabled = !state.AllowArm || !state.IsAnchored; diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs index 109d790be1..38c1070a8a 100644 --- a/Content.Server/Nuke/NukeSystem.cs +++ b/Content.Server/Nuke/NukeSystem.cs @@ -167,12 +167,21 @@ public sealed class NukeSystem : EntitySystem if (component.Status == NukeStatus.ARMED) return; + // Nuke has to have the disk in it to be moved + if (!component.DiskSlot.HasItem) + { + var msg = Loc.GetString("nuke-component-cant-anchor-toggle"); + _popups.PopupEntity(msg, uid, args.Actor, PopupType.MediumCaution); + return; + } + // manually set transform anchor (bypassing anchorable) // todo: it will break pullable system var xform = Transform(uid); if (xform.Anchored) { _transform.Unanchor(uid, xform); + _itemSlots.SetLock(uid, component.DiskSlot, true); } else { @@ -194,6 +203,7 @@ public sealed class NukeSystem : EntitySystem _transform.SetCoordinates(uid, xform, xform.Coordinates.SnapToGrid()); _transform.AnchorEntity(uid, xform); + _itemSlots.SetLock(uid, component.DiskSlot, false); } UpdateUserInterface(uid, component); diff --git a/Resources/Locale/en-US/nuke/nuke-component.ftl b/Resources/Locale/en-US/nuke/nuke-component.ftl index 981dd8b6ae..dfd56347ca 100644 --- a/Resources/Locale/en-US/nuke/nuke-component.ftl +++ b/Resources/Locale/en-US/nuke/nuke-component.ftl @@ -1,4 +1,5 @@ nuke-component-cant-anchor-floor = The anchoring bolts fail to lock into the floor! +nuke-component-cant-anchor-toggle = The nuclear authentication disk is required to toggle the floor bolts! nuke-component-announcement-sender = Nuclear Fission Explosive nuke-component-announcement-armed = Attention! The station's self-destruct mechanism has been engaged {$location}. {$time} seconds until detonation. If this was made in error, the mechanism may still be disarmed. nuke-component-announcement-unarmed = The station's self-destruct was deactivated! Have a nice day!