1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage1.xml

@@ -30,7 +30,6 @@
               <visible>true</visible>
               <offset>(0, 0, -0.75)</offset>
               <rotation>South</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>150</tick>

1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml

@@ -23,7 +23,6 @@
               <offset>(0, 0, -0.65)</offset>
               <rotation>South</rotation>
               <sound>Fuck</sound>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>30</tick>
@@ -88,7 +87,6 @@
               <visible>true</visible>
               <offset>(0, 2, 0.43)</offset>
               <rotation>South</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>30</tick>

1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml

@@ -23,7 +23,6 @@
               <offset>(0, 0, -0.65)</offset>
               <rotation>South</rotation>
               <sound>Fuck</sound>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>30</tick>
@@ -88,7 +87,6 @@
               <visible>true</visible>
               <offset>(0, 2, 0.43)</offset>
               <rotation>South</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>30</tick>

1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml

@@ -23,7 +23,6 @@
               <offset>(0, 0, -0.65)</offset>
               <rotation>South</rotation>
               <sound>Fuck</sound>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>30</tick>
@@ -95,7 +94,6 @@
               <visible>true</visible>
               <offset>(0.03, 2, 0.43)</offset>
               <rotation>South</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>30</tick>

1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml

@@ -15,7 +15,6 @@
               <visible>true</visible>
               <offset>(0, 0, -0.7)</offset>
               <rotation>South</rotation>
-              <voice>MoanShort</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>20</tick>
@@ -108,7 +107,6 @@
               <visible>true</visible>
               <offset>(0, 2, 0.23)</offset>
               <rotation>South</rotation>
-              <voice>Grunt</voice>
             </li>
           </keyframes>
         </value>

1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage4.xml

@@ -37,7 +37,6 @@
               <offset>(0, 0, -0.7)</offset>
               <rotation>South</rotation>
               <sound>Cum</sound>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>125</tick>
@@ -138,7 +137,6 @@
               <visible>true</visible>
               <offset>(0, 2, 0.26)</offset>
               <rotation>South</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>85</tick>
@@ -153,7 +151,6 @@
               <visible>true</visible>
               <offset>(0, 2, 0.26)</offset>
               <rotation>South</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>200</tick>

1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml

@@ -23,7 +23,6 @@
               <offset>(0, 0, -0.65)</offset>
               <rotation>South</rotation>
               <sound>Slimy</sound>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>55</tick>
@@ -89,7 +88,6 @@
               <visible>true</visible>
               <offset>(0, 2, 0.43)</offset>
               <rotation>South</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>55</tick>

1.5/Defs/AnimationDefs/Cunnilingus/Stage2a.xml

@@ -112,7 +112,6 @@
               <visible>true</visible>
               <offset>(0.578171, 0, 0.06489658)</offset>
               <rotation>West</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>60</tick>

1.5/Defs/AnimationDefs/Cunnilingus/Stage2b.xml

@@ -98,7 +98,6 @@
               <visible>true</visible>
               <offset>(0.578171, 0, 0.06489658)</offset>
               <rotation>West</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>28</tick>
@@ -120,6 +119,7 @@
               <visible>true</visible>
               <offset>(0.578171, 0, 0.06489658)</offset>
               <rotation>West</rotation>
+              <sound>Slimy</sound>
             </li>
           </keyframes>
         </value>

1.5/Defs/AnimationDefs/Cunnilingus/Stage2c.xml

@@ -22,7 +22,6 @@
               <visible>true</visible>
               <offset>(-0.2359883, -1, 0.3185842)</offset>
               <rotation>East</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>60</tick>
@@ -94,7 +93,6 @@
               <offset>(0.5309734, 0, 0.1120945)</offset>
               <scale>(1, 1, 0.97)</scale>
               <rotation>West</rotation>
-              <voice>MoanShort</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>60</tick>

1.5/Defs/AnimationDefs/Cunnilingus/Stage3_LoopOnce.xml

@@ -97,7 +97,7 @@
         </value>
       </li>
       <li>
-        <key>RenderNodeTag_Hand</key>
+        <key>Hand</key>
         <value>
           <workerClass>Rimworld_Animations.AnimationWorker_KeyframesExtended</workerClass>
           <keyframes>

1.5/Defs/AnimationDefs/Cunnilingus/Stage4a.xml

@@ -100,7 +100,6 @@
               <offset>(0.5073743, 0, 0.07669616)</offset>
               <rotation>West</rotation>
               <sound>Slimy</sound>
-              <voice>MoanShort</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>25</tick>
@@ -150,6 +149,7 @@
               <visible>true</visible>
               <offset>(0.2713863, -0.5, 0.6135693)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>10</tick>
@@ -157,6 +157,7 @@
               <visible>true</visible>
               <offset>(0.2064899, -0.5, 0.60177)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>20</tick>
@@ -164,6 +165,7 @@
               <visible>true</visible>
               <offset>(0.2477879, -0.5, 0.5545721)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>25</tick>
@@ -171,6 +173,7 @@
               <visible>true</visible>
               <offset>(0.2713863, -0.5, 0.6135693)</offset>
               <rotation>North</rotation>
+              
             </li>
           </keyframes>
         </value>

1.5/Defs/AnimationDefs/Cunnilingus/Stage4b.xml

@@ -93,7 +93,6 @@
               <offset>(0.5073743, 0, 0.07669616)</offset>
               <rotation>West</rotation>
               <sound>Slimy</sound>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>25</tick>
@@ -143,6 +142,7 @@
               <visible>true</visible>
               <offset>(0.2713863, -0.5, 0.6135693)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>10</tick>
@@ -150,6 +150,7 @@
               <visible>true</visible>
               <offset>(0.2064899, -0.5, 0.60177)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>20</tick>
