diff --git a/code/modules/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm index 2e71f7d546..ceb8a026d2 100644 --- a/code/modules/mob/living/carbon/human/species/species_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_vr.dm @@ -16,6 +16,8 @@ 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/bloodsucker = FALSE // Allows safely getting nutrition from blood. + var/is_weaver = FALSE var/silk_production = FALSE var/silk_reserve = 100 diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index fbd4c094b1..1032c5583f 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -91,8 +91,13 @@ 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 custom_only = FALSE +<<<<<<< HEAD var_changes = list("organic_food_coeff" = 0) //The verb is given in human.dm excludes = list(/datum/trait/positive/bloodsucker_plus) //YW edit +======= + var_changes = list("organic_food_coeff" = 0, "bloodsucker" = TRUE) + excludes = list(/datum/trait/neutral/bloodsucker_freeform) +>>>>>>> bab8383194... Merge pull request #13443 from Heroman3003/unoblige-bloodsucker /datum/trait/neutral/bloodsucker/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) @@ -103,7 +108,12 @@ desc = "You get fangs that can be used to drain blood from prey." cost = 0 custom_only = FALSE +<<<<<<< HEAD excludes = list(/datum/trait/neutral/bloodsucker, /datum/trait/positive/bloodsucker_plus) //YW edit +======= + var_changes = list("bloodsucker" = TRUE) + excludes = list(/datum/trait/neutral/bloodsucker) +>>>>>>> bab8383194... Merge pull request #13443 from Heroman3003/unoblige-bloodsucker /datum/trait/neutral/bloodsucker_freeform/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) diff --git a/code/modules/reagents/reagents/core.dm b/code/modules/reagents/reagents/core.dm index 901b803cbb..0d803b63d3 100644 --- a/code/modules/reagents/reagents/core.dm +++ b/code/modules/reagents/reagents/core.dm @@ -46,12 +46,12 @@ var/effective_dose = dose if(issmall(M)) effective_dose *= 2 - var/is_vampire = 0 //VOREStation Edit START + var/is_vampire = FALSE //VOREStation Edit START if(ishuman(M)) var/mob/living/carbon/human/H = M - if(H.species.organic_food_coeff == 0) - H.adjust_nutrition(removed) - is_vampire = 1 //VOREStation Edit END + if(H.species.bloodsucker) + H.adjust_nutrition(removed*30) + is_vampire = TRUE //VOREStation Edit END if(alien == IS_SLIME) // Treat it like nutriment for the jello, but not equivalent. if(data["species"] == M.species.name) // Unless it's Promethean goo, then refill this one's goo. M.inject_blood(src, volume * volume_mod) @@ -65,10 +65,10 @@ return if(effective_dose > 5) - if(is_vampire == 0) //VOREStation Edit. + if(!is_vampire) //VOREStation Edit. M.adjustToxLoss(removed) //VOREStation Edit. if(effective_dose > 15) - if(is_vampire == 0) //VOREStation Edit. + if(!is_vampire) //VOREStation Edit. M.adjustToxLoss(removed) //VOREStation Edit. if(data && data["virus2"]) var/list/vlist = data["virus2"]