forked from space-syndicate/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* shaverma * fix images * shaverma * Update shaverma-unbaked.yml * Update shaverma-baked.yml * Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml Co-authored-by: FN <[email protected]> * Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml Co-authored-by: FN <[email protected]> * Update shaverma-baked.yml * License updates * Localisation? * Localisation * undo something * some codestyle fixes * some codestyle fixes * Discard changes to Resources/Prototypes/Recipes/Cooking/meal_recipes.yml * some codestyle fixes * Delete Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma-unbaked.ftl * Fix meta.json * Update Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl Co-authored-by: FN <[email protected]> * Update Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl Co-authored-by: FN <[email protected]> * Update Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json Co-authored-by: FN <[email protected]> * fixed Recipes * fixed Recipes * Update Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json Co-authored-by: FN <[email protected]> * fixed Recipes... again * pita texture * moved locales * moved locales * no nl on end message removed * removed pita.rsi * fix * Create meta.json * Revert "Create meta.json" This reverts commit 12b822c. * пофиксил отступы --------- Co-authored-by: = <[email protected]> Co-authored-by: FN <[email protected]>
- Loading branch information
1 parent
ae0fa71
commit 9ed74fd
Showing
6 changed files
with
80 additions
and
0 deletions.
There are no files selected for viewing
5 changes: 5 additions & 0 deletions
5
...Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumable/food/shaverma.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
ent-FoodShavermaUnbaked = заготовка шавермы | ||
.desc = Пища богов, осталось только подогреть. | ||
ent-FoodShavermaBaked = шаверма | ||
.desc = Пища богов. |
41 changes: 41 additions & 0 deletions
41
Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
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 |
17 changes: 17 additions & 0 deletions
17
Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
- 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 |
Binary file added
BIN
+7.08 KB
Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/baked.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions
17
Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} | ||
] | ||
} |
Binary file added
BIN
+7.08 KB
Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/unbaked.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.