Magic staves + wands (#9070)

2022-07-14 19:45:27 -07:00
parent 9608005db0
commit ad7889e8a9
85 changed files with 1299 additions and 34 deletions
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs
@@ -142,6 +142,7 @@ public abstract partial class SharedGunSystem
    {
        // Copy the magazine's appearance data
        appearance?.SetData(AmmoVisuals.MagLoaded, magLoaded);
+        appearance?.SetData(AmmoVisuals.HasAmmo, count != 0);
        appearance?.SetData(AmmoVisuals.AmmoCount, count);
        appearance?.SetData(AmmoVisuals.AmmoMax, capacity);
    }