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

fix lollipops always being white #14945

Merged
merged 2 commits into from Jul 21, 2023
Merged

Conversation

TheTyrant25
Copy link
Contributor

[MINOR]

About the PR

Because the main reagent in lollipops is sugar (5u), it would always override the colour of the actual sweet (which is supposed to be randomly assigned, or based on the main reagent). This PR fixes that.

Why's this needed?

They're supposed to be colourful damn it.

Changelog

(u)Tyrant
(+)Lollipops have colours once again.

@keywordlabeler keywordlabeler bot added the P-Minor A bug that does not impact usage of a feature. These are often visual issues label Jul 14, 2023
@github-actions github-actions bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 14, 2023
@TheTyrant25
Copy link
Contributor Author

yes i like absolute pathing, so what
at least i didn't redo the whole file like i was tempted to.

@TheTyrant25 TheTyrant25 added the C-Bug A bug that impacts usage of a feature label Jul 15, 2023
code/modules/food_and_drink/candy.dm Outdated Show resolved Hide resolved
Co-authored-by: ZeWaka <zewakagamer@gmail.com>
@TheTyrant25 TheTyrant25 requested a review from ZeWaka July 21, 2023 05:33
@ZeWaka ZeWaka merged commit 6b62de6 into goonstation:master Jul 21, 2023
21 checks passed
github-actions bot pushed a commit that referenced this pull request Jul 21, 2023
@TheTyrant25 TheTyrant25 deleted the colour branch July 21, 2023 23:51
TyrantCerberus added a commit to TyrantCerberus/HybridOldVersion that referenced this pull request Sep 22, 2023
TyrantCerberus added a commit to TyrantCerberus/HybridOldVersion that referenced this pull request Sep 22, 2023
Ports Goon PR goonstation#14945 "fix lollipops always being white" by TheTyrant25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-Bug A bug that impacts usage of a feature P-Minor A bug that does not impact usage of a feature. These are often visual issues size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants