diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 5c09f221a8b7a3c3f395725821b88a3ba4d0284d..7d373237e40619a824d05a5ff8a7f685bd5cfbbb 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -1215,6 +1215,8 @@ clit size
1 - large
2 - huge
3 - enormous
+4 - penis-like
+5 - like a massive penis
clitPiercing:
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index dc10049672d2c2a4c129607fd21be97f5b6dccaf..9b4870faaace9570c7352ded1a9eca8770c163e5 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -497,6 +497,14 @@ window.canTalk = function(slave) {
return false;
} else if (slave.lips > 95) {
return false;
+ } else if (slave.collar == "dildo gag") {
+ return false;
+ } else if (slave.collar == "massive dildo gag") {
+ return false;
+ } else if (slave.collar == "ballgag") {
+ return false;
+ } else if (slave.collar == "bar gag") {
+ return false;
} else {
return true;
}
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index d7a7cd09d1e43fa064a0da7ca46e9fec8c348e23..6191a19645cd46958ffdf7284b3476e8443480a7 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -885,7 +885,16 @@ My favorite part of my body i<<s>>
<</if>>
<</if>>
<<elseif ($activeSlave.relationship == -3)>>
- Of cour<<s>>e, I'm your wife, <<Master>>." She laughs. "Not exactly traditional married life, but I'll do my be<<s>>t to help redefine it.
+ <<if $activeSlave.devotion+$activeSlave.trust >= 175>>
+ Of cour<<s>>e, I'm your wife, <<Master>>." She laughs. "Not exactly traditional married life, but I'll do my be<<s>>t to help redefine it.
+ <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+ Of cour<<s>>e, I'm your wife, <<Master>>." She sighs. "Any other que<<s>>tion<<s>>?
+ <<elseif $activeSlave.devotion < -20>>
+ I'm your wife, <<Master>>." She <<say>>s, her voice wavering. "Plea<<s>>e let me go...
+ <<else>>
+ Of cour<<s>>e, I'm your wife, <<Master>>." She <<say>>s. "It i<<s>>n't <<s>>o bad, I'm <<s>>tarting to like it.
+ <</if>>
+
<<elseif ($activeSlave.relationship == -2)>>
I'm good friend<<s>> with <<s>>ome of the other <<s>>lave<<s>>," she mutters hesitantly, looking suddenly embarrassed. "I really like you, though, <<Master>>. Like, //like// you, like you." She clears her throat nervously before hurrying on to safer subjects. "Yeah.
<<elseif ($activeSlave.relationship == -1)>>
diff --git a/src/npc/fKiss.tw b/src/npc/fKiss.tw
index 05dd0298cde00e27d7cc42322321f76151894bd5..8b7a862e7f072d746461f481f9d790b35be1be43 100644
--- a/src/npc/fKiss.tw
+++ b/src/npc/fKiss.tw
@@ -21,12 +21,27 @@ You tell $activeSlave.slaveName to
<</if>>
<</if>>
-<<if ($activeSlave.fetish == "mindbroken")>>
+<<switch $activeSlave.collar>>
+<<case "dildo gag", "massive dildo gag", "ballgag", "bar gag">>
+ <<set _tempGag = $activeSlave.collar, $activeSlave.collar = "none">>
+<</switch>>
+
+<<if ($activeSlave.fetish == "mindbroken") && ($activeSlave.relationship != -3)>>
She complies mechanically. She remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment.
<<elseif ($activeSlave.relationship == -2)>>
She hurriedly complies, happy to be near the object of her longing. Once she's close, you take a moment to gaze deeply into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she loves overwhelming, and her eyes flick downward after a moment. She blushes furiously.
<<elseif ($activeSlave.relationship == -3)>>
- She complies in a wifely fashion, moving her body as she approaches to best catch your desire. Once she's close, you take a moment to gaze deeply into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's married to affirming, and looks down with a smile, running her eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
+ <<if $activeSlave.fetish == "mindbroken">>
+ She complies mechanically. She remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment. You kiss her deeply and intensely; she doesn't understand why.
+ <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
+ She complies in a wifely fashion, moving her body as she approaches to best catch your desire. Once she's close, you take a moment to gaze deeply <<if canSee($activeSlave)>>into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's married to affirming, and looks down with a smile, running her eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><<else>>at her face. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's married to affirming, and looks down with a smile<</if>>.
+ <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+ She complies. Once she's close, you take a moment to gaze deeply <<if canSee($activeSlave)>>into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's forcibly married to disturbing, and quickly breaks eye contact<<else>>at her face. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's forcibly married to disturbing, and quickly turns her face away<</if>>.
+ <<elseif $activeSlave.devotion < -20>>
+ She complies fearfully. Once she's close, you take a moment to gaze deeply <<if canSee($activeSlave)>>into her tearing $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's forcibly married to horrifying, and quickly breaks eye contact<<else>>at her tear-streaked face. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's forcibly married to horrifying, and quickly turns her face away<</if>>.
+ <<else>>
+ She complies obediantly. Once she's close, you take a moment to gaze deeply <<if canSee($activeSlave)>>into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's married to reassuring, and looks down with a slight smile, running her eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><<else>>at her face. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's married to reassuring, and looks down with a slight smile<</if>>.
+ <</if>>
<<elseif ($activeSlave.devotion > 75)>>
She hurriedly complies, happy to be near you. Once she's close, you take a moment to gaze deeply into her $activeSlave.eyeColor eyes. She finds the intense look from her beloved <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> disconcerting, and her eyes flick downward after a moment. She blushes furiously.
<<elseif ($activeSlave.devotion > 50)>>
@@ -50,6 +65,18 @@ You extend a <<if $PC.title == 1>>manly<<else>>feminine<</if>> hand and graze yo
<</if>>
Then, you gently raise her <<if $activeSlave.face > 95>>heartrendingly beautiful<<elseif $activeSlave.face > 10>>lovely<<elseif $activeSlave.face >= -10>>pretty<<elseif $activeSlave.face >= -40>>homely<<else>>ugly<</if>> chin and kiss her right on her <<if $activeSlave.lips > 95>>facepussy<<else>><<if $activeSlave.lips > 70>>pillowlike <<elseif $activeSlave.lips > 40>>generous <<elseif $activeSlave.lips > 20>>plush <</if>>lips<</if>>.
+<<if ($activeSlave.relationship == -3)>>
+ <<if $activeSlave.fetish == "mindbroken">>
+ Her mouth opens to accept the kiss, and is compliant with your questing tongue. You kiss your broken wife deeply. Her posture remains completely unchanged. Being kissed affects her as little as being penetrated, being struck, being loved, or being your wife: not at all. When you pull away, <<if canSee($activeSlave)>>her $activeSlave.eyeColor eyes track you carefully, awaiting further use of her body<<else>>she exposes herself to you, awaiting further use of her body<</if>>.
+ <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
+ Her mouth accepts yours with love, matching itself perfectly to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> (Though you're quite careful around her sharp dentition.)<</if>> She melts into you, sighing ever so gently. When you finally break the kiss, her mouth freezes in the shape it was in when last your lips touched, and a momentary look of longing crosses her face.<<if ($activeSlave.amp != 1)>> A hand reaches dumbly up to her mouth to trace her lips where yours last touched.<</if>> <<if ($activeSlave.accent >= 3)>>She does her best to communicate love with her $activeSlave.eyeColor eyes, since she does not speak $language well enough to express herself.<<elseif ($activeSlave.amp == 1) && (canTalk($activeSlave) == false)>>She does her best to communicate love with her $activeSlave.eyeColor eyes.<<elseif canTalk($activeSlave) == false>>She signs that she loves you.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>"I love you, <<Master>>," she lisps dreamily.<<else>>"I love you, <<Master>>," she says dreamily.<</if>>
+ <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+ She reflexively turns her head away from you, but you catch your wife by her jaw and kiss her harder. You wrap your arms around her so she can not escape. She wriggles desperately, but her struggles slowly subside as she realizes that you're not taking this any farther. When you bore of it and pull away, she glares at you. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false))>>Her <<if canSee($activeSlave)>>eyes demand<<else>>face demands<</if>> an answer: are you done?<<elseif canTalk($activeSlave) == false>>She signs irritably, asking if you're done.<<else>>She splutters, "Are you done, <<Master>>?<</if>>
+ <<elseif $activeSlave.devotion < -20>>
+ She is nearly frozen with fear, and does not resist as you kiss her deeply. In fact, she barely reacts at all. She opens her mouth mechanically in response to your insistent tongue, but it's like kissing a doll. She is so filled with terror that she remains stiff even as it becomes clear to her you're not going to hurt her. When you bore of making out with your wife and pull away, she stares at you in utter incomprehension. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false))>>Her <<if canSee($activeSlave)>>eyes beg<<else>>face begs<</if>> for an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs spastically, begging fearfully to know if that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She asks nervously, "I-ith that it, <<Master>>?"<<else>>She asks nervously, "I-is that it, <<Master>> Then she cringes.<</if>>
+ <<else>>
+ She accepts the kiss willingly. As you are so close to her, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>girl<</if>>; she's doing her duty as a wife by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of her mind by your lips and tongue. When you finally break the kiss, <if canSee($activeSlave)>>her $activeSlave.eyeColor eyes gaze into yours searchingly<<else>>she gazes at you<</if>>, looking for answers that are not there. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false))>>Her <<if canSee($activeSlave)>>eyes beg<<else>>face begs<</if>> for an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs hesitantly, asking if that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She asks hesitantly, "I-ith that it, <<Master>>?"<<else>>She asks hesitantly, "I-is that it, <<Master>>?"<</if>>
+ <</if>>
<<if ($activeSlave.fetish == "mindbroken")>>
Her mouth opens to accept the kiss, and is compliant with your questing tongue. Her posture remains completely unchanged. Being kissed affects her as little as being penetrated, being struck, or being loved: not at all. When you pull away, her $activeSlave.eyeColor eyes track you carefully, awaiting further use of her body.
<<elseif ($activeSlave.relationship == -2)>>
@@ -70,3 +97,6 @@ Then, you gently raise her <<if $activeSlave.face > 95>>heartrendingly beautiful
She reflexively turns her head away from you, but you catch her jaw and kiss her harder. Spluttering, she flees backwards, but you tip forward with her and pin her against your desk, plundering her mouth without mercy. She wriggles desperately, but her struggles slowly subside as she realizes that you're not taking this any farther. When you bore of it and pull away, she stares at you in utter incomprehension. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false))>>Her eyes demand an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs irritably, asking whether that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She splutters, "Ith that it, <<Master>>!?"<<else>>She splutters, "Is that it, <<Master>><</if>>
<</if>>
+<<if def _tempGag>>
+ <<set $activeSlave.collar = _tempGag>>
+<</if>>
\ No newline at end of file
diff --git a/src/player/actions/fCaress.tw b/src/player/actions/fCaress.tw
index 999139ae04748ac7bbbf336ea05dc9acadb3d523..73f08a3807715b182e77a3b164f943fa2f8bc8c5 100644
--- a/src/player/actions/fCaress.tw
+++ b/src/player/actions/fCaress.tw
@@ -19,12 +19,22 @@ You tell $activeSlave.slaveName to
have another slave set her down on your desk.
<</if>>
-<<if ($activeSlave.fetish == "mindbroken")>>
+<<if ($activeSlave.fetish == "mindbroken") && ($activeSlave.relationship != -3)>>
She complies mechanically. She remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment.
<<elseif ($activeSlave.relationship == -2)>>
She eagerly complies, happy to be near the object of her longing. Once she's close, you hold her face in your palms and gaze deeply into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she loves overwhelming, and her eyes flick downward after a moment. She blushes furiously.
<<elseif ($activeSlave.relationship == -3)>>
- She happily complies, eager to be close to the <<if $PC.title == 1>>man<<else>>woman<</if>> who married her. Once she's close, you hold her face in your palms and look into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's married to affirming, and looks down with a smile, running her eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
+ <<if $activeSlave.fetish == "mindbroken">>
+ She complies mechanically. She remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment. Once she's close, you hold her face in your palms and look into her blank $activeSlave.eyeColor eyes. She doesn't react.
+ <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
+ She happily complies, eager to be close to the <<if $PC.title == 1>>man<<else>>woman<</if>> who married her. Once she's close, you hold her face in your palms and look into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's married to affirming, and <<if canSee($activeSlave)>>looks down with a smile, running her eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><<else>>looks down with a smile<</if>>.
+ <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+ She complies. Once she's close, you hold her face in your palms and look into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's forcibly married to disturbing, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns her face away<</if>>.
+ <<elseif $activeSlave.devotion < -20>>
+ She complies out of fear. Once she's close, you hold her shaking face in your palms and look into her teary $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's forcibly married to terrifying, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns her face away<</if>>.
+ <<else>>
+ She complies obediantly. Once she's close, you hold her face in your palms and look into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's married to reassuring, and looks down with a slight smile<<if $canSee($activeSlave)>>, running her eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
+ <</if>>
<<elseif ($activeSlave.devotion > 75)>>
She hurriedly complies, happy to be near you. Once she's close, you hold her face in your palms and look into her $activeSlave.eyeColor eyes. She finds the intense look from her beloved <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and her eyes flick downward after a moment. She blushes furiously.
<<elseif ($activeSlave.devotion > 50)>>
diff --git a/src/player/actions/fEmbrace.tw b/src/player/actions/fEmbrace.tw
index 4639465248e2dfccb37effe318e15d32f6892a5d..c23a3bbd31f9c8fced60cee0b4c7cb29099750ae 100644
--- a/src/player/actions/fEmbrace.tw
+++ b/src/player/actions/fEmbrace.tw
@@ -8,11 +8,22 @@ You tell $activeSlave.slaveName to
have another slave set her down on your desk.
<</if>>
-<<if ($activeSlave.fetish == "mindbroken")>>
+<<if ($activeSlave.fetish == "mindbroken") && ($activeSlave.relationship != -3)>>
She complies automatically. She remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment.
<<elseif ($activeSlave.relationship == -2)>>
She excitedly complies, happy to be near the object of her longing. Once she's close, you take her completely relaxed head in your hands and gaze deeply into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she loves overwhelming, and her eyes flick downward after a moment. She blushes furiously.
<<elseif ($activeSlave.relationship == -3)>>
+ <<if $activeSlave.fetish == "mindbroken">>
+ She complies mechanically. She remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment. Once she's close, you hold her face in your palms and look into her blank $activeSlave.eyeColor eyes. She shows no reaction.
+ <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
+ She lovingly complies, hurrying to come close to the <<if $PC.title == 1>>man<<else>>woman<</if>> who married her. Once she's close, you take your willing wife's head in your hands and gaze deeply into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's married to affirming, and <<if canSee($activeSlave)>>looks down with a smile, running her eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><<else>>looks down with a smile<</if>>.
+ <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+ She complies. Once she's close, you take your reluctant wife's head in your hands and gaze deeply into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's forcibly married to disturbing, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns her face away<</if>>.
+ <<elseif $activeSlave.devotion < -20>>
+ She complies out of fear. Once she's close, you take your unwilling wife's head in your hands and gaze deeply into her teary $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's forcibly married to terrifying, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns her face away<</if>>.
+ <<else>>
+ She complies obediantly. Once she's close, you take your willing wife's head in your hands and gaze deeply into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's married to reassuring, and looks down with a slight smile<<if $canSee($activeSlave)>>, running her eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
+ <</if>>
She lovingly complies, hurrying to come close to the <<if $PC.title == 1>>man<<else>>woman<</if>> who married her. Once she's close, you take your willing wife's head in your hands and gaze deeply into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's married to affirming, and looks down with a smile, running her eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
<<elseif ($activeSlave.devotion > 75)>>
She elatedly complies, joyful at being near to you. Once she's close, you take her completely relaxed head in your hands and gaze deeply into her $activeSlave.eyeColor eyes. She finds the intense look from her beloved <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and her eyes flick downward after a moment. She blushes furiously.
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index b2e155f928d88f65126ed37c8a48c036aeea830b..d8828c222af161f73a19939685b3e5a0d92ce592 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -643,8 +643,10 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<else>>
She smiles with gratitude as the biometric scanners scrupulously record her every particular as belonging not to a person but to a piece of human property. She's seen what Free Cities life is, and she seems to have come to the conclusion that being a slave in the penthouse is better than being a free whore on the lower levels.
<</if>>
+ /*
<<set $nextLink = "AS Dump">>
<<set $returnTo = "Main">>
+ */
<<include "New Slave Intro">>
<</replace>>
<</link>>