From 51ff76173e89cf19315372d0a5a9380695de3602 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 01:22:49 +0100
Subject: [PATCH 01/35] feat: Powdered drinks orderable by Logi

---
 .../prototypes/catalog/cargo/cargo-food.ftl   |   6 +
 .../catalog/fills/crates/food-crates.ftl      |   6 +
 .../meta/consumable/drink/powdered.ftl        |  38 +++
 .../DeltaV/Catalog/Cargo/cargo_food.yml       |  20 ++
 .../DeltaV/Catalog/Fills/Crates/food.yml      |  40 +++
 .../Consumable/Drinks/powdered_drinks.yml     | 318 ++++++++++++++++++
 .../Consumable/Drink/powdered_drinks.yml      | 116 +++++++
 .../Recipes/Cooking/powdered_drinks.yml       | 155 +++++++++
 .../Drinks/powdered_drinks.rsi/icon-open.png  | Bin 0 -> 4829 bytes
 .../powdered_drinks.rsi/icon-order-dairy.png  | Bin 0 -> 4597 bytes
 .../powdered_drinks.rsi/icon-order-juices.png | Bin 0 -> 4625 bytes
 .../Drinks/powdered_drinks.rsi/icon.png       | Bin 0 -> 4540 bytes
 .../Drinks/powdered_drinks.rsi/meta.json      |  26 ++
 .../powdered_drinks.rsi/overlay-container.png | Bin 0 -> 715 bytes
 14 files changed, 725 insertions(+)
 create mode 100644 Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl
 create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
 create mode 100644 Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
 create mode 100644 Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-open.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-dairy.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-juices.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/overlay-container.png

diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-food.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-food.ftl
index 07cfe0e2f61..2ad1a600fa7 100644
--- a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-food.ftl
+++ b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-food.ftl
@@ -6,3 +6,9 @@ ent-FoodDonkpocketSavory = { ent-CrateFoodDonkpocketSavory }
 
 ent-FoodDonkpocketSweet = { ent-CrateFoodDonkpocketSweet }
     .desc = { ent-CrateFoodDonkpocketSweet.desc }
+
+ent-FoodHydroCoDairy = { ent-CrateHydroCoDairy }
+    .desc = { ent-CrateHydroCoDairy.desc }
+
+ent-FoodHydroCoJuice = { ent-CrateHydroCoJuice }
+    .desc = { ent-CrateHydroCoJuice.desc }
diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl
index 27e1a91b963..8b3f2b72c69 100644
--- a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl
+++ b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl
@@ -6,3 +6,9 @@ ent-CrateFoodDonkpocketSavory = Donk Pocket shipment (Savory)
 
 ent-CrateFoodDonkpocketSweet = Donk Pocket shipment (Sweet)
     .desc = A shipment of five boxes from the sweet Donk Pocket variety selection.
+
+ent-CrateHydroCoDairy = HydroCo Dairy crate
+    .desc = A shipment of powdered dairy products from HydroCo Industries. Contains powdered milk and soy milk.
+
+ent-CrateHydroCoJuice = HydroCo Juice crate
+    .desc = A variety pack of powdered juice products from HydroCo Industries.
diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl
new file mode 100644
index 00000000000..c6da5475044
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl
@@ -0,0 +1,38 @@
+reagent-name-powdered-milk = powdered milk
+reagent-desc-powdered-milk = A powder-based milk substitute that can be reconstituted with water.
+
+reagent-name-powdered-milk-soy = powdered soy milk
+reagent-desc-powdered-milk-soy = A powder-based dairy-free milk substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-orange = powdered orange juice
+reagent-desc-powdered-juice-orange = A powder-based orange juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-lime = powdered lime juice
+reagent-desc-powdered-juice-lime = A powder-based lime juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-lemon = powdered lemon juice
+reagent-desc-powdered-juice-lemon = A powder-based lemon juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-pineapple = powdered pineapple juice
+reagent-desc-powdered-juice-pineapple = A powder-based pineapple juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-banana = powdered banana juice
+reagent-desc-powdered-juice-banana = A powder-based banana juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-berry = powdered berry juice
+reagent-desc-powdered-juice-berry = A powder-based berry juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-watermelon = powdered watermelon juice
+reagent-desc-powdered-juice-watermelon = A powder-based watermelon juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-grape = powdered grape juice
+reagent-desc-powdered-juice-grape = A powder-based grape juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-apple = powdered apple juice
+reagent-desc-powdered-juice-apple = A powder-based apple juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-cherry = powdered cherry juice
+reagent-desc-powdered-juice-cherry = A powder-based cherry juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-carrot = powdered carrot juice
+reagent-desc-powdered-juice-carrot = A powder-based carrot juice substitute that can be reconstituted with water.
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
index 42b4d57e910..f8afc9446f3 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
@@ -27,3 +27,23 @@
   cost: 6000 # Thanks bounties
   category: Food
   group: market
+
+- type: cargoProduct
+  id: FoodHydroCoDairy
+  icon:
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    state: icon-order-dairy
+  product: CrateHydroCoDairy
+  cost: 1500
+  category: Food
+  group: market
+
+- type: cargoProduct
+  id: FoodHydroCoJuice
+  icon:
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    state: icon-order-juices
+  product: CrateHydroCoJuice
+  cost: 2000
+  category: Food
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 6e273a72c48..1a098948d80 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -29,3 +29,43 @@
           amount: 1
         - id: FoodBoxDonkpocketDink
           prob: 0.1