@@ -157,6 +158,7 @@
               <visible>true</visible>
               <offset>(0.2477879, -0.5, 0.5545721)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>25</tick>
@@ -164,6 +166,7 @@
               <visible>true</visible>
               <offset>(0.2713863, -0.5, 0.6135693)</offset>
               <rotation>North</rotation>
+              
             </li>
           </keyframes>
         </value>

1.5/Defs/AnimationDefs/Cunnilingus/Stage4c.xml

@@ -100,7 +100,6 @@
               <offset>(0.5073743, 0, 0.07669616)</offset>
               <rotation>West</rotation>
               <sound>Slimy</sound>
-              <voice>MoanShort</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>25</tick>
@@ -150,6 +149,7 @@
               <visible>true</visible>
               <offset>(0.2713863, -0.5, 0.6135693)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>10</tick>
@@ -157,6 +157,7 @@
               <visible>true</visible>
               <offset>(0.2064899, -0.5, 0.60177)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>20</tick>
@@ -164,6 +165,7 @@
               <visible>true</visible>
               <offset>(0.2477879, -0.5, 0.5545721)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>25</tick>
@@ -171,6 +173,7 @@
               <visible>true</visible>
               <offset>(0.2713863, -0.5, 0.6135693)</offset>
               <rotation>North</rotation>
+              
             </li>
           </keyframes>
         </value>

1.5/Defs/AnimationDefs/Cunnilingus/Stage5.xml

@@ -100,7 +100,6 @@
               <offset>(0.4896755, 0, 0.04129779)</offset>
               <rotation>West</rotation>
               <sound>Slimy</sound>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>20</tick>
@@ -149,6 +148,7 @@
               <visible>true</visible>
               <offset>(0.2713863, -0.5, 0.6135693)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>8</tick>
@@ -156,6 +156,7 @@
               <visible>true</visible>
               <offset>(0.2477879, -0.5, 0.6548674)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>15</tick>
@@ -163,6 +164,7 @@
               <visible>true</visible>
               <offset>(0.2241894, -0.5, 0.6312683)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>20</tick>
@@ -170,6 +172,7 @@
               <visible>true</visible>
               <offset>(0.2772866, -0.5, 0.6135693)</offset>
               <rotation>North</rotation>
+              
             </li>
           </keyframes>
         </value>

1.5/Defs/AnimationDefs/Cunnilingus/Stage6.xml

@@ -43,7 +43,6 @@
               <visible>true</visible>
               <offset>(-0.2359883, -1, 0.2536873)</offset>
               <rotation>East</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>100</tick>
@@ -130,7 +129,6 @@
               <offset>(0.5073743, 0, 0.06489658)</offset>
               <rotation>West</rotation>
               <sound>Cum</sound>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>10</tick>
@@ -155,7 +153,6 @@
               <offset>(0.5073743, 0, 0.06489658)</offset>
               <rotation>West</rotation>
               <sound>Slimy</sound>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>35</tick>
@@ -231,6 +228,7 @@
               <visible>true</visible>
               <offset>(0.2772866, -0.5, 0.6135693)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>10</tick>
@@ -238,6 +236,7 @@
               <visible>true</visible>
               <offset>(0.2890859, -0.5, 0.5663717)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>15</tick>
@@ -245,6 +244,7 @@
               <visible>true</visible>
               <offset>(0.2182891, -0.5, 0.6666666)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>30</tick>
@@ -252,6 +252,7 @@
               <visible>true</visible>
               <offset>(0.2831856, -0.5, 0.5781713)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>45</tick>
@@ -259,6 +260,7 @@
               <visible>true</visible>
               <offset>(0.2064892, -0.5, 0.6430678)</offset>
               <rotation>North</rotation>
+              
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>70</tick>
@@ -266,6 +268,7 @@
               <visible>false</visible>
               <offset>(0.3303832, -0.5, 0.2654868)</offset>
               <rotation>North</rotation>
+              
             </li>
           </keyframes>
         </value>

1.5/Defs/AnimationDefs/DoublePenetration/Stage1.xml

@@ -22,7 +22,7 @@
               <visible>true</visible>
               <offset>(-0.6, -1, -0.42)</offset>
               <rotation>East</rotation>
-              <sound>Clap</sound>
+              <sound>Fuck</sound>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>40</tick>
@@ -30,7 +30,6 @@
               <visible>true</visible>
               <offset>(-0.6, -1, -0.37)</offset>
               <rotation>East</rotation>
-              <sound>Fuck</sound>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>80</tick>
@@ -85,7 +84,6 @@
               <visible>true</visible>
               <offset>(-0.6, 0, 0.15)</offset>
               <rotation>West</rotation>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>40</tick>
@@ -154,7 +152,6 @@
               <visible>true</visible>
               <offset>(0.25, -1, 0.2)</offset>
               <rotation>West</rotation>
-              <sound>Fuck</sound>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>40</tick>
@@ -162,6 +159,7 @@
               <visible>true</visible>
               <offset>(0.2, -1, 0.2)</offset>
               <rotation>West</rotation>
+              <sound>Fuck</sound>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>80</tick>

1.5/Defs/AnimationDefs/DoublePenetration/Stage2a.xml

@@ -23,7 +23,6 @@
               <offset>(-0.6, -1, -0.37)</offset>
               <rotation>East</rotation>
               <sound>Fuck</sound>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>40</tick>
@@ -85,7 +84,6 @@
               <visible>true</visible>
               <offset>(-0.4, 0, 0.1)</offset>
               <rotation>West</rotation>
-              <voice>MoanShort</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>40</tick>
@@ -135,7 +133,6 @@
               <visible>true</visible>
               <offset>(0.3, -1, 0.2)</offset>
               <rotation>West</rotation>
-              <sound>Fuck</sound>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>40</tick>
@@ -143,7 +140,7 @@
               <visible>true</visible>
               <offset>(0.2, -1, 0.2)</offset>
               <rotation>West</rotation>
