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

Fix admin verb to set unspawned ballisic ammo count (#26411)

Browse Source 
Don't crash if an invalid value is given.
This commit is contained in:
IProduceWidgets
2024-03-24 20:45:01 -04:00
committed by GitHub
parent 3197262f34
commit 451890b85b
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
View File

@@ -718,9 +718,21 @@ public sealed partial class AdminVerbSystem
Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Fun/caps.rsi"), "mag-6"), Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Fun/caps.rsi"), "mag-6"),
Act = () => Act = () =>
{ {
_quickDialog.OpenDialog(player, "Set Bullet Amount", $"Amount (max {ballisticAmmo.Capacity}):", (int amount) => _quickDialog.OpenDialog(player, "Set Bullet Amount", $"Amount (standard {ballisticAmmo.Capacity}):", (string amount) =>
{ {
ballisticAmmo.UnspawnedCount = amount; if (!int.TryParse(amount, out var result))
return;
if (result > 0)
{
ballisticAmmo.UnspawnedCount = result;
}
else
{
ballisticAmmo.UnspawnedCount = 0;
}
_gun.UpdateBallisticAppearance(args.Target, ballisticAmmo);
}); });
}, },
Impact = LogImpact.Medium, Impact = LogImpact.Medium,

2
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
View File

@@ -260,7 +260,7 @@ public abstract partial class SharedGunSystem
args.Capacity = component.Capacity; args.Capacity = component.Capacity;
} }
private void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component) public void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component)
{ {
if (!Timing.IsFirstTimePredicted || !TryComp<AppearanceComponent>(uid, out var appearance)) if (!Timing.IsFirstTimePredicted || !TryComp<AppearanceComponent>(uid, out var appearance))
return; return;