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

Added pop up message for single-use UI (#22573)

Browse Source
This commit is contained in:
chromiumboy
2023-12-16 08:40:24 -06:00
committed by GitHub
parent f136db1770
commit aa08cc3e53
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/UserInterface/ActivatableUISystem.cs
View File

@@ -5,6 +5,7 @@ using Content.Shared.Hands;
using Content.Shared.Hands.Components; using Content.Shared.Hands.Components;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Interaction.Events; using Content.Shared.Interaction.Events;
using Content.Shared.Popups;
using Content.Shared.UserInterface; using Content.Shared.UserInterface;
using Content.Shared.Verbs; using Content.Shared.Verbs;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
@@ -17,6 +18,7 @@ public sealed partial class ActivatableUISystem : EntitySystem
[Dependency] private readonly IAdminManager _adminManager = default!; [Dependency] private readonly IAdminManager _adminManager = default!;
[Dependency] private readonly ActionBlockerSystem _blockerSystem = default!; [Dependency] private readonly ActionBlockerSystem _blockerSystem = default!;
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!; [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -142,6 +144,9 @@ public sealed partial class ActivatableUISystem : EntitySystem
if (aui.SingleUser && (aui.CurrentSingleUser != null) && (actor.PlayerSession != aui.CurrentSingleUser)) if (aui.SingleUser && (aui.CurrentSingleUser != null) && (actor.PlayerSession != aui.CurrentSingleUser))
{ {
string message = Loc.GetString("machine-already-in-use", ("machine", uiEntity));
_popupSystem.PopupEntity(message, uiEntity, user);
// If we get here, supposedly, the object is in use. // If we get here, supposedly, the object is in use.
// Check with BUI that it's ACTUALLY in use just in case. // Check with BUI that it's ACTUALLY in use just in case.
// Since this could brick the object if it goes wrong. // Since this could brick the object if it goes wrong.

4
Resources/Locale/en-US/machine/machine.ftl
View File

@@ -22,4 +22,6 @@ two-way-lever-left = push left
two-way-lever-right = push right two-way-lever-right = push right
two-way-lever-cant = can't push the lever that way! two-way-lever-cant = can't push the lever that way!
recycler-count-items = Recycled {$items} objects. recycler-count-items = Recycled {$items} objects.
machine-already-in-use = {CAPITALIZE(THE($machine))} is already in use.