Merge branch 'master' into Hotdog

Author: SketchiiArtist

Resources/Changelog/Frontier.yml

@@ -5024,3 +5024,12 @@ Entries:
   id: 6257
   time: '2025-08-23T00:31:16.0000000+00:00'
   url: https://github.com/new-frontiers-14/frontier-station-14/pull/3823
+- author: dustylens
+  changes:
+    - type: Add
+      message: >-
+        Rice dough and rice dough slices added for noodle production. Also mochi
+        treats can be made!
+  id: 6258
+  time: '2025-08-23T18:41:26.0000000+00:00'
+  url: https://github.com/new-frontiers-14/frontier-station-14/pull/3816

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/frozen.yml

@@ -23,3 +23,241 @@
     - sweet
     - icecream
     - licorice
+
+- type: entity
+  name: mochi
+  parent: FoodFrozenBase
+  id: FoodFrozenMochi
+  description: A delicious blorb of chewey sticky rice encapsulating a core of ice cream. Tasty!
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/frozen.rsi
+    layers:
+    - state: mochi
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Sugar
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+    - rice
+    - icecream
+    - sweet
+
+- type: entity
+  name: bungo mochi
+  parent: FoodFrozenBase
+  id: FoodFrozenMochiBungo
+  description: A delicious blorb of chewey sticky rice encapsulating a core of ice cream. It's bungo flavored!
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/frozen.rsi
+    layers:
+    - state: bungomochi
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Sugar
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+    - rice
+    - icecream
+    - bungo
+
+- type: entity
+  name: cherry mochi
+  parent: FoodFrozenBase
+  id: FoodFrozenMochiCherry
+  description: A delicious blorb of chewey sticky rice encapsulating a core of ice cream. It's cherry flavored!
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/frozen.rsi
+    layers:
+    - state: cherrymochi
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Sugar
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+    - rice
+    - icecream
+    - cherry
+
+- type: entity
+  name: chocolate mochi
+  parent: FoodFrozenBase
+  id: FoodFrozenMochiChocolate
+  description: A delicious blorb of chewey sticky rice encapsulating a core of ice cream. It's chocolate flavored!
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/frozen.rsi
+    layers:
+    - state: chocomochi
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Sugar
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+    - rice
+    - icecream
+    - chocolate
+
+- type: entity
+  name: fiber mochi
+  parent: FoodFrozenBase
+  id: FoodFrozenMochiFiber
+  description: A delicious blorb of chewey sticky rice encapsulating a core of ice cream. It's woven with fiber!
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/frozen.rsi
+    layers:
+    - state: fibermochi
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 4
+        - ReagentId: Sugar
+          Quantity: 4
+        - ReagentId: Fiber
+          Quantity: 2
+  - type: FlavorProfile
+    flavors:
+    - rice
+    - icecream
+    - fiber
+
+- type: entity
+  name: rosy mochi
+  parent: FoodFrozenBase
+  id: FoodFrozenMochiMoth
+  description: A delicious blorb of chewey sticky rice encapsulating a core of ice cream. It's almost too cute to eat! Almost.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/frozen.rsi
+    layers:
+    - state: mothmochi
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Sugar
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+    - rice
+    - icecream
+    - pink
+
+- type: entity
+  name: cinnamon mochi
+  parent: FoodFrozenBase
+  id: FoodFrozenMochiSpice
+  description: A delicious blorb of chewey sticky rice encapsulating a core of ice cream. It's spicy! Is that cinnamon?
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/frozen.rsi
+    layers:
+    - state: spicemochi
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Sugar
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+    - rice
+    - icecream
+    - cinnamon
+
+- type: entity
+  name: tea mochi
+  parent: FoodFrozenBase
+  id: FoodFrozenMochiTea
+  description: A delicious blorb of chewey sticky rice encapsulating a core of ice cream. It's infused with tea!
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/frozen.rsi
+    layers:
+    - state: teamochi
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Sugar
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+    - rice
+    - icecream
+    - tea
+
+- type: entity
+  name: ube mochi
+  parent: FoodFrozenBase
+  id: FoodFrozenMochiUbe
+  description: A delicious blorb of chewey sticky rice encapsulating a core of ice cream. You're not sure if it's really ube.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/frozen.rsi
+    layers:
+    - state: ubemochi
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 4
+        - ReagentId: Sugar
+          Quantity: 4
+        - ReagentId: PolypyryliumOligomers
+          Quantity: 2
+  - type: FlavorProfile
+    flavors:
+    - rice
+    - icecream
+    - antiseptic

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

