New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs (#33508)

* A looooooooot of new cotton foods for the moffs

* address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs)

* alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png

* update requested sprites

* change requested sprites

* address part of sloth's review, awaiting response

* address second half of review, fix magical food nutriment mitosis bug

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

@@ -47,3 +47,31 @@
           Quantity: 5
         - ReagentId: Nutriment
           Quantity: 5
+
+- type: entity
+  id: FoodBagelCotton
+  parent: FoodBagelBase
+  name: cotton bagel
+  description: A delicious bagel made with cotton dough.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - bread
+    - cotton
+  - type: Sprite
+    state: bagel-cottondough
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: Tag
+    tags:
+    - ClothMade
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2.5
+        - ReagentId: Fiber
+          Quantity: 2.5
+

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

@@ -702,6 +702,46 @@
         Blunt: 1 # bonk
 # Tastes like France.
 
+- type: entity
+  name: cotton baguette
+  parent: FoodBreadBaguette
+  id: FoodBreadBaguetteCotton
+  description: Bon azzétit!
+  components:
+  - type: Sprite
+    state: baguette-cotton
+  - type: SliceableFood
+    slice: FoodBreadBaguetteCottonSlice
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: Tag
+    tags:
+    - Bread
+    - ClothMade
+  - type: Clothing
+    equippedPrefix: baguette-cotton
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: baguette-cotton-inhand-left
+      right:
+      - state: baguette-cotton-inhand-right
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Fiber
+          Quantity: 3
+        - ReagentId: Vitamin
+          Quantity: 1
+        - ReagentId: TableSalt
+          Quantity: 1
+        - ReagentId: Blackpepper
+          Quantity: 1
+
 - type: entity
   name: crostini
   parent: FoodBreadSliceBase
@@ -724,6 +764,37 @@
         - ReagentId: Blackpepper
           Quantity: 0.1
 
+- type: entity
+  name: cotton crostini
+  parent: FoodBreadBaguetteSlice
+  id: FoodBreadBaguetteCottonSlice
+  description: Bon az-zetite!
+  components:
+  - type: Sprite
+    state: crostini-cotton
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: Tag
+    tags:
+    - Bread
+    - Slice
+    - ClothMade
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 2
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 0.25
+        - ReagentId: Fiber
+          Quantity: 0.25
+        - ReagentId: Vitamin
+          Quantity: 0.1
+        - ReagentId: TableSalt
+          Quantity: 0.1
+        - ReagentId: Blackpepper
+          Quantity: 0.1
+
 - type: entity
   name: buttered toast
   parent: FoodBreadSliceBase

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

@@ -28,7 +28,7 @@
   description: A delicious and spongy little cake.
   components:
   - type: Food
-    trash: 
+    trash:
     - FoodPlateMuffinTin
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/misc.rsi
@@ -609,6 +609,38 @@
         - ReagentId: Vitamin
           Quantity: 0.5
 
+- type: entity
+  name: cotton chèvre chaud
+  parent: FoodBakedChevreChaud
+  id: FoodBakedChevreChaudCotton
+  description: A disk of slightly melted chèvre flopped on top of a... cotton crostini, and toasted all-round.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - bread
+    - nutty
+    - creamy
+    - smokey
+    - cotton
+  - type: Sprite
+    state: chevrechaud-cotton
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: Tag
+    tags:
+    - ClothMade
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 1
+        - ReagentId: Fiber
+          Quantity: 1
+        - ReagentId: Vitamin
+          Quantity: 0.5
+
 - type: entity
   name: brownies
   parent: FoodBakedBase
@@ -771,3 +803,35 @@
     damage:
       types:
         Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones
+
+- type: entity
+  name: cotton croissant
+  parent: FoodBakedCroissant
+  id: FoodBakedCroissantCotton
+  description: Buttery, flaky, fibery goodness.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - bread
+    - butter
+    - cotton
+  - type: Sprite
+    state: croissant-cotton
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: Tag
+    tags:
+    - ClothMade
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 7
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 1.5
+        - ReagentId: Fiber
+          Quantity: 1.5
+        - ReagentId: Butter
+          Quantity: 2
+        - ReagentId: Vitamin
+          Quantity: 1

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

@@ -315,6 +315,13 @@
   - type: Construction
     graph: DoughRope
     node: start
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
 
 - type: entity
   name: dough rope
@@ -330,6 +337,13 @@
   - type: Construction
     graph: DoughRope
     node: rolled
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
 
 - type: entity
   name: cornmeal dough
@@ -426,9 +440,9 @@
     - cotton
   - type: Sprite
     state: cotton-dough
-  # - type: SliceableFood # TODO add it
-  #   count: 3
-  #   slice: FoodDoughCottonSlice
+  - type: SliceableFood
+    count: 3
+    slice: FoodDoughCottonSlice
   - type: Construction
     graph: CottonPizza
     node: start
@@ -446,6 +460,59 @@
         - ReagentId: Fiber
           Quantity: 10
 
+- type: entity
+  name: cotton dough slice
+  parent: FoodBakingBase
+  id: FoodDoughCottonSlice
+  description: A slice of cotton dough.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - dough
+    - cotton
+  - type: Sprite
+    state: cotton-dough-slice
+  - type: Tag
+    tags:
+    - Slice
+  - type: Construction
+    graph: DoughRopeCotton
+    node: start
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 1.5
+        - ReagentId: Fiber
+          Quantity: 3.5
+
+- type: entity
+  name: dough rope
+  parent: FoodBakingBase
+  id: FoodDoughCottonRope
+  description: A thin noodle of cotton dough. Can be cooked into a cotton bagel.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - dough
+    - cotton
+  - type: Sprite
+    state: cotton-dough-rope
+  - type: Construction
+    graph: DoughRopeCotton
+    node: rolled
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 1.5
+        - ReagentId: Fiber
+          Quantity: 3.5
+
 - type: entity
   name: raw pastry base
   parent: FoodBakingBase
