hands ECS (#7081)

2022-03-17 20:13:31 +13:00
parent 7b84362901
commit bfd95c493b
94 changed files with 1454 additions and 2185 deletions
--- a/Content.Server/Weapon/Ranged/GunSystem.SpeedLoader.cs
+++ b/Content.Server/Weapon/Ranged/GunSystem.SpeedLoader.cs
@@ -75,15 +75,10 @@ public sealed partial class GunSystem
            return;
        }

-        var itemComponent = EntityManager.GetComponent<SharedItemComponent>(ammo.Value);
-        if (!handsComponent.CanPutInHand(itemComponent))
+        if (!_handsSystem.TryPickup(args.User, ammo.Value, handsComp: handsComponent))
        {
            EjectCasing(ammo.Value);
        }
-        else
-        {
-            handsComponent.PutInHand(itemComponent);
-        }

        UpdateSpeedLoaderAppearance(component);
        args.Handled = true;