Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Network pacifiedcomponent (#13012)

Browse Source
This commit is contained in:
metalgearsloth
2022-12-14 04:02:02 +11:00
committed by GitHub
parent 1a63172554
commit 5a756a0094
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,9 +28,10 @@ namespace Content.Shared.CombatMode.Pacification
if (combatMode.CanDisarm != null) if (combatMode.CanDisarm != null)
combatMode.CanDisarm = false; combatMode.CanDisarm = false;
combatMode.IsInCombatMode = false;
if (combatMode.CombatToggleAction != null) if (combatMode.CombatToggleAction != null)
{ {
combatMode.IsInCombatMode = false;
_actionsSystem.SetEnabled(combatMode.CombatToggleAction, false); _actionsSystem.SetEnabled(combatMode.CombatToggleAction, false);
} }
} }

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

@@ -1,9 +1,11 @@
using Robust.Shared.GameStates;
namespace Content.Shared.CombatMode.Pacification namespace Content.Shared.CombatMode.Pacification
{ {
/// <summary> /// <summary>
/// Status effect that disables combat mode. /// Status effect that disables combat mode.
/// </summary> /// </summary>
[RegisterComponent] [RegisterComponent, NetworkedComponent]
public sealed class PacifiedComponent : Component public sealed class PacifiedComponent : Component
{ {