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

Fix bolt-less gun cycling (#19051)

Browse Source 
Oop.
This commit is contained in:
metalgearsloth
2023-08-13 17:07:59 +10:00
committed by GitHub
parent 8fb38b759a
commit 3fc81bca40
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ public abstract partial class SharedGunSystem
private void OnChamberActivate(EntityUid uid, ChamberMagazineAmmoProviderComponent component, ActivateInWorldEvent args) private void OnChamberActivate(EntityUid uid, ChamberMagazineAmmoProviderComponent component, ActivateInWorldEvent args)
{ {
if (args.Handled || component.BoltClosed == null) if (args.Handled)
return; return;
args.Handled = true; args.Handled = true;
@@ -70,7 +70,7 @@ public abstract partial class SharedGunSystem
private void OnChamberUse(EntityUid uid, ChamberMagazineAmmoProviderComponent component, UseInHandEvent args) private void OnChamberUse(EntityUid uid, ChamberMagazineAmmoProviderComponent component, UseInHandEvent args)
{ {
if (args.Handled || component.BoltClosed == null) if (args.Handled)
return; return;
args.Handled = true; args.Handled = true;
@@ -94,7 +94,7 @@ public abstract partial class SharedGunSystem
private void UseChambered(EntityUid uid, ChamberMagazineAmmoProviderComponent component, EntityUid? user = null) private void UseChambered(EntityUid uid, ChamberMagazineAmmoProviderComponent component, EntityUid? user = null)
{ {
if (component.BoltClosed == null || !component.BoltClosed.Value) if (component.BoltClosed == false)
return; return;
if (TryTakeChamberEntity(uid, out var chamberEnt)) if (TryTakeChamberEntity(uid, out var chamberEnt))
@@ -112,7 +112,7 @@ public abstract partial class SharedGunSystem
CycleCartridge(uid, component, user); CycleCartridge(uid, component, user);
if (component.BoltClosed.Value) if (component.BoltClosed != false)
{ {
Audio.PlayPredicted(component.RackSound, uid, user); Audio.PlayPredicted(component.RackSound, uid, user);
} }