From 6ec152e4830c0980876568cf7155dafd622944e9 Mon Sep 17 00:00:00 2001
From: SweptWasTaken <sweptwastaken@protonmail.com>
Date: Thu, 15 Apr 2021 22:36:41 -0700
Subject: [PATCH] Moves ReagentDispenser Inventories to Catalog

---
 .../Catalog/ReagentDispensers/beverage.yml    | 22 +++++++++++++++
 .../Catalog/ReagentDispensers/chemical.yml    | 27 ++++++++++++++++++
 .../Specific/Dispensers/booze_dispenser.yml   | 13 ---------
 .../Specific/Dispensers/chem_dispenser.yml    | 28 -------------------
 .../Specific/Dispensers/soda_dispenser.yml    | 10 -------
 5 files changed, 49 insertions(+), 51 deletions(-)
 create mode 100644 Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
 create mode 100644 Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml

diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
new file mode 100644
index 0000000000..33e4bdfbc2
--- /dev/null
+++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
@@ -0,0 +1,22 @@
+- type: reagentDispenserInventory
+  id: SodaDispenserInventory
+  inventory:
+  - Coffee
+  - Cola
+  - Cream
+  - Ice
+  - Tea
+  - Water
+
+- type: reagentDispenserInventory
+  id: BoozeDispenserInventory
+  inventory:
+  - Ale
+  - Beer
+  - Cognac
+  - Ice
+  - Kahlua
+  - Rum
+  - Vodka
+  - Whiskey
+  - Wine
diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml
new file mode 100644
index 0000000000..70073d0dde
--- /dev/null
+++ b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml
@@ -0,0 +1,27 @@
+- type: reagentDispenserInventory
+  id: ChemDispenserStandardInventory
+  inventory:
+  - Aluminium
+  - Carbon
+  - Chlorine
+  - Copper
+  - Ethanol
+  - Fluorine
+  - Glucose
+  - Hydrogen
+  - Iron
+  - Lithium
+  - Mercury
+  - Nitrogen
+  - Nutriment
+  - Oxygen
+  - Phosphorus
+  - Potassium
+  - Radium
+  - Silicon
+  - Sodium
+  - Sugar
+  - Sulfur
+  - SulfuricAcid
+  - Uranium
+  - Water
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml
index d37c1e4ec8..b238843e9c 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml
@@ -9,16 +9,3 @@
     state: booze_dispenser
   - type: ReagentDispenser
     pack: BoozeDispenserInventory
-
-- type: reagentDispenserInventory
-  id: BoozeDispenserInventory
-  inventory:
-  - Ale
-  - Beer
-  - Cognac
-  - Ice
-  - Kahlua
-  - Rum
-  - Vodka
-  - Whiskey
-  - Wine
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml
index d16d50abeb..47139c65f2 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml
@@ -13,31 +13,3 @@
   - type: ReagentDispenser
     pack: ChemDispenserStandardInventory
   - type: PowerReceiver
-
-- type: reagentDispenserInventory
-  id: ChemDispenserStandardInventory
-  inventory:
-  - Aluminium
-  - Carbon
-  - Chlorine
-  - Copper
-  - Ethanol
-  - Fluorine
-  - Glucose
-  - Hydrogen
-  - Iron
-  - Lithium
-  - Mercury
-  - Nitrogen
-  - Nutriment
-  - Oxygen
-  - Phosphorus
-  - Potassium
-  - Radium
-  - Silicon
-  - Sodium
-  - Sugar
-  - Sulfur
-  - SulfuricAcid
-  - Uranium
-  - Water
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml
index a63b374417..9b70240a9e 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml
@@ -9,13 +9,3 @@
     state: soda_dispenser
   - type: ReagentDispenser
     pack: SodaDispenserInventory
-
-- type: reagentDispenserInventory
-  id: SodaDispenserInventory
-  inventory:
-  - Coffee
-  - Cola
-  - Cream
-  - Ice
-  - Tea
-  - Water