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

Allows un-obligate bloodsucker to just drink blood normally

Browse Source
This commit is contained in:
Casey
2022-08-07 15:35:55 -04:00
committed by CHOMPStation2
parent aa75a3b2c0
commit fc8890bd7c
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/human/species/species_vr.dm
View File

@@ -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

10
code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
View File

@@ -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)

12
code/modules/reagents/reagents/core.dm
View File

@@ -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"]