Ports sprites, nutella, decapitating champagne bottles with swords, more #34567
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
rootoo807
force-pushed
the
iconport
branch
4 times, most recently
from
bf161a5
to
7f6fdf3
Compare
|
Could not for the life of me figure out why make_froth() doesn't make froth on soda when exploded. otherwise this is ready for review |
MuckerMayhem
approved these changes
Apr 29, 2024
Bay12Bot
added a commit
that referenced
this pull request
Apr 30, 2024
MuckerMayhem
pushed a commit
that referenced
this pull request
May 7, 2024
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.
馃啈 rootoo807
imageadd: Ports new sprites for cans, bottles, condiments, other assorted reagent containers from Aurora. Updates several unique Bay sprites to the same standard.
rscadd: Soda cans and other closed drinks can be shaken (use on harm intent). If shaken, fizzy drinks explode when opened.
rscadd: Adds champagne popping and sabrage (opening with swords). Sabrage needs experienced cooking skill for a 100% success chance.
rscadd: Adds ground peanuts (obtained by growing peanuts) and almond meal (obtained by growing almonds). Added these to several food items and a new protein bar flavor, "peanut crunch".
rscadd: Adds peanut butter and "NTella", recipes for making them, and several new food and drink recipes that use them (ported from Aurora, PBJ sprite from tg).
rscadd: Adds recipes for sprinkles and white wine.
tweak: Vacuum flasks have caps now. You can take them off and use them as cups.
tweak: Shakers have sounds when shaken.
tweak: Coffee cups (the ones from vending machines), cup ramen (resprited), paper water cups, and condiment containers (the generic ones) show the color of their contents. Tweaked some reagent colors to look nicer in cups.
tweak: Soda bottles are now small bottles to match their new sprites, doubled the amount of soda bottles in the booze-o-mat to compensate.
/:cl:
Not user facing: splits drinks.dmi into several more organized .dmi's, splits out several food storage containers from food.dmi, lightly reworks condiments.
Lots of ported features from Aurora, primarily from this PR, which in turn ported cans, bottles, and condiments from /tg/ here, here, and here. All spritework not from Aurora/tg was done by me using the existing sprites as templates for reference.