From 96ef62e297b832c4c60c1994067f6470be721bbe Mon Sep 17 00:00:00 2001 From: FalseIncarnate Date: Tue, 19 May 2015 06:14:41 -0400 Subject: [PATCH] Diet Changes Changes the Kidan racial diet to DIET_HERB, from DIET_OMNI, to maintain consistency with Paradise Lore. Removes diet flags from Diona and IPCs since they utilize alternate nutrition sources. This prevents them from benefiting from any nutriment, protein, or plant-matter they metabolize. Adjusted comments in the on_mob_life procs for Protein and Plant-matter to better explain the diet flag checks and correct a copy-paste mistake on the comments. --- code/modules/mob/living/carbon/species.dm | 6 +++--- code/modules/reagents/Chemistry-Reagents.dm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 5712d788ce8..e325e52ac83 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -553,7 +553,7 @@ flags = IS_WHITELISTED bodyflags = FEET_CLAWS - dietflags = DIET_OMNI + dietflags = DIET_HERB blood_color = "#FB9800" @@ -644,7 +644,7 @@ water and other radiation." flags = NO_BREATHE | REQUIRE_LIGHT | IS_PLANT | RAD_ABSORB | NO_BLOOD | NO_PAIN - dietflags = DIET_HERB //Diona regenerate nutrition in light, but could assimilate plantmatter if they ingest it + dietflags = 0 //Diona regenerate nutrition in light, no diet necessary body_temperature = T0C + 15 //make the plant people have a bit lower body temperature, why not @@ -730,7 +730,7 @@ synth_temp_gain = 10 //this should cause IPCs to stabilize at ~80 C in a 20 C environment. flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | IS_SYNTHETIC | NO_INTORGANS - dietflags = DIET_OMNI //IPCs can't eat, this is here for the sake of standardized code + dietflags = 0 //IPCs can't eat, so no diet blood_color = "#1F181F" flesh_color = "#AAAAAA" diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 90a89c43490..4bac537ed9b 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1519,7 +1519,7 @@ datum if(!(M.mind in ticker.mode.vampires)) if(ishuman(M)) var/mob/living/carbon/human/H = M - if(H.species && H.species.dietflags && !(H.species.dietflags & DIET_HERB)) //Make sure the species has it's dietflag set, otherwise it can't digest any nutrients + if(H.species && H.species.dietflags && !(H.species.dietflags & DIET_HERB)) //Make sure the species has it's dietflag set, and that it is not a herbivore H.nutrition += nutriment_factor // For hunger and fatness if(prob(50)) M.heal_organ_damage(1,0) if(istype(M,/mob/living/simple_animal)) //Any nutrients can heal simple animals @@ -1540,7 +1540,7 @@ datum if(!(M.mind in ticker.mode.vampires)) if(ishuman(M)) var/mob/living/carbon/human/H = M - if(H.species && H.species.dietflags && !(H.species.dietflags & DIET_CARN)) //Make sure the species has it's dietflag set, otherwise it can't digest any nutrients + if(H.species && H.species.dietflags && !(H.species.dietflags & DIET_CARN)) //Make sure the species has it's dietflag set, and that it is not a carnivore H.nutrition += nutriment_factor // For hunger and fatness if(prob(50)) M.heal_organ_damage(1,0) if(istype(M,/mob/living/simple_animal)) //Any nutrients can heal simple animals