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.

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

[MIRROR] Ports sprites, nutella, decapitating champagne bottles with swords, more #2190

Merged
merged 4 commits into from
May 22, 2024

Conversation

SierraHelper
Copy link
Collaborator

Оригинальный PR: Baystation12#34567

🆑 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.

@SierraHelper SierraHelper requested a review from a team as a code owner April 30, 2024 16:49
@github-actions github-actions bot added ⛰️ Спрайты PR затрагивает спрайты 🔉 Звуки PR затрагивает звуки labels Apr 30, 2024
@SierraHelper SierraHelper added the 📜 CL валиден Ченджлог не содержит ошибок label Apr 30, 2024
@github-actions github-actions bot added the 🗺️ Карты Issue или PR затрагивает карты label May 22, 2024
@UEDCommander UEDCommander merged commit e3768a5 into dev-sierra May 22, 2024
12 checks passed
@UEDCommander UEDCommander deleted the upstream-pr-34567 branch May 22, 2024 18:12
SierraHelper added a commit that referenced this pull request May 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🪞 MIR ЯОЯ ⛰️ Спрайты PR затрагивает спрайты 📜 CL валиден Ченджлог не содержит ошибок 🔉 Звуки PR затрагивает звуки 🗺️ Карты Issue или PR затрагивает карты
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants