diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 6187e8791f8..8aed4c86bfa 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -176,7 +176,7 @@ return ..() var/obj/item/organ/internal/stomach/stomach = internal_organs_by_name[BP_STOMACH] if(stomach) - return nutrition + (stomach.ingested.total_volume * 10) + return nutrition + stomach.ingested.total_volume return 0 /mob/living/carbon/human/Stat() @@ -893,7 +893,7 @@ var/obj/item/organ/internal/stomach/stomach = internal_organs_by_name[BP_STOMACH] var/nothing_to_puke = FALSE if(should_have_organ(BP_STOMACH)) - if(!istype(stomach) || (stomach.ingested.total_volume <= 5 && stomach.contents.len == 0)) + if(!istype(stomach) || (stomach.ingested.total_volume <= 3 && !length(stomach.contents))) nothing_to_puke = TRUE else if(!(locate(/mob) in contents)) nothing_to_puke = TRUE diff --git a/code/modules/organs/internal/stomach.dm b/code/modules/organs/internal/stomach.dm index f9640757eb2..3f65e250189 100644 --- a/code/modules/organs/internal/stomach.dm +++ b/code/modules/organs/internal/stomach.dm @@ -23,7 +23,7 @@ /obj/item/organ/internal/stomach/Initialize() . = ..() - ingested = new /datum/reagents/metabolism(240, owner, CHEM_INGEST) + ingested = new /datum/reagents/metabolism(stomach_volume, owner, CHEM_INGEST) if(!ingested.my_atom) ingested.my_atom = src if(species && species.gluttonous) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index fae573002f1..4c41f7e95ae 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -66,8 +66,7 @@ taste_mult = 4 reagent_state = SOLID metabolism = REM * 2 - ingest_met = REM * 4 - var/nutriment_factor = 12 // Per removed in digest. + var/nutriment_factor = 8 // Per removed in digest. var/hydration_factor = 0 // Per removed in digest. var/blood_factor = 2 var/regen_factor = 0.8 @@ -82,7 +81,7 @@ name = "Synthetic Nutriment" description = "A cheaper alternative to actual nutriment." taste_description = "cheap food" - nutriment_factor = 10 + nutriment_factor = 6 attrition_factor = (REM * 4)/BASE_MAX_NUTRITION // Increases attrition rate. /decl/reagent/nutriment/mix_data(var/list/newdata, var/newamount, var/datum/reagents/holder) @@ -135,7 +134,7 @@ Generally coatings are intended for deep frying foods */ /decl/reagent/nutriment/coating - nutriment_factor = 6 //Less dense than the food itself, but coatings still add extra calories + nutriment_factor = 4 //Less dense than the food itself, but coatings still add extra calories var/icon_raw var/icon_cooked var/coated_adj = "coated" @@ -251,7 +250,7 @@ description = "More commonly known as fat, the third macronutrient, with over double the energy content of carbs and protein" reagent_state = SOLID - nutriment_factor = 27//The caloric ratio of carb/protein/fat is 4:4:9 + nutriment_factor = 12 color = "#CCCCCC" taste_description = "fat" @@ -309,7 +308,7 @@ /decl/reagent/nutriment/honey name = "Honey" description = "A golden yellow syrup, loaded with sugary sweetness." - nutriment_factor = 10 + nutriment_factor = 8 color = "#FFFF00" taste_description = "honey" germ_adjust = 5 diff --git a/html/changelogs/geeves-food.yml b/html/changelogs/geeves-food.yml new file mode 100644 index 00000000000..874e1e34b62 --- /dev/null +++ b/html/changelogs/geeves-food.yml @@ -0,0 +1,10 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "The amount of things your stomach can hold is now based on your stomach volume." + - tweak: "Reduced the amount of nutrition nutriment refills across the board. Greatly reduced the amount fat fills." + - tweak: "Reduced the speed at which nutriment gets metabolised." + - tweak: "Stomach volume now contributes less to overall fullness." + - tweak: "Made it so that you can throw up at a lower stomach volume." \ No newline at end of file