AblativeAbsolute/rjw-genes
1
0
Fork 0
mirror of https://github.com/vegapnk/RJW-Genes.git synced 2024-08-15 00:23:31 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity

Really fixed merge conflicts,upsie

Browse source
This commit is contained in:
Vegapnk 2023-01-15 21:14:26 +01:00
parent 0e20e00150
commit 0c3af21c3a
7 changed files with 5 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/Genes/Damage/Gene_Unbreakable.cs
View file

@ -1,5 +1,4 @@
using LicentiaLabs;
using rjw;
using rjw;
using Verse;
namespace RJW_Genes

9
Source/Genes/GeneUtility.cs
View file

@ -174,13 +174,6 @@ namespace RJW_Genes
}
return pawn.genes.HasGene(GeneDefOf.rjw_genes_unbreakable);
}
<<<<<<< HEAD
public static bool HasGenitaliaResizingGenes(Pawn pawn)
{
return !GetGenitaliaResizingGenes(pawn).NullOrEmpty();
}
public static List<Gene_GenitaliaResizingGene> GetGenitaliaResizingGenes(Pawn pawn)
{
@ -196,7 +189,5 @@ namespace RJW_Genes
return ResizingGenes;
}
=======
>>>>>>> 09157e923d5c4c4cf71d79cb0af665ffd6a7c536
}
}

2
Source/Genes/Life_Force/Gene_LifeForce.cs
View file

@ -24,7 +24,7 @@ namespace RJW_Genes
Pawn pawn = this.pawn;
return ((pawn != null) ? pawn.ageTracker : null) == null ||
((float)this.pawn.ageTracker.AgeBiologicalYears >= this.def.minAgeActive && this.pawn.ageTracker.AgeBiologicalYears >= (RJWSettings.AllowYouthSex ? 13f : 18f));
((float)this.pawn.ageTracker.AgeBiologicalYears >= this.def.minAgeActive);
}
}

4
Source/Genes/Special/Patch_OrgasmRush.cs
View file

@ -46,10 +46,10 @@ namespace RJW_Genes
/// <returns></returns>
public static Hediff GetOrgasmRushHediff(Pawn orgasmed)
{
Hediff orgasmRushHediff = orgasmed.health.hediffSet.GetFirstHediffOfDef(GeneDefOf.rjw_genes_orgasm_rush_hediff);
Hediff orgasmRushHediff = orgasmed.health.hediffSet.GetFirstHediffOfDef(HediffDefOf.rjw_genes_orgasm_rush_hediff);
if (orgasmRushHediff == null)
{
orgasmRushHediff = HediffMaker.MakeHediff(GeneDefOf.rjw_genes_orgasm_rush_hediff, orgasmed);
orgasmRushHediff = HediffMaker.MakeHediff(HediffDefOf.rjw_genes_orgasm_rush_hediff, orgasmed);
orgasmRushHediff.Severity = 0;
orgasmed.health.AddHediff(orgasmRushHediff);
}