Content ecs containers (#22484)

2023-12-27 21:30:03 -08:00
parent 1d06539432
commit 7a77d6d5dd
72 changed files with 172 additions and 160 deletions
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
@@ -290,7 +290,7 @@ public abstract partial class SharedGunSystem
        if (entity == null)
            return false;

-        container.Remove(entity.Value);
+        Containers.Remove(entity.Value, container);
        return true;
    }

@@ -316,7 +316,7 @@ public abstract partial class SharedGunSystem
    {
        return Containers.TryGetContainer(uid, ChamberSlot, out var container) &&
               container is ContainerSlot slot &&
-               slot.Insert(ammo);
+               Containers.Insert(ammo, slot);
    }

    private void OnChamberAmmoCount(EntityUid uid, ChamberMagazineAmmoProviderComponent component, ref GetAmmoCountEvent args)