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

Extra ration icons #3290

Merged
merged 5 commits into from
Aug 25, 2024
Merged

Extra ration icons #3290

merged 5 commits into from
Aug 25, 2024

Conversation

Aquidu
Copy link
Contributor

@Aquidu Aquidu commented Aug 13, 2024

About The Pull Request

Adds a unique emblem for each ration box, providing a visual cue for what kind of food can be found inside, adds coloring to the condiment sprites, and creates new sprites for the ration heater side-size rations, drink mixes, and vodka!
Ration boxes
Screenshot (2932)
Side ration, heater, and vodka
Screenshot (2933)
Drink mixes
Screenshot (2927)
Condiments
Screenshot (2926)

Why It's Good For The Game

Currently, the ration heater and vodka use the same icon as the ration box, all ration boxes look the same, "snack" and "side" rations look identical, condiments and drink packs use the same model, and filling color doesn't work for either one. This PR gives each ration a unique icon to be recognized by.

Maintainer edit: cleaned up changelog

Changelog

🆑Aquidu
add: Rations now have icons that help show the contents.
add: Condiments and drink mixes now have colors when full to help show the contents.
add: Unique sprites for the ration heater, drink packs ration drinks, and "side" category rations.
code: Changes the sound effect for opening the drink ration to the bottle cap sound to line up with the icon.
/:cl:

@Aquidu Aquidu requested review from FalloutFalcon and a team as code owners August 13, 2024 19:35
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Aug 13, 2024
@thgvr thgvr added this pull request to the merge queue Aug 25, 2024
Merged via the queue into shiptest-ss13:master with commit 9996795 Aug 25, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Aug 26, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Adds a unique emblem for each ration box, providing a visual cue for
what kind of food can be found inside, adds coloring to the condiment
sprites, and creates new sprites for the ration heater side-size
rations, drink mixes, and vodka!
Ration boxes
![Screenshot
(2932)](https://github.com/user-attachments/assets/5e88056f-4428-4dcc-b20a-eba7d0f54a78)
Side ration, heater, and vodka
![Screenshot
(2933)](https://github.com/user-attachments/assets/94185737-83c6-4722-975d-a8055408c67c)
Drink mixes
![Screenshot
(2927)](https://github.com/user-attachments/assets/8f47233c-e339-4c15-98a9-eea9ee5f50df)
Condiments
![Screenshot
(2926)](https://github.com/user-attachments/assets/db9b791e-912a-459a-b6d2-0c44c8d618da)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Currently, the ration heater and vodka use the same icon as the ration
box, all ration boxes look the same, "snack" and "side" rations look
identical, condiments and drink packs use the same model, and filling
color doesn't work for either one. This PR gives each ration a unique
icon to be recognized by.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

Maintainer edit: cleaned up changelog
## Changelog

:cl:Aquidu
add: Rations now have icons that help show the contents.
add: Condiments and drink mixes now have colors when full to help show
the contents.
add: Unique sprites for the ration heater, drink packs ration drinks,
and "side" category rations.
code: Changes the sound effect for opening the drink ration to the
bottle cap sound to line up with the icon.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
@Aquidu Aquidu deleted the ration-resprite branch August 27, 2024 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants