From 42e9fadfde29d541effcb10f423dcf0f70e265c4 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 18 Aug 2019 19:46:09 -0500
Subject: [PATCH] Etcs
---
Changelog.txt | 2 +-
src/uncategorized/reNickname.tw | 2 +-
src/uncategorized/reStaffedMorning.tw | 4 ++--
src/uncategorized/reStandardPunishment.tw | 2 +-
src/uncategorized/saLiveWithHG.tw | 4 ++--
src/uncategorized/saRules.tw | 10 +++++-----
src/uncategorized/seNonlethalPit.tw | 2 +-
src/uncategorized/seWeddingTriple.tw | 16 ++++++++--------
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index e14886ad677..f44c11a813d 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -3,7 +3,7 @@ Pregmod
0.10.7.1-2.8.x
0
- -large updae to the nursery beta content
+ -large update to the nursery beta content
-fixes and cleaning
0.10.7.1-2.7.x
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 74176c42127..fc0921fb9c0 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -994,7 +994,7 @@
<<set $notApplyDesc = "is a bit sad that $his role isn't part of $his name, since $he likes being a lurcher, especially because of what $he's allowed to do to captured hares, and now wonders whether $he'll be allowed to keep doing so.">>
<<case "Stewardess">>
- <<set $nickname = either("'Chamberlain'", "'Clean Queen'", "'Concierge'", "'Head Maid'", "'Head Servant'", "'Housekeeper'", "'Housemistress'", "'Inspectrix'", "'Maid Boss'", "'Majordomo'", "'Martinent'", "'Perfectionist'", "'Sanitizer'", "'Scrubber'", "'Stewardess'", "'Top Mop'")>>
+ <<set $nickname = either("'Chamberlain'", "'Clean Queen'", "'Concierge'", "'Head Maid'", "'Head Servant'", "'Housekeeper'", "'Housemistress'", "'Inspectrix'", "'Maid Boss'", "'Majordomo'", "'Martinet'", "'Perfectionist'", "'Sanitizer'", "'Scrubber'", "'Stewardess'", "'Top Mop'")>>
<<set $situationDesc = "might consider $his role boring, if $he weren't allowed to use sexual abuse as a correction for poor work. As it is, $his sexual aggressiveness draws much open comment and some private infatuation from the servants.">>
<<set $applyDesc = "likes being in charge of household tasks, especially because $he's allowed to use the servants, and is happy to learn that the role is part of $his name now.">>
<<set $notApplyDesc = "is a bit sad that $his role isn't part of $his name, since $he likes being in charge of household tasks, especially because $he's allowed to use the servants, and now wonders whether $he'll be allowed to keep doing so.">>
diff --git a/src/uncategorized/reStaffedMorning.tw b/src/uncategorized/reStaffedMorning.tw
index f5989ec86c7..a2809876830 100644
--- a/src/uncategorized/reStaffedMorning.tw
+++ b/src/uncategorized/reStaffedMorning.tw
@@ -48,9 +48,9 @@ The bathroom door is open and the shower is running. Though the steam is beginni
<<link "Leave them satisfied">>
<<replace "#result">>
<<if $PC.dick == 1>>
- You begin to thrust gently into _bedSlaves[0].slaveName's mouth. <<if $girl == _girl2>>The $girl<<else>>Your bedmate<</if>>s moan and giggle into you at the signal that you're not going to get up right this instant, and <<if (_bedSlaves[0].dick > 0) && (_bedSlaves[1].dick > 0)>>start jerking each other off harder, making lewd noises and humping each other's hands<<else>>really start giving each other proper handjobs, jerking around lewdly as their arousal builds<</if>>.<<if $PC.vagina == 1>> They always spare at least one hand for your cunt, despite your thrusting.<</if>> When you climax, they do, too, one after the other. They quickly switch mouth positions and suck you back to full mast so you can enjoy your shower.
+ You begin to thrust gently into _bedSlaves[0].slaveName's mouth. <<if $girl == _girl2>>The $girl<<else>>Your bedmate<</if>>s moan and giggle into you at the signal that you're not going to get up right this instant<<if (hasAnyArms(_bedSlaves[0])) && (hasAnyArms(_bedSlaves[1]))>>, and <<if (_bedSlaves[0].dick > 0) && (_bedSlaves[1].dick > 0)>>start jerking each other off harder, making lewd noises and humping each other's hands<<else>>really start giving each other proper handjobs, jerking around lewdly as their arousal builds<</if>>.<<if $PC.vagina == 1>> They always spare at least one hand for your cunt, despite your thrusting.<</if>><</if>> When you climax, they do, too, one after the other. They quickly switch mouth positions and suck you back to full mast so you can enjoy your shower.
<<else>>
- You reach down and run a possessive hand across each slave's scalp, neck, and back, eliciting shivers. Then, you gently hook them under the armpits and pull them up a bit, without breaking their lip locks with your nipples, or forcing them to stop playing with your cunt. Each slave ends curled up, mostly face-down, with their mouths still sucking on your <<if $PC.boobs == 1>>boobs<<else>>chest<</if>> and their free hands trapped between their legs. They get the message and begin to look after themselves, too; their resultant moaning against your nipples grows when you reach down and start teasing their butts. The three of you climax more or less together, and you bounce up with undiminished arousal to enjoy your shower.
+ You reach down and run a possessive hand across each slave's scalp, neck, and back, eliciting shivers. Then, you gently hook them under the armpits and pull them up a bit, without breaking their lip locks with your nipples, or forcing them to stop playing with your cunt. Each slave ends curled up, mostly face-down, with their mouths still sucking on your <<if $PC.boobs == 1>>boobs<<else>>chest<</if>><<if (hasAnyArms(_bedSlaves[0])) && (hasAnyArms(_bedSlaves[1]))>> and their free hands trapped between their legs<</if>>. They get the message and begin to look after themselves, too; their resultant moaning against your nipples grows when you reach down and start teasing their butts. The three of you climax more or less together, and you bounce up with undiminished arousal to enjoy your shower.
<</if>>
<br><br>
By now, the shower is an impenetrable fog of steam. The wet, soapy bodies inside are easy to find, though. _bedSlaves[2].slaveName happens to be closest, so you
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index 01bb8781970..6eb3c5799b0 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -144,7 +144,7 @@
<<else>>
breaks down and makes no move to obey, but does not resist as you <<if hasAnyArms($activeSlave)>>take $his wrist<<if hasBothArms($activeSlave)>>s<</if>> in your hands<<else>>grab $him around the waist<</if>> and hoist $him into the restraints.
<</if>>
- The shackles can be moved up or down, and you move them down, forcing the weeping slave to spread $his legs. You let $him anticipate the pain for a long time before you start whipping $his buttocks. Your leather instrument is exquisitely designed and balanced to produce pain without breaking the skin or leaving a permanent mark, and you make cruel use of it. After a short preliminary asswhipping, you vary your strokes, letting $him feel the whip on $his thighs, calves and flanks before placing strokes against $his <<if $activeSlave.scrotum > 0>>poor ballsack<<elseif $activeSlave.dick > 0>>poor penis<<else>>poor pussy<</if>>. $He loses all control, <<if canTalk($activeSlave)>>shamelessly begging for mercy<<elseif $activeSlave.voice != 0>>sobbing and moaning incoherently<<else>>rasping pathetic little sobs past $his mute throat<</if>>. When you're done, $he's @@.gold;almost crazy with fear@@ of future whippings.
+ The shackles can be moved up or down, and you move them down, forcing the weeping slave to spread $his legs. You let $him anticipate the pain for a long time before you start whipping $his buttocks. Your leather instrument is exquisitely designed and balanced to produce pain without breaking the skin or leaving a permanent mark, and you make cruel use of it. After a short preliminary asswhipping, you vary your strokes, letting $him feel the whip on $his thigh<<if hasBothLegs($activeSlave)>>s<</if>>, cal<<if hasBothLegs($activeSlave)>>ves<<else>>f<</if>> and flank<<if hasBothLegs($activeSlave)>>s<</if>> before placing strokes against $his <<if $activeSlave.scrotum > 0>>poor ballsack<<elseif $activeSlave.dick > 0>>poor penis<<else>>poor pussy<</if>>. $He loses all control, <<if canTalk($activeSlave)>>shamelessly begging for mercy<<elseif $activeSlave.voice != 0>>sobbing and moaning incoherently<<else>>rasping pathetic little sobs past $his mute throat<</if>>. When you're done, $he's @@.gold;almost crazy with fear@@ of future whippings.
<<set $activeSlave.trust -= 6>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index 9651eaf9095..764337b9387 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -952,8 +952,8 @@
<</if>>
<<elseif $HeadGirl.fetish == "masochist">>
<<if ($slaves[$i].health > 40) && ($slaves[$i].heightImplant == 0) && ($slaves[$i].height < 185) && hasAllLimbs($slaves[$i])>>
- $HeadGirl.slaveName has a subconscious need to be hurt by the biggest, strongest $girl possible, and directs the autosurgery to extend $slaves[$i].slaveName's arm and leg bones to make $him a little @@.lime;taller.@@
- <<set $slaves[$i].health -= 20, $slaves[$i].heightImplant = 1, $slaves[$i].height += 1>>
+ $HeadGirl.slaveName has a subconscious need to be hurt by the biggest, strongest $girl possible, and directs the autosurgery to extend $slaves[$i].slaveName's arm and leg bones to make $him a little @@.lime;taller.@@
+ <<set $slaves[$i].health -= 20, $slaves[$i].heightImplant = 1, $slaves[$i].height += 1>>
<</if>>
<<elseif $HeadGirl.fetish == "submissive">>
<<if ($slaves[$i].health > 40) && ($slaves[$i].heightImplant == 0) && ($slaves[$i].height < 185) && hasAllLimbs($slaves[$i])>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 899035ccc29..7b357efb2e3 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -1739,7 +1739,7 @@
<</if>> /* closes releaseRules not restrictive */
<</if>>
- $He is @@.hotpink;very happy@@ with $his private room in the back of $spaName and @@.mediumaquamarine;trusts@@ you a bit more for placing the well-being of your slaves in $his hands.
+ $He is @@.hotpink;very happy@@ with $his private room in the back of $spaName and @@.mediumaquamarine;trusts@@ you a bit more for placing the well-being of your slaves in $his <<if !hasAnyArms($slaves[$i])>>figurative <</if>>hand<<if hasBothArms($slaves[$i])>>s<</if>>.
<<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
<<if ($universalRulesConsent == 0)>>
@@ -2244,7 +2244,7 @@
<</if>> /* closes releaseRules not restrictive */
<</if>>
- $He is @@.hotpink;very happy@@ with $his private room in the back of $nurseryName and @@.mediumaquamarine;trusts@@ you a bit more for placing the responsibility of raising $arcologies[0].name's children in $his hands.
+ $He is @@.hotpink;very happy@@ with $his private room in the back of $nurseryName and @@.mediumaquamarine;trusts@@ you a bit more for placing the responsibility of raising $arcologies[0].name's children in $his <<if !hasAnyArms($slaves[$i])>>figurative <</if>>hand<<if hasBothArms($slaves[$i])>>s<</if>>.
<<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
<<if ($universalRulesConsent == 0)>>
@@ -2765,7 +2765,7 @@
<</if>> /* closes releaseRules not restrictive */
<</if>>
- $He is @@.hotpink;very happy@@ with $his private room in the back of $schoolroomName and @@.mediumaquamarine;trusts@@ you a bit more for placing the future education of your slaves in $his hands.
+ $He is @@.hotpink;very happy@@ with $his private room in the back of $schoolroomName and @@.mediumaquamarine;trusts@@ you a bit more for placing the future education of your slaves in $his <<if !hasAnyArms($slaves[$i])>>figurative <</if>>hand<<if hasBothArms($slaves[$i])>>s<</if>>.
<<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
<<if ($universalRulesConsent == 0)>>
@@ -3078,14 +3078,14 @@
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
<<if ($slaves[$i].fetish == "sadist")>>
<<if $SchlRiIDs.length > 2>>
- Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole class of girls for $him to rape.
+ Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole class of students for $him to rape.
<<else>>
Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day more students enroll in $schoolroomName for $him to rape.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetish == "dom")>>
<<if $SchlRiIDs.length > 2>>
- Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for providing a whole class of girls for $him to dominate.
+ Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for providing a whole class of students for $him to dominate.
<<else>>
Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day more students enroll in $schoolroomName for $him to dominate.
<</if>>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index 612777b7fe0..8489f27c4ad 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -544,7 +544,7 @@
<<run repX(25, "pit", _winner)>>
<</if>>
<<elseif canDoVaginal(_loser)>>
- _winner.slaveName wants to win badly enough that $he takes an extremely unpleasant shortcut to victory. The instant the fight starts, $he furiously goes for _loser.slaveName's eyes, hands forming claws. _loser.slaveName defends _himself2 with _his2 arms, at which point _winner.slaveName delivers a mighty cunt punt. _loser.slaveName goes straight down, _his2 mouth soundlessly opening and closing and tears leaking from _his2 closed eyes while _his2 hands desperately shield _his2 outraged pussy. _winner.slaveName follows _him2 down and puts the unresisting _girl2's head in a simple lock.
+ _winner.slaveName wants to win badly enough that $he takes an extremely unpleasant shortcut to victory. The instant the fight starts, $he furiously goes for _loser.slaveName's eyes<<if hasBothArms(_winner)>>, hands forming claws<<elseif hasAnyArms(_winner)>>, $his hand forming a claw<</if>>. _loser.slaveName <<if hasAnyArms(_loser)>>defends _himself2 with _his2 arm<<if hasBothArms(_loser)>>s<</if>><<else>>tries to defend $himself as best $he can<</if>>, at which point _winner.slaveName delivers a mighty cunt punt. _loser.slaveName goes straight down, _his2 mouth soundlessly opening and closing and tears leaking from _his2 closed eyes<<if hasAnyArms(_loser)>> while _his2 hand<<if hasBothArms(_loser)>>s<</if>> desperately shield<<if !hasBothArms(_loser)>>s<</if>> _his2 outraged pussy<</if>>. _winner.slaveName follows _him2 down and puts the unresisting _girl2's head in a simple lock.
<<if $pitAudience == "paid">>
The audience is not very impressed by this easy win, and your @@.yellowgreen;cut of the betting@@ is unimpressive.
<<run cashX(500, "pit", _winner)>>
diff --git a/src/uncategorized/seWeddingTriple.tw b/src/uncategorized/seWeddingTriple.tw
index b40a2789611..0b9fad6c326 100644
--- a/src/uncategorized/seWeddingTriple.tw
+++ b/src/uncategorized/seWeddingTriple.tw
@@ -273,25 +273,25 @@ In the days leading up to your wedding, your <<if $wife == _wife2>>$wives<<else>
$His slave dick is hidden by its chastity cage.
<<elseif canAchieveErection($activeSlave)>>
<<if ($activeSlave.dick > 4) && ($activeSlave.belly >= 5000)>>
- $He's hugely erect, with $his lacy g-string only serving to hold $his dick agonizingly pressed against the bottom of $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly.
+ $He's hugely erect, with $his lacy g-string only serving to hold $his dick agonizingly pressed against the bottom of $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly.
<<elseif $activeSlave.dick > 4>>
- $He's hugely erect, with $his lacy g-string only serving to hold $his dick upright along $his belly.
+ $He's hugely erect, with $his lacy g-string only serving to hold $his dick upright along $his belly.
<<else>>
- $His erection tents the front of $his lacy g-string.
+ $His erection tents the front of $his lacy g-string.
<</if>>
<<elseif ($activeSlave.dick > 0)>>
<<if $activeSlave.dick > 10>>
- $His huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
+ $His huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
<<elseif $activeSlave.dick > 4>>
- $His big soft cock forms a lewd mass, stuffed into $his lacy g-string.
+ $His big soft cock forms a lewd mass, stuffed into $his lacy g-string.
<<else>>
- $His lacy g-string perfectly conceals $his soft dick.
+ $His lacy g-string perfectly conceals $his soft dick.
<</if>>
<<else>>
<<if $activeSlave.clit > 1>>
- $His huge clit is quite hard, making $him shift uncomfortably as $his lacy g-string stimulates it.
+ $His huge clit is quite hard, making $him shift uncomfortably as $his lacy g-string stimulates it.
<<else>>
- $His lacy g-string covers $his womanhood demurely.
+ $His lacy g-string covers $his womanhood demurely.
<</if>>
<</if>>
There is no aisle for $him to <<if !hasAnyLegs($activeSlave)>>be carried<<else>>walk<</if>> down, just a small space at the head of the room where you're standing alone, and there's no one to <<if !hasAnyLegs($activeSlave)>>walk alongside the slave carrying<<else>>walk<</if>> $him there; this symbolizes $his submission to you
--
GitLab