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

Japanfood #262

Closed
wants to merge 21 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
81fd985
Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Japa…
Chocosasel 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
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,18 @@
FoodNoodlesBoiled: 1
reagents:
Water: 15
Egg: 6
Egg: 6

- 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: entity
name: Tricolor Dango
parent: FoodBakedBase
id: hanamidango
description: Rice sweetness that beckons
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

This file was deleted.

This file was deleted.

Binary file not shown.
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"
}
]
}
Loading