+
+- type: entity
+  id: CrateHydroCoDairy
+  parent: CratePlastic
+  components:
+    - type: StorageFill
+      contents:
+        - id: ReagentTinPowderedMilk
+          amount: 4
+        - id: ReagentTinPowderedMilkSoy
+          amount: 4
+
+- type: entity
+  id: CrateHydroCoJuice
+  parent: CratePlastic
+  components:
+    - type: StorageFill
+      contents:
+        - id: ReagentTinPowderedOrangeJuice
+          amount: 2
+        - id: ReagentTinPowderedLimeJuice
+          amount: 2
+        - id: ReagentTinPowderedLemonJuice
+          amount: 2
+        - id: ReagentTinPowderedPineappleJuice
+          amount: 1
+        - id: ReagentTinPowderedBananaJuice
+          amount: 1
+        - id: ReagentTinPowderedBerryJuice
+          amount: 1
+        - id: ReagentTinPowderedWatermelonJuice
+          amount: 1
+        - id: ReagentTinPowderedGrapeJuice
+          amount: 1
+        - id: ReagentTinPowderedAppleJuice
+          amount: 1
+        - id: ReagentTinPowderedCherryJuice
+          amount: 1
+        - id: ReagentTinPowderedCarrotJuice
+          amount: 1
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
new file mode 100644
index 00000000000..9132f1c70df
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
@@ -0,0 +1,318 @@
+
+- type: entity
+  id: ReagentTinBase
+  parent: ReagentContainerBase
+  components:
+  - type: Openable
+    openableByHand: false
+    sound:
+      path: /Audio/Items/can_open3.ogg
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "icon-open"}
+          False: {state: "icon"}
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 6
+      behaviors:
+      - !type:OpenBehavior
+  - type: Item
+    sprite: Objects/Consumable/Food/snacks.rsi
+    heldPrefix: packet
+    size: Normal
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 3
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 3
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: StaticPrice
+    price: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedOrangeJuice
+  name: tin of powdered orange juice
+  description: A container of powdered orange juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFC420"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedOrangeJuice
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedMilk
+  name: tin of powdered milk
+  description: A container of powdered milk manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the milk.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FAFAFA"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedMilk
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedMilkSoy
+  name: tin of powdered soy milk
+  description: A container of powdered soy milk manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the milk.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFFCE3"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedMilkSoy
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedLimeJuice
+  name: tin of powdered lime juice
+  description: A container of powdered lime juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#B4FF64"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceLime
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedLemonJuice
+  name: tin of powdered lemon juice
+  description: A container of powdered lemon juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFFC69"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceLemon
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedPineappleJuice
+  name: tin of powdered pineapple juice
+  description: A container of powdered pineapple juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFD644"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuicePineapple
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedBananaJuice
+  name: tin of powdered banana juice
+  description: A container of powdered banana juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFFEBF"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceBanana
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedBerryJuice
+  name: tin of powdered berry juice
+  description: A container of powdered berry juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#D366FF"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceBerry
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedWatermelonJuice
+  name: tin of powdered watermelon juice
+  description: A container of powdered watermelon juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFBCDB"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceWatermelon
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedGrapeJuice
+  name: tin of powdered grape juice
+  description: A container of powdered grape juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#E57DFF"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceGrape
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedAppleJuice
+  name: tin of powdered apple juice
+  description: A container of powdered apple juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFC67E"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceApple
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedCherryJuice
+  name: tin of powdered cherry juice
+  description: A container of powdered cherry juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#A9536C"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceCherry
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedCarrotJuice
+  name: tin of powdered carrot juice
+  description: A container of powdered carrot juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFA06B"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceCarrot
+          Quantity: 50
diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
new file mode 100644
index 00000000000..a6ab37b2df3
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
@@ -0,0 +1,116 @@
+- type: reagent
+  id: PowderedMilk
+  name: reagent-name-powdered-milk
+  group: Foods
+  desc: reagent-desc-powdered-milk
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: sweet
+  color: "#FAFAFA"
+
+- type: reagent
+  id: PowderedMilkSoy
+  name: reagent-name-powdered-milk-soy
+  group: Foods
+  desc: reagent-desc-powdered-milk-soy
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: soy
+  color: "#FFFCE3"
+
+- type: reagent
+  id: PowderedJuiceOrange
+  name: reagent-name-powdered-juice-orange
+  group: Foods
+  desc: reagent-desc-powdered-juice-orange
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: sour
+  color: "#FFC420"
+
+- type: reagent
+  id: PowderedJuiceLime
+  name: reagent-name-powdered-juice-lime
+  group: Foods
+  desc: reagent-desc-powdered-juice-lime
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: sour
+  color: "#B4FF64"
+
+- type: reagent
+  id: PowderedJuiceLemon
+  name: reagent-name-powdered-juice-lemon
+  group: Foods
+  desc: reagent-desc-powdered-juice-lemon
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: sour
+  color: "#FFFC69"
+
+- type: reagent
+  id: PowderedJuicePineapple
+  name: reagent-name-powdered-juice-pineapple
+  group: Foods
+  desc: reagent-desc-powdered-juice-pineapple
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: sour
+  color: "#FFD644"
+
+- type: reagent
+  id: PowderedJuiceBanana
+  name: reagent-name-powdered-juice-banana
+  group: Foods
+  desc: reagent-desc-powdered-juice-banana
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: sweet
+  color: "#FFFEBF"
+
+- type: reagent
+  id: PowderedJuiceBerry
+  name: reagent-name-powdered-juice-berry
+  group: Foods
+  desc: reagent-desc-powdered-juice-berry
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: bitter
+  color: "#D366FF"
+
+- type: reagent
+  id: PowderedJuiceWatermelon
+  name: reagent-name-powdered-juice-watermelon
+  group: Foods
+  desc: reagent-desc-powdered-juice-watermelon
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: sickly
+  color: "#FFBCDB"
+
+- type: reagent
+  id: PowderedJuiceGrape
+  name: reagent-name-powdered-juice-grape
+  group: Foods
+  desc: reagent-desc-powdered-juice-grape
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: sour
+  color: "#E57DFF"
+
+- type: reagent
+  id: PowderedJuiceApple
+  name: reagent-name-powdered-juice-apple
+  group: Foods
+  desc: reagent-desc-powdered-juice-apple
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: sweet
+  color: "#FFC67E"
+
+- type: reagent
+  id: PowderedJuiceCherry
+  name: reagent-name-powdered-juice-cherry
+  group: Foods
+  desc: reagent-desc-powdered-juice-cherry
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: sour
+  color: "#A9536C"
+
+- type: reagent
+  id: PowderedJuiceCarrot
+  name: reagent-name-powdered-juice-carrot
+  group: Foods
+  desc: reagent-desc-powdered-juice-carrot
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: bitter
+  color: "#FFA06B"
diff --git a/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml
new file mode 100644
index 00000000000..3fccd07bda7
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml
@@ -0,0 +1,155 @@
+- type: reaction
+  id: ReconstitutePowderedMilk
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedMilk:
+      amount: 1
+  products:
+    Milk: 2
+
+- type: reaction
+  id: ReconstitutePowderedMilkSoy
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedMilkSoy:
+      amount: 1
+  products:
+    MilkSoy: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceOrange
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceOrange:
+      amount: 1
+  products:
+    JuiceOrange: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceLemon
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceLemon:
+      amount: 1
+  products:
+    JuiceLemon: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceLime
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceLime:
+      amount: 1
+  products:
+    JuiceLime: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuicePineapple
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuicePineapple:
+      amount: 1
+  products:
+    JuicePineapple: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceBanana
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceBanana:
+      amount: 1
+  products:
+    JuiceBanana: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceWatermelon
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceWatermelon:
+      amount: 1
+  products:
+    JuiceWatermelon: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceBerry
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceBerry:
+      amount: 1
+  products:
+    JuiceBerry: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceGrape
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceGrape:
+      amount: 1
+  products:
+    JuiceGrape: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceApple
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceApple:
+      amount: 1
+  products:
+    JuiceApple: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceCherry
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceCherry:
+      amount: 1
+  products:
+    JuiceCherry: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceCarrot
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceCarrot:
+      amount: 1
+  products:
+    JuiceCarrot: 2
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddccc536a65e4df94fa862a7db2770c9efebf9b4
GIT binary patch
literal 4829
zcmeHKdsGuw8lOZS0i^W-E2yh6SRd#lGs%P`BLS2|h!7i*6+~8;OeQ#z7fFDCLJ?OB
z;$w9wilTLW@@PFiPHn|k3n;o(w5wGr_&C^IT^}eaxQdp&6P}*!IeR>3`ya`<x!>IT
z`+oPkzx&+}rcg6C!rODSCj>#>sz^l)=($YexPf0=cJ>R<U8dqydX*{=;(!N$WVt{r
z1_K&vfX!wNfrfyw)u4?4HiKc>XqKz9UkmIpJ$5m$r}SVLAC$$0yg^?Enh@ANpsxgt
z{<M3oQ^00E9OqZUhMb7rK0>9|aD{vn;ftie9}!|WisEPx7eR3Z!$m=0eb&zYh#01X
z`9T*!d@JejaE&TFoNKX~^|XP4AV*owMtNjy*w`~kp?h}uy3X)PJEz(HXcuq&SDwo9
zVM|vn_<c10ZT=*0)taK+cM>d5$wLqBw0u#uvWm;e&6CcMPOXkC?27V)wZYQX`s2$s
z9M8-<y^yN(kA^Ds{-v=o=l&75>hiSLs0+8Cye>LtuFsXHW0PJ!ZENQ@96536t<0@B
z|2*`0SXpv4G2A@tk|6=Vm(#+T7UkI{Yx~p8Q4@22u731v%)L#uxjX#P!=+g*oI{!i
z+G9lvf6^50FC^Dg&N~%)?{H04(UF8Nk95didDXfasnUm7#Ksz433pcBT0F44W>(pP
zbv`5gZ+x8n?})LdBl)F?zKC`DPB-68cip>I-oCl@Ood7^wag`Zv7wV3%6ZKGa<%c3
z@l6>IT{yu*;u7kUQrSm7-y^{j9&!Ad-S`J)Y(3$g*b4nH`H#Yh5uTS{j4JxJ(?4ha
zIKNY_udg-Vy3r}kfev5&!)rIG)a7hc@yXV<)?2N&evw~ked0cOwzU9G`78{ipo5N$
zx5ulaanfw$6FRe&;ya8M=DeWbP=|#eQz<)FOQp~zIq%8w(>yM%lk?)lYD8@br<Tx>
z*;Z<P_S{%9JC&5_c%dPl!44b{7%4l!br=mM8}5+voV+-&nPCBs>x9@-<-B;1M&V{F
z#l`p-AAyw)Izz|{@#F?ub$UETF}sHXJjr=W>~;$-5M*X%@-szzvo%G4%49MDA`}RP
zFhIbzER&sZz$RM&L($Elplqa-w%BR2iOX;jT64Nx&f|f3Zf|@>i(1`BZ?g5M0Q3+z
z2#WyaBLbsQFwnzhS7rc`o`8PU!xo!mp#(9M&75u}DP;y_vIh*L(2;%qmUOGZxg8xT
zpbV4|Ky6@E^qnP{3)kntNRUDsElw{W_B%*Bt?w7>o!FQe=XM4L0^Iv}-$D28-3bOL
zwHjBL$#f<>l|s&A*2i^blGfo)Q;1ShQi@7pEh5#z7)FX<La&v;5+Op!2qCFQq`CoA
zDwEAlm`IAD0_1!e@JPiNO34s0jAEz`#`Gu!6DTHvWkRhiNJs_+VS3R3ijS={$V$R6
zFe-*h2dHEiLFzFb0?SAQ0aPLkmWs3@SR5n{(xL<<!7$WGr6cj#W~-3^$4MKB6iQ$*
zr8p-T!SR_Im7FK!BmE;917X(#2RSdAHl;iICt_(MHQ!D!YN8SmDnZ4VL?RJmB23y3
zT0mKCAQKr*XX$j#Fvo&}%>ZEuCQku@a~$ji54Tc;-E56Dn+<YaU(xNGR)g!LBkY8N
zuv37vuMEfbmf>lP(H%ZRr#9<oeb)a%Gna=O4DjH{BWW90Kg&7PeWT`6Y28oVj|SR#
zmAG8zrN9ZYdkZ!qgX%tSz|}oPE+I@Q6sR6O>DoI^|4J$d37wddp?X-4AQX&=#00F>
ziN!FY6QO#sgcOld%BeyhyUnb(XA)LwW(v>|Xa&;K`3H(S#d%Ou-$iFGp_o$ug25;X
zqd~obNqPhm^lVtb)QsL82Mhj7lVB%cK#>7{-D9A5fm$f&D~3Iqfp~w*PtRHWmP>HC
zgNwYEzJqcN%Jp6fycc*dy9VWYF9qHUJeXboH@Q6fU#BP&_%A3EyexTqQ+x=#Xt`;l
zA{0;;^WAxJ|6jm}hb3~M4T8KzGK~doE%O6|?sk=0>3-j9807L%h*psgLF{EJ#mw0F
z+Q%gq=Qf4;tUCSI#t&xIEI#O2bZ&%FQ>arWP1x{5<-BKZw-nP4C)bb3E5A|y^yu`3
zym=nJN{+|hHWb{vI<ow`D@q@Uhf7&<T;<h(i&}kav+U)C?K6gSu^+ToFU3X&dfjfR
zP}Qdu@1wssv5<A=e$#Mh-RyAPoNv>{x*qJv@XjlG?gd4E?~?rTdp@*i(IQ?td;Q&V
zZ3QRq$tx&v@nYWIJ(?+X8F6uOWjl79+EVwT+~f9hkJ@3Ep2sgg8TqjKOj{fJYWcXS
z)KVGJUbdom)3x-X&d$#05pU+X>Yh%nSsrrf{CN+kgqpB-;?UaIpFb(id(v69eLD*Y
z4c+jhGrq(%%x^VRVGMcpyQ@pZKNjWs?YOt@!U|QS{MgQjI_%;K_3kM($lCbQRjXW~
zj*gDAlQx|@xS(pP`bx{GeRM&^r%{_rN~B%6A=ic%PTclz_4+kF+BwPh-Jt3Nq~F;*
zwtLct)vl=x(a~DGBKBC~2YC(Z{mX_1w*0eW-?nc;->_V>-;VO#MKu3X{m~kp-YRO_
za^N9!p`n3oaX9>@4SO^6?*W>?lE&M&>(BWgV#{N;?mIJQi|yvuJWl?LzzJbrCHPiV
zRZSNNMk?nux3;$4x8rGE`FUJUV{@}l#rT<E9%^c8@+>Iw4Lg3*%`f$ColEwQ<}H!?
z%-`7>8yhtj^|s^-M~&C6UsrYolq7sGboWn&82;wFxyKUqTQrrb#tn1!?wV8@)y{bx
zaOq9>GoQrkXVPz;j!I5RiHH_%u4ErIeyC`z<{vet*t|b07`L`P>FbT_+vEP_Tl8}L
yt%~W7N6yG;NE@-OFjt}4-T9*J$eqx$b!OY^fZ2b(qDcjr38|EG6$fS|=l=)6E5Qi>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-dairy.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-dairy.png
new file mode 100644
index 0000000000000000000000000000000000000000..f83b746104f5ba404cd36df3bc72714b90053f4e
GIT binary patch
literal 4597
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
R*TIfK`lR*R6A3xn{{zifRV@Gj

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-juices.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-juices.png
new file mode 100644
index 0000000000000000000000000000000000000000..050af5368b90bbc8e65a5309ecdbe879d05a20db
GIT binary patch
literal 4625
zcmeHKdsGuw8lNDK7>lCfDn7Pzf?J_DNhX9OGZ3EP5g|Z%$U`kmW+pJ27s&vDEiU3?
z1+3cQ>Wa8UYAsrHPoZ7U@=#aSYLBjB-6w0QYwL0A17)kLl~dR|lkhs*bM|n~_CJzy
zbHBOw_x<j7fA_l|Ol^8<qOWMF2!bGAU6M8f^f1?i-r(0!S@{HXeRQtQsMEa)3BdzE
z3OpeJhXGA6$@UP;f@XoS9iS}$HizNbQh^uW?*jHRx4jS8L2eA^g9<z#U(h#!CI_}Z
z=ud#g{M@zH8DMiCA^%l*Ks;isPt@ttVYvjANkY}YUnW=JD2k&>Scc*<3=dU-^##on
z5phgMTfFXp__i`}ap}6aIM`;l8W|G}LC&VCw=_w;(aSFsL>+Be<Q48;aw+}rgBJ1b
zk45pVejB&1U6CUBuI3eAU0waVxAJX|$q(<{y507{)(>Fe=4y4gI=C~bb~IUp7$Vez
z7rTDCr>ngBY#x0gAO$*M3^<sTap_LZ_P&r8s3*L$_4g@Nss1+}FE4oZc<8C*YDf3A
z?=bIuHJ?K7L^l<767#Ko*G&2N-KyKdkYv#iHnc5f@yg9#bw2plvb%5hZvIsO+J3O&
zw(!IBdxqcE=lw0c_WfG2?!;?nqVBezuc+_HKiTnb&9`%Uz0CB%`-;T3&WrcMvDLfq
zS6k1=Hm!Zre_=p>TIKV^<!6&52iGr>*;hAvFM9h+pV6&feBOBBxK0(^<XQQ;X_$OT
z_|W6z4)f1m{(ISdPhrHYocxOgn>;$+IjX|*9|)J+^p>0oZ|wG2KL}l4wL!izQPlTj
zas9dBfU3+NFFE7&;?Fk+`iIq3Q2QUVUwEt4o}VP|>lqvx92guJ(cBn(<g+Tlz7r|>
zMKnl3CzF-S=IT>$(rT6vl+{2>oMsz$UQk4o(?*b+XcjimMT|uwe$;hV3^SBQoD-&(
z>1}azF_Tnjr!y;4v&hO#Bu0s&B1I8S91xgkmVljRlf{8MHDaC@2R1h>6~jD)-J}uc
zf;5V=+G$uJQAlJ+ypt)Diz7vFgq<?t8QKIl1$feki&@r&OQq%I<&yGHiPc^tMKKJM
z%H&eH903T#QDI>TCt`5~auhBOE$txfjE!Zi7MSBC4AxRsBNl^scq~4%O|KuPw>aD?
z06nBm!X`x}GO5`to$TRY<I4bvJD~6NaAZ~3XlVxRu$J0MI=+myuz`~)D01B2R%$o#
z+o4D)ZKBNp>Hw>vQ<mf|+_(oPK@nrN@m@geDM*$vPKY%nHg1OB&g4LV`#A3u^w{2c
zFhJ?`xYkORa^dN;8Zoy%PFYEY!g-Tc%LzH9R3Qo)13!c^6j7^{6oMH;jU=j6C=5nw
z5|z&4U<nIJb5wv_!T=r>O;IR@DiM{!NF$(O2%!Kx3Zs%jRYsXnMX4uIq}dsem4s<>
zR2&rrsN^ygi5ZO;BEv!f0ZD;CP=ygusi{yEsX&!<7{*gkB%WZkn+b57jF~8+r8Y|u
zKfwu($E52tV!1>%F_LZ~SR-)Ih*KC#sdHi?i!sxgEWxRXszOl}8m3aqP?cJZq7$IC
zwA}$Rk>lh`CqKg-3l25|geAB<1qA#!*b5$KrwP_-&$3!g8u5719iP^N>qHSOp(R)v
zkdBw(tg$j2!WpjcIXb<SVvH643(Z{~I0E3oktZ<@uzm$U<hoIrbcyT9^=M-Fs|3UR
zrN9Z&wFL)JM!U`%aJi<)V!~2HgX-Z<*RgTtds2Z@4wDfWqBhV<M4=+(2u6m5A)%BS
zQyRih1IPtlg>iO=)yS3;b~>gA=m@j|>B;|rf`j;j3Z9BCFQ&Ou0D>VXil9ojU<#RA
zFsXaPQm$r<?KndEUz$YlfJsFL__@YF@dC9_I$jLjnt^zK$dCIhe#j+YcxI7l={qCW
zj9k-FU|Qgr?3$5lS_(`HJd<7jH@QR;uT!)I{1;RXUY3SKGH-(yEpJ0|q81wEzRf-F
zH-M4Zwxm1<1kG8<H38Jvv;++LusVIb&p+q*L9>INRwdZM%k-~x+L)}|-iK?$lY7(s
zM?TxJrYcaoGqv2_9d#}y_yVl%(iPOzA0m&}%wxZqm(<z-r&@B>9Qf>%y$hqS|EPOz
z-QE_#{q$vR%Eriy18*d&pEVu&=I~$cK#^}ee>`+;FW%#q_Q}1}&bH03R3tQiotvGV
zcxdCt{pkEpPdc)*j|7Q=-n-Q_y0JiVU_-;+oA{oDccH@Y#j$@?*0r$u*ui5Z+x(E!
zvzHIUedcEwYhr>QR)|KfRIk1)oaejMVF|y}6nNk=wm(`Z$lE_02Uo-L`74IMU0Jt%
zLBhqv{)DU8>0!gjt@$~JemCM*EM9oMq@=xO9sZ`_h$qzA(}*b7Z3%?V`6^%JcwBDJ
z{|Xza{?o(bI|`32{o>LJsJZ=q%)F0!iAc|08MItA_o^UPxFGi<bIOe;7ST(+)yJ6M
zv@!jwjtF-B<0<ur*G^~Vy__=pOu|5jN6&iWt}UoC*CRQNNc?=@%GZVRXdzSEgnGyB
zRHc<{s2nZXzq?!TORp<o7t5pPdJQ*h0s8#p$@bkXohf;zo(Xa?`<~~u?XF$CI%*Hr
l|K6i72Ta=62e(B=LKz(mr#<5O*MZZ7bn&U$Q?Z3L{{ek7QB(i`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1207db777ea7e407fa5547ad3e4e41ce5846514e
GIT binary patch
literal 4540
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
HTebc_1N$y`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/meta.json
new file mode 100644
index 00000000000..244894f967a
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Original image of canned beans (beans.rsi) taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Modified by DisposableCrewmember42.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-open"
+    },
+    {
+      "name": "overlay-container"
+    },
+    {
+      "name": "icon-order-juices"
+    },
+    {
+      "name": "icon-order-dairy"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/overlay-container.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/overlay-container.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e01d12b37712052bdccd91ac675d102527c8fcb
GIT binary patch
literal 715
zcmV;+0yO=JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>CJn4ptCx$WWauf{HlSDionYs1;guFuC*#nlvOW
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yan9G^;BHXnNI5
zCE{WxyDA1=(T5NQF#%C#mN6$uNqCO0d-(Wz7v)*r=l&f1YR+PSPb7{p!>kf-5YKE@
z4bJ<-VOEq?;&bA0lP*a7$aTf#H_ioz1)do;)2VslFtJ$ZV5Ngu(bR~ii6g3}Q@)UK
zS>?RNSu59A>z@3D!JNLb%ypV0NMI35kRU=q4JDLOMU+;Z6bmWZk9+us9lt~_g<K^t
zax9<%4YK10|AXJ%TKTC-Hz^ngx?gPjV-yJN0?oQ@e;?a+^91le16O+6UugidpQP8@
zTI2`_Z37qAZB5w&E_Z;TCqp)6NAlAY@_FF>jJ_!g4BP^}Yi@6?eVjf3Y3eF@0~{Oz
zV+G1y_jq?tXK(+WY4!I5*p+h6Ov%Un00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_007%bL_t(o!|jx@ii9u}MNfvoE{()4_E!G?AK3c?HjyAo3X{ev
zTM09uyAfs>X36P7F5%_AcOPUjnM@{=$s}NmiSN?iQ$$iqj4{zUN87gIOxO2)-1Vu5
z6j6*Z0t~~zG)>fX4S;hFfU+zJAy5<rQc9Fk2qDDF9C&m>N=a2!hmX(m9Iv+b_UZY$
zT)^4y|GN7>4t%_T-v;d~hcGFI<2XJomwhiR%L0H>iv8@pXWO>dI-s={-g~UIc<&E2
x>$+mCC4_+1IynuOW7BnAJllj#(+D!(#t*k6TvlQOzt#W%002ovPDHLkV1ie+J7WL<

literal 0
HcmV?d00001


From 64a8744f7510994f53694cfcbe880bd0923ace27 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 01:35:23 +0100
Subject: [PATCH 02/35] tweak: Lower amounts per crate

---
 .../Prototypes/DeltaV/Catalog/Fills/Crates/food.yml    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 1a098948d80..63c35c156a9 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -37,9 +37,9 @@
     - type: StorageFill
       contents:
         - id: ReagentTinPowderedMilk
-          amount: 4
+          amount: 3
         - id: ReagentTinPowderedMilkSoy
-          amount: 4
+          amount: 1
 
 - type: entity
   id: CrateHydroCoJuice
@@ -48,11 +48,11 @@
     - type: StorageFill
       contents:
         - id: ReagentTinPowderedOrangeJuice
-          amount: 2
+          amount: 1
         - id: ReagentTinPowderedLimeJuice
-          amount: 2
+          amount: 1
         - id: ReagentTinPowderedLemonJuice
-          amount: 2
+          amount: 1
         - id: ReagentTinPowderedPineappleJuice
           amount: 1
         - id: ReagentTinPowderedBananaJuice

From 9da8f35d136593be688c06e54e4b40e58b464119 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 02:20:17 +0100
Subject: [PATCH 03/35] chore: fix copy-paste mistake

---
 .../deltav/prototypes/catalog/fills/crates/food-crates.ftl    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl
index 8b3f2b72c69..46db58d2bb3 100644
--- a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl
+++ b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl
@@ -8,7 +8,7 @@ ent-CrateFoodDonkpocketSweet = Donk Pocket shipment (Sweet)
     .desc = A shipment of five boxes from the sweet Donk Pocket variety selection.
 
 ent-CrateHydroCoDairy = HydroCo Dairy crate
-    .desc = A shipment of powdered dairy products from HydroCo Industries. Contains powdered milk and soy milk.
+    .desc = A shipment of powdered dairy products from HydroCo. Contains powdered milk and soy milk.
 
 ent-CrateHydroCoJuice = HydroCo Juice crate
-    .desc = A variety pack of powdered juice products from HydroCo Industries.
+    .desc = A variety pack of powdered juice products from HydroCo.

From ab17a37ec02da1096671906952f3b754bf381abe Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 02:20:34 +0100
Subject: [PATCH 04/35] feat: Add HydroCo to StockTrade App

---
 Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl | 1 +
 Resources/Prototypes/DeltaV/Entities/Stations/base.yml   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl b/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
index 69ef7330a56..09067ec1d57 100644
--- a/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
+++ b/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
@@ -4,3 +4,4 @@ stock-trading-company-gorlex = Gorlex [GRX]
 stock-trading-company-interdyne = Interdyne Pharmaceuticals [INTP]
 stock-trading-company-fishinc = Fish Inc. [FIN]
 stock-trading-company-donk = Donk Co. [DONK]
+stock-trading-company-hydroco = HydroCo [HYD]
diff --git a/Resources/Prototypes/DeltaV/Entities/Stations/base.yml b/Resources/Prototypes/DeltaV/Entities/Stations/base.yml
index fe31706b262..89f420f1573 100644
--- a/Resources/Prototypes/DeltaV/Entities/Stations/base.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Stations/base.yml
@@ -19,3 +19,6 @@
     - displayName: stock-trading-company-donk
       basePrice: 90
       currentPrice: 90
+    - displayName: stock-trading-company-hydroco
+      basePrice: 30
+      currentPrice: 30

From 61b71bd9cf73bb583548e321c0c4d883a4e3ee5f Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 02:39:00 +0100
Subject: [PATCH 05/35] tweak: Lemon, Lime and Pineapple Juice powders now deal
 slight Caustic damage

---
 .../Consumable/Drink/powdered_drinks.yml      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
index a6ab37b2df3..763d821aeff 100644
--- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
@@ -33,6 +33,13 @@
   physicalDesc: reagent-physical-desc-powdery
   flavor: sour
   color: "#B4FF64"
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Caustic: 0.5
 
 - type: reagent
   id: PowderedJuiceLemon
@@ -42,6 +49,13 @@
   physicalDesc: reagent-physical-desc-powdery
   flavor: sour
   color: "#FFFC69"
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Caustic: 0.5
 
 - type: reagent
   id: PowderedJuicePineapple
@@ -51,6 +65,13 @@
   physicalDesc: reagent-physical-desc-powdery
   flavor: sour
   color: "#FFD644"
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Caustic: 0.5
 
 - type: reagent
   id: PowderedJuiceBanana

From 7bb89e920f90a2e6bc54db782f886e44008666e7 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 02:44:40 +0100
Subject: [PATCH 06/35] i18n: Powdered watermelon juice does not include water

---
 .../en-US/deltav/reagents/meta/consumable/drink/powdered.ftl  | 2 +-
 .../Entities/Objects/Consumable/Drinks/powdered_drinks.yml    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl
index c6da5475044..48466cb56d2 100644
--- a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl
+++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl
@@ -22,7 +22,7 @@ reagent-desc-powdered-juice-banana = A powder-based banana juice substitute that
 reagent-name-powdered-juice-berry = powdered berry juice
 reagent-desc-powdered-juice-berry = A powder-based berry juice substitute that can be reconstituted with water.
 
-reagent-name-powdered-juice-watermelon = powdered watermelon juice
+reagent-name-powdered-juice-watermelon = powdered melon juice
 reagent-desc-powdered-juice-watermelon = A powder-based watermelon juice substitute that can be reconstituted with water.
 
 reagent-name-powdered-juice-grape = powdered grape juice
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
index 9132f1c70df..7754779ca8b 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
@@ -215,8 +215,8 @@
 - type: entity
   parent: ReagentTinBase
   id: ReagentTinPowderedWatermelonJuice
-  name: tin of powdered watermelon juice
-  description: A container of powdered watermelon juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  name: tin of powdered melon juice
+  description: A container of powdered watermelon juice manufactured by HydroCo. NOTE - Melon only; water not included, sold separately. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
   components:
   - type: Sprite
     sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi

From f1a52bd01f42900ea945b24cc1d5b17295995838 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 03:15:18 +0100
Subject: [PATCH 07/35] feat: If eating straight powdered beverage, cough and
 vomit

---
 .../Consumable/Drink/powdered_drinks.yml      | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
index 763d821aeff..33081a52a1a 100644
--- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
@@ -1,4 +1,21 @@
 - type: reagent
+  id: BasePowderedBeverage
+  flavor: terrible
+  metabolisms:
+    Poison:
+      effects:
+      - !type:Emote
+        emote: Cough
+        showInChat: true
+        probability: 0.33
+      - !type:ChemVomit
+        probability: 0.1
+        conditions:
+        - !type:ReagentThreshold
+          min: 15
+
+- type: reagent
+  parent: BasePowderedBeverage
   id: PowderedMilk
   name: reagent-name-powdered-milk
   group: Foods
@@ -8,6 +25,7 @@
   color: "#FAFAFA"
 
 - type: reagent
+  parent: BasePowderedBeverage
   id: PowderedMilkSoy
   name: reagent-name-powdered-milk-soy
   group: Foods
@@ -17,6 +35,7 @@
   color: "#FFFCE3"
 
 - type: reagent
+  parent: BasePowderedBeverage
   id: PowderedJuiceOrange
   name: reagent-name-powdered-juice-orange
   group: Foods
@@ -26,6 +45,7 @@
   color: "#FFC420"
 
 - type: reagent
+  parent: BasePowderedBeverage
   id: PowderedJuiceLime
   name: reagent-name-powdered-juice-lime
   group: Foods
@@ -40,8 +60,18 @@
         damage:
           types:
             Caustic: 0.5
+      - !type:Emote
+        emote: Cough
+        showInChat: true
+        probability: 0.33
+      - !type:ChemVomit
+        probability: 0.1
+        conditions:
+        - !type:ReagentThreshold
+          min: 15
 
 - type: reagent
+  parent: BasePowderedBeverage
   id: PowderedJuiceLemon
   name: reagent-name-powdered-juice-lemon
   group: Foods
@@ -56,8 +86,18 @@
         damage:
           types:
             Caustic: 0.5
+      - !type:Emote
+        emote: Cough
+        showInChat: true
+        probability: 0.33
+      - !type:ChemVomit
+        probability: 0.1
+        conditions:
+        - !type:ReagentThreshold
+          min: 15
 
 - type: reagent
+  parent: BasePowderedBeverage
   id: PowderedJuicePineapple
   name: reagent-name-powdered-juice-pineapple
   group: Foods
@@ -72,8 +112,18 @@
         damage:
           types:
             Caustic: 0.5
+      - !type:Emote
+        emote: Cough
+        showInChat: true
+        probability: 0.33
+      - !type:ChemVomit
+        probability: 0.1
+        conditions:
+        - !type:ReagentThreshold
+          min: 15
 
 - type: reagent
+  parent: BasePowderedBeverage
   id: PowderedJuiceBanana
   name: reagent-name-powdered-juice-banana
   group: Foods
@@ -83,6 +133,7 @@
   color: "#FFFEBF"
 
 - type: reagent
+  parent: BasePowderedBeverage
   id: PowderedJuiceBerry
   name: reagent-name-powdered-juice-berry
   group: Foods
@@ -92,6 +143,7 @@
   color: "#D366FF"
 
 - type: reagent
+  parent: BasePowderedBeverage
   id: PowderedJuiceWatermelon
   name: reagent-name-powdered-juice-watermelon
   group: Foods
@@ -101,6 +153,7 @@
   color: "#FFBCDB"
 
 - type: reagent
+  parent: BasePowderedBeverage
   id: PowderedJuiceGrape
   name: reagent-name-powdered-juice-grape
   group: Foods
@@ -110,6 +163,7 @@
   color: "#E57DFF"
 
 - type: reagent
+  parent: BasePowderedBeverage
   id: PowderedJuiceApple
   name: reagent-name-powdered-juice-apple
   group: Foods
@@ -119,6 +173,7 @@
   color: "#FFC67E"
 
 - type: reagent
+  parent: BasePowderedBeverage
   id: PowderedJuiceCherry
   name: reagent-name-powdered-juice-cherry
   group: Foods
@@ -128,6 +183,7 @@
   color: "#A9536C"
 
 - type: reagent
+  parent: BasePowderedBeverage
   id: PowderedJuiceCarrot
   name: reagent-name-powdered-juice-carrot
   group: Foods

From 317aeb8b5143e582c0868bcc5ea7629c732873d9 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 03:20:31 +0100
Subject: [PATCH 08/35] tweak: change powder tastes

---
 .../DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
index 33081a52a1a..66299277546 100644
--- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
@@ -129,7 +129,7 @@
   group: Foods
   desc: reagent-desc-powdered-juice-banana
   physicalDesc: reagent-physical-desc-powdery
-  flavor: sweet
+  flavor: terrible
   color: "#FFFEBF"
 
 - type: reagent
@@ -149,7 +149,7 @@
   group: Foods
   desc: reagent-desc-powdered-juice-watermelon
   physicalDesc: reagent-physical-desc-powdery
-  flavor: sickly
+  flavor: terrible
   color: "#FFBCDB"
 
 - type: reagent
@@ -169,7 +169,7 @@
   group: Foods
   desc: reagent-desc-powdered-juice-apple
   physicalDesc: reagent-physical-desc-powdery
-  flavor: sweet
+  flavor: sour
   color: "#FFC67E"
 
 - type: reagent

From 5f685a331c3042bfb99f49ff91dbe4eb0f02b026 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 03:31:41 +0100
Subject: [PATCH 09/35] tweak: Add spoons to HydroCo crates

---
 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 63c35c156a9..992df49b703 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -36,6 +36,8 @@
   components:
     - type: StorageFill
       contents:
+        - id: Spoon
+          amount: 2
         - id: ReagentTinPowderedMilk
           amount: 3
         - id: ReagentTinPowderedMilkSoy
@@ -47,6 +49,8 @@
   components:
     - type: StorageFill
       contents:
+        - id: Spoon
+          amount: 2
         - id: ReagentTinPowderedOrangeJuice
           amount: 1
         - id: ReagentTinPowderedLimeJuice

From 0c4745ab4d2234707e8cf9f846d22c882a4d6fda Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 03:47:10 +0100
Subject: [PATCH 10/35] tweak: Add HydroCo consumption notice to crates

---
 .../DeltaV/Catalog/Fills/Crates/food.yml      |  4 ++++
 .../DeltaV/Entities/Objects/Misc/paper.yml    | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 992df49b703..39fe0924c87 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -36,6 +36,8 @@
   components:
     - type: StorageFill
       contents:
+        - id: PaperCrateHydroCoConsumption
+          amount: 1
         - id: Spoon
           amount: 2
         - id: ReagentTinPowderedMilk
@@ -49,6 +51,8 @@
   components:
     - type: StorageFill
       contents:
+        - id: PaperCrateHydroCoConsumption
+          amount: 1
         - id: Spoon
           amount: 2
         - id: ReagentTinPowderedOrangeJuice
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
index 96fe66f08b4..1abffd4dc6e 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
@@ -30,3 +30,25 @@
   id: PaperFugitiveReport
   name: fugitive report
   description: An arrest warrant for a space fugitive sent from GALPOL.
+
+- type: entity
+  id: PaperCrateHydroCoConsumption
+  categories: [ HideSpawnMenu ]
+  name: HydroCo Notice
+  parent: Paper
+  components:
+  - type: Paper
+    stampState: paper_stamp-generic
+    stampedBy:
+    - stampedColor: '#8F99D6FF'
+      stampedName: HydroCo
+    content: |2
+
+      [head=1]HydroCo - Hydrate Tastefully[/head]
+
+      [bold]Consumption Notice[/bold]
+      HydroCo reminds all customers that powdered products are NOT meant for direct consumption.
+      Attempting to eat the powder directly may result in choking hazards and severe discomfort.
+      Always mix with water according to package instructions before consuming.
+
+      Thank you for choosing HydroCo! Enjoy your drinks!

From d76880c463adc8903d81d9efa377c43c36cb78d9 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 03:53:09 +0100
Subject: [PATCH 11/35] refactor: consistent naming

---
 .../DeltaV/Catalog/Fills/Crates/food.yml      | 22 ++++++++--------
 .../Consumable/Drinks/powdered_drinks.yml     | 25 +++++++++----------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 39fe0924c87..6b4dc630b16 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -55,25 +55,25 @@
           amount: 1
         - id: Spoon
           amount: 2
-        - id: ReagentTinPowderedOrangeJuice
+        - id: ReagentTinPowderedJuiceOrange
           amount: 1
-        - id: ReagentTinPowderedLimeJuice
+        - id: ReagentTinPowderedJuiceLime
           amount: 1
-        - id: ReagentTinPowderedLemonJuice
+        - id: ReagentTinPowderedJuiceLemon
           amount: 1
-        - id: ReagentTinPowderedPineappleJuice
+        - id: ReagentTinPowderedJuicePineapple
           amount: 1
-        - id: ReagentTinPowderedBananaJuice
+        - id: ReagentTinPowderedJuiceBanana
           amount: 1
-        - id: ReagentTinPowderedBerryJuice
+        - id: ReagentTinPowderedJuiceBerry
           amount: 1
-        - id: ReagentTinPowderedWatermelonJuice
+        - id: ReagentTinPowderedJuiceWatermelon
           amount: 1
-        - id: ReagentTinPowderedGrapeJuice
+        - id: ReagentTinPowderedJuiceGrape
           amount: 1
-        - id: ReagentTinPowderedAppleJuice
+        - id: ReagentTinPowderedJuiceApple
           amount: 1
-        - id: ReagentTinPowderedCherryJuice
+        - id: ReagentTinPowderedJuiceCherry
           amount: 1
-        - id: ReagentTinPowderedCarrotJuice
+        - id: ReagentTinPowderedJuiceCarrot
           amount: 1
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
index 7754779ca8b..8816552065f 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
@@ -1,4 +1,3 @@
-
 - type: entity
   id: ReagentTinBase
   parent: ReagentContainerBase
@@ -46,7 +45,7 @@
 
 - type: entity
   parent: ReagentTinBase
-  id: ReagentTinPowderedOrangeJuice
+  id: ReagentTinPowderedJuiceOrange
   name: tin of powdered orange juice
   description: A container of powdered orange juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
   components:
@@ -62,7 +61,7 @@
       food:
         maxVol: 50
         reagents:
-        - ReagentId: PowderedOrangeJuice
+        - ReagentId: PowderedJuiceOrange
           Quantity: 50
 
 - type: entity
@@ -109,7 +108,7 @@
 
 - type: entity
   parent: ReagentTinBase
-  id: ReagentTinPowderedLimeJuice
+  id: ReagentTinPowderedJuiceLime
   name: tin of powdered lime juice
   description: A container of powdered lime juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
   components:
@@ -130,7 +129,7 @@
 
 - type: entity
   parent: ReagentTinBase
-  id: ReagentTinPowderedLemonJuice
+  id: ReagentTinPowderedJuiceLemon
   name: tin of powdered lemon juice
   description: A container of powdered lemon juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
   components:
@@ -151,7 +150,7 @@
 
 - type: entity
   parent: ReagentTinBase
-  id: ReagentTinPowderedPineappleJuice
+  id: ReagentTinPowderedJuicePineapple
   name: tin of powdered pineapple juice
   description: A container of powdered pineapple juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
   components:
@@ -172,7 +171,7 @@
 
 - type: entity
   parent: ReagentTinBase
-  id: ReagentTinPowderedBananaJuice
+  id: ReagentTinPowderedJuiceBanana
   name: tin of powdered banana juice
   description: A container of powdered banana juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
   components:
@@ -193,7 +192,7 @@
 
 - type: entity
   parent: ReagentTinBase
-  id: ReagentTinPowderedBerryJuice
+  id: ReagentTinPowderedJuiceBerry
   name: tin of powdered berry juice
   description: A container of powdered berry juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
   components:
@@ -214,7 +213,7 @@
 
 - type: entity
   parent: ReagentTinBase
-  id: ReagentTinPowderedWatermelonJuice
+  id: ReagentTinPowderedJuiceWatermelon
   name: tin of powdered melon juice
   description: A container of powdered watermelon juice manufactured by HydroCo. NOTE - Melon only; water not included, sold separately. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
   components:
@@ -235,7 +234,7 @@
 
 - type: entity
   parent: ReagentTinBase
-  id: ReagentTinPowderedGrapeJuice
+  id: ReagentTinPowderedJuiceGrape
   name: tin of powdered grape juice
   description: A container of powdered grape juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
   components:
@@ -256,7 +255,7 @@
 
 - type: entity
   parent: ReagentTinBase
-  id: ReagentTinPowderedAppleJuice
+  id: ReagentTinPowderedJuiceApple
   name: tin of powdered apple juice
   description: A container of powdered apple juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
   components:
@@ -277,7 +276,7 @@
 
 - type: entity
   parent: ReagentTinBase
-  id: ReagentTinPowderedCherryJuice
+  id: ReagentTinPowderedJuiceCherry
   name: tin of powdered cherry juice
   description: A container of powdered cherry juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
   components:
@@ -298,7 +297,7 @@
 
 - type: entity
   parent: ReagentTinBase
-  id: ReagentTinPowderedCarrotJuice
+  id: ReagentTinPowderedJuiceCarrot
   name: tin of powdered carrot juice
   description: A container of powdered carrot juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
   components:

From f311765cb7562f634e0826f11d5508f31fb997f8 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 03:57:35 +0100
Subject: [PATCH 12/35] refactor: BasePowderBeverage now abstract, inherit
 physicalDesc

---
 .../Reagents/Consumable/Drink/powdered_drinks.yml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
index 66299277546..13879698f7f 100644
--- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
@@ -1,5 +1,7 @@
 - type: reagent
   id: BasePowderedBeverage
+  abstract: true
+  physicalDesc: reagent-physical-desc-powdery
   flavor: terrible
   metabolisms:
     Poison:
@@ -20,7 +22,6 @@
   name: reagent-name-powdered-milk
   group: Foods
   desc: reagent-desc-powdered-milk
-  physicalDesc: reagent-physical-desc-powdery
   flavor: sweet
   color: "#FAFAFA"
 
@@ -30,7 +31,6 @@
   name: reagent-name-powdered-milk-soy
   group: Foods
   desc: reagent-desc-powdered-milk-soy
-  physicalDesc: reagent-physical-desc-powdery
   flavor: soy
   color: "#FFFCE3"
 
@@ -40,7 +40,6 @@
   name: reagent-name-powdered-juice-orange
   group: Foods
   desc: reagent-desc-powdered-juice-orange
-  physicalDesc: reagent-physical-desc-powdery
   flavor: sour
   color: "#FFC420"
 
@@ -50,7 +49,6 @@
   name: reagent-name-powdered-juice-lime
   group: Foods
   desc: reagent-desc-powdered-juice-lime
-  physicalDesc: reagent-physical-desc-powdery
   flavor: sour
   color: "#B4FF64"
   metabolisms:
@@ -76,7 +74,6 @@
   name: reagent-name-powdered-juice-lemon
   group: Foods
   desc: reagent-desc-powdered-juice-lemon
-  physicalDesc: reagent-physical-desc-powdery
   flavor: sour
   color: "#FFFC69"
   metabolisms:
@@ -102,7 +99,6 @@
   name: reagent-name-powdered-juice-pineapple
   group: Foods
   desc: reagent-desc-powdered-juice-pineapple
-  physicalDesc: reagent-physical-desc-powdery
   flavor: sour
   color: "#FFD644"
   metabolisms:
@@ -128,7 +124,6 @@
   name: reagent-name-powdered-juice-banana
   group: Foods
   desc: reagent-desc-powdered-juice-banana
-  physicalDesc: reagent-physical-desc-powdery
   flavor: terrible
   color: "#FFFEBF"
 
@@ -138,7 +133,6 @@
   name: reagent-name-powdered-juice-berry
   group: Foods
   desc: reagent-desc-powdered-juice-berry
-  physicalDesc: reagent-physical-desc-powdery
   flavor: bitter
   color: "#D366FF"
 
@@ -148,7 +142,6 @@
   name: reagent-name-powdered-juice-watermelon
   group: Foods
   desc: reagent-desc-powdered-juice-watermelon
-  physicalDesc: reagent-physical-desc-powdery
   flavor: terrible
   color: "#FFBCDB"
 
@@ -158,7 +151,6 @@
   name: reagent-name-powdered-juice-grape
   group: Foods
   desc: reagent-desc-powdered-juice-grape
-  physicalDesc: reagent-physical-desc-powdery
   flavor: sour
   color: "#E57DFF"
 
@@ -168,7 +160,6 @@
   name: reagent-name-powdered-juice-apple
   group: Foods
   desc: reagent-desc-powdered-juice-apple
-  physicalDesc: reagent-physical-desc-powdery
   flavor: sour
   color: "#FFC67E"
 
@@ -178,7 +169,6 @@
   name: reagent-name-powdered-juice-cherry
   group: Foods
   desc: reagent-desc-powdered-juice-cherry
-  physicalDesc: reagent-physical-desc-powdery
   flavor: sour
   color: "#A9536C"
 
@@ -188,6 +178,5 @@
   name: reagent-name-powdered-juice-carrot
   group: Foods
   desc: reagent-desc-powdered-juice-carrot
-  physicalDesc: reagent-physical-desc-powdery
   flavor: bitter
   color: "#FFA06B"

From 0193e5e31b03aacd1803f56081f3e9dce60437a4 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 04:31:39 +0100
Subject: [PATCH 13/35] refactor: mark ReagentTinBase as abstract

---
 .../Entities/Objects/Consumable/Drinks/powdered_drinks.yml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
index 8816552065f..e4b372726cc 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
@@ -1,5 +1,6 @@
 - type: entity
   id: ReagentTinBase
+  abstract: true
   parent: ReagentContainerBase
   components:
   - type: Openable

From 9da7c4a20a9e8615a2788e5f6e01f2b0aef14ce9 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sat, 16 Nov 2024 06:28:40 +0100
Subject: [PATCH 14/35] tweak: Rephrase HydroCo Notice

---
 Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
index 1abffd4dc6e..54520901932 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
@@ -48,7 +48,7 @@
 
       [bold]Consumption Notice[/bold]
       HydroCo reminds all customers that powdered products are NOT meant for direct consumption.
-      Attempting to eat the powder directly may result in choking hazards and severe discomfort.
+      Attempting to eat the powder directly is a choking hazard and may result in severe discomfort.
       Always mix with water according to package instructions before consuming.
 
       Thank you for choosing HydroCo! Enjoy your drinks!

From b7cf8fdf0ebd12f19300320a40e6f09130635e29 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 06:49:34 +0100
Subject: [PATCH 15/35] refactor: Move name and description to prototype

---
 .../en-US/deltav/prototypes/catalog/cargo/cargo-food.ftl    | 6 ------
 .../deltav/prototypes/catalog/fills/crates/food-crates.ftl  | 6 ------
 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml   | 4 ++++
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-food.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-food.ftl
index 2ad1a600fa7..07cfe0e2f61 100644
--- a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-food.ftl
+++ b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-food.ftl
@@ -6,9 +6,3 @@ ent-FoodDonkpocketSavory = { ent-CrateFoodDonkpocketSavory }
 
 ent-FoodDonkpocketSweet = { ent-CrateFoodDonkpocketSweet }
     .desc = { ent-CrateFoodDonkpocketSweet.desc }
-
-ent-FoodHydroCoDairy = { ent-CrateHydroCoDairy }
-    .desc = { ent-CrateHydroCoDairy.desc }
-
-ent-FoodHydroCoJuice = { ent-CrateHydroCoJuice }
-    .desc = { ent-CrateHydroCoJuice.desc }
diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl
index 46db58d2bb3..27e1a91b963 100644
--- a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl
+++ b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl
@@ -6,9 +6,3 @@ ent-CrateFoodDonkpocketSavory = Donk Pocket shipment (Savory)
 
 ent-CrateFoodDonkpocketSweet = Donk Pocket shipment (Sweet)
     .desc = A shipment of five boxes from the sweet Donk Pocket variety selection.
-
-ent-CrateHydroCoDairy = HydroCo Dairy crate
-    .desc = A shipment of powdered dairy products from HydroCo. Contains powdered milk and soy milk.
-
-ent-CrateHydroCoJuice = HydroCo Juice crate
-    .desc = A variety pack of powdered juice products from HydroCo.
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 6b4dc630b16..9fd00a249f4 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -33,6 +33,8 @@
 - type: entity
   id: CrateHydroCoDairy
   parent: CratePlastic
+  name: HydroCo Dairy crate
+  description: A shipment of powdered dairy products from HydroCo. Contains powdered milk and soy milk.
   components:
     - type: StorageFill
       contents:
@@ -48,6 +50,8 @@
 - type: entity
   id: CrateHydroCoJuice
   parent: CratePlastic
+  name: HydroCo Juice crate
+  description: A variety pack of powdered juice products from HydroCo. Comes in Citrus, Berry, Tropical and Juicy editions.
   components:
     - type: StorageFill
       contents:

From 3d2b0e3c4ae1229d3a12f1b8d8de54684d781371 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 07:17:01 +0100
Subject: [PATCH 16/35] tweak: Juice crate now comes in one of four editions

---
 .../DeltaV/Catalog/Fills/Crates/food.yml      | 139 ++++++++++++++----
 1 file changed, 110 insertions(+), 29 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 9fd00a249f4..8135c8f6aa3 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -51,33 +51,114 @@
   id: CrateHydroCoJuice
   parent: CratePlastic
   name: HydroCo Juice crate
-  description: A variety pack of powdered juice products from HydroCo. Comes in Citrus, Berry, Tropical and Juicy editions.
+  description: A variety pack of powdered juice products from HydroCo. Comes in Citrus, Berry, Tropical and Garden editions.
   components:
-    - type: StorageFill
-      contents:
-        - id: PaperCrateHydroCoConsumption
-          amount: 1
-        - id: Spoon
-          amount: 2
-        - id: ReagentTinPowderedJuiceOrange
-          amount: 1
-        - id: ReagentTinPowderedJuiceLime
-          amount: 1
-        - id: ReagentTinPowderedJuiceLemon
-          amount: 1
-        - id: ReagentTinPowderedJuicePineapple
-          amount: 1
-        - id: ReagentTinPowderedJuiceBanana
-          amount: 1
-        - id: ReagentTinPowderedJuiceBerry
-          amount: 1
-        - id: ReagentTinPowderedJuiceWatermelon
-          amount: 1
-        - id: ReagentTinPowderedJuiceGrape
-          amount: 1
-        - id: ReagentTinPowderedJuiceApple
-          amount: 1
-        - id: ReagentTinPowderedJuiceCherry
-          amount: 1
-        - id: ReagentTinPowderedJuiceCarrot
-          amount: 1
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:GroupSelector
+        children:
+        - !type:NestedSelector
+          tableId: FillHydroCoJuiceCitrus
+        - !type:NestedSelector
+          tableId: FillHydroCoJuiceBerry
+        - !type:NestedSelector
+          tableId: FillHydroCoJuiceTropical
+        - !type:NestedSelector
+          tableId: FillHydroCoJuiceGarden
+
+- type: entityTable
+  id: FillHydroCoJuiceCitrus
+  table: !type:AllSelector
+    children:
+    - id: ReagentTinPowderedJuiceOrange
+      amount: !type:ConstantNumberSelector
+        value: 1
+    - id: ReagentTinPowderedJuiceLime
+      amount: !type:ConstantNumberSelector
+        value: 1
+    - id: ReagentTinPowderedJuiceLemon
+      amount: !type:ConstantNumberSelector
+        value: 1
+    - id: Spoon
+      amount: !type:ConstantNumberSelector
+        value: 2
+    - id: PaperCrateHydroCoConsumption
+      amount: !type:ConstantNumberSelector
+        value: 1
+
+
+- type: entityTable
+  id: FillHydroCoJuiceBerry
+  table: !type:AllSelector
+    children:
+    - id: ReagentTinPowderedJuiceBerry
+      amount: !type:ConstantNumberSelector
+        value: 1
+    - id: ReagentTinPowderedJuiceGrape
+      amount: !type:ConstantNumberSelector
+        value: 1
+    - id: ReagentTinPowderedJuiceCherry
+      amount: !type:ConstantNumberSelector
+        value: 1
+    - id: Spoon
+      amount: !type:ConstantNumberSelector
+        value: 2
+    - id: PaperCrateHydroCoConsumption
+      amount: !type:ConstantNumberSelector
+        value: 1
+
+- type: entityTable
+  id: FillHydroCoJuiceTropical
+  table: !type:AllSelector
+    children:
+    - id: ReagentTinPowderedJuicePineapple
+      amount: !type:ConstantNumberSelector
+        value: 1
+    - id: ReagentTinPowderedJuiceBanana
+      amount: !type:ConstantNumberSelector
+        value: 1
+    - id: ReagentTinPowderedJuiceWatermelon
+      amount: !type:ConstantNumberSelector
+        value: 1
+    - id: Spoon
+      amount: !type:ConstantNumberSelector
+        value: 2
+    - id: PaperCrateHydroCoConsumption
+      amount: !type:ConstantNumberSelector
+        value: 1
+
+
+- type: entityTable
+  id: FillHydroCoJuiceGarden
+  table: !type:AllSelector
+    children:
+    - id: ReagentTinPowderedJuiceApple
+      amount: !type:ConstantNumberSelector
+        value: 1
+    - id: ReagentTinPowderedJuiceCarrot
+      amount: !type:ConstantNumberSelector
+        value: 1
+    - !type:NestedSelector
+      tableId: FillHydroCoJuiceRandomTin
+    - id: Spoon
+      amount: !type:ConstantNumberSelector
+        value: 2
+    - id: PaperCrateHydroCoConsumption
+      amount: !type:ConstantNumberSelector
+        value: 1
+
+- type: entityTable
+  id: FillHydroCoJuiceRandomTin
+  table: !type:GroupSelector
+    children:
+    - id: ReagentTinPowderedJuiceLemon
+    - id: ReagentTinPowderedJuiceLime
+    - id: ReagentTinPowderedJuiceOrange
+    - id: ReagentTinPowderedJuicePineapple
+    - id: ReagentTinPowderedJuiceBanana
+    - id: ReagentTinPowderedJuiceWatermelon
+    - id: ReagentTinPowderedJuiceBerry
+    - id: ReagentTinPowderedJuiceGrape
+    - id: ReagentTinPowderedJuiceCherry
+    - id: ReagentTinPowderedJuiceApple
+    - id: ReagentTinPowderedJuiceCarrot
\ No newline at end of file

From bc8b5ea23a1ede41ac713fa2cb951001efb09892 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 07:20:48 +0100
Subject: [PATCH 17/35] feat: powdered tomato juice

---
 .../meta/consumable/drink/powdered.ftl        |  3 +++
 .../Consumable/Drinks/powdered_drinks.yml     | 21 +++++++++++++++++++
 .../Consumable/Drink/powdered_drinks.yml      |  9 ++++++++
 .../Recipes/Cooking/powdered_drinks.yml       | 12 +++++++++++
 4 files changed, 45 insertions(+)

diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl
index 48466cb56d2..9c3bce8f62a 100644
--- a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl
+++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl
@@ -36,3 +36,6 @@ reagent-desc-powdered-juice-cherry = A powder-based cherry juice substitute that
 
 reagent-name-powdered-juice-carrot = powdered carrot juice
 reagent-desc-powdered-juice-carrot = A powder-based carrot juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-carrot = powdered tomato juice
+reagent-desc-powdered-juice-carrot = A powder-based tomato juice substitute that can be reconstituted with water.
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
index e4b372726cc..7ffa66a9743 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
@@ -316,3 +316,24 @@
         reagents:
         - ReagentId: PowderedJuiceCarrot
           Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuiceTomato
+  name: tin of powdered tomato juice
+  description: A container of powdered tomato juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#EF908F"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceTomato
+          Quantity: 50
diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
index 13879698f7f..a41744950f7 100644
--- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
@@ -180,3 +180,12 @@
   desc: reagent-desc-powdered-juice-carrot
   flavor: bitter
   color: "#FFA06B"
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuiceTomato
+  name: reagent-name-powdered-juice-tomato
+  group: Foods
+  desc: reagent-desc-powdered-juice-tomato
+  flavor: bitter
+  color: "#EF908F"
diff --git a/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml
index 3fccd07bda7..262c40afce2 100644
--- a/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml
@@ -153,3 +153,15 @@
       amount: 1
   products:
     JuiceCarrot: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceTomato
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceTomato:
+      amount: 1
+  products:
+    JuiceTomato: 2

From 88835952c76dc1d07393cccaf23f750c38ad2342 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 07:21:20 +0100
Subject: [PATCH 18/35] refactor: rename reagent ftl for consistendcy

---
 .../meta/consumable/drink/{powdered.ftl => powdered_drinks.ftl}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/{powdered.ftl => powdered_drinks.ftl} (100%)

diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl
similarity index 100%
rename from Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered.ftl
rename to Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl

From 0e800c6dbfcbf763927e85e6ca2099785788195a Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 07:23:10 +0100
Subject: [PATCH 19/35] tweak: use tomato powder in crate fill

---
 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 8135c8f6aa3..4a7993dbcfa 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -138,8 +138,9 @@
     - id: ReagentTinPowderedJuiceCarrot
       amount: !type:ConstantNumberSelector
         value: 1
-    - !type:NestedSelector
-      tableId: FillHydroCoJuiceRandomTin
+    - id: ReagentTinPowderedJuiceTomato
+      amount: !type:ConstantNumberSelector
+        value: 1
     - id: Spoon
       amount: !type:ConstantNumberSelector
         value: 2
@@ -161,4 +162,5 @@
     - id: ReagentTinPowderedJuiceGrape
     - id: ReagentTinPowderedJuiceCherry
     - id: ReagentTinPowderedJuiceApple
-    - id: ReagentTinPowderedJuiceCarrot
\ No newline at end of file
+    - id: ReagentTinPowderedJuiceCarrot
+    - id: ReagentTinPowderedJuiceTomato

From 86d7581c06fe82a2e018e6b02a1301b0999d8e4c Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 07:35:22 +0100
Subject: [PATCH 20/35] fix: copy-paste mistake

---
 .../deltav/reagents/meta/consumable/drink/powdered_drinks.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl
index 9c3bce8f62a..aaed484c664 100644
--- a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl
+++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl
@@ -37,5 +37,5 @@ reagent-desc-powdered-juice-cherry = A powder-based cherry juice substitute that
 reagent-name-powdered-juice-carrot = powdered carrot juice
 reagent-desc-powdered-juice-carrot = A powder-based carrot juice substitute that can be reconstituted with water.
 
-reagent-name-powdered-juice-carrot = powdered tomato juice
-reagent-desc-powdered-juice-carrot = A powder-based tomato juice substitute that can be reconstituted with water.
+reagent-name-powdered-juice-tomato = powdered tomato juice
+reagent-desc-powdered-juice-tomato = A powder-based tomato juice substitute that can be reconstituted with water.

From c0e3c4e788cbfbbe3e554da7f70e17ffe2271ca8 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 07:56:44 +0100
Subject: [PATCH 21/35] feat: hydroco trial mails

---
 .../DeltaV/Entities/Objects/Misc/paper.yml    | 26 ++++++++++++++
 .../Entities/Objects/Specific/Mail/mail.yml   | 34 +++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
index 54520901932..d330f6427fd 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
@@ -52,3 +52,29 @@
       Always mix with water according to package instructions before consuming.
 
       Thank you for choosing HydroCo! Enjoy your drinks!
+
+- type: entity
+  id: PaperMailHydroCoTrial
+  categories: [ HideSpawnMenu ]
+  name: HydroCo Trial Message
+  parent: Paper
+  components:
+  - type: Paper
+    stampState: paper_stamp-generic
+    stampedBy:
+    - stampedColor: '#8F99D6FF'
+      stampedName: HydroCo
+    content: |2
+
+      [head=1]HydroCo - Hydrate Tastefully[/head]
+
+      [bold]Dear Recipient,[/bold]
+      you have been selected among thousands of possible beneficiaries to receive a full-size trial of a HydroCo juice tin!
+      We think you will enjoy the flavor and hope to see you as a returning customer.
+
+      [bold]Consumption Notice[/bold]
+      HydroCo reminds all customers that powdered products are NOT meant for direct consumption.
+      Attempting to eat the powder directly is a choking hazard and may result in severe discomfort.
+      Always mix with water according to package instructions before consuming.
+
+      Enjoy your drinks!
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
index 3d5d66fc2a2..1df0b038647 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
@@ -1698,3 +1698,37 @@
       orGroup: Coat
     - id: ClothingOuterWinterCoatPlaid
       orGroup: Coat
+
+- type: entity
+  parent: BaseMail
+  id: MailHydroCoPowderJuice
+  suffix: HydroCo powder juice
+  components:
+  - type: Mail
+    contents:
+    - id: ReagentTinPowderedJuiceLemon
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceLime
+      orGroup: Juice
+    - id: ReagentTinPowderedJuicePineapple
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceBanana
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceBerry
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceWatermelon
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceGrape
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceApple
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceCherry
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceCarrot
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceTomato
+      orGroup: Juice
+    - id: SpoonPlastic
+      amount: 1
+    - id: PaperMailHydroCoTrial
+      amount: 1
\ No newline at end of file

From aaa9b38197b519e4fcc31ba4500cec362730e157 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 07:56:56 +0100
Subject: [PATCH 22/35] tweak: 2 soy, 2 regular milk in dairy crate

---
 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 4a7993dbcfa..dee3fbf7746 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -43,9 +43,9 @@
         - id: Spoon
           amount: 2
         - id: ReagentTinPowderedMilk
-          amount: 3
+          amount: 2
         - id: ReagentTinPowderedMilkSoy
-          amount: 1
+          amount: 2
 
 - type: entity
   id: CrateHydroCoJuice

From aed6653886a2ab1fbe6dc322449d017c648b80f3 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 07:57:19 +0100
Subject: [PATCH 23/35] tweak: lower price for juice crate

---
 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
index f8afc9446f3..59ba54d3548 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
@@ -44,6 +44,6 @@
     sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
     state: icon-order-juices
   product: CrateHydroCoJuice
-  cost: 2000
+  cost: 1500
   category: Food
   group: market

From 9b35f09a2cb35b2505866ca3f5300bc2bd3f1234 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 07:58:14 +0100
Subject: [PATCH 24/35] tweak: recolor tomato powder

---
 .../Entities/Objects/Consumable/Drinks/powdered_drinks.yml      | 2 +-
 .../DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
index 7ffa66a9743..f964d62e130 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
@@ -329,7 +329,7 @@
     - state: icon
       map: ["enum.OpenableVisuals.Layer"]
     - state: overlay-container
-      color: "#EF908F"
+      color: "#D85553"
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
index a41744950f7..13cd6bfe11d 100644
--- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
@@ -188,4 +188,4 @@
   group: Foods
   desc: reagent-desc-powdered-juice-tomato
   flavor: bitter
-  color: "#EF908F"
+  color: "#D85553"

From 9cbfae1074e072d19da38220c627216ce3149805 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 08:09:02 +0100
Subject: [PATCH 25/35] tweak: use one of each edition, no themed crates;
 plastic spoons instead of metal

---
 .../DeltaV/Catalog/Fills/Crates/food.yml      | 45 ++++++-------------
 1 file changed, 13 insertions(+), 32 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index dee3fbf7746..43ca729eea8 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -40,7 +40,7 @@
       contents:
         - id: PaperCrateHydroCoConsumption
           amount: 1
-        - id: Spoon
+        - id: SpoonPlastic
           amount: 2
         - id: ReagentTinPowderedMilk
           amount: 2
@@ -51,11 +51,11 @@
   id: CrateHydroCoJuice
   parent: CratePlastic
   name: HydroCo Juice crate
-  description: A variety pack of powdered juice products from HydroCo. Comes in Citrus, Berry, Tropical and Garden editions.
+  description: A variety pack of powdered juice products from HydroCo.
   components:
   - type: EntityTableContainerFill
     containers:
-      entity_storage: !type:GroupSelector
+      entity_storage: !type:AllSelector
         children:
         - !type:NestedSelector
           tableId: FillHydroCoJuiceCitrus
@@ -65,10 +65,16 @@
           tableId: FillHydroCoJuiceTropical
         - !type:NestedSelector
           tableId: FillHydroCoJuiceGarden
+        - id: SpoonPlastic
+          amount: !type:ConstantNumberSelector
+            value: 2
+        - id: PaperCrateHydroCoConsumption
+          amount: !type:ConstantNumberSelector
+            value: 1
 
 - type: entityTable
   id: FillHydroCoJuiceCitrus
-  table: !type:AllSelector
+  table: !type:GroupSelector
     children:
     - id: ReagentTinPowderedJuiceOrange
       amount: !type:ConstantNumberSelector
@@ -79,17 +85,10 @@
     - id: ReagentTinPowderedJuiceLemon
       amount: !type:ConstantNumberSelector
         value: 1
-    - id: Spoon
-      amount: !type:ConstantNumberSelector
-        value: 2
-    - id: PaperCrateHydroCoConsumption
-      amount: !type:ConstantNumberSelector
-        value: 1
-
 
 - type: entityTable
   id: FillHydroCoJuiceBerry
-  table: !type:AllSelector
+  table: !type:GroupSelector
     children:
     - id: ReagentTinPowderedJuiceBerry
       amount: !type:ConstantNumberSelector
@@ -100,16 +99,10 @@
     - id: ReagentTinPowderedJuiceCherry
       amount: !type:ConstantNumberSelector
         value: 1
-    - id: Spoon
-      amount: !type:ConstantNumberSelector
-        value: 2
-    - id: PaperCrateHydroCoConsumption
-      amount: !type:ConstantNumberSelector
-        value: 1
 
 - type: entityTable
   id: FillHydroCoJuiceTropical
-  table: !type:AllSelector
+  table: !type:GroupSelector
     children:
     - id: ReagentTinPowderedJuicePineapple
       amount: !type:ConstantNumberSelector
@@ -120,17 +113,11 @@
     - id: ReagentTinPowderedJuiceWatermelon
       amount: !type:ConstantNumberSelector
         value: 1
-    - id: Spoon
-      amount: !type:ConstantNumberSelector
-        value: 2
-    - id: PaperCrateHydroCoConsumption
-      amount: !type:ConstantNumberSelector
-        value: 1
 
 
 - type: entityTable
   id: FillHydroCoJuiceGarden
-  table: !type:AllSelector
+  table: !type:GroupSelector
     children:
     - id: ReagentTinPowderedJuiceApple
       amount: !type:ConstantNumberSelector
@@ -141,12 +128,6 @@
     - id: ReagentTinPowderedJuiceTomato
       amount: !type:ConstantNumberSelector
         value: 1
-    - id: Spoon
-      amount: !type:ConstantNumberSelector
-        value: 2
-    - id: PaperCrateHydroCoConsumption
-      amount: !type:ConstantNumberSelector
-        value: 1
 
 - type: entityTable
   id: FillHydroCoJuiceRandomTin

From 556af0b8cb1465dfe98fbd3b000656909c847c7b Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 08:17:25 +0100
Subject: [PATCH 26/35] feat: soy milk powder and orange juice powder in
 sustenance vendor

---
 .../Catalog/VendingMachines/Inventories/sustenance.yml          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
index 9fa3499e15c..7722f001a3b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
@@ -5,6 +5,8 @@
     FoodSnackNutribrick: 5
     FoodSnackMREBrownie: 5
     FoodCondimentPacketKetchup: 5
+    ReagentTinPowderedMilkSoy: 2
+    ReagentTinPowderedJuiceOrange: 1
   emaggedInventory:
     KitchenKnife: 2
     SpaceMedipen: 3

From b5d94545bf22a89c3a59f22210179349dd23f761 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 08:27:14 +0100
Subject: [PATCH 27/35] tweak: reword hydroco mail message

---
 Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
index d330f6427fd..13f919c05ee 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
@@ -69,7 +69,7 @@
       [head=1]HydroCo - Hydrate Tastefully[/head]
 
       [bold]Dear Recipient,[/bold]
-      you have been selected among thousands of possible beneficiaries to receive a full-size trial of a HydroCo juice tin!
+      you have been selected among thousands of potential beneficiaries to receive a full-size trial tin of HydroCo powdered juice!
       We think you will enjoy the flavor and hope to see you as a returning customer.
 
       [bold]Consumption Notice[/bold]

From 9f22d6e9e75c163aa4ee4f5b5ff359c44b63ffd9 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 08:32:34 +0100
Subject: [PATCH 28/35] tweak: rearrange papers to play nicer with word-wrap

---
 .../DeltaV/Entities/Objects/Misc/paper.yml    | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
index 13f919c05ee..ed5cd749152 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
@@ -47,11 +47,16 @@
       [head=1]HydroCo - Hydrate Tastefully[/head]
 
       [bold]Consumption Notice[/bold]
-      HydroCo reminds all customers that powdered products are NOT meant for direct consumption.
-      Attempting to eat the powder directly is a choking hazard and may result in severe discomfort.
-      Always mix with water according to package instructions before consuming.
+      HydroCo reminds all customers that powdered products
+      are NOT meant for direct consumption. Attempting to eat
+      the powder directly is a choking hazard and may result
+      in severe discomfort.
 
-      Thank you for choosing HydroCo! Enjoy your drinks!
+      Always mix with water according to package instructions
+      before consuming.
+
+      Thank you for choosing HydroCo!
+      Enjoy your drinks!
 
 - type: entity
   id: PaperMailHydroCoTrial
@@ -69,12 +74,19 @@
       [head=1]HydroCo - Hydrate Tastefully[/head]
 
       [bold]Dear Recipient,[/bold]
-      you have been selected among thousands of potential beneficiaries to receive a full-size trial tin of HydroCo powdered juice!
-      We think you will enjoy the flavor and hope to see you as a returning customer.
+      you have been selected among thousands of potential beneficiaries to receive a full-size trial tin of HydroCo
+      powdered juice!
+
+      We think you will enjoy the flavor and hope to see you
+      as a returning customer.
 
       [bold]Consumption Notice[/bold]
-      HydroCo reminds all customers that powdered products are NOT meant for direct consumption.
-      Attempting to eat the powder directly is a choking hazard and may result in severe discomfort.
-      Always mix with water according to package instructions before consuming.
+      HydroCo reminds all customers that powdered products
+      are NOT meant for direct consumption. Attempting to eat
+      the powder directly is a choking hazard and may result in
+      severe discomfort.
+
+      Always mix with water according to package instructions
+      before consuming.
 
       Enjoy your drinks!

From a36a7118798e6932ac0c40274efe29fb3a6eb0c9 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Mon, 18 Nov 2024 08:39:47 +0100
Subject: [PATCH 29/35] tweak: add new-line in case somebody drags the paper
 wider

---
 Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
index ed5cd749152..6fdf9079aec 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
@@ -74,7 +74,8 @@
       [head=1]HydroCo - Hydrate Tastefully[/head]
 
       [bold]Dear Recipient,[/bold]
-      you have been selected among thousands of potential beneficiaries to receive a full-size trial tin of HydroCo
+      you have been selected among thousands of potential
+      beneficiaries to receive a full-size trial tin of HydroCo
       powdered juice!
 
       We think you will enjoy the flavor and hope to see you

From 5d2b754eb299d11d140e50a0ee7e15aea753a658 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Tue, 19 Nov 2024 09:12:52 +0100
Subject: [PATCH 30/35] tweak: reintroduce random tin, condense juice fill
 tables

---
 .../DeltaV/Catalog/Fills/Crates/food.yml      | 91 ++++++-------------
 1 file changed, 29 insertions(+), 62 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 43ca729eea8..7506b8f9ace 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -58,76 +58,43 @@
       entity_storage: !type:AllSelector
         children:
         - !type:NestedSelector
-          tableId: FillHydroCoJuiceCitrus
+          tableId: FillHydroCoJuiceMix
         - !type:NestedSelector
-          tableId: FillHydroCoJuiceBerry
-        - !type:NestedSelector
-          tableId: FillHydroCoJuiceTropical
-        - !type:NestedSelector
-          tableId: FillHydroCoJuiceGarden
+          tableId: FillHydroCoJuiceRandomTin
+          prob: 0.15
         - id: SpoonPlastic
           amount: !type:ConstantNumberSelector
             value: 2
         - id: PaperCrateHydroCoConsumption
-          amount: !type:ConstantNumberSelector
-            value: 1
 
 - type: entityTable
-  id: FillHydroCoJuiceCitrus
-  table: !type:GroupSelector
+  id: FillHydroCoJuiceMix
+  table: !type:AllSelector
     children:
-    - id: ReagentTinPowderedJuiceOrange
-      amount: !type:ConstantNumberSelector
-        value: 1
-    - id: ReagentTinPowderedJuiceLime
-      amount: !type:ConstantNumberSelector
-        value: 1
-    - id: ReagentTinPowderedJuiceLemon
-      amount: !type:ConstantNumberSelector
-        value: 1
-
-- type: entityTable
-  id: FillHydroCoJuiceBerry
-  table: !type:GroupSelector
-    children:
-    - id: ReagentTinPowderedJuiceBerry
-      amount: !type:ConstantNumberSelector
-        value: 1
-    - id: ReagentTinPowderedJuiceGrape
-      amount: !type:ConstantNumberSelector
-        value: 1
-    - id: ReagentTinPowderedJuiceCherry
-      amount: !type:ConstantNumberSelector
-        value: 1
-
-- type: entityTable
-  id: FillHydroCoJuiceTropical
-  table: !type:GroupSelector
-    children:
-    - id: ReagentTinPowderedJuicePineapple
-      amount: !type:ConstantNumberSelector
-        value: 1
-    - id: ReagentTinPowderedJuiceBanana
-      amount: !type:ConstantNumberSelector
-        value: 1
-    - id: ReagentTinPowderedJuiceWatermelon
-      amount: !type:ConstantNumberSelector
-        value: 1
-
-
-- type: entityTable
-  id: FillHydroCoJuiceGarden
-  table: !type:GroupSelector
-    children:
-    - id: ReagentTinPowderedJuiceApple
-      amount: !type:ConstantNumberSelector
-        value: 1
-    - id: ReagentTinPowderedJuiceCarrot
-      amount: !type:ConstantNumberSelector
-        value: 1
-    - id: ReagentTinPowderedJuiceTomato
-      amount: !type:ConstantNumberSelector
-        value: 1
+    #Citrus
+    - !type:GroupSelector
+      children:
+      - id: ReagentTinPowderedJuiceOrange
+      - id: ReagentTinPowderedJuiceLime
+      - id: ReagentTinPowderedJuiceLemon
+    #Berry
+    - !type:GroupSelector
+      children:
+      - id: ReagentTinPowderedJuiceBerry
+      - id: ReagentTinPowderedJuiceGrape
+      - id: ReagentTinPowderedJuiceCherry
+    #Tropical
+    - !type:GroupSelector
+      children:
+      - id: ReagentTinPowderedJuicePineapple
+      - id: ReagentTinPowderedJuiceBanana
+      - id: ReagentTinPowderedJuiceWatermelon
+    #Garden
+    - !type:GroupSelector
+      children:
+      - id: ReagentTinPowderedJuiceApple
+      - id: ReagentTinPowderedJuiceCarrot
+      - id: ReagentTinPowderedJuiceTomato
 
 - type: entityTable
   id: FillHydroCoJuiceRandomTin

From eeff30605bb392dd705e9df884f1c958ca4f310c Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Tue, 19 Nov 2024 09:13:28 +0100
Subject: [PATCH 31/35] refactor: amount defaults to 1

---
 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 7506b8f9ace..35208449f4b 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -39,7 +39,6 @@
     - type: StorageFill
       contents:
         - id: PaperCrateHydroCoConsumption
-          amount: 1
         - id: SpoonPlastic
           amount: 2
         - id: ReagentTinPowderedMilk

From 414778c5a3817c3cf503b6da6eca6b77006561e3 Mon Sep 17 00:00:00 2001
From: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
Date: Mon, 18 Nov 2024 22:58:49 -0500
Subject: [PATCH 32/35] Add Changelog Entry for Teach Lesson (#2225)

* meow

* meow

* Update DeltaVChangelog.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

---------

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

From 341f2a582d93c9831fcac3960432dba1644c9de7 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Tue, 19 Nov 2024 10:31:41 +0100
Subject: [PATCH 33/35] refactor: add missing newline

---
 .../Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
index 1df0b038647..2fa02ebc002 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
@@ -1731,4 +1731,4 @@
     - id: SpoonPlastic
       amount: 1
     - id: PaperMailHydroCoTrial
-      amount: 1
\ No newline at end of file
+      amount: 1

From 5d8343a208dcd30d535d62a499522d842c0d8eae Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Thu, 21 Nov 2024 21:25:49 +0100
Subject: [PATCH 34/35] refactor: respect yaml property ordering convention

---
 .../Objects/Consumable/Drinks/powdered_drinks.yml         | 2 +-
 .../Prototypes/DeltaV/Entities/Objects/Misc/paper.yml     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
index f964d62e130..3cda45a89f4 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
@@ -1,7 +1,7 @@
 - type: entity
+  parent: ReagentContainerBase
   id: ReagentTinBase
   abstract: true
-  parent: ReagentContainerBase
   components:
   - type: Openable
     openableByHand: false
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
index 6fdf9079aec..2682f83ab88 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
@@ -32,10 +32,10 @@
   description: An arrest warrant for a space fugitive sent from GALPOL.
 
 - type: entity
+  parent: Paper
   id: PaperCrateHydroCoConsumption
-  categories: [ HideSpawnMenu ]
   name: HydroCo Notice
-  parent: Paper
+  categories: [ HideSpawnMenu ]
   components:
   - type: Paper
     stampState: paper_stamp-generic
@@ -59,10 +59,10 @@
       Enjoy your drinks!
 
 - type: entity
+  parent: Paper
   id: PaperMailHydroCoTrial
-  categories: [ HideSpawnMenu ]
   name: HydroCo Trial Message
-  parent: Paper
+  categories: [ HideSpawnMenu ]
   components:
   - type: Paper
     stampState: paper_stamp-generic

From a711c54430ecb0e71b853504738ac3c3ca3b84d7 Mon Sep 17 00:00:00 2001
From: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Date: Sun, 24 Nov 2024 11:40:40 +0100
Subject: [PATCH 35/35] refactor: more yaml conventions

---
 .../Prototypes/DeltaV/Catalog/Fills/Crates/food.yml  | 12 ++++++------
 .../Objects/Consumable/Drinks/powdered_drinks.yml    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 35208449f4b..87e928ef054 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -31,8 +31,8 @@
           prob: 0.1
 
 - type: entity
-  id: CrateHydroCoDairy
   parent: CratePlastic
+  id: CrateHydroCoDairy
   name: HydroCo Dairy crate
   description: A shipment of powdered dairy products from HydroCo. Contains powdered milk and soy milk.
   components:
@@ -47,8 +47,8 @@
           amount: 2
 
 - type: entity
-  id: CrateHydroCoJuice
   parent: CratePlastic
+  id: CrateHydroCoJuice
   name: HydroCo Juice crate
   description: A variety pack of powdered juice products from HydroCo.
   components:
@@ -70,25 +70,25 @@
   id: FillHydroCoJuiceMix
   table: !type:AllSelector
     children:
-    #Citrus
+    # Citrus
     - !type:GroupSelector
       children:
       - id: ReagentTinPowderedJuiceOrange
       - id: ReagentTinPowderedJuiceLime
       - id: ReagentTinPowderedJuiceLemon
-    #Berry
+    # Berry
     - !type:GroupSelector
       children:
       - id: ReagentTinPowderedJuiceBerry
       - id: ReagentTinPowderedJuiceGrape
       - id: ReagentTinPowderedJuiceCherry
-    #Tropical
+    # Tropical
     - !type:GroupSelector
       children:
       - id: ReagentTinPowderedJuicePineapple
       - id: ReagentTinPowderedJuiceBanana
       - id: ReagentTinPowderedJuiceWatermelon
-    #Garden
+    # Garden
     - !type:GroupSelector
       children:
       - id: ReagentTinPowderedJuiceApple
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
index 3cda45a89f4..3e242a07f2a 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
@@ -1,7 +1,7 @@
 - type: entity
+  abstract: true
   parent: ReagentContainerBase
   id: ReagentTinBase
-  abstract: true
   components:
   - type: Openable
     openableByHand: false