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

Gluttony rework #15919

Merged
Merged

Conversation

TobleroneSwordfish
Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish commented Sep 21, 2023

[BALANCE] [CATERING] [MEDICAL]

About the PR

This PR is a spiritual successor to #13538, based on some of the feedback it got.
Stomachs now have a capacity (default 7, cyberstomach 12) and can fill up if you eat too much. Each food item contributes an amount determined by its fill_amt var which defaults to 1 but varies between ~0.5-4 depending on the item.
Also adds a status effect to indicate being full.
image
Undigestible items consumed by either deepfrying or matter eater will stay in the stomach, contribute to the fullness amount and can be cut out by using a scalpel on the extracted stomach.
Stomach transplants now work as you'd expect, transferring the contents properly.

TODO:

  • Deal with edible deepfried items not being digested maybe?

Why's this needed?

Same reasoning as #13538, one determined staffie should not be able to demolish 40 minutes of cooking on their own, and a lot of stomach code was old and weird and bad and now it's better.
Also since #15914 was made while I was writing this, provides an alternative solution that keeps things able to have effects after being eaten, but with a way to remove them.

The numbers are pretty arbitrary and based on "this seems about right" so feel free to suggest changes.

Changelog

(u)LeahTheTech
(*)Stomachs now have a capacity and can fill up if you eat too much, cyberstomachs have more. No longer can a single determined staffie consume the entire kitchen.
(+)Undigestible items now remain in the stomach after being eaten by frying or matter eater and can be retrieved by cutting them out of the extracted stomach with a scalpel.

@keywordlabeler keywordlabeler bot added A-Catering Deals with food, the chef, the bar or otherwise edible/drinkable stuff A-Medical Deals with our medical system in some way C-Balance Balance changes, buffs and nerfs labels Sep 21, 2023
@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Sep 21, 2023
@github-actions github-actions bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 21, 2023
@amylizzle
Copy link
Contributor

Consequences for eating deep fried rocks? What is this, 1984?

Copy link
Contributor

@amylizzle amylizzle left a comment

Choose a reason for hiding this comment

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

vorestation 2024

code/mob/living.dm Outdated Show resolved Hide resolved
code/modules/chemistry/tools/food_and_drink.dm Outdated Show resolved Hide resolved
code/obj/item/organs/stomach.dm Show resolved Hide resolved
code/obj/item/organs/stomach.dm Show resolved Hide resolved
code/obj/item/organs/stomach.dm Outdated Show resolved Hide resolved
@Glamurio
Copy link
Contributor

This is a really cool addition and the implementation seems neat. My primary reason for making #15914 though, was that we had an antag that had eaten telecrystals and was nigh impossible to catch. I'm not sure that, even with these additions, that it'll be possible to put them down long enough to cut out the telecrystals.

@TobleroneSwordfish
Copy link
Contributor Author

I'm pretty sure you could do the same thing with chest implanted items or telecrystal item arms so shrug. Personally I recommend hitting them until they stop moving.

@M-Earthfire
Copy link
Contributor

This is a really cool addition and the implementation seems neat. My primary reason for making #15914 though, was that we had an antag that had eaten telecrystals and was nigh impossible to catch. I'm not sure that, even with these additions, that it'll be possible to put them down long enough to cut out the telecrystals.

If you can't catch them, kill them.

@Glamurio
Copy link
Contributor

I'm pretty sure you could do the same thing with chest implanted items or telecrystal item arms so shrug. Personally I recommend hitting them until they stop moving.

Totally, but the time it takes to eat a telecrystal vs. do surgery on someone is different. Nevertheless, that's a unique issue and not related to this PR.

@TobleroneSwordfish TobleroneSwordfish merged commit 03a2ca1 into goonstation:master Sep 22, 2023
23 checks passed
github-actions bot pushed a commit that referenced this pull request Sep 22, 2023
@TobleroneSwordfish TobleroneSwordfish added the E-Add-To-Wiki A PR that will require changes to the wiki label Sep 22, 2023
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-Medical Deals with our medical system in some way C-Balance Balance changes, buffs and nerfs C-Sprites Automatically applied on any .dmi or icons folder change E-Add-To-Wiki A PR that will require changes to the wiki 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

4 participants