From c3d989ddf19773ec8d631fab67e9257942e08f7b Mon Sep 17 00:00:00 2001 From: Casey Date: Fri, 1 Apr 2022 12:59:48 -0400 Subject: [PATCH 1/2] Allows Xenochimera to take Autohiss --- .../species/station/xenochimera_trait_vr.dm | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) 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 31b370ed1d..5301c58a1e 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 @@ -62,7 +62,11 @@ 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) @@ -73,7 +77,11 @@ 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) @@ -84,7 +92,12 @@ 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) @@ -100,7 +113,11 @@ "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 @@ -114,6 +131,7 @@ "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 @@ -133,4 +151,7 @@ "r" = list("rk") ), autohiss_exempt = list("Vespinae")) - excludes = list(/datum/trait/neutral/autohiss_tajaran, /datum/trait/neutral/autohiss_unathi) \ No newline at end of file + 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 From a18235feccdf5f173e55e0604b53121cbc9c714d Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Mon, 4 Apr 2022 16:01:37 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- .../species/station/xenochimera_trait_vr.dm | 20 ------------------- 1 file changed, 20 deletions(-) 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 5301c58a1e..d7a67b078b 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 @@ -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