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

Pacifism rework (#23037)

Browse Source 
* Pacifism rework

* grammar
This commit is contained in:
Kara
2023-12-27 02:55:48 -07:00
committed by GitHub
parent 0366d27586
commit faca1d7043
12 changed files with 223 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/ActionBlocker/ActionBlockerSystem.cs
View File

@@ -9,6 +9,7 @@ using Content.Shared.Movement.Components;
using Content.Shared.Movement.Events;
using Content.Shared.Speech;
using Content.Shared.Throwing;
using Content.Shared.Weapons.Melee;
using JetBrains.Annotations;
using Robust.Shared.Containers;
@@ -145,7 +146,7 @@ namespace Content.Shared.ActionBlocker
return !ev.Cancelled;
}
public bool CanAttack(EntityUid uid, EntityUid? target = null)
public bool CanAttack(EntityUid uid, EntityUid? target = null, Entity<MeleeWeaponComponent>? weapon = null, bool disarm = false)
{
_container.TryGetOuterContainer(uid, Transform(uid), out var outerContainer);
if (target != null && target != outerContainer?.Owner && _container.IsEntityInContainer(uid))
@@ -155,7 +156,7 @@ namespace Content.Shared.ActionBlocker
return containerEv.CanAttack;
}
var ev = new AttackAttemptEvent(uid, target);
var ev = new AttackAttemptEvent(uid, target, weapon, disarm);
RaiseLocalEvent(uid, ev);
if (ev.Cancelled)