@@ -269,7 +269,7 @@
     sprite: _NF/Objects/Consumable/Food/ingredients.rsi
     state: rice-noodle-sheet
   - type: SliceableFood
-    count: 3
+    count: 4
     slice: FoodRiceNoodles
   - type: Tag
     tags:
@@ -280,7 +280,7 @@
         maxVol: 65 # it's a bunch of raw rice. How sad to eat this.
         reagents:
         - ReagentId: Rice
-          Quantity: 45
+          Quantity: 40
         - ReagentId: TableSalt
           Quantity: 10
         - ReagentId: Cornoil
@@ -298,14 +298,57 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 21
+        maxVol: 20
         reagents:
         - ReagentId: Rice
-          Quantity: 15
+          Quantity: 10
         - ReagentId: TableSalt
-          Quantity: 3
+          Quantity: 2
         - ReagentId: Cornoil
-          Quantity: 3
+          Quantity: 2
+
+- type: entity
+  name: rice dough
+  parent: FoodBakingBase
+  id: FoodRiceDough
+  description: You're pretty sure this is just rice and water. You have no idea how it's holding together.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - rice
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/ingredients.rsi
+    state: rice-dough
+  - type: SliceableFood
+    count: 4
+    slice: FoodRiceDoughSlice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 65 # it's a bunch of raw rice. How sad to eat this.
+        reagents:
+        - ReagentId: Rice
+          Quantity: 40
+
+- type: entity
+  name: rice dough slice
+  parent: FoodBakingBase
+  id: FoodRiceDoughSlice
+  description: A slice of rice dough. 
+  components:
+  - type: FlavorProfile
+    flavors:
+      - rice
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/ingredients.rsi
+    state: rice-dough-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Rice
+          Quantity: 10
 
 - type: entity
   parent: FoodMeatBase
@@ -338,4 +381,4 @@
     state: sausagecasing
   - type: Construction
     graph: Cutlet
-    node: casing
+    node: casing

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml

@@ -400,7 +400,7 @@
         maxVol: 35
         reagents:
         - ReagentId: Nutriment
-          Quantity: 15
+          Quantity: 10
         - ReagentId: Flavorol
           Quantity: 10
 
@@ -426,7 +426,7 @@
         maxVol: 35
         reagents:
         - ReagentId: Nutriment
-          Quantity: 15
+          Quantity: 10
         - ReagentId: Vitamin
           Quantity: 5
         - ReagentId: Flavorol
@@ -458,7 +458,7 @@
         maxVol: 35
         reagents:
         - ReagentId: Nutriment
-          Quantity: 15
+          Quantity: 10
         - ReagentId: Vitamin
           Quantity: 5
         - ReagentId: Flavorol
@@ -491,7 +491,7 @@
         maxVol: 35
         reagents:
         - ReagentId: Nutriment
-          Quantity: 15
+          Quantity: 10
         - ReagentId: Vitamin
           Quantity: 5
         - ReagentId: Flavorol
@@ -525,7 +525,7 @@
         maxVol: 35
         reagents:
         - ReagentId: Nutriment
-          Quantity: 15
+          Quantity: 10
         - ReagentId: Vitamin
           Quantity: 5
         - ReagentId: Flavorol
@@ -558,7 +558,7 @@
         maxVol: 35
         reagents:
         - ReagentId: Nutriment
-          Quantity: 15
+          Quantity: 10
         - ReagentId: Vitamin
           Quantity: 5
         - ReagentId: Flavorol