diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index 66501ed441d352949d6f7aa28e93fb8e35a00c05..0a95137d1e753cfb58513a42a78d42e0677ac6f9 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -40,7 +40,7 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
<<if $activeSlave.fetish == "mindbroken">>
- Since $he is mindbroken, there is precisely no chance that $he will be able to look after $himself. $He <<if $activeSlave.amp != 1>>stands<<else>>sits<</if>> before you dumbly, betraying no reaction to the prospect of becoming free from sexual slavery. In situations like this, it is perfectly acceptable to subject $him to another indenture for $his own good.
+ Since $he is mindbroken, there is precisely no chance that $he will be able to look after $himself. $He <<if hasAnyLegs($activeSlave)>>stands<<else>>sits<</if>> before you dumbly, betraying no reaction to the prospect of becoming free from sexual slavery. In situations like this, it is perfectly acceptable to subject $him to another indenture for $his own good.
<br><br>
<span id="result">
@@ -67,7 +67,7 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
<<elseif ($activeSlave.relationship < -1) && ($activeSlave.devotion > 95) && ($activeSlave.trust > 95)>>
$He has been trying desperately hard not to think about this trying situation, but when $he comes before you on the day of $his indenture's expiration, $he can ignore it no longer. $He
- <<if $activeSlave.amp == 1>>
+ <<if !hasAnyArms($activeSlave)>>
wriggles disconsolately, probably wishing $he could throw $himself at your feet or cling to your knees.
<<else>>
throws $himself at your feet and clings to your knees, bursting into tears.
@@ -113,7 +113,7 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
<<set $slaveCost = Math.clamp($slaveCost, $minimumSlaveCost, 100000)>>
$His feelings on this are quite mixed, since $he has come to feel that $he has a place under you.
- <<if $activeSlave.amp == 1>>
+ <<if !hasAnyLegs($activeSlave)>>
Propped up
<<else>>
Standing before you
@@ -150,7 +150,7 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust > 20)>>
$He approaches the moment with calculation, since $he has found more of a place in slavery than $he probably expected when $he became an indentured servant.
-<<if $activeSlave.amp == 1>>
+<<if !hasAnyLegs($activeSlave)>>
Propped up
<<else>>
Standing before you
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index 5ec0fd2ef30edaac007b91acd4aa4820f39a8051..7e6d208dc7f33a66329a32c02ff1b0d34154acda 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -107,7 +107,7 @@ $He's certainly going to have some adjustments to make.
<<set _pornFame = _pornFame.replace("$He is world famous for $his career in slave pornography. Millions are intimately familiar with", "enjoy")>>
<<set _pornFame = _pornFame.replace(".", ",")>>
In addition to $his annuity, you've laid the groundwork for $him to become wealthy by the way you publicized pornography of $him. Many thousands of people across the world are willing to pay to _pornFame and they enjoy it in part because $he doesn't mind it, either. $He's in a position to make great money for doing on camera what $he would probably do anyway.
-<<elseif ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50) && ($activeSlave.muscles > 5) && ($activeSlave.skill.combat >= 1) && ($activeSlave.amp != 1) && ($activeSlave.face > 10)>>
+<<elseif ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50) && ($activeSlave.muscles > 5) && ($activeSlave.skill.combat >= 1) && hasAllLimbs($activeSlave) && ($activeSlave.face > 10)>>
<br><br>
$He's pretty and deadly. If $he feels $he prefers wealth and danger to living on $his annuity, $he'll have no trouble finding work. In fact, $he'll likely have trouble sifting through all the mercenary organizations, businesses in need of attractive and competent guards for public spaces, and citizens looking for effective bodyguards willing to hire $him.
<<elseif ($activeSlave.intelligence+$activeSlave.intelligenceImplant > 50) && ($activeSlave.intelligenceImplant >= 15)>>
@@ -173,7 +173,7 @@ Your arcology has gained a well-off citizen.
that $he's quite eager to fuck you as a free $woman.
<<if _clonedSlave.relationship == -3>>
<<if _clonedSlave.devotion+_clonedSlave.trust >= 175>>
- When $he knows $he has your attention, $he flashes <<if _clonedSlave.amp != 1>>$his hand, revealing the steel ring that $he wore when $he was your slave $wife<<else>> the steel ring that $he wore when $he was your slave $wife attached to the same chain you placed around $his neck on your wedding<</if>>. Even though the ring is meaningless to society, it holds a special meaning to you and $him.
+ When $he knows $he has your attention, $he flashes <<if hasAnyArms(_clonedSlave)>>$his hand, revealing the steel ring that $he wore when $he was your slave $wife<<else>> the steel ring that $he wore when $he was your slave $wife attached to the same chain you placed around $his neck on your wedding<</if>>. Even though the ring is meaningless to society, it holds a special meaning to you and $him.
<<else>>
When $he knows $he has your attention, $he produces the steel ring that $he wore when $he was your slave $wife. $He doesn't put it on, but $he kisses it suggestively before putting it back in $his purse.
<</if>>
@@ -320,8 +320,8 @@ $He is brought down to
the autosurgery,
<</if>>
and, a disturbingly short time later, there is a new Fuckdoll, a humanoid figure encased in a tough black bodysuit, in your office.
-<<if $activeSlave.amp == 1>>
- Its limbless form is not obviously human. It's a sex toy, with several interesting holes and nothing else worth noticing.
+<<if !hasAnyLegs($activeSlave)>>
+ Its <<if isAmputee($activeSlave)>>limbless<<else>>legless<</if>> form is not obviously human. It's a sex toy, with several interesting holes and nothing else worth noticing.
<<else>>
It stands immobile, the hydraulic system hidden within the suit stiffened to make voluntary movement impossible.
<</if>>
@@ -350,7 +350,13 @@ and, a disturbingly short time later, there is a new Fuckdoll, a humanoid figure
<<setNonlocalPronouns $seeDicks>>
<<replace "#result">>
<<if $PC.dick == 1>>
- You enter a command, and the Fuckdoll instantly <<if _clonedSlave.amp == 1>>presents its upper hole<<else>>collapses to its knees<</if>>. You tug the plug clear of its upper hole, and insert your cock. The Fuckdoll's nose ports open when it needs to breathe, but periodically close without warning to force its throat to spasm. When you're bored of this, you pull your dick clear and haul the Fuckdoll over to the couch, entering the command that forces it to present its rear hole. Your saliva-slicked shaft slides readily inside the sex toy's warm interior. After a while, you enter the tightening command, and the Fuckdoll's sphincter obediently cinches down, encouraging you to shoot your load inside it. A low moaning sound issues from its upper hole.
+ You enter a command, and the Fuckdoll instantly
+ <<if hasAnyLegs(_clonedSlave)>>
+ collapses to its knee<<if hasBothLegs($activeSlave)>>s<</if>>.
+ <<else>>
+ presents its upper hole.
+ <</if>>
+ You tug the plug clear of its upper hole, and insert your cock. The Fuckdoll's nose ports open when it needs to breathe, but periodically close without warning to force its throat to spasm. When you're bored of this, you pull your dick clear and haul the Fuckdoll over to the couch, entering the command that forces it to present its rear hole. Your saliva-slicked shaft slides readily inside the sex toy's warm interior. After a while, you enter the tightening command, and the Fuckdoll's sphincter obediently cinches down, encouraging you to shoot your load inside it. A low moaning sound issues from its upper hole.
<<else>>
You shove the Fuckdoll backward onto the couch, and enter a command that forces it into a bridged position. <<if _clonedSlave.vagina > -1>>Its clit is brought to full hardness, and its front hole becomes wet and flushed. You ride this until you orgasm, the Fuckdoll's copious juices adding lewd noises to each grinding motion.<<else>>Its dick is forced to perfect hardness. Its tubes have been tied to prevent any unseemly contamination, allowing you to ride it until you are satisfied. When you're done, the Fuckdoll is allowed to go soft. It did not climax.<</if>>
<</if>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 542c84528463dc682f0cf0954ee6b68c78fb34de..8c7a51b8a3f4798563de0b8faa318e60312b7652 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -1239,7 +1239,7 @@ __Bids Received__
<<if $activeSlave.devotion > 20>>
<<if $activeSlave.fetish == "cumslut">>
<<if $activeSlave.lips > 30>>
- <<if $activeSlave.amp == 0>>
+ <<if hasAllNaturalLimbs($activeSlave)>>
<<if $activeSlave.skill.oral > 50>>
<<if random(1,100) > 60>>
<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.35)/500))>>'' from a prominent citizen who's looking for a fresh, skilled pair of lips eager to wrap around a thick cock.
@@ -1948,4 +1948,4 @@ __Bids Received__
<<link "Re-list $him" "Sell Slave">><<run cashX(-500, "personalBusiness")>><</link>>
//This will cost <<print cashFormat(500)>>//
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 441f3dfa45a326a463a2931b5f7d8252e524551e..8d801a7c5d608f02dae52940f6b900467809cbc6 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -693,7 +693,7 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
<<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "anal skill"})>>
<<elseif (_Slave.skill.whoring < $HeadGirl.skill.whoring)>>
<<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "whore skill"})>>
- <<elseif (_Slave.skill.entertainment < $HeadGirl.skill.entertainment) && (_Slave.amp != 1)>>
+ <<elseif (_Slave.skill.entertainment < $HeadGirl.skill.entertainment) && hasAllLimbs(_Slave)>>
<<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "entertain skill"})>>
<</if>>
<</if>>
diff --git a/src/uncategorized/subordinateTargeting.tw b/src/uncategorized/subordinateTargeting.tw
index 7d90320cc0b9a8854b8fcfcb78d485733080c893..64d704492d9c13ddc38b488793644aa973ebe87b 100644
--- a/src/uncategorized/subordinateTargeting.tw
+++ b/src/uncategorized/subordinateTargeting.tw
@@ -20,7 +20,7 @@
<br><br>__Select a slave for $him to submit to, sexually:__
<<= App.UI.SlaveList.slaveSelectionList(
s => s.devotion >= -20 && s.fuckdoll === 0 && State.variables.activeSlave.ID !== s.ID &&
- (State.variables.activeSlave.amp !== 1 || s.amp !== 1),
+ (hasAllLimbs(State.variables.activeSlave) || hasAllLimbs(s)),
(s, i) => App.UI.DOM.passageLink(SlaveFullName(s), 'Subordinate Targeting', () => { App.activeSlave.subTarget = s.ID; }),
)>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index c01eaba772656f73727ce6658bb0a1b0ed1c2c93..01365a977fa2988938405d95f7d9a36f5350b976 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -1194,7 +1194,7 @@
For today's slutty outfit $he's chosen ripped jean shorts so tight that $he sports a raging cameltoe.
<</if>>
<<case "a slave gown">>
- <<if ($activeSlave.amp == 1) && ($activeSlave.vagina != -1)>>
+ <<if isAmputee($activeSlave) && ($activeSlave.vagina != -1)>>
$He's wearing a lovely 'dress' designed specifically for an amputee.
<<elseif ($activeSlave.dick != 0) && ($activeSlave.vagina != -1)>>
$His gorgeous dress leaves little to the imagination; there's little doubt $his pussy is bare beneath it, and $his cock tents the fabric as $he moves.
@@ -1204,7 +1204,7 @@
$His gorgeous dress leaves little to the imagination; there's little doubt $his pussy is bare beneath it.
<</if>>
<<case "a halter top dress">>
- <<if ($activeSlave.amp == 1) && ($activeSlave.vagina != -1)>>
+ <<if isAmputee($activeSlave) && ($activeSlave.vagina != -1)>>
$He's wearing a 'beautiful halter top dress' designed specifically for an amputee.
<<elseif ($activeSlave.dick != 0) && ($activeSlave.vagina != -1)>>
$His beautiful halter top dress is almost sculpted around $him, but $his cock tents the fabric as $he moves.
@@ -1214,7 +1214,7 @@
$His beautiful halter top dress is almost sculpted around $him.
<</if>>
<<case "a ball gown">>
- <<if ($activeSlave.amp == 1) && ($activeSlave.vagina != -1)>>
+ <<if isAmputee($activeSlave) && ($activeSlave.vagina != -1)>>
$He's wearing a 'fabulous silken ball gown' designed specifically for an amputee.
<<elseif ($activeSlave.dick != 0) && ($activeSlave.vagina != -1)>>
$His fabulous silken ball gown is draped around $him, but $his cock tents the fabric as $he moves.
@@ -3166,4 +3166,4 @@
<<default>>
<span id="walkpast"><<link "Fuck $him">><<replace "#walk">><<FFuckdollOral>><</replace>><</link>></span>
<</switch>>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 1f0eb75d7cc5d1e15c0c199cfa121cbc790aa264..782dc40f918160112df125540c667cb625750fac 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -10,7 +10,7 @@
<h1>The Wardrobe</h1>
-//$activeSlave.slaveName <<if $activeSlave.amp != 1>>stands on<<else>>has been placed on a cushion atop<</if>> a small platform surrounded by mirrors and an array of clothing options. $He is awaiting your fashion choices.//
+//$activeSlave.slaveName <<if hasAnyLegs($activeSlave)>>stands on<<else>>has been placed on a cushion atop<</if>> a small platform surrounded by mirrors and an array of clothing options. $He is awaiting your fashion choices.//
<br><br>