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

fix harm mode popup (#15823)

Browse Source 
* fix harm mode popup

* fix enable/disable message
This commit is contained in:
Slava0135
2023-04-26 19:21:43 +03:00
committed by GitHub
parent d0f5315b3c
commit 18206a3059
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,8 +53,8 @@ namespace Content.Shared.CombatMode
if (!_timing.IsFirstTimePredicted) if (!_timing.IsFirstTimePredicted)
return; return;
var msg = component.IsInCombatMode ? "action-popup-combat" : "action-popup-combat-enabled"; var msg = component.IsInCombatMode ? "action-popup-combat-enabled" : "action-popup-combat-disabled";
_popup.PopupEntity(Loc.GetString(msg), args.Performer); _popup.PopupEntity(Loc.GetString(msg), args.Performer, args.Performer);
} }
public void SetCanDisarm(EntityUid entity, bool canDisarm, CombatModeComponent? component = null) public void SetCanDisarm(EntityUid entity, bool canDisarm, CombatModeComponent? component = null)

2
Resources/Locale/en-US/actions/actions/combat-mode.ftl
View File

@@ -1,7 +1,7 @@
action-name-combat = [color=red]Combat Mode[/color] action-name-combat = [color=red]Combat Mode[/color]
action-description-combat = Enter combat mode 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 action-popup-combat-enabled = Combat mode enabled