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
reduction of unnecessary inspections
2024-08-14 22:46:52 +00:00 · 2024-06-23 12:55:27 +00:00 · 2024-01-11 20:55:26 +03:00 · 2024-01-11 20:39:07 +03:00 · 2024-01-11 20:38:38 +03:00 · 2024-01-08 13:55:51 -08:00
2 changed files with 5 additions and 2 deletions
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
@ -276,7 +276,10 @@ namespace RJW_Menstruation
            float res = 0;
            if (VariousDefOf.Hediff_Heavy_Lactating_Permanent != null)
            {
-                if (pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Heavy_Lactating_Permanent)) milkcomp = pawn.AllComps.FirstOrDefault(x => x.GetType().ToString().ToLower().Contains("hypermilkable"));
+                if (pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Heavy_Lactating_Permanent)
+                    || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Permanent)
+                    || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Natural)
+                    || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Drug)) milkcomp = pawn.AllComps.FirstOrDefault(x => x.GetType().ToString().ToLower().Contains("milkablehuman"));
                else milkcomp = pawn.AllComps.FirstOrDefault(x => x.GetType().ToString().ToLower().Contains("milkable"));
            }
            else
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs
@ -158,7 +158,7 @@ namespace RJW_Menstruation
        public static readonly HediffDef Hediff_Lactating_Natural = DefDatabase<HediffDef>.GetNamedSilentFail("Lactating_Natural");
        public static readonly HediffDef Hediff_Lactating_Permanent = DefDatabase<HediffDef>.GetNamedSilentFail("Lactating_Permanent");
        public static readonly HediffDef Hediff_Heavy_Lactating_Permanent = DefDatabase<HediffDef>.GetNamedSilentFail("Heavy_Lactating_Permanent");
-        public static readonly JobDef Job_LactateSelf_MC = DefDatabase<JobDef>.GetNamedSilentFail("LactateSelf_MC");
+        public static readonly JobDef Job_LactateSelf_MC = DefDatabase<JobDef>.GetNamedSilentFail("MilkSelf");

        // Defs from Sexperience Ideology
        public static readonly PreceptDef Pregnancy_Elevated = DefDatabase<PreceptDef>.GetNamedSilentFail("Pregnancy_Elevated");
Author	SHA1	Message	Date
Akiyami Solo	475584f5dd	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-06-23 12:55:27 +00:00
Акиями Соло	cdfe9b44b8	reduction of unnecessary inspections	2024-01-11 20:55:26 +03:00
Акиями Соло	b21fc85a29	fix JobDef link for mod rjw-mc-biotech mod	2024-01-11 20:39:07 +03:00
Акиями Соло	48f020d832	fix display of breast fullness in gui for rjw-mc-biotech mod	2024-01-11 20:38:38 +03:00
lutepickle	23ae342722	Merge branch 'dev'	2024-01-08 13:55:51 -08:00
lutepickle	509eeabddc	Merge branch 'dev'	2023-07-28 17:29:32 -07:00
lutepickle	6fabfd6aaf	Revert "Initialize womb when displaying gizmo if needed." This reverts commit `ebbbf8ee7f`.	2023-07-03 09:08:52 -07:00
lutepickle	ebbbf8ee7f	Initialize womb when displaying gizmo if needed.	2023-07-03 08:54:19 -07:00