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 cinnamon, both as plant and associated chem #15192

Merged
merged 2 commits into from Aug 13, 2023

Conversation

Glamurio
Copy link
Contributor

[Feature] [Hydroponics]

About the PR

This PR adds cinnamon sticks as a vegetable (because technically it is). It grows on cinnamon trees, whose bark is harvested for the delicious treat.

image

Cinnamon is also a chemical that enhances flavor, but has a side effect that when consuming too much of it, it will restrain you in place and make you cough up a bunch of cinnamon dust, rapidly depleting the chem. As this used some of the /datum/particleSystem/blow_cig_smoke, I reworked that, as it was always hard-coded to be white smoke, but it now allows for people to pass a desired color for the smoke.

Additionally it adds cinnamon to cinnamon donuts, which had no cinnamon.

Why's this needed?

This was a requested feature. Also, cinnamon is delicious.

Relevant thread on the forum:
https://forum.ss13.co/showthread.php?tid=21599

I'm likely going to add cinnamon in powdered form, akin to curry powder, to the chef locker, and allow people to produce it as well. But that will be in a follow-up PR.

Changelog

(u)Ryou (Glamurio) & Zac 
(*)Added cinnamon to the game. Ask your local botanist to grow you some! Careful not too eat too much of it.

@Glamurio Glamurio requested a review from Tarmunora as a code owner July 31, 2023 12:07
@keywordlabeler keywordlabeler bot added A-Hydroponics Deals with plants, hydro, etc. C-Feature A new feature or enhancements to existing features labels Jul 31, 2023
@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Jul 31, 2023
@github-actions github-actions bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 31, 2023
@MintyPhresh
Copy link
Contributor

thank you so much for not making this a tree mutation

@Mister-Moriarty Mister-Moriarty added the E-Add-To-Wiki A PR that will require changes to the wiki label Jul 31, 2023
code/modules/chemistry/Reagents-FoodDrink.dm Outdated Show resolved Hide resolved
code/modules/chemistry/Reagents-FoodDrink.dm Outdated Show resolved Hide resolved
code/modules/chemistry/Reagents-FoodDrink.dm Outdated Show resolved Hide resolved
code/modules/chemistry/Reagents-FoodDrink.dm Outdated Show resolved Hide resolved
@TobleroneSwordfish TobleroneSwordfish merged commit d62440d into goonstation:master Aug 13, 2023
21 checks passed
@Glamurio Glamurio deleted the cinnamon branch August 13, 2023 23:09
github-actions bot pushed a commit that referenced this pull request Aug 13, 2023
@Studenterhue Studenterhue removed the E-Add-To-Wiki A PR that will require changes to the wiki label Sep 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Hydroponics Deals with plants, hydro, etc. C-Feature A new feature or enhancements to existing features C-Sprites Automatically applied on any .dmi or icons folder change size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants