More merging

Resources/Changelog/Changelog.yml

@@ -530,6 +530,7 @@ Entries:
 =======
 Entries:
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> upstream/master
 - author: Plykiya
   changes:
@@ -756,6 +757,8 @@ Entries:
   id: 6713
   time: '2024-06-12T10:32:11.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28885
+=======
+>>>>>>> upstream/master
 - author: robertGN
   changes:
   - message: Syndicate communications consoles can no longer recall the emergency
@@ -4616,3 +4619,10 @@ Entries:
   id: 7212
   time: '2024-08-25T17:09:51.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/30001
+- author: lzk228
+  changes:
+  - message: Cotton dough added to the game! Check the guidebook for new recipes.
+    type: Add
+  id: 7213
+  time: '2024-08-26T02:46:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30668

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

@@ -121,6 +121,67 @@
     - Bread
     - Slice
 
+- type: entity
+  name: cotton bread
+  parent: FoodBreadBase
+  id: FoodBreadCotton
+  description: Bread, but for moff.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - cotton
+    - bread
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: Sprite
+    layers:
+    - state: cotton
+  - type: SliceableFood
+    slice: FoodBreadCottonSlice
+  - type: Tag
+    tags:
+    - ClothMade
+    - Bread
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 26
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Fiber
+          Quantity: 10
+
+- type: entity
+  name: cotton bread slice
+  parent: FoodBreadSliceBase
+  id: FoodBreadCottonSlice
+  description: A slice of (maybe) delicious cotton bread.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - cotton
+    - bread
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: Sprite
+    layers:
+    - state: cotton-slice
+  - type: Tag
+    tags:
+    - ClothMade
+    - Bread
+    - Slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 8
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Fiber
+          Quantity: 2
+
 - type: entity
   name: cornbread
   parent: FoodBreadBase

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

@@ -618,3 +618,66 @@
           Quantity: 2
 
 # Tastes like crust, tomato, cheese, radiation.
+
+- type: entity
+  name: cotton pizza
+  parent: FoodPizzaBase
+  id: FoodPizzaCotton
+  description: Flat fabric cotton dough with cotton topping. Incredible.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - cotton
+    - bread
+  - type: Sprite
+    layers:
+    - state: cotton-pizza
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: SliceableFood
+    slice: FoodPizzaCottonSlice
+  - type: Tag
+    tags:
+    - ClothMade
+    - Pizza
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 40
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 20
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Fiber
+          Quantity: 10
+
+- type: entity
+  name: slice of cotton pizza
+  parent: FoodPizzaSliceBase
+  id: FoodPizzaCottonSlice
+  description: A slice of cotton pizza. Cotton included.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - cotton
+    - bread
+  - type: Sprite
+    layers:
+    - state: cotton-slice
+  - type: Tag
+    tags:
+    - ClothMade
+    - Pizza
+    - Slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3.5
+        - ReagentId: Vitamin
+          Quantity: 0.8
+        - ReagentId: Fiber
+          Quantity: 1.5

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

@@ -414,6 +414,38 @@
     graph: Tortilla
     node: flat
 
+- type: entity
+  name: cotton dough
+  parent: FoodBakingBase
+  id: FoodDoughCotton
+  description: A piece of fabric dough.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - dough
+    - cotton
+  - type: Sprite
+    state: cotton-dough
+  # - type: SliceableFood # TODO add it
+  #   count: 3
+  #   slice: FoodDoughCottonSlice
+  - type: Construction
+    graph: CottonPizza
+    node: start
+  - type: Tag
+    tags:
+    - Ingredient
+    - ClothMade
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 18
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Fiber
+          Quantity: 10
+
 - type: entity
   name: raw pastry base
   parent: FoodBakingBase
@@ -456,6 +488,18 @@
     count: 3
     slice: FoodCroissantRaw
 
+- type: entity
+  name: flat cotton dough
+  parent: FoodBakingBase
+  id: FoodDoughCottonFlat
+  description: A flattened cotton dough.
+  components:
+  - type: Sprite
+    state: cotton-dough-flat
+  - type: Construction
+    graph: CottonPizza
+    node: flat
+
 - type: entity
   name: pizza bread
   parent: FoodBakingBase

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

@@ -0,0 +1,13 @@
+- type: constructionGraph
+  id: CottonPizza
+  start: start
+  graph:
+  - node: start
+    entity: FoodDoughCotton
+    edges:
+    - to: flat
+      steps:
+      - tool: Rolling
+        doAfter: 1
+  - node: flat
+    entity: FoodDoughCottonFlat

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -399,6 +399,14 @@
   solids:
     FoodDough: 1
 
