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/MobState/EntitySystems/MobStateSystem.cs
View File

@@ -29,7 +29,6 @@ namespace Content.Shared.MobState.EntitySystems
SubscribeLocalEvent<MobStateComponent, IsEquippingAttemptEvent>(OnEquipAttempt);
SubscribeLocalEvent<MobStateComponent, EmoteAttemptEvent>(OnEmoteAttempt);
SubscribeLocalEvent<MobStateComponent, IsUnequippingAttemptEvent>(OnUnequipAttempt);
SubscribeLocalEvent<MobStateComponent, AttackAttemptEvent>(OnAttackAttempt);
SubscribeLocalEvent<MobStateComponent, DropAttemptEvent>(OnDropAttempt);
SubscribeLocalEvent<MobStateComponent, PickupAttemptEvent>(OnPickupAttempt);
SubscribeLocalEvent<MobStateComponent, StartPullAttemptEvent>(OnStartPullAttempt);
@@ -96,11 +95,6 @@ namespace Content.Shared.MobState.EntitySystems
CheckAct(uid, component, args);
}
private void OnAttackAttempt(EntityUid uid, MobStateComponent component, AttackAttemptEvent args)
{
CheckAct(uid, component, args);
}
private void OnDropAttempt(EntityUid uid, MobStateComponent component, DropAttemptEvent args)
{
CheckAct(uid, component, args);