cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-9751

Browse Source
This commit is contained in:
Nadyr
2021-03-06 02:31:39 -05:00
committed by GitHub
parent 396f0ea1e9 dc7893eee2
commit 49d8ede34f
23 changed files with 125 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
View File

@@ -46,7 +46,7 @@
var/is_vampire = 0 //VOREStation Edit START
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.species.gets_food_nutrition == 0)
if(H.species.organic_food_coeff == 0)
H.adjust_nutrition(removed)
is_vampire = 1 //VOREStation Edit END
if(alien == IS_SLIME) // Treat it like nutriment for the jello, but not equivalent.

5
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
View File

@@ -12,6 +12,7 @@
var/allergen_type = GENERIC // What potential allergens does this contain?
var/injectable = 0
color = "#664330"
affects_robots = 1 //VOREStation Edit
/datum/reagent/nutriment/mix_data(var/list/newdata, var/newamount)
@@ -38,7 +39,7 @@
data -= taste
/datum/reagent/nutriment/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(!injectable && alien != IS_SLIME && alien != IS_CHIMERA) //VOREStation Edit
if(!injectable && alien != IS_SLIME && alien != IS_CHIMERA && !M.isSynthetic()) //VOREStation Edit
M.adjustToxLoss(0.1 * removed)
return
if(M.species.allergens & allergen_type)
@@ -906,7 +907,7 @@
if(adj_temp < 0 && M.bodytemperature > 310)
M.bodytemperature = min(310, M.bodytemperature - (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT))
if(issmall(M)) removed *= 2 //CHOMP Station addition Small bodymass, more effect from lower volume.
if(M.species.gets_food_nutrition) //CHOMPStation addition. If this is set to 0, they don't get nutrition from food.
if(M.species.organic_food_coeff) //CHOMPStation addition. If this is set to 0, they don't get nutrition from food.
M.nutrition += nutriment_factor * removed //CHOMPStation addition For hunger and fatness
/* VOREStation Removal
if(alien == IS_SLIME && water_based)

10
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm
View File

@@ -125,7 +125,7 @@
/datum/reagent/ethanol/monstertamer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(M.species.gets_food_nutrition) //it's still food!
if(M.species.organic_food_coeff) //it's still food!
switch(alien)
if(IS_DIONA) //Diona don't get any nutrition from nutriment or protein.
if(IS_SKRELL)
@@ -151,7 +151,7 @@
..()
if(alien == IS_SKRELL)
M.adjustToxLoss(removed) //Equivalent to half as much protein, since it's half protein.
if(M.species.gets_food_nutrition)
if(M.species.organic_food_coeff)
if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein
M.adjust_nutrition(alt_nutriment_factor * removed)
@@ -429,7 +429,7 @@
/datum/reagent/ethanol/hairoftherat/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(M.species.gets_food_nutrition) //it's still food!
if(M.species.organic_food_coeff) //it's still food!
switch(alien)
if(IS_DIONA) //Diona don't get any nutrition from nutriment or protein.
if(IS_SKRELL)
@@ -455,6 +455,6 @@
..()
if(alien == IS_SKRELL)
M.adjustToxLoss(removed) //Equivalent to half as much protein, since it's half protein.
if(M.species.gets_food_nutrition)
if(M.species.organic_food_coeff)
if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein
M.nutrition += (alt_nutriment_factor * removed)
M.nutrition += (alt_nutriment_factor * removed)