Pacifism rework (#23037)

* 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

View File

@@ -1,3 +1,5 @@
using Content.Shared.Weapons.Melee;
namespace Content.Shared.Interaction.Events
{
/// <summary>
@@ -12,10 +14,19 @@ namespace Content.Shared.Interaction.Events
public EntityUid Uid { get; }
public EntityUid? Target { get; }
public AttackAttemptEvent(EntityUid uid, EntityUid? target = null)
public Entity<MeleeWeaponComponent>? Weapon { get; }
/// <summary>
/// If this attempt is a disarm as opposed to an actual attack, for things that care about the difference.
/// </summary>
public bool Disarm { get; }
public AttackAttemptEvent(EntityUid uid, EntityUid? target = null, Entity<MeleeWeaponComponent>? weapon = null, bool disarm = false)
{
Uid = uid;
Target = target;
Weapon = weapon;
Disarm = disarm;
}
}