From 3fb87f58e000500ef1388d18ea37f545f510e9ee Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Mon, 9 Apr 2018 07:31:22 +1200 Subject: [PATCH] Resolving merge conflict and a few minor tweaks --- src/pregmod/reMaleCitizenHookup.tw | 11 ++++++----- src/pregmod/theCattleRanch.tw | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw index 29a04f0eb20..4575c47b236 100644 --- a/src/pregmod/reMaleCitizenHookup.tw +++ b/src/pregmod/reMaleCitizenHookup.tw @@ -188,9 +188,9 @@ He's clearly attracted to you; even the most consummate actor would have difficu <br><<link "To them that hath, it shall be given">> <<replace "#result">> You're not exactly starved for casual sex, but you've never thought there was any such thing as too much of a good thing. <<if _FS != "Physical Idealist">>You pull his arm around your waist<<else>>You nudge him in the ribs and motion to the door<</if>>. You hear a slight gasp from him as he realizes that his gambit has succeeded with more immediate effect than he expected. He shivers with anticipation as you steer him back through a side door, grabbing a pair of glasses of <<if $PC.refreshmentType == 1>>$PC.refreshment<<else>>liquor<</if>> on the way, and making a discreet exit towards your private suite. - <<if $Concubine != 0>><<if $Concubine.intelligence > 1>> + <<if $Concubine != 0 && if $Concubine.intelligence > 1>> $Concubine.slaveName is there, of course, and she instantly sees that her continued presence for a ménage à trois is wanted by both you and your guest. - <</if>><</if>> + <</if>> Your guest restrains his eager praise now that you're in private, but his wide-eyed appreciation of your domain is compliment enough. Once in your suite, you undress him, revealing <<switch _FS>> <<case "Supremacist" "Subjugationist">> @@ -290,14 +290,15 @@ He's clearly attracted to you; even the most consummate actor would have difficu a hot young body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you. <</switch>> <<if _FS == "Asset Expansionist">> - <<if $Concubine != 0 && $Concubine.amp != 1>> + <<if $Concubine != 0 && if $Concubine.amp != 1>> $Concubine.slaveName eagerly joins the two of you to help clean the massive cumshot up. <</if>> <<elseif _FS != "Youth Preferentialist">> - <<if $Concubine != 0 && $Concubine.amp != 1>> + <<if $Concubine != 0 && if $Concubine.amp != 1>> The <<if canSee($Concubine)>>view of your bouncing tits<<else>>sound of lusty sex<</if>> is too much for $Concubine.slaveName to resist and crawls over to kiss and caress you as your lover finishes. <</if>> <</if>> + <</if>> Sometimes society overlooks that you are a woman and have certain needs, but your lover tonight knows exactly how to treat you. When your guest <<if _FS != "Youth Preferentialist">>is finally spent<<else>>wakes up from against your body<</if>>, he showers, dresses, and leaves discreetly, offering you a proper thank you. This is the kind of thing that @@.green;builds a lasting reputation@@ in the Free Cities. <<set $rep += 1000>> <<if isPlayerFertile($PC)>> @@ -413,4 +414,4 @@ He's clearly attracted to you; even the most consummate actor would have difficu <</replace>> <</link>> <</if>> -</span> \ No newline at end of file +</span> diff --git a/src/pregmod/theCattleRanch.tw b/src/pregmod/theCattleRanch.tw index cab032308d4..c845d430ea5 100644 --- a/src/pregmod/theCattleRanch.tw +++ b/src/pregmod/theCattleRanch.tw @@ -7,7 +7,7 @@ <<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "TCR", $returnTo = "Main", $newSlaveIndex = 0>> <</if>> -//The Cattle Ranch is a controversial slave school operating primarily out of Pastoralistic Free Cities. Its business model is to offer the ideal free range dairy cow; one whos tits and belly reach the floor when she is on all fours. All cattle come optimized for milking, with big breast and gravid middles. Slave orphans have their heels clipped shortly after birth and are conditioned to believe they are actual livestock, resulting in a mindbreak like state. Between their wide hips and big butts and their heavy, milky breasts, they are often popular breeding slaves. They rarely display their stock over video call, instead favoring a more hands-on approach. Buyers can visit their local shops to view grazing cattle available for sale. Alternatively, they can watch the calfs frolic among their mothers or enjoy the sight of a breeding bull impregnating an empty womb. Cows are also specially trained to respond to spectators banging on the fence; oral awaits if you drop trou for them! <<if $TCR.schoolUpgrade != 0>><br><br>You have endowed a healthy sum of credits to <<if $TCR.schoolUpgrade == 1>>make their breeding bulls available for sale.<<else>>encourage the sale of heifers.<</if>> As a major benefac<<if $PC.title == 0>>trix<<else>>tor<</if>> of the ranch, you also receive a discount on them.<</if>>// +//The Cattle Ranch is a controversial slave school operating primarily out of Pastoralistic Free Cities. Its business model is to offer the ideal free range dairy cow; one whos tits and belly reach the floor when she is on all fours. All cattle come optimized for milking, with big breast and gravid middles. Slave orphans have their heels clipped shortly after birth and are conditioned to believe they are actual livestock, resulting in a mindbreak like state. Between their wide hips and big butts and their heavy, milky breasts, they are often popular breeding slaves. They rarely display their stock over video call, instead favoring a more hands-on approach. Buyers can visit their local shops to view grazing cattle available for sale. Alternatively, they can watch the calfs frolic among their mothers or enjoy the sight of a breeding bull impregnating an empty womb. Cows are also specially trained to respond to spectators banging on the fence; oral awaits if you drop trou for them! <<if $TCR.schoolUpgrade != 0>><br><br>You have endowed a healthy sum of credits to <<if $TCR.schoolUpgrade == 1>>make their breeding bulls available for sale.<<else>>encourage the sale of heifers.<</if>> As a major benefact<<if $PC.title == 0>>rix<<else>>or<</if>> of the ranch, you also receive a discount on them.<</if>>// <br><br>The Cattle Ranch parades a choice selection of cows for your viewing pleasure. You're free to do as you please to the slaves, as long as you don't cause lasting harm to them.<<if isPlayerFertile($PC)>> You can't help but notice the number of bulls lining up along the fence sniffing at you.<</if>> @@ -39,4 +39,4 @@ <</if>> <br><br> -<<set $saleDescription = 1>><<include "Long Slave Description">> \ No newline at end of file +<<set $saleDescription = 1>><<include "Long Slave Description">> -- GitLab