-              <sound>Clap</sound>
+              <sound>Fuck</sound>
             </li>
           </keyframes>
         </value>

1.5/Defs/AnimationDefs/DoublePenetration/Stage2b.xml

@@ -77,7 +77,6 @@
               <visible>true</visible>
               <offset>(-0.45, 0, 0.12)</offset>
               <rotation>West</rotation>
-              <voice>MoanShort</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>30</tick>
@@ -134,8 +133,6 @@
               <visible>true</visible>
               <offset>(0.3, -1, 0.2)</offset>
               <rotation>West</rotation>
-              <sound>Fuck</sound>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>40</tick>
@@ -143,7 +140,7 @@
               <visible>true</visible>
               <offset>(0.2, -1, 0.2)</offset>
               <rotation>West</rotation>
-              <sound>Clap</sound>
+              <sound>Fuck</sound>
             </li>
           </keyframes>
         </value>

1.5/Defs/AnimationDefs/DoublePenetration/Stage2c.xml

@@ -91,7 +91,6 @@
               <visible>true</visible>
               <offset>(-0.38, 0, 0.08)</offset>
               <rotation>West</rotation>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>30</tick>

1.5/Defs/AnimationDefs/DoublePenetration/Stage2d.xml

@@ -87,9 +87,9 @@
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>15</tick>
-              <angle>-39</angle>
+              <angle>-35</angle>
               <visible>true</visible>
-              <offset>(-0.5743952, 0, 0.1317991)</offset>
+              <offset>(-0.48, 0, 0.12)</offset>
               <rotation>West</rotation>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
@@ -125,7 +125,6 @@
               <angle>0</angle>
               <visible>true</visible>
               <rotation>South</rotation>
-              <voice>Scream</voice>
             </li>
           </keyframes>
         </value>

1.5/Defs/AnimationDefs/DoublePenetration/Stage3.xml

@@ -23,7 +23,6 @@
               <offset>(-0.64, -1, -0.3)</offset>
               <rotation>East</rotation>
               <sound>Fuck</sound>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>25</tick>
@@ -85,7 +84,6 @@
               <visible>true</visible>
               <offset>(-0.5, 0, 0.18)</offset>
               <rotation>West</rotation>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>25</tick>
@@ -148,7 +146,6 @@
               <offset>(0.2, -1, 0.28)</offset>
               <rotation>West</rotation>
               <sound>Fuck</sound>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>25</tick>

1.5/Defs/AnimationDefs/DoublePenetration/Stage4.xml

@@ -30,7 +30,6 @@
               <visible>true</visible>
               <offset>(-0.6, -1, -0.37)</offset>
               <rotation>East</rotation>
-              <voice>Grunt</voice>
             </li>
           </keyframes>
         </value>
@@ -85,7 +84,6 @@
               <visible>true</visible>
               <offset>(-0.56, 0, 0.22)</offset>
               <rotation>West</rotation>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>17</tick>
@@ -148,7 +146,6 @@
               <offset>(0.23, -1, 0.28)</offset>
               <rotation>West</rotation>
               <sound>Fuck</sound>
-              <voice>MoanShort</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>17</tick>

1.5/Defs/AnimationDefs/DoublePenetration/Stage5a.xml

@@ -53,7 +53,6 @@
               <offset>(-0.6, -1, -0.37)</offset>
               <rotation>East</rotation>
               <sound>Cum</sound>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>105</tick>
@@ -122,7 +121,6 @@
               <visible>true</visible>
               <offset>(-0.45, 0, 0.12)</offset>
               <rotation>West</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>60</tick>
@@ -144,7 +142,6 @@
               <visible>true</visible>
               <offset>(-0.55, 0, 0.12)</offset>
               <rotation>West</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>180</tick>
@@ -243,7 +240,6 @@
               <offset>(0.16, -1, 0.2)</offset>
               <rotation>West</rotation>
               <sound>Cum</sound>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>135</tick>

1.5/Defs/AnimationDefs/DoublePenetration/Stage5b.xml

@@ -22,7 +22,6 @@
               <visible>true</visible>
               <offset>(-0.6, -1, -0.37)</offset>
               <rotation>East</rotation>
-              <sound>Fuck</sound>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>25</tick>
@@ -30,7 +29,7 @@
               <visible>true</visible>
               <offset>(-0.6, -1, -0.37)</offset>
               <rotation>East</rotation>
-              <sound>Clap</sound>
+              <sound>Fuck</sound>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>50</tick>
@@ -46,7 +45,6 @@
               <visible>true</visible>
               <offset>(-0.6, -1, -0.37)</offset>
               <rotation>East</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>100</tick>
@@ -123,7 +121,6 @@
               <visible>true</visible>
               <offset>(-0.45, 0, 0.12)</offset>
               <rotation>West</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>60</tick>
@@ -138,7 +135,6 @@
               <visible>true</visible>
               <offset>(-0.6, 0, 0)</offset>
               <rotation>West</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>180</tick>
@@ -208,7 +204,6 @@
               <visible>true</visible>
               <offset>(0.16, -1, 0.2)</offset>
               <rotation>West</rotation>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>70</tick>
@@ -224,7 +219,6 @@
               <visible>true</visible>
               <offset>(0.16, -1, 0.2)</offset>
               <rotation>West</rotation>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>130</tick>

1.5/Defs/AnimationDefs/DoublePenetration/Stage5c.xml

@@ -22,7 +22,6 @@
               <visible>true</visible>
               <offset>(-0.6, -1, -0.37)</offset>
               <rotation>East</rotation>
-              <sound>Fuck</sound>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>25</tick>
@@ -30,7 +29,7 @@
               <visible>true</visible>
               <offset>(-0.6, -1, -0.37)</offset>
               <rotation>East</rotation>
