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

Bugfix: Wielding now uses identity system. (#33134)

Browse Source 
Make wielding system use identity
This commit is contained in:
Plykiya
2024-11-03 03:25:30 -08:00
committed by GitHub
parent d2a487dc9e
commit 912ac2c069
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Wieldable/WieldableSystem.cs
View File

@@ -3,6 +3,7 @@ using Content.Shared.Examine;
using Content.Shared.Hands; using Content.Shared.Hands;
using Content.Shared.Hands.Components; using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems; using Content.Shared.Hands.EntitySystems;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction.Events; using Content.Shared.Interaction.Events;
using Content.Shared.Inventory.VirtualItem; using Content.Shared.Inventory.VirtualItem;
using Content.Shared.Item; using Content.Shared.Item;
@@ -253,7 +254,7 @@ public sealed class WieldableSystem : EntitySystem
return false; return false;
var selfMessage = Loc.GetString("wieldable-component-successful-wield", ("item", used)); var selfMessage = Loc.GetString("wieldable-component-successful-wield", ("item", used));
var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", user), ("item", used)); var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", Identity.Entity(user, EntityManager)), ("item", used));
_popupSystem.PopupPredicted(selfMessage, othersMessage, user, user); _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user);
var targEv = new ItemWieldedEvent(); var targEv = new ItemWieldedEvent();
@@ -298,7 +299,7 @@ public sealed class WieldableSystem : EntitySystem
_audioSystem.PlayPredicted(component.UnwieldSound, uid, args.User); _audioSystem.PlayPredicted(component.UnwieldSound, uid, args.User);
var selfMessage = Loc.GetString("wieldable-component-failed-wield", ("item", uid)); var selfMessage = Loc.GetString("wieldable-component-failed-wield", ("item", uid));
var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", args.User.Value), ("item", uid)); var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", Identity.Entity(args.User.Value, EntityManager)), ("item", uid));
_popupSystem.PopupPredicted(selfMessage, othersMessage, args.User.Value, args.User.Value); _popupSystem.PopupPredicted(selfMessage, othersMessage, args.User.Value, args.User.Value);
} }