From 0f54f7f3873ca257c55ef55d2c17d1d6656744f8 Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Thu, 10 Jun 2021 02:27:16 +0000 Subject: [PATCH 1/2] Adds a different version of bloodsucker trait --- .../species/station/traits_vr/neutral.dm | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) 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 486c6007d5..8866f7e8ca 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 @@ -84,17 +84,43 @@ // YW Addition end /datum/trait/neutral/bloodsucker +<<<<<<< HEAD name = "Minor Bloodsucker" //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) H.verbs |= /mob/living/carbon/human/proc/bloodsuck +/datum/trait/neutral/bloodsucker_freeform + name = "Bloodsucker" + desc = "You get fangs that can be used to drain blood from prey." + cost = 0 + custom_only = FALSE + excludes = list(/datum/trait/neutral/bloodsucker) + +/datum/trait/neutral/bloodsucker_freeform/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + H.verbs |= /mob/living/carbon/human/proc/bloodsuck + /datum/trait/neutral/succubus_drain name = "Succubus Drain" desc = "Makes you able to gain nutrition from draining prey in your grasp." From 691114b7c8669f8fd53da8ea570387ae4427e761 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Thu, 10 Jun 2021 02:33:03 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- .../species/station/traits_vr/neutral.dm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) 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 8866f7e8ca..3c40e2e042 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 @@ -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)