Merge branch 'Floof-Station:master' into master

Author: SyaoranFox

Resources/Changelog/Euphoria.yml

@@ -1475,3 +1475,17 @@ Entries:
       message: Trains evac will no longer have pressure issues.
   id: 180
   time: '2026-03-21T00:34:02.0000000+00:00'
+- author: SyaoranFox
+  changes:
+    - type: Add
+      message: Olive, Ghee, and Corn oil jars to chefvend.!
+  id: 181
+  time: '2026-03-21T13:56:04.0000000+00:00'
+- author: SyaoranFox
+  changes:
+    - type: Add
+      message: Miso Recipe
+    - type: Tweak
+      message: Increased volume of salt and pepper shakers
+  id: 182
+  time: '2026-03-22T00:17:07.0000000+00:00'

Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml

@@ -28,6 +28,9 @@
     # End DeltaV Additions
     FoodSnackChocolate: 4 # Floofstation
     DrinkCreamCarton: 2 # Floofstation
+    OilJarCorn: 2 # Floofstation
+    OilJarOlive: 2 # Floofstation
+    OilJarGhee: 2 # Floofstation
   contrabandInventory:
     EggBoxBroken: 1
     FoodBoxDonkpocket: 1

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml

@@ -556,7 +556,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 40
   - type: SolutionTransfer
     canChangeTransferAmount: true
     minTransferAmount: 5
@@ -595,7 +595,7 @@
       food:
         reagents:
         - ReagentId: TableSalt
-          Quantity: 20
+          Quantity: 40
   - type: Sprite
     state: shaker-salt
   - type: Icon
@@ -615,7 +615,7 @@
       food:
         reagents:
         - ReagentId: Blackpepper
-          Quantity: 20
+          Quantity: 40
   - type: Sprite
     state: shaker-pepper
   - type: Icon

Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml

@@ -669,7 +669,7 @@
         - ReagentId: Butter
           Quantity: 15
   - type: SliceableFood
-    count: 3
+    count: 5
     slice: FoodButterSlice
   - type: Extractable # DeltaV - Makes butter extractable
     grindableSolutionName: food
@@ -687,10 +687,10 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 6
+        maxVol: 4
         reagents:
         - ReagentId: Butter
-          Quantity: 5
+          Quantity: 3
   - type: Tag
     tags:
     - Slice

Resources/Prototypes/_Floof/Prototypes/Recipes/Cooking/soups.yml

@@ -0,0 +1,12 @@
+- type: microwaveMealRecipe
+  id: RecipeMisoSoup
+  name: miso soup recipe
+  result: FoodSoupMiso
+  time: 10
+  group: Soup
+  reagents:
+    Water: 10
+  solids:
+    FoodBowlBig: 1
+    FoodSoybeans: 2
+    FoodTofuSlice: 1