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

Fixed delivery popups (#35724)

Browse Source 
* :)

* cool stuff
This commit is contained in:
ScarKy0
2025-03-08 22:08:41 +01:00
committed by GitHub
parent 6f39ee8688
commit e57325b797
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Delivery/SharedDeliverySystem.cs
View File

@@ -3,6 +3,7 @@ using Content.Shared.Shuttles.Components;
using Content.Shared.Examine;
using Content.Shared.FingerprintReader;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction.Events;
using Content.Shared.NameModifier.EntitySystems;
using Content.Shared.Popups;
@@ -107,7 +108,8 @@ public abstract class SharedDeliverySystem : EntitySystem
if (rewardMoney)
GrantSpesoReward(ent.AsNullable());
_popup.PopupPredicted(Loc.GetString("delivery-unlocked", ("delivery", deliveryName)), user, user);
_popup.PopupPredicted(Loc.GetString(Loc.GetString("delivery-unlocked-self", ("delivery", deliveryName))),
Loc.GetString("delivery-unlocked-others", ("delivery", deliveryName), ("recipient", Identity.Name(user, EntityManager)), ("possadj", user)), user, user);
return true;
}
@@ -131,7 +133,8 @@ public abstract class SharedDeliverySystem : EntitySystem
DirtyField(ent.Owner, ent.Comp, nameof(DeliveryComponent.IsOpened));
_popup.PopupPredicted(Loc.GetString("delivery-opened", ("delivery", deliveryName)), user, user);
_popup.PopupPredicted(Loc.GetString(Loc.GetString("delivery-opened-self", ("delivery", deliveryName))),
Loc.GetString("delivery-opened-others", ("delivery", deliveryName), ("recipient", Identity.Name(user, EntityManager)), ("possadj", user)), user, user);
if (!_container.TryGetContainer(ent, ent.Comp.Container, out var container))
return;

4
Content.Shared/FingerprintReader/FingerprintReaderSystem.cs
View File

@@ -31,7 +31,7 @@ public sealed class FingerprintReaderSystem : EntitySystem
if (!target.Comp.IgnoreGloves && TryGetBlockingGloves(user, out var gloves))
{
if (target.Comp.FailGlovesPopup != null)
_popup.PopupPredicted(Loc.GetString(target.Comp.FailGlovesPopup, ("blocker", gloves)), target, user);
_popup.PopupClient(Loc.GetString(target.Comp.FailGlovesPopup, ("blocker", gloves)), target, user);
return false;
}
@@ -40,7 +40,7 @@ public sealed class FingerprintReaderSystem : EntitySystem
!target.Comp.AllowedFingerprints.Contains(fingerprint.Fingerprint))
{
if (target.Comp.FailPopup != null)
_popup.PopupPredicted(Loc.GetString(target.Comp.FailPopup), target, user);
_popup.PopupClient(Loc.GetString(target.Comp.FailPopup), target, user);
return false;
}

6
Resources/Locale/en-US/delivery/delivery-component.ftl
View File

@@ -3,8 +3,10 @@ delivery-already-opened-examine = It was already opened.
delivery-recipient-no-name = Unnamed
delivery-recipient-no-job = Unknown
delivery-unlocked = You unlock the {$delivery} with your fingerprint.
delivery-opened = You open the {$delivery}.
delivery-unlocked-self = You unlock the {$delivery} with your fingerprint.
delivery-opened-self = You open the {$delivery}.
delivery-unlocked-others = {CAPITALIZE($recipient)} unlocked the {$delivery} with {POSS-ADJ($possadj)} fingerprint.
delivery-opened-others = {CAPITALIZE($recipient)} opened the {$delivery}.
delivery-unlock-verb = Unlock
delivery-open-verb = Open