diff --git a/game/base-combat/tentacles/tentacle-action.twee b/game/base-combat/tentacles/tentacle-action.twee
index 72d2fffe8a2694609e4af9a872d6589f666d03ae..c7da7706d0edbb79d878cbccff9e8e6d8df7a93a 100644
--- a/game/base-combat/tentacles/tentacle-action.twee
+++ b/game/base-combat/tentacles/tentacle-action.twee
@@ -69,28 +69,32 @@
<<if $tentacles[$tentacleindex].head is "leftnipplesuck">>
and up to your <<breasts>>, where it suckles your left nipple.
- <<neutral 3>><<playWithBreasts>>
+ <<neutralbreast 3>><<playWithBreasts>>
<</if>>
<<if $tentacles[$tentacleindex].head is "rightnipplesuck">>
and up to your <<breasts>>, where it suckles your right nipple.
- <<neutral 3>><<playWithBreasts>>
+ <<neutralbreast 3>><<playWithBreasts>>
<</if>>
<<if $tentacles[$tentacleindex].head is "leftnipple">>
and continues teasing your left nipple. <span class="purple">The tip of the tentacle opens up, latches on, then begins sucking.</span>
- <<neutral 3>><<set $tentacles[$tentacleindex].head to "leftnipplesuck">><<set $leftnipple to "tentaclesuck">><<playWithBreasts>>
+ <<neutralbreast 3>><<set $tentacles[$tentacleindex].head to "leftnipplesuck">><<set $leftnipple to "tentaclesuck">><<playWithBreasts>>
<</if>>
<<if $tentacles[$tentacleindex].head is "rightnipple">>
and continues teasing your right nipple. <span class="purple">The tip of the tentacle opens up, latches on, then begins sucking.</span>
- <<neutral 3>><<set $tentacles[$tentacleindex].head to "rightnipplesuck">><<set $rightnipple to "tentaclesuck">><<playWithBreasts>>
+ <<neutralbreast 3>><<set $tentacles[$tentacleindex].head to "rightnipplesuck">><<set $rightnipple to "tentaclesuck">><<playWithBreasts>>
+<</if>>
+
+<<if $parasite.nipples.name isnot undefined>>
+ The suction drives the attached $parasite.nipples.name into a frenzy.
<</if>>
<<if $tentacles[$tentacleindex].head is "chest">>
<<if $chestuse is "squeezed">>
then up between your <<breasts>>, rubbing itself between them.
- <<neutral 2>>
+ <<neutralbreast 2>>
<<else>>
moves away from your <<breasts>>
<<set $tentacles[$tentacleindex].head to 0>><<set $breastuse to 0>>
@@ -185,7 +189,7 @@
<<if !$worn.genitals.type.includes("chastity")>>
<<if $penisWetness + ($tentacles[$tentacleindex].size * 10) gte ($penissize * 15) + random(1, 40) or random(1, 2) is 2>>
and <<slithers>> over to your <<penis>>. <<penis_lube_text>> <span class="purple">the tip opens and presses against your glans, a thrust away from enveloping.</span>
- <<set $penisstate to "tentacleimminent">><<set $tentacles[$tentacleindex].head to "penisimminent">><<neutral 4>>
+ <<set $penisstate to "tentacleimminent">><<set $tentacles[$tentacleindex].head to "penisimminent">><<neutralgenitals 4>>
<<else>>
and <<slithers>> over to your <<penis>>. The tip opens presses against your glans, but <span class="blue">it fails to gain purchase.</span>
<<sex 5>>
@@ -253,7 +257,8 @@
<<else>>
and between your thighs <span class="blue">where it <<slithers>> toward your <<pussy>>.</span>
<</if>>
- <<neutral 3>><<set $vaginause to "tentacle">><<set $vaginastate to "tentacleentrance">><<set $tentacles[$tentacleindex].head to "vaginaentrance">><<set $thighuse to 0>>
+ <<neutralgenitals 3>><<set $vaginause to "tentacle">><<set $vaginastate to "tentacleentrance">><<set $tentacles[$tentacleindex].head to "vaginaentrance">><<set $thighuse to 0>>
+
<</if>>
<</if>>
<<set $rng to random(1, 100)>>
@@ -271,7 +276,8 @@
<<else>>
and between your thighs, <span class="blue">where the tip opens as it <<slithers>> toward your <<penis>>.</span>
<</if>>
- <<neutral 3>><<set $penisuse to "tentacle">><<set $penisstate to "tentacleentrance">><<set $tentacles[$tentacleindex].head to "penisentrance">><<set $thighuse to 0>>
+ <<neutralgenitals 3>><<set $penisuse to "tentacle">><<set $penisstate to "tentacleentrance">><<set $tentacles[$tentacleindex].head to "penisentrance">><<set $thighuse to 0>>
+
<</if>>
<</if>>
<<set $rng to random(1, 100)>>
@@ -290,21 +296,21 @@
<<if $rng lte 10>>
<<if $chestuse is "squeezed" and $breastuse is 0>>
<<upperslither>><span class="blue">and up between your squeezed <<breasts>>.</span>
- <<set $tentacles[$tentacleindex].head to "chest">><<neutral 2>><<set $breastuse to "tentacle">><<cheststat>>
+ <<set $tentacles[$tentacleindex].head to "chest">><<neutralbreast 2>><<set $breastuse to "tentacle">><<cheststat>>
<<else>>
<<tentacledefault>>
<</if>>
<<elseif $rng lte 20>>
<<if $leftnipple is 0>>
<<upperslither>> <<playWithBreasts>><span class="blue">and teases your left nipple.</span>
- <<neutral 2>><<set $tentacles[$tentacleindex].head to "leftnipple">><<set $leftnipple to "tentacle">>
+ <<neutralbreast 2>><<set $tentacles[$tentacleindex].head to "leftnipple">><<set $leftnipple to "tentacle">>
<<else>>
<<tentacledefault>>
<</if>>
<<elseif $rng lte 30>>
<<if $rightnipple is 0>>
<<upperslither>> <<playWithBreasts>><span class="blue">and teases your right nipple.</span>
- <<neutral 2>><<set $tentacles[$tentacleindex].head to "rightnipple">><<set $rightnipple to "tentacle">>
+ <<neutralbreast 2>><<set $tentacles[$tentacleindex].head to "rightnipple">><<set $rightnipple to "tentacle">>
<<else>>
<<tentacledefault>>
<</if>>
@@ -325,14 +331,14 @@
<<elseif $rng lte 60>>
<<if $vaginaexist is 1 and $vaginause is 0>>
<<underslither>> <span class="blue">and <<slithers>> toward your <<pussy>>.</span>
- <<neutral 2>><<set $vaginause to "tentacle">><<set $vaginastate to "tentacleentrance">><<set $tentacles[$tentacleindex].head to "vaginaentrance">>
+ <<neutralgenitals 2>><<set $vaginause to "tentacle">><<set $vaginastate to "tentacleentrance">><<set $tentacles[$tentacleindex].head to "vaginaentrance">>
<<else>>
<<tentacledefault>>
<</if>>
<<elseif $rng lte 70>>
<<if $penisexist is 1 and $penisuse is 0>>
<<underslither>> <span class="blue">and <<slithers>> toward your <<penis>>.</span>
- <<neutral 2>><<set $penisuse to "tentacle">><<set $penisstate to "tentacleentrance">><<set $tentacles[$tentacleindex].head to "penisentrance">>
+ <<neutralgenitals 2>><<set $penisuse to "tentacle">><<set $penisstate to "tentacleentrance">><<set $tentacles[$tentacleindex].head to "penisentrance">>
<<else>>
<<tentacledefault>>
<</if>>
@@ -387,7 +393,7 @@
<<if $position isnot "wall">>
<<if $breastsize gte 2 and $chestuse is 0>>
The $tentacles[$tentacleindex].name tentacle <<slithers>> around your <<breasts>>, <span class="blue">squeezing them together.</span>
- <<neutral 1>><<set $tentacles[$tentacleindex].shaft to "breasts">><<set $chestuse to "squeezed">>
+ <<neutralbreast 1>><<set $tentacles[$tentacleindex].shaft to "breasts">><<set $chestuse to "squeezed">>
<<else>>
The $tentacles[$tentacleindex].name tentacle gently slaps your <<bottom>>.
<<violence 1>><<hitstat>>
@@ -399,7 +405,7 @@
<<elseif $rng lte 40>>
<<if $position isnot "wall">>
The $tentacles[$tentacleindex].name tentacle winds its way around your chest, beneath your <<breasts>>.
- <<neutral 1>><<set $tentacles[$tentacleindex].shaft to "chest">>
+ <<neutralbreast 1>><<set $tentacles[$tentacleindex].shaft to "chest">>
<<else>>
The $tentacles[$tentacleindex].name tentacle gently slaps your <<bottom>>.
<<violence 1>><<hitstat>>
@@ -484,7 +490,7 @@
<<neutral 1>><<set $tummygoo += 1>><<set $tentacles[$tentacleindex].health -= 1>><<tummyejacstat>><<ejacstat>>
<<elseif $rng gte 30>>
then squirts a warm fluid over your chest.
- <<neutral 1>><<set $chestgoo += 1>><<set $tentacles[$tentacleindex].health -= 1>><<chestejacstat>><<ejacstat>>
+ <<neutralbreast 1>><<set $chestgoo += 1>><<set $tentacles[$tentacleindex].health -= 1>><<chestejacstat>><<ejacstat>>
<<elseif $rng gte 20>>
then squirts a warm fluid over your face.
<<neutral 1>><<set $facegoo += 1>><<set $tentacles[$tentacleindex].health -= 1>><<faceejacstat>><<ejacstat>>
diff --git a/game/base-combat/tentacles/tentacle-adv.twee b/game/base-combat/tentacles/tentacle-adv.twee
index 59222eda6c634a65212a1269ec43dee0a7538021..879fad4d6436d5ad454e955c4a88ecbbf2ef02ba 100644
--- a/game/base-combat/tentacles/tentacle-adv.twee
+++ b/game/base-combat/tentacles/tentacle-adv.twee
@@ -41,33 +41,33 @@ The _tentacle.desc tentacle writhes between your feet.
<<if _tentacle.head is "leftnipplesuck">>
and up to your <<breasts>>, where it suckles your left nipple.
<br>
- <<playWithBreasts>><<neutral 3>>
+ <<playWithBreasts>><<neutralbreast 3>>
<</if>>
<<if _tentacle.head is "rightnipplesuck">>
and up to your <<breasts>>, where it suckles your right nipple.
<br>
- <<playWithBreasts>><<neutral 3>>
+ <<playWithBreasts>><<neutralbreast 3>>
<</if>>
<<if _tentacle.head is "leftnipple">>
and continues teasing your left nipple. <span class="purple">The tip of the tentacle opens up, latches on, then begins sucking.</span>
<br>
<<set _tentacle.head to "leftnipplesuck">><<set $leftnipple to "tentaclesuck">>
- <<playWithBreasts>><<neutral 3>>
+ <<playWithBreasts>><<neutralbreast 3>>
<</if>>
<<if _tentacle.head is "rightnipple">>
and continues teasing your right nipple. <span class="purple">The tip of the tentacle opens up, latches on, then begins sucking.</span>
<br>
<<set _tentacle.head to "rightnipplesuck">><<set $rightnipple to "tentaclesuck">>
- <<playWithBreasts>><<neutral 3>>
+ <<playWithBreasts>><<neutralbreast 3>>
<</if>>
<<if _tentacle.head is "chest">>
<<if $chestuse is "squeezed">>
then up between your <<breasts>>, rubbing itself between them.
- <<neutral 2>>
+ <<neutralbreast 2>>
<<else>>
moves away from your <<breasts>>
<<set _tentacle.head to 0>><<set $breastuse to 0>>
@@ -206,7 +206,7 @@ The _tentacle.desc tentacle writhes between your feet.
<<if !$worn.genitals.type.includes("chastity")>>
<<if $penisWetness + (_tentacle.size * 10) gte ($penissize * 15) + random(1, 40) or random(1, 2) is 2>>
and <<slithers>> over to your <<penis>>. <<penis_lube_text>> <span class="pink">the tip opens and presses against your glans, a thrust away from enveloping.</span>
- <<set $penisstate to "tentacleimminent">><<set _tentacle.head to "penisimminent">><<neutral 4>>
+ <<set $penisstate to "tentacleimminent">><<set _tentacle.head to "penisimminent">><<neutralgenitals 4>>
<<else>>
and <<slithers>> over to your <<penis>>. The tip opens presses against your glans, but <span class="blue">it fails to gain purchase.</span>
<<sex 5>>
@@ -308,7 +308,6 @@ The _tentacle.desc tentacle writhes between your feet.
<<else>>
and between your thighs <span class="blue">where it <<slithers>> toward your <<pussy>>.</span>
<</if>>
- <<neutral 3>>
<<set $vaginause to "tentacle">><<set $vaginastate to "tentacleentrance">><<set _tentacle.head to "vaginaentrance">><<set $thighuse to 0>>
<</if>>
<br>
@@ -329,7 +328,6 @@ The _tentacle.desc tentacle writhes between your feet.
<<else>>
and between your thighs <span class="blue">where the tip opens as it <<slithers>> toward your <<penis>>.</span>
<</if>>
- <<neutral 3>>
<<set $penisuse to "tentacle">><<set $penisstate to "tentacleentrance">><<set _tentacle.head to "penisentrance">><<set $thighuse to 0>>
<</if>>
<br>
@@ -359,7 +357,7 @@ The _tentacle.desc tentacle writhes between your feet.
<<if $rng lte 10>>
<<if $chestuse is "squeezed" and $breastuse is 0>>
<<upperslither>><span class="blue">and up between your squeezed <<breasts>>.</span>
- <<set _tentacle.head to "chest">><<neutral 2>><<set $breastuse to "tentacle">><<cheststat>>
+ <<set _tentacle.head to "chest">><<neutralbreast 2>><<set $breastuse to "tentacle">><<cheststat>>
<<else>>
<<tentacleadvdefault _tentacle>>
<</if>>
@@ -367,7 +365,7 @@ The _tentacle.desc tentacle writhes between your feet.
<<elseif $rng lte 20>>
<<if $leftnipple is 0>>
<<upperslither>> <<playWithBreasts>><span class="blue">and teases your left nipple.</span>
- <<neutral 2>>
+ <<neutralbreast 2>>
<<set _tentacle.head to "leftnipple">><<set $leftnipple to "tentacle">>
<<else>>
<<tentacleadvdefault _tentacle>>
@@ -376,7 +374,7 @@ The _tentacle.desc tentacle writhes between your feet.
<<elseif $rng lte 30>>
<<if $rightnipple is 0>>
<<upperslither>> <<playWithBreasts>><span class="blue">and teases your right nipple.</span>
- <<neutral 2>>
+ <<neutralbreast 2>>
<<set _tentacle.head to "rightnipple">><<set $rightnipple to "tentacle">>
<<else>>
<<tentacleadvdefault _tentacle>>
@@ -406,7 +404,7 @@ The _tentacle.desc tentacle writhes between your feet.
<<elseif $rng lte 60>>
<<if $vaginaexist is 1 and $vaginause is 0>>
<<underslither>> <span class="blue">and <<slithers>> toward your <<pussy>>.</span>
- <<neutral 2>>
+ <<neutralgenitals 2>>
<<set $vaginause to "tentacle">><<set $vaginastate to "tentacleentrance">><<set _tentacle.head to "vaginaentrance">>
<<else>>
<<tentacleadvdefault _tentacle>>
@@ -415,7 +413,7 @@ The _tentacle.desc tentacle writhes between your feet.
<<elseif $rng lte 70>>
<<if $penisexist is 1 and $penisuse is 0>>
<<underslither>> <span class="blue">and <<slithers>> toward your <<penis>>.</span>
- <<neutral 2>>
+ <<neutralgenitals 2>>
<<set $penisuse to "tentacle">><<set $penisstate to "tentacleentrance">><<set _tentacle.head to "penisentrance">>
<<else>>
<<tentacleadvdefault _tentacle>>
@@ -472,7 +470,7 @@ The _tentacle.desc tentacle writhes between your feet.
<<if $position isnot "wall">>
<<if $breastsize gte 2 and $chestuse is 0>>
The _tentacle.desc tentacle <<slithers>> around your <<breasts>>, <span class="blue">squeezing them together.</span>
- <<neutral 1>><<set _tentacle.shaft to "breasts">><<set $chestuse to "squeezed">>
+ <<neutralbreast 1>><<set _tentacle.shaft to "breasts">><<set $chestuse to "squeezed">>
<<else>>
The _tentacle.desc tentacle gently slaps your <<bottom>>.
<<violence 1>><<hitstat>>
@@ -485,7 +483,7 @@ The _tentacle.desc tentacle writhes between your feet.
<<elseif $rng lte 40>>
<<if $position isnot "wall">>
The _tentacle.desc tentacle winds its way around your chest, beneath your <<breasts>>.
- <<neutral 1>><<set _tentacle.shaft to "chest">>
+ <<neutralbreast 1>><<set _tentacle.shaft to "chest">>
<<else>>
The _tentacle.desc tentacle gently slaps your <<bottom>>.
<<violence 1>><<hitstat>>