From aa66d79c93cb88fc7120370adf5e683f86c8e480 Mon Sep 17 00:00:00 2001 From: ksen0morph <144564556+ksen0morph@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:24:24 +0300 Subject: [PATCH] Revert "shaverma (#39)" This reverts commit 9ed74fd2e380f20480c29f8d9b6412336e5891d0. --- .../objects/consumable/food/shaverma.ftl | 5 --- .../Objects/Consumable/Food/shaverma.yml | 41 ------------------ .../Recipes/Cooking/meal_recipes.yml | 17 -------- .../Consumable/Food/shavuha.rsi/baked.png | Bin 7253 -> 0 bytes .../Consumable/Food/shavuha.rsi/meta.json | 17 -------- .../Consumable/Food/shavuha.rsi/unbaked.png | Bin 7253 -> 0 bytes 6 files changed, 80 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl delete mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml delete mode 100644 Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml delete mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/baked.png delete mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json delete mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/unbaked.png 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 deleted file mode 100644 index 7593c56ab4a..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl +++ /dev/null @@ -1,5 +0,0 @@ -ent-FoodShavermaUnbaked = заготовка шавермы - .desc = Пища богов, осталось только подогреть. - -ent-FoodShavermaBaked = шаверма - .desc = Пища богов. diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml deleted file mode 100644 index fa70d092701..00000000000 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml +++ /dev/null @@ -1,41 +0,0 @@ -- 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 - 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 diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml deleted file mode 100644 index 159e5e3550b..00000000000 --- a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: microwaveMealRecipe - id: RecipeFoodShavermaUnbaked - name: The best food ever - result: FoodShavermaUnbaked - time: 1 - solids: - FoodMeat: 2 - FoodDough: 1 - FoodTomato: 1 - -- type: microwaveMealRecipe - id: RecipeFoodShavermaBaked - name: The best food ever - result: FoodShavermaBaked - time: 15 - solids: - FoodShavermaUnbaked: 1 \ No newline at end of file diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/baked.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/baked.png deleted file mode 100644 index 304b49992bcbcfa6f22a61952850b88374309059..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 deleted file mode 100644 index 9523bb211bd..00000000000 --- a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-4.0", - "copyright": "Created by sspetishes.", - "size": { - "x": 512, - "y": 512 - }, - "states": [ - { - "name": "baked" - }, - { - "name": "unbaked" - } - ] -} diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/unbaked.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/unbaked.png deleted file mode 100644 index 304b49992bcbcfa6f22a61952850b88374309059..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7253 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