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

Make combat check CanInteract (#7046)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-09 19:40:07 +13:00
committed by GitHub
parent d691161542
commit 17132385d4
8 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Cuffs/SharedCuffableSystem.cs
View File

@@ -20,7 +20,6 @@ namespace Content.Shared.Cuffs
SubscribeLocalEvent<SharedCuffableComponent, InteractionAttemptEvent>(OnInteractAttempt);
SubscribeLocalEvent<SharedCuffableComponent, IsEquippingAttemptEvent>(OnEquipAttempt);
SubscribeLocalEvent<SharedCuffableComponent, IsUnequippingAttemptEvent>(OnUnequipAttempt);
SubscribeLocalEvent<SharedCuffableComponent, AttackAttemptEvent>(OnAttackAttempt);
SubscribeLocalEvent<SharedCuffableComponent, DropAttemptEvent>(OnDropAttempt);
SubscribeLocalEvent<SharedCuffableComponent, PickupAttemptEvent>(OnPickupAttempt);
}
@@ -75,11 +74,6 @@ namespace Content.Shared.Cuffs
CheckAct(uid, component, args);
}
private void OnAttackAttempt(EntityUid uid, SharedCuffableComponent component, AttackAttemptEvent args)
{
CheckAct(uid, component, args);
}
private void OnDropAttempt(EntityUid uid, SharedCuffableComponent component, DropAttemptEvent args)
{
CheckAct(uid, component, args);