From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 26 Aug 2024 02:46:16 +0000 (+0200) Subject: Moff cooking. Part one. (#30668) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2871e692684f164460a217b79a637ee5616906df;p=space-station-14.git Moff cooking. Part one. (#30668) * yml part * guidebook * commit * some fixes * a little * change --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 31e92931db..0fb3df4d27 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index 652c60722d..ff38363c9e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 6e481bb961..1a80a5fe53 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/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 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml new file mode 100644 index 0000000000..2292d4d299 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 9a59ab5023..ce38125627 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/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 diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 24dca890ed..7d524a9c7a 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/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 diff --git a/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml b/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml index 450f5f088b..3eb9c2ca2f 100644 --- a/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml +++ b/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 + + 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 index 0000000000..0b92e30ae1 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 index 0000000000..baa9dc777f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json index 2761d79f98..f35aa5f4ce 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json +++ b/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" }, 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 index 0000000000..e047c757fc 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 index 0000000000..34a9a34933 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json index cb676a06ef..607a9cf8f3 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json +++ b/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" }, 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 index 0000000000..e13da227bf 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 index 0000000000..831c58a93c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index 6132ff89da..366f39f96a 100644 --- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/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", + "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 @@ -40,6 +40,12 @@ { "name": "cornmealdough-slice" }, + { + "name": "cotton-dough-flat" + }, + { + "name": "cotton-dough" + }, { "name": "dough" },