Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Remove Ammo component references (#19537)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-01 07:33:28 +10:00
committed by GitHub
parent df7d51ef3b
commit 3ab346f471
13 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
View File

@@ -352,7 +352,7 @@ public abstract partial class SharedGunSystem
{
if (TryTakeChamberEntity(uid, out chamberEnt))
{
args.Ammo.Add((chamberEnt.Value, EnsureComp<AmmoComponent>(chamberEnt.Value)));
args.Ammo.Add((chamberEnt.Value, EnsureShootable(chamberEnt.Value)));
}
// No ammo returned.
else
@@ -406,7 +406,7 @@ public abstract partial class SharedGunSystem
{
// Shooting code won't eject it if it's still contained.
chamberEnt = slot.ContainedEntity;
args.Ammo.Add((chamberEnt.Value, EnsureComp<AmmoComponent>(chamberEnt.Value)));
args.Ammo.Add((chamberEnt.Value, EnsureShootable(chamberEnt.Value)));
}
}
}