Ammunition boxes code quality (#3790)

* Boxes

* Reorganizes the YAML

* Reverts to previous commit and fixes the icons.

* Readds the new CLRifle.rsi as it'll be used soon.

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml

@@ -216,7 +216,7 @@
     - type: Sprite
       layers:
         - state: blue
-        - texture: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/icon.png
+        - texture: Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - MagazineSRifle
@@ -253,7 +253,7 @@
     - type: Sprite
       layers:
         - state: blue
-        - texture: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/icon.png
+        - texture: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - MagazinePistol
@@ -270,7 +270,7 @@
     - type: Sprite
       layers:
         - state: blue
-        - texture: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/icon.png
+        - texture: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - MagazineMagnum

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimaterial.yml

@@ -1,7 +1,7 @@
 - type: entity
-  id: BoxAntiMaterial
-  name: "ammunition box (.60 anti-material)"
   parent: BaseItem
+  id: BoxAntiMaterial
+  name: ammunition box (.60 anti-material)
   components:
   - type: AmmoBox
     caliber: AntiMaterial
@@ -9,7 +9,7 @@
     fillPrototype: CartridgeAntiMaterial
   - type: Sprite
     netsync: false
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi
     layers:
     - state: base
       map: ["enum.RangedBarrelVisualLayers.Base"]

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/clrifle.yml

@@ -0,0 +1,157 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BoxClRifleBase
+  name: ammunition box (.25 caseless)
+  components:
+  - type: AmmoBox
+    caliber: ClRifle
+    capacity: 60
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi
+    netsync: false
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: mag
+      steps: 2
+      zeroVisible: false
+
+# Boxes
+- type: entity
+  parent: BoxClRifleBase
+  id: BoxClRifle10x24
+  name: ammunition box (.25 caseless)
+  components:
+  - type: AmmoBox
+    capacity: 200
+    fillPrototype: CartridgeClRifle
+  - type: Sprite
+    layers:
+    - state: base-10x24
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag10-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: mag10
+      steps: 2
+      zeroVisible: false
+
+- type: entity
+  parent: BoxClRifleBase
+  id: BoxClRifleBigBox
+  name: ammunition box (.25 caseless)
+  components:
+  - type: AmmoBox
+    capacity: 200
+    fillPrototype: CartridgeClRifle
+  - type: Sprite
+    layers:
+    - state: base-b
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: magb-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: magb
+      steps: 2
+      zeroVisible: false
+
+- type: entity
+  parent: BoxClRifleBase
+  id: BoxClRifleBigBoxRubber
+  name: ammunition box (.25 caseless rubber)
+  components:
+  - type: AmmoBox
+    capacity: 200
+    fillPrototype: CartridgeClRifleRubber
+  - type: Sprite
+    layers:
+    - state: base-b
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: magb-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: rubber-b
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: magb
+      steps: 2
+      zeroVisible: false
+
+- type: entity
+  parent: BoxClRifleBase
+  id: BoxClRifleBox
+  name: ammunition box (.25 caseless)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeClRifle
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+
+- type: entity
+  parent: BoxClRifleBase
+  id: BoxClRifleBoxFlash
+  name: ammunition box (.25 caseless flash)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeClRifleFlash
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: flash
+
+- type: entity
+  parent: BoxClRifleBase
+  id: BoxClRifleBoxHV
+  name: ammunition box (.25 caseless high-velocity)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeClRifleHV
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: hv
+
+- type: entity
+  parent: BoxClRifleBase
+  id: BoxClRifleBoxPractice
+  name: ammunition box (.25 caseless practice)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeClRiflePractice
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: practice
+
+- type: entity
+  parent: BoxClRifleBase
+  id: BoxClRifleBoxRubber
+  name: ammunition box (.25 caseless rubber)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeClRifleRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: rubber

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/lrifle.yml

@@ -0,0 +1,99 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BoxLRifleBase
+  name: ammunition box (.30 rifle)
+  components:
+  - type: AmmoBox
+    caliber: LRifle
+    capacity: 50
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi
+    netsync: false
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: mag
+      steps: 2
+      zeroVisible: false
+
+# Boxes
+- type: entity
+  parent: BoxLRifleBase
+  id: BoxLRifleBigBox
+  name: ammunition box (.30 rifle)
+  components:
+  - type: AmmoBox
+    capacity: 200
+    fillPrototype: CartridgeLRifle
+  - type: Sprite
+    layers:
+    - state: base-b
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: magb-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: magb
+      steps: 2
+      zeroVisible: false
+
+- type: entity
+  parent: BoxLRifleBase
+  id: BoxLRifleBox
+  name: ammunition box (.30 rifle)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeLRifle
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+
+- type: entity
+  parent: BoxLRifleBase
+  id: BoxLRifleBoxHV
+  name: ammunition box (.30 rifle high-velocity)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeLRifleHV
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: hv
+
+- type: entity
+  parent: BoxLRifleBase
+  id: BoxLRifleBoxPractice
+  name: ammunition box (.30 rifle practice)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeLRiflePractice
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: practice
+
+- type: entity
+  parent: BoxLRifleBase
+  id: BoxLRifleBoxRubber
+  name: ammunition box (.30 rifle rubber)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeLRifleRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: rubber

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml

@@ -1,19 +1,14 @@
 - type: entity
-  id: BoxMagnumBase
-  name: "ammunition box (.40 magnum)"
-  parent: BaseItem
   abstract: true
+  parent: BaseItem
+  id: BoxMagnumBase
   components:
   - type: AmmoBox
     caliber: Magnum
-    capacity: 30
+    capacity: 60
   - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
     netsync: false
-    layers:
-    - state: base
-      map: ["enum.RangedBarrelVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.RangedBarrelVisualLayers.Mag"]
   - type: Appearance
     visuals:
     - type: MagVisualizer
@@ -23,56 +18,75 @@
 
 # Boxes
 - type: entity
-  id: BoxMagnum
-  name: "ammunition box (.40 magnum)"
   parent: BoxMagnumBase
+  id: BoxMagnum
+  name: ammunition box (.40 magnum)
   components:
   - type: AmmoBox
-    capacity: 60
     fillPrototype: CartridgeMagnum
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
 
 - type: entity
-  id: BoxMagnumFlash
-  name: "ammunition box (.40 magnum flash)"
   parent: BoxMagnumBase
+  id: BoxMagnumFlash
+  name: ammunition box (.40 magnum flash)
   components:
   - type: AmmoBox
-    capacity: 60
     fillPrototype: CartridgeMagnumFlash
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: flash
 
 - type: entity
-  id: BoxMagnumHV
-  name: "ammunition box (.40 magnum high-velocity)"
   parent: BoxMagnumBase
+  id: BoxMagnumHV
+  name: ammunition box (.40 magnum high-velocity)
   components:
   - type: AmmoBox
-    capacity: 60
     fillPrototype: CartridgeMagnumHV
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: hv
 
 - type: entity
-  id: BoxMagnumPractice
-  name: "ammunition box (.40 magnum practice)"
   parent: BoxMagnumBase
+  id: BoxMagnumPractice
+  name: ammunition box (.40 magnum practice)
   components:
   - type: AmmoBox
-    capacity: 60
     fillPrototype: CartridgeMagnumPractice
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: practice
 
 - type: entity
-  id: BoxMagnumRubber
-  name: "ammunition box (.40 magnum rubber)"
   parent: BoxMagnumBase
+  id: BoxMagnumRubber
+  name: ammunition box (.40 magnum rubber)
   components:
   - type: AmmoBox
-    capacity: 60
     fillPrototype: CartridgeMagnumRubber
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: rubber

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml

@@ -1,20 +1,15 @@
 - type: entity
-  id: BoxPistolBase
-  name: "ammunition box (.35 auto)"
-  parent: BaseItem
   abstract: true
+  parent: BaseItem
+  id: BoxPistolBase
+  name: ammunition box (.35 auto)
   components:
   - type: AmmoBox
     caliber: Pistol
-    capacity: 30
+    capacity: 60
-
   - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
     netsync: false
-    layers:
-    - state: base
-      map: ["enum.RangedBarrelVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.RangedBarrelVisualLayers.Mag"]
   - type: Appearance
     visuals:
     - type: MagVisualizer
@@ -24,61 +19,75 @@
 
 # Boxes
 - type: entity
+  parent: BoxPistolBase
   id: BoxPistolBox
-  name: "ammunition box (.35 auto)"
+  name: ammunition box (.35 auto)
-  parent: BoxPistolBase
   components:
   - type: AmmoBox
-    capacity: 60
     fillPrototype: CartridgePistol
-
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
 
 - type: entity
+  parent: BoxPistolBase
   id: BoxPistolBoxFlash
-  name: "ammunition box (.35 auto flash)"
+  name: ammunition box (.35 auto flash)
-  parent: BoxPistolBase
   components:
   - type: AmmoBox
-    capacity: 60
     fillPrototype: CartridgePistolFlash
-
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: flash
 
 - type: entity
+  parent: BoxPistolBase
   id: BoxPistolBoxHV
-  name: "ammunition box (.35 auto high-velocity)"
+  name: ammunition box (.35 auto high-velocity)
-  parent: BoxPistolBase
   components:
   - type: AmmoBox
-    capacity: 60
     fillPrototype: CartridgePistolHV
-
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: hv
 
 - type: entity
+  parent: BoxPistolBase
   id: BoxPistolBoxPractice
-  name: "ammunition box (.35 auto practice)"
+  name: ammunition box (.35 auto practice)
-  parent: BoxPistolBase
   components:
   - type: AmmoBox
-    capacity: 60
     fillPrototype: CartridgePistolPractice
-
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: practice
 
 - type: entity
-  id: BoxPistolBoxRubber
-  name: "ammunition box (.35 auto rubber)"
   parent: BoxPistolBase
+  id: BoxPistolBoxRubber
+  name: ammunition box (.35 auto rubber)
   components:
   - type: AmmoBox
-    capacity: 60
     fillPrototype: CartridgePistolRubber
-
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: rubber

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/srifle.yml

@@ -0,0 +1,135 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BoxSRifleBase
+  components:
+  - type: AmmoBox
+    caliber: SRifle
+    capacity: 60
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi
+    netsync: false
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: mag
+      steps: 2
+      zeroVisible: false
+
+# Boxes
+- type: entity
+  parent: BoxSRifleBase
+  id: BoxSRifleBigBox
+  name: ammunition box (.20 rifle)
+  components:
+  - type: AmmoBox
+    capacity: 200
+    fillPrototype: CartridgeSRifle
+  - type: Sprite
+    layers:
+    - state: base-b
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: magb-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: magb
+      steps: 2
+      zeroVisible: false
+
+- type: entity
+  parent: BoxSRifleBase
+  id: BoxSRifleBigBoxRubber
+  name: ammunition box (.20 rifle rubber)
+  components:
+  - type: AmmoBox
+    capacity: 200
+    fillPrototype: CartridgeSRiflePractice
+  - type: Sprite
+    layers:
+    - state: base-b
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: magb-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: practice-b
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: magb
+      steps: 2
+      zeroVisible: false
+
+- type: entity
+  parent: BoxSRifleBase
+  id: BoxSRifleBox
+  name: ammunition box (.20 rifle)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeSRifle
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+
+- type: entity
+  parent: BoxSRifleBase
+  id: BoxSRifleBoxFlash
+  name: ammunition box (.20 rifle flash)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeSRifleFlash
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: flash
+
+- type: entity
+  parent: BoxSRifleBase
+  id: BoxSRifleBoxHV
+  name: ammunition box (.20 rifle high-velocity)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeSRifleHV
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: hv
+
+- type: entity
+  parent: BoxSRifleBase
+  id: BoxSRifleBoxPractice
+  name: ammunition box (.20 rifle practice)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeSRiflePractice
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: practice
+
+- type: entity
+  parent: BoxSRifleBase
+  id: BoxSRifleBoxRubber
+  name: ammunition box (.20 rifle rubber)
+  components:
+  - type: AmmoBox
+    fillPrototype: CartridgeSRifleRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.RangedBarrelVisualLayers.Mag"]
+    - state: rubber

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml

@@ -1,8 +1,8 @@
 - type: entity
-  id: BoxDonkSoftBase
-  name: "foamdart box"
-  parent: BaseItem
   abstract: true
+  parent: BaseItem
+  id: BoxDonkSoftBase
+  name: foamdart box
   components:
   - type: AmmoBox
     caliber: Rocket
@@ -12,9 +12,9 @@
 
 # Boxes
 - type: entity
-  id: BoxDonkSoftBox
-  name: "foam dart box"
   parent: BoxDonkSoftBase
+  id: BoxDonkSoftBox
+  name: foam dart box
   components:
   - type: AmmoBox
     capacity: 40
@@ -24,9 +24,9 @@
     state: foambox
 
 - type: entity
-  id: BoxCartridgeCap
-  name: "cap gun cartridge box"
   parent: BoxDonkSoftBase
+  id: BoxCartridgeCap
+  name: cap gun cartridge box
   components:
   - type: AmmoBox
     capacity: 20

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml

@@ -1,7 +1,7 @@
 - type: entity
+  parent: BaseItem
   id: CartridgeAntiMaterial
   name: cartridge (.60 anti-material)
-  parent: BaseItem
   components:
   - type: Ammo
     caliber: AntiMaterial

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml

@@ -1,120 +0,0 @@
-- type: entity
-  id: BoxClRifleBase
-  name: "ammunition box (.25 caseless)"
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: AmmoBox
-    caliber: ClRifle
-    capacity: 30
-
-  - type: Sprite
-    netsync: false
-    layers:
-    - state: base
-      map: ["enum.RangedBarrelVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Appearance
-    visuals:
-    - type: MagVisualizer
-      magState: mag
-      steps: 2
-      zeroVisible: false
-
-# Boxes
-- type: entity
-  id: BoxClRifle10x24
-  name: "ammunition box (.25 caseless)"
-  parent: BoxClRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 200
-    fillPrototype: CartridgeClRifle
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi
-
-- type: entity
-  id: BoxClRifleBigBox
-  name: "ammunition box (.25 caseless)"
-  parent: BoxClRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 200
-    fillPrototype: CartridgeClRifle
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi
-
-- type: entity
-  id: BoxClRifleBigBoxRubber
-  name: "ammunition box (.25 caseless rubber)"
-  parent: BoxClRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 200
-    fillPrototype: CartridgeClRifleRubber
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi
-
-- type: entity
-  id: BoxClRifleBox
-  name: "ammunition box (.25 caseless)"
-  parent: BoxClRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 60
-    fillPrototype: CartridgeClRifle
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi
-
-- type: entity
-  id: BoxClRifleBoxFlash
-  name: "ammunition box (.25 caseless flash)"
-  parent: BoxClRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 60
-    fillPrototype: CartridgeClRifleFlash
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi
-
-- type: entity
-  id: BoxClRifleBoxHV
-  name: "ammunition box (.25 caseless high-velocity)"
-  parent: BoxClRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 60
-    fillPrototype: CartridgeClRifleHV
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi
-
-- type: entity
-  id: BoxClRifleBoxPractice
-  name: "ammunition box (.25 caseless practice)"
-  parent: BoxClRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 60
-    fillPrototype: CartridgeClRiflePractice
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi
-
-- type: entity
-  id: BoxClRifleBoxRubber
-  name: "ammunition box (.25 caseless rubber)"
-  parent: BoxClRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 60
-    fillPrototype: CartridgeClRifleRubber
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml

@@ -1,72 +0,0 @@
-- type: entity
-  id: BoxLRifleBase
-  name: "ammunition box (.30 rifle)"
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: AmmoBox
-    caliber: LRifle
-    capacity: 30
-
-  - type: Sprite
-    netsync: false
-    layers:
-    - state: base
-      map: ["enum.RangedBarrelVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Appearance
-    visuals:
-    - type: MagVisualizer
-      magState: mag
-      steps: 2
-      zeroVisible: false
-
-# Boxes
-- type: entity
-  id: BoxLRifleBigBox
-  name: "ammunition box (.30 rifle)"
-  parent: BoxLRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 200
-    fillPrototype: CartridgeLRifle
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi
-
-- type: entity
-  id: BoxLRifleBoxHV
-  name: "ammunition box (.30 rifle high-velocity)"
-  parent: BoxLRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 50
-    fillPrototype: CartridgeLRifleHV
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi
-
-- type: entity
-  id: BoxLRifleBoxPractice
-  name: "ammunition box (.30 rifle practice)"
-  parent: BoxLRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 50
-    fillPrototype: CartridgeLRiflePractice
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi
-
-- type: entity
-  id: BoxLRifleBoxRubber
-  name: "ammunition box (.30 rifle rubber)"
-  parent: BoxLRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 50
-    fillPrototype: CartridgeLRifleRubber
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml

@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: BulletBaseHV
   id: BulletAntiMaterial
   name: bullet (.60 anti-material)
-  parent: BulletBaseHV
-  abstract: true
   components:
   - type: Projectile
     damages:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml

@@ -1,108 +0,0 @@
-- type: entity
-  id: BoxSRifleBase
-  name: "ammunition box (.20 rifle)"
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: AmmoBox
-    caliber: SRifle
-    capacity: 30
-
-  - type: Sprite
-    netsync: false
-    layers:
-    - state: base
-      map: ["enum.RangedBarrelVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Appearance
-    visuals:
-    - type: MagVisualizer
-      magState: mag
-      steps: 2
-      zeroVisible: false
-
-# Boxes
-- type: entity
-  id: BoxSRifleBigBox
-  name: "ammunition box (.20 rifle)"
-  parent: BoxSRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 200
-    fillPrototype: CartridgeSRifle
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi
-
-- type: entity
-  id: BoxSRifleBigBoxRubber
-  name: "ammunition box (.20 rifle rubber)"
-  parent: BoxSRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 200
-    fillPrototype: CartridgeSRifleRubber
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi
-
-- type: entity
-  id: BoxSRifleBox
-  name: "ammunition box (.20 rifle)"
-  parent: BoxSRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 60
-    fillPrototype: CartridgeSRifle
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi
-
-- type: entity
-  id: BoxSRifleBoxFlash
-  name: "ammunition box (.20 rifle flash)"
-  parent: BoxSRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 60
-    fillPrototype: CartridgeSRifleFlash
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi
-
-- type: entity
-  id: BoxSRifleBoxHV
-  name: "ammunition box (.20 rifle high-velocity)"
-  parent: BoxSRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 60
-    fillPrototype: CartridgeSRifleHV
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi
-
-- type: entity
-  id: BoxSRifleBoxPractice
-  name: "ammunition box (.20 rifle practice)"
-  parent: BoxSRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 60
-    fillPrototype: CartridgeSRiflePractice
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi
-
-- type: entity
-  id: BoxSRifleBoxRubber
-  name: "ammunition box (.20 rifle rubber)"
-  parent: BoxSRifleBase
-  components:
-  - type: AmmoBox
-    capacity: 60
-    fillPrototype: CartridgeSRifleRubber
-
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-1"
-        }
-    ]
-}