From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Date: Thu, 4 Jan 2024 05:53:44 +0000 (+0100)
Subject: makes the shotgun cartridge dispensers like the ammo boxes (#23388)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a4c446242dcfccefbcfe596862e15a981fd32b60;p=space-station-14.git

makes the shotgun cartridge dispensers like the ammo boxes (#23388)

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

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
index 6482c5dd91..ba8fd6fb25 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -268,124 +268,6 @@
       - id: MagazineShotgunIncendiary
         amount: 4
 
-# base BallisticAmmoProvider dispensers
-- type: entity
-  parent: BaseItem
-  id: BaseAmmoProvider
-  abstract: true
-  components:
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-  - type: Item
-    size: Normal
-  - type: Sprite
-    sprite: Objects/Storage/boxes.rsi
-
-- type: entity
-  parent: BaseAmmoProvider
-  id: AmmoProviderShotgunShell
-  abstract: true
-  components:
-    - type: BallisticAmmoProvider
-      whitelist:
-        tags:
-        - ShellShotgun
-      capacity: 12
-
-# Shotgun Shells
-- type: entity
-  name: shotgun beanbag cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxBeanbag
-  description: A dispenser box full of beanbag shots, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellShotgunBeanbag
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellbeanbag
-
-- type: entity
-  name: shotgun lethal cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxLethalshot
-  description: A dispenser box full of lethal pellet shots, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellShotgun
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shelllethal
-
-- type: entity
-  name: shotgun slug cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxShotgunSlug
-  description: A dispenser box full of slugs, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellShotgunSlug
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellslug
-
-- type: entity
-  name: shotgun flare cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxShotgunFlare
-  description: A dispenser box full of flare cartridges, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellShotgunFlare
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellflare
-
-- type: entity
-  name: shotgun incendiary cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxShotgunIncendiary
-  description: A dispenser box full of incendiary cartridges, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellShotgunIncendiary
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellincendiary
-
-- type: entity
-  name: shotgun practice cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxShotgunPractice
-  description: A dispenser box full of practice cartridges, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellShotgunPractice
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellpractice
-
-- type: entity
-  name: tranquilizer cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxShellTranquilizer
-  description: A dispenser box full of tranquilizer cartridges, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellTranquilizer
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellslug
-
-
 # Rifle
 - type: entity
   name: box of .20 rifle magazines
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
new file mode 100644
index 0000000000..831c3c3352
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -0,0 +1,116 @@
+- type: entity
+  parent: BaseItem
+  id: BaseAmmoProvider
+  abstract: true
+  components:
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Item
+    size: Normal
+  - type: Sprite
+    sprite: Objects/Storage/boxes.rsi
+
+- type: entity
+  parent: BaseAmmoProvider
+  id: AmmoProviderShotgunShell
+  abstract: true
+  components:
+    - type: BallisticAmmoProvider
+      mayTransfer: true
+      whitelist:
+        tags:
+        - ShellShotgun
+      capacity: 12
+
+# Shotgun Shells
+- type: entity
+  name: shotgun beanbag cartridges dispenser
+  parent: AmmoProviderShotgunShell
+  id: BoxBeanbag
+  description: A dispenser box full of beanbag shots, designed for riot shotguns.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellShotgunBeanbag
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shellbeanbag
+
+- type: entity
+  name: shotgun lethal cartridges dispenser
+  parent: AmmoProviderShotgunShell
+  id: BoxLethalshot
+  description: A dispenser box full of lethal pellet shots, designed for riot shotguns.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellShotgun
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shelllethal
+
+- type: entity
+  name: shotgun slug cartridges dispenser
+  parent: AmmoProviderShotgunShell
+  id: BoxShotgunSlug
+  description: A dispenser box full of slugs, designed for riot shotguns.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellShotgunSlug
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shellslug
+
+- type: entity
+  name: shotgun flare cartridges dispenser
+  parent: AmmoProviderShotgunShell
+  id: BoxShotgunFlare
+  description: A dispenser box full of flare cartridges, designed for riot shotguns.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellShotgunFlare
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shellflare
+
+- type: entity
+  name: shotgun incendiary cartridges dispenser
+  parent: AmmoProviderShotgunShell
+  id: BoxShotgunIncendiary
+  description: A dispenser box full of incendiary cartridges, designed for riot shotguns.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellShotgunIncendiary
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shellincendiary
+
+- type: entity
+  name: shotgun practice cartridges dispenser
+  parent: AmmoProviderShotgunShell
+  id: BoxShotgunPractice
+  description: A dispenser box full of practice cartridges, designed for riot shotguns.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellShotgunPractice
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shellpractice
+
+- type: entity
+  name: tranquilizer cartridges dispenser
+  parent: AmmoProviderShotgunShell
+  id: BoxShellTranquilizer
+  description: A dispenser box full of tranquilizer cartridges, designed for riot shotguns.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellTranquilizer
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shellslug
\ No newline at end of file