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

Make Disarm opt-in (#7811)

Browse Source
This commit is contained in:
Júlio César Ueti
2022-04-30 18:29:13 -03:00
committed by GitHub
parent 6bf2f659a6
commit 2881cd4020
10 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/CombatMode/SharedCombatModeSystem.cs
View File

@@ -33,12 +33,13 @@ namespace Content.Shared.CombatMode
_actionsSystem.AddAction(uid, component.CombatToggleAction, null);
if (component.DisarmAction == null
&& component.CanDisarm
&& _protoMan.TryIndex(component.DisarmActionId, out EntityTargetActionPrototype? disarmProto))
{
component.DisarmAction = new(disarmProto);
}
if (component.DisarmAction != null)
if (component.DisarmAction != null && component.CanDisarm)
_actionsSystem.AddAction(uid, component.DisarmAction, null);
}