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

Gun + PKA fixes (#16244)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-08 22:37:40 +10:00
committed by GitHub
parent 892eb24c51
commit 84e1b6f695
10 changed files with 141 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs
View File

@@ -8,12 +8,12 @@ public abstract partial class SharedGunSystem
{
protected virtual void InitializeBasicEntity()
{
SubscribeLocalEvent<BasicEntityAmmoProviderComponent, ComponentInit>(OnBasicEntityInit);
SubscribeLocalEvent<BasicEntityAmmoProviderComponent, MapInitEvent>(OnBasicEntityMapInit);
SubscribeLocalEvent<BasicEntityAmmoProviderComponent, TakeAmmoEvent>(OnBasicEntityTakeAmmo);
SubscribeLocalEvent<BasicEntityAmmoProviderComponent, GetAmmoCountEvent>(OnBasicEntityAmmoCount);
}
private void OnBasicEntityInit(EntityUid uid, BasicEntityAmmoProviderComponent component, ComponentInit args)
private void OnBasicEntityMapInit(EntityUid uid, BasicEntityAmmoProviderComponent component, MapInitEvent args)
{
if (component.Count is null)
{
@@ -26,7 +26,7 @@ public abstract partial class SharedGunSystem
private void OnBasicEntityTakeAmmo(EntityUid uid, BasicEntityAmmoProviderComponent component, TakeAmmoEvent args)
{
for (int i = 0; i < args.Shots; i++)
for (var i = 0; i < args.Shots; i++)
{
if (component.Count <= 0)
return;
@@ -40,6 +40,7 @@ public abstract partial class SharedGunSystem
args.Ammo.Add((ent, EnsureComp<AmmoComponent>(ent)));
}
_recharge.Reset(uid);
UpdateBasicEntityAppearance(uid, component);
Dirty(component);
}
@@ -73,6 +74,7 @@ public abstract partial class SharedGunSystem
component.Count = count;
Dirty(component);
UpdateBasicEntityAppearance(uid, component);
UpdateAmmoCount(uid);
return true;
}