diff --git a/1.6/Assemblies/Rjw-Genes.dll b/1.6/Assemblies/Rjw-Genes.dll index f649db6..024571a 100644 Binary files a/1.6/Assemblies/Rjw-Genes.dll and b/1.6/Assemblies/Rjw-Genes.dll differ diff --git a/1.6/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml b/1.6/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml index 3d8c82b..543c542 100644 --- a/1.6/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml +++ b/1.6/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml @@ -189,6 +189,8 @@
  • HemiPenis + CloacalVagina + CloacalAnus
  • ScaleLoverQuirk @@ -233,4 +235,31 @@ + + rjw_genes_rodent_genitalia + + Carriers of this gene develop rodent genitalia. + Genes/Icons/Genitalia_croc_icon + +
  • + RodentPenis + RodentVagina +
  • +
    + + + + rjw_genes_cloacal_genitalia + + Carriers of this gene develop cloacal genitalia. + Genes/Icons/Genitalia_croc_icon + +
  • + CloacalPenis + CloacalVagina + CloacalAnus +
  • +
    +
    + \ No newline at end of file diff --git a/1.6/Source/Common/patches/PatchPregnancyHelper.cs b/1.6/Source/Common/patches/PatchPregnancyHelper.cs index a01897c..7de40f9 100644 --- a/1.6/Source/Common/patches/PatchPregnancyHelper.cs +++ b/1.6/Source/Common/patches/PatchPregnancyHelper.cs @@ -5,9 +5,10 @@ using System.Text; using System.Threading.Tasks; using HarmonyLib; using RimWorld; -using Verse; using rjw; using rjw.Modules.Interactions; +using Verse; +using static rjw.RJWPregnancySettings; //using rjw.Modules.Interactions.Enums; namespace RJW_Genes @@ -81,9 +82,10 @@ namespace RJW_Genes if (RJWSettings.DevMode) ModLog.Message(xxx.get_pawnname(giver) + " has no parts to Fertilize with"); return; } + + //If recieving pawn has a Vasectomy,temporarily remove it to prevent fertility Malice, replace it after DoImpregnate. if (vasectomy != null) { - //Temporarily remove Vasectomy from Receiver to prevent fertility Malice, replace it after DoImpregnate. if (RJWSettings.DevMode) ModLog.Message("vasectomy check"); receiver.health.RemoveHediff(vasectomy); } @@ -103,7 +105,7 @@ namespace RJW_Genes private static bool CanImpregnate2(Pawn fucker, Pawn fucked, xxx.rjwSextype sexType) { - if (fucker == null || fucked == null) + if (fucker == null || fucked == null) { return false; @@ -223,7 +225,7 @@ namespace RJW_Genes return false; } - if (((xxx.is_animal(fucker) && xxx.is_human(fucked)) || (xxx.is_human(fucker) && xxx.is_animal(fucked))) && !RJWPregnancySettings.bestial_pregnancy_enabled) + if (((xxx.is_animal(fucker) && xxx.is_human(fucked)) || (xxx.is_human(fucker) && xxx.is_animal(fucked))) && RJWPregnancySettings.bestial_pregnancy == BestialPregnancy.None) { if (RJWSettings.DevMode) { diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b4bc3d..887c2aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 2.6.0 (18-08-2025) +# 2.6.0 (05-09-2025) (Commit by @Telanda-DDS) **Changes** diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a41147f..c27c658 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ But please consider also the following: ## Contributors -- Shabalox (MechBreeding, InsectBreeding, Animal Gene Inheritance) +- Shabalox (MechBreeding, InsectBreeding) - WasMachenDennSachen (Various Icons) - Jaaldabaoth (1.5 Migration, MPreg, Femboys, Initial VE-Genetic Hybrids) - Flock-of-Birds (Cosmetic Genitalia per XML) diff --git a/README.md b/README.md index f95644a..3663b7c 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ This mod adds genes related and based on RJW to Rimworld. - Cum-Amount Changes, Transfer Nutrition Boosts - Sexual Vampires that need Cum, Cocks or some other sources. - Mech Breeding Additions & Orgasmic Mytosis -- Human-Animal Gene Inheritance merged from [Shabakur](https://github.com/Shabakur/RJW_Animal_Gene_Inheritance) - Genetic Diseases that spread on Intercourse - Patches for some popular / common Xenotypes from other Mods.