forked from new-frontiers-14/frontier-station-14
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ports coffee arabica plant from SS13. (new-frontiers-14#1546)
* Ports coffee arabica plant from SS13. TG sprites used. Includes seeds, plant, coffee grounds chemicals, new reaction to brew coffee. * Coffee PR suggestions * dark coffee beans: inherit from light coffee beans * Coffee grounds recognizable, author in meta.json * Coffee bean/fruit sprites by Stagnation * Fix coffee.rsi license, attribute produce to stag * hyphenate * cleanup: ingredients.yml (heatCapacity, comments) * Updated produce-beans from Stagnation --------- Co-authored-by: Whatstone <[email protected]>
- Loading branch information
Showing
25 changed files
with
291 additions
and
0 deletions.
There are no files selected for viewing
2 changes: 2 additions & 0 deletions
2
Resources/Locale/en-US/_NF/reagents/meta/consumable/food/ingredients.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
reagent-name-coffeegrounds = coffee grounds | ||
reagent-desc-coffeegrounds = Aromatic and richly textured, these grounds exude a robust scent that promises a flavorful brew. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,5 +38,6 @@ | |
BerrySeeds: 5 | ||
PeaSeeds: 5 | ||
CottonSeeds: 5 | ||
CoffeeSeeds: 5 # Frontier | ||
emaggedInventory: | ||
FlyAmanitaSeeds: 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,6 +49,7 @@ | |
- FoodPeaPod | ||
- FoodPumpkin | ||
- CottonBol | ||
- FoodCoffee # Frontier | ||
chance: 0.8 | ||
offset: 0.0 | ||
#rare | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98 changes: 98 additions & 0 deletions
98
Resources/Prototypes/_NF/Objects/Consumable/Food/ingredients.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
- type: entity | ||
name: raw coffee beans | ||
parent: FoodProduceBase | ||
id: FoodCoffeeBeansRaw | ||
description: Green coffee beans, just waiting to be roasted. | ||
components: | ||
- type: FlavorProfile | ||
flavors: | ||
- bitter | ||
- type: Food | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 6 | ||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 1 | ||
- ReagentId: Theobromine # Caffeine | ||
Quantity: 1 | ||
- type: Sprite | ||
sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi | ||
state: produce-beans | ||
- type: Tag | ||
tags: | ||
- Fruit | ||
- type: Construction | ||
graph: Coffee | ||
node: start | ||
defaultTarget: light roasted coffee | ||
- type: AtmosExposed # Expose the beans to atmosphere - heats and cools them | ||
- type: Temperature # Temperature components needed to cook the beans | ||
currentTemperature: 290 | ||
- type: InternalTemperature | ||
thickness: 0.008 # 8mm (roughly bean sized) | ||
area: .2 # essentially a giant sheet of beans | ||
|
||
- type: entity | ||
name: light roasted coffee beans | ||
parent: FoodProduceBase | ||
id: FoodCoffeeBeansRoastedLight | ||
description: Cinnamon roast coffee beans. Bright and fruity. | ||
components: | ||
- type: FlavorProfile | ||
flavors: | ||
- bitter | ||
- type: Food | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 6 | ||
reagents: | ||
- ReagentId: CoffeeGrounds | ||
Quantity: 5 | ||
- type: Sprite | ||
sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi | ||
state: produce-beans-light | ||
- type: Tag | ||
tags: | ||
- Fruit | ||
- type: Construction | ||
graph: Coffee | ||
node: light roasted coffee | ||
defaultTarget: medium roasted coffee | ||
- type: AtmosExposed # Expose the beans to atmosphere - heats and cools them | ||
- type: Temperature # Temperature components needed to cook the beans | ||
- type: InternalTemperature | ||
thickness: 0.008 # 8mm (roughly bean sized) | ||
area: .2 # essentially a giant sheet of beans | ||
conductivity: 1.5 # Arbitrarily chosen | ||
- type: Extractable | ||
grindableSolutionName: food | ||
|
||
- type: entity | ||
name: medium roasted coffee beans | ||
parent: FoodCoffeeBeansRoastedLight | ||
id: FoodCoffeeBeansRoastedMedium | ||
description: City roast coffee beans. Smooth and nutty. | ||
components: | ||
- type: Sprite | ||
sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi | ||
state: produce-beans-medium | ||
- type: Construction | ||
graph: Coffee | ||
node: medium roasted coffee | ||
defaultTarget: dark roasted coffee | ||
|
||
- type: entity | ||
name: dark roasted coffee beans | ||
parent: FoodCoffeeBeansRoastedLight | ||
id: FoodCoffeeBeansRoastedDark | ||
description: Viennese roast coffee beans. Smoky and spicy. | ||
components: | ||
- type: Sprite | ||
sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi | ||
state: produce-beans-dark | ||
- type: Construction | ||
graph: Coffee | ||
node: dark roasted coffee |
31 changes: 31 additions & 0 deletions
31
Resources/Prototypes/_NF/Objects/Consumable/Food/produce.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
- type: entity | ||
name: coffee berries | ||
parent: FoodProduceBase | ||
id: FoodCoffee | ||
description: Red berries encasing coffee beans. | ||
components: | ||
- type: FlavorProfile | ||
flavors: | ||
- bitter | ||
- type: Food | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 12 | ||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 2 | ||
- ReagentId: Theobromine | ||
Quantity: 1 | ||
- type: Sprite | ||
sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi | ||
- type: Produce | ||
seedId: coffee | ||
- type: Tag | ||
tags: | ||
- Fruit | ||
- type: SpawnItemsOnUse | ||
items: | ||
- id: FoodCoffeeBeansRaw | ||
sound: | ||
path: /Audio/Effects/packetrip.ogg |
17 changes: 17 additions & 0 deletions
17
Resources/Prototypes/_NF/Reagents/Consumables/ingredients.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
- type: reagent | ||
id: CoffeeGrounds | ||
name: reagent-name-coffeegrounds | ||
group: Foods | ||
desc: reagent-desc-coffeegrounds | ||
flavor: bitter | ||
color: "#4B382A" | ||
physicalDesc: reagent-physical-desc-powdery | ||
slippery: false | ||
recognizable: true # "Waiter, there seems to be grounds in my coffee." | ||
metabolisms: | ||
Drink: | ||
effects: | ||
- !type:SatiateHunger | ||
factor: 0.1 | ||
- !type:SatiateThirst | ||
factor: -0.25 |
40 changes: 40 additions & 0 deletions
40
Resources/Prototypes/_NF/Recipes/Construction/Graphs/food/coffee.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# coffee | ||
- type: constructionGraph | ||
id: Coffee | ||
start: start | ||
graph: | ||
|
||
- node: start | ||
edges: | ||
- to: light roasted coffee | ||
completed: | ||
- !type:PlaySound | ||
sound: /Audio/Effects/sizzle.ogg | ||
steps: | ||
- minTemperature: 365 # ~92 C - arbitrarily set to take a while | ||
# - minTemperature: 453 # 180 C | ||
|
||
- node: light roasted coffee | ||
entity: FoodCoffeeBeansRoastedLight | ||
edges: | ||
- to: medium roasted coffee | ||
completed: | ||
- !type:PlaySound | ||
sound: /Audio/Effects/sizzle.ogg | ||
steps: | ||
- minTemperature: 375 # ~102 C - arbitrarily set to take a while | ||
# - minTemperature: 477 # 204 C | ||
|
||
- node: medium roasted coffee | ||
entity: FoodCoffeeBeansRoastedMedium | ||
edges: | ||
- to: dark roasted coffee | ||
completed: | ||
- !type:PlaySound | ||
sound: /Audio/Effects/sizzle.ogg | ||
steps: | ||
- minTemperature: 385 # ~112 C - arbitrarily set to take a while | ||
#- minTemperature: 493 # 220 C | ||
|
||
- node: dark roasted coffee | ||
entity: FoodCoffeeBeansRoastedDark |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
- type: reaction | ||
id: Coffee | ||
minTemp: 353 # ~80 deg C | ||
reactants: | ||
Water: | ||
amount: 3 | ||
CoffeeGrounds: | ||
amount: 1 | ||
products: | ||
Coffee: 4 |
Binary file added
BIN
+370 Bytes
Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/dead.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+381 Bytes
Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/harvest.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions
50
Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-NC-SA-4.0", | ||
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13. produce, produce-beans and variants created by Stagnation (Discord)", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "dead" | ||
}, | ||
{ | ||
"name": "harvest" | ||
}, | ||
{ | ||
"name": "produce" | ||
}, | ||
{ | ||
"name": "produce-beans" | ||
}, | ||
{ | ||
"name": "produce-beans-light" | ||
}, | ||
{ | ||
"name": "produce-beans-medium" | ||
}, | ||
{ | ||
"name": "produce-beans-dark" | ||
}, | ||
{ | ||
"name": "seed" | ||
}, | ||
{ | ||
"name": "stage-1" | ||
}, | ||
{ | ||
"name": "stage-2" | ||
}, | ||
{ | ||
"name": "stage-3" | ||
}, | ||
{ | ||
"name": "stage-4" | ||
}, | ||
{ | ||
"name": "stage-5" | ||
} | ||
] | ||
} |
Binary file added
BIN
+421 Bytes
...ces/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+471 Bytes
...es/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+442 Bytes
...s/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-medium.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+592 Bytes
Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+448 Bytes
Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+195 Bytes
Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/seed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+311 Bytes
Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+321 Bytes
Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+325 Bytes
Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+355 Bytes
Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+377 Bytes
Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.