Speedloaders for Internal Magazine Weapons

Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs

@@ -49,10 +49,48 @@ private void OnBallisticInteractUsing(EntityUid uid, BallisticAmmoProviderCompon
             return;
 
         if (GetBallisticShots(component) >= component.Capacity)
+        {
+            Popup(Loc.GetString("gun-ballistic-transfer-target-full", ("entity", args.Target)), uid, args.User);
             return;
+        }
+
+        if (EntityManager.HasComponent<SpeedLoaderComponent>(args.Used))
+        {
+            var emptySlots = component.Capacity - component.UnspawnedCount - component.Entities.Count; // Number of empty slots in the shotgun
+
+            var ammo = new List<(EntityUid? Entity, IShootable Shootable)>();
+            var ev = new TakeAmmoEvent(emptySlots, ammo, Transform(uid).Coordinates, args.User);
+            RaiseLocalEvent(args.Used, ev);
+
+            // empty speedloader
+            if (ev.Ammo.Count == 0)
+            {
+                Popup(Loc.GetString("gun-speedloader-empty"), uid, args.User);
+                return;
+            }
+
+            foreach (var (ent, _) in ammo)
+            {
+                if (ent == null)
+                    continue;
+
+                component.Entities.Add(ent.Value);
+                Containers.Insert(ent.Value, component.Container);
+
+                if (IsClientSide(ent.Value))
+                    Del(ent.Value);
+
+                if (ev.Ammo.Count == 0)
+                    break;
+            }
+        }
+        // if not a speedloader just insert
+        else
+        {
+            component.Entities.Add(args.Used);
+            Containers.Insert(args.Used, component.Container);
+        }
 
-        component.Entities.Add(args.Used);
-        Containers.Insert(args.Used, component.Container);
         // Not predicted so
         Audio.PlayPredicted(component.SoundInsert, uid, args.User);
         args.Handled = true;

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml

@@ -1,21 +1,33 @@
 - type: entity
-  id: SpeedLoaderLightRifle
+  id: BaseSpeedLoaderLightRifle
   name: "speed loader (.30 rifle)"
   parent: BaseItem
+  abstract: true
   components:
   - type: Tag
     tags:
-      - SpeedLoaderRifle
+    - SpeedLoaderRifle
   - type: SpeedLoader
   - type: BallisticAmmoProvider
-    mayTransfer: true
     whitelist:
       tags:
-        - CartridgeLightRifle
-    capacity: 5
-    proto: CartridgeLightRifle
+      - CartridgeLightRifle
+    capacity: 6
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
+
+- type: entity
+  id: SpeedLoaderLightRifle
+  name: "speed loader (.30 rifle)"
+  parent: BaseSpeedLoaderLightRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifle
+  - type: Sprite
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
@@ -26,7 +38,3 @@
     steps: 6
     zeroVisible: false
   - type: Appearance
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-        ents: []

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/shotgun.yml

@@ -0,0 +1,40 @@
+- type: entity
+  id: BaseSpeedLoaderShotgun
+  name: "speed loader (shotgun)"
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - SpeedLoaderShotgun
+  - type: SpeedLoader
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+      - ShellShotgun
+    capacity: 4
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Shotgun/shotgun_speed_loader.rsi
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
+
+- type: entity
+  id: SpeedLoaderShotgun
+  name: "speed loader (shotgun)"
+  parent: BaseSpeedLoaderShotgun
+  components:
+  - type: BallisticAmmoProvider
+    proto: ShellShotgun
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: base-4
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: base
+    steps: 5
+    zeroVisible: false
+  - type: Appearance

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -43,6 +43,18 @@
   - type: StaticPrice
     price: 500
 
+- type: entity
+  name: BaseWeaponShotgunSpeedLoadable
+  parent: BaseWeaponShotgun
+  id: BaseWeaponShotgunSpeedLoadable
+  abstract: true
+  components:
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+      - ShellShotgun
+      - SpeedLoaderShotgun
+
 - type: entity
   name: Bulldog
   # Don't parent to BaseWeaponShotgun because it differs significantly
@@ -135,7 +147,7 @@
 
 - type: entity
   name: Enforcer
-  parent: [BaseWeaponShotgun, BaseGunWieldable]
+  parent: [BaseWeaponShotgunSpeedLoadable, BaseGunWieldable]
   id: WeaponShotgunEnforcer
   description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells.
   components:
@@ -158,7 +170,7 @@
 
 - type: entity
   name: Kammerer
-  parent: [BaseWeaponShotgun, BaseGunWieldable]
+  parent: [BaseWeaponShotgunSpeedLoadable, BaseGunWieldable]
   id: WeaponShotgunKammerer
   description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells.
   components:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -31,6 +31,7 @@
     whitelist:
       tags:
       - CartridgeLightRifle
+      - SpeedLoaderRifle
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container

Resources/Prototypes/tags.yml

@@ -545,7 +545,7 @@
 - type: Tag
   id: DrinkSpaceGlue
 
-- type: Tag 
+- type: Tag
   id: Dropper
 
 - type: Tag
@@ -1176,6 +1176,9 @@
 - type: Tag
   id: SpeedLoaderRifle
 
+- type: Tag
+  id: SpeedLoaderShotgun
+
 - type: Tag
   id: SpiderCraft
 

Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Shotgun/shotgun_speed_loader.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC0-1.0",
+    "copyright": "Created by @BluHNT from Nuclear-14 fork",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "base-1"
+        },
+        {
+            "name": "base-2"
+        },
+        {
+            "name": "base-3"
+        },
+        {
+            "name": "base-4"
+        }
+    ]
+}