-              <sound>Clap</sound>
+              <sound>Fuck</sound>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>50</tick>
@@ -46,7 +45,6 @@
               <visible>true</visible>
               <offset>(-0.6, -1, -0.37)</offset>
               <rotation>East</rotation>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>100</tick>
@@ -130,7 +128,6 @@
               <visible>true</visible>
               <offset>(-0.45, 0, 0.12)</offset>
               <rotation>West</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>60</tick>
@@ -138,7 +135,6 @@
               <visible>true</visible>
               <offset>(-0.5, 0, 0.12)</offset>
               <rotation>West</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>65</tick>
@@ -167,7 +163,6 @@
               <visible>true</visible>
               <offset>(-0.5, 0, 0.12)</offset>
               <rotation>West</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>180</tick>
@@ -250,7 +245,6 @@
               <visible>true</visible>
               <offset>(0.33, -1, 0.2)</offset>
               <rotation>West</rotation>
-              <sound>Fuck</sound>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>23</tick>
@@ -258,7 +252,7 @@
               <visible>true</visible>
               <offset>(0.16, -1, 0.2)</offset>
               <rotation>West</rotation>
-              <sound>Clap</sound>
+              <sound>Fuck</sound>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>70</tick>
@@ -274,7 +268,6 @@
               <visible>true</visible>
               <offset>(0.16, -1, 0.2)</offset>
               <rotation>West</rotation>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>130</tick>

1.5/Defs/AnimationDefs/Missionary/Stage1.xml

@@ -30,7 +30,6 @@
               <offset>(-0.75, 0, 0.38)</offset>
               <rotation>East</rotation>
               <sound>Fuck</sound>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>66</tick>
@@ -135,7 +134,6 @@
               <visible>true</visible>
               <offset>(0.1, -1, 0)</offset>
               <rotation>West</rotation>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>100</tick>

1.5/Defs/AnimationDefs/Missionary/Stage2.xml

@@ -23,7 +23,6 @@
               <visible>true</visible>
               <offset>(-0.6, 0, 0.38)</offset>
               <rotation>East</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>35</tick>
@@ -114,7 +113,6 @@
               <visible>true</visible>
               <offset>(0.03, -1, 0)</offset>
               <rotation>West</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>10</tick>

1.5/Defs/AnimationDefs/Missionary/Stage2b.xml

@@ -23,7 +23,6 @@
               <visible>true</visible>
               <offset>(-0.6, 0, 0.38)</offset>
               <rotation>East</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>35</tick>
@@ -114,7 +113,6 @@
               <visible>true</visible>
               <offset>(0.03, -1, 0)</offset>
               <rotation>West</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>10</tick>

1.5/Defs/AnimationDefs/Missionary/Stage2c.xml

@@ -23,7 +23,6 @@
               <visible>true</visible>
               <offset>(-0.6, 0, 0.38)</offset>
               <rotation>East</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>35</tick>
@@ -121,7 +120,6 @@
               <visible>true</visible>
               <offset>(0.12, -1, 0.03)</offset>
               <rotation>West</rotation>
-              <voice>Moan</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>35</tick>

1.5/Defs/AnimationDefs/Missionary/Stage4.xml

@@ -23,7 +23,6 @@
               <visible>true</visible>
               <offset>(-0.42, 0, 0.42)</offset>
               <rotation>East</rotation>
-              <voice>MoanShort</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>20</tick>
@@ -100,7 +99,6 @@
               <visible>true</visible>
               <offset>(0.2, -1, 0)</offset>
               <rotation>West</rotation>
-              <voice>MoanShort</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>20</tick>

1.5/Defs/AnimationDefs/Missionary/Stage5.xml

@@ -23,7 +23,6 @@
               <visible>true</visible>
               <offset>(-0.45, 0, 0.42)</offset>
               <rotation>East</rotation>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>13</tick>
@@ -100,7 +99,6 @@
               <visible>true</visible>
               <offset>(0.16, -1, 0)</offset>
               <rotation>West</rotation>
-              <voice>Grunt</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>13</tick>

1.5/Defs/AnimationDefs/Missionary/Stage6.xml

@@ -23,7 +23,6 @@
               <offset>(-0.43, 0, 0.42)</offset>
               <rotation>East</rotation>
               <sound>Fuck</sound>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>80</tick>
@@ -54,7 +53,6 @@
               <visible>true</visible>
               <offset>(-0.43, 0, 0.42)</offset>
               <rotation>East</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>200</tick>
@@ -138,7 +136,6 @@
               <visible>true</visible>
               <offset>(0.23, -1, 0)</offset>
               <rotation>West</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>80</tick>
@@ -146,7 +143,6 @@
               <visible>true</visible>
               <offset>(0.2, -1, 0)</offset>
               <rotation>West</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>85</tick>
@@ -161,7 +157,6 @@
               <visible>true</visible>
               <offset>(0.2, -1, 0)</offset>
               <rotation>West</rotation>
-              <voice>Scream</voice>
             </li>
             <li Class="Rimworld_Animations.ExtendedKeyframe">
               <tick>155</tick>

1.5/Defs/VoiceDefs/VoiceDef_Human.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+	<Rimworld_Animations.VoiceDef>
+		<defName>Voice_HumanFemale</defName>
+		<race>Human</race>
+		<gender>Female</gender>
+		<sounds>
+			<!-- <li><key>Moan</key><value>FemaleMoanSoundDefHere</value></li> -->
+		</sounds>
+	</Rimworld_Animations.VoiceDef>
+
+	<Rimworld_Animations.VoiceDef>
+		<defName>Voice_HumanMale</defName>
+		<race>Human</race>
+		<gender>Male</gender>
+		<sounds>
+			<!-- <li><key>Moan</key><value>MaleMoanSoundDefHere</value></li> -->
+		</sounds>
+	</Rimworld_Animations.VoiceDef>
+
+</Defs>

