From 18206a305953fd5d9762cc20bf7186c4962f62f7 Mon Sep 17 00:00:00 2001
From: Slava0135 <40753025+Slava0135@users.noreply.github.com>
Date: Wed, 26 Apr 2023 19:21:43 +0300
Subject: [PATCH] fix harm mode popup (#15823)

* fix harm mode popup

* fix enable/disable message
---
 Content.Shared/CombatMode/SharedCombatModeSystem.cs    | 4 ++--
 Resources/Locale/en-US/actions/actions/combat-mode.ftl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/CombatMode/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
index 46e263b63c..57c7b5c8d8 100644
--- a/Content.Shared/CombatMode/SharedCombatModeSystem.cs
+++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
@@ -53,8 +53,8 @@ namespace Content.Shared.CombatMode
             if (!_timing.IsFirstTimePredicted)
                 return;
 
-            var msg = component.IsInCombatMode ? "action-popup-combat" : "action-popup-combat-enabled";
-            _popup.PopupEntity(Loc.GetString(msg), args.Performer);
+            var msg = component.IsInCombatMode ? "action-popup-combat-enabled" : "action-popup-combat-disabled";
+            _popup.PopupEntity(Loc.GetString(msg), args.Performer, args.Performer);
         }
 
         public void SetCanDisarm(EntityUid entity, bool canDisarm, CombatModeComponent? component = null)
diff --git a/Resources/Locale/en-US/actions/actions/combat-mode.ftl b/Resources/Locale/en-US/actions/actions/combat-mode.ftl
index 978038d39d..2479748de8 100644
--- a/Resources/Locale/en-US/actions/actions/combat-mode.ftl
+++ b/Resources/Locale/en-US/actions/actions/combat-mode.ftl
@@ -1,7 +1,7 @@
 action-name-combat = [color=red]Combat Mode[/color]
 action-description-combat = Enter combat mode
 
-action-popup-combat = Combat mode disabled
+action-popup-combat-disabled = Combat mode disabled
 action-popup-combat-enabled = Combat mode enabled
 
 
-- 
2.51.2