From 2aa29de1eeb8d38b649f809d902b728fd49221e5 Mon Sep 17 00:00:00 2001 From: GeneralGaws <122978178+GeneralGaws@users.noreply.github.com> Date: Fri, 26 Dec 2025 19:28:02 +0300 Subject: [PATCH] Energy guns' fire mode text formating fix (#42103) issue --- .../Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs | 4 ++-- Resources/Locale/en-US/weapons/ranged/gun.ftl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs index 81f4ad3213..59b4345f97 100644 --- a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs @@ -38,7 +38,7 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem if (!_prototypeManager.TryIndex(fireMode.Prototype, out var proto)) return; - args.PushMarkup(Loc.GetString("gun-set-fire-mode", ("mode", proto.Name))); + args.PushMarkup(Loc.GetString("gun-set-fire-mode-examine", ("mode", proto.Name))); } private BatteryWeaponFireMode GetMode(BatteryWeaponFireModesComponent component) @@ -124,7 +124,7 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem _appearanceSystem.SetData(uid, BatteryWeaponFireModeVisuals.State, prototype.ID, appearance); if (user != null) - _popupSystem.PopupClient(Loc.GetString("gun-set-fire-mode", ("mode", prototype.Name)), uid, user.Value); + _popupSystem.PopupClient(Loc.GetString("gun-set-fire-mode-popup", ("mode", prototype.Name)), uid, user.Value); } if (TryComp(uid, out BatteryAmmoProviderComponent? batteryAmmoProviderComponent)) diff --git a/Resources/Locale/en-US/weapons/ranged/gun.ftl b/Resources/Locale/en-US/weapons/ranged/gun.ftl index 08f1f6cb22..bc54aeb3f4 100644 --- a/Resources/Locale/en-US/weapons/ranged/gun.ftl +++ b/Resources/Locale/en-US/weapons/ranged/gun.ftl @@ -4,7 +4,8 @@ gun-fire-rate-examine = Fire rate is [color={$color}]{$fireRate}[/color] per sec gun-selector-verb = Change to {$mode} gun-selected-mode = Selected {$mode} gun-disabled = You can't use guns! -gun-set-fire-mode = Set to [color=yellow]{$mode}[/color]. +gun-set-fire-mode-examine = Set to [color=yellow]{$mode}[/color]. +gun-set-fire-mode-popup = Changed to {$mode} gun-magazine-whitelist-fail = That won't fit into the gun! gun-magazine-fired-empty = No ammo left! -- 2.52.0