diff --git a/1.4/Defs/MorphsAndMutationDefs/Shared/SkinMutations.xml b/1.4/Defs/MorphsAndMutationDefs/Shared/SkinMutations.xml index 13d123d9d..ad42ac631 100644 --- a/1.4/Defs/MorphsAndMutationDefs/Shared/SkinMutations.xml +++ b/1.4/Defs/MorphsAndMutationDefs/Shared/SkinMutations.xml @@ -253,7 +253,7 @@ EtherThrumboFurredLimb - + ThrumboMorph EtherThickFurLimb diff --git a/1.5/Defs/MorphsAndMutationDefs/Animal/Reptile/Ophidia/Cobra/Cobra_Hybrid.xml b/1.5/Defs/MorphsAndMutationDefs/Animal/Reptile/Ophidia/Cobra/Cobra_Hybrid.xml index 23d4298ff..7b97b9467 100644 --- a/1.5/Defs/MorphsAndMutationDefs/Animal/Reptile/Ophidia/Cobra/Cobra_Hybrid.xml +++ b/1.5/Defs/MorphsAndMutationDefs/Animal/Reptile/Ophidia/Cobra/Cobra_Hybrid.xml @@ -524,6 +524,8 @@ + true + CorpsesHumanlike true @@ -534,6 +536,13 @@
  • Female_AverageWide
  • Female_AveragePointy
  • + +
  • Male
  • +
  • Female
  • +
  • Thin
  • +
  • Hulk
  • +
  • Fat
  • +
  • hair @@ -554,16 +563,25 @@
  • +
  • + SkinHair + + skin_1 + + + hair_1 + +
  • Parts/Cobra/Cobra_Tail + SkinHair TailLeg false - EtherSnakeTail true true diff --git a/1.5/Defs/MorphsAndMutationDefs/Shared/SkinMutations.xml b/1.5/Defs/MorphsAndMutationDefs/Shared/SkinMutations.xml index 13d123d9d..ad42ac631 100644 --- a/1.5/Defs/MorphsAndMutationDefs/Shared/SkinMutations.xml +++ b/1.5/Defs/MorphsAndMutationDefs/Shared/SkinMutations.xml @@ -253,7 +253,7 @@ EtherThrumboFurredLimb - + ThrumboMorph EtherThickFurLimb diff --git a/Source/Dependencies/AlienRace.dll b/Source/Dependencies/AlienRace.dll index 40461aab3..36a55e5ee 100644 Binary files a/Source/Dependencies/AlienRace.dll and b/Source/Dependencies/AlienRace.dll differ diff --git a/Source/Pawnmorphs/Esoteria/Hybrids/RaceGenerator.cs b/Source/Pawnmorphs/Esoteria/Hybrids/RaceGenerator.cs index 88de2ff76..064d35089 100644 --- a/Source/Pawnmorphs/Esoteria/Hybrids/RaceGenerator.cs +++ b/Source/Pawnmorphs/Esoteria/Hybrids/RaceGenerator.cs @@ -264,8 +264,8 @@ private static IEnumerable GenerateAllImpliedRaces() - CreateImplicitMeshes(race); race.ResolveReferences(); + CreateImplicitMeshes(race); yield return race; } diff --git a/Source/Pawnmorphs/Esoteria/Hybrids/RaceShiftUtilities.cs b/Source/Pawnmorphs/Esoteria/Hybrids/RaceShiftUtilities.cs index b868fd3a0..16bdba154 100644 --- a/Source/Pawnmorphs/Esoteria/Hybrids/RaceShiftUtilities.cs +++ b/Source/Pawnmorphs/Esoteria/Hybrids/RaceShiftUtilities.cs @@ -488,6 +488,9 @@ private static void ValidateExplicitRaceChange(Pawn pawn, ThingDef race, ThingDe } + var alienComp = pawn.GetComp(); + AccessTools.Field(typeof(AlienPartGenerator.AlienComp), "nodeProps").SetValue(alienComp, null); + ValidateGraphicsPaths(pawn, oldARace, aRace); ValidateGenes(pawn, oldARace, aRace); HPatches.PawnPatches.QueueRaceCheck(pawn); @@ -507,7 +510,6 @@ private static void ValidateExplicitRaceChange(Pawn pawn, ThingDef race, ThingDe private static void ValidateGenes([NotNull] Pawn pawn, [NotNull] ThingDef_AlienRace oldRace, [NotNull] ThingDef_AlienRace race) { - var alienComp = pawn.GetComp(); if (ThingDefOf.Human == race) { // Reversion