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

Fix guns that spawn without a magazine looking like they have one (#26922)

Browse Source
This commit is contained in:
DrSmugleaf
2024-04-13 08:26:25 -07:00
committed by GitHub
parent b51482f51a
commit 2d53cfeabc
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs
View File

@@ -40,7 +40,7 @@ public sealed partial class GunSystem
if (sprite == null) return; if (sprite == null) return;
if (!args.AppearanceData.TryGetValue(AmmoVisuals.MagLoaded, out var magloaded) || if (args.AppearanceData.TryGetValue(AmmoVisuals.MagLoaded, out var magloaded) &&
magloaded is true) magloaded is true)
{ {
if (!args.AppearanceData.TryGetValue(AmmoVisuals.AmmoMax, out var capacity)) if (!args.AppearanceData.TryGetValue(AmmoVisuals.AmmoMax, out var capacity))

3
Content.Shared/Strip/SharedStrippableSystem.cs
View File

@@ -51,8 +51,7 @@ public abstract class SharedStrippableSystem : EntitySystem
{ {
args.CanDrop |= args.Target == args.User && args.CanDrop |= args.Target == args.User &&
HasComp<StrippingComponent>(args.User) && HasComp<StrippingComponent>(args.User) &&
HasComp<HandsComponent>(args.User) && HasComp<HandsComponent>(args.User);
HasComp<StrippingComponent>(args.User);
if (args.CanDrop) if (args.CanDrop)
args.Handled = true; args.Handled = true;