Merge branch 'master' into hwid-ops

Resources/Changelog/DeltaVChangelog.yml

@@ -1,23 +1,4 @@
 Entries:
-- author: DebugOk
-  changes:
-  - message: You should be able to exit cryo even after leaving now, meaning it just
-      keeps your body safe?
-    type: Tweak
-  id: 215
-  time: '2024-01-31T07:41:58.0000000+00:00'
-- author: DebugOk
-  changes:
-  - message: Prisoners will no longer spawn in cryopods instead of in the brig.
-    type: Fix
-  id: 216
-  time: '2024-01-31T09:42:57.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-  - message: Made HCV cocktail less immediately lethal (damnation!!!)
-    type: Tweak
-  id: 217
-  time: '2024-01-31T10:34:16.0000000+00:00'
 - author: Adrian16199
   changes:
   - message: Shoukou has received the cryopods.
@@ -3779,3 +3760,27 @@
   id: 714
   time: '2024-11-28T19:36:26.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2309
+- author: Kr8art
+  changes:
+  - message: Added a restock for the sustenance vendor to end the ongoing involuntary
+      hunger strikes in perma.
+    type: Add
+  id: 715
+  time: '2024-11-29T01:27:57.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2307
+- author: Emily9031
+  changes:
+  - message: Felinids, vulpkanin, harpies, and rodentia now have gasping sounds.
+    type: Fix
+  id: 716
+  time: '2024-11-29T06:35:24.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2313
+- author: DisposableCrewmember42
+  changes:
+  - message: NanoTrasen has established business relations with HydroCo! You can now
+      order powdered milk and juice via your Logistics department and bet on the growth
+      of the HYD stock.
+    type: Add
+  id: 717
+  time: '2024-11-29T09:51:20.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2210

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]

Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl

@@ -1,2 +1,5 @@
 ent-CrateVendingMachineRestockPrideFilled = Pride-O-Mat restock crate
-    .desc = Contains a restock box for the Pride-O-Mat.
+    .desc = Contains a restock box for the Pride-O-Mat.
+
+ent-CrateVendingMachineRestockSustenanceFilled = Sustenance vendor restock crate
+    .desc = Contains a restock box for the sustenance vendor.

Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl

@@ -0,0 +1,41 @@
+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 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
+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.
+
+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.

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

Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml

@@ -37,3 +37,23 @@
   cost: 3333
   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: 1500
+  category: Food
+  group: market

Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml

@@ -7,3 +7,13 @@
   cost: 1100
   category: Service
   group: market
+
+- type: cargoProduct
+  id: CrateVendingMachineRestockSustenance
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockSustenanceFilled
+  cost: 750
+  category: Service
+  group: market

Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml

@@ -40,3 +40,85 @@
     contents:
     - id: FoodPieBananaCream
       amount: 13
+
+- type: entity
+  parent: CratePlastic
+  id: CrateHydroCoDairy
+  name: HydroCo Dairy crate
+  description: A shipment of powdered dairy products from HydroCo. Contains powdered milk and soy milk.
+  components:
+    - type: StorageFill
+      contents:
+        - id: PaperCrateHydroCoConsumption
+        - id: SpoonPlastic
+          amount: 2
+        - id: ReagentTinPowderedMilk
+          amount: 2
+        - id: ReagentTinPowderedMilkSoy
+          amount: 2
+
+- type: entity
+  parent: CratePlastic
+  id: CrateHydroCoJuice
+  name: HydroCo Juice crate
+  description: A variety pack of powdered juice products from HydroCo.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: FillHydroCoJuiceMix
+        - !type:NestedSelector
+          tableId: FillHydroCoJuiceRandomTin
+          prob: 0.15
+        - id: SpoonPlastic
+          amount: !type:ConstantNumberSelector
+            value: 2
+        - id: PaperCrateHydroCoConsumption
+
+- type: entityTable
+  id: FillHydroCoJuiceMix
+  table: !type:AllSelector
+    children:
+    # 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
+  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
+    - id: ReagentTinPowderedJuiceTomato

Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml

@@ -4,4 +4,12 @@
   components:
   - type: StorageFill
     contents:
-      - id: VendingMachineRestockPride
+      - id: VendingMachineRestockPride
+
+- type: entity
+  id: CrateVendingMachineRestockSustenanceFilled
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+    - id: VendingMachineRestockSustenance