]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Moff cooking. Part one. (#30668)
authorlzk <124214523+lzk228@users.noreply.github.com>
Mon, 26 Aug 2024 02:46:16 +0000 (04:46 +0200)
committerGitHub <noreply@github.com>
Mon, 26 Aug 2024 02:46:16 +0000 (12:46 +1000)
* yml part

* guidebook

* commit

* some fixes

* a little

* change

16 files changed:
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Resources/Prototypes/Recipes/Reactions/food.yml
Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton-slice.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-pizza.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-slice.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-flat.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json

index 31e92931dbd0f14d2045f7a7ca9b4229140c2ecd..0fb3df4d278091cdf8065d72a6321e58218efc0d 100644 (file)
     - 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
index 652c60722d99f9754a9c1006005de95417b94b72..ff38363c9ea7d7c38139b2b7da63f0ea367a28ee 100644 (file)
           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
index 6e481bb96184c27e4e5b2bf87f3e149a557cf038..1a80a5fe53249b00d890274db1a418105fbb4f84 100644 (file)
     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
     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
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml
new file mode 100644 (file)
index 0000000..2292d4d
--- /dev/null
@@ -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
index 9a59ab50234d977d6831af65788016b56c077031..ce381256270e427e8f8356253845c08e73385cab 100644 (file)
   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
     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
index 24dca890ed75c72821e7d7dffe60baa8779c9ab1..7d524a9c7ae00fc608159dd397250b8d0c9889fd 100644 (file)
     - !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
index 450f5f088ba19146d10d4e82abc093a16db43b2d..3eb9c2ca2f2b0f2318d92904fdb2387bfbc9aee9 100644 (file)
@@ -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"/>
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton-slice.png
new file mode 100644 (file)
index 0000000..0b92e30
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton-slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton.png
new file mode 100644 (file)
index 0000000..baa9dc7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton.png differ
index 2761d79f9864b022b1ddabff66dfa221ddbd385c..f35aa5f4ced86f7506015819effd88c1124d82af 100644 (file)
@@ -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
     {
       "name": "crostini"
     },
+    {
+      "name": "cotton"
+    },
+    {
+      "name": "cotton-slice"
+    },
     {
       "name": "french-toast"
     },
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-pizza.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-pizza.png
new file mode 100644 (file)
index 0000000..e047c75
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-pizza.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-slice.png
new file mode 100644 (file)
index 0000000..34a9a34
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-slice.png differ
index cb676a06ef78d60d9c7349c91de3acf95952d05b..607a9cf8f3abef22c98119ca63a44c6965d61f94 100644 (file)
@@ -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
     {
       "name": "base-8"
     },
+    {
+      "name": "cotton-pizza"
+    },
+    {
+      "name": "cotton-slice"
+    },
     {
       "name": "dank"
     },
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-flat.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-flat.png
new file mode 100644 (file)
index 0000000..e13da22
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-flat.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough.png
new file mode 100644 (file)
index 0000000..831c58a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough.png differ
index 6132ff89daf850422aec83f39ac0d29eb6f927cf..366f39f96a0d880cf5939dba225c80dfaab89a36 100644 (file)
@@ -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",
+  "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)",
   "size": {
     "x": 32,
     "y": 32
     {
       "name": "cornmealdough-slice"
     },
+    {
+      "name": "cotton-dough-flat"
+    },
+    {
+      "name": "cotton-dough"
+    },
     {
       "name": "dough"
     },