From 3d2515eb73234caf96bf506abd1d2ba90ff71970 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 13 Aug 2019 21:00:10 -0500
Subject: [PATCH] Tails
---
src/npc/fFeelings.tw | 23 ----
src/uncategorized/PESS.tw | 4 -
src/uncategorized/PETS.tw | 4 -
src/uncategorized/REFI.tw | 8 --
src/uncategorized/RESS.tw | 125 ------------------
src/uncategorized/newSlaveIntro.tw | 31 -----
src/uncategorized/pUndergroundRailroad.tw | 12 --
src/uncategorized/randomNonindividualEvent.tw | 8 --
src/uncategorized/reBusyArcade.tw | 4 -
src/uncategorized/reFullBed.tw | 4 -
src/uncategorized/reSlaveMarriage.tw | 4 -
src/uncategorized/rename.tw | 8 --
src/uncategorized/saDiet.tw | 4 -
src/uncategorized/saLiveWithHG.tw | 36 +----
src/uncategorized/slaveInteract.tw | 4 -
src/uncategorized/slaveSold.tw | 4 -
16 files changed, 4 insertions(+), 279 deletions(-)
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 460660e7840..796a142b2eb 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -1064,28 +1064,6 @@ My favorite part of my body i<<s>>
/* TODO: add a description for this */
<<case "please you" "serve in the master suite" "be your Concubine">>
<<if ($activeSlave.fetishKnown == 1)>>
-<<<<<<< HEAD
- <<if $activeSlave.toyHole == "mouth" && ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 60) && ($PC.dick == 1)>>
- I love <<s>>ucking your cock every day, and I love
- <<if $PC.balls > 2>>
- every opportunity I get to wor<<sh>>ip your ball<<s>>, they're <<s>>o huge and make <<s>>o much cum and I ju<<s>>t want to <<s>>pend my life ki<<ss>>ing your ball<<s>> and <<s>>ucking your cock, and live off your cum...
- <<elseif $PC.balls > 1>>
- wor<<sh>>ipping your ma<<ss>>ive ball<<s>>. <<if hasAnyArms($activeSlave)>>Your ball<<s>> are <<s>>o big that one te<<s>>ticle fill<<s>> my hand; I even cum without touching my<<s>>elf <<s>>o I can properly <<s>>erve you.<<else>>Feeling you re<<s>>t your ball<<s>> on my fa<<c>>e in between fa<<c>>efuck<<s>> i<<s>> heaven for me.<</if>>
- <<elseif $PC.balls > 0>>
- plea<<s>>uring your big ball<<s>> too. They're the perfect <<s>>i<<z>>e to fill my mouth a<<s>> I <<s>>uck on them, and I love feeling them ten<<s>>e again<<s>>t my chin when you <<sh>>oot cum down my throat.
- <<else>>
- playing with your ball<<s>> too.
- <</if>>
- <<elseif $activeSlave.toyHole != "dick">>
- <<if ($activeSlave.energy > 95) && ($PC.dick == 1)>>
- I love how taking your cock i<<s>> my only job, and I love having your other toy<<s>> to have <<s>>e<<x>> too.
- <<else>>
- It'<<s>> ni<<c>>e being your $girl.
- <</if>>
- <<else>>
- <<if ($activeSlave.energy > 95) && ($PC.vagina == 1)>>
- I love how fucking your <<if ($PC.vagina == 1)>>pu<<ss>>y<<else>>a<<ss>><</if>> i<<s>> my only job, and I'm <<s>>o happy you tru<<s>>t me enough to cum in<<s>>ide you.
-=======
<<if $activeSlave.toyHole == "mouth" && ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 60) && ($PC.dick == 1)>>
I love <<s>>ucking your cock every day, and I love
<<if $PC.balls > 2>>
@@ -1103,7 +1081,6 @@ My favorite part of my body i<<s>>
<<else>>
It'<<s>> ni<<c>>e being your $girl.
<</if>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<else>>
<<if ($activeSlave.energy > 95) && ($PC.vagina == 1)>>
I love how fucking your <<if ($PC.vagina == 1)>>pu<<ss>>y<<else>>a<<ss>><</if>> i<<s>> my only job, and I'm <<s>>o happy you tru<<s>>t me enough to cum in<<s>>ide you.
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 964ac2f1d49..9653f152a4d 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -382,11 +382,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<<replace "#result">>
When you enter your suite, the dim light reveals $activeSlave.slaveName waiting with $his beautiful body laid across the bed. When $he <<if canSee($activeSlave)>>sees<<else>>figures out<</if>> the kind of lovemaking you're in the mood for, $he <<if hasAnyArms($activeSlave)>>spreads $his arm<<if hasBothArms($activeSlave)>>s<</if>><<else>>presents $himself<</if>> for you, smiling gently. $He kisses you lovingly, <<if !canTalk($activeSlave) && hasAnyArms($activeSlave)>>taking your hand in $hers and drawing a heart on your palm with one finger.<<elseif canTalk($activeSlave)>><<say>>ing, "<<Master>>, I love you."<<else>>giving you a sultry look<</if>>
<<if ($PC.vagina == 1)>>
-<<<<<<< HEAD
- $He lies on $his side <<if hasBothLegs($activeSlave)>>and raises one leg for you so you can straddle the other<<elseif !hasAnyLegs($activeSlave)>>wiggles $his leg stumps<<else>>motions for you to straddle $his leg<</if>>, sliding up to press your pussy against $his submissive groin. You grind against $him; the stimulation is so strong that $he writhes into the sheets, panting and whining.
-=======
$He lies on $his side <<if hasBothLegs($activeSlave)>>and raises one leg for you so you can straddle the other<<elseif !hasAnyLegs($activeSlave)>>wiggles $his hips<<else>>motions for you to straddle $his leg<</if>>, sliding up to press your pussy against $his submissive groin. You grind against $him; the stimulation is so strong that $he writhes into the sheets, panting and whining.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<if $PC.dick == 1>>
Your stiff dick, unused for once, slides deliciously between your warm bodies.
<</if>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index a1e361debb7..6160c7c107f 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -95,11 +95,7 @@
<<set $activeSlave.counter.penetrative += 1>>
<<set $penetrativeTotal += 1>>
-<<<<<<< HEAD
-Late at night, you decide to walk through the clinic to look over its patients personally. As soon as you enter the space, left dimly lit at night to encourage sleep, you hear a quiet moaning and the distinct noise of flesh on flesh. Heading over towards that area, you note the noise is coming from where $subSlave.slaveName is listed as resting. Appearing quietly, you see <<EventNameLink>> between $his patient's <<if hasBothLegs($subSlave)>>legs<<elseif !hasAnyLegs($subSlave)>>stumps<<else>>leg and stump<</if>>, which are spread wide by the stirrups provided with each patient bed for examination of a slave's holes.
-=======
Late at night, you decide to walk through the clinic to look over its patients personally. As soon as you enter the space, left dimly lit at night to encourage sleep, you hear a quiet moaning and the distinct noise of flesh on flesh. Heading over towards that area, you note the noise is coming from where $subSlave.slaveName is listed as resting. Appearing quietly, you see <<EventNameLink>> between $his patient's <<if hasBothLegs($subSlave)>>legs<<else>>hips<</if>>, which are spread wide by the stirrups provided with each patient bed for examination of a slave's holes.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<br><br>
<<if canPenetrate($activeSlave)>>
$He's pounding eagerly away and mauling $his patient's bare boobs with both hands.
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index 0239fe833cb..bb7274fae62 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -493,13 +493,9 @@ It seems $he passed by while you were drinking from $subSlave.slaveName and foun
/* 000-250-006 */
$subSlave.slaveName is <<if $subSlave.vagina > 0 || $subSlave.anus > 0>>riding another slave, _his2 hands pinning _himU down<<else>>straddling another slave, _his2 <<if $subSlave.dick > 0>>cock in _hisU mouth<<else>><<if $subSlave.vagina > 0>>pussy<<else>>ass<</if>>pressed to _hisU face<</if>><</if>>. The slave_girlU had been disobedient, and _hisU punishment was to let $subSlave.slaveName dominate _himU. The truth is this is also _his2 reward; _he2 is such a dominant that _he2's prone to lashing out at your other slaves if _he2 isn't given a proper outlet. Sure enough, _his2 moans begin to increase in pitch and frequency, reaching a crescendo as _he2 comes to an orgasm. Once you feel the poor _girlU beneath _him2 has had enough, you give $subSlave.slaveName the order to dismount. _He2 leaves your office with a smile on _his2 face, passing <<EventNameLink $activeSlave>>, who is
-<<<<<<< HEAD
<<if isAmputee($activeSlave)>>
propped limblessly nearby. $He has
<<elseif !hasAnyLegs($activeSlave)>>
-=======
-<<if !hasAnyLegs($activeSlave)>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
propped helplessly nearby. $He has
<<elseif !canWalk($activeSlave)>>
kneeling in the doorway with
@@ -556,13 +552,9 @@ It seems $he passed by while $subSlave.slaveName was dominating the other slave<
/* 000-250-006 */
$subSlave.slaveName is lying on the edge of your desk with _his2<<if $subSlave.belly >= 1500>> bloated<</if>> body helpless beneath you, your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> in _him2, and your hands around _his2 neck. It's just breath play, and you're practiced enough that _he2's in no danger. _He2's such a sexual submissive that _he2 sometimes acts out if not managed. This happens when _he2 feels the urge to misbehave in order to access punishment, so you personally ensure that _he2 can indulge _his2 submissiveness when _he2 needs it. _He2 does not orgasm with you, _his2 complete servitude to your pleasure fulfilling a deeper need than that. _He2 leaves your office with a serene look on _his2 face, passing <<EventNameLink>>, who is
-<<<<<<< HEAD
<<if isAmputee($activeSlave)>>
propped limblessly nearby. $He has
<<elseif !hasAnyLegs($activeSlave)>>
-=======
-<<if !hasAnyLegs($activeSlave)>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
propped helplessly nearby. $He has
<<elseif !canWalk($activeSlave)>>
kneeling in the doorway with
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 8ddcd9ad252..0b3b7258ac3 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -514,11 +514,7 @@ As $he staggers to a halt in front of your desk,
<<else>>
$his motion
<</if>>
-<<<<<<< HEAD
-provides just enough stimulation that $he climaxes. $His <<if hasBothArms($activeSlave)>>hands ball into fists at $his sides<<else>>hand balls into a fist at $his side<</if>> and $his torso pitches forward involuntarily,
-=======
provides just enough stimulation that $he climaxes. $His <<if hasAnyArms($activeSlave)>><<if hasBothArms($activeSlave)>>hands ball into fists at $his sides<<else>>hand balls into a fist at $his side<</if>> and $his<</if>> torso pitches forward involuntarily,
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<if (($activeSlave.balls > 3) && ($activeSlave.hormoneBalance < -20)) || ($activeSlave.balls >= 10)>>
a ridiculous, pent-up torrent of cum shooting out
<<if $activeSlave.dick > 0>>
@@ -977,19 +973,12 @@ $He sets $his jaw and <<if canSee($activeSlave)>>manages to meet your eyes witho
<<case "bondage gear">>
One day, you catch sight of <<EventNameLink>> <<if ($activeSlave.heels == 1) && ($activeSlave.shoes != "heels") && ($activeSlave.shoes != "pumps") && ($activeSlave.shoes != "boots") && ($activeSlave.shoes != "extreme heels")>>crawling<<elseif ($activeSlave.shoes == "heels") || ($activeSlave.shoes == "pumps") || ($activeSlave.shoes == "boots") || ($activeSlave.shoes == "extreme heels")>>tottering<<else>>walking<</if>> around stark naked. This is unacceptable, as $he has been ordered to wear humiliating and uncomfortable bondage gear. When confronted,
-<<<<<<< HEAD
-<<if !hasAnyArms($activeSlave)>>
- $he tries to communicate $his reluctance to wear the clothing as best as $he can with various head movements and facial expressions<<if $activeSlave.bellyPreg >= 5000>>, including several nods towards $his rounded middle<</if>>.
-<<elseif !canTalk($activeSlave)>>
- $he uses gestures to communicate $his embarrassment with $his clothing, covering $his nipples, crotch and anus with $his hands one after the other and begging for clothes that do the same.<<if $activeSlave.bellyPreg >= 5000>> $He also gestures to $his rounded belly with a look of concern.<</if>>
-=======
<<if !canTalk($activeSlave)>>
<<if !hasAnyArms($activeSlave)>>
$he tries to communicate $his reluctance to wear the clothing as best as $he can with various head movements and facial expressions<<if $activeSlave.bellyPreg >= 5000>>, including several nods towards $his rounded middle<</if>>.
<<else>>
$he uses gestures to communicate $his embarrassment with $his clothing, covering $his nipples, crotch and anus with $his hands one after the other and begging for clothes that do the same.<<if $activeSlave.bellyPreg >= 5000>> $He also gestures to $his rounded belly with a look of concern.<</if>>
<</if>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<else>>
$he <<say>>s fearfully, "I'm <<s>>orry, <<Master>>, but tho<<s>>e thing<<s>> are ju<<s>>t <<s>>o embarra<<ss>>ing!<<if $activeSlave.bellyPreg >= 5000>> I'm al<<s>>o worried for my baby'<<s>> <<s>>afety.<</if>>"
<</if>>
@@ -1580,11 +1569,7 @@ Going about your day, you see <<EventNameLink>> sitting <<if (hasAnyLegs($active
<<else>>
hesitantly,
<</if>>
-<<<<<<< HEAD
-"<<Master>>, I... I have a lot of implant<<s>>. A lot."<<if (hasAnyArms($activeSlave))>>$He touches $his body absentmindedly.<<else>>$He wriggles $his stumps, trying to indicate $his implants.<</if>> "Can... can you give me <<s>>ome more?"
-=======
"<<Master>>, I... I have a lot of implant<<s>>. A lot."<<if (hasAnyArms($activeSlave))>>$He touches $his body absentmindedly.<<else>>$He wriggles $his body, trying to indicate $his implants.<</if>> "Can... can you give me <<s>>ome more?"
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<case "night visit">>
@@ -1834,11 +1819,7 @@ $He constantly passes by your desk as you work, going back and forth between the
<<else>>
walks
<</if>>
-<<<<<<< HEAD
-gingerly, supporting $his udders with both hand<<if hasBothArms($activeSlave)>>s<</if>><<if $activeSlave.belly >= 10000>> and $his _belly <<if $activeSlave.belly >= 3000>>pregnant<<else>>rounded<</if>> belly<</if>>, <<if $activeSlave.nipples == "inverted">>wincing<<else>>dribbling a little milk<</if>> as $he goes. The other way, $he has a distinctly relieved expression and $his breasts are much saggier.
-=======
gingerly, supporting $his udders with <<if hasBothArms($activeSlave)>>both hands<<else>>$his hand<</if>><<if $activeSlave.belly >= 10000>> and $his _belly <<if $activeSlave.belly >= 3000>>pregnant<<else>>rounded<</if>> belly<</if>>, <<if $activeSlave.nipples == "inverted">>wincing<<else>>dribbling a little milk<</if>> as $he goes. The other way, $he has a distinctly relieved expression and $his breasts are much saggier.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<case "whore rebellious">>
@@ -4221,13 +4202,8 @@ $He saunters over and
kneels obediently
<</if>>
in front of you, awaiting further direction.
-<<<<<<< HEAD
-<<if $activeSlave.amp < 0>>
- Clad in an antique T-shirt referencing some defunct old world website, $his P-Limbs stand in stark contrast — gyros and servomotors against simple thread and cloth. With such tangible examples of the technological prowess of the Free Cities serving as $his limbs, $his <<if $activeSlave.belly >= 5000>>taut <</if>>shirt is an amusing testimonial to how far behind the old world stands in contrast to the new.
-=======
<<if getLimbCount($activeSlave, 102) > 2>>
Clad in an antique T-Shirt referencing some defunct old world website, $his P-Limbs stand in stark contrast — gyros and servomotors against simple thread and cloth. With such tangible examples of the technological prowess of the Free Cities serving as $his limbs, $his <<if $activeSlave.belly >= 5000>>taut <</if>>shirt is an amusing testimonial to how far behind the old world stands in contrast to the new.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<elseif $activeSlave.boobs > 4000>>
$His breasts are so massive that the front of $his loose pajama top must be unbuttoned. Even so, the protrusion of $his immense breasts<<if $activeSlave.belly >= 5000>> and _belly rounded belly<</if>> from $his chest strains the soft pajama top to it's breaking point.
<<elseif $activeSlave.intelligence+$activeSlave.intelligenceImplant > 50>>
@@ -10219,11 +10195,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "No, reassure $him that $he doesn't need to be an anal slut">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You kindly explain that you've decided to save $his ass — for now. $He starts to express understanding and apologize for bothering you, but finds $himself swept off $his <<if isAmputee($activeSlave)>>stumps<<else>>feet<</if>> and<<if $activeSlave.bellyPreg >= 5000>> gently<</if>> deposited on the couch. $He gasps with surprise when $he finds $himself being teased, fondled, and massaged rather than outright used. In no time at all $he's pressing $his whole<<if $activeSlave.belly >= 5000>> <<if $activeSlave.bellyPreg >= 3000>>gravid<<else>>rounded<</if>><</if>> body against you and shivering with delight.
-=======
You kindly explain that you've decided to save $his ass — for now. $He starts to express understanding and apologize for bothering you, but finds $himself swept off $his <<if !hasBothLegs($activeSlave)>>stumps<<elseif !hasAnyLegs($activeSlave)>>foot<<else>>feet<</if>> and<<if $activeSlave.bellyPreg >= 5000>> gently<</if>> deposited on the couch. $He gasps with surprise when $he finds $himself being teased, fondled, and massaged rather than outright used. In no time at all $he's pressing $his whole<<if $activeSlave.belly >= 5000>> <<if $activeSlave.bellyPreg >= 3000>>gravid<<else>>rounded<</if>><</if>> body against you and shivering with delight.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<if $activeSlave.vagina > 0 && canDoVaginal($activeSlave)>>
$His shivers reach a crescendo when you <<if $PC.dick == 0>>scissor yourself against<<else>>enter<</if>> $his warm, wet pussy, which convulsively flexes against your <<if $PC.dick == 0>>clit<<else>>rock hard dick<</if>>.
<<else>>
@@ -10291,22 +10263,14 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Not while $he is so pregnant">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- $He's clearly disappointed, but $he accepts that you are watching out for $his health and goes about $his business. After the incident, you notice that $he definitely seems to have a kink for implants. $He loves it when $his implants are groped, but $his favorite is when $he gets to fuck another slave with fake tits. $He can't keep $his <<if (hasBothArms($activeSlave))>>hands<<elseif (hasAnyArms($activeSlave))>>fingers<<else>>lips<</if>> off a pair of bolted-on boobs.
-=======
$He's clearly disappointed, but $he accepts that you are watching out for $his health and goes about $his business. After the incident, you notice that $he definitely seems to have a kink for implants. $He loves it when $his implants are groped, but $his favorite is when $he gets to fuck another slave with fake tits. $He can't keep $his <<if hasBothArms($activeSlave)>>hands<<elseif hasAnyArms($activeSlave)>>fingers<<else>>lips<</if>> off a pair of bolted-on boobs.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<</replace>>
<</link>>
<</if>>
<br><<link "No">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- $He's clearly disappointed, but $he accepts your will and goes about $his business. After the incident, you notice that $he definitely seems to have a kink for implants. $He loves it when $his implants are groped, but $his favorite is when $he gets to fuck another slave with fake tits. $He can't keep $his <<if (hasBothArms($activeSlave))>>hands<<elseif (hasAnyArms($activeSlave))>>fingers<<else>>lips<</if>> off a pair of bolted-on boobs.
-=======
$He's clearly disappointed, but $he accepts your will and goes about $his business. After the incident, you notice that $he definitely seems to have a kink for implants. $He loves it when $his implants are groped, but $his favorite is when $he gets to fuck another slave with fake tits. $He can't keep $his <<if hasBothArms($activeSlave)>>hands<<elseif hasAnyArms($activeSlave)>>fingers<<else>>lips<</if>> off a pair of bolted-on boobs.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<</replace>>
<</link>>
@@ -11887,11 +11851,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "Share $his body with the public">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- <<if (hasAnyLegs($activeSlave))>>
-=======
<<if hasAnyLegs($activeSlave)>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
$activeSlave.slaveName is surprised to find you walking beside $him, but obediently falls in behind you as a proper slave should.
<<else>>
You scoop $activeSlave.slaveName's limbless form up and carry $him out.
@@ -13531,13 +13491,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You tell $him $he's a sex slave, and that $he needs to learn how to take a dick up the ass.
-<<<<<<< HEAD
- <<if !canTalk($activeSlave) && (hasAnyArms($activeSlave))>>
- $He frantically begs with gestures, pleading <<if (hasBothLegs($activeSlave))>>on $his knees<<else>>desperately<</if>>.
-=======
<<if !canTalk($activeSlave) && hasAnyArms($activeSlave)>>
$He frantically begs with gestures, pleading <<if hasBothLegs($activeSlave)>>on $his knees<<else>>desperately<</if>>.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<elseif !canTalk($activeSlave)>>
$He frantically mouths pleas that you leave $his butt alone.
<<else>>
@@ -13547,11 +13502,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<set $activeSlave.trust -= 5, $activeSlave.counter.oral++, $oralTotal++>>
<</replace>>
<</link>>
-<<<<<<< HEAD
-<<if (hasAnyLegs($activeSlave))>>
-=======
<<if hasAnyLegs($activeSlave)>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<br><<link "Force $him to degrade $himself">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
@@ -13571,13 +13522,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You tell $him $he's a sex slave, and that $he needs to learn how to take a dick up the ass.
-<<<<<<< HEAD
- <<if !canTalk($activeSlave) && (hasAnyArms($activeSlave))>>
- $He frantically begs with gestures, pleading <<if (hasBothLegs($activeSlave))>>on $his knees<<else>>desperately<</if>>.
-=======
<<if !canTalk($activeSlave) && hasAnyArms($activeSlave)>>
$He frantically begs with gestures, pleading <<if hasBothLegs($activeSlave)>>on $his knees<<else>>desperately<</if>>.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<elseif !canTalk($activeSlave)>>
$He frantically mouths pleas that you leave $his butt alone.
<<else>>
@@ -13906,15 +13852,10 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
$He knows what it means when $he's informed that $him meals will now be available in your office only. You not only supervise $him intake strictly, but set up a bowl for $him on a little stand so the chubby bitch can lap up $his food<<if hasBothArms($activeSlave)>> hands-free<</if>> on
<<if $activeSlave.belly >= 300000>>
$his _belly belly,
-<<<<<<< HEAD
- <<else>>
- <<if hasAllLimbs($activeSlave)>>all fours<<else>>the ground<</if>>,
-=======
<<elseif hasAllLimbs($activeSlave)>>
all fours,
<<else>>
the ground,
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<</if>>
leaving $him open for use from behind.
<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
@@ -14143,11 +14084,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<EventNameDelink $activeSlave>>
<<replace "#result">>
$He's absorbed enough with $his application that $he starts with surprise when you gently encircle $him from behind with a hug<<if $PC.belly >= 5000>>, pushing your own gravid belly into the small of $his back<</if>>. When you take the lotion and begin to lovingly massage it into $his harder to reach areas, $he sighs with pleasure and leans against you.
-<<<<<<< HEAD
- <<if (hasAnyArms($activeSlave)) && $PC.belly >= 1500>> $He takes the lotion and begins to return the favor. You spend the rest of $his break carefully massaging each other's baby bumps.<</if>>
-=======
<<if hasAnyArms($activeSlave) && $PC.belly >= 1500>> $He takes the lotion and begins to return the favor. You spend the rest of $his break carefully massaging each other's baby bumps.<</if>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<if !canTalk($activeSlave)>>
<<if $activeSlave.voice == 0>>
$He looks like $he would love to thank you, were $he not mute.
@@ -14176,11 +14113,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<EventNameDelink $activeSlave>>
<<replace "#result">>
$He's absorbed enough with $his application that $he starts with surprise when you gently encircle $him from behind with a hug<<if $PC.belly >= 5000>>, pushing your own gravid belly into the small of $his back<</if>>. When you take the lotion and begin to lovingly massage it into $his harder to reach areas, $he sighs with pleasure and leans back into you. $He feels <<if $PC.dick == 0>>the warmth of your growing arousal<<else>>your erection hard<</if>> against $him, so $he
-<<<<<<< HEAD
- <<if (isAmputee($activeSlave))>>
-=======
<<if isAmputee($activeSlave)>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
wriggles $his limbless form around on the floor so as to offer $himself to you.
<<else>>
slowly kneels down with you into a comfortable lotus position on the bathroom floor.
@@ -14225,13 +14158,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<replace "#result">>
$He's absorbed enough with $his application that $he starts with surprise when you seize $his hips and bend $him over the sink for a quick assfuck.
<<= VCheck.Anal()>>
-<<<<<<< HEAD
- <<if (hasAnyArms($activeSlave))>>
- $He does $his best to brace $himself against the sink, but $his <<if (!hasBothArms($activeSlave))>>hand is<<else>>hands are<</if>> slick from the lotion and $he slides around for a while before $he gives up and accepts that $he's in for an uncomfortable time.
-=======
<<if hasAnyArms($activeSlave)>>
$He does $his best to brace $himself against the sink, but $his <<if !hasBothArms($activeSlave)>>hand is<<else>>hands are<</if>> slick from the lotion and $he slides around for a while before $he gives up and accepts that $he's in for an uncomfortable time.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<</if>>
Taking it up the ass while hugely pregnant isn't the most comfortable way to have sex, but such is the life of a sex slave.
<<if ($activeSlave.lactation == 1)>>
@@ -14249,13 +14177,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<replace "#result">>
$He's absorbed enough with $his application that $he starts with surprise when you seize $his hips and bend $him over the sink for a quick assfuck.
<<= VCheck.Anal()>>
-<<<<<<< HEAD
- <<if (hasAnyArms($activeSlave))>>
- $He does $his best to brace $himself against the sink, but $his <<if (!hasBothArms($activeSlave))>>hand is<<else>>hands are<</if>> slick from the lotion and $he slides around for a while before $he gives up and accepts that $he's in for an uncomfortable time.
-=======
<<if hasAnyArms($activeSlave)>>
$He does $his best to brace $himself against the sink, but $his <<if !hasBothArms($activeSlave)>>hand is<<else>>hands are<</if>> slick from the lotion and $he slides around for a while before $he gives up and accepts that $he's in for an uncomfortable time.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<</if>>
Taking it up the ass while hugely pregnant isn't the most comfortable way to have sex, but such is the life of a sex slave.
<<if ($activeSlave.lactation == 1)>>
@@ -14279,13 +14202,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
<<= VCheck.Vaginal()>>
<</if>>
-<<<<<<< HEAD
- <<if (hasAnyArms($activeSlave))>>
- $He does $his best to steady $himself atop the squirming mass, but $his <<if (!hasBothArms($activeSlave))>>hand is<<else>>hands are<</if>> slick from the lotion and $he slides around for a while before $he gives up and accepts that $he's in for an uncomfortable time.
-=======
<<if hasAnyArms($activeSlave)>>
$He does $his best to steady $himself atop the squirming mass, but $his <<if !hasBothArms($activeSlave)>>hand is<<else>>hands are<</if>> slick from the lotion and $he slides around for a while before $he gives up and accepts that $he's in for an uncomfortable time.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<</if>>
<<if $activeSlave.mpreg == 1>>
Taking it up the ass
@@ -15296,13 +15214,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You tell $him $he's a sex slave, and that $he needs to learn how to suck dick.
-<<<<<<< HEAD
- <<if !canTalk($activeSlave) && (hasAnyArms($activeSlave))>>
- $He frantically begs with gestures, pleading <<if (hasBothLegs($activeSlave))>>on $his knees<<else>>desperately<</if>>.
-=======
<<if !canTalk($activeSlave) && hasAnyArms($activeSlave)>>
$He frantically begs with gestures, pleading <<if hasBothLegs($activeSlave)>>on $his knees<<else>>desperately<</if>>.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<elseif !canTalk($activeSlave)>>
$He frantically mouths pleas that you leave $his throat cock-free.
<<else>>
@@ -15441,11 +15354,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<elseif $activeSlave.height >= 185>>
very tall
<</if>>
-<<<<<<< HEAD
- form upside down with $his head on the cushion, $his back on the backrest, and $his <<if !hasAnyLegs($activeSlave)>>stumps<<elseif hasBothLegs($activeSlave)>>legs<<else>>ass<</if>> in the air. In this position, $his
-=======
form upside down with $his head on the cushion, $his back on the backrest, and $his <<if hasBothLegs($activeSlave)>>legs<<else>>ass<</if>> in the air. In this position, $his
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<if ($activeSlave.dick > 10)>>
obscene
<<elseif ($activeSlave.dick > 9)>>
@@ -15738,22 +15647,14 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Require double repayment and spend it on $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- Your tenant knows that abject surrender is his only hope once you make it clear to him that his scheme is known to you. He complies all too eagerly with your demand that he repay double what he owes. Slaves are not permitted to keep possessions, especially money, so you spend it on $activeSlave.slaveName directly. $He spends the day <<if $activeSlave.preg > $activeSlave.pregData.normalBirth/2>>having $his pregnant belly moisturized, <<if hasBothLegs($activeSlave)>>$his tired feet rubbed, <</if>>$his cravings fulfilled, being<<else>>being<</if>> massaged, beautified, and pampered. You then take $him out for a lovely meal, allowing $him to wear clothing that's almost conservative by Free Cities standards, and take a nice walk around $arcologies[0].name's club, talking on light subjects. $He's @@.hotpink;deeply touched@@ by an evening of affection without sex.
-=======
Your tenant knows that abject surrender is his only hope once you make it clear to him that his scheme is known to you. He complies all too eagerly with your demand that he repay double what he owes. Slaves are not permitted to keep possessions, especially money, so you spend it on $activeSlave.slaveName directly. $He spends the day <<if $activeSlave.preg > $activeSlave.pregData.normalBirth/2>>having $his pregnant belly moisturized<<if hasAnyLegs($activeSlave)>>, $his tired <<if hasBothLegs($activeSlave)>>feet<<else>>foot<</if>> rubbed<</if>>, $his cravings fulfilled, being<<else>>being<</if>> massaged, beautified, and pampered. You then take $him out for a lovely meal, allowing $him to wear clothing that's almost conservative by Free Cities standards, and take a nice walk around $arcologies[0].name's club, talking on light subjects. $He's @@.hotpink;deeply touched@@ by an evening of affection without sex.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<set $activeSlave.devotion += 10>>
<</replace>>
<</link>>
<br><<link "Leverage the situation and reward $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- Archimedes might have his lever, but give you a place to set such information as this, and you can move a mountain of money. Before he knows what has beset him, your tenant is bustled out of $arcologies[0].name and replaced by a favored and hopefully more honest competitor, who @@.green;is well aware of the score here.@@ $activeSlave.slaveName, who made this possible, spends the day <<if $activeSlave.preg > $activeSlave.pregData.normalBirth/2>>having $his pregnant belly moisturized, <<if hasBothLegs($activeSlave)>>$his tired feet rubbed, <</if>>$his cravings fulfilled, being<<else>>being<</if>> massaged, beautified, and pampered. You then take $him out for a lovely meal, allowing $him to wear clothing that's almost conservative by Free Cities standards, and take a nice walk around $arcologies[0].name's club, talking on light subjects. $He's @@.hotpink;deeply touched@@ by an evening of affection without sex, and $he @@.mediumaquamarine;trusts you@@ with all sorts of amusing whorehouse rumors.
-=======
Archimedes might have his lever, but give you a place to set such information as this, and you can move a mountain of money. Before he knows what has beset him, your tenant is bustled out of $arcologies[0].name and replaced by a favored and hopefully more honest competitor, who @@.green;is well aware of the score here.@@ $activeSlave.slaveName, who made this possible, spends the day <<if $activeSlave.preg > $activeSlave.pregData.normalBirth/2>>having $his pregnant belly moisturized<<if hasAnyLegs($activeSlave)>>, $his tired <<if hasBothLegs($activeSlave)>>feet<<else>>foot<</if>> rubbed<</if>>, $his cravings fulfilled, being<<else>>being<</if>> massaged, beautified, and pampered. You then take $him out for a lovely meal, allowing $him to wear clothing that's almost conservative by Free Cities standards, and take a nice walk around $arcologies[0].name's club, talking on light subjects. $He's @@.hotpink;deeply touched@@ by an evening of affection without sex, and $he @@.mediumaquamarine;trusts you@@ with all sorts of amusing whorehouse rumors.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<set $activeSlave.devotion += 3, $activeSlave.trust += 3>>
<<run cashX(-2000, "event", $activeSlave)>>
<<set $arcologies[0].prosperity += 1>>
@@ -20033,12 +19934,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<if $activeSlave.belly >= 300000>>
gently leans onto $his _belly belly<<if hasAnyArms($activeSlave)>> with $his arm<<if hasBothArms($activeSlave)>>s<</if>> steadying the mass<</if>>
<<elseif $activeSlave.belly >= 5000>>
-<<<<<<< HEAD
- <<if $activeSlave.bellyPreg >= 3000>>
- <<if hasAnyLegs($activeSlave)>>kneels carefully<<else>>lowers $himself<</if>><<if hasAnyArms($activeSlave)>> with <<if hasBothArms($activeSlave)>>an<<else>>$his<</if>> arm wrapped protectively around $his bump<</if>>
- <<else>>
- <<if hasAnyLegs($activeSlave)>>kneels carefully<<else>>lowers $himself<</if>><<if hasAnyArms($activeSlave)>> with <<if hasBothArms($activeSlave)>>an<<else>>$his<</if>> arm cradling $his _belly belly<</if>>
-=======
<<if hasAnyLegs($activeSlave)>>kneels carefully<<else>>lowers $himself<</if>>
<<if hasAnyArms($activeSlave)>>
with <<if hasBothArms($activeSlave)>>an<<else>>$his<</if>> arm
@@ -20047,7 +19942,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
cradling $his _belly belly
<</if>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<</if>>
<<else>>
sinks to <<if hasAnyLegs($activeSlave)>>$his knee<<if !hasAnyLegs($activeSlave)>>s<</if>> obediently<<if hasAnyArms($activeSlave)>> with $his hand<<if hasBothArms($activeSlave)>>s<</if>> placed placidly on $his thigh<<if !hasAnyLegs($activeSlave)>>s<</if>><</if>><<else>>the ground<</if>>
@@ -20288,11 +20182,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Ignore $his pleas">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You order $him to take the next pose in the inspection series, as though $he hadn't broken down at all. There's such understated menace in your <<if canHear($activeSlave)>>voice<<else>>words<</if>> that $he <<if hasBothLegs($activeSlave)>>gets right back to $his feet<<else>>stands right back up<</if>><<if hasAnyLegs($activeSlave)>>, using the back of <<if hasBothLegs($activeSlave)>>a<<else>>$his<</if>> $activeSlave.skin hand to cuff away $his tears<</if>>. "Y-ye<<s>>, <<Master>>," $he sniffles, trying to get $himself under control, and then shudders.
-=======
You order $him to take the next pose in the inspection series, as though $he hadn't broken down at all. There's such understated menace in your <<if canHear($activeSlave)>>voice<<else>>words<</if>> that $he <<if hasBothLegs($activeSlave)>>gets right back to $his feet<<else>>stands right back up<</if>><<if hasAnyArms($activeSlave)>>, using the back of <<if hasBothArms($activeSlave)>>a<<else>>$his<</if>> $activeSlave.skin hand to cuff away $his tears<</if>>. "Y-ye<<s>>, <<Master>>," $he sniffles, trying to get $himself under control, and then shudders.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<if $dairy > 0 && $dairyStimulatorsSetting == 2>>
It's never hard to see the exact moment when your slaves remind themselves that you run an industrial Dairy, and that if they displease you, they may find themselves hydrated for milk production from fifty kilogram udders by constant machine rape down their throats and up their asses<<if isFertile($activeSlave) && $dairyPregSetting > 0>> as their wombs steadily fill with life<</if>>.
<<elseif $arcade > 0>>
@@ -21075,17 +20965,10 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
You can't help but be aroused by the sight of your swollen, helpless slave, and you take off your pants, revealing your erection. The slave's <<if canSee($activeSlave)>>backward glance falls on your dick<<else>>ears perk up<</if>> and $he
<<if $activeSlave.devotion > 95>>
licks $his lips,
-<<<<<<< HEAD
- <<if !hasAnyLegs($activeSlave)>>
- wiggling the stumps of $his legs and swiveling $his hips to give you a clear angle at $his hungry <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>.
- <<else>>
- <<if hasBothLegs($activeSlave)>>spreading $his legs<<else>>moving $his leg<</if>> and revealing more of $his massive underbelly while angling $his wanting <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>> at the perfect angle for fucking.
-=======
<<if hasAnyLegs($activeSlave)>>
<<if hasBothLegs($activeSlave)>>spreading $his legs<<else>>moving $his leg<</if>> and revealing more of $his massive underbelly while angling $his wanting <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>> at the perfect angle for fucking.
<<else>>
wiggling the stumps of $his legs and swiveling $his hips to give you a clear angle at $his hungry <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<</if>>
<<elseif $activeSlave.devotion > 50>>
blushes, swiveling $his hips to give you easy access to $his <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>.
@@ -21095,15 +20978,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
moans nervously.
<<elseif ($activeSlave.trust < -50)>>
yelps, turning away from you and <<if canSee($activeSlave)>>reflexively <</if>>clenching $his eyes shut as $his
-<<<<<<< HEAD
- <<if !hasAnyLegs($activeSlave)>>
- stumps push toward each other, clearly trying (and failing) to conceal $his <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>.
- <<elseif !hasBothLegs($activeSlave)>>
- leg bends and flexes in a futile attempt to hide $his <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>.
- <<else>>
-=======
<<if hasBothLegs($activeSlave)>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
legs instinctively clench together to hide $his <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>.
<<elseif hasAnyLegs($activeSlave)>>
leg bends and flexes in a futile attempt to hide $his <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>.
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 44457ee5522..9dbb742b2b2 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -934,11 +934,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Clean up $his whorish appearance">>
<<replace "#introResult">>
-<<<<<<< HEAD
- $He's totally unsurprised when you send $him to the salon for a makeover. It takes several days of work before $he's brought back in for another inspection; when $he arrives, you wordlessly point $him to a full length mirror. $He <<if canSee($activeSlave)>>sees $himself<<else>><<if hasAnyArms($activeSlave)>>tenderly uses $his hand<<if hasBothArms($activeSlave)>>s<</if>> and finds $himself<<else>>stoically waits while you vividly describe $his new appearance. One<</if>><</if>> without tattoos, a hooker's haircut and piercings, a conventionally pretty $girl with subtle implants and a clean appearance. $He gasps <<if hasAnyArms($activeSlave)>>and covers $his mouth with a hand<<else>>but quickly closes $his mouth<</if>>, and then suddenly bursts into tears. "Thank you, <<Master>>," $he sobs. "I never would have thought."<<if hasAnyArms($activeSlave)>>$He reaches out to touch $his reflection. <<else>>$He pauses for just a moment. <</if>>I <<if canSee($activeSlave)>>look<<else>>feel<</if>> like a nice $girl." $He is @@.hotpink;grateful to you@@ for <<if canSee($activeSlave)>>showing $him<<else>><<if hasAnyArms($activeSlave)>>letting $him feel<<else>>detailing<</if>><</if>> this new side of $himself, and has @@.mediumaquamarine;begun to trust@@ that being your slave will be less degrading than being a free prostitute.
-=======
$He's totally unsurprised when you send $him to the salon for a makeover. It takes several days of work before $he's brought back in for another inspection; when $he arrives, you wordlessly point $him to a full length mirror. $He <<if canSee($activeSlave)>>sees $himself<<else>><<if hasAnyArms($activeSlave)>>tenderly uses $his hand<<if hasBothArms($activeSlave)>>s<</if>> and finds $himself<<else>>stoically waits while you vividly describe $his new appearance. One<</if>><</if>> without tattoos, a hooker's haircut and piercings, a conventionally pretty $girl with subtle implants and a clean appearance. $He gasps <<if hasAnyArms($activeSlave)>>and covers $his mouth with a hand<<else>>but quickly closes $his mouth<</if>>, and then suddenly bursts into tears. "Thank you, <<Master>>," $he sobs. "I never would have thought."<<if hasAnyArms($activeSlave)>> $He reaches out to touch $his reflection. <<else>> $He pauses for just a moment. <</if>>"I <<if canSee($activeSlave)>>look<<else>>feel<</if>> like a nice $girl." $He is @@.hotpink;grateful to you@@ for <<if canSee($activeSlave)>>showing $him<<else>><<if hasAnyArms($activeSlave)>>letting $him feel<<else>>detailing<</if>><</if>> this new side of $himself, and has @@.mediumaquamarine;begun to trust@@ that being your slave will be less degrading than being a free prostitute.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<</replace>>
<<set $activeSlave.trust += 4>>
<<set $activeSlave.devotion += 4>>
@@ -1296,11 +1292,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</if>>
$He frantically
<<if !isAmputee($activeSlave)>>
-<<<<<<< HEAD
- wrenches $his <<if hasAnyArms($activeSlave)>>hand<<if hasBothArms($activeSlave)>>s<</if>><<if hasAnyLegs($activeSlave)>> and <</if>><</if>><<if hasAnyLegs($activeSlave)>><<if hasBothLegs($activeSlave)>>feet<<else>>foot<</if>><</if>> as you work up and down $his exposed back and limb<<if (!hasBothArms($activeSlave) && !hasAnyLegs($activeSlave)) || (!hasAnyArms($activeSlave) && !hasBothLegs($activeSlave))>>s<</if>>, but is completely unable to get free.
-=======
wrenches $his <<if hasAnyArms($activeSlave)>>hand<<if hasBothArms($activeSlave)>>s<</if>><<if hasAnyLegs($activeSlave)>> and <</if>><</if>><<if hasAnyLegs($activeSlave)>><<if hasBothLegs($activeSlave)>>feet<<else>>foot<</if>><</if>> as you work up and down $his exposed back and limb<<if getLimbCount($activeSlave)>>s<</if>>, but is completely unable to get free.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<else>>
twists and turns, but without limbs is powerless to escape the curling whip.
<</if>>
@@ -1439,11 +1431,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</if>>
-<<<<<<< HEAD
-<<if (hasAnyLegs($activeSlave)) && ($activeSlave.indentureRestrictions <= 0) && ($seeExtreme == 1)>>
-=======
<<if hasAnyLegs && ($activeSlave.indentureRestrictions <= 0) && ($seeExtreme == 1)>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<br>
<<link "Clip $his Achilles tendons">>
<<replace "#introResult">>
@@ -2092,25 +2080,11 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</if>>
-<<<<<<< HEAD
-<<if canTalk($activeSlave) && (!isAmputee($activeSlave))>>
-=======
<<if canTalk($activeSlave) && !isAmputee($activeSlave)>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<br>
<<link "Make $him an office ornament for the day">>
<<replace "#introResult">>
You cuff $his <<if hasAnyArms($activeSlave)>>wrist<<if hasBothArms($activeSlave)>>s<</if>><<if hasAnyLegs($activeSlave)>> and <</if>><</if>><<if hasAnyLegs($activeSlave)>>ankle<<if hasBothLegs($activeSlave)>>s<</if>><</if>>, bend
-<<<<<<< HEAD
- <<if (hasAllLimbs($activeSlave))>>
- all four limbs
- <<elseif ((hasBothArms($activeSlave) && hasAnyLegs($activeSlave)) || (hasAnyArms($activeSlave) && hasBothLegs($activeSlave)))>>
- all three limbs
- <<elseif ((!hasAnyArms($activeSlave) && !hasBothLegs($activeSlave)) || (!hasBothArms($activeSlave) && !hasAnyLegs($activeSlave)))>>
- $his limb
- <<else>>
- both limbs
-=======
<<if getLimbCount($activeSlave) === 4>>
all four limbs
<<elseif getLimbCount($activeSlave) === 3>>
@@ -2119,7 +2093,6 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
both limbs
<<else>>
$his limb
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<</if>>
behind $him, secure them together, and hoist $him up to the ceiling on a rope. $He hangs up there like a sex slave chandelier<<if $activeSlave.boobs >= 650>>, breasts swaying in a lovely way whenever $he struggles<</if>>. Periodically you let $him down to stretch $his aching <<if ((!hasAnyArms($activeSlave) && !hasBothLegs($activeSlave)) || (!hasBothArms($activeSlave) && !hasAnyLegs($activeSlave)))>>limb<<else>>limbs<</if>>, but whenever you put your decoration back up you add some clips with little bells on them: first the nose, then the nipples, and finally the <<if $activeSlave.dick != 0>>dickhead<<else>>pussylips<</if>>. By the end of the day your work is accompanied by the sweet sounds of ringing bells and @@.gold;agonized pleas@@ for mercy in $his <<if $activeSlave.voice == 3>>high, girlish<<elseif $activeSlave.voice == 2>>feminine<<else>>deep<</if>> voice. $He will remember @@.mediumorchid;what you can do to $him.@@
<</replace>>
@@ -2182,11 +2155,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</link>>
<</if>>
-<<<<<<< HEAD
-<<if (hasAnyArms($activeSlave))>>
-=======
<<if hasAnyArms($activeSlave)>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<br>
<<link "Put a shock collar on $him and force $him to rape $himself">>
<<set $activeSlave.collar = "shock punishment">>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index 08dc2d15b7d..c540ef65a47 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -2,17 +2,6 @@
<<set $nextButton = " ", $nextLink = "Random Nonindividual Event">> /* hide button until user makes a selection */
-<<<<<<< HEAD
-<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && !isAmputee(s) && s.devotion < 75 && s.trust < 75 && s.indenture == -1 && canWalk(s) && canTalk(s) && canSee($activeSlave) && ["serve in the club", "serve the public", "whore", "work in the brothel"].includes(s.assignment); })>>
-<<if (ndef $activeSlave)>> /* search again without assignments limitation */
- <<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && !isAmputee(s) && s.indenture == -1 && canSee($activeSlave) && ["serve in the club", "serve the public", "whore", "work in the brothel"].includes(s.assignment); })>>
- <<if (ndef $activeSlave)>> /* we will find one */
- <<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && !isAmputee(s) && s.devotion < 20 && canTalk(s) && canSee($activeSlave); })>>
- <<if (ndef $activeSlave)>> /* we will find one */
- <<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && !isAmputee(s) && canTalk(s) && canSee($activeSlave); })>>
- <<if (ndef $activeSlave)>> /* anyone out there? */
- <<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && !isAmputee(s) && canSee($activeSlave); })>>
-=======
<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && canWalk(s) && s.devotion < 75 && s.trust < 75 && s.indenture == -1 && canWalk(s) && canTalk(s) && canSee($activeSlave) && ["serve in the club", "serve the public", "whore", "work in the brothel"].includes(s.assignment); })>>
<<if (ndef $activeSlave)>> /* search again without assignments limitation */
<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" canWalk(s) && s.indenture == -1 && canSee($activeSlave) && ["serve in the club", "serve the public", "whore", "work in the brothel"].includes(s.assignment); })>>
@@ -22,7 +11,6 @@
<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && canWalk(s) && canTalk(s) && canSee($activeSlave); })>>
<<if (ndef $activeSlave)>> /* anyone out there? */
<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && canWalk(s) && canSee($activeSlave); })>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<if (ndef $activeSlave)>> /* still no match */
<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken"; })>>
<<if (ndef $activeSlave)>> /* STILL no match */
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 8035b74fe9f..181a4cd9ba1 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -346,11 +346,7 @@
<</if>>
<<if $fuckSlaves > 1>>
-<<<<<<< HEAD
<<set $bedSlaves = $slaves.filter(function(s) { return s.devotion > 50 && (s.assignment == "please you" || s.assignment == "serve in the master suite" || s.assignment == "be your Concubine") && !isAmputee(s) && canDoAnal(s); })>>
-=======
- <<set $bedSlaves = $slaves.filter(function(s) { return s.devotion > 50 && (s.assignment == "please you" || s.assignment == "serve in the master suite" || s.assignment == "be your Concubine") && hasAllLimbs(s) && canDoAnal(s); })>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<if def $bedSlaves[1]>>
<<set $bedSlaves = $bedSlaves.shuffle()>>
<<set $bedSlaves.length = 2>>
@@ -408,11 +404,7 @@
<<if ($Concubine != 0)>>
<<if $fuckSlaves > 1>>
-<<<<<<< HEAD
<<if canTalk($Concubine) && canSee($Concubine) && canHear($Concubine) && $Concubine.fetish != "mindbroken" && canHold($Concubine) && canWalk($Concubine)>>
-=======
- <<if canTalk($Concubine) && canSee($Concubine) && canHear($Concubine) && $Concubine.fetish != "mindbroken" && hasAllLimbs($Concubine)>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<set $events.push("PE headgirl concubine")>>
<</if>>
<</if>>
diff --git a/src/uncategorized/reBusyArcade.tw b/src/uncategorized/reBusyArcade.tw
index 7f69075f54e..cba806b26e6 100644
--- a/src/uncategorized/reBusyArcade.tw
+++ b/src/uncategorized/reBusyArcade.tw
@@ -3,11 +3,7 @@
<<set _rebaIDs = []>>
<<for _reba = 0; _reba < $ArcadeiIDs.length; _reba++>>
<<set _rebaIndex = $slaveIndices[$ArcadeiIDs[_reba]]>>
-<<<<<<< HEAD
<<if hasAnyArms($slaves[_rebaIndex]) && $slaves[_rebaIndex].fetish != "mindbroken" && $slaves[_rebaIndex].devotion < 45>>
-=======
- <<if hasAllLimbs($slaves[_rebaIndex]) && $slaves[_rebaIndex].fetish != "mindbroken" && $slaves[_rebaIndex].devotion < 45>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<set _rebaIDs.push($slaves[_rebaIndex].ID)>>
<</if>>
<</for>>
diff --git a/src/uncategorized/reFullBed.tw b/src/uncategorized/reFullBed.tw
index ba980cf4d9e..df63177b5be 100644
--- a/src/uncategorized/reFullBed.tw
+++ b/src/uncategorized/reFullBed.tw
@@ -102,11 +102,7 @@ Today was an unusually relaxing day, and you aren't particularly tired.
<</if>>
<br><<link "Pull up the sheets and wrestle">>
<<replace "#result">>
-<<<<<<< HEAD
Without warning, you jerk the sheets all the way up and pin them at the head of the bed. They giggle as you seize first the one and then the other, groping and tickling. $slaves[_bedSlaveTwo].slaveName and $slaves[_bedSlaveOne].slaveName catch the spirit of fun, and rove around in the soft darkness under the sheets. You're <<if $PC.dick == 1>>rock hard<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>soaking wet<</if>> in no time, wrestling with two naked slaves, and begin to fuck the first one you can grab and hold. <<if (!isAmputee($slaves[_bedSlaveOne]))>>When you <<if ($PC.dick == 0)>>finish with $him<<else>>come inside $him<</if>>, you release $him and $he slides out of bed to wash; by the time $he gets back under the sheets, clean and fresh, you're on the point of fucking the other.<<else>>When you <<if ($PC.dick == 0)>>finish with $him<<else>>come inside $him<</if>>, you carry $his limbless, helpless body out of bed to wash $him, and then return to the bed to fuck the other.<</if>> You switch off with the two of them, fucking them in turn, until everyone falls asleep in an exhausted pile. They have become @@.mediumaquamarine;still more trusting of you.@@
-=======
- Without warning, you jerk the sheets all the way up and pin them at the head of the bed. They giggle as you seize first the one and then the other, groping and tickling. $slaves[_bedSlaveTwo].slaveName and $slaves[_bedSlaveOne].slaveName catch the spirit of fun, and rove around in the soft darkness under the sheets. You're <<if $PC.dick == 1>>rock hard<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>soaking wet<</if>> in no time, wrestling with two naked slaves, and begin to fuck the first one you can grab and hold. When you <<if ($PC.dick == 0)>>finish with $him<<else>>come inside $him<</if>>, you release $him and $he slides out of bed to wash; by the time $he gets back under the sheets, clean and fresh, you're on the point of fucking the other. You switch off with the two of them, fucking them in turn, until everyone falls asleep in an exhausted pile. They have become @@.mediumaquamarine;still more trusting of you.@@
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<set $slaves[_bedSlaveOne].trust += 4, $slaves[_bedSlaveTwo].trust += 4>>
<<if canDoVaginal(_bedSlaveOne)>>
<<set $slaves[_bedSlaveOne].counter.vaginal += 2>>
diff --git a/src/uncategorized/reSlaveMarriage.tw b/src/uncategorized/reSlaveMarriage.tw
index 598cda8e43f..d93f63ede28 100644
--- a/src/uncategorized/reSlaveMarriage.tw
+++ b/src/uncategorized/reSlaveMarriage.tw
@@ -30,11 +30,7 @@
</span>
<<print "[[$groomSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1,$activeSlave = $groomSlave]]">> and <<print "[[$brideSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1,$activeSlave = $brideSlave]]">> come into your office
-<<<<<<< HEAD
-<<if (hasAnyArms($groomSlave)) && (hasAnyArms($brideSlave))>>holding hands<<else>>doing their best to stay close to one another despite their physical limitations<</if>>. $brideSlave.slaveName looks at $groomSlave.slaveName expectantly, but _he2's terribly nervous and makes several false starts before beginning. Finally $groomSlave.slaveName musters $his courage and <<if !canTalk($groomSlave)>>asks you with simple gestures to grant the two of them a slave marriage.<<else>>asks with $his voice cracking, "<<Master>>, would you plea<<s>>e grant u<<s>> a <<s>>lave marriage?"<</if>>
-=======
<<if hasAnyArms($groomSlave) && hasAnyArms($brideSlave)>>holding hands<<else>>doing their best to stay close to one another despite their physical limitations<</if>>. $brideSlave.slaveName looks at $groomSlave.slaveName expectantly, but _he2's terribly nervous and makes several false starts before beginning. Finally $groomSlave.slaveName musters $his courage and <<if !canTalk($groomSlave)>>asks you with simple gestures to grant the two of them a slave marriage.<<else>>asks with $his voice cracking, "<<Master>>, would you plea<<s>>e grant u<<s>> a <<s>>lave marriage?"<</if>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<br><br>
diff --git a/src/uncategorized/rename.tw b/src/uncategorized/rename.tw
index 8b894da7db6..4bd15084990 100644
--- a/src/uncategorized/rename.tw
+++ b/src/uncategorized/rename.tw
@@ -102,15 +102,7 @@
Names are meaningless to $him and it is unlikely $he'll remember it.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
<<if $activeSlave.slaveSurname == $PC.surname>>
-<<<<<<< HEAD
- <<if $activeSlave.amp <= 0>>
- When you tell $him that $he's to be known as $activeSlave.slaveName $activeSlave.slaveSurname now, $he starts to cry. $He tries to get $himself under control and thank you as best $he can, <<if hasAnyArms($activeSlave)>>wiping at the tears running down $his $activeSlave.skin cheeks, <</if>>but $he can't seem to stop weeping as $he thanks you over and over. $He's a sex slave, your property, and it's understandable that some doubts about the permanence of $his place as your slave $wife. This has @@.mediumaquamarine;helped reassure $him,@@ and explains the strength of $his emotional reaction. The next time you make love to $him, $he @@.hotpink;presses $himself as close to you as $he can,@@ eager to drink in as much of your presence as $he can get.
- <<else>>
- $He's @@.hotpink;deeply touched@@ that $he now shares a surname with you, and has @@.mediumaquamarine;an additional source of confidence@@ that $he'll remain your amputee slave $wife.
- <</if>>
-=======
When you tell $him that $he's to be known as $activeSlave.slaveName $activeSlave.slaveSurname now, $he starts to cry. $He tries to get $himself under control and thank you as best $he can, <<if hasAnyArms($activeSlave)>>wiping at the tears running down $his $activeSlave.skin cheeks, <</if>>but $he can't seem to stop weeping as $he thanks you over and over. $He's a sex slave, your property, and it's understandable that some doubts about the permanence of $his place as your slave $wife. This has @@.mediumaquamarine;helped reassure $him,@@ and explains the strength of $his emotional reaction. The next time you make love to $him, $he @@.hotpink;presses $himself as close to you as $he can,@@ eager to drink in as much of your presence as $he can get.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
<<elseif $oldSurname == $PC.slaveSurname>>
$He's devastated that you'd rename $him something other than your name. $He's @@.gold;terrified@@ that you intend to discard $him as your slave $wife, and @@.mediumorchid;saddened@@ that you would take away something that was precious to $him.
diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index 0896315f861..9a6ca0a8c0e 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -372,11 +372,7 @@
<</if>>
<<case "muscle building">> /* Muscle Gain */
<<if isAmputee($slaves[$i])>>
-<<<<<<< HEAD
$He is no longer capable of working out in any plausible way. $His special diet @@.yellow;has ended.@@
-=======
- $He is no longer capable of pumping iron. $His special diet @@.yellow;has ended.@@
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<set $slaves[$i].diet = "healthy">>
<<else>>
<<if $slaves[$i].muscles > 90>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index 3abf92ddae7..504bc73524e 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -799,11 +799,7 @@
<<else>>
and keeps $him on $his diet.
<</if>>
-<<<<<<< HEAD
-<<elseif (($slaves[$i].muscles <= 95 && (($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 0) || (($HeadGirl.fetish == "submissive" || $HeadGirl.fetish == "masochist") && $HeadGirl.fetishKnown == 1))) || ($slaves[$i].muscles <= 45 && ($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 1)) || $slaves[$i].muscles <= 5) && !isAmputee($slaves[$i])>>
-=======
<<elseif (($slaves[$i].muscles <= 95 && (($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 0) || (($HeadGirl.fetish == "submissive" || $HeadGirl.fetish == "masochist") && $HeadGirl.fetishKnown == 1))) || ($slaves[$i].muscles <= 45 && ($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 1)) || $slaves[$i].muscles <= 5) && hasAnyLimbs($slaves[$i])>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
$HeadGirl.slaveName thinks $slaves[$i].slaveName
<<if $HeadGirl.fetish == "submissive">>
could use bigger muscles to better dominate _him2 with in bed
@@ -925,19 +921,13 @@
<<if $HeadGirl.fetishKnown == 1>>
<<if ($HeadGirl.fetish == "sadist") && ($HeadGirl.fetishStrength > 95) && ($seeExtreme == 1) && ($slaves[$i].fetish != "mindbroken")>>
<<if ($slaves[$i].health > 40)>>
-<<<<<<< HEAD
- <<if (!isAmputee($slaves[$i])) && ($slaves[$i].devotion < -20)>>
- $HeadGirl.slaveName decides to extract the ultimate in sadistic pleasure from $slaves[$i].slaveName, and directs the autosurgery to @@.red;amputate $his arms and legs.@@ _He2 carefully describes the entire process to the sobbing slave @@.gold;in minute detail@@ before allowing $him to be sedated.
+ <<if hasAnyNaturalLimbs($slaves[$i]) && ($slaves[$i].devotion < -20)>>
+ $HeadGirl.slaveName decides to extract the ultimate in sadistic pleasure from $slaves[$i].slaveName, and directs the autosurgery to @@.red;amputate $his <<if hasAnyArms($slaves[$i])>>arm<<if hasBothArms($slaves[$i])>>s<</if>> <<if hasAnyLegs($slaves[$i])>>and<</if>><</if>><<if hasAnyLegs($slaves[$i])>> leg<<if hasBothLegs($slaves[$i])>>s<</if>><</if>>.@@ _He2 carefully describes the entire process to the sobbing slave @@.gold;in minute detail@@ before allowing $him to be sedated.
<<run surgeryAmp($slaves[$i], "left arm")>>
<<run surgeryAmp($slaves[$i], "right arm")>>
<<run surgeryAmp($slaves[$i], "left leg")>>
<<run surgeryAmp($slaves[$i], "right leg")>>
- <<set $slaves[$i].devotion -= 20, $slaves[$i].trust -= 20, $slaves[$i].health -= 40, $slaves[$i].amp = 1>>
-=======
- <<if hasAnyNaturalLimbs($slaves[$i]) && ($slaves[$i].devotion < -20)>>
- $HeadGirl.slaveName decides to extract the ultimate in sadistic pleasure from $slaves[$i].slaveName, and directs the autosurgery to @@.red;amputate $his <<if hasAnyArms($slaves[$i])>>arm<<if hasBothArms($slaves[$i])>>s<</if>> <<if hasAnyLegs($slaves[$i])>>and<</if>><</if>><<if hasAnyLegs($slaves[$i])>> leg<<if hasBothLegs($slaves[$i])>>s<</if>><</if>>.@@ _He2 carefully describes the entire process to the sobbing slave @@.gold;in minute detail@@ before allowing $him to be sedated.
<<set $slaves[$i].devotion -= 20, $slaves[$i].trust -= 20, $slaves[$i].health -= 40, $slaves[$i].amp = 1, $activeSlave.missingArms = 3, $activeSlave.missingLegs = 3>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<</if>>
<<if ($slaves[$i].balls > 0) && ($slaves[$i].devotion <= 50)>>
$HeadGirl.slaveName decides to have some once-only sadistic pleasure, and carefully straps $slaves[$i].slaveName into the surgery until $he's completely immobile. $HeadGirl.slaveName situates <<if canSee($slaves[$i])>>a mirror so the terrified $girl can see $his own crotch<<else>>$him so that the terrified $girl can sense what part of $his body is being manipulated even through the anesthetics<</if>>, gets behind $him, and carefully sodomizes $him during the entire process of @@.red;castration.@@ $slaves[$i].slaveName is anesthetized down there and can't feel the brutal anal rape, but $his abuser orgasms repeatedly to $him @@.gold;weeping at the <<if canSee($slaves[$i])>>sight<<else>>muted sensation<</if>> of being gelded and raped at once.@@
@@ -950,11 +940,7 @@
<</if>>
<<elseif ($HeadGirl.fetish == "dom") && ($HeadGirl.fetishStrength > 60) && ($seeExtreme == 1) && ($slaves[$i].fetish != "mindbroken") && ($slaves[$i].devotion <= 50)>>
<<if ($slaves[$i].health > 40)>>
-<<<<<<< HEAD
- <<if ($slaves[$i].heels == 0) && (hasAnyLegs($slaves[$i]))>>
-=======
<<if ($slaves[$i].heels == 0) && hasAnyNaturalLegs($slaves[$i])>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
$HeadGirl.slaveName is not satisfied with $slaves[$i].slaveName's submissiveness, and directs the autosurgery to @@.red;clip $his Achilles tendons.@@ Once the slave is recovered from surgery, $HeadGirl.slaveName removes all shoes from the suite, too, so $slaves[$i].slaveName is forced to crawl like a good little bitch. $slaves[$i].slaveName is @@.gold;angry@@ and @@.gold;frightened.@@
<<set $slaves[$i].devotion -= 5, $slaves[$i].health -= 20, $slaves[$i].heels = 1, $slaves[$i].shoes = "none">>
<</if>>
@@ -964,32 +950,18 @@
<</if>>
<</if>>
<<elseif $HeadGirl.energy > 95>>
-<<<<<<< HEAD
- <<if ($slaves[$i].health > 40) && ($slaves[$i].heels == 0) && (hasAnyLegs($slaves[$i])) && ($slaves[$i].devotion <= 50) && ($slaves[$i].fetish != "mindbroken")>>
-=======
<<if ($slaves[$i].health > 40) && ($slaves[$i].heels == 0) && hasAnyNaturalLegs($slaves[$i]) && ($slaves[$i].devotion <= 50) && ($slaves[$i].fetish != "mindbroken")>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
$HeadGirl.slaveName wants a good little bimbo who sticks $his butt out all the time, and directs the autosurgery to @@.red;clip $slaves[$i].slaveName's Achilles tendons.@@ Once the slave is recovered from surgery, $HeadGirl.slaveName presents $slaves[$i].slaveName with a new pair of extra-tall heels to totter around in like a good little slut. $slaves[$i].slaveName is @@.gold;angry@@ and @@.gold;frightened.@@
<<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5, $slaves[$i].health -= 20, $slaves[$i].heels = 1, $slaves[$i].shoes = "heels">>
<</if>>
<<elseif $HeadGirl.fetish == "masochist">>
-<<<<<<< HEAD
- <<if ($slaves[$i].health > 40) && ($slaves[$i].heightImplant == 0) && ($slaves[$i].height < 185) && (!isAmputee($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 <<if (hasAnyArms($slaves[$i]))>>arm<<if (hasAnyLegs($slaves[$i]))>> and <</if>><</if>><<if (hasAnyLegs($slaves[$i]))>>leg<</if>> 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) && (!isAmputee($slaves[$i]))>>
- $HeadGirl.slaveName wants to be topped by the biggest, strongest $girl possible, and directs the autosurgery to extend $slaves[$i].slaveName's <<if (hasAnyArms($slaves[$i]))>>arm<<if (hasAnyLegs($slaves[$i]))>> and <</if>><</if>><<if (hasAnyLegs($slaves[$i]))>>leg<</if>> bones to make $him a little @@.lime;taller.@@
-=======
<<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])>>
$HeadGirl.slaveName wants to be topped 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.@@
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<set $slaves[$i].health -= 20, $slaves[$i].heightImplant = 1, $slaves[$i].height += 1>>
<</if>>
<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 62c718b4b1e..a90a5431687 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -357,11 +357,7 @@
<<if ($activeSlave.rivalryTarget != 0) && canWalk($activeSlave)>>
| <<link "Abuse $his rival with $him">><<replace "#miniscene">><<include "FRival">><br> <</replace>><</link>>
<</if>>
-<<<<<<< HEAD
- <<if ($activeSlave.fetish != "mindbroken") && ((hasAnyArms($activeSlave)) || ($activeSlave.voice != 0)) && $activeSlave.accent != 4>>
-=======
<<if ($activeSlave.fetish != "mindbroken") && (canTalk($activeSlave) || hasAnyArms($activeSlave))>>
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
| <<link "Ask $him about $his feelings">><<replace "#miniscene">><<include "FFeelings">><br> <</replace>><</link>>
<<if $PC.dick > 0>>
| <<link "Make $him beg">><<replace "#miniscene">><<include "FBeg">><br> <</replace>><</link>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 2ae3f77984f..b3dfc160af4 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -566,11 +566,7 @@
<</if>>
<<case "womb filler">>
-<<<<<<< HEAD
- $activeSlave.slaveName is seen in a drug report nine months later; $he is unrecognizable. $His gaunt body is completely bloated by $his enormous womb, leaving <<if !isAmputee($activeSlave)>>what's left of $his arms and legs dangling<<else>>$his torso teetering<</if>> pathetically atop its quivering mass. The headline reads "New drug allows for upwards of seven hundred children carried at once". Live on stream, $his body loses stability and ruptures, flooding the room with fluid and children.
-=======
$activeSlave.slaveName is seen in a drug report nine months later; $he is unrecognizable. $His gaunt body is completely bloated by $his enormous womb, leaving <<if !isAmputee($activeSlave)>>what's left of $his <<if hasAnyArms($activeSlave)>>arm<<if hasBothArms($activeSlave)>>s<</if>><<if hasAnyLegs($activeSlave)>> and <</if>><</if>><<if hasAnyLegs($activeSlave)>>leg<<if hasBothLegs($activeSlave)>>s<</if>><</if>> dangling<<else>>$his torso teetering<</if>> pathetically atop its quivering mass. The headline reads "New drug allows for upwards of seven hundred children carried at once". Live on stream, $his body loses stability and ruptures, flooding the room with fluid and children.
->>>>>>> 8904da665cf70f578fc323b43728627d830e648f
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].vagina == 0)>>
<<if isFertile($slaves[_ss])>>
--
GitLab