fix harm mode popup (#15823)

* fix harm mode popup

* fix enable/disable message

diff --git a/Content.Shared/CombatMode/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
index 46e263b63c59b02223d0eae6e4ba75262a517196..57c7b5c8d812ec635050d6d211bc06056a833494 100644 (file)
--- 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 978038d39dac6c5ceaf17108410adb64a2badb74..2479748de84d8edc1967a2ae52931edb1e575fbd 100644 (file)
--- 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