1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanFemale.xml

@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-	<SoundDef>
-		<defName>Moan_HumanFemale</defName>
-		<context>MapOnly</context>
-		<eventNames />
-		<maxSimultaneous>5</maxSimultaneous>
-		<maxVoices>5</maxVoices>
-		<subSounds>
-			<li>
-				<grains>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Moan1</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Moan2</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Moan3</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Moan4</clipPath>
-					</li>
-				</grains>
-				<volumeRange>
-					<min>55</min>
-					<max>65</max>
-				</volumeRange>
-				<pitchRange>
-					<min>0.9</min>
-					<max>1.1</max>
-				</pitchRange>
-				<distRange>
-					<min>0</min>
-					<max>100</max>
-				</distRange>
-				<repeatMode>NeverTwice</repeatMode>
-				<sustainLoop>false</sustainLoop>
-			</li>
-		</subSounds>
-	</SoundDef>
-
-	<SoundDef>
-		<defName>MoanShort_HumanFemale</defName>
-		<context>MapOnly</context>
-		<eventNames />
-		<maxSimultaneous>5</maxSimultaneous>
-		<maxVoices>5</maxVoices>
-		<subSounds>
-			<li>
-				<grains>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/MoanShort1</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/MoanShort2</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/MoanShort3</clipPath>
-					</li>
-				</grains>
-				<volumeRange>
-					<min>55</min>
-					<max>65</max>
-				</volumeRange>
-				<pitchRange>
-					<min>0.9</min>
-					<max>1.1</max>
-				</pitchRange>
-				<distRange>
-					<min>0</min>
-					<max>100</max>
-				</distRange>
-				<repeatMode>NeverTwice</repeatMode>
-				<sustainLoop>false</sustainLoop>
-			</li>
-		</subSounds>
-	</SoundDef>
-
-	<SoundDef>
-		<defName>Grunt_HumanFemale</defName>
-		<context>MapOnly</context>
-		<eventNames />
-		<maxSimultaneous>5</maxSimultaneous>
-		<maxVoices>5</maxVoices>
-		<subSounds>
-			<li>
-				<grains>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Grunt1</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Grunt2</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Grunt3</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Grunt4</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Grunt5</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Grunt6</clipPath>
-					</li>
-				</grains>
-				<volumeRange>
-					<min>55</min>
-					<max>65</max>
-				</volumeRange>
-				<pitchRange>
-					<min>0.9</min>
-					<max>1.1</max>
-				</pitchRange>
-				<distRange>
-					<min>0</min>
-					<max>100</max>
-				</distRange>
-				<repeatMode>NeverTwice</repeatMode>
-				<sustainLoop>false</sustainLoop>
-			</li>
-		</subSounds>
-	</SoundDef>
-
-	<SoundDef>
-		<defName>Scream_HumanFemale</defName>
-		<context>MapOnly</context>
-		<eventNames />
-		<maxSimultaneous>5</maxSimultaneous>
-		<maxVoices>5</maxVoices>
-		<subSounds>
-			<li>
-				<grains>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Scream1</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Scream2</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Scream3</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/FVoice/Scream4</clipPath>
-					</li>
-				</grains>
-				<volumeRange>
-					<min>55</min>
-					<max>65</max>
-				</volumeRange>
-				<pitchRange>
-					<min>0.9</min>
-					<max>1.1</max>
-				</pitchRange>
-				<distRange>
-					<min>0</min>
-					<max>100</max>
-				</distRange>
-				<repeatMode>NeverTwice</repeatMode>
-				<sustainLoop>false</sustainLoop>
-			</li>
-		</subSounds>
-	</SoundDef>
-</Defs>

1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanMale.xml

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-	<SoundDef>
-		<defName>Moan_HumanMale</defName>
-		<context>MapOnly</context>
-		<eventNames />
-		<maxSimultaneous>5</maxSimultaneous>
-		<maxVoices>5</maxVoices>
-		<subSounds>
-			<li>
-				<grains>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/Moan1</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/Moan2</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/Moan3</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/Moan4</clipPath>
-					</li>
-				</grains>
-				<volumeRange>
-					<min>55</min>
-					<max>65</max>
-				</volumeRange>
-				<pitchRange>
-					<min>0.9</min>
-					<max>1.1</max>
-				</pitchRange>
-				<distRange>
-					<min>0</min>
-					<max>100</max>
-				</distRange>
-				<repeatMode>NeverTwice</repeatMode>
-				<sustainLoop>false</sustainLoop>
-			</li>
-		</subSounds>
-	</SoundDef>
-
-	<SoundDef>
-		<defName>MoanShort_HumanMale</defName>
-		<context>MapOnly</context>
-		<eventNames />
-		<maxSimultaneous>5</maxSimultaneous>
-		<maxVoices>5</maxVoices>
-		<subSounds>
-			<li>
-				<grains>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/MoanShort1</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/MoanShort2</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/MoanShort3</clipPath>
-					</li>
-				</grains>
-				<volumeRange>
-					<min>55</min>
-					<max>65</max>
-				</volumeRange>
-				<pitchRange>
-					<min>0.9</min>
-					<max>1.1</max>
-				</pitchRange>
-				<distRange>
-					<min>0</min>
-					<max>100</max>
-				</distRange>
-				<repeatMode>NeverTwice</repeatMode>
-				<sustainLoop>false</sustainLoop>
-			</li>
-		</subSounds>
-	</SoundDef>
-
-	<SoundDef>
-		<defName>Grunt_HumanMale</defName>
-		<context>MapOnly</context>
-		<eventNames />
-		<maxSimultaneous>5</maxSimultaneous>
-		<maxVoices>5</maxVoices>
-		<subSounds>
-			<li>
-				<grains>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/Grunt1</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/Grunt2</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/Grunt3</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/Grunt4</clipPath>
-					</li>
-				</grains>
-				<volumeRange>
-					<min>55</min>
-					<max>65</max>
-				</volumeRange>
-				<pitchRange>
-					<min>0.9</min>
-					<max>1.1</max>
-				</pitchRange>
-				<distRange>
-					<min>0</min>
-					<max>100</max>
-				</distRange>
-				<repeatMode>NeverTwice</repeatMode>
-				<sustainLoop>false</sustainLoop>
-			</li>
-		</subSounds>
-	</SoundDef>
-
-	<SoundDef>
-		<defName>Scream_HumanMale</defName>
-		<context>MapOnly</context>
-		<eventNames />
-		<maxSimultaneous>5</maxSimultaneous>
-		<maxVoices>5</maxVoices>
-		<subSounds>
-			<li>
-				<grains>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/Scream1</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/Scream2</clipPath>
-					</li>
-					<li Class="AudioGrain_Clip">
-						<clipPath>Voices/MVoice/Scream3</clipPath>
-					</li>
-				</grains>
-				<volumeRange>
-					<min>55</min>
-					<max>65</max>
-				</volumeRange>
-				<pitchRange>
-					<min>0.9</min>
-					<max>1.1</max>
-				</pitchRange>
-				<distRange>
-					<min>0</min>
-					<max>100</max>
-				</distRange>
-				<repeatMode>NeverTwice</repeatMode>
-				<sustainLoop>false</sustainLoop>
-			</li>
-		</subSounds>
-	</SoundDef>
-</Defs>