+- type: microwaveMealRecipe
+  id: RecipeBreadCotton
+  name: cotton bread recipe
+  result: FoodBreadCotton
+  time: 10
+  solids:
+    FoodDoughCotton: 1
+
 - type: microwaveMealRecipe
   id: RecipeSausageBread
   name: sausage bread recipe
@@ -602,6 +610,15 @@
     FoodTomato: 2
     SheetUranium1: 2
 
+- type: microwaveMealRecipe
+  id: RecipeCottonPizza
+  name: cotton pizza recipe
+  result: FoodPizzaCotton
+  time: 30
+  solids:
+    FoodDoughCottonFlat: 1
+    CottonBol: 4
+
 #Italian
 - type: microwaveMealRecipe
   id: RecipeBoiledSpaghetti

Resources/Prototypes/Recipes/Reactions/food.yml

@@ -72,6 +72,22 @@
     - !type:CreateEntityReactionEffect
       entity: FoodDoughTortilla
 
+- type: reaction
+  id: CreateDoughCotton
+  impact: Low
+  quantized: true
+  conserveEnergy: false
+  reactants:
+    Fiber:
+      amount: 10
+    Flour:
+      amount: 5
+    Water:
+      amount: 10
+  effects:
+  - !type:CreateEntityReactionEffect
+    entity: FoodDoughCotton
+
 - type: reaction
   id: CreateCakeBatter
   impact: Low

Resources/Prototypes/Voice/speech_emotes.yml

@@ -3,7 +3,7 @@
   id: Scream
   name: chat-emote-name-scream
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/scream.png
   whitelist:
     components:
     - Vocal

Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml

@@ -22,9 +22,15 @@ WARNING: This is not an automatically generated list, things here may become out
 - Chocolate = 6 Cocoa Powder, 2 Milk, 2 Sugar
 - Uncooked Animal Protein: Grind Raw Meat
 
+Buzz! Don't forget about Moth diet!
+- Cotton Dough = 5 Flour, 10 Fabric, 10 Water
+- Cotton bread baked the same as default but with cotton dough instead
+- Cotton Pizza: Microwave 1 Flat Cotton Dough and 4 Cotton Bolls for 30 Seconds
+
 <Box>
 <GuideEntityEmbed Entity="FoodDough"/>
 <GuideEntityEmbed Entity="FoodDoughCornmeal"/>
+<GuideEntityEmbed Entity="FoodDoughCotton"/>
 <GuideEntityEmbed Entity="FoodTofu"/>
 <GuideEntityEmbed Entity="FoodDoughPie"/>
 <GuideEntityEmbed Entity="FoodCakeBatter"/>

Resources/Textures/Interface/Emotes/attributions.yml

@@ -76,6 +76,11 @@
   copyright: "Created by Sarahon"
   source: "https://github.com/Sarahon"
 
+- files: ["scream.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by lzk228(discord 455630609641897984), based on sprite by Sarahon"
+  source: "https://github.com/lzk228"
+
 - files: ["sigh.png"]
   license: "CC-BY-SA-3.0"
   copyright: "Created by Sarahon"
@@ -98,7 +103,7 @@
 
 - files: ["vocal.png"]
   license: "CC-BY-SA-3.0"
-  copyright: "Created by Sarahon"
+  copyright: "Created by Sarahon, modified by lzk228(discord 455630609641897984)"
   source: "https://github.com/Sarahon"
 
 - files: ["weh.png"]

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",
+  "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)",
   "size": {
     "x": 32,
     "y": 32
@@ -70,6 +70,12 @@
     {
       "name": "crostini"
     },
+    {
+      "name": "cotton"
+    },
+    {
+      "name": "cotton-slice"
+    },
     {
       "name": "french-toast"
     },

Resources/Textures/Objects/Consumable/Food/Baked/pizza.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, Spicy Rock Pizza modified from margherita pizza by mkanke",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, Spicy Rock Pizza modified from margherita pizza by mkanke, cotton made by mlexf (discord 1143460554963427380)",
   "size": {
     "x": 32,
     "y": 32
@@ -43,6 +43,12 @@
     {
       "name": "base-8"
     },
+    {
+      "name": "cotton-pizza"
+    },
+    {
+      "name": "cotton-slice"
+    },
     {
       "name": "dank"
     },