From 18e38ceddfb7fcbe16bc6f084baa8a39f1556ecd Mon Sep 17 00:00:00 2001
From: Elijahrane <60792108+Elijahrane@users.noreply.github.com>
Date: Sun, 28 Nov 2021 09:30:46 +0800
Subject: [PATCH] Pill canisters added to fills (#5576)

---
 .../Catalog/Cargo/cargo_medical.yml           | 12 ++++++++++++
 .../Catalog/Fills/Boxes/medical.yml           | 19 +++++++++++++++++++
 .../Catalog/Fills/Crates/medical.yml          | 16 ++++++++++++++++
 .../Catalog/Fills/Lockers/medical.yml         |  2 ++
 .../Machines/Computers/computers.yml          |  1 +
 5 files changed, 50 insertions(+)

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
index 939666ec69..50f2f2a897 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
@@ -9,3 +9,15 @@
   cost: 1000
   category: Medical
   group: market
+  
+- type: cargoProduct
+  name: "Chemistry Supplies"
+  id: MedicalChemistrySupplies
+  description: Basic chemistry supplies.
+  icon:
+    sprite: Objects/Specific/Chemistry/beaker.rsi
+    state: beaker
+  product: CrateChemistrySupplies
+  cost: 500
+  category: Medical
+  group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
index 167ca2ca73..cd1eb22731 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -16,6 +16,25 @@
   - type: Item
   - type: Storage
     capacity: 30
+    
+- type: entity
+  name: pill canister box
+  parent: BoxBase
+  id: BoxPillCanister
+  description: A box full of pill canisters.
+  components:
+  - type: StorageFill
+    contents:
+      - id: PillCanister
+        amount: 6
+  - type: Sprite
+    layers:
+      - state: box
+      - state: pillbox
+
+  - type: Item
+  - type: Storage
+    capacity: 30
 
 - type: entity
   name: sterile box
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
index d84ec92740..240e58d097 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
@@ -20,6 +20,22 @@
       - id: Gauze
         amount: 2
 
+- type: entity
+  id: CrateChemistrySupplies
+  name: chemistry supplies crate
+  parent: CrateMedical
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSyringe
+        amount: 1
+      - id: BoxBeaker
+        amount: 1
+      - id: BoxPillCanister
+        amount: 1
+      - id: Dropper
+        amount: 2
+
 - type: entity
   id: CrateMedicalSurgery
   name: surgical supplies crate
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index 51d42b50b1..d3af00779c 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -50,3 +50,5 @@
         prob: 1
       - id: BoxBeaker
         prob: 1
+      - id: BoxPillCanister
+        prob: 1
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 4b465e0067..f1c9eb4772 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -254,6 +254,7 @@
   - type: GalacticMarket
     products:
       - MedicalSupplies
+      - MedicalChemistrySupplies
       - EmergencyExplosive
       - EmergencyFire
       - EmergencyInternals