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.

Sign up for GitHub

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

Jump to bottom

Lemon Lime Bitters #2464

Merged
merged 21 commits into from
Feb 18, 2025
Merged

Lemon Lime Bitters #2464

merged 21 commits into from
Feb 18, 2025

Conversation

BlitzTheSquishy
Copy link
Contributor

About the PR

Added lemon lime bitters

Why / Balance

It's a crime against Australians to not have already had this in DV let alone SS14.

Technical details

Media

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog

🆑

  • add: Lemon lime bitters! Australians Rejoice!

@BlitzTheSquishy BlitzTheSquishy requested review from a team as code owners December 18, 2024 00:18
@BlitzTheSquishy
Copy link
Contributor Author

still WIP

@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi size/M 64-255 lines labels Dec 18, 2024
@IamVelcroboy
Copy link
Member

still WIP

you can set as draft to signal it's WIP to maintainers. Top right side of page
image

@BlitzTheSquishy
Copy link
Contributor Author

still WIP

you can set as draft to signal it's WIP to maintainers. Top right side of page image

yeah.. but im laaazy

@BlitzTheSquishy BlitzTheSquishy marked this pull request as draft December 18, 2024 00:54
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Dec 18, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@BlitzTheSquishy
Copy link
Contributor Author

Conflicts from my own pr lmao

@Lyndomen
Copy link
Contributor

Direction review pending, 24 hours!

IamVelcroboy
IamVelcroboy previously requested changes Dec 18, 2024
View reviewed changes
Copy link
Member

@IamVelcroboy IamVelcroboy left a comment

Choose a reason for hiding this comment

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

Add to the random drink spawner

@Lyndomen
Copy link
Contributor

image

@BlitzTheSquishy
Copy link
Contributor Author

Add to the random drink spawner

I- havnt even MADE THE PROTOTYPE FOR THE BOTTLE YET GRRRRRRRRR

@Lyndomen
Copy link
Contributor

Add to the random drink spawner

I- havnt even MADE THE PROTOTYPE FOR THE BOTTLE YET GRRRRRRRRR

You asked for review!!! 😭😭😭

@BlitzTheSquishy
Copy link
Contributor Author

Add to the random drink spawner

I- havnt even MADE THE PROTOTYPE FOR THE BOTTLE YET GRRRRRRRRR

You asked for review!!! 😭😭😭

Nuh UH

@deltanedas
Copy link
Member

steal sprites from someone

@BlitzTheSquishy
Copy link
Contributor Author

steal sprites from someone

I am literally doing this right now-

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Feb 13, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 17, 2025 •
edited
Loading

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

Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi

State Old New Status
icon Added
icon_open Added

Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.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 b0544b5

@BlitzTheSquishy
Copy link
Contributor Author

"changes" i just made them god damn it

@BlitzTheSquishy BlitzTheSquishy marked this pull request as ready for review February 17, 2025 03:56
@ewokswagger
Copy link
Contributor

Is this still draft?

@ThataKat
Copy link
Contributor

Ok direction is reviewing 24 hours for real this time

@BlitzTheSquishy
Copy link
Contributor Author

Is this still draft?

Nope, i set it to normal PR

@ThataKat
Copy link
Contributor

Direction approved, drink responsibly

@deltanedas deltanedas merged commit 1ebdedf into DeltaV-Station:master Feb 18, 2025
16 checks passed
@Eagle0600
Copy link

It's only 1/6th bitters but as alcoholic as bitters? The real drink is effectively treated as nonalcoholic (you can definitely add vodka to make it alcoholic).

@deltanedas
Copy link
Member

the power of WA

@BlitzTheSquishy
Copy link
Contributor Author

It's only 1/6th bitters but as alcoholic as bitters? The real drink is effectively treated as nonalcoholic (you can definitely add vodka to make it alcoholic).

wait did i fuck up its alcohol value? I swear I had it as zero ethanol added?

@BlitzTheSquishy
Copy link
Contributor Author

It's only 1/6th bitters but as alcoholic as bitters? The real drink is effectively treated as nonalcoholic (you can definitely add vodka to make it alcoholic).

wait did i fuck up its alcohol value? I swear I had it as zero ethanol added?

oops

@Eagle0600 Eagle0600 mentioned this pull request Feb 18, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deltanedas deltanedas deltanedas approved these changes

@IamVelcroboy IamVelcroboy IamVelcroboy left review comments

Assignees
No one assigned
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/M 64-255 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@BlitzTheSquishy @IamVelcroboy @Lyndomen @deltanedas @ewokswagger @ThataKat @Eagle0600