From 3722106cd4003cd3369f6de2a6b1951aab571091 Mon Sep 17 00:00:00 2001
From: Illiux <newoutlook@gmail.com>
Date: Thu, 15 Sep 2022 06:17:32 -0700
Subject: [PATCH] Add 2 bottle boxes to chemistry lockers (#11298)

---
 .../Prototypes/Catalog/Fills/Boxes/medical.yml   |  15 +++++++++++++++
 .../Prototypes/Catalog/Fills/Lockers/medical.yml |   2 ++
 .../Objects/Storage/boxes.rsi/bottle.png         | Bin 0 -> 614 bytes
 .../Textures/Objects/Storage/boxes.rsi/meta.json |   3 +++
 4 files changed, 20 insertions(+)
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/bottle.png

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
index 38c84cb8b4..75694428a5 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -28,6 +28,21 @@
       - state: box
       - state: pillbox
 
+- type: entity
+  name: bottle box
+  parent: BoxCardboard
+  id: BoxBottle
+  description: A box full of bottles.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ChemistryEmptyBottle01
+        amount: 6
+  - type: Sprite
+    layers:
+      - state: box
+      - state: bottle
+
 - type: entity
   name: sterile mask box
   parent: BoxCardboard
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index 356d79fe22..b3ecf118bb 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -61,3 +61,5 @@
       - id: BoxSyringe
       - id: BoxBeaker
       - id: BoxPillCanister
+      - id: BoxBottle
+      - id: BoxBottle
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/bottle.png b/Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
new file mode 100644
index 0000000000000000000000000000000000000000..02c8323b4030d9f141032f751c246fea0a9b9f88
GIT binary patch
literal 614
zcmV-s0-61ZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@Iq;9qb_LkfAzR5EXIMDionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_7;J6>}?mh0_0YbgZG%GL;Xu55t
z5^*t;T@{0`=s_4k1TZ8s%b1g-Bsz|-d-(Wz7vou-&;2?2)SSftpGZ8*4AUmwAfDc|
z4bJ<-5muB{;&b9LlP*a7$aTfzH_io@1)do()2Vsl2(egbW2KE*(bR~ih@+~eQ@)V#
zSmnIMSu0mr^Pc>Lp`5<5%ypW>NMI35kRU=q6(y8mBSx!EiiH&I$2<53UB5&wg<K^t
zax9<%4YKP8|AXJ%TKUNdFDVoUx?UXTV+0890*#vEd>=bb;{@<O16O*>U#SB#pQP7X
zTJ#7AZvz+CElt@2E_Z-|Cqp)6SMt*o@_FF>jJ_!g^xp!#YhG{7eVjf3Y3eF@0~{Oz
zqXo)d@9^&K_TK(I)9mjD3ORCpa-m1o00006VoOIv0RI300RJ8(lYRgI010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru<_Ql64i&Gf|M&m^0Aoo+K~z}7V_+BsqhJ(_f>AIE
zM!_f;V8BSW&S_`=qwuqg8R_Q$bjvAp1lb`FapBqjhzrmD<8%-afQf9&tt1(O#30-V
zD@g`&9l=CNAgp@@p<xagl8JB>jDk@x3I-ei0L%g$XekCl$N&HU07*qoM6N<$f~qY1
AZ~y=R

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 600f085c82..cc22369629 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -34,6 +34,9 @@
         {
             "name": "sechud"
         },
+        {
+          "name": "bottle"
+        },
         {
             "name": "box"
         },