diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs index 6392956d63..b17e34f171 100644 --- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs +++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs @@ -6,6 +6,7 @@ using Content.Shared.Cuffs.Components; using Content.Shared.Database; using Content.Shared.Hands; using Content.Shared.Hands.EntitySystems; +using Content.Shared.IdentityManagement; using Content.Shared.Input; using Content.Shared.Interaction; using Content.Shared.Item; @@ -46,6 +47,7 @@ public sealed class PullingSystem : EntitySystem [Dependency] private readonly SharedInteractionSystem _interaction = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly HeldSpeedModifierSystem _clothingMoveSpeed = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; public override void Initialize() { @@ -326,7 +328,6 @@ public sealed class PullingSystem : EntitySystem RaiseLocalEvent(pullableUid, message); } - _alertsSystem.ClearAlert(pullableUid, pullableComp.PulledAlert); } @@ -514,6 +515,10 @@ public sealed class PullingSystem : EntitySystem Dirty(pullerUid, pullerComp); Dirty(pullableUid, pullableComp); + var pullingMessage = + Loc.GetString("getting-pulled-popup", ("puller", Identity.Entity(pullerUid, EntityManager))); + _popup.PopupEntity(pullingMessage, pullableUid, pullableUid); + _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(pullerUid):user} started pulling {ToPrettyString(pullableUid):target}"); return true; diff --git a/Resources/Locale/en-US/movement/pulling.ftl b/Resources/Locale/en-US/movement/pulling.ftl new file mode 100644 index 0000000000..13349a9cfa --- /dev/null +++ b/Resources/Locale/en-US/movement/pulling.ftl @@ -0,0 +1 @@ +getting-pulled-popup = { CAPITALIZE(THE($puller)) } begins pulling you.