Skip to content

feat/fix: differentiate PDA vibration popup recipients #2034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
re-silvered wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −7
Open

feat/fix: differentiate PDA vibration popup recipients #2034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 31 additions & 6 deletions Content.Shared/PDA/SharedRingerSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,37 @@ private void StartRingtone(Entity<RingerComponent> ent)

UpdateRingerUi(ent);

_popup.PopupPredicted(Loc.GetString("comp-ringer-vibration-popup"),
ent,
ent.Owner,
Filter.Pvs(ent, 0.05f),
false,
PopupType.Medium);
// Hardlight start - differentiate ringer popup text recipients.
EntityUid? recipient = null;
string? ownerName = null;

if (TryComp<PdaComponent>(ent.Owner, out var pda))
{
recipient = pda.PdaOwner;
ownerName = pda.OwnerName;
}

var selfMessage = Loc.GetString("comp-ringer-vibration-popup-self");
var othersMessage = ownerName != null
? Loc.GetString("comp-ringer-vibration-popup-other-owner", ("owner", ownerName))
: Loc.GetString("comp-ringer-vibration-popup-other-unknown"); // Fallback if no owner.

if (recipient != null)
{
_popup.PopupEntity(selfMessage, ent.Owner, recipient.Value, PopupType.Medium);

_popup.PopupEntity(
othersMessage,
ent.Owner,
Filter.PvsExcept(recipient.Value, entityManager: EntityManager),
true,
PopupType.Small);
}
else
{
_popup.PopupPredicted(selfMessage, othersMessage, ent.Owner, recipient, PopupType.Medium);
}
// Hardlight end

DirtyFields(ent.AsNullable(),
null,
Expand Down
6 changes: 5 additions & 1 deletion Resources/Locale/en-US/pda/Ringer/ringer-component.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@

# For the PDA Ringer screen

comp-ringer-vibration-popup = Your PDA vibrates
# Hardlight start
comp-ringer-vibration-popup-self = Your PDA vibrates
comp-ringer-vibration-popup-other-owner = {$owner}'s PDA vibrates
comp-ringer-vibration-popup-other-unknown = A nearby PDA rings
# Hardlight end

comp-ringer-ui-menu-title = Ringtone

Expand Down
Loading