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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-08-28 19:22:10 -04:00
committed by GitHub
parent 0d550ed47c
commit aa34e96246
1 changed files with 0 additions and 3 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
-3
View File
@@ -64,8 +64,6 @@
excludes = list(/datum/trait/positive/winged_flight/xenochimera)
custom_only = FALSE
<<<<<<< HEAD
=======
/datum/trait/positive/winged_flight/xenochimera
name = "Xenochhimera: Winged Flight"
desc = "Allows you to fly by using your wings. Don't forget to bring them!"
@@ -73,7 +71,6 @@
excludes = list(/datum/trait/positive/aquatic/xenochimera)
custom_only = FALSE
>>>>>>> df05951dd6... Merge pull request #13573 from Cameron653/AQUATIC_LIFE
/* // Commented out in lieu of finding a better solution.
/datum/trait/neutral/coldadapt/xenochimera
sort = TRAIT_SORT_SPECIES