|
3 | 3 | using Content.Shared.Hands;
|
4 | 4 | using Content.Shared.Hands.Components;
|
5 | 5 | using Content.Shared.Hands.EntitySystems;
|
| 6 | +using Content.Shared.IdentityManagement; |
6 | 7 | using Content.Shared.Interaction.Events;
|
7 | 8 | using Content.Shared.Inventory.VirtualItem;
|
8 | 9 | using Content.Shared.Item;
|
@@ -125,7 +126,7 @@ private void OnExamineRequires(Entity<GunRequiresWieldComponent> entity, ref Exa
|
125 | 126 |
|
126 | 127 | private void OnExamine(EntityUid uid, GunWieldBonusComponent component, ref ExaminedEvent args)
|
127 | 128 | {
|
128 |
| - if (HasComp<GunRequiresWieldComponent>(uid)) |
| 129 | + if (HasComp<GunRequiresWieldComponent>(uid)) |
129 | 130 | return;
|
130 | 131 |
|
131 | 132 | if (component.WieldBonusExamineMessage != null)
|
@@ -253,7 +254,7 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use
|
253 | 254 | return false;
|
254 | 255 |
|
255 | 256 | var selfMessage = Loc.GetString("wieldable-component-successful-wield", ("item", used));
|
256 |
| - var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", user), ("item", used)); |
| 257 | + var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", Identity.Entity(user, EntityManager)), ("item", used)); |
257 | 258 | _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user);
|
258 | 259 |
|
259 | 260 | var targEv = new ItemWieldedEvent();
|
@@ -298,7 +299,7 @@ private void OnItemUnwielded(EntityUid uid, WieldableComponent component, ItemUn
|
298 | 299 | _audioSystem.PlayPredicted(component.UnwieldSound, uid, args.User);
|
299 | 300 |
|
300 | 301 | var selfMessage = Loc.GetString("wieldable-component-failed-wield", ("item", uid));
|
301 |
| - var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", args.User.Value), ("item", uid)); |
| 302 | + var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", Identity.Entity(args.User.Value, EntityManager)), ("item", uid)); |
302 | 303 | _popupSystem.PopupPredicted(selfMessage, othersMessage, args.User.Value, args.User.Value);
|
303 | 304 | }
|
304 | 305 |
|
|
0 commit comments