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

made cup ramen eatable with anything with the fork component #27826

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 0 additions & 38 deletions Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2328,44 +2328,6 @@
- type: Sprite
sprite: Objects/Consumable/Drinks/shake-white.rsi

- type: entity
parent: DrinkGlassBase
id: DrinkRamen
name: cup ramen
description: Just add 10ml boiling water. A taste that reminds you of your school years.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 40 #big cup
reagents:
- ReagentId: DryRamen
Quantity: 25
- ReagentId: Soysauce
Quantity: 5
- type: Sprite
sprite: Objects/Consumable/Drinks/ramen.rsi
- type: Tag
tags:
- Trash
- type: SpaceGarbage

- type: entity
parent: DrinkRamen
id: DrinkHellRamen
name: hell ramen
description: Just add 10ml boiling water. Super spicy flavor.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 40
reagents:
- ReagentId: DryRamen
Quantity: 25
- ReagentId: CapsaicinOil
Quantity: 5

- type: entity
parent: DrinkGlass
id: DrinkBloodGlass
Expand Down
49 changes: 49 additions & 0 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,46 @@
- type: Food
trash: FoodPacketSyndiTrash

- type: entity
parent: FoodSnackBase
id: DrinkRamen
name: cup ramen
description: A cheap food with a taste that reminds you of your school years.
components:
- type: RefillableSolution
solution: food
- type: InjectableSolution
solution: food
- type: SolutionContainerManager
solutions:
food:
maxVol: 50 #big cup
reagents:
- ReagentId: DryRamen
Quantity: 30
- ReagentId: Soysauce
Quantity: 5
- type: Sprite
state: ramen
- type: Food
trash: FoodPacketCupRamenTrash

- type: entity
parent: DrinkRamen
id: DrinkHellRamen
name: hell ramen
description: Super spicy flavor!
components:
- type: SolutionContainerManager
solutions:
food:
maxVol: 50
reagents:
- ReagentId: DryRamen
Quantity: 30
- ReagentId: CapsaicinOil
Quantity: 5

- type: entity
name: chow mein
parent: FoodSnackBase
Expand Down Expand Up @@ -573,6 +613,15 @@
- type: Sprite
state: syndicakes-trash

- type: entity
noSpawn: true
parent: FoodPacketTrash
id: FoodPacketCupRamenTrash
name: empty cup ramen
components:
- type: Sprite
state: ramen

- type: entity
noSpawn: true
parent: FoodPacketTrash
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide, cnds-trash based on boritos-trash and syndicakes modified by potato1234x",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide, cnds-trash based on boritos-trash and syndicakes modified by potato1234x, ramen from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "ramen"
},
{
"name": "boritos"
},
Expand Down
Loading