From 4c0885248cb8f6327da0371db222caa911f3534e Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 13 Nov 2022 15:49:34 -0500 Subject: [PATCH] Xenochimera Fix for Numbing Fangs/Sharp Melee overriding Claws --- .../carbon/human/species/station/xenochimera_trait_vr.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species/station/xenochimera_trait_vr.dm b/code/modules/mob/living/carbon/human/species/station/xenochimera_trait_vr.dm index 1b77e9e25b..a2b2318cf3 100644 --- a/code/modules/mob/living/carbon/human/species/station/xenochimera_trait_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/xenochimera_trait_vr.dm @@ -43,7 +43,11 @@ cost = 0 category = 0 custom_only = FALSE +<<<<<<< HEAD var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/chimera, /datum/unarmed_attack/bite/sharp, /datum/unarmed_attack/bite/sharp/numbing)) // CHOMPEdit: Fix 'chimera unarmed attacks with this trait +======= + var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/chimera, /datum/unarmed_attack/bite/sharp, /datum/unarmed_attack/bite/sharp/numbing)) // Fixes the parent forgetting to add 'chimera-specific claws +>>>>>>> c86ab5fed8... Merge pull request #14078 from Rykka-Stormheart/shep-dev-chimera-attack-fix /datum/trait/positive/snowwalker/xenochimera sort = TRAIT_SORT_SPECIES