cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 23:29:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-04-04 16:01:37 -04:00
committed by GitHub
parent c3d989ddf1
commit a18235fecc
1 changed files with 0 additions and 20 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
-20
View File
@@ -62,11 +62,7 @@
category = 0
custom_only = FALSE
<<<<<<< HEAD
// CHOMPEdits Start - Adding Xenochimera traits. TODO - Port these to VORE.
=======
/* // Commented out in lieu of finding a better solution.
>>>>>>> 29ad6e8c73... Merge pull request #12573 from Rykka-Stormheart/shep-dev-xenochimera-hiss
/datum/trait/neutral/coldadapt/xenochimera
sort = TRAIT_SORT_SPECIES
allowed_species = list(SPECIES_XENOCHIMERA)
@@ -77,11 +73,7 @@
can_take = ORGANICS // (Not sure if this is needed for Xenochimera-specific sub-version.)
custom_only = FALSE
excludes = list(/datum/trait/neutral/hotadapt, /datum/trait/neutral/hotadapt/xenochimera)
<<<<<<< HEAD
=======
>>>>>>> 29ad6e8c73... Merge pull request #12573 from Rykka-Stormheart/shep-dev-xenochimera-hiss
/datum/trait/neutral/hotadapt/xenochimera
sort = TRAIT_SORT_SPECIES
allowed_species = list(SPECIES_XENOCHIMERA)
@@ -92,12 +84,8 @@
can_take = ORGANICS // negates the need for suit coolers entirely for synths, so no. (Not sure if this is needed for Xenochimera-specific sub-version.)
custom_only = FALSE
excludes = list(/datum/trait/neutral/coldadapt, /datum/trait/neutral/coldadapt/xenochimera)
<<<<<<< HEAD
=======
*/
>>>>>>> 29ad6e8c73... Merge pull request #12573 from Rykka-Stormheart/shep-dev-xenochimera-hiss
/datum/trait/neutral/autohiss_unathi/xenochimera
sort = TRAIT_SORT_SPECIES
allowed_species = list(SPECIES_XENOCHIMERA)
@@ -113,11 +101,7 @@
"x" = list("ks", "kss", "ksss")
),
autohiss_exempt = list("Sinta'unathi"))
<<<<<<< HEAD
excludes = list(/datum/trait/neutral/autohiss_tajaran, /datum/trait/neutral/autohiss_vassilian) //YW edit: exclude vassillian hiss
=======
excludes = list(/datum/trait/neutral/autohiss_tajaran)
>>>>>>> 29ad6e8c73... Merge pull request #12573 from Rykka-Stormheart/shep-dev-xenochimera-hiss
/datum/trait/neutral/autohiss_tajaran/xenochimera
sort = TRAIT_SORT_SPECIES
@@ -131,7 +115,6 @@
"r" = list("rr", "rrr", "rrrr")
),
autohiss_exempt = list("Siik"))
<<<<<<< HEAD
excludes = list(/datum/trait/neutral/autohiss_unathi, /datum/trait/neutral/autohiss_vassilian) //YW edit: exclude vassillian hiss
/datum/trait/neutral/autohiss_vassilian/xenochimera
@@ -152,6 +135,3 @@
),
autohiss_exempt = list("Vespinae"))
excludes = list(/datum/trait/neutral/autohiss_tajaran, /datum/trait/neutral/autohiss_unathi)
=======
excludes = list(/datum/trait/neutral/autohiss_unathi)
>>>>>>> 29ad6e8c73... Merge pull request #12573 from Rykka-Stormheart/shep-dev-xenochimera-hiss