From 27c16edb541fa75e761b2695938b7408bbe4fff6 Mon Sep 17 00:00:00 2001
From: Lamrr <96937466+Lamrr@users.noreply.github.com>
Date: Sun, 23 Jan 2022 07:47:54 +1100
Subject: [PATCH] Adds shotgun shell boxes (#6195)

---
 .../Catalog/Fills/Boxes/security.yml          |  32 ++++++++++++++++++
 .../Catalog/Fills/Crates/armory.yml           |   4 +--
 .../Catalog/Fills/Crates/security.yml         |   4 +--
 .../Objects/Storage/boxes.rsi/box_beanbag.png | Bin 0 -> 337 bytes
 .../Storage/boxes.rsi/box_lethalshot.png      | Bin 0 -> 359 bytes
 .../Objects/Storage/boxes.rsi/meta.json       |   8 ++++-
 6 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/box_beanbag.png
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/box_lethalshot.png

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
index 70e3ee3578..f94aadab7f 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
@@ -57,3 +57,35 @@
     layers:
       - state: box_security
       - state: ziptie
+
+- type: entity
+  name: box of beanbag shots
+  parent: BoxCardboard
+  id: BoxBeanbag
+  description: A box full of beanbag shots, designed for riot shotguns.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ShellShotgunBeanbag
+        amount: 6
+  - type: Sprite
+    layers:
+      - state: box_beanbag
+  - type: Storage
+    capacity: 30
+
+- type: entity
+  name: box of lethal shots
+  parent: BoxCardboard
+  id: BoxLethalshot
+  description: A box full of lethal shots, designed for riot shotguns.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ShellShotgunBase
+        amount: 6
+  - type: Sprite
+    layers:
+      - state: box_lethalshot
+  - type: Storage
+    capacity: 30
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
index 2f7c63f4bb..cea0cb252d 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -21,5 +21,5 @@
     contents:
       - id: ShotgunGladstone
         amount: 2
-      - id: ShellShotgun
-        amount: 18
+      - id: BoxLethalshot
+        amount: 3
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
index 2e4974674a..5444927a21 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -61,8 +61,8 @@
         amount: 2
       - id: ShotgunGladstone
         amount: 2
-      - id: ShellShotgunBeanbag
-        amount: 12
+      - id: BoxBeanbag
+        amount: 2
 #      - ShieldRiot
 #      - SecGasmask
 
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_beanbag.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_beanbag.png
new file mode 100644
index 0000000000000000000000000000000000000000..d83ddc20b350113a03dbe417b58f6ba0de00d5dc
GIT binary patch
literal 337
zcmV-X0j~auP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003PNkl<ZSi|j>
zKTE?v7{-6qfQzU&X&@&N0vUp2wZ+lmr*iO{_$^8trOp{L1VSAW2o4goB~I!&6=G{`
z8WK+7e&aLT^W2~Jy%#hZ#q@p>J<pR}m_<>v<Yz1jzVA!Name$$RddrcF$_b7VfZb?
zmg+0e0h9+YetR^^0whVI?gWaWz;)eD%;Gq%e+2;jAZW$-VL06U4fKP6W7`Jc<|<|X
zbPs^n$0^q%QCpj@wJL-z!@t=F%CcP2X4ALE+Nw3zRza1|=l8~1qfS`m_UweC!)*Yb
ziVr3uSzG(Re?gUVZ<n2e3jpkwdnU|kYa5SbLI`PD766yyaVxvL8w>!*vWzrMduwMx
jAw(xL;i9=lqXGB=0Sa|0XpS+E00000NkvXXu0mjfDB_Rh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_lethalshot.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_lethalshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..03f3e809ef5d69dc9e89259e4bd36efd11605877
GIT binary patch
literal 359
zcmV-t0hs=YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003lNkl<ZSi|j>
zF-yZh7>1viKq)v#5sZNxWC&!)kkuAP`wRS2`jg@)bu~kVK<JV{aA}a1fP?Xzgj!p@
zgp?rU9iQRe_wKvz?t?*tdX}~i`o1rZVHU^n4?klU1VJEO*QF?mPR%XL!Y~XOMbWnq
zCw-S-2+(@~<F`xGTYxl8`#XWMEb%<=C}v5LsFwg>8it)1Kh5XO@4z$+xpW)=o>wc(
z^_q!k0x%knmD$%?he9ZIfl=4I>3S>HNgKZFIvTJk%f_s;cR&MVOV&6*RaMGgrz$(N
zW}}x-O36oEw_=UEU|Y9$=a`cV0A9+P<-Js9|MxH0)|G$C=<FH*=k<{#8)epbBojhN
z+qMC?Su8r)<-=?SK%VDhS*HCt6AB@YG868a4;nNG;1e!_iRuLkiF*J5002ovPDHLk
FV1mF7nyLT*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 779637b116..7b0c750a9e 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/17dc39d12005f3279a90212b5c61a781c08693a5",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0",
   "size": {
     "x": 32,
     "y": 32
@@ -113,6 +113,12 @@
       "name": "hug-inhand-right",
       "directions": 4
     },
+    {
+      "name": "box_lethalshot"
+    },
+    {
+      "name": "box_beanbag"
+    },
     {
       "name": "ziptie"
     }