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

Starset Sarsaparilla #271

Merged
merged 6 commits into from
Jan 12, 2025

Conversation

SteroidsOnSteroids
Copy link

@SteroidsOnSteroids SteroidsOnSteroids commented Jan 3, 2025

About the PR

Added Starset Sarsaparilla to the list of beverages ingame

Why / Balance

I observed a serious lack of new vegas representation with the nuclear cola beverage so I took matters into my own hands

Technical details

Adds the starset sarsaparilla item, textures in the RSI, copyrights for those textures, and unique flavor for the beverage.

Media

Screenshot 2025-01-03 105921

Requirements

Breaking changes

No breaking changes.

Changelog

🆑

  • add: The Bartender can now go riding merrily along with the Starset Sarsaparilla and give the crewmembers spurs that jingle jangle jingle.

Copy link

github-actions bot commented Jan 3, 2025

RSI Diff Bot; head commit 1452738 merging into 43d9cdb
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon Added
icon_empty Added

Edit: diff updated after 1452738

@SteroidsOnSteroids
Copy link
Author

I'm gonna make a commit to change the color of the bottle sprite since that's off a bit

Signed-off-by: SteroidsOnSteroids <161250813+SteroidsOnSteroids@users.noreply.github.com>
@SteroidsOnSteroids
Copy link
Author

Okey dokey I think the sprites are good

Copy link
Collaborator

@FluffMe FluffMe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resources/Textures/_Harmony/Objects/Consumable/Drinks/sunset-soda.rsi/meta.json is changed with two added lines for no reason. Should be reverted.

@FluffMe FluffMe added S: Awaiting Changes Reviewer requested changes and removed S: Needs Review Review is requested labels Jan 6, 2025
Signed-off-by: SteroidsOnSteroids <161250813+SteroidsOnSteroids@users.noreply.github.com>
@SteroidsOnSteroids
Copy link
Author

fixed I believe

Copy link
Collaborator

@DieselMohawk DieselMohawk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorta wish the glass was more of that Mojave orange, but it works.

Good work

@SteroidsOnSteroids
Copy link
Author

SteroidsOnSteroids commented Jan 11, 2025

Sorta wish the glass was more of that Mojave orange, but it works.

Good work

Me too, but considering most drinks have a blue outline regardless of the contents I tried to keep the sprite somewhat consistent with the rest of the drinks, may do another sprite update in the future

@github-actions github-actions bot added S: Needs Review Review is requested and removed S: Awaiting Changes Reviewer requested changes labels Jan 11, 2025
@FluffMe
Copy link
Collaborator

FluffMe commented Jan 12, 2025

Updated PR to uncomment the CL

@FluffMe FluffMe merged commit ebb2a4f into ss14-harmony:master Jan 12, 2025
14 checks passed
FluffMe added a commit that referenced this pull request Jan 12, 2025
@SteroidsOnSteroids SteroidsOnSteroids deleted the startset_sarsaparilla branch January 12, 2025 22:09
ReboundQ3 pushed a commit to ReboundQ3/Late-station-14 that referenced this pull request Jan 19, 2025
* sunset_spacesparilla

* sunset_spacesparilla

* Add files via upload

Signed-off-by: SteroidsOnSteroids <161250813+SteroidsOnSteroids@users.noreply.github.com>

* Update meta.json

Signed-off-by: SteroidsOnSteroids <161250813+SteroidsOnSteroids@users.noreply.github.com>

---------

Signed-off-by: SteroidsOnSteroids <161250813+SteroidsOnSteroids@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants