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

Adds new candies/treats, brownies, and refactors existing wrapped candy code #17553

Merged
merged 14 commits into from Jan 29, 2024

Conversation

itsloley
Copy link
Contributor

@itsloley itsloley commented Jan 3, 2024

[CATERING][CODE QUALITY][FEATURE][ADD TO WIKI]

About the PR

Adds a lot of melted sugar based recipes to the kitchen!

  • Sugar can be melted by putting sugar and a tray in the oven for 5s on high or 10s on low. Reagents can be poured into the tray of sugar!
  • The tray can be cut into strips, which can be put on rods or popsicle sticks to be turned into rock candy.
  • Melted sugar strips can be cut into individual hard candy pieces, which can be wrapped in paper for presentation!
  • Hard candy pieces can be put on a rod or popsicle stick to make small lollipops, similar to the ones found in medbay.
  • Melted sugar strips can be used in-hand to make them into a circle which can be put on a rod or popsicle stick to make a swirly lollipop.
  • Putting flour onto a melted sugar circle allows it to be folded in-hand, creating dragon's beard candy.
  • Dragon's beard candy gets better the more times you fold it! It has a chance to break, but your chances are better if you're a skilled chef and apply flour before each fold.
  • Dragon's beard candy can be cut into individual pieces.
  • Also adds brownies, made with sweet dough, 2 eggs and a chocolate bar in the mixer, then putting the brownie batter in the oven for 7 seconds on high.
  • Refactors wrapped candy code, combining candies that had a wrapper before into one parent type

Why's this needed?

Adds a lot more candy recipes for the chef to play with! Hand out comedically oversized lollipops to the crew, swap medbay's lollipops for dubious homemade ones, or just inject brownies with THC.

yippee

Changelog

(u)Lyy, Beshemoth
(*)Added melted sugar cooking recipes, including rock candy, hard candy, craftable lollipops, swirly lollipops, and dragon's beard candy!

@keywordlabeler keywordlabeler bot added A-Catering Deals with food, the chef, the bar or otherwise edible/drinkable stuff C-Code-Quality Cleans up code, refactors things to be more readable or intuitive C-Feature A new feature or enhancements to existing features E-Add-To-Wiki A PR that will require changes to the wiki labels Jan 3, 2024
@boring-cyborg boring-cyborg bot added A-Mapping A mapping change C-Sprites Automatically applied on any .dmi or icons folder change labels Jan 3, 2024
@github-actions github-actions bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jan 3, 2024
@imawxome
Copy link

imawxome commented Jan 3, 2024

yippeee

@pali6
Copy link
Member

pali6 commented Jan 3, 2024

Very neat!

Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

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

Oh these look sweet! Only issue I can see at a glance is that the brownies are in cavalier perspective, they should be in cabinet perspective. See the discord #imspriter channel for details.

Copy link
Member

@ZeWaka ZeWaka left a comment

Choose a reason for hiding this comment

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

sprites still need to be fixed imo

@Roninnozlo
Copy link

Oh these look sweet! Only issue I can see at a glance is that the brownies are in cavalier perspective, they should be in cabinet perspective. See the discord #imspriter channel for details.

I think they're supposed to be 3/4th perspective, not either of those.

Anyway I saw in the channel that they do indeed have a 3/4 version of the brownie pans

@itsloley itsloley requested a review from ZeWaka January 13, 2024 15:11
Copy link
Contributor

This PR has been inactive for two weeks, and has been automatically marked as stale. This means it is at risk of being auto closed in another week. Please address any outstanding review items and ensure your PR is finished. If you are auto-staled anyway, ask developers if your PR will be merged. Once you have done any of the previous actions then you should request a developer remove the stale label on your PR, to reset the stale timer. If you feel no developer will respond in that time, you may wish to close this PR youself, while you seek developer comment, as you will then be able to reopen the PR yourself.

@github-actions github-actions bot added the S-Stale An inactive PR that has had no updates in the past two weeks label Jan 28, 2024
@TobleroneSwordfish TobleroneSwordfish removed the S-Stale An inactive PR that has had no updates in the past two weeks label Jan 28, 2024
Copy link
Member

@WALPVRGIS WALPVRGIS left a comment

Choose a reason for hiding this comment

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

Some sprite review stuff; these are the only things I want changed tbh and then I'm totally happy for this to be merged. Cute sprites :3 Love seeing new pretty recipes as fun art is kinda the main reward of cooking >:D

icons/obj/foodNdrink/food_candy.dmi Outdated Show resolved Hide resolved
icons/obj/foodNdrink/food_dessert.dmi Outdated Show resolved Hide resolved
Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

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

Some code nitpicks before I merge, never call update_icon directly.

code/modules/food_and_drink/ingredients.dm Outdated Show resolved Hide resolved
code/modules/food_and_drink/ingredients.dm Outdated Show resolved Hide resolved
code/modules/food_and_drink/ingredients.dm Outdated Show resolved Hide resolved
code/modules/food_and_drink/ingredients.dm Outdated Show resolved Hide resolved
code/modules/food_and_drink/ingredients.dm Outdated Show resolved Hide resolved
@TobleroneSwordfish TobleroneSwordfish merged commit 029a867 into goonstation:master Jan 29, 2024
20 checks passed
github-actions bot pushed a commit that referenced this pull request Jan 29, 2024
@TobleroneSwordfish TobleroneSwordfish removed the E-Add-To-Wiki A PR that will require changes to the wiki label Jan 31, 2024
@itsloley itsloley deleted the sweetsntreats branch February 29, 2024 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Catering Deals with food, the chef, the bar or otherwise edible/drinkable stuff A-Mapping A mapping change C-Code-Quality Cleans up code, refactors things to be more readable or intuitive C-Feature A new feature or enhancements to existing features C-Sprites Automatically applied on any .dmi or icons folder change size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants