Randomized lollipop and gumball flavors #1074
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
github-actions
bot
added
Changes: C#
|
RSI Diff Bot; head commit f16967f merging into 4b80e48 Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi
|
should speed up downloading these textures on 9600 baud modems
deltanedas
requested changes
Apr 13, 2024
Content.Server/Nyanotrasen/Abilities/Borgs/CandyFlavorPrototype.cs
Outdated
Show resolved
Hide resolved
Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs
Outdated
Show resolved
Hide resolved
Content.Server/Nyanotrasen/Abilities/Borgs/RandomizedCandySystem.cs
Outdated
Show resolved
Hide resolved
Content.Server/Nyanotrasen/Abilities/Borgs/RandomizedCandySystem.cs
Outdated
Show resolved
Hide resolved
Signed-off-by: no <165581243+pissdemon@users.noreply.github.com>
deltanedas
approved these changes
Apr 13, 2024
nearlyNonexistent
referenced
this pull request
in nearlyNonexistent/Horizon-Station
Apr 14, 2024
* Give lollipops and gumballs random flavors * RandomizedCandy: Fix borg lollipop action * RandomizedCandy: Play sound when candy is fabricated * RandomizedCandy: Lollipop can now be put in mouth * RandomizedCandy: Quieten fab sound * RandomizedCandy: merge icons and reexport without pHYs chunk should speed up downloading these textures on 9600 baud modems * RandomizedCandy: loads more flavors and update description * RandomizedCandy: Fix duplicate candyFlavor IDs * RandomizedCandy: Fix attrib and preserve flavor order * RandomizedCandy: init on MapInit instead of ComponentInit * RandomizedCandy: Fix minor code style issues, file placement * RandomizedCandy: put new code into DeltaV namespace * RandomizedCandy: Removed redundant datafield tags Signed-off-by: no <165581243+pissdemon@users.noreply.github.com> --------- Signed-off-by: no <165581243+pissdemon@users.noreply.github.com>
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 makes gumballs and lollipops have random flavors! And it will also make borgs make a noise when dispensing them, as well as allow you to put lollipops in your mouth as god intended. (And I'm also contemplating buffing the lollipop a little.)
Why / Balance
Because nobody could tell me how they taste like and that's literally unacceptable. It also allows people to have really intense schoolyard disputes over their favorite flavors.
Technical details
Adds a candyFlavor proto. You can add new candy flavors, giving them a name, a color and a set of flavors (uses the Flavor proto).
Media
Also, when you eat them it shows the appropriate flavors, but you can probably use your imagination for that.
Breaking changes
None.
Changelog
🆑
TODO
(Laika, who I blame for this PR, said they would help with sprite stuff for this)