Adds a new condiment station #2637
Merged
Conversation
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
|
RSI Diff Bot; head commit 2142664 merging into 079c63c Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi
Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi
Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi
Resources/Textures/_NF/Structures/smalldispensers.rsi
|
dvir001
reviewed
Dec 30, 2024
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
Outdated
Show resolved
Hide resolved
|
Are those upside down helmets? |
|
Nope! Unique sprites from wallflowerghost! |
|
I guess it shows how well they fit in that I thought they were pre-existing sprites |
|
Much nicer than my sad sprites for sure. |
Converted tag to empty comp Removed StaticPrice to match the rest of the machines Rebase CondimentCup to DrinkWaterCup added on head sprite Added label to jugs
dvir001
approved these changes
Jan 3, 2025
People are meant to be pulling a condiment packet's amount to use for their food. Not chugging the stuff. From a more practical standpoint 20u will mostly result condiments being thrown away. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
the
Merge Conflict
github-actions
bot
removed
the
Merge Conflict
FrontierATC
added a commit
that referenced
this pull request
Jan 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
This PR adds a new dispenser for condiments, in addition to a dispenser for condiment cups and crafting means for each.
Big shout to @wallflowerghost for the sprite glowup.
Why / Balance
I was looking for an alternative approach to the condiment station vending machine and thought this might be a viable alternative. PLUS I needed a way to offload 1000u of ketchup, so having a way to better get the ketchup out of the barrel and into the customer's hands, even 5u at a time, seemed ideal.
How to test
Place and ensure the filled condiment machine comes stocked as desired.
Ditto condiment cups.
Ensure that all crafting recipes are functioning as desired.
Media
Requirements
Breaking changes
Changelog
🆑