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

1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs

@@ -639,12 +639,8 @@ namespace RJW_Menstruation
             if (Scribe.mode == LoadSaveMode.PostLoadInit)
             {
                 Initialize();
-                // Biotech labor errors if the mother is also the father, so don't let that happen
+                if (pregnancy is HediffWithParents vanillaPreg && vanillaPreg.Mother == vanillaPreg.Father)   // Fix mother == father issue
-                if (pregnancy is HediffWithParents vanillaPreg && vanillaPreg.Mother == vanillaPreg.Father && vanillaPreg.Mother != null)
-                {
-                    Log.Warning($"Pregnancy of {Pawn} has same mother and father, setting father to null");
                     vanillaPreg.SetParents(vanillaPreg.Mother, null, vanillaPreg.geneSet);
-                }
             }
         }
 
@@ -794,7 +790,7 @@ namespace RJW_Menstruation
         {
             get
             {
-                if (Pawn.Dead || !Pawn.ShouldCycle()) return null;
+                if (Pawn.Dead) return null;
                 StringBuilder tip = new StringBuilder();
                 tip.Append(Translations.Dialog_WombInfo01);
                 tip.Append(": ");
@@ -816,11 +812,7 @@ namespace RJW_Menstruation
 
         public override string CompDebugString()
         {
-            if (Pawn.Dead ||
+            if (Pawn.Dead || curStage == Stage.None || curStage == Stage.Infertile || curStage == Stage.Pregnant) return null;
-                !Pawn.ShouldCycle() ||
-                curStage == Stage.None ||
-                curStage == Stage.Infertile ||
-                curStage == Stage.Pregnant) return null;
             StringBuilder debugString = new StringBuilder();
             debugString.Append($"Time to next state: ");
             debugString.Append(GenDate.ToStringTicksToPeriod(TicksToNextStage()));

1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs

@@ -242,7 +242,7 @@ namespace RJW_Menstruation
             bool isInduced = comp is HediffComp_InducedOvulator;
             if (comp.curStage == HediffComp_Menstruation.Stage.Follicular &&
                 isInduced &&
-                comp.Pawn.jobs?.curDriver is JobDriver_Sex job &&
+                comp.Pawn.jobs.curDriver is JobDriver_Sex job &&
                 job.Sexprops != null &&
                 !UsingCondom(comp.Pawn, job.Partner) &&
                 (job.Sexprops.sexType == xxx.rjwSextype.Vaginal || job.Sexprops.sexType == xxx.rjwSextype.DoublePenetration))

1.5/source/RJW_Menstruation/RJW_Menstruation/Patch/Pawn_Patch.cs

@@ -33,12 +33,8 @@ namespace RJW_Menstruation
 
             foreach (LocalTargetInfo t in selftargets)
             {
-                if (t.Pawn == pawn)
+                if (t.Pawn == pawn && pawn.HasMenstruationComp()) opts.AddDistinct(MakeSelfMenu(pawn, t));
-                {
+                break;
-                    if (pawn.HasMenstruationComp() && pawn.ShouldCycle())
-                        opts.AddDistinct(MakeSelfMenu(pawn, t));
-                    break;
-                }
             }
         }