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

Japanfood #264

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 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
eb3b41e
Merge pull request #263 from Chocosasel/japanfood
Sh1ntra Jun 4, 2024
a0c72f7
Japan Food
Sh1ntra Jun 4, 2024
ae99c35
фикс случайного изменения файла
Sh1ntra Jun 4, 2024
09639d0
перенос файлов
Sh1ntra Jun 4, 2024
4561acb
adminbuse звуки с основы
Sh1ntra Jun 4, 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
Binary file added Resources/Audio/Corvax/Adminbuse/ai_malf_1.ogg
Binary file not shown.
Binary file added Resources/Audio/Corvax/Adminbuse/ai_malf_2.ogg
Binary file not shown.
Binary file added Resources/Audio/Corvax/Adminbuse/ai_malf_3.ogg
Binary file not shown.
Binary file added Resources/Audio/Corvax/Adminbuse/ai_malf_4.ogg
Binary file not shown.
Binary file added Resources/Audio/Corvax/Adminbuse/aimalf.ogg
Binary file not shown.
Binary file added Resources/Audio/Corvax/Adminbuse/artillery.ogg
Binary file not shown.
Binary file added Resources/Audio/Corvax/Adminbuse/i-storm1.ogg
Binary file not shown.
Binary file added Resources/Audio/Corvax/Adminbuse/irod.ogg
Binary file not shown.
1 change: 1 addition & 0 deletions Resources/Audio/Corvax/Adminbuse/licenses.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
All sounds in directory are taken from TauCeti github (licensed under CC-BY-SA by 3.0) at commit https://github.com/TauCetiStation/TauCetiClassic/commit/92d2767dbb39f28540f78d5055e7be1eb7acee98
Binary file added Resources/Audio/Corvax/Adminbuse/noert.ogg
Binary file not shown.
Binary file added Resources/Audio/Corvax/Adminbuse/outbreak5.ogg
Binary file not shown.
Binary file added Resources/Audio/Corvax/Adminbuse/portal.ogg
Binary file not shown.
Binary file added Resources/Audio/Corvax/Adminbuse/vox_arrival.ogg
Binary file not shown.
Binary file added Resources/Audio/Corvax/Adminbuse/vox_returns.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/Corvax/Adminbuse/yesert.ogg
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: entity
name: Tricolor Dango
parent: FoodBakedBase
id: hanamidango
description: Манящая рисовая сладость.
components:
- type: Item
storedRotation: -90
- type: Food
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/hanamidango.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,26 @@
- type: entity
name: Свиной Рамён
parent: FoodBowlBase
id: porkramennoodles
description: Оу, я вижу вы человек Высокой культуры...
components:
- type: Item
- type: Food
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/porkramennoodles.rsi
state: ramen
- type: SolutionContainerManager
solutions:
food:
maxVol: 20
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Protein
Quantity: 3
- ReagentId: Flavorol
Quantity: 5
- type: Tag
tags:
- Meat
- Soup
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
- type: microwaveMealRecipe
id: Recipedango
name: dango recipe
result: hanamidango
time: 10
solids:
FoodWatermelonSlice: 1
reagents:
Rice: 15
Sugar: 5
Water: 10
GreenTea: 5
Egg: 6

- type: microwaveMealRecipe
id: Recipeporkramen
name: pork ramen recipe
result: porkramennoodles
time: 15
solids:
FoodMeatCutlet: 3
FoodBowlBig: 1
FoodGarlic: 1
FoodNoodlesBoiled: 1
reagents:
Water: 15
Egg: 6
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,14 @@
{
"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": "hanamidango"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"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": "ramen"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading