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

Nuke Now Requires the Disk to be Inserted to Toggle Anchor (#29565)

Browse Source 
* Nuke Now Requires the Disk to be Inserted to Toggle Anchor

* message stating you need the disk to toggle floor bolts
This commit is contained in:
Cojoke
2024-09-09 14:30:26 -05:00
committed by GitHub
parent f9aaf138b2
commit 00034622c3
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,7 +107,7 @@ namespace Content.Client.Nuke
FirstStatusLabel.Text = firstMsg; FirstStatusLabel.Text = firstMsg;
SecondStatusLabel.Text = secondMsg; 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.Disabled = state.Status == NukeStatus.ARMED;
AnchorButton.Pressed = state.IsAnchored; AnchorButton.Pressed = state.IsAnchored;
ArmButton.Disabled = !state.AllowArm || !state.IsAnchored; ArmButton.Disabled = !state.AllowArm || !state.IsAnchored;

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

@@ -167,12 +167,21 @@ public sealed class NukeSystem : EntitySystem
if (component.Status == NukeStatus.ARMED) if (component.Status == NukeStatus.ARMED)
return; 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) // manually set transform anchor (bypassing anchorable)
// todo: it will break pullable system // todo: it will break pullable system
var xform = Transform(uid); var xform = Transform(uid);
if (xform.Anchored) if (xform.Anchored)
{ {
_transform.Unanchor(uid, xform); _transform.Unanchor(uid, xform);
_itemSlots.SetLock(uid, component.DiskSlot, true);
} }
else else
{ {
@@ -194,6 +203,7 @@ public sealed class NukeSystem : EntitySystem
_transform.SetCoordinates(uid, xform, xform.Coordinates.SnapToGrid()); _transform.SetCoordinates(uid, xform, xform.Coordinates.SnapToGrid());
_transform.AnchorEntity(uid, xform); _transform.AnchorEntity(uid, xform);
_itemSlots.SetLock(uid, component.DiskSlot, false);
} }
UpdateUserInterface(uid, component); UpdateUserInterface(uid, component);

1
Resources/Locale/en-US/nuke/nuke-component.ftl
View File

@@ -1,4 +1,5 @@
nuke-component-cant-anchor-floor = The anchoring bolts fail to lock into the floor! 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-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-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! nuke-component-announcement-unarmed = The station's self-destruct was deactivated! Have a nice day!