1.5/Defs/VoiceDefs/VoiceDef_Human/VoiceDef_Human.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-	<!-- Default voice sounds -->
-	<!-- play when voice def for pawn isn't found -->
-	
-	<Rimworld_Animations.VoiceDef>
-		<defName>Voice_HumanFemale</defName>
-		<gender>Female</gender>
-		<sounds>
-			<li><key>Moan</key><value>Moan_HumanFemale</value></li>
-			<li><key>MoanShort</key><value>MoanShort_HumanFemale</value></li>
-			<li><key>Grunt</key><value>Grunt_HumanFemale</value></li>
-			<li><key>Scream</key><value>Scream_HumanFemale</value></li>
-		</sounds>
-	</Rimworld_Animations.VoiceDef>
-
-	<Rimworld_Animations.VoiceDef>
-		<defName>Voice_HumanMale</defName>
-		<gender>Male</gender>
-		<sounds>
-			<li><key>Moan</key><value>Moan_HumanMale</value></li>
-			<li><key>MoanShort</key><value>MoanShort_HumanMale</value></li>
-			<li><key>Grunt</key><value>Grunt_HumanMale</value></li>
-			<li><key>Scream</key><value>Scream_HumanMale</value></li>
-		</sounds>
-	</Rimworld_Animations.VoiceDef>
-
-</Defs>

1.5/Defs/VoiceDefs/VoiceDef_Orassan.xml

@@ -3,9 +3,7 @@
 	<!--
 	<Rimworld_Animations.VoiceDef>
 		<defName>Voice_Orassan</defName>
-		<races>
+		<race>Alien_Orassan</race>
-			<li>Alien_Orassan</li>
-		</races>
 		<gender>Male</gender>
 		<traitDefs>
 			<li>Wimpy</li>

1.5/Defs/VoiceDefs/VoiceTagDef.xml

@@ -2,25 +2,5 @@
 <Defs>
 	<Rimworld_Animations.VoiceTagDef>
 		<defName>Moan</defName>
-		<probability>0.2</probability>
 	</Rimworld_Animations.VoiceTagDef>
-	
-	<Rimworld_Animations.VoiceTagDef>
-		<defName>MoanShort</defName>
-		<probability>0.4</probability>
-	</Rimworld_Animations.VoiceTagDef>
-	
-	<Rimworld_Animations.VoiceTagDef>
-		<defName>Grunt</defName>
-		<probability>0.4</probability>
-	</Rimworld_Animations.VoiceTagDef>
-	
-	
-	<!-- Screams are guaranteed -->
-	<!-- Play once during orgasm -->
-	<Rimworld_Animations.VoiceTagDef>
-		<defName>Scream</defName>
-		<probability>1</probability>
-	</Rimworld_Animations.VoiceTagDef>
-	
 </Defs>

1.5/Source/Comps/CompExtendedAnimator.cs

@@ -284,8 +284,6 @@ namespace Rimworld_Animations {
                     sound.PlayOneShot(new TargetInfo(pawn.Position, pawn.Map));
                 }
 
-                if (RJWAnimationSettings.playVoices)
-                {
                 //play voice sounds
                 VoiceTagDef voiceTag = animWorker.voiceAtTick(rootNode.tree.AnimationTick);
                 if (voiceTag != null)
@@ -308,8 +306,6 @@ namespace Rimworld_Animations {
                     }
 
                 }
-                }
-
 
             }
 
@@ -326,8 +322,6 @@ namespace Rimworld_Animations {
                             sound.PlayOneShot(new TargetInfo(pawn.Position, pawn.Map));
                         }
 
-                        if (RJWAnimationSettings.playVoices)
-                        {
                         //play voice sounds
                         VoiceTagDef voiceTag = childrenAnimWorker.voiceAtTick(rootNode.tree.AnimationTick);
                         if (voiceTag != null)
@@ -346,7 +340,7 @@ namespace Rimworld_Animations {
                                 }
                             }
                         }
-                        }
+
                     }
                 }
             }

1.5/Source/Patches/RJWPatches/RJWAnimationSettings.cs

