Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

shaverma #39

Merged
merged 34 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
c20b804
shaverma
onlyfans12 Nov 10, 2024
839f9b9
fix images
onlyfans12 Nov 10, 2024
9062f93
shaverma
onlyfans12 Nov 10, 2024
2591c13
Update shaverma-unbaked.yml
jailedfish Nov 10, 2024
5ae25d9
Update shaverma-baked.yml
jailedfish Nov 10, 2024
b9f9549
Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
jailedfish Nov 10, 2024
8dca773
Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
jailedfish Nov 10, 2024
0dfc180
Update shaverma-baked.yml
jailedfish Nov 10, 2024
c673a94
License updates
jailedfish Nov 11, 2024
f668d07
Localisation?
jailedfish Nov 11, 2024
819895b
Localisation
jailedfish Nov 11, 2024
6d4f8a4
undo something
jailedfish Nov 11, 2024
896cb6f
some codestyle fixes
jailedfish Nov 11, 2024
69d9b42
some codestyle fixes
jailedfish Nov 11, 2024
cb1c8d2
Discard changes to Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
jailedfish Nov 11, 2024
415e25b
some codestyle fixes
jailedfish Nov 11, 2024
f670348
Delete Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable…
jailedfish Nov 11, 2024
a276d77
Fix meta.json
jailedfish Nov 11, 2024
7a1cf2e
Update Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable…
jailedfish Nov 11, 2024
268452a
Update Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable…
jailedfish Nov 11, 2024
744a9a9
Update Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha…
jailedfish Nov 11, 2024
e4851f7
fixed Recipes
jailedfish Nov 11, 2024
5bd6d8e
fixed Recipes
jailedfish Nov 11, 2024
48a0a5e
Update Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha…
jailedfish Nov 11, 2024
42ec14e
fixed Recipes... again
jailedfish Nov 11, 2024
fcb233b
pita texture
jailedfish Nov 12, 2024
22959b0
moved locales
jailedfish Nov 12, 2024
3bee4c6
moved locales
jailedfish Nov 12, 2024
3ea91f1
no nl on end message removed
jailedfish Nov 12, 2024
f3a8b4c
removed pita.rsi
jailedfish Nov 13, 2024
85a3e9a
fix
jailedfish Nov 13, 2024
12b822c
Create meta.json
jailedfish Nov 13, 2024
e30b604
Revert "Create meta.json"
jailedfish Nov 13, 2024
64faa23
пофиксил отступы
jailedfish Nov 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ent-FoodShavermaUnbaked = заготовка шавермы
jailedfish marked this conversation as resolved.
Show resolved Hide resolved
.desc = Пища богов, осталось только подогреть.

ent-FoodShavermaBaked = шаверма
.desc = Пища богов.
jailedfish marked this conversation as resolved.
Show resolved Hide resolved
jailedfish marked this conversation as resolved.
Show resolved Hide resolved
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
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
jailedfish marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading