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

Pill bottle coloring #6190

Merged
merged 15 commits into from
Apr 26, 2024
Merged

Pill bottle coloring #6190

merged 15 commits into from
Apr 26, 2024

Conversation

Git-Nivrak
Copy link
Contributor

@Git-Nivrak Git-Nivrak commented Apr 24, 2024 •
edited
Loading

About the pull request

You can now change pill bottle colors with 12 color options!
Color reference:
image

Explain why it's good for the game

Allows for some less bland colors on custom pill bottles that are nicer on the eye
It's also pretty cool

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
qol: You can now change the color of pill bottles in the chem master or with a hand labeler.
/:cl:

@github-actions github-actions bot added the Quality of Life Make the game harder to play label Apr 24, 2024
Drulikar
Drulikar requested changes Apr 24, 2024
View reviewed changes
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

This is fine to do, but as a verb is a little weird.

Please instead make this a feature for the ChemMaster:
image

Its also one of the few machines that still needs to be TGUIified but for now if you just want to add the feature to this nanu UI thats okay.

@Drulikar Drulikar marked this pull request as draft April 24, 2024 20:21
@Git-Nivrak Git-Nivrak marked this pull request as ready for review April 24, 2024 20:49
@Drulikar Drulikar marked this pull request as draft April 24, 2024 22:02
@Git-Nivrak Git-Nivrak changed the title Adds a verb to change pill bottle colors Pill bottle coloring Apr 25, 2024
@Git-Nivrak Git-Nivrak marked this pull request as ready for review April 25, 2024 05:16
Drulikar
Drulikar requested changes Apr 25, 2024
View reviewed changes
code/game/objects/items/storage/firstaid.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/firstaid.dm Outdated Show resolved Hide resolved
code/game/objects/items/tools/misc_tools.dm Outdated Show resolved Hide resolved
code/modules/reagents/chemistry_machinery/chem_master.dm Outdated Show resolved Hide resolved
Drulikar
Drulikar approved these changes Apr 25, 2024
View reviewed changes
code/game/objects/items/storage/firstaid.dm Outdated Show resolved Hide resolved
Zonespace27
Zonespace27 previously requested changes Apr 25, 2024
View reviewed changes
code/game/objects/items/storage/firstaid.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar added this pull request to the merge queue Apr 26, 2024
Merged via the queue into cmss13-devs:master with commit ccb9bc5 Apr 26, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Apr 26, 2024
@cm13-github
Automatic changelog for PR #6190 [ci skip]
2bd98eb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Drulikar Drulikar Drulikar approved these changes

@Zonespace27 Zonespace27 Zonespace27 left review comments

Assignees
No one assigned
Labels
Quality of Life Make the game harder to play
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Git-Nivrak @Zonespace27 @Drulikar