@@ -15,7 +15,7 @@ namespace Rimworld_Animations {
             PlayAnimForNonsexualActs = true;
 
         //probably move this setting to a different mod menu if moving rjw parts of code
-        public static bool playVoices = true, playHumanlikeVoicesAsDefault = true;
+        public static bool playHumanlikeVoicesAsDefault = true;
         public static float floatRangeInRenderTreeMenu = 1f;
 
         public static bool offsetTab = false, debugMode = false;
@@ -24,7 +24,7 @@ namespace Rimworld_Animations {
         public override void ExposeData() {
 
             base.ExposeData();
-            Scribe_Values.Look(ref playVoices, "RJWAnimations_PlayVoices", true);
+
             Scribe_Values.Look(ref playHumanlikeVoicesAsDefault, "RJWAnimations-playHumanlikeVoicesAsDefault", true);
             Scribe_Values.Look(ref debugMode, "RJWAnimations-AnimsDebugMode", false);
             Scribe_Values.Look(ref offsetTab, "RJWAnimations-EnableOffsetTab", false);
@@ -61,12 +61,7 @@ namespace Rimworld_Animations {
             listingStandard.CheckboxLabeled("RimAnim_HeartsDuringLovin".Translate(), ref RJWAnimationSettings.hearts);
             listingStandard.CheckboxLabeled("RimAnim_PlayNonsexual".Translate(), ref RJWAnimationSettings.PlayAnimForNonsexualActs);
             listingStandard.CheckboxLabeled("RimAnim_AnimManagerTab".Translate(), ref RJWAnimationSettings.offsetTab);
-            listingStandard.CheckboxLabeled("RimAnim_Voices".Translate(), ref RJWAnimationSettings.playVoices);
-            if (RJWAnimationSettings.playVoices)
-            {
             listingStandard.CheckboxLabeled("RimAnim_HumanlikeVoicesDefault".Translate(), ref RJWAnimationSettings.playHumanlikeVoicesAsDefault);
-            }
-            
             listingStandard.Label("RimAnim_ShiverIntensity".Translate() + RJWAnimationSettings.shiverIntensity);
             RJWAnimationSettings.shiverIntensity = listingStandard.Slider(RJWAnimationSettings.shiverIntensity, 0.0f, 12f);
 

1.5/Source/Voices/VoiceDef.cs

@@ -11,7 +11,7 @@ namespace Rimworld_Animations
     public class VoiceDef : Def
     {
 
-        public List<ThingDef> races = new List<ThingDef>();
+        public ThingDef race;
         public Gender gender = Gender.None;
         public List<TraitDef> traits = new List<TraitDef>();
         public bool takesPriority = false;
@@ -22,8 +22,8 @@ namespace Rimworld_Animations
         public bool VoiceFitsPawn(Pawn pawn)
         {
 
-            //doesn't match any of the races
+            //doesn't match race
-            if (!races.Exists(x => x == pawn.def)) return false;
+            if (pawn.def != race) return false;
 
             //doesn't match gender
             if (gender != Gender.None && pawn.gender != gender) return false;

Languages/ChineseSimplified/Keyed/RJWAnimations-LanguageData.xml

@@ -11,17 +11,12 @@
 	<RimAnim_PlayNonsexual>播放非性行为的动画 (牵手、亲热)</RimAnim_PlayNonsexual>
 	<RimAnim_AnimManagerTab>启用动画管理器选项卡</RimAnim_AnimManagerTab>
 	<RimAnim_ShiverIntensity>颤抖/颤动强度 (默认为 2): </RimAnim_ShiverIntensity>
-	
-	<RimAnim_HumanlikeVoicesDefault>默认情况下播放类似人类的声音</RimAnim_HumanlikeVoicesDefault>
 	<RimAnim_DebugMode>调试模式</RimAnim_DebugMode>
-	<RimAnim_FloatRangeRenderTree>调整渲染树偏移表单的浮动范围:</RimAnim_FloatRangeRenderTree>
 	
 	<!-- Main Tab Window -->
 	<RimAnims_AnimManager>Animation Manager</RimAnims_AnimManager>
-	<RimAnims_Warning>警告--一般情况下，你不想更改人类偏移值，只想更改外星种族偏移值或动物偏移值</RimAnims_Warning>
+	<RimAnims_Warning>警告--一般情况下，你不想更改人类偏移值，只想更改外星種族偏移值或动物偏移值</RimAnims_Warning>
 	<RimAnims_CopyToClipboard>将偏移值复制到剪贴板</RimAnims_CopyToClipboard>
 	<RimAnims_ShareSettings>将偏移值粘贴到 OffsetDef 中，或在 Discord 中共享</RimAnims_ShareSettings>
 	
-
-	
 </LanguageData>

Languages/ChineseTraditional/Keyed/RJWAnimations-LanguageData.xml

@@ -11,10 +11,7 @@
 	<RimAnim_PlayNonsexual>播放非性行為的動畫 (牽手、親熱)</RimAnim_PlayNonsexual>
 	<RimAnim_AnimManagerTab>啟用動畫管理器選項卡</RimAnim_AnimManagerTab>
 	<RimAnim_ShiverIntensity>顫抖/顫動強度 (預設為 2): </RimAnim_ShiverIntensity>
-	
-	<RimAnim_HumanlikeVoicesDefault>默認情況下播放類似人類的聲音</RimAnim_HumanlikeVoicesDefault>
 	<RimAnim_DebugMode>除錯模式</RimAnim_DebugMode>
-	<RimAnim_FloatRangeRenderTree>調整渲染樹偏移表單的浮動範圍:</RimAnim_FloatRangeRenderTree>
 	
 	<!-- Main Tab Window -->
 	<RimAnims_AnimManager>Animation Manager</RimAnims_AnimManager>
@@ -22,6 +19,4 @@
 	<RimAnims_CopyToClipboard>將偏移值複製到剪貼板</RimAnims_CopyToClipboard>
 	<RimAnims_ShareSettings>將偏移值黏貼到 OffsetDef 中，或在 Discord 中共享</RimAnims_ShareSettings>
 	
-
-	
 </LanguageData>

Languages/English/Keyed/RJWAnimations-LanguageData.xml

@@ -11,18 +11,15 @@
 	<RimAnim_PlayNonsexual>Play animation for nonsexual acts (handholding, makeout)</RimAnim_PlayNonsexual>
 	<RimAnim_AnimManagerTab>Enable Animation Manager Tab</RimAnim_AnimManagerTab>
 	<RimAnim_ShiverIntensity>Shiver/Quiver Intensity (default 2): </RimAnim_ShiverIntensity>
-	<RimAnim_Voices>Play voices during animations</RimAnim_Voices>
+	<RimAnim_HumanlikeVoicesDefault>Play humanlike voices by default</RimAnim_HumanlikeVoicesDefault>
-	<RimAnim_HumanlikeVoicesDefault>Play human voices by default, when none found for humanlike race</RimAnim_HumanlikeVoicesDefault>
 	<RimAnim_DebugMode>Debug Mode</RimAnim_DebugMode>
-	<RimAnim_FloatRangeRenderTree>Float range for Debug Render Tree offset menu: </RimAnim_FloatRangeRenderTree>
-	
 	
 	<!-- Main Tab Window -->
 	<RimAnims_AnimManager>Animation Manager</RimAnims_AnimManager>
 	<RimAnims_Warning>Warning--You generally don't want to change human offsets, only alien offsets or animals</RimAnims_Warning>
 	<RimAnims_CopyToClipboard>Copy Offset to Clipboard</RimAnims_CopyToClipboard>
 	<RimAnims_ShareSettings>Paste offset values in OffsetDef, or share in Discord</RimAnims_ShareSettings>
-	
+	<RimAnim_FloatRangeRenderTree>Float range for Debug Render Tree offset menu: </RimAnim_FloatRangeRenderTree>
 	
 	
 </LanguageData>

LoadFolders.xml

@@ -30,7 +30,6 @@
 		<li IfModActive="erdelf.HumanoidAlienRaces">Patch_HumanoidAlienRaces/1.5</li>
 		<li IfModActive="c0ffee.SexToysMasturbation">Patch_SexToysMasturbation/1.5</li>
 		<li IfModActive="Nals.FacialAnimation">Patch_FacialAnimation/1.5</li>
-		<li IfModNotActive="shauaputa.rimnudeworld">Patch_NoRimNudeWorld/1.5</li>
 	</v1.5>
 
 

Patch_NoRimNudeWorld/1.5/Defs/PawnRenderNodeTagDef.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-	<!-- placeholder for when RimNude isn't installed -->
-	<PawnRenderNodeTagDef>
-		<defName>RimNude_Penis</defName>
-	</PawnRenderNodeTagDef>
-</Defs>

Rimworld-Animations.csproj

@@ -244,9 +244,7 @@
     <Content Include="1.5\Defs\TexPathVariantsDefs\TexPathVariants_Xray_Inside.xml" />
     <Content Include="1.5\Defs\TexPathVariantsDefs\TexPathVariants_XrayPenis_Horse.xml" />
     <Content Include="1.5\Defs\AnimationDefs\Cowgirl\TexPathVariants_Cowgirl.xml" />
-    <Content Include="1.5\Defs\VoiceDefs\VoiceDef_Human\SoundDef_HumanFemale.xml" />
+    <Content Include="1.5\Defs\VoiceDefs\VoiceDef_Human.xml" />
-    <Content Include="1.5\Defs\VoiceDefs\VoiceDef_Human\SoundDef_HumanMale.xml" />
-    <Content Include="1.5\Defs\VoiceDefs\VoiceDef_Human\VoiceDef_Human.xml" />
     <Content Include="1.5\Defs\VoiceDefs\VoiceDef_Orassan.xml" />
     <Content Include="1.5\Defs\VoiceDefs\VoiceTagDef.xml" />
     <Content Include="1.5\Patches\AnimationPatchHSK.xml" />
@@ -291,37 +289,6 @@
     <Content Include="1.5\Sounds\Sex\Suck\Swallow_1.wav" />
     <Content Include="1.5\Sounds\Sex\Suck\Swallow_2.wav" />
     <Content Include="1.5\Sounds\Sex\Suck\Swallow_3.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Grunt1.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Grunt2.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Grunt3.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Grunt4.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Grunt5.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Grunt6.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Moan1.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Moan2.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Moan3.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Moan4.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\MoanShort1.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\MoanShort2.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\MoanShort3.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Scream1.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Scream2.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Scream3.wav" />
-    <Content Include="1.5\Sounds\Voices\FVoice\Scream4.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\Grunt1.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\Grunt2.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\Grunt3.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\Grunt4.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\Moan1.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\Moan2.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\Moan3.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\Moan4.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\MoanShort1.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\MoanShort2.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\MoanShort3.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\Scream1.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\Scream2.wav" />
-    <Content Include="1.5\Sounds\Voices\MVoice\Scream3.wav" />
     <Content Include="1.5\Textures\AnimationProps\Banana\Banana_east.png" />
     <Content Include="1.5\Textures\AnimationProps\Banana\Banana_north.png" />
     <Content Include="1.5\Textures\AnimationProps\Banana\Banana_south.png" />
@@ -350,7 +317,6 @@
     <Content Include="Languages\PortugueseBrazilian\DefInjected\Rimworld_Animations.AnimationDef\Animations_vanilla.xml" />
     <Content Include="LoadFolders.xml" />
     <Content Include="Patch_FacialAnimation\1.5\Patches\AnimationPatch_HideHeadWhenAnimating.xml" />
-    <Content Include="Patch_NoRimNudeWorld\1.5\Defs\PawnRenderNodeTagDef.xml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="1.5\Source\Extensions\" />