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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-11-13 16:52:49 -05:00
committed by GitHub
parent 4c0885248c
commit b981bafc41
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/xenochimera_trait_vr.dm
-4
View File
@@ -43,11 +43,7 @@
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