Adds choccy milk and milkshake #11295
Open
+74
−8
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cmss13-ci
bot
added
Sprites
cm13-github
added
the
Merge Conflict
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
Contributor
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
Blundir
approved these changes
Dec 14, 2025
github-project-automation
bot
moved this from Awaiting Review
to Partially Approved / Mergeable
in Review Backlog
realforest2001
approved these changes
Dec 14, 2025
|
|
||
| /obj/item/reagent_container/food/condiment/on_reagent_change() | ||
| if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "hotsauce_cholula" || icon_state == "hotsauce_franks" || icon_state == "hotsauce_sriracha" || icon_state == "hotsauce_tabasco" || icon_state == "coldsauce_cole") | ||
| if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "hotsauce_cholula" || icon_state == "hotsauce_franks" || icon_state == "hotsauce_sriracha" || icon_state == "hotsauce_tabasco" || icon_state == "coldsauce_cole" || icon_state == "chocolate_syrup") |
Member
There was a problem hiding this comment.
this probably needs to be cleaned up into if(icon_state in STATIC_CONTAINER_ICONS) with a define list
Contributor
Author
There was a problem hiding this comment.
I'm unsure how to go about doing this, but I will try.
realforest2001
requested changes
Dec 14, 2025
Member
realforest2001
left a comment
realforest2001
left a comment
There was a problem hiding this comment.
Wrong button first time
github-project-automation
bot
moved this from Partially Approved / Mergeable
to Changes Requested
in Review Backlog
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the pull request
Feeling sad? FIFTY-TWO CENTILITERS OF CHOCCY MILK!!!!
Chocolate syrup recipe: Grind chocolate bar
Chocolate milk recipe: 4 parts milk, 1 part chocolate syrup
Chocolate Milkshake recipe: 2 parts ice, 2 parts chocolate milk, 1 part cream
Explain why it's good for the game
Feeling depressed? FIFTY-TWO CENTILITERS OF CHOCCY!!!!! MILK!!!!
Testing Photographs and Procedure
Screenshots & Videos
HOOOOOOOLYYYYYYY SHIIIIIIIIIITTTTT!
Changelog
🆑 Puckaboo2
add: Adds chocolate milk, and chocolate milkshakes.
add: Grind chocolate bars to make chocolate syrup.
add: Adds Chocolate Syrup to soda fountains.
add: Adds chocolate syrup to some fridges.
imageadd: Adds a WY-brand chocolate syrup bottle filled with chocolate syrup, adds chocolate milk glass and chocolate milkshake glass
code: Renames 'chocolate' to 'chocolatesyrup' and renames 'glass of chocolate' to 'glass of chocolate syrup'
/:cl: