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

Remake bottles and syringes names to use labels #29956

Merged
merged 5 commits into from
Sep 7, 2024
Merged

Remake bottles and syringes names to use labels #29956

merged 5 commits into from
Sep 7, 2024

Conversation

lzk228
Copy link
Contributor

@lzk228 lzk228 commented Jul 12, 2024 •
edited by UbaserB
Loading

About the PR

instead of nocturine bottle it now will be bottle (nocturine) and you can even remove this label! so no more meta things
also removed descriptions from some bottles so they wont be recognizable without the label
fixes #21533

some bottles and syringes loose contraband tag

Why / Balance

better

Technical details

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • tweak: Bottle and syringe names are remade into labels.

@github-actions github-actions bot added the Changes: No C# Changes: Requires no C# knowledge to review or fix this item. label Jul 12, 2024
@Plykiya
Copy link
Contributor

Plykiya commented Jul 12, 2024 •
edited
Loading

I believe drinks have this kind of problem as well, like with coffee or tea. Once the cup is empty... it's not coffee or tea anymore, y'know?

Great change

@lzk228
Copy link
Contributor Author

lzk228 commented Jul 12, 2024

I believe drinks have this kind of problem as well, like with coffee or tea. Once the cup is empty... it's not coffee or tea anymore, y'know?

a little controversial and out the scope of this pr

@slarticodefast
Copy link
Member

Do they show up correctly in vending machines?

@lzk228
Copy link
Contributor Author

lzk228 commented Jul 12, 2024

Do they show up correctly in vending machines?

yes they do #29178

@ShadowCommander
Copy link
Member

ShadowCommander commented Jul 13, 2024 •
edited
Loading

Not sure about removing the descriptions just for consistency and making them non-recognizable when the label is removed.

It makes it harder for new players to figure out what the tools they have do.

I'd be more ok with this if it still had an examine text somewhere like attached to the label.

@themias
Copy link
Contributor

themias commented Jul 18, 2024 •
edited
Loading

fixes #29506

@deltanedas
Copy link
Contributor

I'd be more ok with this if it still had an examine text somewhere like attached to the label.

erm why does your bottle say its used to make people sleep KOS

@lzk228
Copy link
Contributor Author

lzk228 commented Jul 19, 2024

fixes #29506

nope, i didnt localize pills

@slarticodefast
Copy link
Member

Fixes #21533

@lzk228 lzk228 closed this Aug 3, 2024
@lzk228 lzk228 deleted the 07-12 branch August 3, 2024 15:50
@lzk228 lzk228 restored the 07-12 branch August 3, 2024 15:51
@lzk228
Copy link
Contributor Author

lzk228 commented Aug 3, 2024

oop

@lzk228 lzk228 reopened this Aug 3, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 12, 2024
@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 14, 2024
UbaserB
UbaserB requested changes Sep 4, 2024
View reviewed changes
Copy link
Member

@UbaserB UbaserB left a comment

Choose a reason for hiding this comment

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

can you do this for vials too

@lzk228
Copy link
Contributor Author

lzk228 commented Sep 4, 2024

can you do this for vials too

yeah, done, i just forgot about their existing

@UbaserB UbaserB added the S: Undergoing Maintainer Discussion Status: Currently going through an extended discussion amongst maintainers, as per procedure. label Sep 4, 2024
@slarticodefast
Copy link
Member

Can do the same for the newly added bottles and vials in this PR?
#31738

@slarticodefast slarticodefast added the S: Awaiting Changes Status: Changes are required before another review can happen label Sep 5, 2024
@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Sep 5, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 5, 2024

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

@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Sep 5, 2024
@UbaserB UbaserB merged commit 9680c1d into space-wizards:master Sep 7, 2024
11 checks passed
@lzk228 lzk228 deleted the 07-12 branch September 7, 2024 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@UbaserB UbaserB UbaserB approved these changes

Assignees
No one assigned
Labels
Changes: No C# Changes: Requires no C# knowledge to review or fix this item. S: Awaiting Changes Status: Changes are required before another review can happen S: Undergoing Maintainer Discussion Status: Currently going through an extended discussion amongst maintainers, as per procedure.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

bottles with reagents should be just labeled
7 participants
@lzk228 @Plykiya @slarticodefast @ShadowCommander @themias @deltanedas @UbaserB