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

Subscribe to attackattempt for stuncomp (#12415)

Browse Source
This commit is contained in:
metalgearsloth
2022-11-07 03:31:23 +11:00
committed by GitHub
parent cd40a0ee96
commit 7e44673bc3
1 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Content.Shared/Stunnable/SharedStunSystem.cs
View File

@@ -59,11 +59,12 @@ namespace Content.Shared.Stunnable
// Attempt event subscriptions. // Attempt event subscriptions.
SubscribeLocalEvent<StunnedComponent, UpdateCanMoveEvent>(OnMoveAttempt); SubscribeLocalEvent<StunnedComponent, UpdateCanMoveEvent>(OnMoveAttempt);
SubscribeLocalEvent<StunnedComponent, InteractionAttemptEvent>(OnInteractAttempt); SubscribeLocalEvent<StunnedComponent, InteractionAttemptEvent>(OnAttempt);
SubscribeLocalEvent<StunnedComponent, UseAttemptEvent>(OnUseAttempt); SubscribeLocalEvent<StunnedComponent, UseAttemptEvent>(OnAttempt);
SubscribeLocalEvent<StunnedComponent, ThrowAttemptEvent>(OnThrowAttempt); SubscribeLocalEvent<StunnedComponent, ThrowAttemptEvent>(OnAttempt);
SubscribeLocalEvent<StunnedComponent, DropAttemptEvent>(OnDropAttempt); SubscribeLocalEvent<StunnedComponent, DropAttemptEvent>(OnAttempt);
SubscribeLocalEvent<StunnedComponent, PickupAttemptEvent>(OnPickupAttempt); SubscribeLocalEvent<StunnedComponent, AttackAttemptEvent>(OnAttempt);
SubscribeLocalEvent<StunnedComponent, PickupAttemptEvent>(OnAttempt);
SubscribeLocalEvent<StunnedComponent, IsEquippingAttemptEvent>(OnEquipAttempt); SubscribeLocalEvent<StunnedComponent, IsEquippingAttemptEvent>(OnEquipAttempt);
SubscribeLocalEvent<StunnedComponent, IsUnequippingAttemptEvent>(OnUnequipAttempt); SubscribeLocalEvent<StunnedComponent, IsUnequippingAttemptEvent>(OnUnequipAttempt);
} }
@@ -243,27 +244,7 @@ namespace Content.Shared.Stunnable
args.Cancel(); args.Cancel();
} }
private void OnInteractAttempt(EntityUid uid, StunnedComponent stunned, InteractionAttemptEvent args) private void OnAttempt(EntityUid uid, StunnedComponent stunned, CancellableEntityEventArgs args)
{
args.Cancel();
}
private void OnUseAttempt(EntityUid uid, StunnedComponent stunned, UseAttemptEvent args)
{
args.Cancel();
}
private void OnThrowAttempt(EntityUid uid, StunnedComponent stunned, ThrowAttemptEvent args)
{
args.Cancel();
}
private void OnDropAttempt(EntityUid uid, StunnedComponent stunned, DropAttemptEvent args)
{
args.Cancel();
}
private void OnPickupAttempt(EntityUid uid, StunnedComponent stunned, PickupAttemptEvent args)
{ {
args.Cancel(); args.Cancel();
} }