-
Notifications
You must be signed in to change notification settings - Fork 399
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
Update custom drinks #993
Merged
IamVelcroboy
merged 10 commits into
DeltaV-Station:master
from
FluffiestFloof:drinkmetem
Apr 4, 2024
Merged
Update custom drinks #993
IamVelcroboy
merged 10 commits into
DeltaV-Station:master
from
FluffiestFloof:drinkmetem
Apr 4, 2024
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
hmm yes 13x17 sprite
RSI Diff Bot; head commit 7ce3781 merging into 82d700f Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi
|
IamVelcroboy
previously approved these changes
Mar 25, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me
nearlyNonexistent
referenced
this pull request
in nearlyNonexistent/Horizon-Station
Apr 14, 2024
* fix dulleaveanee icon weirdness hmm yes 13x17 sprite * First batch * fixes * imsmart * elp Some DV drink sprites are way too different from the base game sprites * oops * soju and sake * fix flavor * small fix to kvass
VMSolidus
added a commit
to Simple-Station/Einstein-Engines
that referenced
this pull request
May 12, 2024
## Mirror of PR #993: [Update custom drinks](DeltaV-Station/Delta-v#993) from <img src="https://avatars.githubusercontent.com/u/131613340?v=4" alt="DeltaV-Station" width="22"/> [DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v) <aside>PR opened by <img src="https://avatars.githubusercontent.com/u/9823203?v=4" width="16"/><a href="https://github.com/FluffiestFloof"> FluffiestFloof</a> at 2024-03-21 21:36:52 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/9823203?v=4" width="16"/><a href="https://github.com/FluffiestFloof"> FluffiestFloof</a> at 2024-04-04 17:06:01 UTC</aside> <sup> `be0d84458adc156a7f2bcb6305a7d6dbb5042c10` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: YML - Changes: Localization - Changes: Sprite --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > Gives all the DeltaV and Nyano drinks new empty and fill sprites. > Fun. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > Looks better. > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > Fixes #985 > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > > - [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > <!-- > List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes. > --> > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > > 🆑 > - fix: Fixed our custom drinks not having different fill levels. </details> Co-authored-by: Fluffiest Floofers <[email protected]> Co-authored-by: VMSolidus <[email protected]>
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
# Description This PR adds a long overdue Guidebook for Harpies. However, I am physically incapable of half-assing it, so it contains ALL information about Harpies. Where they come from, notes on biology, what traits they have, what their average height is, what Language do they speak, etc. Also while I was at it, I put the singing animation in the character creation screen. So now it's basically impossible for anyone to miss out on the silly fact that they can do this. ![image](https://github.com/user-attachments/assets/134a80e8-7d9a-4bb0-8cdc-bb49dcb2399a) ![image](https://github.com/user-attachments/assets/5c35c2e2-aaf3-4695-a2e1-a69e13991dc8) # Changelog :cl: - add: Added a full Guidebook entry for Harpies. Unlike previous species guidebooks, this document contains extensive lore and background information for Harpies, in addition to notes on their game mechanics.
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: Localization
Changes any ftl files
Changes: Sprite
Changes any png or json in an rsi
Changes: YML
Changes any yml files
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
Gives all the DeltaV and Nyano drinks new empty and fill sprites.
Fun.
Why / Balance
Looks better.
Technical details
Fixes #985
Media
Breaking changes
Changelog
🆑