]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Energy guns' fire mode text formating fix (#42103)
authorGeneralGaws <122978178+GeneralGaws@users.noreply.github.com>
Fri, 26 Dec 2025 16:28:02 +0000 (19:28 +0300)
committerGitHub <noreply@github.com>
Fri, 26 Dec 2025 16:28:02 +0000 (16:28 +0000)
issue

Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
Resources/Locale/en-US/weapons/ranged/gun.ftl

index 81f4ad3213383da098d9c4d567da7836fceca90c..59b4345f97892ff494e15f4aa9671ad3711adb10 100644 (file)
@@ -38,7 +38,7 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem
         if (!_prototypeManager.TryIndex<EntityPrototype>(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))
index 08f1f6cb22b6ece341ff39e6b416c6c6314e04b6..bc54aeb3f4f03bd736da9513cd61f363084880ca 100644 (file)
@@ -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!