cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-06-10 02:33:03 -04:00
committed by GitHub
parent 0f54f7f387
commit 691114b7c8
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+2 -17
View File
@@ -84,27 +84,12 @@
// YW Addition end
/datum/trait/neutral/bloodsucker
<<<<<<< HEAD
name = "Minor Bloodsucker" //YW edit
name = "Minor Bloodsucker (Obligate)" //YW edit
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."
||||||| parent of 643caba532... Merge pull request #10604 from Heroman3003/succ-the-hemoglobin
name = "Bloodsucker"
desc = "Makes you unable to gain nutrition from anything but blood. To compenstate, you get fangs that can be used to drain blood from prey."
=======
name = "Bloodsucker (Obligate)"
desc = "Makes you unable to gain nutrition from anything but blood. To compenstate, you get fangs that can be used to drain blood from prey."
>>>>>>> 643caba532... Merge pull request #10604 from Heroman3003/succ-the-hemoglobin
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
||||||| parent of 643caba532... Merge pull request #10604 from Heroman3003/succ-the-hemoglobin
var_changes = list("organic_food_coeff" = 0) //The verb is given in human.dm
=======
var_changes = list("organic_food_coeff" = 0)
excludes = list(/datum/trait/neutral/bloodsucker_freeform)
>>>>>>> 643caba532... Merge pull request #10604 from Heroman3003/succ-the-hemoglobin
/datum/trait/neutral/bloodsucker/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)
@@ -115,7 +100,7 @@
desc = "You get fangs that can be used to drain blood from prey."
cost = 0
custom_only = FALSE
excludes = list(/datum/trait/neutral/bloodsucker)
excludes = list(/datum/trait/neutral/bloodsucker, /datum/trait/positive/bloodsucker_plus) //YW edit
/datum/trait/neutral/bloodsucker_freeform/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)