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

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
}
}