search

DeltaV-Station / Delta-v

A fork of Space Station 14, embracing a mixture of classic SS13 chaos and experimentation only possible with the new engine
https://delta-v.org
GNU Affero General Public License v3.0
70 stars 301 forks source link

Ports Pears & Coffee from Frontier #2232

Open Lyndomen opened 3 days ago

Lyndomen commented 3 days ago

About the PR

Title, ports pears and pear recipes from frontier, as well as coffee, coffee roasting, and brewing.

https://github.com/new-frontiers-14/frontier-station-14/pull/2047 https://github.com/new-frontiers-14/frontier-station-14/pull/1546 https://github.com/new-frontiers-14/frontier-station-14/pull/1558

Thank you to dustylens, whatston3, Iocanthos, and I couldn't find out who made pears- so thank you to that person too.

Why / Balance

Botany content on request. Coffee roasting is actually kinda baller and could lead to barista gaming

Technical details

YAML warrior

Media

image image image image

Requirements

Breaking changes

Changelog :cl:

github-actions[bot] commented 3 days ago

RSI Diff Bot; head commit 175aed5f0dd335dcbe3e265589a41df6940a45ea merging into 88182267bf967ffe9e9232b461ef88d7c223fefb This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi

| State | Old | New | Status | --- | --- | --- | --- | | fill-1 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-1.png) | Added | fill-2 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-2.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon.png) | Added | icon_empty | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon_empty.png) | Added

Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi

| State | Old | New | Status | --- | --- | --- | --- | | inhand-left | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/inhand-right.png) | Added | pearmuffin | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/pearmuffin.png) | Added

Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi

| State | Old | New | Status | --- | --- | --- | --- | | inhand-left | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-right.png) | Added | pearandcheese | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/pearandcheese.png) | Added | tin | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/tin.png) | Added

Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi

| State | Old | New | Status | --- | --- | --- | --- | | bellepear | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/bellepear.png) | Added | bowl | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/bowl.png) | Added | poachedpear | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/poachedpear.png) | Added

Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi

| State | Old | New | Status | --- | --- | --- | --- | | dead | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/dead.png) | Added | harvest | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/harvest.png) | Added | produce-beans-dark | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-dark.png) | Added | produce-beans-light | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-light.png) | Added | produce-beans-medium | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-medium.png) | Added | produce-beans | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans.png) | Added | produce | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce.png) | Added | seed | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/seed.png) | Added | stage-1 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-1.png) | Added | stage-2 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-2.png) | Added | stage-3 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-3.png) | Added | stage-4 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-4.png) | Added | stage-5 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-5.png) | Added

Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi

| State | Old | New | Status | --- | --- | --- | --- | | dead | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/dead.png) | Added | harvest | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/harvest.png) | Added | produce | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/produce.png) | Added | seed | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/seed.png) | Added | stage-1 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-1.png) | Added | stage-2 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-2.png) | Added | stage-3 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-3.png) | Added | stage-4 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-4.png) | Added | stage-5 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-5.png) | Added | stage-6 | ![]() | ![](https://raw.githubusercontent.com/Lyndomen/LyndoFork/175aed5f0dd335dcbe3e265589a41df6940a45ea/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-6.png) | Added

Edit: diff updated after 175aed5f0dd335dcbe3e265589a41df6940a45ea