diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm index 3efba64e5ae..d0428cdb6bc 100644 --- a/code/__defines/mobs.dm +++ b/code/__defines/mobs.dm @@ -117,6 +117,11 @@ #define MOB_TINY 5 #define MOB_MINISCULE 1 +// Gluttony levels. +#define GLUT_TINY 1 // Eat anything tiny and smaller +#define GLUT_SMALLER 2 // Eat anything smaller than we are +#define GLUT_ANYTHING 3 // Eat anything, ever + #define TINT_NONE 0 #define TINT_MODERATE 1 #define TINT_HEAVY 2 diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm index fa7dda8f576..3e919def334 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm @@ -26,7 +26,7 @@ cold_level_3 = 0 eyes = "vox_eyes_s" - gluttonous = 2 + gluttonous = GLUT_SMALLER breath_type = "nitrogen" poison_type = "oxygen" diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 598e19aace8..a0f033fe90f 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -121,7 +121,7 @@ var/primitive_form // Lesser form, if any (ie. monkey for humans) var/greater_form // Greater form, if any, ie. human for monkeys. var/holder_type - var/gluttonous // Can eat some mobs. 1 = eat MOB_TINY and below, 2 = eat anything we're larger than, 3 = eat anything + var/gluttonous // Can eat some mobs. Values can be GLUT_TINY, GLUT_SMALLER, GLUT_ANYTHING. var/rarity_value = 1 // Relative rarity/collector value for this species. // Determines the organs that the species spawns with and var/list/has_organ = list( // which required-organ checks are conducted. diff --git a/code/modules/mob/living/carbon/human/species/station/resomi.dm b/code/modules/mob/living/carbon/human/species/station/resomi.dm index 238f022aabb..9cdf3b82e53 100644 --- a/code/modules/mob/living/carbon/human/species/station/resomi.dm +++ b/code/modules/mob/living/carbon/human/species/station/resomi.dm @@ -30,7 +30,7 @@ mob_size = MOB_SMALL holder_type = /obj/item/weapon/holder/human short_sighted = 1 - gluttonous = 1 + gluttonous = GLUT_TINY spawn_flags = CAN_JOIN | IS_WHITELISTED appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_EYE_COLOR diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index a4d9ce10a12..ec8fe65ccb9 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -28,7 +28,7 @@ unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) primitive_form = "Stok" darksight = 3 - gluttonous = 1 + gluttonous = GLUT_TINY slowdown = 0.5 brute_mod = 0.8 num_alternate_languages = 2 @@ -87,7 +87,7 @@ slowdown = -0.5 brute_mod = 1.15 burn_mod = 1.15 - gluttonous = 1 + gluttonous = GLUT_TINY num_alternate_languages = 2 secondary_langs = list("Siik'tajr") name_language = "Siik'tajr" diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm index 3c89ed183b0..22f583e1063 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm @@ -11,7 +11,7 @@ has_fine_manipulation = 0 siemens_coefficient = 0 - gluttonous = 3 + gluttonous = GLUT_ANYTHING eyes = "blank_eyes" diff --git a/code/modules/mob/mob_grab_specials.dm b/code/modules/mob/mob_grab_specials.dm index 860d214b141..1109e78129b 100644 --- a/code/modules/mob/mob_grab_specials.dm +++ b/code/modules/mob/mob_grab_specials.dm @@ -147,11 +147,11 @@ else var/mob/living/carbon/human/H = user if(istype(H) && H.species.gluttonous && (iscarbon(target) || isanimal(target))) - if(H.species.gluttonous == 1 && (target.mob_size <= MOB_TINY) && !ishuman(target)) // Anything MOB_TINY or smaller + if(H.species.gluttonous == GLUT_TINY && (target.mob_size <= MOB_TINY) && !ishuman(target)) // Anything MOB_TINY or smaller can_eat = 1 - else if(H.species.gluttonous == 2 && (H.mob_size > target.mob_size)) // Anything we're larger than + else if(H.species.gluttonous == GLUT_SMALLER && (H.mob_size > target.mob_size)) // Anything we're larger than can_eat = 1 - else if(H.species.gluttonous == 3) // Eat anything ever + else if(H.species.gluttonous == GLUT_ANYTHING) // Eat anything ever can_eat = 2 if(can_eat)