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.

Sign up for GitHub

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

Jump to bottom

Added Moffee entity and recipe #33833

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Added Moffee entity and recipe #33833

wants to merge 11 commits into from

Conversation

OrnamentalFreak
Copy link

About the PR

Added moffee and its recipe, added it to Solar's Best vending machine

Why / Balance

I saw some complaints from moth players about not having a tea/coffee equivalent that is safe for them to drink and doesn't feel like a loophole (green tea). It is relatively commonly available via the vending machines, and is enough of a mild pain to make (requiring a heat threshold) that it doesn't feel like it undermines the challenges inherent to the race's diet.

Technical details

Added moffee to reagents and recipes, along with its components. Added a HotMoffee variant for the vending machine.

Media

image

Requirements

Changelog

@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. size/L Denotes a PR that changes 1000-4999 lines. Changes: Sprites Changes: Might require knowledge of spriting or visual design. labels Dec 12, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Dec 12, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 12, 2024 •
edited
Loading

RSI Diff Bot; head commit 06035b5 merging into 842bbeb
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Consumable/Drinks/hot_moffee.rsi

State Old New Status
icon-0 Added
icon-1 Added
icon-2 Added
icon-3 Added
icon-4 Added
icon-vend Added

Edit: diff updated after 06035b5

@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Dec 12, 2024
ArtisticRoomba
ArtisticRoomba suggested changes Dec 12, 2024
View reviewed changes
Copy link
Contributor

@ArtisticRoomba ArtisticRoomba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good to me, but then again, I don't know much of anything. I saw some things that might need to be addressed though.

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml Show resolved Hide resolved
Resources/Textures/Objects/Consumable/Drinks/hot_moffee.rsi/meta.json Outdated Show resolved Hide resolved
@beck-thompson beck-thompson added P3: Standard Priority: Default priority for repository items. T: New Feature Type: New feature or content, or extending existing content DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. A: Service Area: Service department, including cooking, botany, etc A: General Interactions Area: General in-game interactions that don't relate to another area. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Dec 12, 2024
OrnamentalFreak and others added 2 commits December 11, 2024 22:01
@OrnamentalFreak @Aeshus
Update Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks…
ddfc874 
…_cups.yml

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
@OrnamentalFreak @Aeshus
Update Resources/Textures/Objects/Consumable/Drinks/hot_moffee.rsi/me…
0124301 
…ta.json

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
@OrnamentalFreak @Aeshus
Update Resources/Textures/Objects/Consumable/Drinks/hot_moffee.rsi/me…
06035b5 
…ta.json

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
@tutoumi
Copy link

tutoumi commented Dec 13, 2024

when do we get a moffin ?

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Dec 16, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ArtisticRoomba ArtisticRoomba ArtisticRoomba requested changes

@Aeshus Aeshus Aeshus left review comments

Assignees
No one assigned
Labels
A: General Interactions Area: General in-game interactions that don't relate to another area. A: Service Area: Service department, including cooking, botany, etc Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. P3: Standard Priority: Default priority for repository items. S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted size/L Denotes a PR that changes 1000-4999 lines. T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@OrnamentalFreak @tutoumi @Aeshus @ArtisticRoomba @beck-thompson