Skip to content

Prevent people from breaking out of grabs while stunned. #675

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
BramvanZijp wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prevent people from breaking out of grabs while stunned. #675

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cd29c3
Prevent people from breaking out of grabs while stunned.
BramvanZijp Mar 11, 2026
ba49d33
Get rid of un-needed newlines.
BramvanZijp Mar 11, 2026
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
20 changes: 20 additions & 0 deletions Content.Shared/Stunnable/SharedStunSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@
using Content.Shared.StatusEffect;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Content.Shared.Movement.Pulling.Systems;
using Content.Shared.Pulling.Events;
using Content.Shared.Movement.Pulling.Components;
using Content.Shared.Movement.Pulling.Events;

namespace Content.Shared.Stunnable;

Expand Down Expand Up @@ -134,6 +138,7 @@ public override void Initialize()
SubscribeLocalEvent<StunnedComponent, PickupAttemptEvent>(OnAttempt);
SubscribeLocalEvent<StunnedComponent, IsEquippingAttemptEvent>(OnEquipAttempt);
SubscribeLocalEvent<StunnedComponent, IsUnequippingAttemptEvent>(OnUnequipAttempt);
SubscribeLocalEvent<StunnedComponent, AttemptStopPullingEvent>(HandleStopPull);
SubscribeLocalEvent<MobStateComponent, MobStateChangedEvent>(OnMobStateChanged);

// New Status Effect subscriptions
Expand Down Expand Up @@ -520,5 +525,20 @@ private void OnUnequipAttempt(EntityUid uid, StunnedComponent stunned, IsUnequip
args.Cancel();
}


private void HandleStopPull(EntityUid uid, StunnedComponent stunned, ref AttemptStopPullingEvent args)
{
if (args.User == null || !Exists(args.User.Value))
return;

if (args.User.Value == uid)
{
//TODO: UX feedback. Simply blocking the normal interaction feels like an interface bug

args.Cancelled = true;
}

}

#endregion
}
Loading