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.RangedMagazine.cs
+++ b/Content.Server/Weapon/Ranged/GunSystem.RangedMagazine.cs
@@ -70,16 +70,8 @@ public sealed partial class GunSystem
        if (TakeAmmo(component) is not {Valid: true} ammo)
            return;

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

        args.Handled = true;
    }