mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
FBP Munchies
This commit is contained in:
@@ -20,6 +20,31 @@
|
|||||||
var/wikilink = null //link to wiki page for species
|
var/wikilink = null //link to wiki page for species
|
||||||
var/icon_height = 32
|
var/icon_height = 32
|
||||||
var/agility = 20 //prob() to do agile things
|
var/agility = 20 //prob() to do agile things
|
||||||
|
<<<<<<< HEAD
|
||||||
|
||||||| parent of 7b5b76d379... Merge pull request #8808 from KillianKirilenko/kk-misc3
|
||||||
|
var/is_weaver = FALSE
|
||||||
|
var/silk_production = FALSE
|
||||||
|
var/silk_reserve = 100
|
||||||
|
var/silk_max_reserve = 500
|
||||||
|
var/silk_color = "#FFFFFF"
|
||||||
|
=======
|
||||||
|
|
||||||
|
var/organic_food_coeff = 1
|
||||||
|
var/synthetic_food_coeff = 0
|
||||||
|
//var/vore_numbing = 0
|
||||||
|
var/metabolism = 0.0015
|
||||||
|
var/lightweight = FALSE //Oof! Nonhelpful bump stumbles.
|
||||||
|
var/trashcan = FALSE //It's always sunny in the wrestling ring.
|
||||||
|
var/eat_minerals = FALSE //HEAVY METAL DIET
|
||||||
|
var/base_species = null // Unused outside of a few species
|
||||||
|
var/selects_bodytype = FALSE // Allows the species to choose from body types like custom species can, affecting suit fitting and etcetera as you would expect.
|
||||||
|
|
||||||
|
var/is_weaver = FALSE
|
||||||
|
var/silk_production = FALSE
|
||||||
|
var/silk_reserve = 100
|
||||||
|
var/silk_max_reserve = 500
|
||||||
|
var/silk_color = "#FFFFFF"
|
||||||
|
>>>>>>> 7b5b76d379... Merge pull request #8808 from KillianKirilenko/kk-misc3
|
||||||
|
|
||||||
var/list/traits = list()
|
var/list/traits = list()
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +1,3 @@
|
|||||||
|
|
||||||
/datum/species
|
|
||||||
//var/vore_numbing = 0
|
|
||||||
var/gets_food_nutrition = TRUE // If this is set to 0, the person can't get nutrition from food.
|
|
||||||
var/metabolism = 0.0015
|
|
||||||
var/lightweight = FALSE //Oof! Nonhelpful bump stumbles.
|
|
||||||
var/trashcan = FALSE //It's always sunny in the wrestling ring.
|
|
||||||
var/eat_minerals = FALSE //HEAVY METAL DIET
|
|
||||||
var/base_species = null //Used in every UpdateAppearance call.
|
|
||||||
var/selects_bodytype = FALSE // Allows the species to choose from body types intead of being forced to be just one.
|
|
||||||
|
|
||||||
/datum/species/New()
|
/datum/species/New()
|
||||||
if(!base_species)
|
if(!base_species)
|
||||||
base_species = name
|
base_species = name
|
||||||
|
|||||||
@@ -129,8 +129,14 @@ YW change end */
|
|||||||
desc = "Makes you unable to gain nutrition from anything but blood. To compensate, you get fangs that can be used to drain blood from prey."
|
desc = "Makes you unable to gain nutrition from anything but blood. To compensate, you get fangs that can be used to drain blood from prey."
|
||||||
cost = 0
|
cost = 0
|
||||||
custom_only = FALSE
|
custom_only = FALSE
|
||||||
|
<<<<<<< HEAD
|
||||||
var_changes = list("gets_food_nutrition" = 0) //The verb is given in human.dm
|
var_changes = list("gets_food_nutrition" = 0) //The verb is given in human.dm
|
||||||
excludes = list(/datum/trait/bloodsucker_plus)
|
excludes = list(/datum/trait/bloodsucker_plus)
|
||||||
|
||||||| parent of 7b5b76d379... Merge pull request #8808 from KillianKirilenko/kk-misc3
|
||||||
|
var_changes = list("gets_food_nutrition" = 0) //The verb is given in human.dm
|
||||||
|
=======
|
||||||
|
var_changes = list("organic_food_coeff" = 0) //The verb is given in human.dm
|
||||||
|
>>>>>>> 7b5b76d379... Merge pull request #8808 from KillianKirilenko/kk-misc3
|
||||||
|
|
||||||
/datum/trait/bloodsucker/apply(var/datum/species/S,var/mob/living/carbon/human/H)
|
/datum/trait/bloodsucker/apply(var/datum/species/S,var/mob/living/carbon/human/H)
|
||||||
..(S,H)
|
..(S,H)
|
||||||
@@ -184,12 +190,20 @@ YW change end */
|
|||||||
desc = "You only gain nutrition from raw ore and refined minerals. There's nothing that sates the appetite better than precious gems, exotic or rare minerals and you have damn fine taste. Anything else is beneath you."
|
desc = "You only gain nutrition from raw ore and refined minerals. There's nothing that sates the appetite better than precious gems, exotic or rare minerals and you have damn fine taste. Anything else is beneath you."
|
||||||
cost = 0
|
cost = 0
|
||||||
custom_only = FALSE
|
custom_only = FALSE
|
||||||
var_changes = list("gets_food_nutrition" = 0, "eat_minerals" = 1)
|
var_changes = list("organic_food_coeff" = 0, "eat_minerals" = 1)
|
||||||
|
|
||||||
/datum/trait/gem_eater/apply(var/datum/species/S,var/mob/living/carbon/human/H)
|
/datum/trait/gem_eater/apply(var/datum/species/S,var/mob/living/carbon/human/H)
|
||||||
..(S,H)
|
..(S,H)
|
||||||
H.verbs |= /mob/living/proc/eat_minerals
|
H.verbs |= /mob/living/proc/eat_minerals
|
||||||
|
|
||||||
|
/datum/trait/synth_chemfurnace
|
||||||
|
name = "Biofuel Processor"
|
||||||
|
desc = "You are able to gain energy through consuming and processing normal food. Energy-dense foods such as protein bars and survival food will yield the best results."
|
||||||
|
cost = 0
|
||||||
|
custom_only = FALSE
|
||||||
|
can_take = SYNTHETICS
|
||||||
|
var_changes = list("organic_food_coeff" = 0, "synthetic_food_coeff" = 0.25)
|
||||||
|
|
||||||
/datum/trait/glowing_eyes
|
/datum/trait/glowing_eyes
|
||||||
name = "Glowing Eyes"
|
name = "Glowing Eyes"
|
||||||
desc = "Your eyes show up above darkness. SPOOKY! And kinda edgey too."
|
desc = "Your eyes show up above darkness. SPOOKY! And kinda edgey too."
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
var/is_vampire = 0 //VOREStation Edit START
|
var/is_vampire = 0 //VOREStation Edit START
|
||||||
if(ishuman(M))
|
if(ishuman(M))
|
||||||
var/mob/living/carbon/human/H = 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)
|
H.adjust_nutrition(removed)
|
||||||
is_vampire = 1 //VOREStation Edit END
|
is_vampire = 1 //VOREStation Edit END
|
||||||
if(alien == IS_SLIME) // Treat it like nutriment for the jello, but not equivalent.
|
if(alien == IS_SLIME) // Treat it like nutriment for the jello, but not equivalent.
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
var/nutriment_factor = 30 // Per unit
|
var/nutriment_factor = 30 // Per unit
|
||||||
var/injectable = 0
|
var/injectable = 0
|
||||||
color = "#664330"
|
color = "#664330"
|
||||||
|
affects_robots = 1 //VOREStation Edit
|
||||||
|
|
||||||
/datum/reagent/nutriment/mix_data(var/list/newdata, var/newamount)
|
/datum/reagent/nutriment/mix_data(var/list/newdata, var/newamount)
|
||||||
|
|
||||||
@@ -37,10 +38,14 @@
|
|||||||
data -= taste
|
data -= taste
|
||||||
|
|
||||||
/datum/reagent/nutriment/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
/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)
|
M.adjustToxLoss(0.1 * removed)
|
||||||
return
|
return
|
||||||
affect_ingest(M, alien, removed)
|
affect_ingest(M, alien, removed)
|
||||||
|
//VOREStation Edits Start
|
||||||
|
if(M.isSynthetic() && M.nutrition < 500)
|
||||||
|
M.adjust_nutrition((nutriment_factor * removed) * M.species.synthetic_food_coeff)
|
||||||
|
//VOREStation Edits End
|
||||||
|
|
||||||
/datum/reagent/nutriment/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
/datum/reagent/nutriment/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||||
switch(alien)
|
switch(alien)
|
||||||
@@ -48,10 +53,11 @@
|
|||||||
if(IS_UNATHI) removed *= 0.5
|
if(IS_UNATHI) removed *= 0.5
|
||||||
if(IS_CHIMERA) removed *= 0.25 //VOREStation Edit
|
if(IS_CHIMERA) removed *= 0.25 //VOREStation Edit
|
||||||
if(issmall(M)) removed *= 2 // Small bodymass, more effect from lower volume.
|
if(issmall(M)) removed *= 2 // Small bodymass, more effect from lower volume.
|
||||||
M.heal_organ_damage(0.5 * removed, 0)
|
//VOREStation Edits Start
|
||||||
if(M.species.gets_food_nutrition) //VOREStation edit. If this is set to 0, they don't get nutrition from food.
|
if(!M.isSynthetic())
|
||||||
M.adjust_nutrition(nutriment_factor * removed) // For hunger and fatness
|
M.adjust_nutrition((nutriment_factor * removed) * M.species.organic_food_coeff)
|
||||||
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
|
M.heal_organ_damage(0.5 * removed, 0)
|
||||||
|
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
|
||||||
|
|
||||||
// Aurora Cooking Port Insertion Begin
|
// Aurora Cooking Port Insertion Begin
|
||||||
|
|
||||||
|
|||||||
@@ -125,7 +125,7 @@
|
|||||||
/datum/reagent/ethanol/monstertamer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
/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)
|
switch(alien)
|
||||||
if(IS_DIONA) //Diona don't get any nutrition from nutriment or protein.
|
if(IS_DIONA) //Diona don't get any nutrition from nutriment or protein.
|
||||||
if(IS_SKRELL)
|
if(IS_SKRELL)
|
||||||
@@ -151,7 +151,7 @@
|
|||||||
..()
|
..()
|
||||||
if(alien == IS_SKRELL)
|
if(alien == IS_SKRELL)
|
||||||
M.adjustToxLoss(removed) //Equivalent to half as much protein, since it's half protein.
|
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
|
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)
|
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)
|
/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)
|
switch(alien)
|
||||||
if(IS_DIONA) //Diona don't get any nutrition from nutriment or protein.
|
if(IS_DIONA) //Diona don't get any nutrition from nutriment or protein.
|
||||||
if(IS_SKRELL)
|
if(IS_SKRELL)
|
||||||
@@ -455,6 +455,6 @@
|
|||||||
..()
|
..()
|
||||||
if(alien == IS_SKRELL)
|
if(alien == IS_SKRELL)
|
||||||
M.adjustToxLoss(removed) //Equivalent to half as much protein, since it's half protein.
|
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
|
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)
|
||||||
Reference in New Issue
Block a user