Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Japanfood #353

Merged
merged 48 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
cbac5ec
Add pork ramen
Sh1ntra Jun 3, 2024
b1627c6
Create 1.txt
Chocosasel Jun 3, 2024
7b9db30
Merge pull request #258 from Chocosasel/master
Sh1ntra Jun 3, 2024
ddb2852
Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/1 di…
Sh1ntra Jun 3, 2024
18f4069
Add files via upload
Chocosasel Jun 3, 2024
e495ca1
Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood…
Chocosasel Jun 3, 2024
6fd96d9
Add files via upload
Chocosasel Jun 3, 2024
050fd8b
Add files via upload
Chocosasel Jun 3, 2024
6f605b2
Delete Resources/Prototypes/Recipes/Cooking/JapanFood directory
Chocosasel Jun 3, 2024
93ac6e3
Add files via upload
Chocosasel Jun 3, 2024
a2447c0
Add files via upload
Chocosasel Jun 3, 2024
8e06439
Delete Resources/Textures/Objects/Consumable/Food/JapanFood.rsi direc…
Chocosasel Jun 3, 2024
959811f
Delete Resources/Prototypes/Recipes/Cooking/JapanFood directory
Chocosasel Jun 3, 2024
9b2eb95
Add files via upload
Chocosasel Jun 4, 2024
e94168c
Add files via upload
Chocosasel Jun 4, 2024
b63d819
Add files via upload
Chocosasel Jun 4, 2024
0ddc269
Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood…
Chocosasel Jun 4, 2024
54dffc6
Delete Resources/Prototypes/Corvax/Recipes/Cooking/meal_recipes.yml
Chocosasel Jun 4, 2024
57410c2
Add files via upload
Chocosasel Jun 4, 2024
7f26199
Delete Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rs…
Chocosasel Jun 4, 2024
5817115
Merge branch 'japanfood' into japanfood
Sh1ntra Jun 4, 2024
27985ee
Delete Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ra…
Chocosasel Jun 4, 2024
55e6ef1
Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Japa…
Chocosasel Jun 4, 2024
e2198b8
Update meta.json
Chocosasel Jun 4, 2024
87321f8
Delete Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ra…
Sh1ntra Jun 4, 2024
8a69fa5
Update meal_recipes.yml
Sh1ntra Jun 4, 2024
81fd985
Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Japa…
Chocosasel Jun 4, 2024
0ee5656
Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Japa…
Sh1ntra Jun 4, 2024
a1bc9bb
Merge branch 'japanfood' into japanfood
Sh1ntra Jun 4, 2024
15a8d0f
Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Japa…
Chocosasel Jun 28, 2024
d027d71
Add files via upload
Chocosasel Jun 28, 2024
25b53df
Delete Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rs…
Chocosasel Jun 28, 2024
38890fd
Add files via upload
Chocosasel Jun 28, 2024
dc141fd
Delete Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood directory
Chocosasel Jun 28, 2024
b5cfb38
Add files via upload
Chocosasel Jun 28, 2024
1788f79
Merge pull request #350 from Chocosasel/japanfood
Sh1ntra Jun 28, 2024
84bf11f
Add files via upload
Chocosasel Jun 28, 2024
6f4f645
Delete Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rs…
Chocosasel Jun 28, 2024
8bce73e
Add files via upload
Chocosasel Jun 28, 2024
ee67353
Merge pull request #352 from Chocosasel/japanfood
Sh1ntra Jun 28, 2024
9f58830
Update hanamidango.yml
Sh1ntra Jun 28, 2024
04af34b
Update mitarasidango.yml
Sh1ntra Jun 28, 2024
7c13161
Update hanamidango.yml
Sh1ntra Jun 28, 2024
aa3b6c9
Update onigiri.yml
Sh1ntra Jun 28, 2024
2343d84
Update porkramennoodles.yml
Sh1ntra Jun 28, 2024
d0e34c8
Update spicyporkramen.yml
Sh1ntra Jun 28, 2024
6d79376
Update dangodough.yml
Sh1ntra Jun 28, 2024
7bbf885
Update rawramennoodles.yml
Sh1ntra Jun 28, 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,33 @@
- type: reaction
id: CreateDangoDough
impact: Low
quantized: true
conserveEnergy: false
reactants:
Rice:
amount: 5
Water:
amount: 2
Sugar:
amount: 2
effects:
- !type:CreateEntityReactionEffect
entity: Doughdangoball

