Merge branch 'dev' into 'dev'

Breast fullness is not displayed and the "milk yourself" action is not invoked on a pawn when the rjw-mc-biotech mod is present See merge request lutepickle/rjw_menstruation!6
Repair self-insemination pregnancies at game load
2024-08-14 22:46:52 +00:00 · 2024-08-01 05:14:47 +00:00 · 2024-07-31 06:50:38 -07:00
3 changed files with 7 additions and 0 deletions
--- a/1.5/Assemblies/RJW_Menstruation.dll
+++ b/1.5/Assemblies/RJW_Menstruation.dll
--- a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
+++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
@ -637,7 +637,11 @@ namespace RJW_Menstruation
            Scribe_Values.Look(ref DoCleanWomb, "DoCleanWomb", false);
            Scribe_References.Look(ref pregnancy, "pregnancy");
            if (Scribe.mode == LoadSaveMode.PostLoadInit)
+            {
                Initialize();
+                if (pregnancy is HediffWithParents vanillaPreg && vanillaPreg.Mother == vanillaPreg.Father)   // Fix mother == father issue
+                    vanillaPreg.SetParents(vanillaPreg.Mother, null, vanillaPreg.geneSet);
+            }
        }


--- a/changelogs.txt
+++ b/changelogs.txt
@ -1,3 +1,6 @@
+Version 1.5.0.2
+ - Fix error during labor if the mother is also the father.
+
 Version 1.5.0.1
 - Fix error getting blood color of pawns without genes.
Author	SHA1	Message	Date
Akiyami Solo	7a92cce993	Merge branch 'dev' into 'dev' Breast fullness is not displayed and the "milk yourself" action is not invoked on a pawn when the rjw-mc-biotech mod is present See merge request lutepickle/rjw_menstruation!6	2024-08-01 05:14:47 +00:00
lutepickle	4be4d881d5	Repair self-insemination pregnancies at game load	2024-07-31 06:50:38 -07:00