From 125a7e29b415185cce830494dc3ff08f8827b919 Mon Sep 17 00:00:00 2001 From: Crosarius <30341877+Crosarius@users.noreply.github.com> Date: Sat, 8 Aug 2020 04:49:02 +1000 Subject: [PATCH] Gluttony (#9610) Fixes an oversight which prevented Unathi from being able to devour big mobs such as space carp, cows, etc. This does not allow them to eat Humanoids. Looks like carp are back on the menu boys! --- code/modules/organs/internal/stomach.dm | 6 +++--- html/changelogs/Crosarius-Gluttony.yml | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/Crosarius-Gluttony.yml diff --git a/code/modules/organs/internal/stomach.dm b/code/modules/organs/internal/stomach.dm index fd3bbd4bba4..d9b073bec43 100644 --- a/code/modules/organs/internal/stomach.dm +++ b/code/modules/organs/internal/stomach.dm @@ -75,7 +75,7 @@ var/mob/living/L = food if((species.gluttonous & GLUT_TINY) && (L.mob_size <= MOB_TINY) && !ishuman(food)) // Anything MOB_TINY or smaller return DEVOUR_SLOW - else if((species.gluttonous & (GLUT_SMALLER|GLUT_MESSY)) && owner.mob_size > L.mob_size) // Anything we're larger than + else if((species.gluttonous & GLUT_MESSY) || ((species.gluttonous & GLUT_SMALLER) && owner.mob_size > L.mob_size)) //Whether you can eat things smaller, or bigger than you. return DEVOUR_SLOW else if(species.gluttonous & GLUT_ANYTHING) // Eat anything ever return DEVOUR_FAST @@ -98,9 +98,9 @@ /obj/item/organ/internal/stomach/proc/metabolize() if(is_usable()) ingested.metabolize() - + #define STOMACH_VOLUME 65 - + /obj/item/organ/internal/stomach/process() ..() if(owner) diff --git a/html/changelogs/Crosarius-Gluttony.yml b/html/changelogs/Crosarius-Gluttony.yml new file mode 100644 index 00000000000..f1a494f668b --- /dev/null +++ b/html/changelogs/Crosarius-Gluttony.yml @@ -0,0 +1,8 @@ +# Your name. +author: Crosarius + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +changes: + - bugfix: "Fixed Unathi not being able to eat mobs larger than themselves in their usual spectacularly messy fashion. Carp, cows, etc are back on the menu+."