From 5a756a00944001cf51cc49359a8f1b4ba0620275 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 14 Dec 2022 04:02:02 +1100
Subject: [PATCH] Network pacifiedcomponent (#13012)

---
 Content.Shared/CombatMode/Pacification/PacificationSystem.cs | 3 ++-
 Content.Shared/CombatMode/Pacification/PacifiedComponent.cs  | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
index 86825e4096..3f0e79dc31 100644
--- a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
+++ b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
@@ -28,9 +28,10 @@ namespace Content.Shared.CombatMode.Pacification
             if (combatMode.CanDisarm != null)
                 combatMode.CanDisarm = false;
 
+            combatMode.IsInCombatMode = false;
+
             if (combatMode.CombatToggleAction != null)
             {
-                combatMode.IsInCombatMode = false;
                 _actionsSystem.SetEnabled(combatMode.CombatToggleAction, false);
             }
         }
diff --git a/Content.Shared/CombatMode/Pacification/PacifiedComponent.cs b/Content.Shared/CombatMode/Pacification/PacifiedComponent.cs
index 393c513b7f..aee298a9d5 100644
--- a/Content.Shared/CombatMode/Pacification/PacifiedComponent.cs
+++ b/Content.Shared/CombatMode/Pacification/PacifiedComponent.cs
@@ -1,9 +1,11 @@
+using Robust.Shared.GameStates;
+
 namespace Content.Shared.CombatMode.Pacification
 {
     /// <summary>
     /// Status effect that disables combat mode.
     /// </summary>
-    [RegisterComponent]
+    [RegisterComponent, NetworkedComponent]
     public sealed class PacifiedComponent : Component
     {