From 9f785d73c877023f9a22a05e19e717a649ea7766 Mon Sep 17 00:00:00 2001
From: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Date: Thu, 10 Feb 2022 01:37:43 +0000
Subject: [PATCH] Introduced BaseCartridge (#6597)

---
 .../Guns/Ammunition/Cartridges/BaseCartridge.yml       | 10 ++++++++++
 .../Guns/Ammunition/Cartridges/antimaterial.yml        |  5 +----
 .../Weapons/Guns/Ammunition/Cartridges/clrifle.yml     |  5 +----
 .../Weapons/Guns/Ammunition/Cartridges/lrifle.yml      |  5 +----
 .../Weapons/Guns/Ammunition/Cartridges/magnum.yml      |  5 +----
 .../Weapons/Guns/Ammunition/Cartridges/pistol.yml      |  5 +----
 .../Weapons/Guns/Ammunition/Cartridges/shotgun.yml     |  2 +-
 .../Weapons/Guns/Ammunition/Cartridges/srifle.yml      |  5 +----
 .../Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml |  5 +----
 9 files changed, 18 insertions(+), 29 deletions(-)
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/BaseCartridge.yml

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/BaseCartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/BaseCartridge.yml
new file mode 100644
index 0000000000..1f7c50bf83
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/BaseCartridge.yml
@@ -0,0 +1,10 @@
+- type: entity
+  id: BaseCartridge
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - Cartridge
+  - type: Item
+    size: 1
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml
index 9f3d97cc1f..728a562709 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: BaseCartridge
   id: CartridgeAntiMaterial
   name: cartridge (.60 anti-material)
   components:
@@ -17,6 +17,3 @@
   - type: Appearance
     visuals:
     - type: SpentAmmoVisualizer
-  - type: Tag
-    tags:
-    - Cartridge
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/clrifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/clrifle.yml
index eeddf26846..4ebe269fe0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/clrifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/clrifle.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: CartridgeClRifleBase
   name: cartridge (.25 rifle)
-  parent: BaseItem
+  parent: BaseCartridge
   abstract: true
   components:
   - type: Ammo
@@ -16,9 +16,6 @@
   - type: Appearance
     visuals:
     - type: SpentAmmoVisualizer
-  - type: Tag
-    tags:
-    - Cartridge
 
 - type: entity
   id: CartridgeClRifle
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/lrifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/lrifle.yml
index ca09499fb2..fbb8280cf8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/lrifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/lrifle.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: CartridgeLRifleBase
   name: cartridge (.30 rifle)
-  parent: BaseItem
+  parent: BaseCartridge
   abstract: true
   components:
   - type: Ammo
@@ -16,9 +16,6 @@
   - type: Appearance
     visuals:
     - type: SpentAmmoVisualizer
-  - type: Tag
-    tags:
-    - Cartridge
 
 - type: entity
   id: CartridgeLRifle
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
index 4fbbf59977..6864caf9c7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: CartridgeMagnumBase
   name: cartridge (.40 magnum)
-  parent: BaseItem
+  parent: BaseCartridge
   abstract: true
   components:
   - type: Ammo
@@ -16,9 +16,6 @@
   - type: Appearance
     visuals:
     - type: SpentAmmoVisualizer
-  - type: Tag
-    tags:
-    - Cartridge
 
 - type: entity
   id: CartridgeMagnum
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
index 472922ec69..70abed5fb9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: CartridgePistolBase
   name: cartridge (.35 auto)
-  parent: BaseItem
+  parent: BaseCartridge
   abstract: true
   components:
   - type: Ammo
@@ -16,9 +16,6 @@
   - type: Appearance
     visuals:
     - type: SpentAmmoVisualizer
-  - type: Tag
-    tags:
-    - Cartridge
 
 - type: entity
   id: CartridgePistol
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index 1289ce4842..723002f00f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ShellShotgunBase
   name: shell (.50)
-  parent: BaseItem
+  parent: BaseCartridge
   abstract: true
   components:
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/srifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/srifle.yml
index 006581c564..a71f9b39bf 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/srifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/srifle.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: CartridgeSRifleBase
   name: cartridge (.20 rifle)
-  parent: BaseItem
+  parent: BaseCartridge
   abstract: true
   components:
   - type: Ammo
@@ -16,9 +16,6 @@
   - type: Appearance
     visuals:
     - type: SpentAmmoVisualizer
-  - type: Tag
-    tags:
-    - Cartridge
 
 - type: entity
   id: CartridgeSRifle
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
index cb4f52101e..2718a976cd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: CartridgeCapBase
   name: cartridge (cap)
-  parent: BaseItem
+  parent: BaseCartridge
   abstract: true
   components:
   - type: Ammo
@@ -13,9 +13,6 @@
     layers:
     - state: base
       map: ["enum.AmmoVisualLayers.Base"]
-  - type: Tag
-    tags:
-    - Cartridge
 
 - type: entity
   id: CartridgeCap