Muffins

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

@@ -11,6 +11,7 @@
     FoodPlate: 10
     FoodPlateSmall: 10
     FoodPlateTin: 5
+    FoodPlateMuffinTin: 5
     FoodKebabSkewer: 5
     DrinkGlass: 5
     Beaker: 5

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml

@@ -46,6 +46,8 @@
       - FoodBakedMuffinBerry
       - FoodBakedMuffinCherry
       - FoodBakedMuffinBluecherry
+      - FoodBakedMuffinChocolate
+      - FoodBakedMuffinBanana
       - FoodBakedBunHoney
       - FoodBakedBunHotX
       - FoodBakedBunMeat

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml

@@ -19,44 +19,84 @@
   - type: Item
     size: Tiny
 
-# Muffins/Buns
+# Muffins
 
 - type: entity
   name: muffin
-  parent: FoodBakedBase
+  parent: FoodInjectableBase
   id: FoodBakedMuffin
   description: A delicious and spongy little cake.
   components:
+  - type: Food
+    trash: 
+    - FoodPlateMuffinTin
   - type: Sprite
+    sprite: Objects/Consumable/Food/Baked/misc.rsi
     state: muffin
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+  - type: FlavorProfile
+    flavors:
+      - sweet
+  - type: Item
+    size: Tiny
 
 - type: entity
   name: berry muffin
-  parent: FoodBakedBase
+  parent: FoodBakedMuffin
   id: FoodBakedMuffinBerry
   description: A delicious and spongy little cake, with berries.
   components:
   - type: Sprite
     state: muffin-berry
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: JuiceBerry
+          Quantity: 2
   - type: Tag
     tags:
     - Fruit
 
 - type: entity
   name: cherry muffin
-  parent: FoodBakedBase
+  parent: FoodBakedMuffin
   id: FoodBakedMuffinCherry
   description: A sweet muffin with cherry bits.
   components:
   - type: Sprite
     state: muffin-cherry
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: JuiceCherry
+          Quantity: 2
   - type: Tag
     tags:
     - Fruit
 
 - type: entity
   name: bluecherry muffin
-  parent: FoodBakedBase
+  parent: FoodBakedMuffin
   id: FoodBakedMuffinBluecherry
   description: Blue cherries inside a delicious muffin.
   components:
@@ -66,6 +106,51 @@
     tags:
     - Fruit
 
+- type: entity
+  name: chocolate muffin
+  parent: FoodBakedMuffin
+  id: FoodBakedMuffinChocolate
+  description: A delicious and spongy chocolate muffin.
+  components:
+  - type: Sprite
+    state: muffin-chocolate
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: CocoaPowder
+          Quantity: 2
+
+- type: entity
+  name: banana muffin
+  parent: FoodBakedMuffin
+  id: FoodBakedMuffinBanana
+  description: A delicious and spongy banana muffin.
+  components:
+  - type: Sprite
+    state: muffin-banana
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: JuiceBanana
+          Quantity: 2
+  - type: Tag
+    tags:
+    - Fruit
+
+# Buns
+
 - type: entity
   name: honey bun #TODO honey
   parent: FoodBakedBase
@@ -685,4 +770,4 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones
+        Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones

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

@@ -178,3 +178,27 @@
     materialComposition:
       Steel: 60
   - type: SpaceGarbage
+
+# Muffin Tin
+
+- type: entity
+  name: muffin tin
+  parent: BaseItem
+  id: FoodPlateMuffinTin
+  description: A cheap foil tin for muffins.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/plates.rsi
+    state: muffin-tin
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,0
+    storedOffset: 0,-3
+  - type: Tag
+    tags:
+    - Trash
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 30
+  - type: SpaceGarbage

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -163,6 +163,7 @@
       - FoodPlateSmallPlastic
       - FoodBowlBig
       - FoodPlateTin
+      - FoodPlateMuffinTin
       - FoodKebabSkewer
       - SprayBottle
       - MopItem

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -1779,6 +1779,67 @@
     FoodOrange: 1
     FoodAmbrosiaVulgaris: 1
 
+# Muffins
+
+- type: microwaveMealRecipe
+  id: RecipeMuffin
+  name: muffin recipe
+  result: FoodBakedMuffin
+  time: 15
+  solids:
+    FoodPlateMuffinTin: 1
+    FoodDoughSlice: 1
+  reagents:
+    Sugar: 10
+
+- type: microwaveMealRecipe
+  id: RecipeMuffinChocolate
+  name: chocolate muffin recipe
+  result: FoodBakedMuffinChocolate
+  time: 15
+  solids:
+    FoodPlateMuffinTin: 1
+    FoodDoughSlice: 1
+    FoodSnackChocolateBar: 1
+  reagents:
+    Sugar: 10
+
+- type: microwaveMealRecipe
+  id: RecipeMuffinBerry
+  name: berry muffin recipe
+  result: FoodBakedMuffinBerry
+  time: 15
+  solids:
+    FoodPlateMuffinTin: 1
+    FoodDoughSlice: 1
+    FoodBerries: 1
+  reagents:
+    Sugar: 10
+
+- type: microwaveMealRecipe
+  id: RecipeMuffinBanana
+  name: banana muffin recipe
+  result: FoodBakedMuffinBanana
+  time: 15
+  solids:
+    FoodPlateMuffinTin: 1
+    FoodDoughSlice: 1
+    FoodBanana: 1
+  reagents:
+    Sugar: 10
+
+- type: microwaveMealRecipe
+  id: RecipeMuffinCherry
+  name: cherry muffin recipe
+  result: FoodBakedMuffinCherry
+  time: 15
+  solids:
+    FoodPlateMuffinTin: 1
+    FoodDoughSlice: 1
+    FoodCherry: 3
+  reagents:
+    Sugar: 10
+
 # NOT ACTUAL FOOD
 
 - type: microwaveMealRecipe

Resources/Prototypes/Recipes/Lathes/cooking.yml

@@ -98,6 +98,13 @@
   materials:
     Steel: 100
 
+- type: latheRecipe
+  id: FoodPlateMuffinTin
+  result: FoodPlateMuffinTin
+  completetime: 0.4
+  materials:
+    Steel: 50
+
 - type: latheRecipe
   id: FoodKebabSkewer
   result: FoodKebabSkewer

Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58, croissant taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58, croissant taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955. Muffin-chocolate, muffin-banana and muffin-cherry sprites modified from the original muffin sprite by RumiTiger",
     "size": {
         "x": 32,
         "y": 32
@@ -162,7 +162,12 @@
         },
         {
             "name": "croissant"
+        },
+        {
+           "name": "muffin-chocolate"
+        },
+        {
+           "name": "muffin-banana"
         }
     ]
 }
-

Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Muffin-tin sprite modified from the original tin sprite by RumiTiger",
   "size": {
     "x": 32,
     "y": 32
@@ -33,6 +33,9 @@
     },
     {
       "name": "tray-trash"
+    },
+    {
+        "name": "muffin-tin"
     }
   ]
 }