@@ -499,6 +566,9 @@
   - type: Construction
     graph: CottonPizza
     node: flat
+  - type: SliceableFood
+    count: 3
+    slice: FoodCroissantRawCotton
 
 - type: entity
   name: pizza bread
@@ -818,3 +888,16 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 3
+
+- type: entity
+  name: raw cotton croissant
+  parent: FoodCroissantRaw
+  id: FoodCroissantRawCotton
+  description: Buttery, flaky, fibery goodness waiting to happen.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - dough
+    - cotton
+  - type: Sprite
+    state: croissant-raw-cotton

Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml

@@ -10,4 +10,18 @@
       - tool: Rolling
         doAfter: 1
   - node: rolled
-    entity: FoodDoughRope
+    entity: FoodDoughRope
+
+- type: constructionGraph
+  id: DoughRopeCotton
+  start: start
+  graph:
+  - node: start
+    entity: FoodDoughCottonSlice
+    edges:
+    - to: rolled
+      steps:
+      - tool: Rolling
+        doAfter: 1
+  - node: rolled
+    entity: FoodDoughCottonRope

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -24,6 +24,14 @@
     FoodDoughRope: 1
     PoppySeeds: 1
 
+- type: microwaveMealRecipe
+  id: RecipeBagelCotton
+  name: cotton bagel recipe
+  result: FoodBagelCotton
+  time: 5
+  solids:
+    FoodDoughCottonRope: 1
+
 #Burgers
 
 - type: microwaveMealRecipe
@@ -458,6 +466,17 @@
   solids:
     FoodDough: 1
 
+- type: microwaveMealRecipe
+  id: RecipeBaguetteCotton
+  name: baguette recipe
+  result: FoodBreadBaguetteCotton
+  time: 15
+  reagents:
+    TableSalt: 5
+    Blackpepper: 5
+  solids:
+    FoodDoughCotton: 1
+
 - type: microwaveMealRecipe
   id: RecipeBaguetteSword
   name: baguette sword recipe
@@ -1939,6 +1958,15 @@
     FoodChevreSlice: 1
     FoodBreadBaguetteSlice: 1
 
+- type: microwaveMealRecipe
+  id: RecipeFoodBakedChevreChaudCotton
+  name: cotton chevre chaud recipe
+  result: FoodBakedChevreChaudCotton
+  time: 5
+  solids:
+    FoodChevreSlice: 1
+    FoodBreadBaguetteCottonSlice: 1
+
 - type: microwaveMealRecipe
   id: RecipeCannabisButter
   name: cannabis butter recipe
@@ -2067,6 +2095,15 @@
     FoodCroissantRaw: 1
     FoodButterSlice: 1
 
+- type: microwaveMealRecipe
+  id: RecipeCroissantCotton
+  name: cotton croissant recipe
+  result: FoodBakedCroissantCotton
+  time: 5
+  solids:
+    FoodCroissantRawCotton: 1
+    FoodButterSlice: 1
+
 - type: microwaveMealRecipe
   id: RecipeThrowingCroissant
   name: throwing croissant recipe

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

@@ -1,17 +1,20 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Bagel and BagelPoppy were created by DrEnzyme",
+    "copyright": "Bagel and BagelPoppy were created by DrEnzyme. Bagel-cottondough by JuneSzalkowska.",
     "size": {
       "x": 32,
       "y": 32
     },
     "states": [
-      {
-        "name": "bagel"
-      },
-      {
-        "name": "bagel-poppy"
-      }
+        {
+            "name": "bagel"
+        },
+        {
+            "name": "bagel-poppy"
+        },
+        {
+            "name": "bagel-cottondough"
+        }
     ]
-}
+}

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

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380)",
+  "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Cotton baguette and crostini variants by JuneSzalkowska",
   "size": {
     "x": 32,
     "y": 32
@@ -46,6 +46,21 @@
       "name": "baguette-inhand-right",
       "directions": 4
     },
+    {
+      "name": "baguette-cotton"
+    },
+    {
+      "name": "baguette-cotton-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "baguette-cotton-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "baguette-cotton-inhand-right",
+      "directions": 4
+    },
     {
       "name": "banana"
     },
@@ -70,6 +85,9 @@
     {
       "name": "crostini"
     },
+    {
+      "name": "crostini-cotton"
+    },
     {
       "name": "cotton"
     },

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. Muffin-chocolate, muffin-banana and muffin-cherry sprites modified from the original muffin sprite by RumiTiger",
+    "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. Chevrechaud-cotton and croissant-cotton created by JuneSzalkowska",
     "size": {
         "x": 32,
         "y": 32
@@ -160,9 +160,15 @@
         {
             "name": "chevrechaud"
         },
+        {
+            "name": "chevrechaud-cotton"
+        },
         {
             "name": "croissant"
         },
+        {
+            "name": "croissant-cotton"
+        },
         {
            "name": "muffin-chocolate"
         },

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

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380)",
+  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska",
   "size": {
     "x": 32,
     "y": 32
@@ -46,6 +46,12 @@
     {
       "name": "cotton-dough"
     },
+    {
+      "name": "cotton-dough-slice"
+    },
+    {
+      "name": "cotton-dough-rope"
+    },
     {
       "name": "dough"
     },
@@ -123,6 +129,9 @@
     },
     {
       "name": "croissant-raw"
+    },
+    {
+      "name": "croissant-raw-cotton"
     }
   ]
 }