- type: reaction
id: CreateRawRamen
impact: Low
quantized: true
conserveEnergy: false
reactants:
Flour:
amount: 10
TableSalt:
amount: 1
OilOlive:
amount: 1
Egg:
amount: 6
effects:
- !type:CreateEntityReactionEffect
entity: rawnoodles
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
- type: microwaveMealRecipe
id: Recipeporkramen
name: pork ramen recipe
result: porkramennoodles
time: 15
solids:
FoodMeatCutlet: 3
FoodBowlBig: 1
FoodGarlic: 1
rawnoodles: 1
reagents:
Water: 15
Egg: 6

- type: microwaveMealRecipe
id: Recipehanamidango
name: dango hanami recipe
result: hanamidango
time: 10
reagents:
GreenTea: 5
JuiceWatermelon: 5
solids:
Doughdangoball: 3

- type: microwaveMealRecipe
id: Recipemitarashidango
name: dango mitarashi recipe
result: mitarashidango
time: 10
reagents:
Soysauce: 5
Sugar: 5
solids:
Doughdangoball: 3

- type: microwaveMealRecipe
id: Recipeonigiri
name: onigiri recipe
result: onigiri
time: 20
reagents:
Mayo: 5
Rice: 10
solids:
FoodMeatChicken: 1

- type: microwaveMealRecipe
id: Recipespicyramen
name: spicy ramen recipe
result: spicyporkramennoodles
time: 20
solids:
FoodMeatCutlet: 3
FoodBowlBig: 1
FoodGarlic: 1
rawnoodles: 1
FoodChiliPepper: 1
reagents:
Water: 15
Egg: 6
Hotsauce: 5
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: entity
name: шарик данго
parent: FoodBakingBase
id: Doughdangoball
description: Выглядит как шарик из теста.
components:
- type: FlavorProfile
flavors:
- dough
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/ingredients.rsi
state: doughdangoball
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
name: сухая лапша для рамэна
parent: FoodBakingBase
id: rawnoodles
description: Сухая лапша.
components:
- type: FlavorProfile
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/ingredients.rsi
state: rawnoodles
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: entity
name: трёхцветное данго
parent: FoodBakedBase
id: hanamidango
description: Похоже что тебе нравятся разные цвета, не так ли?
components:
- type: Item
storedRotation: -90
- type: Food
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
state: hanamidango
- type: SolutionContainerManager
solutions:
food:
maxVol: 20
reagents:
- ReagentId: Nutriment
Quantity: 15
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: entity
name: митараши данго
parent: FoodBakedBase
id: mitarashidango
description: Рисовая сладость, манящая за собой
components:
- type: Item
storedRotation: -90
- type: Food
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
state: mitarashidango
- type: SolutionContainerManager
solutions:
food:
maxVol: 20
reagents:
- ReagentId: Nutriment
Quantity: 15
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: entity
name: онигири
parent: FoodBakedBase
id: onigiri
description: Лучший рис в галактике!
components:
- type: Item
storedRotation: -90
- type: Food
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
state: onigiri
- type: SolutionContainerManager
solutions:
food:
maxVol: 25
reagents:
- ReagentId: Nutriment
Quantity: 20
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
- type: entity
name: свиной рамэн
parent: FoodBowlBase
id: porkramennoodles
description: Оу, да я вижу вы человек высокой культуры...
components:
- type: Item
- type: Food
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
state: porkramen
- type: SolutionContainerManager
solutions:
food:
maxVol: 30
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Protein
Quantity: 3
- ReagentId: Flavorol
Quantity: 5
- ReagentId: Soysauce
Quantity: 2
- type: Tag
tags:
- Meat
- Soup
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
- type: entity
name: острый рамэн
parent: FoodBowlBase
id: spicyporkramennoodles
description: Выглядит так горячо... И так аппетитно!
components:
- type: Item
- type: Food
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
state: spicyporkramen
- type: SolutionContainerManager
solutions:
food:
maxVol: 30
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Protein
Quantity: 3
- ReagentId: Flavorol
Quantity: 5
- ReagentId: CapsaicinOil
Quantity: 2
- ReagentId: Soysauce
Quantity: 2
- type: Tag
tags:
- Meat
- Soup
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-SA-3.0",
"copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "doughdangoball"
},
{
"name": "rawnoodles"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "porkramen"
},
{
"name": "spicyporkramen",
"delays": [
[
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "hanamidango"
},
{
"name": "mitarashidango"
},
{
"name": "onigiri"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading