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

Fix a bunch of warnings (#10886)

Browse Source 
* Fix a bunch of warnings

Also made ensnareable not broadcast as they're only used directed.
Mainly just Get<T> and AppearanceSystem

* buckle too

* fix tests

Co-authored-by: wrexbe <wrexbe@protonmail.com>
This commit is contained in:
metalgearsloth
2022-08-28 13:26:35 +10:00
committed by GitHub
parent cf84c20f68
commit d767ce9585
17 changed files with 75 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,10 +82,12 @@ public abstract partial class SharedGunSystem
protected void UpdateBatteryAppearance(EntityUid uid, BatteryAmmoProviderComponent component)
{
if (!TryComp<AppearanceComponent>(uid, out var appearance)) return;
appearance.SetData(AmmoVisuals.HasAmmo, component.Shots != 0);
appearance.SetData(AmmoVisuals.AmmoCount, component.Shots);
appearance.SetData(AmmoVisuals.AmmoMax, component.Capacity);
if (!TryComp<AppearanceComponent>(uid, out var appearance))
return;
Appearance.SetData(uid, AmmoVisuals.HasAmmo, component.Shots != 0, appearance);
Appearance.SetData(uid, AmmoVisuals.AmmoCount, component.Shots, appearance);
Appearance.SetData(uid, AmmoVisuals.AmmoMax, component.Capacity, appearance);
}
private IShootable GetShootable(BatteryAmmoProviderComponent component, EntityCoordinates coordinates)

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

@@ -110,7 +110,7 @@ public abstract partial class SharedGunSystem
}
else
{
appearance?.SetData(AmmoVisuals.MagLoaded, false);
Appearance.SetData(uid, AmmoVisuals.MagLoaded, false, appearance);
return;
}

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

@@ -39,6 +39,7 @@ public abstract partial class SharedGunSystem : EntitySystem
[Dependency] protected readonly DamageableSystem Damageable = default!;
[Dependency] private readonly ItemSlotsSystem _slots = default!;
[Dependency] protected readonly SharedActionsSystem Actions = default!;
[Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
[Dependency] private readonly SharedCombatModeSystem _combatMode = default!;
[Dependency] protected readonly SharedContainerSystem Containers = default!;
[Dependency] protected readonly SharedPhysicsSystem Physics = default!;
@@ -310,8 +311,7 @@ public abstract partial class SharedGunSystem : EntitySystem
Dirty(cartridge);
cartridge.Spent = spent;
if (!TryComp<AppearanceComponent>(cartridge.Owner, out var appearance)) return;
appearance.SetData(AmmoVisuals.Spent, spent);
Appearance.SetData(cartridge.Owner, AmmoVisuals.Spent, spent);
}
/// <summary>