New recipe: Cotton Cakes (#39222)

* add moth edible cotton cakes

* oh fuck i accidentally changed the sln file

* inhand sprite fix

---------

Co-authored-by: DispenserDev <mariousjoaquin@gmail.com>

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
index 88506d33a62af1563f85c72af95b591496bfea06..5d559fa13244f92fcd2e27cfee1a530297f9f0a6 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
@@ -42,6 +42,7 @@
       - FoodCakeChristmasSlice
       - FoodCakeVanillaSlice
       - FoodCakeBirthdaySlice
+      - FoodCakeCottonSlice
       - FoodBakedMuffin
       - FoodBakedMuffinBerry
       - FoodBakedMuffinCherry

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
index 7e580db98051e6ff739328448c0964a26eb9c9a0..719f2bd912592ca37a8531f02081b1233afc862b 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
@@ -37,6 +37,7 @@
       - FoodCakeChristmas
       - FoodCakeBirthday
       - FoodCakeVanilla
+      - FoodCakeCotton
       - FoodPieApple
       - FoodPieBaklava
       - FoodPieBananaCream

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index eb6b71212a21c7ccbb1c8952ba6752a346a5977a..5c0a4eb7cfb4a53f82233a80061a7da0753ebd46 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -1190,3 +1190,58 @@
       Burger: SuppermatterBurger
   - type: Item
     heldPrefix: suppermatter-shard
+
+- type: entity
+  name: cotton cake
+  parent: FoodCakeBase
+  id: FoodCakeCotton
+  description: A cake with a fiber frosting and a wad of cotton on top.
+  components:
+  - type: Sprite
+    state: cotton
+  - type: SliceableFood
+    slice: FoodCakeCottonSlice
+  - type: Tag
+    tags:
+    - Cake
+    - ClothMade
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 55
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 30
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Fiber
+          Quantity: 10
+  - type: Item
+    heldPrefix: cotton
+
+- type: entity
+  name: slice of cotton cake
+  parent: FoodCakeSliceBase
+  id: FoodCakeCottonSlice
+  description: A slice of cotton cake. You can just lick the frosting, it's fine.
+  components:
+  - type: Sprite
+    state: cotton-slice
+  - type: Tag
+    tags:
+    - Cake
+    - ClothMade
+    - Slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 8
+        - ReagentId: Vitamin
+          Quantity: 1
+        - ReagentId: Fiber
+          Quantity: 2
+  - type: Item
+    heldPrefix: cotton-slice

diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index d576d5789e2085ae86f3d2dc41c3283577412350..baf3e7011c91ea79360ebbe66774e4f50967f0b2 100644 (file)
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -2435,3 +2435,15 @@
     MobMothroach: 1
     OrganAnimalHeart: 1
     MoproachShoes: 1
+
+- type: microwaveMealRecipe
+  id: RecipeCottonCake
+  name: cotton cake recipe
+  result: FoodCakeCotton
+  time: 5
+  group: Cake
+  reagents:
+    Fiber: 10
+  solids:
+    FoodCakePlain: 1
+    
\ No newline at end of file

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png
new file mode 100644 (file)
index 0000000..623d36b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png
new file mode 100644 (file)
index 0000000..117e455
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png
new file mode 100644 (file)
index 0000000..db53efc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png
new file mode 100644 (file)
index 0000000..883083e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png
new file mode 100644 (file)
index 0000000..dbcc9f2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png
new file mode 100644 (file)
index 0000000..eeee2e2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
index f54a9cfcc960edde4a803c903430346533908a57..e00bbdeeea1fb71d38684d69980f21b8080d7bfc 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.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, inhands by mubururu_ (github)",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github), cotton cake sprites by DispenserG0inUp",
     "size": {
         "x": 32,
         "y": 32
@@ -308,6 +308,28 @@
         {
             "name": "lemoon-slice"
 
+        },
+               {
+            "name": "cotton"
+        },
+        {
+            "name": "cotton-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cotton-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "cotton-slice"
+        },
+        {
+            "name": "cotton-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cotton-slice-inhand-right",
+            "directions": 4
         }
     ]
 }