From deb5e3f7bda89a7540bc271a8c6df8b7bc146a06 Mon Sep 17 00:00:00 2001 From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com> Date: Sun, 4 Oct 2020 11:17:38 +0100 Subject: [PATCH 1/2] Adds Numbing Fangs trait Adds the numbing fangs from "Sharp Melee & Numbing Fangs" as a separate trait. Cannot be taken with "Sharp Melee" or "Sharp Melee & Numbing Fangs", but you can still take the latter if you want both. Positive trait, costs 1 point. (Didn't need to explicitly add them as excluded traits of each other, as there's code to automatically detect that they modify the same variable. Tested to confirm.) --- .../carbon/human/species/station/traits_vr/positive.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index 54bddcdadf..261a1c009d 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -62,6 +62,12 @@ cost = 2 var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp, /datum/unarmed_attack/bite/sharp/numbing)) +/datum/trait/fangs + name = "Numbing Fangs" + desc = "Provides fangs that makes the person bit unable to feel their body or pain." + cost = 1 + var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp/numbing)) + /datum/trait/minor_brute_resist name = "Minor Brute Resist" desc = "Adds 15% resistance to brute damage sources." From 4f90fc65def0085c233727e519b077cd4e13537c Mon Sep 17 00:00:00 2001 From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com> Date: Mon, 5 Oct 2020 07:03:40 +0100 Subject: [PATCH 2/2] Fix numbing bite including claws whoops --- .../living/carbon/human/species/station/traits_vr/positive.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index 261a1c009d..b9841bb29e 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -66,7 +66,7 @@ name = "Numbing Fangs" desc = "Provides fangs that makes the person bit unable to feel their body or pain." cost = 1 - var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp/numbing)) + var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite/sharp/numbing)) /datum/trait/minor_brute_resist name = "Minor Brute Resist"