Merge branch 'dev'

This commit is contained in:
lutepickle 2024-07-20 17:36:01 -07:00
commit f58e154ca3
5 changed files with 6 additions and 3 deletions

Binary file not shown.

View file

@ -321,7 +321,7 @@
<stages> <stages>
<li> <li>
<label>{0} came inside</label> <label>{0} came inside</label>
<description>I hope this makes me pregnant like should be.</description> <description>I hope this makes me pregnant like I should be.</description>
<baseMoodEffect>15</baseMoodEffect> <baseMoodEffect>15</baseMoodEffect>
<baseOpinionOffset>10</baseOpinionOffset> <baseOpinionOffset>10</baseOpinionOffset>
</li> </li>

View file

@ -8,7 +8,7 @@ namespace RJW_Menstruation
{ {
public static ThingDef VEGeneBloodDef(Pawn pawn) public static ThingDef VEGeneBloodDef(Pawn pawn)
{ {
if (!ModsConfig.BiotechActive) return null; if (!ModsConfig.BiotechActive || pawn.genes == null) return null;
foreach(Gene gene in pawn.genes.GenesListForReading.Where(gene => gene.Active)) foreach(Gene gene in pawn.genes.GenesListForReading.Where(gene => gene.Active))
{ {
ThingDef bloodDef = gene.def.GetModExtension<GeneExtension>()?.customBloodThingDef; ThingDef bloodDef = gene.def.GetModExtension<GeneExtension>()?.customBloodThingDef;

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest> <Manifest>
<identifier>RJW Menstruation</identifier> <identifier>RJW Menstruation</identifier>
<version>1.5.0.0</version> <version>1.5.0.1</version>
<dependencies> <dependencies>
</dependencies> </dependencies>
<incompatibleWith /> <incompatibleWith />

View file

@ -1,3 +1,6 @@
Version 1.5.0.1
- Fix error getting blood color of pawns without genes.
Version 1.5.0.0 Version 1.5.0.0
- Support for RimWorld 1.5. All future changes to Menstruation will only be for RimWorld 1.5. - Support for RimWorld 1.5. All future changes to Menstruation will only be for RimWorld 1.5.
- Updated Traditional Chinese translation by Hydrogen. - Updated Traditional Chinese translation by Hydrogen.