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

BatteryWeaponPowerCell tweaks (#33500)

Browse Source 
* BatteryWeaponPowerCell tweaks

* add update ammo ev & shuttle guns tweaks

* MilonPL requested changes

* revert changes in OnPowerCellChanged

* Add events to get charge info & change current charge

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
This commit is contained in:
Kirus59
2025-04-29 04:12:25 +03:00
committed by GitHub
parent a8054c37b1
commit 8c38aa3742
9 changed files with 138 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
View File

@@ -67,7 +67,7 @@ public abstract partial class SharedGunSystem
component.Shots--;
}
TakeCharge(uid, component);
TakeCharge((uid, component));
UpdateBatteryAppearance(uid, component);
Dirty(uid, component);
}
@@ -81,9 +81,9 @@ public abstract partial class SharedGunSystem
/// <summary>
/// Update the battery (server-only) whenever fired.
/// </summary>
protected virtual void TakeCharge(EntityUid uid, BatteryAmmoProviderComponent component)
protected virtual void TakeCharge(Entity<BatteryAmmoProviderComponent> entity)
{
UpdateAmmoCount(uid, prediction: false);
UpdateAmmoCount(entity, prediction: false);
}
protected void UpdateBatteryAppearance(EntityUid uid, BatteryAmmoProviderComponent component)