mirror of
https://github.com/vegapnk/RJW-Genes.git
synced 2024-08-15 00:23:31 +00:00
Resolve Merge conflicts
This commit is contained in:
commit
bf5617ffe0
35 changed files with 641 additions and 123 deletions
|
@ -25,6 +25,7 @@
|
|||
<AbilityDef>rjw_genes_flight</AbilityDef>
|
||||
</descriptionHyperlinks>
|
||||
<biostatCpx>1</biostatCpx>
|
||||
<biostatMet>-1</biostatMet>
|
||||
<graphicData>
|
||||
<graphicPath>Things/Pawn/Humanlike/BodyAttachments/rjw_genes_Succubus_Wings/Succubus_Wings</graphicPath>
|
||||
<colorType>Skin</colorType>
|
||||
|
|
|
@ -105,7 +105,7 @@
|
|||
<label>paralysing kiss</label>
|
||||
<labelShortAdj>paralysing kiss</labelShortAdj>
|
||||
<description>Carriers of this gene are able to briefly stun an enemy with a kiss.</description>
|
||||
<iconPath>Things/Mote/Heart</iconPath>
|
||||
<iconPath>Genes/Icons/rjw_genes_lips</iconPath>
|
||||
<prerequisite>rjw_genes_lifeforce</prerequisite>
|
||||
<displayOrderInCategory>12</displayOrderInCategory>
|
||||
<displayCategory>rjw_genes_fertilin</displayCategory>
|
||||
|
@ -151,6 +151,24 @@
|
|||
</symbolPack>
|
||||
</GeneDef>
|
||||
|
||||
<GeneDef>
|
||||
<defName>rjw_genes_naked_prowess</defName>
|
||||
<label>naked prowess</label>
|
||||
<description>Carriers of this gene are able to temporarily increase their strenght and resilience, while they are naked.</description>
|
||||
<iconPath>Things/Mote/Heart</iconPath>
|
||||
<prerequisite>rjw_genes_lifeforce</prerequisite>
|
||||
<displayOrderInCategory>13</displayOrderInCategory>
|
||||
<displayCategory>rjw_genes_fertilin</displayCategory>
|
||||
<abilities>
|
||||
<li>rjw_genes_naked_prowess</li>
|
||||
</abilities>
|
||||
<descriptionHyperlinks>
|
||||
<AbilityDef>rjw_genes_naked_prowess</AbilityDef>
|
||||
</descriptionHyperlinks>
|
||||
<biostatCpx>1</biostatCpx>
|
||||
<biostatMet>-1</biostatMet>
|
||||
</GeneDef>
|
||||
|
||||
<GeneDef>
|
||||
<defName>rjw_genes_cum_eater</defName>
|
||||
<label>Cum eater</label>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue