From c20b80436db0b6bc5517a4761b4ae3bd664ab129 Mon Sep 17 00:00:00 2001 From: = Date: Mon, 11 Nov 2024 00:16:50 +0300 Subject: [PATCH 01/37] shaverma --- .../Consumable/Food/Baked/shaverma-baked.yml | 24 + .../Consumable/Food/shaverma-unbaked.yml | 24 + .../Recipes/Cooking/meal_recipes.yml | 1185 +++++++++-------- .../Consumable/Food/shavuha.rsi/baked.png | Bin 0 -> 759 bytes .../Consumable/Food/shavuha.rsi/meta.json | 17 + .../Consumable/Food/shavuha.rsi/unbaked.png | Bin 0 -> 126 bytes 6 files changed, 666 insertions(+), 584 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml create mode 100644 Resources/Textures/Objects/Consumable/Food/shavuha.rsi/baked.png create mode 100644 Resources/Textures/Objects/Consumable/Food/shavuha.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Food/shavuha.rsi/unbaked.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml new file mode 100644 index 00000000000..c510a6c9e9d --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml @@ -0,0 +1,24 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml + +- type: entity + name: shaverma + parent: FoodMealBase + id: Shaverma-baked + description: Пища богов + components: + - type: Item + storedRotation: -90 + - type: Food + transferAmount: 3 + - type: Sprite + sprite: Objects/Consumable/Food/shavuha.rsi + layers: + - state: baked + - type: SolutionContainerManager + solutions: + food: + canReact: false # Dont want cause reactions inside tacos after merging ingredients + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 7.4 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml new file mode 100644 index 00000000000..86d80e9e42d --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml @@ -0,0 +1,24 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml + +- type: entity + name: shaverma + parent: FoodMealBase + id: Shaverma-unbaked + description: Пища богов + components: + - type: Item + storedRotation: -90 + - type: Food + transferAmount: 3 + - type: Sprite + sprite: Objects/Consumable/Food/shavuha.rsi + layers: + - state: unbaked + - type: SolutionContainerManager + solutions: + food: + canReact: false # Dont want cause reactions inside tacos after merging ingredients + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 4.5 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 173cf9e9dbd..a4c6ec2f9a1 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -4,8 +4,26 @@ result: FoodBreadBun time: 5 solids: - FoodDoughSlice: 1 # one third of a standard bread dough recipe + FoodDoughSlice: 1 # one third of a standard bread dough recipe +#Shaverma +- type: microwaveMealRecipe + id: RecipeShaverma-unbaked + name: The best food ever + result: Shaverma-unbaked + time: 1 + solids: + FoodMeat: 2 + FoodDough: 1 + FoodTomato: 1 + +- type: microwaveMealRecipe + id: RecipeShaverma-baked + name: The best food ever + result: Shaverma-baked + time: 15 + solids: + Shaverma-unbaked: 1 #Bagels - type: microwaveMealRecipe id: RecipeBagel @@ -13,7 +31,7 @@ result: FoodBagel time: 5 solids: - FoodDoughRope: 1 # created by rolling a dough slice. + FoodDoughRope: 1 # created by rolling a dough slice. - type: microwaveMealRecipe id: RecipeBagelPoppy @@ -21,8 +39,8 @@ result: FoodBagelPoppy time: 5 solids: - FoodDoughRope: 1 - PoppySeeds: 1 + FoodDoughRope: 1 + PoppySeeds: 1 #Burgers @@ -32,8 +50,8 @@ result: FoodBurgerAppendix time: 10 solids: - FoodBreadBun: 1 - OrganHumanAppendix: 1 + FoodBreadBun: 1 + OrganHumanAppendix: 1 - type: microwaveMealRecipe id: RecipeBaconBurger @@ -41,9 +59,9 @@ result: FoodBurgerBacon time: 10 solids: - FoodBreadBun: 1 - FoodMeatBacon: 1 - FoodCheeseSlice: 2 + FoodBreadBun: 1 + FoodMeatBacon: 1 + FoodCheeseSlice: 2 - type: microwaveMealRecipe id: RecipeBaseballBurger @@ -51,8 +69,8 @@ result: FoodBurgerBaseball time: 10 solids: - FoodBreadBun: 1 - BaseBallBat: 1 + FoodBreadBun: 1 + BaseBallBat: 1 - type: microwaveMealRecipe id: RecipeBearger @@ -60,8 +78,8 @@ result: FoodBurgerBear time: 10 solids: - FoodBreadBun: 1 - FoodMeatBear: 1 + FoodBreadBun: 1 + FoodMeatBear: 1 - type: microwaveMealRecipe id: RecipeBigBiteBurger @@ -69,11 +87,11 @@ result: FoodBurgerBig time: 15 solids: - FoodBreadBun: 1 - FoodMeat: 2 - FoodCheeseSlice: 1 - FoodTomato: 1 - FoodOnionSlice: 2 + FoodBreadBun: 1 + FoodMeat: 2 + FoodCheeseSlice: 1 + FoodTomato: 1 + FoodOnionSlice: 2 - type: microwaveMealRecipe #Added to metamorph recipes id: RecipeBrainBurger @@ -81,8 +99,8 @@ result: FoodBurgerBrain time: 10 solids: - FoodBreadBun: 1 - OrganHumanBrain: 1 + FoodBreadBun: 1 + OrganHumanBrain: 1 - type: microwaveMealRecipe id: RecipeCatBurger @@ -90,9 +108,9 @@ result: FoodBurgerCat time: 10 solids: - FoodBreadBun: 1 - FoodMeat: 1 - ClothingHeadHatCatEars: 1 + FoodBreadBun: 1 + FoodMeat: 1 + ClothingHeadHatCatEars: 1 - type: microwaveMealRecipe #Added to metamorph recipes id: RecipeCheeseburger @@ -100,9 +118,9 @@ result: FoodBurgerCheese time: 10 solids: - FoodBreadBun: 1 - FoodMeat: 1 - FoodCheeseSlice: 1 + FoodBreadBun: 1 + FoodMeat: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe #Added to metamorph recipes id: RecipeChickenSandwich @@ -110,10 +128,10 @@ result: FoodBurgerChicken time: 10 reagents: - Mayo: 5 + Mayo: 5 solids: - FoodBreadBun: 1 - FoodMeatChicken: 1 + FoodBreadBun: 1 + FoodMeatChicken: 1 - type: microwaveMealRecipe id: RecipeClownBurger @@ -121,8 +139,8 @@ result: FoodBurgerClown time: 10 solids: - FoodBreadBun: 1 - ClothingMaskClown: 1 + FoodBreadBun: 1 + ClothingMaskClown: 1 - type: microwaveMealRecipe id: RecipeCorgiBurger @@ -130,8 +148,8 @@ result: FoodBurgerCorgi time: 10 solids: - FoodBreadBun: 1 - FoodMeatCorgi: 1 + FoodBreadBun: 1 + FoodMeatCorgi: 1 - type: microwaveMealRecipe #Added to metamorph recipes id: RecipeCrabBurger @@ -139,8 +157,8 @@ result: FoodBurgerCrab time: 10 solids: - FoodBreadBun: 1 - FoodMeatCrab: 2 + FoodBreadBun: 1 + FoodMeatCrab: 2 - type: microwaveMealRecipe id: RecipeCrazyHamburger @@ -148,15 +166,15 @@ result: FoodBurgerCrazy time: 15 reagents: - OilOlive: 15 + OilOlive: 15 solids: - FoodBreadBun: 1 - FoodMeat: 2 - FoodCheeseSlice: 2 - FoodChiliPepper: 1 - FoodCabbage: 1 - CrayonGreen: 1 - Flare: 1 + FoodBreadBun: 1 + FoodMeat: 2 + FoodCheeseSlice: 2 + FoodChiliPepper: 1 + FoodCabbage: 1 + CrayonGreen: 1 + Flare: 1 - type: microwaveMealRecipe #Added to metamorph recipes id: RecipeDuckBurger @@ -164,9 +182,9 @@ result: FoodBurgerDuck time: 10 solids: - FoodBreadBun: 1 - FoodMeatDuck: 1 - FoodCheeseSlice: 1 + FoodBreadBun: 1 + FoodMeatDuck: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeEmpoweredBurger @@ -174,8 +192,8 @@ result: FoodBurgerEmpowered time: 10 solids: - FoodBreadBun: 1 - SheetPlasma1: 2 + FoodBreadBun: 1 + SheetPlasma1: 2 - type: microwaveMealRecipe id: RecipeCarpBurger @@ -183,9 +201,9 @@ result: FoodBurgerCarp time: 10 solids: - FoodBreadBun: 1 - FoodMeatFish: 1 - FoodCheeseSlice: 1 + FoodBreadBun: 1 + FoodMeatFish: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeFiveBurger @@ -193,9 +211,9 @@ result: FoodBurgerFive time: 10 solids: - FoodBreadBun: 1 - FoodMeat: 1 - FoodChiliPepper: 3 + FoodBreadBun: 1 + FoodMeat: 1 + FoodChiliPepper: 3 - type: microwaveMealRecipe id: RecipeGhostBurger @@ -203,8 +221,8 @@ result: FoodBurgerGhost time: 10 solids: - FoodBreadBun: 1 - Ectoplasm: 1 + FoodBreadBun: 1 + Ectoplasm: 1 - type: microwaveMealRecipe id: RecipeHumanBurger @@ -212,8 +230,8 @@ result: FoodBurgerHuman time: 10 solids: - FoodBreadBun: 1 - FoodMeatHuman: 1 + FoodBreadBun: 1 + FoodMeatHuman: 1 - type: microwaveMealRecipe id: RecipeJellyBurger @@ -221,8 +239,8 @@ result: FoodBurgerJelly time: 10 solids: - FoodBreadBun: 1 - FoodJellyAmanita: 1 + FoodBreadBun: 1 + FoodJellyAmanita: 1 - type: microwaveMealRecipe id: RecipeBurgerMcguffin @@ -230,9 +248,9 @@ result: FoodBurgerMcguffin time: 10 solids: - FoodBreadBun: 1 - FoodCheeseSlice: 1 - FoodEgg: 2 + FoodBreadBun: 1 + FoodCheeseSlice: 1 + FoodEgg: 2 - type: microwaveMealRecipe id: RecipeBurgerMcrib @@ -240,9 +258,9 @@ result: FoodBurgerMcrib time: 10 solids: - FoodBreadBun: 1 - FoodMealRibs: 1 - FoodOnionSlice: 1 + FoodBreadBun: 1 + FoodMealRibs: 1 + FoodOnionSlice: 1 - type: microwaveMealRecipe id: RecipeMimeBurger @@ -250,8 +268,8 @@ result: FoodBurgerMime time: 10 solids: - FoodBreadBun: 1 - ClothingMaskMime: 1 + FoodBreadBun: 1 + ClothingMaskMime: 1 - type: microwaveMealRecipe id: RecipePlainBurger @@ -259,8 +277,8 @@ result: FoodBurgerPlain time: 10 solids: - FoodBreadBun: 1 - FoodMeat: 1 + FoodBreadBun: 1 + FoodMeat: 1 - type: microwaveMealRecipe id: RecipeRatBurger @@ -268,8 +286,8 @@ result: FoodBurgerRat time: 10 solids: - FoodBreadBun: 1 - FoodMeatRat: 1 + FoodBreadBun: 1 + FoodMeatRat: 1 - type: microwaveMealRecipe id: RecipeRobotBurger @@ -277,9 +295,9 @@ result: FoodBurgerRobot time: 10 solids: - FoodBreadBun: 1 - CapacitorStockPart: 2 - # i would add steel to this recipe but the microwave explodes + FoodBreadBun: 1 + CapacitorStockPart: 2 + # i would add steel to this recipe but the microwave explodes - type: microwaveMealRecipe id: RecipeSoylentBurger @@ -287,9 +305,9 @@ result: FoodBurgerSoy time: 10 solids: - FoodBreadBun: 1 - FoodCheeseSlice: 2 - FoodSoybeans: 2 #replace with soylent green when those become craftable + FoodBreadBun: 1 + FoodCheeseSlice: 2 + FoodSoybeans: 2 #replace with soylent green when those become craftable - type: microwaveMealRecipe id: RecipeSpellBurger @@ -297,8 +315,8 @@ result: FoodBurgerSpell time: 10 solids: - FoodBreadBun: 1 - ClothingHeadHatWizard: 1 + FoodBreadBun: 1 + ClothingHeadHatWizard: 1 - type: microwaveMealRecipe id: RecipeSuperBiteBurger @@ -306,13 +324,13 @@ result: FoodBurgerSuper time: 25 reagents: - TableSalt: 5 + TableSalt: 5 solids: - FoodBreadBun: 1 - FoodMeat: 2 - FoodCheeseSlice: 2 - FoodTomato: 2 - FoodEgg: 2 + FoodBreadBun: 1 + FoodMeat: 2 + FoodCheeseSlice: 2 + FoodTomato: 2 + FoodEgg: 2 - type: microwaveMealRecipe id: RecipeTofuBurger @@ -320,8 +338,8 @@ result: FoodBurgerTofu time: 10 solids: - FoodBreadBun: 1 - FoodTofuSlice: 1 + FoodBreadBun: 1 + FoodTofuSlice: 1 - type: microwaveMealRecipe id: RecipeXenoburger @@ -329,16 +347,16 @@ result: FoodBurgerXeno time: 10 solids: - FoodBreadBun: 1 - FoodMeatXeno: 1 + FoodBreadBun: 1 + FoodMeatXeno: 1 - type: microwaveMealRecipe id: RecipeMothRoachburger name: mothroachburger recipe result: FoodBurgerMothRoach solids: - FoodBreadBun: 1 - MobMothroach: 1 + FoodBreadBun: 1 + MobMothroach: 1 #Breads & Sandwiches @@ -348,8 +366,8 @@ result: FoodBreadBanana time: 15 solids: - FoodDough: 1 - FoodBanana: 1 + FoodDough: 1 + FoodBanana: 1 - type: microwaveMealRecipe id: RecipeCornbread @@ -357,7 +375,7 @@ result: FoodBreadCorn time: 10 solids: - FoodDoughCornmeal: 1 + FoodDoughCornmeal: 1 - type: microwaveMealRecipe id: RecipeCreamCheeseBread @@ -365,10 +383,10 @@ result: FoodBreadCreamcheese time: 15 reagents: - Milk: 5 + Milk: 5 solids: - FoodDough: 1 - FoodCheeseSlice: 2 + FoodDough: 1 + FoodCheeseSlice: 2 - type: microwaveMealRecipe id: RecipeMeatBread @@ -376,9 +394,9 @@ result: FoodBreadMeat time: 15 solids: - FoodDough: 1 - FoodMeatCutlet: 2 - FoodCheeseSlice: 2 + FoodDough: 1 + FoodMeatCutlet: 2 + FoodCheeseSlice: 2 - type: microwaveMealRecipe id: RecipeMimanaBread @@ -386,10 +404,10 @@ result: FoodBreadMimana time: 15 reagents: - Nothing: 5 + Nothing: 5 solids: - FoodDough: 1 - FoodMimana: 1 + FoodDough: 1 + FoodMimana: 1 - type: microwaveMealRecipe id: RecipeBread @@ -397,7 +415,7 @@ result: FoodBreadPlain time: 10 solids: - FoodDough: 1 + FoodDough: 1 - type: microwaveMealRecipe id: RecipeBreadCotton @@ -405,7 +423,7 @@ result: FoodBreadCotton time: 10 solids: - FoodDoughCotton: 1 + FoodDoughCotton: 1 - type: microwaveMealRecipe id: RecipeSausageBread @@ -413,8 +431,8 @@ result: FoodBreadSausage time: 15 solids: - FoodDough: 1 - FoodMeat: 1 #replace with sausage + FoodDough: 1 + FoodMeat: 1 #replace with sausage - type: microwaveMealRecipe id: RecipeSpiderMeatBread @@ -422,9 +440,9 @@ result: FoodBreadMeatSpider time: 15 solids: - FoodDough: 1 - FoodMeatSpiderCutlet: 2 - FoodCheeseSlice: 2 + FoodDough: 1 + FoodMeatSpiderCutlet: 2 + FoodCheeseSlice: 2 - type: microwaveMealRecipe id: RecipeTofuBread @@ -432,8 +450,8 @@ result: FoodBreadTofu time: 15 solids: - FoodDough: 1 - FoodTofu: 1 + FoodDough: 1 + FoodTofu: 1 - type: microwaveMealRecipe id: RecipeXenoMeatBread @@ -441,9 +459,9 @@ result: FoodBreadMeatXeno time: 15 solids: - FoodDough: 1 - FoodMeatXenoCutlet: 2 - FoodCheeseSlice: 2 + FoodDough: 1 + FoodMeatXenoCutlet: 2 + FoodCheeseSlice: 2 #Slices Only @@ -453,10 +471,10 @@ result: FoodBreadBaguette time: 15 reagents: - TableSalt: 5 - Blackpepper: 5 + TableSalt: 5 + Blackpepper: 5 solids: - FoodDough: 1 + FoodDough: 1 - type: microwaveMealRecipe id: RecipeBaguetteSword @@ -465,11 +483,11 @@ secretRecipe: true time: 15 reagents: - TableSalt: 5 - Blackpepper: 5 + TableSalt: 5 + Blackpepper: 5 solids: - FoodDough: 1 - PartRodMetal1: 1 + FoodDough: 1 + PartRodMetal1: 1 - type: microwaveMealRecipe id: RecipeButteredToast @@ -477,8 +495,8 @@ result: FoodBreadButteredToast time: 5 solids: - FoodBreadPlainSlice: 1 - FoodButterSlice: 1 + FoodBreadPlainSlice: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeFrenchToast @@ -486,10 +504,10 @@ result: FoodBreadFrenchToast time: 5 reagents: - Milk: 5 - Egg: 12 + Milk: 5 + Egg: 12 solids: - FoodBreadPlainSlice: 1 + FoodBreadPlainSlice: 1 - type: microwaveMealRecipe id: RecipeGarlicBread @@ -497,9 +515,9 @@ result: FoodBreadGarlicSlice time: 5 solids: - FoodBreadPlainSlice: 1 - FoodGarlic: 1 - FoodButterSlice: 1 + FoodBreadPlainSlice: 1 + FoodGarlic: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeJellyToast @@ -507,8 +525,8 @@ result: FoodBreadJellySlice time: 5 solids: - FoodBreadPlainSlice: 1 - FoodJellyAmanita: 1 #replace with jelly + FoodBreadPlainSlice: 1 + FoodJellyAmanita: 1 #replace with jelly - type: microwaveMealRecipe id: RecipeMoldyBreadSlice @@ -516,8 +534,8 @@ result: FoodBreadMoldySlice time: 5 solids: - FoodBreadPlainSlice: 1 - FoodFlyAmanita: 1 + FoodBreadPlainSlice: 1 + FoodFlyAmanita: 1 - type: microwaveMealRecipe id: RecipeTwoBreadSlice @@ -525,9 +543,9 @@ result: FoodBreadTwoSlice time: 5 reagents: - Wine: 5 + Wine: 5 solids: - FoodBreadPlainSlice: 2 + FoodBreadPlainSlice: 2 - type: microwaveMealRecipe id: RecipeOnionRings @@ -535,7 +553,7 @@ result: FoodOnionRings time: 15 solids: - FoodOnionSlice: 1 + FoodOnionSlice: 1 #Pizzas TODO: contruction graph based pizza - type: microwaveMealRecipe @@ -544,9 +562,9 @@ result: FoodPizzaMargherita time: 30 solids: - FoodDoughFlat: 1 - FoodCheeseSlice: 1 - FoodTomato: 4 + FoodDoughFlat: 1 + FoodCheeseSlice: 1 + FoodTomato: 4 - type: microwaveMealRecipe id: RecipeMushroomPizza @@ -554,8 +572,8 @@ result: FoodPizzaMushroom time: 30 solids: - FoodDoughFlat: 1 - FoodMushroom: 5 + FoodDoughFlat: 1 + FoodMushroom: 5 - type: microwaveMealRecipe id: RecipeMeatPizza @@ -563,10 +581,10 @@ result: FoodPizzaMeat time: 30 solids: - FoodDoughFlat: 1 - FoodMeat: 3 - FoodCheeseSlice: 1 - FoodTomato: 1 + FoodDoughFlat: 1 + FoodMeat: 3 + FoodCheeseSlice: 1 + FoodTomato: 1 - type: microwaveMealRecipe id: RecipeVegetablePizza @@ -574,11 +592,11 @@ result: FoodPizzaVegetable time: 30 solids: - FoodDoughFlat: 1 - FoodEggplant: 1 - FoodCarrot: 1 - FoodCorn: 1 - FoodTomato: 1 + FoodDoughFlat: 1 + FoodEggplant: 1 + FoodCarrot: 1 + FoodCorn: 1 + FoodTomato: 1 - type: microwaveMealRecipe id: RecipeHawaiianPizza @@ -586,9 +604,9 @@ result: FoodPizzaPineapple time: 30 solids: - FoodDoughFlat: 1 - FoodMeatChickenCutlet: 3 - FoodPineappleSlice: 5 + FoodDoughFlat: 1 + FoodMeatChickenCutlet: 3 + FoodPineappleSlice: 5 - type: microwaveMealRecipe id: RecipeDankPizza @@ -596,10 +614,10 @@ result: FoodPizzaDank time: 30 solids: - FoodDoughFlat: 1 - LeavesCannabis: 2 - FoodCheeseSlice: 1 - FoodTomato: 1 + FoodDoughFlat: 1 + LeavesCannabis: 2 + FoodCheeseSlice: 1 + FoodTomato: 1 - type: microwaveMealRecipe id: RecipeDonkpocketPizza @@ -607,10 +625,10 @@ result: FoodPizzaDonkpocket time: 30 solids: - FoodDoughFlat: 1 - FoodDonkpocketWarm: 3 - FoodCheeseSlice: 1 - FoodTomato: 1 + FoodDoughFlat: 1 + FoodDonkpocketWarm: 3 + FoodCheeseSlice: 1 + FoodTomato: 1 - type: microwaveMealRecipe id: RecipeUraniumPizza @@ -618,10 +636,10 @@ result: FoodPizzaUranium time: 30 solids: - FoodDoughFlat: 1 - FoodChiliPepper: 2 - FoodTomato: 2 - SheetUranium1: 2 + FoodDoughFlat: 1 + FoodChiliPepper: 2 + FoodTomato: 2 + SheetUranium1: 2 - type: microwaveMealRecipe id: RecipeCottonPizza @@ -629,8 +647,8 @@ result: FoodPizzaCotton time: 30 solids: - FoodDoughCottonFlat: 1 - CottonBol: 4 + FoodDoughCottonFlat: 1 + CottonBol: 4 #Italian - type: microwaveMealRecipe @@ -639,10 +657,10 @@ result: FoodNoodlesBoiled time: 15 reagents: - Flour: 15 - Egg: 6 + Flour: 15 + Egg: 6 solids: - FoodButter: 1 + FoodButter: 1 - type: microwaveMealRecipe id: RecipePastaTomato @@ -650,8 +668,8 @@ result: FoodNoodles time: 10 solids: - FoodNoodlesBoiled: 1 - FoodTomato: 2 + FoodNoodlesBoiled: 1 + FoodTomato: 2 - type: microwaveMealRecipe id: RecipeMeatballSpaghetti @@ -659,8 +677,8 @@ result: FoodNoodlesMeatball time: 10 solids: - FoodNoodlesBoiled: 1 - FoodMeatMeatball: 2 + FoodNoodlesBoiled: 1 + FoodMeatMeatball: 2 - type: microwaveMealRecipe id: RecipeButterNoodles @@ -668,8 +686,8 @@ result: FoodNoodlesButter time: 10 solids: - FoodNoodlesBoiled: 1 - FoodButter: 1 + FoodNoodlesBoiled: 1 + FoodButter: 1 - type: microwaveMealRecipe id: RecipeChowMein @@ -677,12 +695,12 @@ result: FoodNoodlesChowmein time: 10 reagents: - Egg: 6 + Egg: 6 solids: - FoodNoodlesBoiled: 1 - FoodEggplant: 1 - FoodCarrot: 1 - FoodCorn: 1 + FoodNoodlesBoiled: 1 + FoodEggplant: 1 + FoodCarrot: 1 + FoodCorn: 1 - type: microwaveMealRecipe id: RecipeOatmeal @@ -690,10 +708,10 @@ result: FoodOatmeal time: 15 reagents: - Oats: 15 - Water: 10 + Oats: 15 + Water: 10 solids: - FoodBowlBig: 1 + FoodBowlBig: 1 - type: microwaveMealRecipe id: RecipeBoiledRice @@ -701,10 +719,10 @@ result: FoodRiceBoiled time: 15 reagents: - Rice: 15 - Water: 10 + Rice: 15 + Water: 10 solids: - FoodBowlBig: 1 + FoodBowlBig: 1 - type: microwaveMealRecipe id: RecipeRicePudding @@ -712,11 +730,11 @@ result: FoodRicePudding time: 15 reagents: - Rice: 15 - Milk: 10 - Sugar: 5 + Rice: 15 + Milk: 10 + Sugar: 5 solids: - FoodBowlBig: 1 + FoodBowlBig: 1 - type: microwaveMealRecipe id: RecipeRicePork @@ -724,8 +742,8 @@ result: FoodRicePork time: 15 solids: - FoodRiceBoiled: 1 - FoodMeatCutlet: 3 + FoodRiceBoiled: 1 + FoodMeatCutlet: 3 - type: microwaveMealRecipe id: RecipeRiceGumbo @@ -733,9 +751,9 @@ result: FoodRiceGumbo time: 15 solids: - FoodRiceBoiled: 1 - FoodMeatCutlet: 3 - FoodChiliPepper: 2 + FoodRiceBoiled: 1 + FoodMeatCutlet: 3 + FoodChiliPepper: 2 - type: microwaveMealRecipe id: RecipeEggRice @@ -743,10 +761,10 @@ result: FoodRiceEgg time: 15 reagents: - Egg: 6 + Egg: 6 solids: - FoodRiceBoiled: 1 - FoodCarrot: 1 + FoodRiceBoiled: 1 + FoodCarrot: 1 - type: microwaveMealRecipe id: RecipeCopypasta @@ -754,7 +772,7 @@ result: FoodNoodlesCopy time: 10 solids: - FoodNoodles: 2 + FoodNoodles: 2 #Soups & Stew - type: microwaveMealRecipe @@ -763,12 +781,12 @@ result: FoodSoupBisque time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - FoodTomato: 1 - FoodMushroom: 1 - FoodMeatFish: 1 + FoodBowlBig: 1 + FoodTomato: 1 + FoodMushroom: 1 + FoodMeatFish: 1 - type: microwaveMealRecipe id: RecipeMeatballSoup @@ -776,12 +794,12 @@ result: FoodSoupMeatball time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - FoodMeatMeatball: 1 - FoodCarrot: 1 - FoodPotato: 1 + FoodBowlBig: 1 + FoodMeatMeatball: 1 + FoodCarrot: 1 + FoodPotato: 1 - type: microwaveMealRecipe id: RecipeNettleSoup @@ -789,12 +807,12 @@ result: FoodSoupNettle time: 10 reagents: - Water: 10 - Egg: 6 + Water: 10 + Egg: 6 solids: - FoodBowlBig: 1 - Nettle: 1 - FoodPotato: 1 + FoodBowlBig: 1 + Nettle: 1 + FoodPotato: 1 - type: microwaveMealRecipe id: RecipeEyeballSoup @@ -802,12 +820,12 @@ result: FoodSoupEyeball time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - OrganHumanEyes: 1 - FoodCarrot: 1 - FoodPotato: 1 + FoodBowlBig: 1 + OrganHumanEyes: 1 + FoodCarrot: 1 + FoodPotato: 1 - type: microwaveMealRecipe id: RecipeAmanitaJelly @@ -815,10 +833,10 @@ result: FoodJellyAmanita time: 10 reagents: - Water: 5 - Vodka: 5 + Water: 5 + Vodka: 5 solids: - FoodFlyAmanita: 3 + FoodFlyAmanita: 3 - type: microwaveMealRecipe id: RecipeOnionSoup @@ -826,11 +844,11 @@ result: FoodSoupOnion time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - FoodOnionSlice: 5 - FoodCheeseSlice: 1 + FoodBowlBig: 1 + FoodOnionSlice: 5 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeMushroomSoup @@ -838,11 +856,11 @@ result: FoodSoupMushroom time: 10 reagents: - Water: 5 - Milk: 5 + Water: 5 + Milk: 5 solids: - FoodBowlBig: 1 - FoodMushroom: 2 + FoodBowlBig: 1 + FoodMushroom: 2 - type: microwaveMealRecipe id: RecipeStewSoup @@ -850,15 +868,15 @@ result: FoodSoupStew time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - FoodMeatCutlet: 3 - FoodTomato: 1 - FoodPotato: 1 - FoodCarrot: 1 - FoodEggplant: 1 - FoodMushroom: 1 + FoodBowlBig: 1 + FoodMeatCutlet: 3 + FoodTomato: 1 + FoodPotato: 1 + FoodCarrot: 1 + FoodEggplant: 1 + FoodMushroom: 1 - type: microwaveMealRecipe id: RecipeTomatoSoup @@ -866,10 +884,10 @@ result: FoodSoupTomato time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - FoodTomato: 2 + FoodBowlBig: 1 + FoodTomato: 2 - type: microwaveMealRecipe id: RecipeTomatoBloodSoup @@ -877,10 +895,10 @@ result: FoodSoupTomatoBlood time: 10 reagents: - Blood: 10 + Blood: 10 solids: - FoodBowlBig: 1 - FoodBloodTomato: 2 + FoodBowlBig: 1 + FoodBloodTomato: 2 - type: microwaveMealRecipe id: RecipeWingFangChuSoup @@ -888,10 +906,10 @@ result: FoodSoupWingFangChu time: 10 reagents: - Soysauce: 5 + Soysauce: 5 solids: - FoodBowlBig: 1 - FoodMeatXenoCutlet: 2 + FoodBowlBig: 1 + FoodMeatXenoCutlet: 2 - type: microwaveMealRecipe id: RecipeWingFangChuSoupSpider @@ -899,10 +917,10 @@ result: FoodSoupWingFangChu time: 10 reagents: - Soysauce: 5 + Soysauce: 5 solids: - FoodBowlBig: 1 - FoodMeatSpider: 2 + FoodBowlBig: 1 + FoodMeatSpider: 2 - type: microwaveMealRecipe id: RecipeVegetableSoup @@ -910,13 +928,13 @@ result: FoodSoupVegetable time: 10 reagents: - Water: 5 + Water: 5 solids: - FoodBowlBig: 1 - FoodCorn: 1 - FoodCarrot: 1 - FoodPotato: 1 - FoodEggplant: 1 + FoodBowlBig: 1 + FoodCorn: 1 + FoodCarrot: 1 + FoodPotato: 1 + FoodEggplant: 1 - type: microwaveMealRecipe id: RecipeClownTearsSoup @@ -924,12 +942,12 @@ result: FoodSoupClown time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - FoodBanana: 1 - ShardGlass: 1 - #idk probably replace shard with someting bananium when #14663 merged + FoodBowlBig: 1 + FoodBanana: 1 + ShardGlass: 1 + #idk probably replace shard with someting bananium when #14663 merged - type: microwaveMealRecipe id: RecipeMonkeysDelightSoup @@ -937,13 +955,13 @@ result: FoodSoupMonkey time: 10 reagents: - Flour: 5 - TableSalt: 1 - Blackpepper: 1 + Flour: 5 + TableSalt: 1 + Blackpepper: 1 solids: - FoodBowlBig: 1 - FoodBanana: 1 - MonkeyCube: 1 + FoodBowlBig: 1 + FoodBanana: 1 + MonkeyCube: 1 - type: microwaveMealRecipe id: RecipeBungoSoup @@ -951,11 +969,11 @@ result: FoodSoupBungo time: 10 reagents: - Water: 5 + Water: 5 solids: - FoodBowlBig: 1 - FoodBungo: 2 - FoodChiliPepper: 1 + FoodBowlBig: 1 + FoodBungo: 2 + FoodChiliPepper: 1 - type: microwaveMealRecipe id: RecipeBoiledSnail @@ -963,9 +981,9 @@ result: FoodMeatSnailCooked time: 5 reagents: - Water: 10 + Water: 10 solids: - FoodMeatSnail: 1 + FoodMeatSnail: 1 - type: microwaveMealRecipe id: RecipeEscargotSoup @@ -973,12 +991,12 @@ result: FoodSoupEscargot time: 10 reagents: - Water: 5 + Water: 5 solids: - FoodBowlBig: 1 - FoodOnionSlice: 1 - FoodButter: 1 - FoodMeatSnailCooked: 1 + FoodBowlBig: 1 + FoodOnionSlice: 1 + FoodButter: 1 + FoodMeatSnailCooked: 1 #Pies @@ -988,9 +1006,9 @@ result: FoodPieAmanita time: 15 solids: - FoodDoughPie: 1 - FoodFlyAmanita: 1 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodFlyAmanita: 1 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeApplePie @@ -998,9 +1016,9 @@ result: FoodPieApple time: 15 solids: - FoodDoughPie: 1 - FoodApple: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodApple: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeBaklava @@ -1008,9 +1026,9 @@ result: FoodPieBaklava time: 15 solids: - FoodDoughPie: 1 - FoodSnackPistachios: 1 #i'd rather use a botany crop but we don't have nuts yet - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodSnackPistachios: 1 #i'd rather use a botany crop but we don't have nuts yet + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeBananaCreamPie @@ -1018,9 +1036,9 @@ result: FoodPieBananaCream time: 15 solids: - FoodDoughPie: 1 - FoodBanana: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodBanana: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeBerryClafoutis @@ -1028,9 +1046,9 @@ result: FoodPieClafoutis time: 15 solids: - FoodDoughPie: 1 - FoodBerries: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodBerries: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeCherryPie @@ -1038,9 +1056,9 @@ result: FoodPieCherry time: 15 solids: - FoodDoughPie: 1 - FoodCherry: 5 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodCherry: 5 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeFrostyPie @@ -1048,9 +1066,9 @@ result: FoodPieFrosty time: 15 solids: - FoodDoughPie: 1 - FoodChillyPepper: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodChillyPepper: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeMeatPie @@ -1058,9 +1076,9 @@ result: FoodPieMeat time: 15 solids: - FoodDoughPie: 1 - FoodMeat: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodMeat: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipePumpkinPie @@ -1068,9 +1086,9 @@ result: FoodPiePumpkin time: 15 solids: - FoodDoughPie: 1 - FoodPumpkin: 1 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodPumpkin: 1 + FoodPlateTin: 1 #- type: microwaveMealRecipe # id: RecipePlumpPie @@ -1088,9 +1106,9 @@ result: FoodPieXeno time: 15 solids: - FoodDoughPie: 1 - FoodMeatXeno: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodMeatXeno: 3 + FoodPlateTin: 1 #Tarts @@ -1100,12 +1118,12 @@ result: FoodTartCoco time: 15 reagents: - Sugar: 5 - Milk: 5 + Sugar: 5 + Milk: 5 solids: - FoodDoughPie: 1 - FoodSnackChocolateBar: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodSnackChocolateBar: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeGappleTart @@ -1113,13 +1131,13 @@ result: FoodTartGapple time: 15 reagents: - Gold: 10 - Sugar: 5 - Milk: 5 + Gold: 10 + Sugar: 5 + Milk: 5 solids: - FoodDoughPie: 1 - FoodApple: 2 #in absence of the real gapple i'm substituting one apple with 10u gold (one ingot) - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodApple: 2 #in absence of the real gapple i'm substituting one apple with 10u gold (one ingot) + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeGrapeTart @@ -1127,12 +1145,12 @@ result: FoodTartGrape time: 15 reagents: - Sugar: 5 - Milk: 5 + Sugar: 5 + Milk: 5 solids: - FoodDoughPie: 1 - FoodGrape: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodGrape: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeMimeTart @@ -1140,12 +1158,12 @@ result: FoodTartMime time: 15 reagents: - Sugar: 5 - Milk: 5 + Sugar: 5 + Milk: 5 solids: - FoodDoughPie: 1 - FoodMimana: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodMimana: 3 + FoodPlateTin: 1 #Other @@ -1155,10 +1173,10 @@ result: FoodMealCubancarp time: 15 solids: - FoodDough: 1 - FoodCheeseSlice: 2 - FoodChiliPepper: 1 - FoodMeatFish: 2 + FoodDough: 1 + FoodCheeseSlice: 2 + FoodChiliPepper: 1 + FoodMeatFish: 2 - type: microwaveMealRecipe id: RecipeSashimi @@ -1166,9 +1184,9 @@ result: FoodMealSashimi time: 15 reagents: - TableSalt: 1 + TableSalt: 1 solids: - FoodMeatFish: 2 + FoodMeatFish: 2 - type: microwaveMealRecipe id: RecipeMisoColaSoup @@ -1176,9 +1194,9 @@ result: DisgustingSweptSoup time: 15 reagents: - Cola: 5 + Cola: 5 solids: - FoodSoupMiso: 1 + FoodSoupMiso: 1 - type: microwaveMealRecipe id: RecipeLoadedBakedPotato @@ -1186,8 +1204,8 @@ result: FoodMealPotatoLoaded time: 15 solids: - FoodPotato: 1 - FoodCheeseSlice: 1 + FoodPotato: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeFries @@ -1195,9 +1213,9 @@ result: FoodMealFries time: 15 reagents: - TableSalt: 5 + TableSalt: 5 solids: - FoodPotato: 1 + FoodPotato: 1 - type: microwaveMealRecipe id: RecipeCheesyFries @@ -1205,10 +1223,10 @@ result: FoodMealFriesCheesy time: 15 reagents: - TableSalt: 5 + TableSalt: 5 solids: - FoodPotato: 1 - FoodCheeseSlice: 1 + FoodPotato: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeCarrotFries @@ -1216,9 +1234,9 @@ result: FoodMealFriesCarrot time: 15 reagents: - TableSalt: 5 + TableSalt: 5 solids: - FoodCarrot: 1 + FoodCarrot: 1 - type: microwaveMealRecipe id: RecipePopcorn @@ -1226,7 +1244,7 @@ result: FoodSnackPopcorn time: 20 solids: - FoodCorn: 1 + FoodCorn: 1 - type: microwaveMealRecipe id: RecipePancake @@ -1234,9 +1252,9 @@ result: FoodBakedPancake time: 5 reagents: - Flour: 5 - Milk: 5 - Egg: 6 + Flour: 5 + Milk: 5 + Egg: 6 - type: microwaveMealRecipe id: RecipeBlueberryPancake @@ -1244,11 +1262,11 @@ result: FoodBakedPancakeBb time: 5 reagents: - Flour: 5 - Milk: 5 - Egg: 6 + Flour: 5 + Milk: 5 + Egg: 6 solids: - FoodBerries: 2 + FoodBerries: 2 - type: microwaveMealRecipe id: RecipeWaffles @@ -1256,10 +1274,10 @@ result: FoodBakedWaffle time: 10 reagents: - Flour: 5 - Milk: 5 - Egg: 6 - SodaWater: 5 + Flour: 5 + Milk: 5 + Egg: 6 + SodaWater: 5 - type: microwaveMealRecipe id: RecipeWaffleSoy @@ -1267,10 +1285,10 @@ result: FoodBakedWaffleSoy time: 10 reagents: - Flour: 5 - MilkSoy: 5 - Egg: 6 - SodaWater: 5 + Flour: 5 + MilkSoy: 5 + Egg: 6 + SodaWater: 5 - type: microwaveMealRecipe id: RecipeCookie @@ -1278,11 +1296,11 @@ result: FoodBakedCookie time: 5 reagents: - Flour: 5 - Sugar: 5 + Flour: 5 + Sugar: 5 solids: - FoodButterSlice: 1 - FoodSnackChocolateBar: 1 + FoodButterSlice: 1 + FoodSnackChocolateBar: 1 - type: microwaveMealRecipe id: RecipeSugarCookie @@ -1290,10 +1308,10 @@ result: FoodBakedCookieSugar time: 5 reagents: - Flour: 5 - Sugar: 10 + Flour: 5 + Sugar: 10 solids: - FoodButterSlice: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeRaisinCookie @@ -1301,10 +1319,10 @@ result: FoodBakedCookieRaisin time: 5 reagents: - Flour: 5 - Sugar: 5 + Flour: 5 + Sugar: 5 solids: - FoodSnackRaisins: 1 + FoodSnackRaisins: 1 - type: microwaveMealRecipe id: RecipeCookieOatmeal @@ -1312,10 +1330,10 @@ result: FoodBakedCookieOatmeal time: 5 reagents: - Oats: 5 - Sugar: 5 + Oats: 5 + Sugar: 5 solids: - FoodButterSlice: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeChocolateChipPancake @@ -1323,11 +1341,11 @@ result: FoodBakedPancakeCc time: 5 reagents: - Flour: 5 - Milk: 5 - Egg: 6 + Flour: 5 + Milk: 5 + Egg: 6 solids: - FoodSnackChocolateBar: 1 + FoodSnackChocolateBar: 1 - type: microwaveMealRecipe id: RecipeAppleCake @@ -1335,8 +1353,8 @@ result: FoodCakeApple time: 5 solids: - FoodCakePlain: 1 - FoodApple: 3 + FoodCakePlain: 1 + FoodApple: 3 - type: microwaveMealRecipe id: RecipeCarrotCake @@ -1344,8 +1362,8 @@ result: FoodCakeCarrot time: 5 solids: - FoodCakePlain: 1 - FoodCarrot: 3 + FoodCakePlain: 1 + FoodCarrot: 3 - type: microwaveMealRecipe id: RecipeLemonCake @@ -1353,8 +1371,8 @@ result: FoodCakeLemon time: 5 solids: - FoodCakePlain: 1 - FoodLemon: 3 + FoodCakePlain: 1 + FoodLemon: 3 - type: microwaveMealRecipe id: RecipeLemoonCake @@ -1362,9 +1380,9 @@ result: FoodCakeLemoon time: 5 solids: - FoodCakePlain: 1 - FoodLemoon: 2 - FoodBerries: 1 #dark colouring + FoodCakePlain: 1 + FoodLemoon: 2 + FoodBerries: 1 #dark colouring - type: microwaveMealRecipe id: RecipeOrangeCake @@ -1372,8 +1390,8 @@ result: FoodCakeOrange time: 5 solids: - FoodCakePlain: 1 - FoodOrange: 3 + FoodCakePlain: 1 + FoodOrange: 3 - type: microwaveMealRecipe id: RecipeBlueberryCake @@ -1381,8 +1399,8 @@ result: FoodCakeBlueberry time: 5 solids: - FoodCakePlain: 1 - FoodBerries: 3 + FoodCakePlain: 1 + FoodBerries: 3 - type: microwaveMealRecipe id: RecipeLimeCake @@ -1390,8 +1408,8 @@ result: FoodCakeLime time: 5 solids: - FoodCakePlain: 1 - FoodLime: 3 + FoodCakePlain: 1 + FoodLime: 3 - type: microwaveMealRecipe id: RecipeCheeseCake @@ -1399,10 +1417,10 @@ result: FoodCakeCheese time: 5 reagents: - Cream: 10 + Cream: 10 solids: - FoodCakePlain: 1 - FoodCheeseSlice: 3 + FoodCakePlain: 1 + FoodCheeseSlice: 3 - type: microwaveMealRecipe id: RecipePumpkinCake @@ -1410,8 +1428,8 @@ result: FoodCakePumpkin time: 5 solids: - FoodCakePlain: 1 - FoodPumpkin: 1 + FoodCakePlain: 1 + FoodPumpkin: 1 - type: microwaveMealRecipe id: RecipeClownCake @@ -1419,8 +1437,8 @@ result: FoodCakeClown time: 5 solids: - ClothingMaskClown: 1 - FoodCakePlain: 1 + ClothingMaskClown: 1 + FoodCakePlain: 1 - type: microwaveMealRecipe id: RecipeCake @@ -1428,7 +1446,7 @@ result: FoodCakePlain time: 15 solids: - FoodCakeBatter: 1 + FoodCakeBatter: 1 - type: microwaveMealRecipe id: RecipeBirthdayCake @@ -1436,9 +1454,9 @@ result: FoodCakeBirthday time: 5 reagents: - Cream: 5 + Cream: 5 solids: - FoodCakePlain: 1 + FoodCakePlain: 1 - type: microwaveMealRecipe id: RecipeChocolateCake @@ -1446,8 +1464,8 @@ result: FoodCakeChocolate time: 5 solids: - FoodCakePlain: 1 - FoodSnackChocolateBar: 2 + FoodCakePlain: 1 + FoodSnackChocolateBar: 2 - type: microwaveMealRecipe id: RecipeBrainCake @@ -1455,8 +1473,8 @@ result: FoodCakeBrain time: 15 solids: - FoodCakePlain: 1 - OrganHumanBrain: 1 + FoodCakePlain: 1 + OrganHumanBrain: 1 - type: microwaveMealRecipe id: RecipeSlimeCake @@ -1464,9 +1482,9 @@ result: FoodCakeSlime time: 5 reagents: - Slime: 15 + Slime: 15 solids: - FoodCakePlain: 1 + FoodCakePlain: 1 - type: microwaveMealRecipe id: RecipeCatCake @@ -1474,12 +1492,12 @@ result: MobCatCake time: 15 reagents: - Milk: 15 - Cognizine: 5 + Milk: 15 + Cognizine: 5 solids: - FoodCakePlain: 1 - FoodSnackRaisins: 1 - OrganAnimalHeart: 1 + FoodCakePlain: 1 + FoodSnackRaisins: 1 + OrganAnimalHeart: 1 - type: microwaveMealRecipe id: RecipeBreadDog @@ -1487,11 +1505,11 @@ result: MobBreadDog time: 15 reagents: - Cognizine: 5 + Cognizine: 5 solids: - FoodBreadSausage: 1 - OrganAnimalHeart: 1 - FoodSpaceshroomCooked: 1 + FoodBreadSausage: 1 + OrganAnimalHeart: 1 + FoodSpaceshroomCooked: 1 - type: microwaveMealRecipe id: RecipeDumplings @@ -1499,10 +1517,10 @@ result: FoodBakedDumplings time: 15 reagents: - Water: 10 - UncookedAnimalProteins: 6 + Water: 10 + UncookedAnimalProteins: 6 solids: - FoodDoughSlice: 3 + FoodDoughSlice: 3 - type: microwaveMealRecipe id: RecipeBrownies @@ -1510,12 +1528,12 @@ result: FoodBakedBrownieBatch time: 25 reagents: - Flour: 15 - Sugar: 30 - Egg: 18 + Flour: 15 + Sugar: 30 + Egg: 18 solids: - FoodButter: 2 - FoodSnackChocolateBar: 2 + FoodButter: 2 + FoodSnackChocolateBar: 2 #Donks i guess - type: microwaveMealRecipe @@ -1524,7 +1542,7 @@ result: FoodDonkpocketWarm time: 5 solids: - FoodDonkpocket: 1 + FoodDonkpocket: 1 - type: microwaveMealRecipe id: RecipeWarmDankpocket @@ -1532,7 +1550,7 @@ result: FoodDonkpocketDankWarm time: 5 solids: - FoodDonkpocketDank: 1 + FoodDonkpocketDank: 1 - type: microwaveMealRecipe id: RecipeWarmDonkpocketSpicy @@ -1540,7 +1558,7 @@ result: FoodDonkpocketSpicyWarm time: 5 solids: - FoodDonkpocketSpicy: 1 + FoodDonkpocketSpicy: 1 - type: microwaveMealRecipe id: RecipeWarmDonkpocketTeriyaki @@ -1548,7 +1566,7 @@ result: FoodDonkpocketTeriyakiWarm time: 5 solids: - FoodDonkpocketTeriyaki: 1 + FoodDonkpocketTeriyaki: 1 - type: microwaveMealRecipe id: RecipeWarmDonkpocketPizza @@ -1556,7 +1574,7 @@ result: FoodDonkpocketPizzaWarm time: 5 solids: - FoodDonkpocketPizza: 1 + FoodDonkpocketPizza: 1 - type: microwaveMealRecipe id: RecipeDonkpocketHonk @@ -1564,7 +1582,7 @@ result: FoodDonkpocketHonkWarm time: 5 solids: - FoodDonkpocketHonk: 1 + FoodDonkpocketHonk: 1 - type: microwaveMealRecipe id: RecipeDonkpocketBerry @@ -1572,7 +1590,7 @@ result: FoodDonkpocketBerryWarm time: 5 solids: - FoodDonkpocketBerry: 1 + FoodDonkpocketBerry: 1 - type: microwaveMealRecipe id: RecipeDonkpocketStonk @@ -1580,7 +1598,7 @@ result: FoodDonkpocketStonkWarm time: 5 solids: - FoodDonkpocketStonk: 1 + FoodDonkpocketStonk: 1 - type: microwaveMealRecipe id: RecipeDonkpocketCarp @@ -1588,8 +1606,7 @@ result: FoodDonkpocketCarpWarm time: 5 solids: - FoodDonkpocketCarp: 1 - + FoodDonkpocketCarp: 1 - type: microwaveMealRecipe id: RecipeHotChili @@ -1597,11 +1614,11 @@ result: FoodSoupChiliHot time: 20 solids: - FoodBowlBig: 1 - FoodChiliPepper: 1 - FoodMeatCutlet: 1 - FoodOnionSlice: 1 - FoodTomato: 1 + FoodBowlBig: 1 + FoodChiliPepper: 1 + FoodMeatCutlet: 1 + FoodOnionSlice: 1 + FoodTomato: 1 - type: microwaveMealRecipe id: RecipeColdChili @@ -1609,9 +1626,9 @@ result: FoodSoupChiliCold time: 5 reagents: - Nitrogen: 5 + Nitrogen: 5 solids: - FoodSoupChiliHot: 1 + FoodSoupChiliHot: 1 - type: microwaveMealRecipe id: RecipeClownTears @@ -1619,10 +1636,10 @@ result: FoodSoupClown time: 15 solids: - FoodBowlBig: 1 - FoodOnionSlice: 1 - FoodTomato: 1 - BikeHorn: 1 + FoodBowlBig: 1 + FoodOnionSlice: 1 + FoodTomato: 1 + BikeHorn: 1 - type: microwaveMealRecipe id: RecipeChiliClown @@ -1630,12 +1647,12 @@ result: FoodSoupChiliClown time: 30 solids: - FoodBowlBig: 1 - FoodChiliPepper: 1 - FoodMeatCutlet: 1 - FoodOnionSlice: 1 - FoodTomato: 1 - ClothingShoesClown: 1 + FoodBowlBig: 1 + FoodChiliPepper: 1 + FoodMeatCutlet: 1 + FoodOnionSlice: 1 + FoodTomato: 1 + ClothingShoesClown: 1 - type: microwaveMealRecipe id: RecipeQueso @@ -1644,10 +1661,10 @@ time: 15 #todo Add blackpepper #reagents: - #blackpepper: 5 + #blackpepper: 5 solids: - FoodChiliPepper: 1 - FoodCheeseSlice: 2 + FoodChiliPepper: 1 + FoodCheeseSlice: 2 - type: microwaveMealRecipe id: RecipeRibs @@ -1655,10 +1672,10 @@ result: FoodMealRibs time: 15 reagents: - BbqSauce: 5 + BbqSauce: 5 solids: - FoodMeat: 2 - FoodKebabSkewer: 1 + FoodMeat: 2 + FoodKebabSkewer: 1 - type: microwaveMealRecipe id: RecipeEnchiladas @@ -1666,9 +1683,9 @@ result: FoodMealEnchiladas time: 20 solids: - FoodChiliPepper: 2 - FoodMeatCutlet: 1 - FoodCorn: 1 + FoodChiliPepper: 2 + FoodMeatCutlet: 1 + FoodCorn: 1 # SALADS: These should be moved out of the microwave as soon as possible - type: microwaveMealRecipe @@ -1677,9 +1694,9 @@ result: FoodSaladHerb time: 5 solids: - FoodBowlBig: 1 - FoodAmbrosiaVulgaris: 3 - FoodApple: 1 + FoodBowlBig: 1 + FoodAmbrosiaVulgaris: 3 + FoodApple: 1 - type: microwaveMealRecipe id: RecipeValidSalad @@ -1687,10 +1704,10 @@ result: FoodSaladValid time: 5 solids: - FoodBowlBig: 1 - FoodAmbrosiaVulgaris: 3 - FoodPotato: 1 - FoodMeatMeatball: 1 + FoodBowlBig: 1 + FoodAmbrosiaVulgaris: 3 + FoodPotato: 1 + FoodMeatMeatball: 1 - type: microwaveMealRecipe id: RecipeColeslaw @@ -1698,11 +1715,11 @@ result: FoodSaladColeslaw time: 5 reagents: - Vinaigrette: 5 + Vinaigrette: 5 solids: - FoodBowlBig: 1 - FoodOnionRed: 1 - FoodCabbage: 1 + FoodBowlBig: 1 + FoodOnionRed: 1 + FoodCabbage: 1 - type: microwaveMealRecipe id: RecipeCaesarSalad @@ -1710,13 +1727,13 @@ result: FoodSaladCaesar time: 5 reagents: - OilOlive: 5 + OilOlive: 5 solids: - FoodBowlBig: 1 - FoodOnionRedSlice: 1 - FoodBreadPlainSlice: 1 - FoodCheeseSlice: 1 - FoodCabbage: 1 + FoodBowlBig: 1 + FoodOnionRedSlice: 1 + FoodBreadPlainSlice: 1 + FoodCheeseSlice: 1 + FoodCabbage: 1 - type: microwaveMealRecipe id: RecipeCitrusSalad @@ -1724,10 +1741,10 @@ result: FoodSaladCitrus time: 5 solids: - FoodBowlBig: 1 - FoodOrange: 1 - FoodLemon: 1 - FoodLime: 1 + FoodBowlBig: 1 + FoodOrange: 1 + FoodLemon: 1 + FoodLime: 1 - type: microwaveMealRecipe id: RecipeKimchiSalad @@ -1735,12 +1752,12 @@ result: FoodSaladKimchi time: 5 reagents: - Vinegar: 5 + Vinegar: 5 solids: - FoodBowlBig: 1 - FoodCarrot: 1 - FoodCabbage: 1 - FoodGarlic: 1 + FoodBowlBig: 1 + FoodCarrot: 1 + FoodCabbage: 1 + FoodGarlic: 1 - type: microwaveMealRecipe id: RecipeFruitSalad @@ -1748,11 +1765,11 @@ result: FoodSaladFruit time: 5 solids: - FoodBowlBig: 1 - FoodOrange: 1 - FoodApple: 1 - FoodGrape: 1 - FoodWatermelonSlice: 2 + FoodBowlBig: 1 + FoodOrange: 1 + FoodApple: 1 + FoodGrape: 1 + FoodWatermelonSlice: 2 - type: microwaveMealRecipe id: RecipeJungleSalad @@ -1760,11 +1777,11 @@ result: FoodSaladJungle time: 5 solids: - FoodBowlBig: 1 - FoodBanana: 1 - FoodApple: 1 - FoodGrape: 1 - FoodWatermelonSlice: 2 + FoodBowlBig: 1 + FoodBanana: 1 + FoodApple: 1 + FoodGrape: 1 + FoodWatermelonSlice: 2 - type: microwaveMealRecipe id: RecipeWatermelonFruitBowlSalad @@ -1772,12 +1789,12 @@ result: FoodSaladWatermelonFruitBowl time: 5 solids: - FoodWatermelon: 1 - FoodApple: 1 - FoodBanana: 1 - FoodLemon: 1 - FoodOrange: 1 - FoodAmbrosiaVulgaris: 1 + FoodWatermelon: 1 + FoodApple: 1 + FoodBanana: 1 + FoodLemon: 1 + FoodOrange: 1 + FoodAmbrosiaVulgaris: 1 # Muffins @@ -1787,10 +1804,10 @@ result: FoodBakedMuffin time: 15 solids: - FoodPlateMuffinTin: 1 - FoodDoughSlice: 1 + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 reagents: - Sugar: 10 + Sugar: 10 - type: microwaveMealRecipe id: RecipeMuffinChocolate @@ -1798,11 +1815,11 @@ result: FoodBakedMuffinChocolate time: 15 solids: - FoodPlateMuffinTin: 1 - FoodDoughSlice: 1 - FoodSnackChocolateBar: 1 + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + FoodSnackChocolateBar: 1 reagents: - Sugar: 10 + Sugar: 10 - type: microwaveMealRecipe id: RecipeMuffinBerry @@ -1810,11 +1827,11 @@ result: FoodBakedMuffinBerry time: 15 solids: - FoodPlateMuffinTin: 1 - FoodDoughSlice: 1 - FoodBerries: 1 + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + FoodBerries: 1 reagents: - Sugar: 10 + Sugar: 10 - type: microwaveMealRecipe id: RecipeMuffinBanana @@ -1822,11 +1839,11 @@ result: FoodBakedMuffinBanana time: 15 solids: - FoodPlateMuffinTin: 1 - FoodDoughSlice: 1 - FoodBanana: 1 + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + FoodBanana: 1 reagents: - Sugar: 10 + Sugar: 10 - type: microwaveMealRecipe id: RecipeMuffinCherry @@ -1834,11 +1851,11 @@ result: FoodBakedMuffinCherry time: 15 solids: - FoodPlateMuffinTin: 1 - FoodDoughSlice: 1 - FoodCherry: 3 + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + FoodCherry: 3 reagents: - Sugar: 10 + Sugar: 10 # NOT ACTUAL FOOD @@ -1848,7 +1865,7 @@ result: LeavesTeaDried time: 10 solids: - LeavesTea: 1 + LeavesTea: 1 - type: microwaveMealRecipe id: RecipeDriedTobacco @@ -1856,7 +1873,7 @@ result: LeavesTobaccoDried time: 10 solids: - LeavesTobacco: 1 + LeavesTobacco: 1 - type: microwaveMealRecipe id: RecipeDriedCannabis @@ -1864,7 +1881,7 @@ result: LeavesCannabisDried time: 10 solids: - LeavesCannabis: 1 + LeavesCannabis: 1 - type: microwaveMealRecipe id: RecipeDriedCannabisRainbow @@ -1872,7 +1889,7 @@ result: LeavesCannabisRainbowDried time: 10 solids: - LeavesCannabisRainbow: 1 + LeavesCannabisRainbow: 1 - type: microwaveMealRecipe id: RecipeTrashBakedBananaPeel @@ -1880,7 +1897,7 @@ result: TrashBakedBananaPeel time: 5 solids: - TrashBananaPeel: 1 + TrashBananaPeel: 1 # Suppermatter - type: microwaveMealRecipe @@ -1889,11 +1906,11 @@ result: FoodCakeSuppermatter time: 30 solids: - FoodCakeBatter: 2 + FoodCakeBatter: 2 reagents: - Sugar: 30 - Nitrogen: 10 - Plasma: 10 + Sugar: 30 + Nitrogen: 10 + Plasma: 10 - type: microwaveMealRecipe id: RecipeFoodBakedChevreChaud @@ -1901,8 +1918,8 @@ result: FoodBakedChevreChaud time: 5 solids: - FoodChevreSlice: 1 - FoodBreadBaguetteSlice: 1 + FoodChevreSlice: 1 + FoodBreadBaguetteSlice: 1 - type: microwaveMealRecipe id: RecipeCookedSpaceshroom @@ -1910,7 +1927,7 @@ result: FoodSpaceshroomCooked time: 5 solids: - FoodSpaceshroom: 1 + FoodSpaceshroom: 1 - type: microwaveMealRecipe id: RecipeCannabisButter @@ -1918,8 +1935,8 @@ result: FoodCannabisButter time: 15 solids: - FoodButter: 1 - LeavesCannabis: 6 + FoodButter: 1 + LeavesCannabis: 6 - type: microwaveMealRecipe id: RecipeCannabisBrownies @@ -1927,12 +1944,12 @@ result: FoodBakedCannabisBrownieBatch time: 25 reagents: - Flour: 15 - Sugar: 30 - Egg: 18 + Flour: 15 + Sugar: 30 + Egg: 18 solids: - FoodCannabisButter: 2 - FoodSnackChocolateBar: 2 + FoodCannabisButter: 2 + FoodSnackChocolateBar: 2 - type: microwaveMealRecipe id: RecipeCornInButter @@ -1940,9 +1957,9 @@ result: FoodMealCornInButter time: 10 solids: - FoodCorn: 1 - FoodPlate: 1 - FoodButter: 1 + FoodCorn: 1 + FoodPlate: 1 + FoodButter: 1 - type: microwaveMealRecipe id: RecipePeaSoup @@ -1950,10 +1967,10 @@ result: FoodSoupPea time: 10 solids: - FoodPeaPod: 2 - FoodBowlBig: 1 + FoodPeaPod: 2 + FoodBowlBig: 1 reagents: - Water: 10 + Water: 10 - type: microwaveMealRecipe id: RecipeTacoShell @@ -1961,7 +1978,7 @@ result: FoodTacoShell time: 5 solids: - FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe + FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe - type: microwaveMealRecipe id: RecipeTacoBeef @@ -1969,9 +1986,9 @@ result: FoodTacoBeef time: 10 solids: - FoodTacoShell: 1 - FoodMeatCutlet: 1 - FoodCheeseSlice: 1 + FoodTacoShell: 1 + FoodMeatCutlet: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeTacoChicken @@ -1979,9 +1996,9 @@ result: FoodTacoChicken time: 10 solids: - FoodTacoShell: 1 - FoodMeatChickenCutlet: 1 - FoodCheeseSlice: 1 + FoodTacoShell: 1 + FoodMeatChickenCutlet: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeTacoFish @@ -1989,11 +2006,11 @@ result: FoodTacoFish time: 10 solids: - FoodTacoShell: 1 - FoodMeatFish: 1 - FoodOnionSlice: 2 - FoodTomato: 1 - FoodCabbage: 1 + FoodTacoShell: 1 + FoodMeatFish: 1 + FoodOnionSlice: 2 + FoodTomato: 1 + FoodCabbage: 1 - type: microwaveMealRecipe id: RecipeTacoRat @@ -2001,9 +2018,9 @@ result: FoodTacoRat time: 10 solids: - FoodTacoShell: 1 - FoodCheeseSlice: 1 - FoodMeatRat: 1 + FoodTacoShell: 1 + FoodCheeseSlice: 1 + FoodMeatRat: 1 - type: microwaveMealRecipe id: RecipeTacoBeefSupreme @@ -2011,12 +2028,12 @@ result: FoodTacoBeefSupreme time: 10 solids: - FoodTacoShell: 1 - FoodCheeseSlice: 1 - FoodMeatCutlet: 1 - FoodTomato: 1 - FoodCabbage: 1 - FoodOnionSlice: 2 + FoodTacoShell: 1 + FoodCheeseSlice: 1 + FoodMeatCutlet: 1 + FoodTomato: 1 + FoodCabbage: 1 + FoodOnionSlice: 2 - type: microwaveMealRecipe id: RecipeTacoChickenSupreme @@ -2024,12 +2041,12 @@ result: FoodTacoChickenSupreme time: 10 solids: - FoodTacoShell: 1 - FoodCheeseSlice: 1 - FoodMeatChickenCutlet: 1 - FoodTomato: 1 - FoodCabbage: 1 - FoodOnionSlice: 2 + FoodTacoShell: 1 + FoodCheeseSlice: 1 + FoodMeatChickenCutlet: 1 + FoodTomato: 1 + FoodCabbage: 1 + FoodOnionSlice: 2 - type: microwaveMealRecipe id: RecipeCroissant @@ -2037,8 +2054,8 @@ result: FoodBakedCroissant time: 5 solids: - FoodCroissantRaw: 1 - FoodButterSlice: 1 + FoodCroissantRaw: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeThrowingCroissant @@ -2047,6 +2064,6 @@ secretRecipe: true time: 5 solids: - FoodCroissantRaw: 1 - FoodButterSlice: 1 - ShardGlass: 1 + FoodCroissantRaw: 1 + FoodButterSlice: 1 + ShardGlass: 1 diff --git a/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/baked.png b/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/baked.png new file mode 100644 index 0000000000000000000000000000000000000000..558dadb0dc7cfcf31e08e900b60b3ed68f7f80ab GIT binary patch literal 759 zcmVPx#)lf`SMgIT(^yu03?BV?R^z`Z4^y%CG{P+I;{Y+_b z|NHI!{QLj^|NsC0|Ns8~|N8ycod5pz>B5TSyoUe$^7z)E)~$B<(wO<+y#D#-{n(-J z#gE~%eb>5@{Pf(xmS6SFl>O3^Y&Hs(J{|YisP5Ur{qWYPdrzBXEYGip`svB~@8X|X zAn)thDV!=T!@hV0Isl8$G`lXh?>3WHY*=GVN|;mf$6jN77u z(1}-dW-n__6Tyc=fie=dWi-CErs=GUNI(#UdLGmtiJt%f01I?dPE-CngV#G=`}zR> z@q^^i%m4rZsYygZR4C7F(}{9|Fc1LH^sq>oY)Bv=hagnJyR}-iw>|&=lez({c!WV_ zcyY6vETq|NUK;g5)Qvwx!;2hoZD`ku&rTzy7~%x0_r-&dW2RsNrNtCYBaKGmd|&l; z>k5F-f)C?@)mwzmU*lW!BL-8SJ!JXY+rtz30pqg6`|N$R{(b*JSE<#r1*`35t29s6 z>m+#|QeylwQOmYm?=?+V>1gzsE{9NTVOb_6s8gFcilNP8WFIbgp^GG^sLZLGqv@K&+?hO+nc9vmpVP7e&H}aM#HOJlV%-Yi(tMV+%0^|P_Dz0@Q pt+mGy8@t}GhM`@M(_hFo^*^KUJQ!lvVw$*gWR1M z)}51i3FI&b_=LFnWET1!zhMQED+%%oW^j0RBMr#m@pN$v;kcfhAkhQlO=Dn8663uD PWHETU`njxgN@xNAm^U4j literal 0 HcmV?d00001 From 839f9b9f78088dddadfc41c23b463d677da3c540 Mon Sep 17 00:00:00 2001 From: = Date: Mon, 11 Nov 2024 00:37:57 +0300 Subject: [PATCH 02/37] fix images --- .../Consumable/Food/shavuha.rsi/baked.png | Bin 759 -> 7253 bytes .../Consumable/Food/shavuha.rsi/unbaked.png | Bin 126 -> 7253 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/baked.png b/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/baked.png index 558dadb0dc7cfcf31e08e900b60b3ed68f7f80ab..304b49992bcbcfa6f22a61952850b88374309059 100644 GIT binary patch literal 7253 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 literal 759 zcmVPx#)lf`SMgIT(^yu03?BV?R^z`Z4^y%CG{P+I;{Y+_b z|NHI!{QLj^|NsC0|Ns8~|N8ycod5pz>B5TSyoUe$^7z)E)~$B<(wO<+y#D#-{n(-J z#gE~%eb>5@{Pf(xmS6SFl>O3^Y&Hs(J{|YisP5Ur{qWYPdrzBXEYGip`svB~@8X|X zAn)thDV!=T!@hV0Isl8$G`lXh?>3WHY*=GVN|;mf$6jN77u z(1}-dW-n__6Tyc=fie=dWi-CErs=GUNI(#UdLGmtiJt%f01I?dPE-CngV#G=`}zR> z@q^^i%m4rZsYygZR4C7F(}{9|Fc1LH^sq>oY)Bv=hagnJyR}-iw>|&=lez({c!WV_ zcyY6vETq|NUK;g5)Qvwx!;2hoZD`ku&rTzy7~%x0_r-&dW2RsNrNtCYBaKGmd|&l; z>k5F-f)C?@)mwzmU*lW!BL-8SJ!JXY+rtz30pqg6`|N$R{(b*JSE<#r1*`35t29s6 z>m+#|QeylwQOmYm?=?+V>1gzsE{9NTVOb_6s8gFcilNP8WFIbgp^GG^sLZLGqv@K&+?hO+nc9vmpVP7e&H}aM#HOJlV%-Yi(tMV+%0^|P_Dz0@Q pt+mGy8@t}GhM`@M(_hFo^*^KUJQ0QMo3?1F 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 literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^av;pe3?v!<**pYNEa{HEjtmSN`?>!lvVw$*gWR1M z)}51i3FI&b_=LFnWET1!zhMQED+%%oW^j0RBMr#m@pN$v;kcfhAkhQlO=Dn8663uD PWHETU`njxgN@xNAm^U4j From 9062f934d8c628dacb32f55fac8b1f9495759348 Mon Sep 17 00:00:00 2001 From: = Date: Mon, 11 Nov 2024 00:16:50 +0300 Subject: [PATCH 03/37] shaverma From 2591c1365c45590c849f38c8d4685b5849439594 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 00:55:27 +0300 Subject: [PATCH 04/37] Update shaverma-unbaked.yml --- .../Entities/Objects/Consumable/Food/shaverma-unbaked.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml index 86d80e9e42d..2b22d1f5093 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml @@ -1,10 +1,10 @@ # When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml - type: entity - name: shaverma + name: заготовка шавермы parent: FoodMealBase id: Shaverma-unbaked - description: Пища богов + description: Пища богов, но не прожаренная components: - type: Item storedRotation: -90 From 5ae25d972f045dd4f2f421a0fc461f30d2bd838a Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 00:55:51 +0300 Subject: [PATCH 05/37] Update shaverma-baked.yml --- .../Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml index c510a6c9e9d..a520db45d37 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml @@ -1,7 +1,7 @@ # When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml - type: entity - name: shaverma + name: шаверма parent: FoodMealBase id: Shaverma-baked description: Пища богов From b9f9549758e7144bc15e68e371911b9652d92bbf Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 01:23:10 +0300 Subject: [PATCH 06/37] Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> --- Resources/Prototypes/Recipes/Cooking/meal_recipes.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index a4c6ec2f9a1..97e9a45b1e2 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -24,6 +24,7 @@ time: 15 solids: Shaverma-unbaked: 1 +# Corvax-Next-Shaverma-End #Bagels - type: microwaveMealRecipe id: RecipeBagel From 8dca77373baa989486079fe31ee2873c1bb6afe5 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 01:23:21 +0300 Subject: [PATCH 07/37] Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> --- Resources/Prototypes/Recipes/Cooking/meal_recipes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 97e9a45b1e2..e89ab3807f2 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -6,7 +6,7 @@ solids: FoodDoughSlice: 1 # one third of a standard bread dough recipe -#Shaverma +# Corvax-Next-Shaverma-Start - type: microwaveMealRecipe id: RecipeShaverma-unbaked name: The best food ever From 0dfc180af46a724791d56f18a42836b3a37a5032 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 01:24:07 +0300 Subject: [PATCH 08/37] Update shaverma-baked.yml --- .../Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml index a520db45d37..cb81eaf0913 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml @@ -1,5 +1,3 @@ -# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml - - type: entity name: шаверма parent: FoodMealBase From c673a943dafa7bcc4d45770de9aa650d5b5575b1 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:07:25 +0300 Subject: [PATCH 09/37] License updates --- .../Textures/Objects/Consumable/Food/shavuha.rsi/meta.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/meta.json index 603d0360149..75e7a5f4340 100644 --- a/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "MIT", - "copyright": "Added by JailedFish", + "license": "No license/unknown license", + "copyright": "By sspetishes", "size": { "x": 32, "y": 32 From f668d071bf441fff607ba6e1a8ea46d49812e0c0 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 08:54:10 +0000 Subject: [PATCH 10/37] Localisation? --- .../entities/objects/consumable/food/baked/shaverma-baked.ftl | 2 ++ .../entities/objects/consumable/food/shaverma-unbaked.ftl | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/shaverma-baked.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/shaverma-unbaked.ftl diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/shaverma-baked.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/shaverma-baked.ftl new file mode 100644 index 00000000000..00a9c0331a8 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/shaverma-baked.ftl @@ -0,0 +1,2 @@ +ent-Shaverma-unbaked = Заготовка шавермы + .desc = Пища богов, осталось только подогреть. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/shaverma-unbaked.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/shaverma-unbaked.ftl new file mode 100644 index 00000000000..0b2979b4363 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/shaverma-unbaked.ftl @@ -0,0 +1,2 @@ +ent-Shaverma-baked = Шаверма + .desc = Пища богов. \ No newline at end of file From 819895bf38a849b80480dbb235539f8b6ce6fc92 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 08:59:44 +0000 Subject: [PATCH 11/37] Localisation --- .../Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml | 2 -- .../Entities/Objects/Consumable/Food/shaverma-unbaked.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml index cb81eaf0913..b440fdd1d75 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml @@ -1,8 +1,6 @@ - type: entity - name: шаверма parent: FoodMealBase id: Shaverma-baked - description: Пища богов components: - type: Item storedRotation: -90 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml index 2b22d1f5093..0f418fa43a0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml @@ -1,10 +1,8 @@ # When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml - type: entity - name: заготовка шавермы parent: FoodMealBase id: Shaverma-unbaked - description: Пища богов, но не прожаренная components: - type: Item storedRotation: -90 From 6d4f8a4ee294b4ef94fc144cef6fc7c8cb08650b Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:59:00 +0000 Subject: [PATCH 12/37] undo something --- .../Recipes/Cooking/meal_recipes.yml | 1172 ++++++++--------- 1 file changed, 586 insertions(+), 586 deletions(-) diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index e89ab3807f2..66d8c93be61 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -4,7 +4,7 @@ result: FoodBreadBun time: 5 solids: - FoodDoughSlice: 1 # one third of a standard bread dough recipe + FoodDoughSlice: 1 # one third of a standard bread dough recipe # Corvax-Next-Shaverma-Start - type: microwaveMealRecipe @@ -13,9 +13,9 @@ result: Shaverma-unbaked time: 1 solids: - FoodMeat: 2 - FoodDough: 1 - FoodTomato: 1 + FoodMeat: 2 + FoodDough: 1 + FoodTomato: 1 - type: microwaveMealRecipe id: RecipeShaverma-baked @@ -23,7 +23,7 @@ result: Shaverma-baked time: 15 solids: - Shaverma-unbaked: 1 + Shaverma-unbaked: 1 # Corvax-Next-Shaverma-End #Bagels - type: microwaveMealRecipe @@ -32,7 +32,7 @@ result: FoodBagel time: 5 solids: - FoodDoughRope: 1 # created by rolling a dough slice. + FoodDoughRope: 1 # created by rolling a dough slice. - type: microwaveMealRecipe id: RecipeBagelPoppy @@ -40,8 +40,8 @@ result: FoodBagelPoppy time: 5 solids: - FoodDoughRope: 1 - PoppySeeds: 1 + FoodDoughRope: 1 + PoppySeeds: 1 #Burgers @@ -51,8 +51,8 @@ result: FoodBurgerAppendix time: 10 solids: - FoodBreadBun: 1 - OrganHumanAppendix: 1 + FoodBreadBun: 1 + OrganHumanAppendix: 1 - type: microwaveMealRecipe id: RecipeBaconBurger @@ -60,9 +60,9 @@ result: FoodBurgerBacon time: 10 solids: - FoodBreadBun: 1 - FoodMeatBacon: 1 - FoodCheeseSlice: 2 + FoodBreadBun: 1 + FoodMeatBacon: 1 + FoodCheeseSlice: 2 - type: microwaveMealRecipe id: RecipeBaseballBurger @@ -70,8 +70,8 @@ result: FoodBurgerBaseball time: 10 solids: - FoodBreadBun: 1 - BaseBallBat: 1 + FoodBreadBun: 1 + BaseBallBat: 1 - type: microwaveMealRecipe id: RecipeBearger @@ -79,8 +79,8 @@ result: FoodBurgerBear time: 10 solids: - FoodBreadBun: 1 - FoodMeatBear: 1 + FoodBreadBun: 1 + FoodMeatBear: 1 - type: microwaveMealRecipe id: RecipeBigBiteBurger @@ -88,11 +88,11 @@ result: FoodBurgerBig time: 15 solids: - FoodBreadBun: 1 - FoodMeat: 2 - FoodCheeseSlice: 1 - FoodTomato: 1 - FoodOnionSlice: 2 + FoodBreadBun: 1 + FoodMeat: 2 + FoodCheeseSlice: 1 + FoodTomato: 1 + FoodOnionSlice: 2 - type: microwaveMealRecipe #Added to metamorph recipes id: RecipeBrainBurger @@ -100,8 +100,8 @@ result: FoodBurgerBrain time: 10 solids: - FoodBreadBun: 1 - OrganHumanBrain: 1 + FoodBreadBun: 1 + OrganHumanBrain: 1 - type: microwaveMealRecipe id: RecipeCatBurger @@ -109,9 +109,9 @@ result: FoodBurgerCat time: 10 solids: - FoodBreadBun: 1 - FoodMeat: 1 - ClothingHeadHatCatEars: 1 + FoodBreadBun: 1 + FoodMeat: 1 + ClothingHeadHatCatEars: 1 - type: microwaveMealRecipe #Added to metamorph recipes id: RecipeCheeseburger @@ -119,9 +119,9 @@ result: FoodBurgerCheese time: 10 solids: - FoodBreadBun: 1 - FoodMeat: 1 - FoodCheeseSlice: 1 + FoodBreadBun: 1 + FoodMeat: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe #Added to metamorph recipes id: RecipeChickenSandwich @@ -129,10 +129,10 @@ result: FoodBurgerChicken time: 10 reagents: - Mayo: 5 + Mayo: 5 solids: - FoodBreadBun: 1 - FoodMeatChicken: 1 + FoodBreadBun: 1 + FoodMeatChicken: 1 - type: microwaveMealRecipe id: RecipeClownBurger @@ -140,8 +140,8 @@ result: FoodBurgerClown time: 10 solids: - FoodBreadBun: 1 - ClothingMaskClown: 1 + FoodBreadBun: 1 + ClothingMaskClown: 1 - type: microwaveMealRecipe id: RecipeCorgiBurger @@ -149,8 +149,8 @@ result: FoodBurgerCorgi time: 10 solids: - FoodBreadBun: 1 - FoodMeatCorgi: 1 + FoodBreadBun: 1 + FoodMeatCorgi: 1 - type: microwaveMealRecipe #Added to metamorph recipes id: RecipeCrabBurger @@ -158,8 +158,8 @@ result: FoodBurgerCrab time: 10 solids: - FoodBreadBun: 1 - FoodMeatCrab: 2 + FoodBreadBun: 1 + FoodMeatCrab: 2 - type: microwaveMealRecipe id: RecipeCrazyHamburger @@ -167,15 +167,15 @@ result: FoodBurgerCrazy time: 15 reagents: - OilOlive: 15 + OilOlive: 15 solids: - FoodBreadBun: 1 - FoodMeat: 2 - FoodCheeseSlice: 2 - FoodChiliPepper: 1 - FoodCabbage: 1 - CrayonGreen: 1 - Flare: 1 + FoodBreadBun: 1 + FoodMeat: 2 + FoodCheeseSlice: 2 + FoodChiliPepper: 1 + FoodCabbage: 1 + CrayonGreen: 1 + Flare: 1 - type: microwaveMealRecipe #Added to metamorph recipes id: RecipeDuckBurger @@ -183,9 +183,9 @@ result: FoodBurgerDuck time: 10 solids: - FoodBreadBun: 1 - FoodMeatDuck: 1 - FoodCheeseSlice: 1 + FoodBreadBun: 1 + FoodMeatDuck: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeEmpoweredBurger @@ -193,8 +193,8 @@ result: FoodBurgerEmpowered time: 10 solids: - FoodBreadBun: 1 - SheetPlasma1: 2 + FoodBreadBun: 1 + SheetPlasma1: 2 - type: microwaveMealRecipe id: RecipeCarpBurger @@ -202,9 +202,9 @@ result: FoodBurgerCarp time: 10 solids: - FoodBreadBun: 1 - FoodMeatFish: 1 - FoodCheeseSlice: 1 + FoodBreadBun: 1 + FoodMeatFish: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeFiveBurger @@ -212,9 +212,9 @@ result: FoodBurgerFive time: 10 solids: - FoodBreadBun: 1 - FoodMeat: 1 - FoodChiliPepper: 3 + FoodBreadBun: 1 + FoodMeat: 1 + FoodChiliPepper: 3 - type: microwaveMealRecipe id: RecipeGhostBurger @@ -222,8 +222,8 @@ result: FoodBurgerGhost time: 10 solids: - FoodBreadBun: 1 - Ectoplasm: 1 + FoodBreadBun: 1 + Ectoplasm: 1 - type: microwaveMealRecipe id: RecipeHumanBurger @@ -231,8 +231,8 @@ result: FoodBurgerHuman time: 10 solids: - FoodBreadBun: 1 - FoodMeatHuman: 1 + FoodBreadBun: 1 + FoodMeatHuman: 1 - type: microwaveMealRecipe id: RecipeJellyBurger @@ -240,8 +240,8 @@ result: FoodBurgerJelly time: 10 solids: - FoodBreadBun: 1 - FoodJellyAmanita: 1 + FoodBreadBun: 1 + FoodJellyAmanita: 1 - type: microwaveMealRecipe id: RecipeBurgerMcguffin @@ -249,9 +249,9 @@ result: FoodBurgerMcguffin time: 10 solids: - FoodBreadBun: 1 - FoodCheeseSlice: 1 - FoodEgg: 2 + FoodBreadBun: 1 + FoodCheeseSlice: 1 + FoodEgg: 2 - type: microwaveMealRecipe id: RecipeBurgerMcrib @@ -259,9 +259,9 @@ result: FoodBurgerMcrib time: 10 solids: - FoodBreadBun: 1 - FoodMealRibs: 1 - FoodOnionSlice: 1 + FoodBreadBun: 1 + FoodMealRibs: 1 + FoodOnionSlice: 1 - type: microwaveMealRecipe id: RecipeMimeBurger @@ -269,8 +269,8 @@ result: FoodBurgerMime time: 10 solids: - FoodBreadBun: 1 - ClothingMaskMime: 1 + FoodBreadBun: 1 + ClothingMaskMime: 1 - type: microwaveMealRecipe id: RecipePlainBurger @@ -278,8 +278,8 @@ result: FoodBurgerPlain time: 10 solids: - FoodBreadBun: 1 - FoodMeat: 1 + FoodBreadBun: 1 + FoodMeat: 1 - type: microwaveMealRecipe id: RecipeRatBurger @@ -287,8 +287,8 @@ result: FoodBurgerRat time: 10 solids: - FoodBreadBun: 1 - FoodMeatRat: 1 + FoodBreadBun: 1 + FoodMeatRat: 1 - type: microwaveMealRecipe id: RecipeRobotBurger @@ -296,9 +296,9 @@ result: FoodBurgerRobot time: 10 solids: - FoodBreadBun: 1 - CapacitorStockPart: 2 - # i would add steel to this recipe but the microwave explodes + FoodBreadBun: 1 + CapacitorStockPart: 2 + # i would add steel to this recipe but the microwave explodes - type: microwaveMealRecipe id: RecipeSoylentBurger @@ -306,9 +306,9 @@ result: FoodBurgerSoy time: 10 solids: - FoodBreadBun: 1 - FoodCheeseSlice: 2 - FoodSoybeans: 2 #replace with soylent green when those become craftable + FoodBreadBun: 1 + FoodCheeseSlice: 2 + FoodSoybeans: 2 #replace with soylent green when those become craftable - type: microwaveMealRecipe id: RecipeSpellBurger @@ -316,8 +316,8 @@ result: FoodBurgerSpell time: 10 solids: - FoodBreadBun: 1 - ClothingHeadHatWizard: 1 + FoodBreadBun: 1 + ClothingHeadHatWizard: 1 - type: microwaveMealRecipe id: RecipeSuperBiteBurger @@ -325,13 +325,13 @@ result: FoodBurgerSuper time: 25 reagents: - TableSalt: 5 + TableSalt: 5 solids: - FoodBreadBun: 1 - FoodMeat: 2 - FoodCheeseSlice: 2 - FoodTomato: 2 - FoodEgg: 2 + FoodBreadBun: 1 + FoodMeat: 2 + FoodCheeseSlice: 2 + FoodTomato: 2 + FoodEgg: 2 - type: microwaveMealRecipe id: RecipeTofuBurger @@ -339,8 +339,8 @@ result: FoodBurgerTofu time: 10 solids: - FoodBreadBun: 1 - FoodTofuSlice: 1 + FoodBreadBun: 1 + FoodTofuSlice: 1 - type: microwaveMealRecipe id: RecipeXenoburger @@ -348,16 +348,16 @@ result: FoodBurgerXeno time: 10 solids: - FoodBreadBun: 1 - FoodMeatXeno: 1 + FoodBreadBun: 1 + FoodMeatXeno: 1 - type: microwaveMealRecipe id: RecipeMothRoachburger name: mothroachburger recipe result: FoodBurgerMothRoach solids: - FoodBreadBun: 1 - MobMothroach: 1 + FoodBreadBun: 1 + MobMothroach: 1 #Breads & Sandwiches @@ -367,8 +367,8 @@ result: FoodBreadBanana time: 15 solids: - FoodDough: 1 - FoodBanana: 1 + FoodDough: 1 + FoodBanana: 1 - type: microwaveMealRecipe id: RecipeCornbread @@ -376,7 +376,7 @@ result: FoodBreadCorn time: 10 solids: - FoodDoughCornmeal: 1 + FoodDoughCornmeal: 1 - type: microwaveMealRecipe id: RecipeCreamCheeseBread @@ -384,10 +384,10 @@ result: FoodBreadCreamcheese time: 15 reagents: - Milk: 5 + Milk: 5 solids: - FoodDough: 1 - FoodCheeseSlice: 2 + FoodDough: 1 + FoodCheeseSlice: 2 - type: microwaveMealRecipe id: RecipeMeatBread @@ -395,9 +395,9 @@ result: FoodBreadMeat time: 15 solids: - FoodDough: 1 - FoodMeatCutlet: 2 - FoodCheeseSlice: 2 + FoodDough: 1 + FoodMeatCutlet: 2 + FoodCheeseSlice: 2 - type: microwaveMealRecipe id: RecipeMimanaBread @@ -405,10 +405,10 @@ result: FoodBreadMimana time: 15 reagents: - Nothing: 5 + Nothing: 5 solids: - FoodDough: 1 - FoodMimana: 1 + FoodDough: 1 + FoodMimana: 1 - type: microwaveMealRecipe id: RecipeBread @@ -416,7 +416,7 @@ result: FoodBreadPlain time: 10 solids: - FoodDough: 1 + FoodDough: 1 - type: microwaveMealRecipe id: RecipeBreadCotton @@ -424,7 +424,7 @@ result: FoodBreadCotton time: 10 solids: - FoodDoughCotton: 1 + FoodDoughCotton: 1 - type: microwaveMealRecipe id: RecipeSausageBread @@ -432,8 +432,8 @@ result: FoodBreadSausage time: 15 solids: - FoodDough: 1 - FoodMeat: 1 #replace with sausage + FoodDough: 1 + FoodMeat: 1 #replace with sausage - type: microwaveMealRecipe id: RecipeSpiderMeatBread @@ -441,9 +441,9 @@ result: FoodBreadMeatSpider time: 15 solids: - FoodDough: 1 - FoodMeatSpiderCutlet: 2 - FoodCheeseSlice: 2 + FoodDough: 1 + FoodMeatSpiderCutlet: 2 + FoodCheeseSlice: 2 - type: microwaveMealRecipe id: RecipeTofuBread @@ -451,8 +451,8 @@ result: FoodBreadTofu time: 15 solids: - FoodDough: 1 - FoodTofu: 1 + FoodDough: 1 + FoodTofu: 1 - type: microwaveMealRecipe id: RecipeXenoMeatBread @@ -460,9 +460,9 @@ result: FoodBreadMeatXeno time: 15 solids: - FoodDough: 1 - FoodMeatXenoCutlet: 2 - FoodCheeseSlice: 2 + FoodDough: 1 + FoodMeatXenoCutlet: 2 + FoodCheeseSlice: 2 #Slices Only @@ -472,10 +472,10 @@ result: FoodBreadBaguette time: 15 reagents: - TableSalt: 5 - Blackpepper: 5 + TableSalt: 5 + Blackpepper: 5 solids: - FoodDough: 1 + FoodDough: 1 - type: microwaveMealRecipe id: RecipeBaguetteSword @@ -484,11 +484,11 @@ secretRecipe: true time: 15 reagents: - TableSalt: 5 - Blackpepper: 5 + TableSalt: 5 + Blackpepper: 5 solids: - FoodDough: 1 - PartRodMetal1: 1 + FoodDough: 1 + PartRodMetal1: 1 - type: microwaveMealRecipe id: RecipeButteredToast @@ -496,8 +496,8 @@ result: FoodBreadButteredToast time: 5 solids: - FoodBreadPlainSlice: 1 - FoodButterSlice: 1 + FoodBreadPlainSlice: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeFrenchToast @@ -505,10 +505,10 @@ result: FoodBreadFrenchToast time: 5 reagents: - Milk: 5 - Egg: 12 + Milk: 5 + Egg: 12 solids: - FoodBreadPlainSlice: 1 + FoodBreadPlainSlice: 1 - type: microwaveMealRecipe id: RecipeGarlicBread @@ -516,9 +516,9 @@ result: FoodBreadGarlicSlice time: 5 solids: - FoodBreadPlainSlice: 1 - FoodGarlic: 1 - FoodButterSlice: 1 + FoodBreadPlainSlice: 1 + FoodGarlic: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeJellyToast @@ -526,8 +526,8 @@ result: FoodBreadJellySlice time: 5 solids: - FoodBreadPlainSlice: 1 - FoodJellyAmanita: 1 #replace with jelly + FoodBreadPlainSlice: 1 + FoodJellyAmanita: 1 #replace with jelly - type: microwaveMealRecipe id: RecipeMoldyBreadSlice @@ -535,8 +535,8 @@ result: FoodBreadMoldySlice time: 5 solids: - FoodBreadPlainSlice: 1 - FoodFlyAmanita: 1 + FoodBreadPlainSlice: 1 + FoodFlyAmanita: 1 - type: microwaveMealRecipe id: RecipeTwoBreadSlice @@ -544,9 +544,9 @@ result: FoodBreadTwoSlice time: 5 reagents: - Wine: 5 + Wine: 5 solids: - FoodBreadPlainSlice: 2 + FoodBreadPlainSlice: 2 - type: microwaveMealRecipe id: RecipeOnionRings @@ -554,7 +554,7 @@ result: FoodOnionRings time: 15 solids: - FoodOnionSlice: 1 + FoodOnionSlice: 1 #Pizzas TODO: contruction graph based pizza - type: microwaveMealRecipe @@ -563,9 +563,9 @@ result: FoodPizzaMargherita time: 30 solids: - FoodDoughFlat: 1 - FoodCheeseSlice: 1 - FoodTomato: 4 + FoodDoughFlat: 1 + FoodCheeseSlice: 1 + FoodTomato: 4 - type: microwaveMealRecipe id: RecipeMushroomPizza @@ -573,8 +573,8 @@ result: FoodPizzaMushroom time: 30 solids: - FoodDoughFlat: 1 - FoodMushroom: 5 + FoodDoughFlat: 1 + FoodMushroom: 5 - type: microwaveMealRecipe id: RecipeMeatPizza @@ -582,10 +582,10 @@ result: FoodPizzaMeat time: 30 solids: - FoodDoughFlat: 1 - FoodMeat: 3 - FoodCheeseSlice: 1 - FoodTomato: 1 + FoodDoughFlat: 1 + FoodMeat: 3 + FoodCheeseSlice: 1 + FoodTomato: 1 - type: microwaveMealRecipe id: RecipeVegetablePizza @@ -593,11 +593,11 @@ result: FoodPizzaVegetable time: 30 solids: - FoodDoughFlat: 1 - FoodEggplant: 1 - FoodCarrot: 1 - FoodCorn: 1 - FoodTomato: 1 + FoodDoughFlat: 1 + FoodEggplant: 1 + FoodCarrot: 1 + FoodCorn: 1 + FoodTomato: 1 - type: microwaveMealRecipe id: RecipeHawaiianPizza @@ -605,9 +605,9 @@ result: FoodPizzaPineapple time: 30 solids: - FoodDoughFlat: 1 - FoodMeatChickenCutlet: 3 - FoodPineappleSlice: 5 + FoodDoughFlat: 1 + FoodMeatChickenCutlet: 3 + FoodPineappleSlice: 5 - type: microwaveMealRecipe id: RecipeDankPizza @@ -615,10 +615,10 @@ result: FoodPizzaDank time: 30 solids: - FoodDoughFlat: 1 - LeavesCannabis: 2 - FoodCheeseSlice: 1 - FoodTomato: 1 + FoodDoughFlat: 1 + LeavesCannabis: 2 + FoodCheeseSlice: 1 + FoodTomato: 1 - type: microwaveMealRecipe id: RecipeDonkpocketPizza @@ -626,10 +626,10 @@ result: FoodPizzaDonkpocket time: 30 solids: - FoodDoughFlat: 1 - FoodDonkpocketWarm: 3 - FoodCheeseSlice: 1 - FoodTomato: 1 + FoodDoughFlat: 1 + FoodDonkpocketWarm: 3 + FoodCheeseSlice: 1 + FoodTomato: 1 - type: microwaveMealRecipe id: RecipeUraniumPizza @@ -637,10 +637,10 @@ result: FoodPizzaUranium time: 30 solids: - FoodDoughFlat: 1 - FoodChiliPepper: 2 - FoodTomato: 2 - SheetUranium1: 2 + FoodDoughFlat: 1 + FoodChiliPepper: 2 + FoodTomato: 2 + SheetUranium1: 2 - type: microwaveMealRecipe id: RecipeCottonPizza @@ -648,8 +648,8 @@ result: FoodPizzaCotton time: 30 solids: - FoodDoughCottonFlat: 1 - CottonBol: 4 + FoodDoughCottonFlat: 1 + CottonBol: 4 #Italian - type: microwaveMealRecipe @@ -658,10 +658,10 @@ result: FoodNoodlesBoiled time: 15 reagents: - Flour: 15 - Egg: 6 + Flour: 15 + Egg: 6 solids: - FoodButter: 1 + FoodButter: 1 - type: microwaveMealRecipe id: RecipePastaTomato @@ -669,8 +669,8 @@ result: FoodNoodles time: 10 solids: - FoodNoodlesBoiled: 1 - FoodTomato: 2 + FoodNoodlesBoiled: 1 + FoodTomato: 2 - type: microwaveMealRecipe id: RecipeMeatballSpaghetti @@ -678,8 +678,8 @@ result: FoodNoodlesMeatball time: 10 solids: - FoodNoodlesBoiled: 1 - FoodMeatMeatball: 2 + FoodNoodlesBoiled: 1 + FoodMeatMeatball: 2 - type: microwaveMealRecipe id: RecipeButterNoodles @@ -687,8 +687,8 @@ result: FoodNoodlesButter time: 10 solids: - FoodNoodlesBoiled: 1 - FoodButter: 1 + FoodNoodlesBoiled: 1 + FoodButter: 1 - type: microwaveMealRecipe id: RecipeChowMein @@ -696,12 +696,12 @@ result: FoodNoodlesChowmein time: 10 reagents: - Egg: 6 + Egg: 6 solids: - FoodNoodlesBoiled: 1 - FoodEggplant: 1 - FoodCarrot: 1 - FoodCorn: 1 + FoodNoodlesBoiled: 1 + FoodEggplant: 1 + FoodCarrot: 1 + FoodCorn: 1 - type: microwaveMealRecipe id: RecipeOatmeal @@ -709,10 +709,10 @@ result: FoodOatmeal time: 15 reagents: - Oats: 15 - Water: 10 + Oats: 15 + Water: 10 solids: - FoodBowlBig: 1 + FoodBowlBig: 1 - type: microwaveMealRecipe id: RecipeBoiledRice @@ -720,10 +720,10 @@ result: FoodRiceBoiled time: 15 reagents: - Rice: 15 - Water: 10 + Rice: 15 + Water: 10 solids: - FoodBowlBig: 1 + FoodBowlBig: 1 - type: microwaveMealRecipe id: RecipeRicePudding @@ -731,11 +731,11 @@ result: FoodRicePudding time: 15 reagents: - Rice: 15 - Milk: 10 - Sugar: 5 + Rice: 15 + Milk: 10 + Sugar: 5 solids: - FoodBowlBig: 1 + FoodBowlBig: 1 - type: microwaveMealRecipe id: RecipeRicePork @@ -743,8 +743,8 @@ result: FoodRicePork time: 15 solids: - FoodRiceBoiled: 1 - FoodMeatCutlet: 3 + FoodRiceBoiled: 1 + FoodMeatCutlet: 3 - type: microwaveMealRecipe id: RecipeRiceGumbo @@ -752,9 +752,9 @@ result: FoodRiceGumbo time: 15 solids: - FoodRiceBoiled: 1 - FoodMeatCutlet: 3 - FoodChiliPepper: 2 + FoodRiceBoiled: 1 + FoodMeatCutlet: 3 + FoodChiliPepper: 2 - type: microwaveMealRecipe id: RecipeEggRice @@ -762,10 +762,10 @@ result: FoodRiceEgg time: 15 reagents: - Egg: 6 + Egg: 6 solids: - FoodRiceBoiled: 1 - FoodCarrot: 1 + FoodRiceBoiled: 1 + FoodCarrot: 1 - type: microwaveMealRecipe id: RecipeCopypasta @@ -773,7 +773,7 @@ result: FoodNoodlesCopy time: 10 solids: - FoodNoodles: 2 + FoodNoodles: 2 #Soups & Stew - type: microwaveMealRecipe @@ -782,12 +782,12 @@ result: FoodSoupBisque time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - FoodTomato: 1 - FoodMushroom: 1 - FoodMeatFish: 1 + FoodBowlBig: 1 + FoodTomato: 1 + FoodMushroom: 1 + FoodMeatFish: 1 - type: microwaveMealRecipe id: RecipeMeatballSoup @@ -795,12 +795,12 @@ result: FoodSoupMeatball time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - FoodMeatMeatball: 1 - FoodCarrot: 1 - FoodPotato: 1 + FoodBowlBig: 1 + FoodMeatMeatball: 1 + FoodCarrot: 1 + FoodPotato: 1 - type: microwaveMealRecipe id: RecipeNettleSoup @@ -808,12 +808,12 @@ result: FoodSoupNettle time: 10 reagents: - Water: 10 - Egg: 6 + Water: 10 + Egg: 6 solids: - FoodBowlBig: 1 - Nettle: 1 - FoodPotato: 1 + FoodBowlBig: 1 + Nettle: 1 + FoodPotato: 1 - type: microwaveMealRecipe id: RecipeEyeballSoup @@ -821,12 +821,12 @@ result: FoodSoupEyeball time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - OrganHumanEyes: 1 - FoodCarrot: 1 - FoodPotato: 1 + FoodBowlBig: 1 + OrganHumanEyes: 1 + FoodCarrot: 1 + FoodPotato: 1 - type: microwaveMealRecipe id: RecipeAmanitaJelly @@ -834,10 +834,10 @@ result: FoodJellyAmanita time: 10 reagents: - Water: 5 - Vodka: 5 + Water: 5 + Vodka: 5 solids: - FoodFlyAmanita: 3 + FoodFlyAmanita: 3 - type: microwaveMealRecipe id: RecipeOnionSoup @@ -845,11 +845,11 @@ result: FoodSoupOnion time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - FoodOnionSlice: 5 - FoodCheeseSlice: 1 + FoodBowlBig: 1 + FoodOnionSlice: 5 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeMushroomSoup @@ -857,11 +857,11 @@ result: FoodSoupMushroom time: 10 reagents: - Water: 5 - Milk: 5 + Water: 5 + Milk: 5 solids: - FoodBowlBig: 1 - FoodMushroom: 2 + FoodBowlBig: 1 + FoodMushroom: 2 - type: microwaveMealRecipe id: RecipeStewSoup @@ -869,15 +869,15 @@ result: FoodSoupStew time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - FoodMeatCutlet: 3 - FoodTomato: 1 - FoodPotato: 1 - FoodCarrot: 1 - FoodEggplant: 1 - FoodMushroom: 1 + FoodBowlBig: 1 + FoodMeatCutlet: 3 + FoodTomato: 1 + FoodPotato: 1 + FoodCarrot: 1 + FoodEggplant: 1 + FoodMushroom: 1 - type: microwaveMealRecipe id: RecipeTomatoSoup @@ -885,10 +885,10 @@ result: FoodSoupTomato time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - FoodTomato: 2 + FoodBowlBig: 1 + FoodTomato: 2 - type: microwaveMealRecipe id: RecipeTomatoBloodSoup @@ -896,10 +896,10 @@ result: FoodSoupTomatoBlood time: 10 reagents: - Blood: 10 + Blood: 10 solids: - FoodBowlBig: 1 - FoodBloodTomato: 2 + FoodBowlBig: 1 + FoodBloodTomato: 2 - type: microwaveMealRecipe id: RecipeWingFangChuSoup @@ -907,10 +907,10 @@ result: FoodSoupWingFangChu time: 10 reagents: - Soysauce: 5 + Soysauce: 5 solids: - FoodBowlBig: 1 - FoodMeatXenoCutlet: 2 + FoodBowlBig: 1 + FoodMeatXenoCutlet: 2 - type: microwaveMealRecipe id: RecipeWingFangChuSoupSpider @@ -918,10 +918,10 @@ result: FoodSoupWingFangChu time: 10 reagents: - Soysauce: 5 + Soysauce: 5 solids: - FoodBowlBig: 1 - FoodMeatSpider: 2 + FoodBowlBig: 1 + FoodMeatSpider: 2 - type: microwaveMealRecipe id: RecipeVegetableSoup @@ -929,13 +929,13 @@ result: FoodSoupVegetable time: 10 reagents: - Water: 5 + Water: 5 solids: - FoodBowlBig: 1 - FoodCorn: 1 - FoodCarrot: 1 - FoodPotato: 1 - FoodEggplant: 1 + FoodBowlBig: 1 + FoodCorn: 1 + FoodCarrot: 1 + FoodPotato: 1 + FoodEggplant: 1 - type: microwaveMealRecipe id: RecipeClownTearsSoup @@ -943,12 +943,12 @@ result: FoodSoupClown time: 10 reagents: - Water: 10 + Water: 10 solids: - FoodBowlBig: 1 - FoodBanana: 1 - ShardGlass: 1 - #idk probably replace shard with someting bananium when #14663 merged + FoodBowlBig: 1 + FoodBanana: 1 + ShardGlass: 1 + #idk probably replace shard with someting bananium when #14663 merged - type: microwaveMealRecipe id: RecipeMonkeysDelightSoup @@ -956,13 +956,13 @@ result: FoodSoupMonkey time: 10 reagents: - Flour: 5 - TableSalt: 1 - Blackpepper: 1 + Flour: 5 + TableSalt: 1 + Blackpepper: 1 solids: - FoodBowlBig: 1 - FoodBanana: 1 - MonkeyCube: 1 + FoodBowlBig: 1 + FoodBanana: 1 + MonkeyCube: 1 - type: microwaveMealRecipe id: RecipeBungoSoup @@ -970,11 +970,11 @@ result: FoodSoupBungo time: 10 reagents: - Water: 5 + Water: 5 solids: - FoodBowlBig: 1 - FoodBungo: 2 - FoodChiliPepper: 1 + FoodBowlBig: 1 + FoodBungo: 2 + FoodChiliPepper: 1 - type: microwaveMealRecipe id: RecipeBoiledSnail @@ -982,9 +982,9 @@ result: FoodMeatSnailCooked time: 5 reagents: - Water: 10 + Water: 10 solids: - FoodMeatSnail: 1 + FoodMeatSnail: 1 - type: microwaveMealRecipe id: RecipeEscargotSoup @@ -992,12 +992,12 @@ result: FoodSoupEscargot time: 10 reagents: - Water: 5 + Water: 5 solids: - FoodBowlBig: 1 - FoodOnionSlice: 1 - FoodButter: 1 - FoodMeatSnailCooked: 1 + FoodBowlBig: 1 + FoodOnionSlice: 1 + FoodButter: 1 + FoodMeatSnailCooked: 1 #Pies @@ -1007,9 +1007,9 @@ result: FoodPieAmanita time: 15 solids: - FoodDoughPie: 1 - FoodFlyAmanita: 1 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodFlyAmanita: 1 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeApplePie @@ -1017,9 +1017,9 @@ result: FoodPieApple time: 15 solids: - FoodDoughPie: 1 - FoodApple: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodApple: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeBaklava @@ -1027,9 +1027,9 @@ result: FoodPieBaklava time: 15 solids: - FoodDoughPie: 1 - FoodSnackPistachios: 1 #i'd rather use a botany crop but we don't have nuts yet - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodSnackPistachios: 1 #i'd rather use a botany crop but we don't have nuts yet + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeBananaCreamPie @@ -1037,9 +1037,9 @@ result: FoodPieBananaCream time: 15 solids: - FoodDoughPie: 1 - FoodBanana: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodBanana: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeBerryClafoutis @@ -1047,9 +1047,9 @@ result: FoodPieClafoutis time: 15 solids: - FoodDoughPie: 1 - FoodBerries: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodBerries: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeCherryPie @@ -1057,9 +1057,9 @@ result: FoodPieCherry time: 15 solids: - FoodDoughPie: 1 - FoodCherry: 5 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodCherry: 5 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeFrostyPie @@ -1067,9 +1067,9 @@ result: FoodPieFrosty time: 15 solids: - FoodDoughPie: 1 - FoodChillyPepper: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodChillyPepper: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeMeatPie @@ -1077,9 +1077,9 @@ result: FoodPieMeat time: 15 solids: - FoodDoughPie: 1 - FoodMeat: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodMeat: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipePumpkinPie @@ -1087,9 +1087,9 @@ result: FoodPiePumpkin time: 15 solids: - FoodDoughPie: 1 - FoodPumpkin: 1 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodPumpkin: 1 + FoodPlateTin: 1 #- type: microwaveMealRecipe # id: RecipePlumpPie @@ -1107,9 +1107,9 @@ result: FoodPieXeno time: 15 solids: - FoodDoughPie: 1 - FoodMeatXeno: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodMeatXeno: 3 + FoodPlateTin: 1 #Tarts @@ -1119,12 +1119,12 @@ result: FoodTartCoco time: 15 reagents: - Sugar: 5 - Milk: 5 + Sugar: 5 + Milk: 5 solids: - FoodDoughPie: 1 - FoodSnackChocolateBar: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodSnackChocolateBar: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeGappleTart @@ -1132,13 +1132,13 @@ result: FoodTartGapple time: 15 reagents: - Gold: 10 - Sugar: 5 - Milk: 5 + Gold: 10 + Sugar: 5 + Milk: 5 solids: - FoodDoughPie: 1 - FoodApple: 2 #in absence of the real gapple i'm substituting one apple with 10u gold (one ingot) - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodApple: 2 #in absence of the real gapple i'm substituting one apple with 10u gold (one ingot) + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeGrapeTart @@ -1146,12 +1146,12 @@ result: FoodTartGrape time: 15 reagents: - Sugar: 5 - Milk: 5 + Sugar: 5 + Milk: 5 solids: - FoodDoughPie: 1 - FoodGrape: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodGrape: 3 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeMimeTart @@ -1159,12 +1159,12 @@ result: FoodTartMime time: 15 reagents: - Sugar: 5 - Milk: 5 + Sugar: 5 + Milk: 5 solids: - FoodDoughPie: 1 - FoodMimana: 3 - FoodPlateTin: 1 + FoodDoughPie: 1 + FoodMimana: 3 + FoodPlateTin: 1 #Other @@ -1174,10 +1174,10 @@ result: FoodMealCubancarp time: 15 solids: - FoodDough: 1 - FoodCheeseSlice: 2 - FoodChiliPepper: 1 - FoodMeatFish: 2 + FoodDough: 1 + FoodCheeseSlice: 2 + FoodChiliPepper: 1 + FoodMeatFish: 2 - type: microwaveMealRecipe id: RecipeSashimi @@ -1185,9 +1185,9 @@ result: FoodMealSashimi time: 15 reagents: - TableSalt: 1 + TableSalt: 1 solids: - FoodMeatFish: 2 + FoodMeatFish: 2 - type: microwaveMealRecipe id: RecipeMisoColaSoup @@ -1195,9 +1195,9 @@ result: DisgustingSweptSoup time: 15 reagents: - Cola: 5 + Cola: 5 solids: - FoodSoupMiso: 1 + FoodSoupMiso: 1 - type: microwaveMealRecipe id: RecipeLoadedBakedPotato @@ -1205,8 +1205,8 @@ result: FoodMealPotatoLoaded time: 15 solids: - FoodPotato: 1 - FoodCheeseSlice: 1 + FoodPotato: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeFries @@ -1214,9 +1214,9 @@ result: FoodMealFries time: 15 reagents: - TableSalt: 5 + TableSalt: 5 solids: - FoodPotato: 1 + FoodPotato: 1 - type: microwaveMealRecipe id: RecipeCheesyFries @@ -1224,10 +1224,10 @@ result: FoodMealFriesCheesy time: 15 reagents: - TableSalt: 5 + TableSalt: 5 solids: - FoodPotato: 1 - FoodCheeseSlice: 1 + FoodPotato: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeCarrotFries @@ -1235,9 +1235,9 @@ result: FoodMealFriesCarrot time: 15 reagents: - TableSalt: 5 + TableSalt: 5 solids: - FoodCarrot: 1 + FoodCarrot: 1 - type: microwaveMealRecipe id: RecipePopcorn @@ -1245,7 +1245,7 @@ result: FoodSnackPopcorn time: 20 solids: - FoodCorn: 1 + FoodCorn: 1 - type: microwaveMealRecipe id: RecipePancake @@ -1253,9 +1253,9 @@ result: FoodBakedPancake time: 5 reagents: - Flour: 5 - Milk: 5 - Egg: 6 + Flour: 5 + Milk: 5 + Egg: 6 - type: microwaveMealRecipe id: RecipeBlueberryPancake @@ -1263,11 +1263,11 @@ result: FoodBakedPancakeBb time: 5 reagents: - Flour: 5 - Milk: 5 - Egg: 6 + Flour: 5 + Milk: 5 + Egg: 6 solids: - FoodBerries: 2 + FoodBerries: 2 - type: microwaveMealRecipe id: RecipeWaffles @@ -1275,10 +1275,10 @@ result: FoodBakedWaffle time: 10 reagents: - Flour: 5 - Milk: 5 - Egg: 6 - SodaWater: 5 + Flour: 5 + Milk: 5 + Egg: 6 + SodaWater: 5 - type: microwaveMealRecipe id: RecipeWaffleSoy @@ -1286,10 +1286,10 @@ result: FoodBakedWaffleSoy time: 10 reagents: - Flour: 5 - MilkSoy: 5 - Egg: 6 - SodaWater: 5 + Flour: 5 + MilkSoy: 5 + Egg: 6 + SodaWater: 5 - type: microwaveMealRecipe id: RecipeCookie @@ -1297,11 +1297,11 @@ result: FoodBakedCookie time: 5 reagents: - Flour: 5 - Sugar: 5 + Flour: 5 + Sugar: 5 solids: - FoodButterSlice: 1 - FoodSnackChocolateBar: 1 + FoodButterSlice: 1 + FoodSnackChocolateBar: 1 - type: microwaveMealRecipe id: RecipeSugarCookie @@ -1309,10 +1309,10 @@ result: FoodBakedCookieSugar time: 5 reagents: - Flour: 5 - Sugar: 10 + Flour: 5 + Sugar: 10 solids: - FoodButterSlice: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeRaisinCookie @@ -1320,10 +1320,10 @@ result: FoodBakedCookieRaisin time: 5 reagents: - Flour: 5 - Sugar: 5 + Flour: 5 + Sugar: 5 solids: - FoodSnackRaisins: 1 + FoodSnackRaisins: 1 - type: microwaveMealRecipe id: RecipeCookieOatmeal @@ -1331,10 +1331,10 @@ result: FoodBakedCookieOatmeal time: 5 reagents: - Oats: 5 - Sugar: 5 + Oats: 5 + Sugar: 5 solids: - FoodButterSlice: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeChocolateChipPancake @@ -1342,11 +1342,11 @@ result: FoodBakedPancakeCc time: 5 reagents: - Flour: 5 - Milk: 5 - Egg: 6 + Flour: 5 + Milk: 5 + Egg: 6 solids: - FoodSnackChocolateBar: 1 + FoodSnackChocolateBar: 1 - type: microwaveMealRecipe id: RecipeAppleCake @@ -1354,8 +1354,8 @@ result: FoodCakeApple time: 5 solids: - FoodCakePlain: 1 - FoodApple: 3 + FoodCakePlain: 1 + FoodApple: 3 - type: microwaveMealRecipe id: RecipeCarrotCake @@ -1363,8 +1363,8 @@ result: FoodCakeCarrot time: 5 solids: - FoodCakePlain: 1 - FoodCarrot: 3 + FoodCakePlain: 1 + FoodCarrot: 3 - type: microwaveMealRecipe id: RecipeLemonCake @@ -1372,8 +1372,8 @@ result: FoodCakeLemon time: 5 solids: - FoodCakePlain: 1 - FoodLemon: 3 + FoodCakePlain: 1 + FoodLemon: 3 - type: microwaveMealRecipe id: RecipeLemoonCake @@ -1381,9 +1381,9 @@ result: FoodCakeLemoon time: 5 solids: - FoodCakePlain: 1 - FoodLemoon: 2 - FoodBerries: 1 #dark colouring + FoodCakePlain: 1 + FoodLemoon: 2 + FoodBerries: 1 #dark colouring - type: microwaveMealRecipe id: RecipeOrangeCake @@ -1391,8 +1391,8 @@ result: FoodCakeOrange time: 5 solids: - FoodCakePlain: 1 - FoodOrange: 3 + FoodCakePlain: 1 + FoodOrange: 3 - type: microwaveMealRecipe id: RecipeBlueberryCake @@ -1400,8 +1400,8 @@ result: FoodCakeBlueberry time: 5 solids: - FoodCakePlain: 1 - FoodBerries: 3 + FoodCakePlain: 1 + FoodBerries: 3 - type: microwaveMealRecipe id: RecipeLimeCake @@ -1409,8 +1409,8 @@ result: FoodCakeLime time: 5 solids: - FoodCakePlain: 1 - FoodLime: 3 + FoodCakePlain: 1 + FoodLime: 3 - type: microwaveMealRecipe id: RecipeCheeseCake @@ -1418,10 +1418,10 @@ result: FoodCakeCheese time: 5 reagents: - Cream: 10 + Cream: 10 solids: - FoodCakePlain: 1 - FoodCheeseSlice: 3 + FoodCakePlain: 1 + FoodCheeseSlice: 3 - type: microwaveMealRecipe id: RecipePumpkinCake @@ -1429,8 +1429,8 @@ result: FoodCakePumpkin time: 5 solids: - FoodCakePlain: 1 - FoodPumpkin: 1 + FoodCakePlain: 1 + FoodPumpkin: 1 - type: microwaveMealRecipe id: RecipeClownCake @@ -1438,8 +1438,8 @@ result: FoodCakeClown time: 5 solids: - ClothingMaskClown: 1 - FoodCakePlain: 1 + ClothingMaskClown: 1 + FoodCakePlain: 1 - type: microwaveMealRecipe id: RecipeCake @@ -1447,7 +1447,7 @@ result: FoodCakePlain time: 15 solids: - FoodCakeBatter: 1 + FoodCakeBatter: 1 - type: microwaveMealRecipe id: RecipeBirthdayCake @@ -1455,9 +1455,9 @@ result: FoodCakeBirthday time: 5 reagents: - Cream: 5 + Cream: 5 solids: - FoodCakePlain: 1 + FoodCakePlain: 1 - type: microwaveMealRecipe id: RecipeChocolateCake @@ -1465,8 +1465,8 @@ result: FoodCakeChocolate time: 5 solids: - FoodCakePlain: 1 - FoodSnackChocolateBar: 2 + FoodCakePlain: 1 + FoodSnackChocolateBar: 2 - type: microwaveMealRecipe id: RecipeBrainCake @@ -1474,8 +1474,8 @@ result: FoodCakeBrain time: 15 solids: - FoodCakePlain: 1 - OrganHumanBrain: 1 + FoodCakePlain: 1 + OrganHumanBrain: 1 - type: microwaveMealRecipe id: RecipeSlimeCake @@ -1483,9 +1483,9 @@ result: FoodCakeSlime time: 5 reagents: - Slime: 15 + Slime: 15 solids: - FoodCakePlain: 1 + FoodCakePlain: 1 - type: microwaveMealRecipe id: RecipeCatCake @@ -1493,12 +1493,12 @@ result: MobCatCake time: 15 reagents: - Milk: 15 - Cognizine: 5 + Milk: 15 + Cognizine: 5 solids: - FoodCakePlain: 1 - FoodSnackRaisins: 1 - OrganAnimalHeart: 1 + FoodCakePlain: 1 + FoodSnackRaisins: 1 + OrganAnimalHeart: 1 - type: microwaveMealRecipe id: RecipeBreadDog @@ -1506,11 +1506,11 @@ result: MobBreadDog time: 15 reagents: - Cognizine: 5 + Cognizine: 5 solids: - FoodBreadSausage: 1 - OrganAnimalHeart: 1 - FoodSpaceshroomCooked: 1 + FoodBreadSausage: 1 + OrganAnimalHeart: 1 + FoodSpaceshroomCooked: 1 - type: microwaveMealRecipe id: RecipeDumplings @@ -1518,10 +1518,10 @@ result: FoodBakedDumplings time: 15 reagents: - Water: 10 - UncookedAnimalProteins: 6 + Water: 10 + UncookedAnimalProteins: 6 solids: - FoodDoughSlice: 3 + FoodDoughSlice: 3 - type: microwaveMealRecipe id: RecipeBrownies @@ -1529,12 +1529,12 @@ result: FoodBakedBrownieBatch time: 25 reagents: - Flour: 15 - Sugar: 30 - Egg: 18 + Flour: 15 + Sugar: 30 + Egg: 18 solids: - FoodButter: 2 - FoodSnackChocolateBar: 2 + FoodButter: 2 + FoodSnackChocolateBar: 2 #Donks i guess - type: microwaveMealRecipe @@ -1543,7 +1543,7 @@ result: FoodDonkpocketWarm time: 5 solids: - FoodDonkpocket: 1 + FoodDonkpocket: 1 - type: microwaveMealRecipe id: RecipeWarmDankpocket @@ -1551,7 +1551,7 @@ result: FoodDonkpocketDankWarm time: 5 solids: - FoodDonkpocketDank: 1 + FoodDonkpocketDank: 1 - type: microwaveMealRecipe id: RecipeWarmDonkpocketSpicy @@ -1559,7 +1559,7 @@ result: FoodDonkpocketSpicyWarm time: 5 solids: - FoodDonkpocketSpicy: 1 + FoodDonkpocketSpicy: 1 - type: microwaveMealRecipe id: RecipeWarmDonkpocketTeriyaki @@ -1567,7 +1567,7 @@ result: FoodDonkpocketTeriyakiWarm time: 5 solids: - FoodDonkpocketTeriyaki: 1 + FoodDonkpocketTeriyaki: 1 - type: microwaveMealRecipe id: RecipeWarmDonkpocketPizza @@ -1575,7 +1575,7 @@ result: FoodDonkpocketPizzaWarm time: 5 solids: - FoodDonkpocketPizza: 1 + FoodDonkpocketPizza: 1 - type: microwaveMealRecipe id: RecipeDonkpocketHonk @@ -1583,7 +1583,7 @@ result: FoodDonkpocketHonkWarm time: 5 solids: - FoodDonkpocketHonk: 1 + FoodDonkpocketHonk: 1 - type: microwaveMealRecipe id: RecipeDonkpocketBerry @@ -1591,7 +1591,7 @@ result: FoodDonkpocketBerryWarm time: 5 solids: - FoodDonkpocketBerry: 1 + FoodDonkpocketBerry: 1 - type: microwaveMealRecipe id: RecipeDonkpocketStonk @@ -1599,7 +1599,7 @@ result: FoodDonkpocketStonkWarm time: 5 solids: - FoodDonkpocketStonk: 1 + FoodDonkpocketStonk: 1 - type: microwaveMealRecipe id: RecipeDonkpocketCarp @@ -1607,7 +1607,7 @@ result: FoodDonkpocketCarpWarm time: 5 solids: - FoodDonkpocketCarp: 1 + FoodDonkpocketCarp: 1 - type: microwaveMealRecipe id: RecipeHotChili @@ -1615,11 +1615,11 @@ result: FoodSoupChiliHot time: 20 solids: - FoodBowlBig: 1 - FoodChiliPepper: 1 - FoodMeatCutlet: 1 - FoodOnionSlice: 1 - FoodTomato: 1 + FoodBowlBig: 1 + FoodChiliPepper: 1 + FoodMeatCutlet: 1 + FoodOnionSlice: 1 + FoodTomato: 1 - type: microwaveMealRecipe id: RecipeColdChili @@ -1627,9 +1627,9 @@ result: FoodSoupChiliCold time: 5 reagents: - Nitrogen: 5 + Nitrogen: 5 solids: - FoodSoupChiliHot: 1 + FoodSoupChiliHot: 1 - type: microwaveMealRecipe id: RecipeClownTears @@ -1637,10 +1637,10 @@ result: FoodSoupClown time: 15 solids: - FoodBowlBig: 1 - FoodOnionSlice: 1 - FoodTomato: 1 - BikeHorn: 1 + FoodBowlBig: 1 + FoodOnionSlice: 1 + FoodTomato: 1 + BikeHorn: 1 - type: microwaveMealRecipe id: RecipeChiliClown @@ -1648,12 +1648,12 @@ result: FoodSoupChiliClown time: 30 solids: - FoodBowlBig: 1 - FoodChiliPepper: 1 - FoodMeatCutlet: 1 - FoodOnionSlice: 1 - FoodTomato: 1 - ClothingShoesClown: 1 + FoodBowlBig: 1 + FoodChiliPepper: 1 + FoodMeatCutlet: 1 + FoodOnionSlice: 1 + FoodTomato: 1 + ClothingShoesClown: 1 - type: microwaveMealRecipe id: RecipeQueso @@ -1664,8 +1664,8 @@ #reagents: #blackpepper: 5 solids: - FoodChiliPepper: 1 - FoodCheeseSlice: 2 + FoodChiliPepper: 1 + FoodCheeseSlice: 2 - type: microwaveMealRecipe id: RecipeRibs @@ -1673,10 +1673,10 @@ result: FoodMealRibs time: 15 reagents: - BbqSauce: 5 + BbqSauce: 5 solids: - FoodMeat: 2 - FoodKebabSkewer: 1 + FoodMeat: 2 + FoodKebabSkewer: 1 - type: microwaveMealRecipe id: RecipeEnchiladas @@ -1684,9 +1684,9 @@ result: FoodMealEnchiladas time: 20 solids: - FoodChiliPepper: 2 - FoodMeatCutlet: 1 - FoodCorn: 1 + FoodChiliPepper: 2 + FoodMeatCutlet: 1 + FoodCorn: 1 # SALADS: These should be moved out of the microwave as soon as possible - type: microwaveMealRecipe @@ -1695,9 +1695,9 @@ result: FoodSaladHerb time: 5 solids: - FoodBowlBig: 1 - FoodAmbrosiaVulgaris: 3 - FoodApple: 1 + FoodBowlBig: 1 + FoodAmbrosiaVulgaris: 3 + FoodApple: 1 - type: microwaveMealRecipe id: RecipeValidSalad @@ -1705,10 +1705,10 @@ result: FoodSaladValid time: 5 solids: - FoodBowlBig: 1 - FoodAmbrosiaVulgaris: 3 - FoodPotato: 1 - FoodMeatMeatball: 1 + FoodBowlBig: 1 + FoodAmbrosiaVulgaris: 3 + FoodPotato: 1 + FoodMeatMeatball: 1 - type: microwaveMealRecipe id: RecipeColeslaw @@ -1716,11 +1716,11 @@ result: FoodSaladColeslaw time: 5 reagents: - Vinaigrette: 5 + Vinaigrette: 5 solids: - FoodBowlBig: 1 - FoodOnionRed: 1 - FoodCabbage: 1 + FoodBowlBig: 1 + FoodOnionRed: 1 + FoodCabbage: 1 - type: microwaveMealRecipe id: RecipeCaesarSalad @@ -1728,13 +1728,13 @@ result: FoodSaladCaesar time: 5 reagents: - OilOlive: 5 + OilOlive: 5 solids: - FoodBowlBig: 1 - FoodOnionRedSlice: 1 - FoodBreadPlainSlice: 1 - FoodCheeseSlice: 1 - FoodCabbage: 1 + FoodBowlBig: 1 + FoodOnionRedSlice: 1 + FoodBreadPlainSlice: 1 + FoodCheeseSlice: 1 + FoodCabbage: 1 - type: microwaveMealRecipe id: RecipeCitrusSalad @@ -1742,10 +1742,10 @@ result: FoodSaladCitrus time: 5 solids: - FoodBowlBig: 1 - FoodOrange: 1 - FoodLemon: 1 - FoodLime: 1 + FoodBowlBig: 1 + FoodOrange: 1 + FoodLemon: 1 + FoodLime: 1 - type: microwaveMealRecipe id: RecipeKimchiSalad @@ -1753,12 +1753,12 @@ result: FoodSaladKimchi time: 5 reagents: - Vinegar: 5 + Vinegar: 5 solids: - FoodBowlBig: 1 - FoodCarrot: 1 - FoodCabbage: 1 - FoodGarlic: 1 + FoodBowlBig: 1 + FoodCarrot: 1 + FoodCabbage: 1 + FoodGarlic: 1 - type: microwaveMealRecipe id: RecipeFruitSalad @@ -1766,11 +1766,11 @@ result: FoodSaladFruit time: 5 solids: - FoodBowlBig: 1 - FoodOrange: 1 - FoodApple: 1 - FoodGrape: 1 - FoodWatermelonSlice: 2 + FoodBowlBig: 1 + FoodOrange: 1 + FoodApple: 1 + FoodGrape: 1 + FoodWatermelonSlice: 2 - type: microwaveMealRecipe id: RecipeJungleSalad @@ -1778,11 +1778,11 @@ result: FoodSaladJungle time: 5 solids: - FoodBowlBig: 1 - FoodBanana: 1 - FoodApple: 1 - FoodGrape: 1 - FoodWatermelonSlice: 2 + FoodBowlBig: 1 + FoodBanana: 1 + FoodApple: 1 + FoodGrape: 1 + FoodWatermelonSlice: 2 - type: microwaveMealRecipe id: RecipeWatermelonFruitBowlSalad @@ -1790,12 +1790,12 @@ result: FoodSaladWatermelonFruitBowl time: 5 solids: - FoodWatermelon: 1 - FoodApple: 1 - FoodBanana: 1 - FoodLemon: 1 - FoodOrange: 1 - FoodAmbrosiaVulgaris: 1 + FoodWatermelon: 1 + FoodApple: 1 + FoodBanana: 1 + FoodLemon: 1 + FoodOrange: 1 + FoodAmbrosiaVulgaris: 1 # Muffins @@ -1805,10 +1805,10 @@ result: FoodBakedMuffin time: 15 solids: - FoodPlateMuffinTin: 1 - FoodDoughSlice: 1 + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 reagents: - Sugar: 10 + Sugar: 10 - type: microwaveMealRecipe id: RecipeMuffinChocolate @@ -1816,11 +1816,11 @@ result: FoodBakedMuffinChocolate time: 15 solids: - FoodPlateMuffinTin: 1 - FoodDoughSlice: 1 - FoodSnackChocolateBar: 1 + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + FoodSnackChocolateBar: 1 reagents: - Sugar: 10 + Sugar: 10 - type: microwaveMealRecipe id: RecipeMuffinBerry @@ -1828,11 +1828,11 @@ result: FoodBakedMuffinBerry time: 15 solids: - FoodPlateMuffinTin: 1 - FoodDoughSlice: 1 - FoodBerries: 1 + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + FoodBerries: 1 reagents: - Sugar: 10 + Sugar: 10 - type: microwaveMealRecipe id: RecipeMuffinBanana @@ -1840,11 +1840,11 @@ result: FoodBakedMuffinBanana time: 15 solids: - FoodPlateMuffinTin: 1 - FoodDoughSlice: 1 - FoodBanana: 1 + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + FoodBanana: 1 reagents: - Sugar: 10 + Sugar: 10 - type: microwaveMealRecipe id: RecipeMuffinCherry @@ -1852,11 +1852,11 @@ result: FoodBakedMuffinCherry time: 15 solids: - FoodPlateMuffinTin: 1 - FoodDoughSlice: 1 - FoodCherry: 3 + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + FoodCherry: 3 reagents: - Sugar: 10 + Sugar: 10 # NOT ACTUAL FOOD @@ -1866,7 +1866,7 @@ result: LeavesTeaDried time: 10 solids: - LeavesTea: 1 + LeavesTea: 1 - type: microwaveMealRecipe id: RecipeDriedTobacco @@ -1874,7 +1874,7 @@ result: LeavesTobaccoDried time: 10 solids: - LeavesTobacco: 1 + LeavesTobacco: 1 - type: microwaveMealRecipe id: RecipeDriedCannabis @@ -1882,7 +1882,7 @@ result: LeavesCannabisDried time: 10 solids: - LeavesCannabis: 1 + LeavesCannabis: 1 - type: microwaveMealRecipe id: RecipeDriedCannabisRainbow @@ -1890,7 +1890,7 @@ result: LeavesCannabisRainbowDried time: 10 solids: - LeavesCannabisRainbow: 1 + LeavesCannabisRainbow: 1 - type: microwaveMealRecipe id: RecipeTrashBakedBananaPeel @@ -1898,7 +1898,7 @@ result: TrashBakedBananaPeel time: 5 solids: - TrashBananaPeel: 1 + TrashBananaPeel: 1 # Suppermatter - type: microwaveMealRecipe @@ -1907,11 +1907,11 @@ result: FoodCakeSuppermatter time: 30 solids: - FoodCakeBatter: 2 + FoodCakeBatter: 2 reagents: - Sugar: 30 - Nitrogen: 10 - Plasma: 10 + Sugar: 30 + Nitrogen: 10 + Plasma: 10 - type: microwaveMealRecipe id: RecipeFoodBakedChevreChaud @@ -1919,8 +1919,8 @@ result: FoodBakedChevreChaud time: 5 solids: - FoodChevreSlice: 1 - FoodBreadBaguetteSlice: 1 + FoodChevreSlice: 1 + FoodBreadBaguetteSlice: 1 - type: microwaveMealRecipe id: RecipeCookedSpaceshroom @@ -1928,7 +1928,7 @@ result: FoodSpaceshroomCooked time: 5 solids: - FoodSpaceshroom: 1 + FoodSpaceshroom: 1 - type: microwaveMealRecipe id: RecipeCannabisButter @@ -1936,8 +1936,8 @@ result: FoodCannabisButter time: 15 solids: - FoodButter: 1 - LeavesCannabis: 6 + FoodButter: 1 + LeavesCannabis: 6 - type: microwaveMealRecipe id: RecipeCannabisBrownies @@ -1945,12 +1945,12 @@ result: FoodBakedCannabisBrownieBatch time: 25 reagents: - Flour: 15 - Sugar: 30 - Egg: 18 + Flour: 15 + Sugar: 30 + Egg: 18 solids: - FoodCannabisButter: 2 - FoodSnackChocolateBar: 2 + FoodCannabisButter: 2 + FoodSnackChocolateBar: 2 - type: microwaveMealRecipe id: RecipeCornInButter @@ -1958,9 +1958,9 @@ result: FoodMealCornInButter time: 10 solids: - FoodCorn: 1 - FoodPlate: 1 - FoodButter: 1 + FoodCorn: 1 + FoodPlate: 1 + FoodButter: 1 - type: microwaveMealRecipe id: RecipePeaSoup @@ -1968,10 +1968,10 @@ result: FoodSoupPea time: 10 solids: - FoodPeaPod: 2 - FoodBowlBig: 1 + FoodPeaPod: 2 + FoodBowlBig: 1 reagents: - Water: 10 + Water: 10 - type: microwaveMealRecipe id: RecipeTacoShell @@ -1979,7 +1979,7 @@ result: FoodTacoShell time: 5 solids: - FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe + FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe - type: microwaveMealRecipe id: RecipeTacoBeef @@ -1987,9 +1987,9 @@ result: FoodTacoBeef time: 10 solids: - FoodTacoShell: 1 - FoodMeatCutlet: 1 - FoodCheeseSlice: 1 + FoodTacoShell: 1 + FoodMeatCutlet: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeTacoChicken @@ -1997,9 +1997,9 @@ result: FoodTacoChicken time: 10 solids: - FoodTacoShell: 1 - FoodMeatChickenCutlet: 1 - FoodCheeseSlice: 1 + FoodTacoShell: 1 + FoodMeatChickenCutlet: 1 + FoodCheeseSlice: 1 - type: microwaveMealRecipe id: RecipeTacoFish @@ -2007,11 +2007,11 @@ result: FoodTacoFish time: 10 solids: - FoodTacoShell: 1 - FoodMeatFish: 1 - FoodOnionSlice: 2 - FoodTomato: 1 - FoodCabbage: 1 + FoodTacoShell: 1 + FoodMeatFish: 1 + FoodOnionSlice: 2 + FoodTomato: 1 + FoodCabbage: 1 - type: microwaveMealRecipe id: RecipeTacoRat @@ -2019,9 +2019,9 @@ result: FoodTacoRat time: 10 solids: - FoodTacoShell: 1 - FoodCheeseSlice: 1 - FoodMeatRat: 1 + FoodTacoShell: 1 + FoodCheeseSlice: 1 + FoodMeatRat: 1 - type: microwaveMealRecipe id: RecipeTacoBeefSupreme @@ -2029,12 +2029,12 @@ result: FoodTacoBeefSupreme time: 10 solids: - FoodTacoShell: 1 - FoodCheeseSlice: 1 - FoodMeatCutlet: 1 - FoodTomato: 1 - FoodCabbage: 1 - FoodOnionSlice: 2 + FoodTacoShell: 1 + FoodCheeseSlice: 1 + FoodMeatCutlet: 1 + FoodTomato: 1 + FoodCabbage: 1 + FoodOnionSlice: 2 - type: microwaveMealRecipe id: RecipeTacoChickenSupreme @@ -2042,12 +2042,12 @@ result: FoodTacoChickenSupreme time: 10 solids: - FoodTacoShell: 1 - FoodCheeseSlice: 1 - FoodMeatChickenCutlet: 1 - FoodTomato: 1 - FoodCabbage: 1 - FoodOnionSlice: 2 + FoodTacoShell: 1 + FoodCheeseSlice: 1 + FoodMeatChickenCutlet: 1 + FoodTomato: 1 + FoodCabbage: 1 + FoodOnionSlice: 2 - type: microwaveMealRecipe id: RecipeCroissant @@ -2055,8 +2055,8 @@ result: FoodBakedCroissant time: 5 solids: - FoodCroissantRaw: 1 - FoodButterSlice: 1 + FoodCroissantRaw: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeThrowingCroissant @@ -2065,6 +2065,6 @@ secretRecipe: true time: 5 solids: - FoodCroissantRaw: 1 - FoodButterSlice: 1 - ShardGlass: 1 + FoodCroissantRaw: 1 + FoodButterSlice: 1 + ShardGlass: 1 From 896cb6f1142b15791259fac0e5458f75601a50e9 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:05:11 +0000 Subject: [PATCH 13/37] some codestyle fixes --- .../consumable/food/shaverma-unbaked.ftl | 0 .../objects/consumable/food/shaverma.ftl | 5 +++ .../consumable/food/baked/shaverma-baked.ftl | 2 - .../consumable/food/shaverma-unbaked.ftl | 2 - .../Consumable/Food/Baked/shaverma-baked.yml | 20 --------- .../Consumable/Food/shaverma-unbaked.yml | 22 ---------- .../Recipes/Cooking/meal_recipes.yml | 19 -------- .../Objects/Consumable/Food/shaverma.yml | 41 ++++++++++++++++++ .../Recipes/Cooking/meal_recipes.yml | 19 ++++++++ .../Consumable/Food/shavuha.rsi/baked.png | Bin .../Consumable/Food/shavuha.rsi/meta.json | 0 .../Consumable/Food/shavuha.rsi/unbaked.png | Bin 12 files changed, 65 insertions(+), 65 deletions(-) create mode 100644 Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma-unbaked.ftl create mode 100644 Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/shaverma-baked.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/shaverma-unbaked.ftl delete mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml rename Resources/Textures/{ => _CorvaxNext}/Objects/Consumable/Food/shavuha.rsi/baked.png (100%) rename Resources/Textures/{ => _CorvaxNext}/Objects/Consumable/Food/shavuha.rsi/meta.json (100%) rename Resources/Textures/{ => _CorvaxNext}/Objects/Consumable/Food/shavuha.rsi/unbaked.png (100%) diff --git a/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma-unbaked.ftl b/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma-unbaked.ftl new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl b/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl new file mode 100644 index 00000000000..827f475e577 --- /dev/null +++ b/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl @@ -0,0 +1,5 @@ +ent-FoodShavermaUnbaked = Заготовка шавермы + .desc = Пища богов, осталось только подогреть. + +ent-FoodShavermaBaked = Шаверма + .desc = Пища богов. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/shaverma-baked.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/shaverma-baked.ftl deleted file mode 100644 index 00a9c0331a8..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/shaverma-baked.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-Shaverma-unbaked = Заготовка шавермы - .desc = Пища богов, осталось только подогреть. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/shaverma-unbaked.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/shaverma-unbaked.ftl deleted file mode 100644 index 0b2979b4363..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/shaverma-unbaked.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-Shaverma-baked = Шаверма - .desc = Пища богов. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml deleted file mode 100644 index b440fdd1d75..00000000000 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml +++ /dev/null @@ -1,20 +0,0 @@ -- type: entity - parent: FoodMealBase - id: Shaverma-baked - components: - - type: Item - storedRotation: -90 - - type: Food - transferAmount: 3 - - type: Sprite - sprite: Objects/Consumable/Food/shavuha.rsi - layers: - - state: baked - - type: SolutionContainerManager - solutions: - food: - canReact: false # Dont want cause reactions inside tacos after merging ingredients - maxVol: 10 - reagents: - - ReagentId: Nutriment - Quantity: 7.4 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml deleted file mode 100644 index 0f418fa43a0..00000000000 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml +++ /dev/null @@ -1,22 +0,0 @@ -# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml - -- type: entity - parent: FoodMealBase - id: Shaverma-unbaked - components: - - type: Item - storedRotation: -90 - - type: Food - transferAmount: 3 - - type: Sprite - sprite: Objects/Consumable/Food/shavuha.rsi - layers: - - state: unbaked - - type: SolutionContainerManager - solutions: - food: - canReact: false # Dont want cause reactions inside tacos after merging ingredients - maxVol: 10 - reagents: - - ReagentId: Nutriment - Quantity: 4.5 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 66d8c93be61..37aca34fa43 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -6,25 +6,6 @@ solids: FoodDoughSlice: 1 # one third of a standard bread dough recipe -# Corvax-Next-Shaverma-Start -- type: microwaveMealRecipe - id: RecipeShaverma-unbaked - name: The best food ever - result: Shaverma-unbaked - time: 1 - solids: - FoodMeat: 2 - FoodDough: 1 - FoodTomato: 1 - -- type: microwaveMealRecipe - id: RecipeShaverma-baked - name: The best food ever - result: Shaverma-baked - time: 15 - solids: - Shaverma-unbaked: 1 -# Corvax-Next-Shaverma-End #Bagels - type: microwaveMealRecipe id: RecipeBagel diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml new file mode 100644 index 00000000000..aef44b81d83 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml @@ -0,0 +1,41 @@ +- type: entity + parent: FoodMealBase + id: FoodShavermaBaked + components: + - type: Item + storedRotation: -90 + - type: Food + transferAmount: 3 + - type: Sprite + sprite: _CorvaxNext/Objects/Consumable/Food/shavuha.rsi + layers: + - state: baked + - type: SolutionContainerManager + solutions: + food: + canReact: false # Dont want cause reactions inside tacos after merging ingredients + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 7.4 + +- type: entity + parent: FoodMealBase + id: FoodShavermaUnbaked + components: + - type: Item + storedRotation: -90 + - type: Food + transferAmount: 3 + - type: Sprite + sprite: Objects/Consumable/Food/shavuha.rsi + layers: + - state: unbaked + - type: SolutionContainerManager + solutions: + food: + canReact: false # Dont want cause reactions inside tacos after merging ingredients + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 4.5 diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml new file mode 100644 index 00000000000..8688c60de52 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml @@ -0,0 +1,19 @@ +# Corvax-Next-Shaverma-Start +- type: microwaveMealRecipe + id: RecipeShaverma-unbaked + name: The best food ever + result: Shaverma-unbaked + time: 1 + solids: + FoodMeat: 2 + FoodDough: 1 + FoodTomato: 1 + +- type: microwaveMealRecipe + id: RecipeShaverma-baked + name: The best food ever + result: Shaverma-baked + time: 15 + solids: + Shaverma-unbaked: 1 +# Corvax-Next-Shaverma-End \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/baked.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/baked.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/shavuha.rsi/baked.png rename to Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/baked.png diff --git a/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/shavuha.rsi/meta.json rename to Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json diff --git a/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/unbaked.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/unbaked.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/shavuha.rsi/unbaked.png rename to Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/unbaked.png From 69d9b42ded484ea3ee97618c0a5554405d337d82 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:05:11 +0000 Subject: [PATCH 14/37] some codestyle fixes --- .../_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml index aef44b81d83..85fe3a45c91 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml @@ -28,7 +28,7 @@ - type: Food transferAmount: 3 - type: Sprite - sprite: Objects/Consumable/Food/shavuha.rsi + sprite: _CorvaxNext/Objects/Consumable/Food/shavuha.rsi layers: - state: unbaked - type: SolutionContainerManager From cb1c8d29eb0890a16b4f19d24fb4b775df34184e Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 21:49:47 +0300 Subject: [PATCH 15/37] Discard changes to Resources/Prototypes/Recipes/Cooking/meal_recipes.yml --- Resources/Prototypes/Recipes/Cooking/meal_recipes.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 37aca34fa43..173cf9e9dbd 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1590,6 +1590,7 @@ solids: FoodDonkpocketCarp: 1 + - type: microwaveMealRecipe id: RecipeHotChili name: hot chili recipe @@ -1643,7 +1644,7 @@ time: 15 #todo Add blackpepper #reagents: - #blackpepper: 5 + #blackpepper: 5 solids: FoodChiliPepper: 1 FoodCheeseSlice: 2 From 415e25b37cc8ad0a5dff5cec8624c10d82a10cd2 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:05:11 +0000 Subject: [PATCH 16/37] some codestyle fixes --- .../Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml index 8688c60de52..60ee37b5dde 100644 --- a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml @@ -1,6 +1,6 @@ # Corvax-Next-Shaverma-Start - type: microwaveMealRecipe - id: RecipeShaverma-unbaked + id: RecipeFoodShavermaUnbaked name: The best food ever result: Shaverma-unbaked time: 1 @@ -10,7 +10,7 @@ FoodTomato: 1 - type: microwaveMealRecipe - id: RecipeShaverma-baked + id: RecipeFoodShavermaBaked name: The best food ever result: Shaverma-baked time: 15 From f670348aaa44f3236df0bc42f5023e2b1c6fba87 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 21:53:37 +0300 Subject: [PATCH 17/37] Delete Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma-unbaked.ftl --- .../entities/objects/consumable/food/shaverma-unbaked.ftl | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma-unbaked.ftl diff --git a/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma-unbaked.ftl b/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma-unbaked.ftl deleted file mode 100644 index e69de29bb2d..00000000000 From a276d77fecf66ee43c6a8716cc434aea4a381cd5 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 22:04:26 +0300 Subject: [PATCH 18/37] Fix meta.json --- .../_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json index 75e7a5f4340..fe25667d684 100644 --- a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json +++ b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json @@ -3,8 +3,8 @@ "license": "No license/unknown license", "copyright": "By sspetishes", "size": { - "x": 32, - "y": 32 + "x": 512, + "y": 512 }, "states": [ { From 7a1cf2e212085dcd129246da4853494b3236a4ab Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 22:14:15 +0300 Subject: [PATCH 19/37] Update Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> --- .../_corvaxnext/entities/objects/consumable/food/shaverma.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl b/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl index 827f475e577..5e0a0574939 100644 --- a/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl +++ b/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl @@ -1,5 +1,5 @@ ent-FoodShavermaUnbaked = Заготовка шавермы .desc = Пища богов, осталось только подогреть. -ent-FoodShavermaBaked = Шаверма +ent-FoodShavermaBaked = шаверма .desc = Пища богов. \ No newline at end of file From 268452aafb141e3e3d3703be5456892b5f656566 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 22:14:26 +0300 Subject: [PATCH 20/37] Update Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> --- .../_corvaxnext/entities/objects/consumable/food/shaverma.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl b/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl index 5e0a0574939..08da94ce513 100644 --- a/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl +++ b/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl @@ -1,4 +1,4 @@ -ent-FoodShavermaUnbaked = Заготовка шавермы +ent-FoodShavermaUnbaked = заготовка шавермы .desc = Пища богов, осталось только подогреть. ent-FoodShavermaBaked = шаверма From 744a9a9f8f68541f781074f7a6c2d0078198294c Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 22:14:34 +0300 Subject: [PATCH 21/37] Update Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> --- .../_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json index fe25667d684..2c961d47226 100644 --- a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json +++ b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "No license/unknown license", - "copyright": "By sspetishes", + "copyright": "Created by sspetishes.", "size": { "x": 512, "y": 512 From e4851f74e8e2bd9f80f5dd214e5d0ba2e47d85a8 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:05:11 +0000 Subject: [PATCH 22/37] fixed Recipes --- .../_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml | 4 ++-- .../Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml index 85fe3a45c91..9ce9eb8140e 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml @@ -13,7 +13,7 @@ - type: SolutionContainerManager solutions: food: - canReact: false # Dont want cause reactions inside tacos after merging ingredients + canReact: false maxVol: 10 reagents: - ReagentId: Nutriment @@ -34,7 +34,7 @@ - type: SolutionContainerManager solutions: food: - canReact: false # Dont want cause reactions inside tacos after merging ingredients + canReact: false maxVol: 10 reagents: - ReagentId: Nutriment diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml index 60ee37b5dde..82e45555cc2 100644 --- a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml @@ -2,7 +2,7 @@ - type: microwaveMealRecipe id: RecipeFoodShavermaUnbaked name: The best food ever - result: Shaverma-unbaked + result: FoodShavermaUnbaked time: 1 solids: FoodMeat: 2 @@ -12,7 +12,7 @@ - type: microwaveMealRecipe id: RecipeFoodShavermaBaked name: The best food ever - result: Shaverma-baked + result: FoodShavermaBaked time: 15 solids: Shaverma-unbaked: 1 From 5bd6d8ee60d6a96e822da9c7022b653425af97d8 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:05:11 +0000 Subject: [PATCH 23/37] fixed Recipes --- .../Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml index 82e45555cc2..90b92f941bd 100644 --- a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml @@ -1,4 +1,3 @@ -# Corvax-Next-Shaverma-Start - type: microwaveMealRecipe id: RecipeFoodShavermaUnbaked name: The best food ever @@ -15,5 +14,4 @@ result: FoodShavermaBaked time: 15 solids: - Shaverma-unbaked: 1 -# Corvax-Next-Shaverma-End \ No newline at end of file + Shaverma-unbaked: 1 \ No newline at end of file From 48a0a5ed493fab33ef61f7b848dc2664039b0371 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 22:25:47 +0300 Subject: [PATCH 24/37] Update Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> --- .../_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json index 2c961d47226..9523bb211bd 100644 --- a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json +++ b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "No license/unknown license", + "license": "CC-BY-4.0", "copyright": "Created by sspetishes.", "size": { "x": 512, From 42ec14ebd9ddd285b3490c821158c9aa5110425f Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:05:11 +0000 Subject: [PATCH 25/37] fixed Recipes... again --- .../Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml index 90b92f941bd..159e5e3550b 100644 --- a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml @@ -14,4 +14,4 @@ result: FoodShavermaBaked time: 15 solids: - Shaverma-unbaked: 1 \ No newline at end of file + FoodShavermaUnbaked: 1 \ No newline at end of file From fcb233b2c8e9b5cbdc4018de60e03934fd36f1aa Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Tue, 12 Nov 2024 14:45:19 +0000 Subject: [PATCH 26/37] pita texture --- .../Objects/Consumable/Food/pita.rsi/meta.json | 14 ++++++++++++++ .../Objects/Consumable/Food/pita.rsi/pita.png | Bin 0 -> 6912 bytes 2 files changed, 14 insertions(+) create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/pita.png diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json new file mode 100644 index 00000000000..07c81407e2c --- /dev/null +++ b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-4.0", + "copyright": "Created by kef1r00.", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "baked" + } + ] +} diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/pita.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/pita.png new file mode 100644 index 0000000000000000000000000000000000000000..da6e1bae46eeb4b8ad321fbdfe2a0881830f8f1b GIT binary patch literal 6912 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 Date: Tue, 12 Nov 2024 21:00:00 +0000 Subject: [PATCH 27/37] moved locales --- .../food => ss14_ru/prototypes/_corvaxnext}/shaverma.ftl | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/ru-RU/{_corvaxnext/entities/objects/consumable/food => ss14_ru/prototypes/_corvaxnext}/shaverma.ftl (100%) diff --git a/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl b/Resources/Locale/ru-RU/ss14_ru/prototypes/_corvaxnext/shaverma.ftl similarity index 100% rename from Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl rename to Resources/Locale/ru-RU/ss14_ru/prototypes/_corvaxnext/shaverma.ftl From 3bee4c647ed95eacdfcd92b3d69fb3160b0a9053 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Tue, 12 Nov 2024 21:21:24 +0000 Subject: [PATCH 28/37] moved locales --- .../_corvaxnext/entities/objects/consumable/food}/shaverma.ftl | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/ru-RU/{ss14_ru/prototypes/_corvaxnext => ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food}/shaverma.ftl (100%) diff --git a/Resources/Locale/ru-RU/ss14_ru/prototypes/_corvaxnext/shaverma.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl similarity index 100% rename from Resources/Locale/ru-RU/ss14_ru/prototypes/_corvaxnext/shaverma.ftl rename to Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl From 3ea91f11355fa1c4baf220a754c93725b052e047 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Tue, 12 Nov 2024 21:21:59 +0000 Subject: [PATCH 29/37] no nl on end message removed --- .../_corvaxnext/entities/objects/consumable/food/shaverma.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl index 08da94ce513..7593c56ab4a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl @@ -2,4 +2,4 @@ ent-FoodShavermaUnbaked = заготовка шавермы .desc = Пища богов, осталось только подогреть. ent-FoodShavermaBaked = шаверма - .desc = Пища богов. \ No newline at end of file + .desc = Пища богов. From f3a8b4c2fed6a509781ce10569824f7d9003776a Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Wed, 13 Nov 2024 15:28:58 +0000 Subject: [PATCH 30/37] removed pita.rsi --- .../Objects/Consumable/Food/pita.rsi/meta.json | 14 -------------- .../Objects/Consumable/Food/pita.rsi/pita.png | Bin 6912 -> 0 bytes .../Consumable/Food/shavuha.rsi/meta.json | 17 ----------------- 3 files changed, 31 deletions(-) delete mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json delete mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/pita.png delete mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json deleted file mode 100644 index 07c81407e2c..00000000000 --- a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-4.0", - "copyright": "Created by kef1r00.", - "size": { - "x": 64, - "y": 64 - }, - "states": [ - { - "name": "baked" - } - ] -} diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/pita.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/pita.png deleted file mode 100644 index da6e1bae46eeb4b8ad321fbdfe2a0881830f8f1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6912 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 Date: Wed, 13 Nov 2024 19:37:55 +0300 Subject: [PATCH 31/37] fix --- .../Consumable/Food/shavuha.rsi/meta.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json new file mode 100644 index 00000000000..9523bb211bd --- /dev/null +++ b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-4.0", + "copyright": "Created by sspetishes.", + "size": { + "x": 512, + "y": 512 + }, + "states": [ + { + "name": "baked" + }, + { + "name": "unbaked" + } + ] +} From 12b822c29fa3824e2e03d76b12b3fb4b7747e8b6 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Wed, 13 Nov 2024 19:38:31 +0300 Subject: [PATCH 32/37] Create meta.json --- .../Objects/Consumable/Food/pita.rsi/meta.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json new file mode 100644 index 00000000000..07c81407e2c --- /dev/null +++ b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-4.0", + "copyright": "Created by kef1r00.", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "baked" + } + ] +} From e30b604fc5c1b7496599c42c20c62fdf08d5d3f9 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Wed, 13 Nov 2024 19:40:39 +0300 Subject: [PATCH 33/37] Revert "Create meta.json" This reverts commit 12b822c29fa3824e2e03d76b12b3fb4b7747e8b6. --- .../Objects/Consumable/Food/pita.rsi/meta.json | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json deleted file mode 100644 index 07c81407e2c..00000000000 --- a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/pita.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-4.0", - "copyright": "Created by kef1r00.", - "size": { - "x": 64, - "y": 64 - }, - "states": [ - { - "name": "baked" - } - ] -} From 64faa234eef17ed15c3efdca215fe88e33185e01 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Wed, 13 Nov 2024 20:02:49 +0300 Subject: [PATCH 34/37] =?UTF-8?q?=D0=BF=D0=BE=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Consumable/Food/shaverma.yml | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml index 9ce9eb8140e..fa70d092701 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml @@ -2,40 +2,40 @@ parent: FoodMealBase id: FoodShavermaBaked components: - - type: Item - storedRotation: -90 - - type: Food - transferAmount: 3 - - type: Sprite - sprite: _CorvaxNext/Objects/Consumable/Food/shavuha.rsi - layers: - - state: baked - - type: SolutionContainerManager - solutions: - food: - canReact: false - maxVol: 10 - reagents: - - ReagentId: Nutriment - Quantity: 7.4 + - type: Item + storedRotation: -90 + - type: Food + transferAmount: 3 + - type: Sprite + sprite: _CorvaxNext/Objects/Consumable/Food/shavuha.rsi + layers: + - state: baked + - type: SolutionContainerManager + solutions: + food: + canReact: false + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 7.4 - type: entity parent: FoodMealBase id: FoodShavermaUnbaked components: - - type: Item - storedRotation: -90 - - type: Food - transferAmount: 3 - - type: Sprite - sprite: _CorvaxNext/Objects/Consumable/Food/shavuha.rsi - layers: - - state: unbaked - - type: SolutionContainerManager - solutions: - food: - canReact: false - maxVol: 10 - reagents: - - ReagentId: Nutriment - Quantity: 4.5 + - type: Item + storedRotation: -90 + - type: Food + transferAmount: 3 + - type: Sprite + sprite: _CorvaxNext/Objects/Consumable/Food/shavuha.rsi + layers: + - state: unbaked + - type: SolutionContainerManager + solutions: + food: + canReact: false + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 4.5 From eeb4669198e0ae796326d69a9e57d177c4ec6ee2 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Wed, 13 Nov 2024 20:37:11 +0300 Subject: [PATCH 35/37] texture fix --- .../Consumable/Food/shavuha.rsi/baked.png | Bin 7253 -> 935 bytes .../Consumable/Food/shavuha.rsi/meta.json | 4 ++-- .../Consumable/Food/shavuha.rsi/unbaked.png | Bin 7253 -> 935 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/baked.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/baked.png index 304b49992bcbcfa6f22a61952850b88374309059..09bc323cffded562dc11b377c711d15e95a40ed2 100644 GIT binary patch delta 923 zcmV;M17!TwIHw0wiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=0drDE zLIAGL9O(c600d`2O+f$vv5yPNyFB}|y10qR8 zK~z{r?Urds6j1=jePt72T`C=G;kxFr+d9o`6BM<%>n;T44<2*8dGG&wZ{7?~FdB^_ ze~|#?_}Aza_%{XmIyA~z_xM$RKn~Wn48$Cj#pl3KU)j2vrdG(L&^Zwm7E5R3cms zMJ;?lOzJ`qvX>^5A+V}ZBLf@|c2 z4Z|=efmx|02+~N?FMabBcJ9|)=faLC%sCqg9}|J`Xg&QkPNlVfdpr`5N1nCd10&~e z#xQ#(1y!9?pIF86>0_now~@bAN6PN=B&^6}(#&Kw9XS&^xG`HF@rNu&U zm}}&6cuI61DcAzGCLApfcv4fz7*!f1U!(}{r1znw=nZ7iaFHP_1ryYQ4>j(-;O1Wb;5g(x@ zYKDPzM_zaxF4L`m5FilX44}nQE0udh#HZkNNQ=waMcw@}pTcE4+LXHfdWYh9Yw186 zqC%t7Q+4ecqrwMB3$C%p;W8fYiW{WxoRy*2+PYlV`XCiPsVAF!3YYO}Ti)9KE&MxL xwa32^w|Lcq9Qb4L2ma~B2YLm11^#yd_zF7EEP$d${5Svr002ovPDHLkV1j@ZspbFx literal 7253 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 diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json index 9523bb211bd..34e67291c27 100644 --- a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json +++ b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json @@ -3,8 +3,8 @@ "license": "CC-BY-4.0", "copyright": "Created by sspetishes.", "size": { - "x": 512, - "y": 512 + "x": 32, + "y": 32 }, "states": [ { diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/unbaked.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/unbaked.png index 304b49992bcbcfa6f22a61952850b88374309059..09bc323cffded562dc11b377c711d15e95a40ed2 100644 GIT binary patch delta 923 zcmV;M17!TwIHw0wiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=0drDE zLIAGL9O(c600d`2O+f$vv5yPNyFB}|y10qR8 zK~z{r?Urds6j1=jePt72T`C=G;kxFr+d9o`6BM<%>n;T44<2*8dGG&wZ{7?~FdB^_ ze~|#?_}Aza_%{XmIyA~z_xM$RKn~Wn48$Cj#pl3KU)j2vrdG(L&^Zwm7E5R3cms zMJ;?lOzJ`qvX>^5A+V}ZBLf@|c2 z4Z|=efmx|02+~N?FMabBcJ9|)=faLC%sCqg9}|J`Xg&QkPNlVfdpr`5N1nCd10&~e z#xQ#(1y!9?pIF86>0_now~@bAN6PN=B&^6}(#&Kw9XS&^xG`HF@rNu&U zm}}&6cuI61DcAzGCLApfcv4fz7*!f1U!(}{r1znw=nZ7iaFHP_1ryYQ4>j(-;O1Wb;5g(x@ zYKDPzM_zaxF4L`m5FilX44}nQE0udh#HZkNNQ=waMcw@}pTcE4+LXHfdWYh9Yw186 zqC%t7Q+4ecqrwMB3$C%p;W8fYiW{WxoRy*2+PYlV`XCiPsVAF!3YYO}Ti)9KE&MxL xwa32^w|Lcq9Qb4L2ma~B2YLm11^#yd_zF7EEP$d${5Svr002ovPDHLkV1j@ZspbFx literal 7253 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 From d46dd4a8c7af48432059246e68dbb41f7f27bc90 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Wed, 13 Nov 2024 20:37:27 +0300 Subject: [PATCH 36/37] some fixes --- .../Consumable/Food/shavuha.rsi/baked.png | Bin 935 -> 1232 bytes .../Consumable/Food/shavuha.rsi/unbaked.png | Bin 935 -> 1082 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/baked.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/baked.png index 09bc323cffded562dc11b377c711d15e95a40ed2..d6811e538d82fdd5160e4cc3cb640a7490deeae5 100644 GIT binary patch delta 1223 zcmZ{iX;9L67{}?DNqLbSYqwcb>6Bx3Fy^Yc+Gvhx>SktZR90JUYb%lna{T#&M_MML zC|UHJ?Dmr&1~C0@a?=SDpsJdQQ6ec!+B+{Q7Q|PkB_x8wdK+J z$LKUVWbG^*?_!Rch0n76We@zTMDlKFN@caYfD)#JOQID8r(c`O-}m!4wM|e0?O~;u zQ`^WFtJ0GpZe0VL7L`j3*C`Ay_DWN!q>&eshUfeu`bC96H!Mw%i&eao0Q0uZT`jyJ zL-v$a)z=~HZ05Zile4K2Ok#K{4PxXn-Vau&%FY>hKN~e7CgIe*WKxH+df1qonF&+! zp_uMA!Q3dBPZq`G`qsY^gB{lQJ_infQ})10`l5=2aX2qgBmJMQ5a^ zSrwFCQF7}OO>)aWu zgP7jm=Wp$6kthz=9BEn$x2J{rh&KC3H+E#4@Mu8l(~m!aJbO1ghDo*!xADBPH}p6) zzQlwY_WK4@+spSOO&eV;u8vwh-XwuKg(+<{DXkprpsvWGE_@{=YB&jMZlacpdD~N_ z7m(G3C*9cF)g0`Ei7n6aYRdMtH8o`{v=~a&oJ17kpb8cw=V84)A2_uOZg&cQ8|-*! z6vSJ!?7r6gUJXm{(4g7nWF&>O9PoB$Iit94zfv)+1}5s>!Hkh@yKJv3!<`9_LhQg` z(Jou;);QuT9oN|-^#ksjM|NvBZg}kWg}Z*oeKohrc?GBkV8H_PFLZk%0RXO(0E7Vm z190}tPiPwefBqxjDu`P4b088OGZP2E1u*XcKA?r_M3Q2@VjfQh3Q5=LT`6Q=%y~^`m3}c zKlxnjjK(r`?qJz5xA{7@*ImjlpttnpbV$!Jk75?ynzhoSiIM{UQ8+*Le4^R@=#8r1 z`&n-TiX3W{=zeqbnb?A;VoG@MCN*VL9_rY5Iw#t);*#f0+?zw=?r4u2fkh4V*Oz?C zy#+4x-QwG%!C{Zx67Qq>rSaYS4u?6My0!D^=Z_(|NSrU$|Htn_?d(FFQJ#cPxTk*2 zm+v}XSSPig?(>wQ{EzxRkH~i*@0B1wm?L9`6`|=)F{mTRnIQ?Z{g}^mdW%7$HMXh_ cA)l;7$R@9*9Qc7#XX_mi5)>XNIuV!pH;lN$s{jB1 delta 924 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 Date: Wed, 13 Nov 2024 22:49:45 +0300 Subject: [PATCH 37/37] eat message --- .../_corvaxnext/entities/objects/consumable/food/shaverma.ftl | 3 +++ .../_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl index 7593c56ab4a..0a87c460fce 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl @@ -3,3 +3,6 @@ ent-FoodShavermaUnbaked = заготовка шавермы ent-FoodShavermaBaked = шаверма .desc = Пища богов. + +food-unbaked-saverma-eat = Вы кусаете шаверму, на вкус непрожаренно. +food-saverma-eat = Вы кусаете шаверму, на вкус божественно. diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml index fa70d092701..b3f057cb619 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml @@ -5,6 +5,7 @@ - type: Item storedRotation: -90 - type: Food + eatMessage: food-saverma-eat transferAmount: 3 - type: Sprite sprite: _CorvaxNext/Objects/Consumable/Food/shavuha.rsi @@ -26,6 +27,7 @@ - type: Item storedRotation: -90 - type: Food + eatMessage: food-unbaked-saverma-eat transferAmount: 3 - type: Sprite sprite: _CorvaxNext/Objects/Consumable/Food/shavuha.rsi