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

Use AttackAttempt for pax (#11844)

Browse Source
This commit is contained in:
metalgearsloth
2022-10-16 07:19:40 +11:00
committed by GitHub
parent 56a8dac3fc
commit 1ce609b865
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Shared/CombatMode/Pacification/PacificationSystem.cs
View File

@@ -1,18 +1,26 @@
using Content.Shared.Actions; using Content.Shared.Actions;
using Content.Shared.Interaction.Events;
namespace Content.Shared.CombatMode.Pacification namespace Content.Shared.CombatMode.Pacification
{ {
public sealed class PacificationSystem : EntitySystem public sealed class PacificationSystem : EntitySystem
{ {
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!; [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
SubscribeLocalEvent<PacifiedComponent, ComponentInit>(OnInit); SubscribeLocalEvent<PacifiedComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<PacifiedComponent, ComponentShutdown>(OnShutdown); SubscribeLocalEvent<PacifiedComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<PacifiedComponent, AttackAttemptEvent>(OnAttackAttempt);
} }
private void OnInit(EntityUid uid, PacifiedComponent component, ComponentInit args) private void OnAttackAttempt(EntityUid uid, PacifiedComponent component, AttackAttemptEvent args)
{
args.Cancel();
}
private void OnStartup(EntityUid uid, PacifiedComponent component, ComponentStartup args)
{ {
if (!TryComp<SharedCombatModeComponent>(uid, out var combatMode)) if (!TryComp<SharedCombatModeComponent>(uid, out var combatMode))
return; return;
@@ -34,6 +42,7 @@ namespace Content.Shared.CombatMode.Pacification
if (combatMode.CanDisarm != null) if (combatMode.CanDisarm != null)
combatMode.CanDisarm = true; combatMode.CanDisarm = true;
if (combatMode.CombatToggleAction != null) if (combatMode.CombatToggleAction != null)
_actionsSystem.SetEnabled(combatMode.CombatToggleAction, true); _actionsSystem.SetEnabled(combatMode.CombatToggleAction, true);
} }

4
Content.Shared/CombatMode/Pacification/PacifiedComponent.cs
View File

@@ -5,5 +5,7 @@ namespace Content.Shared.CombatMode.Pacification
/// </summary> /// </summary>
[RegisterComponent] [RegisterComponent]
public sealed class PacifiedComponent : Component public sealed class PacifiedComponent : Component
{} {
}
} }