From 2808549fcfbec39bd4c095e5f0dc14b112e26d1f Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Thu, 1 Aug 2019 20:30:38 +0200
Subject: [PATCH] partly converted limb access in src/pregmod

---
 src/js/slaveStatsChecker.js  |  33 ++++++++
 src/pregmod/birthStorm.tw    |   6 +-
 src/pregmod/eliteTakeOver.tw |   2 +-
 src/pregmod/fDick.tw         |   4 +-
 src/pregmod/fFeet.tw         | 151 +++++++++++++++++------------------
 src/pregmod/fMarry.tw        |  10 +--
 src/pregmod/fNippleFuck.tw   |  12 +--
 src/pregmod/fPat.tw          |  36 ++++-----
 src/pregmod/fillUpButt.tw    |  27 ++++---
 src/pregmod/fillUpFace.tw    |  12 +--
 src/pregmod/forceFeeding.tw  |   8 +-
 11 files changed, 168 insertions(+), 133 deletions(-)

diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index e90648a5103..0bfcc2f3fb0 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -1071,6 +1071,39 @@ window.getArmCount = function(slave, id) {
 	return n;
 };
 
+/**
+ * Returns count of specified leg type. Uses new limb IDs.
+ *
+ * @param {App.Entity.SlaveState} slave
+ * @param {number} id
+ * @returns {number}
+ */
+window.getLegCount = function(slave, id) {
+	let oldID = (id - 1) * -1;
+
+	if (oldID < 0) {
+		if (slave.amp === oldID) {
+			return 2;
+		} else {
+			return 0;
+		}
+	}
+
+	let n = 0;
+	if (hasLeftLeg(slave)) {
+		n++;
+	}
+	if (hasRightLeg(slave)) {
+		n++;
+	}
+
+	if (id === 0) {
+		return 2 - n;
+	}
+
+	return n;
+};
+
 
 /**
  * True if slave has left arm
diff --git a/src/pregmod/birthStorm.tw b/src/pregmod/birthStorm.tw
index 36bb947cbb2..635786d8c8c 100644
--- a/src/pregmod/birthStorm.tw
+++ b/src/pregmod/birthStorm.tw
@@ -116,11 +116,11 @@
 
 The remote surgery allows the removal of the pregnancy generator through conventional means, an injection to induce labor and the resulting birthing of the womb's contents.
 <<if $activeSlave.broodmother == 2>>
-	$activeSlave.slaveName's obscenely swollen belly begins to shudder and writhe moments after being injected with the drug as all $his waters break. $He spreads $his <<if $activeSlave.amp != 1>>legs to either side of $his spasming bulk as wide as $he can<<else>>stumps as wide as $he can<</if>> with a loud moan. $His vaginal lips part as the first of $his brood is born, followed by another, and another. After hours of constant
+	$activeSlave.slaveName's obscenely swollen belly begins to shudder and writhe moments after being injected with the drug as all $his waters break. $He spreads $his <<if hasBothLegs($activeSlave)>>legs to either side of $his spasming bulk<<elseif !hasAnyLegs($activeSlave)>>stumps<<else>>leg and $his stump<</if>> as wide as $he can with a loud moan. $His vaginal lips part as the first of $his brood is born, followed by another, and another. After hours of constant
 <<elseif $activeSlave.broodmother == 1>>
-	$activeSlave.slaveName's massive belly shudders and shrinks as all $his waters simultaneously break. $He spreads $his <<if $activeSlave.amp != 1>>legs<<else>>stumps<</if>> wide with a loud moan. $His vaginal lips part as the first of $his brood is born, followed not long after by another. After an hour of constant
+	$activeSlave.slaveName's massive belly shudders and shrinks as all $his waters simultaneously break. $He spreads $his <<if hasBothLegs($activeSlave)>>legs<<elseif !hasAnyLegs($activeSlave)>>stumps<<else>>leg and stump<</if>> wide with a loud moan. $His vaginal lips part as the first of $his brood is born, followed not long after by another. After an hour of constant
 <<else>>
-	$activeSlave.slaveName's massive belly shudders and shrinks as all $his waters simultaneously break. $He spreads $his <<if $activeSlave.amp != 1>>legs<<else>>stumps<</if>> wide with a loud moan. $His vaginal lips part as $his birthing begins. After an hour of intensive
+	$activeSlave.slaveName's massive belly shudders and shrinks as all $his waters simultaneously break. $He spreads $his <<if hasBothLegs($activeSlave)>>legs<<elseif !hasAnyLegs($activeSlave)>>stumps<<else>>leg and stump<</if>> wide with a loud moan. $His vaginal lips part as $his birthing begins. After an hour of intensive
 <</if>>
 <<if $activeSlave.fetish == "mindbroken">>
 	birthing, $he shows little interest in the changes to $his body. @@.red;The ordeal of intensive birthing has had a massive effect on $his health as well as completely destroying $his vagina.@@
diff --git a/src/pregmod/eliteTakeOver.tw b/src/pregmod/eliteTakeOver.tw
index 14b19e8857a..20762df4e7a 100644
--- a/src/pregmod/eliteTakeOver.tw
+++ b/src/pregmod/eliteTakeOver.tw
@@ -31,7 +31,7 @@ You look up from your desk as the locked door to your office unseals, and a doze
 	What was that last thing he said? It's getting hard to think right. The $PC.refreshment... Drugged... You collapse onto your desk, unconscious.
 	<br>
 	<<if $Bodyguard != 0>>
-		A sharp pain and a rush of adrenaline drags you back to your senses. Sneaking a peak, you witness $Bodyguard.slaveName valiantly trying to protect you, despite <<if $Bodyguard.amp < 0>>$his cybernetics being locked down<<else>>the overwhelming odds<</if>>. As $he and their leader struggle closer to your desk, his revolver and a syringe are dislodged onto your desk. It seems drugging you wasn't their first thought. With $Bodyguard.slaveName's risky gamble, your fate has fallen back into your hands.
+		A sharp pain and a rush of adrenaline drags you back to your senses. Sneaking a peak, you witness $Bodyguard.slaveName valiantly trying to protect you, despite <<if hasAnyProstheticLimbs($Bodyguard)>>$his cybernetics being locked down<<else>>the overwhelming odds<</if>>. As $he and their leader struggle closer to your desk, his revolver and a syringe are dislodged onto your desk. It seems drugging you wasn't their first thought. With $Bodyguard.slaveName's risky gamble, your fate has fallen back into your hands.
 	<<else>>
 		You'll spend the rest of your life a breeder to the Societal Elite; blinded and muted. More than a slave, but still less than your master. Life isn't so bad, your two most devoted slaves were taken along to keep you happy, and you are treated quite well, possibilities considered. Though once your eggs dry up, odds are your little remaining usefulness will be at an end. Best not to think too much into it.
 		<<set _pregSurrender = 1>>
diff --git a/src/pregmod/fDick.tw b/src/pregmod/fDick.tw
index 0f956c73aa6..278b880f7d3 100644
--- a/src/pregmod/fDick.tw
+++ b/src/pregmod/fDick.tw
@@ -8,7 +8,7 @@
 /*CHECK*/
 
 /*NON-AMPUTEE*/
-<<if ($activeSlave.amp < 1)>>
+<<if !isAmputee($activeSlave)>>
 	You direct $activeSlave.slaveName to lie down and ready $himself as you step over to $him and align your <<if $PC.vagina == 1>>vagina<<else>>ass<</if>> with $his
 	<<if ($activeSlave.vaginaPiercing > 1) && ($activeSlave.dick != 0)>>
 		pierced cock-head.
@@ -126,7 +126,7 @@
 			<</if>>
 			Such audacity takes you entirely by surprise and gives $him the edge $he needs to pull it off. $He vigorously pistons in and out of you with little regard for you<<if $PC.pregKnown == 1>> or your pregnancy<</if>>, fucking you senseless until $he has had enough and cums deep inside your <<if $PC.vagina == 1>>pussy<<else>>ass<</if>>.
 			<<if canImpreg($PC, $activeSlave) && $activeSlave.fetish == "pregnancy">>
-				Running a hand across your firm belly, $he decides $his job is not yet done and begins reaming you once more, dead set on taking this opportunity to @@.orangered;show you your place by knocking you up with $his child.@@ $He manages to empty $his balls in your womb several more times before exhaustion kicks in, forcing $him to leave you twitching and drooling cum.
+				<<if hasAnyArms($activeSlave)>>Running a hand across<<else>>Grinding against<</if>> your firm belly, $he decides $his job is not yet done and begins reaming you once more, dead set on taking this opportunity to @@.orangered;show you your place by knocking you up with $his child.@@ $He manages to empty $his balls in your womb several more times before exhaustion kicks in, forcing $him to leave you twitching and drooling cum.
 				<<= knockMeUp($PC, 100, 0, $activeSlave.ID)>>
 				<<set $activeSlave.counter.penetrative += 5, $penetrativeTotal += 5>>
 			<<else>>
diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw
index 24ddc0164c3..4ed37e7f038 100644
--- a/src/pregmod/fFeet.tw
+++ b/src/pregmod/fFeet.tw
@@ -216,15 +216,23 @@
 	<<set _hips = "very narrow">>
 <</if>>
 
-<<if ($activeSlave.skin == $activeSlave.race) || ($activeSlave.race == "white") || ($activeSlave.race == "black") || ($seeRace == 1)>>
+<<if ($activeSlave.skin == $activeSlave.race) || ($activeSlave.race == "white") || ($activeSlave.race == "black") || ($seeRace == 0)>>
 	<<set _skin = "$activeSlave.skin">>
 <<else>>
 	<<set _skin = "$activeSlave.skin $activeSlave.race">>
 <</if>>
 
+<<if hasBothLegs($activeSlave)>>
+	<<set _nounL = "legs">>
+	<<set _nounF = "feet">>
+<<else>>
+	<<set _nounL = "leg">>
+	<<set _nounF = "foot">>
+<</if>>
+
 
 /*Part 1: Order and reaction*/
-You call $activeSlave.slaveName to your office, telling $him to use $his feet to please you.
+You call $activeSlave.slaveName to your office, telling $him to use $his _nounF to please you.
 <<if ($activeSlave.fetish == "mindbroken")>>
 	$He is brought to you and stands blankly by your desk.
 <<elseif ($activeSlave.relationship == -3 && $activeSlave.devotion >= 60 )>>
@@ -249,7 +257,7 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
 
 /*Extra 1 if tease/perverted and not mindbroken*/
 <<if ($activeSlave.sexualQuirk == "tease" || $activeSlave.sexualQuirk == "perverted") && $activeSlave.devotion > 60 && $activeSlave.fetish != "mindbroken">>
-		Before you can begin, $he arches a leg in a seductive tease.
+	Before you can begin, $he arches <<if hasBothLegs($activeSlave)>>a<<else>>$his<</if>> leg in a seductive tease.
 <</if>>
 /*Part 2: lube and reaction*/
 <<if !canWalk($activeSlave)>>
@@ -260,42 +268,33 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
 	<<elseif tooBigDick($activeSlave)>>
 		Since $he is immobilized by $his _dick dick, you have $him lay on $his side on the floor,
 	<<elseif tooBigButt($activeSlave)>>
-		Since $he is immobilized by $his _dick dick, you have $him sit on your desk to present $his _legs legs and feet,
+		Since $he is immobilized by $his _dick dick, you have $him sit on your desk to present $his _legs _nounL and _nounF,
 	<<elseif tooBigBalls($activeSlave)>>
-		Since $he is immobilized by $his _balls balls, you have $him lay on $his back on the floor with $his legs over $his nuts,
+		Since $he is immobilized by $his _balls balls, you have $him lay on $his back on the floor with $his _nounL over $his nuts,
 	<<else>>
-		You have $him sit on the edge of your desk to present $his _legs legs and feet,
+		You have $him sit on the edge of your desk to present $his _legs _nounL and _nounF,
 	<</if>>
 <<else>>
-	You have $him sit on the edge of your desk to present $his _legs legs and feet,
+	You have $him sit on the edge of your desk to present $his _legs _nounL and _nounF,
+<</if>>
+<<if getLegCount($activeSlave, 4) + getLegCount($activeSlave, 6) === 2>>
+	then pour lubricant onto your hands, applying it to $his elegant artificial _nounF.
+<<elseif getLegCount($activeSlave, 5) === 2>>
+	then pour lubricant onto your hands, applying it to $his deadly artificial _nounF.
+<<elseif hasBothLegs($activeSlave) && !hasAnyNaturalLegs($activeSlave)>>
+	then pour lubricant onto your hands, applying it to $his artificial _nounF.
+<<else>>
+	then pour lubricant onto your hands, massaging it into $his $activeSlave.skin _nounF: rubbing $his arch<<if hasBothLegs($activeSlave)>>es<</if>>, sole<<if hasBothLegs($activeSlave)>>s<</if>>, and toes.
 <</if>>
 <<if $activeSlave.fetish == "mindbroken">>
-	<<if $activeSlave.amp == -2 || $activeSlave.amp == -5>>
-		then pour lubricant onto your hands, applying it to $his elegant artificial feet.
-	<<elseif $activeSlave.amp == -4>>
-		then pour lubricant onto your hands, applying it to $his deadly artificial feet.
-	<<elseif $activeSlave.amp == -1>>
-		then pour lubricant onto your hands, applying it to $his artificial feet.
-	<<else>>
-		then pour lubricant onto your hands, massaging it into $his $activeSlave.skin feet: rubbing $his arches, soles, and toes.
-	<</if>>
 	$He shows little reaction to your efforts.
 <<else>>/*not mindbroken*/
-	<<if $activeSlave.amp == -2 || $activeSlave.amp == -5>>
-		then pour lubricant onto your hands, applying it to $his elegant artificial feet.
-	<<elseif $activeSlave.amp == -4>>
-		then pour lubricant onto your hands, applying it to $his deadly artificial feet.
-	<<elseif $activeSlave.amp == -1>>
-		then pour lubricant onto your hands, applying it to $his artificial feet
-	<<else>>
-		then pour lubricant onto your hands, massaging it into $his $activeSlave.skin feet: rubbing $his arches, soles, and $his toes.
-	<</if>>
 	<<if ($activeSlave.devotion < -50)>>
 		$He tries to stay hateful despite the pleasurable stimulation.
 	<<elseif ($activeSlave.devotion < -20)>>
 		$He is mostly quiet, but occasionally stifles a moan.
 	<<elseif ($activeSlave.devotion > 20 && $activeSlave.sexualFlaw == "shamefast")>>
-		$He hides $his face in $his hands in shame at $his nudity, but occasionally a moan breaks out.
+		$He <<if (hasAnyArms($activeSlave))>>hides $his face in $his hand<<if (hasBothArms($activeSlave))>>s<</if>><<else>>attempts to hide $his face<</if>> in shame at $his nudity, but occasionally a moan breaks out.
 	<<elseif ($activeSlave.devotion <= 20)>>
 		$He seems a bit surprised by the attention, occasionally letting out a moan.
 	<<else>>
@@ -309,12 +308,12 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
 
 /*Part 3: Actions, attraction/devotion and fetishes*/
 <<if $activeSlave.fetish == "mindbroken">>
-		You hold $his feet and thrust between them as $he <<if canSee($activeSlave)>>watches you blankly. <<else>>points $his blind gaze at you. <</if>>
+		You hold $his _nounF and thrust between them as $he <<if canSee($activeSlave)>>watches you blankly. <<else>>points $his blind gaze at you. <</if>>
 <<elseif !(canWalk($activeSlave))>>
 	<<if ($activeSlave.devotion < -50)>>
-		When $he refuses to serve, you take both $his feet and start thrusting between them.
+		When $he refuses to serve, you take<<if hasBothLegs($activeSlave)>> both of<</if>> $his _nounF and start thrusting between them.
 	<<elseif ($activeSlave.devotion < -20)>>
-		$He seems a bit reluctant when massaging you with $his feet so you have to do most of the work.
+		$He seems a bit reluctant when massaging you with $his _nounF so you have to do most of the work.
 	<<elseif ($activeSlave.devotion <= 20)>>
 		$He tries to make it pleasurable for you, but the combination of the awkward angle and $his nervousness makes $him lose $his pacing often.
 	<<elseif ($activeSlave.devotion < 60 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion <= 20))>>
@@ -323,24 +322,24 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
 		<<if ($activeSlave.trust < -50)>>
 			$His lack of trust causes $him to ask "<<Master>>, is this pleasurable for you?", spoiling the moment.
 		<<else>>
-			$He moves $his feet hypnotically, trying $his hardest to make you cum. Being on $his side doesn't affect $his footjob, and you get a nice view of $his _legs legs as $he runs $his feet across your cock.
+			$He moves $his _nounF hypnotically, trying $his hardest to make you cum. Being on $his side doesn't affect $his footjob, and you get a nice view of $his _legs _nounL as $he runs $his _nounF across your cock.
 		<</if>>
 	<</if>>
 	<<if !canWalk($activeSlave)>>
 		<<if $activeSlave.boobs > $activeSlave.belly >>
-			$His _boobs breasts wobble as $his feet service you.
+			$His _boobs breasts wobble as $his _nounF service you.
 		<<else>>
-			$His _belly belly wobbles as $his feet service you.
+			$His _belly belly wobbles as $his _nounF service you.
 		<</if>>
 	<</if>>
 <<elseif ($activeSlave.devotion < -50)>>
-	When $he refuses to comply, you take both $his feet and start thrusting between them.
+	When $he refuses to comply, you take both $his _nounF and start thrusting between them.
 <<elseif ($activeSlave.devotion < -20)>>
-	$He seems a bit reluctant when massaging you with $his feet so you have to do most of the work.
+	$He seems a bit reluctant when massaging you with $his _nounF so you have to do most of the work.
 <<elseif ($activeSlave.devotion <= 20)>>
 	$He tries to make it pleasurable for you, trying to find the right angle and speed, but $he seems a bit tense and ruins $his pacing.
 <<elseif ($activeSlave.devotion < 60 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion <= 20))>>
-	$He does $his best to please you, massaging you nicely with $his feet.
+	$He does $his best to please you, massaging you nicely with $his _nounF.
 <<elseif ($activeSlave.attrXY < 16)>>
 	$He tries to make it pleasurable for you, but $his great distaste for men is obvious on $his expression.
 <<else>>
@@ -368,43 +367,43 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
 		<<else>>
 			perverted smile
 		<</if>>
-		showing $his sexual excitement to service your cock with $his feet.
+		showing $his sexual excitement to service your cock with $his _nounF.
 	<<elseif $activeSlave.fetish == "cumslut" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
-		As a devoted cumslut, $activeSlave.slaveName eagerly strokes your cock with $his feet, delightedly smearing your precum on $his soles. $He <<if canSee($activeSlave)>>stares at your <<if $PC.balls >=2>>massive balls with a ravenous gaze, <<elseif $PC.balls >=1>>large balls with a hungry gaze, <<else>>balls with a steady gaze, <</if>><<else>>gingerly feels the weight of your <<if $PC.balls >=2>>massive balls <<elseif $PC.balls >=1>>large balls <<else>>balls <</if>>with $his feet, <</if>>shivering in anticipation.
+		As a devoted cumslut, $activeSlave.slaveName eagerly strokes your cock with $his _nounF, delightedly smearing your precum on $his sole<<if hasBothLegs($activeSlave)>>s<</if>>. $He <<if canSee($activeSlave)>>stares at your <<if $PC.balls >= 2>>massive balls with a ravenous gaze, <<elseif $PC.balls >= 1>>large balls with a hungry gaze, <<else>>balls with a steady gaze, <</if>><<else>>gingerly feels the weight of your <<if $PC.balls >= 2>>massive balls <<elseif $PC.balls >= 1>>large balls <<else>>balls <</if>>with $his _nounF, <</if>>shivering in anticipation.
 	<<elseif $activeSlave.fetish == "humiliation" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
-		$activeSlave.slaveName slowly strokes your cock with $his feet, getting off on the degrading use of $his feet and avoiding your gaze. $He is showing an embarrassed smile<<if (skinToneLevel($activeSlave.skin) > 22)>>, and if $his skin was any lighter you would see $his<<else>> and<</if>> bright blushing cheeks.
-	<<elseif $activeSlave.fetish == "boobs" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
-		As $activeSlave.slaveName deftly strokes your cock with $his feet, $his hands plays with $his <<if $activeSlave.boobs < 300>>erect nipples. <<elseif $activeSlave.boobs < 500>>small chest. <<elseif $activeSlave.boobs >= 18000>>_boobs breasts, though $he can't reach $his nipples. <<else>>_boobs breasts and erect nipples. <</if>> $He is certainly giving you plenty of sexy options for you to watch.
+		$activeSlave.slaveName slowly strokes your cock with $his _nounF, getting off on the degrading use of $his _nounF and avoiding your gaze. $He is showing an embarrassed smile<<if (skinToneLevel($activeSlave.skin) > 22)>>, and if $his skin was any lighter you would see $his<<else>> and<</if>> bright blushing cheeks.
+	<<elseif $activeSlave.fetish == "boobs" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60 && hasAnyArms($activeSlave)>>
+		As $activeSlave.slaveName deftly strokes your cock with $his _nounF, $his hand<<if hasBothArms($activeSlave)>>s<</if>> play<<if !hasBothArms($activeSlave)>>s<</if>> with $his <<if $activeSlave.boobs < 300>>erect nipples. <<elseif $activeSlave.boobs < 500>>small chest. <<elseif $activeSlave.boobs >= 18000>>_boobs breasts, though $he can't reach $his nipples. <<else>>_boobs breasts and erect nipples. <</if>> $He is certainly giving you plenty of sexy options for you to watch.
 	<<elseif $activeSlave.fetish == "sadist" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
 		$activeSlave.slaveName is a sadist, and $his deft footjob toys with the boundaries of pain and pleasure. $His devoted yet belittling <<if canSee($activeSlave)>>gaze carefully watches your face<<else>>expressions are clear as $he feels<</if>> for every reaction.
 	<<elseif $activeSlave.fetish == "dom" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
-		$activeSlave.slaveName is a dominant and $his skilled feet roughly stroke your erect cock, but $he pauses often to rub $his soles on your <<if $PC.balls >= 2>>massive<<elseif $PC.balls >= 0>>large>><</if>> balls so $he doesn't get too aggressive with $his <<= WrittenMaster()>>.
+		$activeSlave.slaveName is a dominant and $his skilled _nounF roughly stroke your erect cock, but $he pauses often to rub $his sole<<if hasBothLegs($activeSlave)>>s<</if>> on your <<if $PC.balls >= 2>>massive<<elseif $PC.balls >= 0>>large>><</if>> balls so $he doesn't get too aggressive with $his <<= WrittenMaster()>>.
 	<<elseif $activeSlave.fetish == "pregnancy" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
-		$activeSlave.slaveName skillfully strokes your cock with $his feet, one of $his hands roaming across $his _belly belly as $he happily services you. $He occasionally pauses to <<if canSee($activeSlave)>>watch <<else>>feel <</if>>your <<if $PC.balls >= 2>>massive<<elseif $PC.balls >= 0>>large>><</if>> balls churn with sperm, clearly lost in a pregnancy fantasy.
+		$activeSlave.slaveName skillfully strokes your cock with $his _nounF<<if hasAnyArms($activeSlave)>>,<<if hasBothArms($activeSlave)>> one of<</if>> $his hand<<if hasBothArms($activeSlave)>>s<</if>> roaming across $his _belly belly as $he happily services you<</if>>. $He occasionally pauses to <<if canSee($activeSlave)>>watch <<else>>feel <</if>>your <<if $PC.balls >= 2>>massive<<elseif $PC.balls >= 0>>large>><</if>> balls churn with sperm, clearly lost in a pregnancy fantasy.
 	<<else>>
-		$activeSlave.slaveName skillfully strokes your cock with $his feet, trying $his best to bring you pleasure.
+		$activeSlave.slaveName skillfully strokes your cock with $his _nounF, trying $his best to bring you pleasure.
 	<</if>>
 <</if>>
-<<if $activeSlave.amp == -2 || $activeSlave.amp == -5>>
+<<if getLegCount($activeSlave, 3) + getLegCount($activeSlave, 6) > 0>>
 	As you enjoy your footjob $his capable prosthetics begin to vibrate on your cock.
-<<elseif $activeSlave.amp == -4>>
-	The hard angles of $his metal feet provide extra stimulation.
+<<elseif getLegCount($activeSlave, 4)>>
+	The hard angles of $his metal _nounF provide extra stimulation.
 <</if>>
 
 /*Extra 2: if not mindbroken/immobile, tease with a flash.*/
 <<if $activeSlave.fetish != "mindbroken" && canWalk($activeSlave) && $activeSlave.sexualQuirk == "tease" && $activeSlave.devotion >= 60>>
 	<<if canSee($activeSlave)>>Seeing <<else>>Feeling <</if>>you near your orgasm, $he
-	<<if _footSeed < 40>>
+	<<if _footSeed < 40 && hasAnyArms($activeSlave)>>
 		<<if $activeSlave.boobs < 300>>
-			presses $his hands on $his flat chest,
+			presses $his hand<<if hasBothArms($activeSlave)>>s<</if>> on $his flat chest,
 		<<elseif $activeSlave.boobs < 500>>
-			puts $his hands under $his small chest,
+			puts $his hand<<if hasBothArms($activeSlave)>>s<</if>> under $his small chest,
 		<<else>>
-			cups $his _boobs breasts with $his hands,
+			cups $his _boobs breasts with $his hand<<if hasBothArms($activeSlave)>>s<</if>>,
 		<</if>>
 		then sticks out $his tongue, posing like a Free Cities whore who wants a cumshot.
 	<<elseif _footSeed < 70 && !($activeSlave.chastityPenis) && !($activeSlave.chastityVagina) && ($activeSlave.dick > 0 || $activeSlave.vagina >= 0 )>>
-		spreads $his _legs legs
+		spreads $his _legs _nounL
 		<<if $activeSlave.dick > 0>>
 			<<if $activeSlave.vagina >= 0>>
 				and raises $his _dick <<if canAchieveErection($activeSlave)>>erect <<else>>soft <</if>>cock <<if $activeSlave.balls > 0 && $activeSlave.scrotum > 0>>and _balls balls <</if>> to reveal $his <<if $activeSlave.vaginaLube == 1>>wet <<elseif $activeSlave.vaginaLube == 2>>dripping wet <</if>>aroused vagina
@@ -422,36 +421,36 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
 
 /*PC orgasms*/
 <<if ($activeSlave.fetish == "mindbroken")>>
-	You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even _belly belly with your massive load<<elseif $PC.balls >=1>> and _legs legs with your large load<</if>>.
+	You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>> _legs _nounL, and even _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>>.
 <<elseif !canWalk($activeSlave)>>
 	<<if ($activeSlave.devotion < -50)>>
-		You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he struggles in your grasp. $He is furious that $he is now covered in cum $he can't easily reach to clean.
+		You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>> _legs _nounL, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>> as $he struggles in your grasp. $He is furious that $he is now covered in cum $he can't easily reach to clean.
 	<<elseif ($activeSlave.devotion < -20)>>
-		You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>. $He was startled by your orgasm and now wears a conflicted expression, but you are done using $him for now. $He is left covered in cum $he can't easily reach to clean.
+		You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>> _legs _nounL, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>>. $He was startled by your orgasm and now wears a conflicted expression, but you are done using $him for now. $He is left covered in cum $he can't easily reach to clean.
 	<<elseif ($activeSlave.devotion <= 20)>>
-		You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he sighs in nervous relief.
+		You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>> _legs _nounL, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>> as $he sighs in nervous relief.
 	<<elseif ($activeSlave.devotion < 60 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion <= 20))>>
-		You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he rises to an elbow to smile at you.
+		You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>> _legs _nounL, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>> as $he rises to an elbow to smile at you.
 	<<else>>
 		<<if ($activeSlave.trust < -50)>>
 			$His lack of trust causes $his eyes to glaze over in fear.
 		<<else>>
-			You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he moans in pleasure.
+			You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>> _legs _nounL, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>> as $he moans in pleasure.
 		<</if>>
 	<</if>>
 <<elseif ($activeSlave.devotion < -50)>>
-	You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he struggles in your grasp with a look of disgust.
+	You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>> _legs _nounL, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>> as $he struggles in your grasp with a look of disgust.
 <<elseif ($activeSlave.devotion < -20)>>
-	You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>. $He was startled by your orgasm and now wears a conflicted expression, as well as your cum, but you are done using $him for now.
+	You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>> _legs _nounL, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>>. $He was startled by your orgasm and now wears a conflicted expression, as well as your cum, but you are done using $him for now.
 <<elseif ($activeSlave.devotion <= 20)>>
-	You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he sighs in nervous relief.
+	You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>> _legs _nounL, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>> as $he sighs in nervous relief.
 <<elseif ($activeSlave.devotion < 60 || $activeSlave.attrXY < 16 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion <= 20))>>
-		You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he does $his best to catch your semen on $his legs.
+		You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>> _legs _nounL, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>>, and $he does $his best to catch your semen on $his _nounL.
 <<else>>
 	<<if $activeSlave.fetish == "cumslut" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
 		When you eventually cum, $activeSlave.slaveName giggles in lustful joy as your hot cum coats $his _skin
 		<<if $PC.balls >= 1>>
-			feet and quickly slides from your desk to kneel in front of your pulsating cock.
+			_nounF and quickly slides from your desk to kneel in front of your pulsating cock.
 			<<if $PC.balls >= 2>>
 				Your massive load quickly covers $his face as $he moans and twitches in pleasure, semen dripping down $his
 				<<if $activeSlave.boobs < 300>>
@@ -473,30 +472,30 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
 				<</if>>
 			<</if>>
 		<<else>>
-			feet.
+			_nounF.
 		<</if>>
 	<<elseif $activeSlave.fetish == "humiliation" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
-		You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he whimpers as even $his feet used as a sex object.
+		You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>> _legs _nounL, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>>, and $he whimpers as even $his _nounF used as a sex object.
 	<<elseif $activeSlave.fetish == "submissive" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
-		You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he gasps as $he submissively accepts your semen on $his skin.
+		You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>> _legs _nounL, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>>, and $he gasps as $he submissively accepts your semen on $his skin.
 	<<elseif $activeSlave.fetish == "buttslut" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
-		When you eventually cum, $activeSlave.slaveName moans as your semen lands on $his _skin feet,
+		When you eventually cum, $activeSlave.slaveName moans as your semen lands on $his _skin _nounF,
 		<<if $PC.balls >= 1>>
 			but quickly turns to present $his _butt ass and _hips hips as a new target.
 			<<if $PC.balls >= 2>>
 				Your massive load quickly covers $his _thighs ass and thighs, sticky cum dripping all the way to $his calves.
 			<<else>>
-				Your large load soaks $his _thighs ass and thighs in sticky semen, which drips down $his _legs legs.
+				Your large load soaks $his _thighs ass and thighs in sticky semen, which drips down $his _legs _nounL.
 			<</if>>
 		<<else>>
 			but you know $he wanted to involve $his _butt butt and your cum, if your orgasm had more volume.
 		<</if>>
 	<<elseif $activeSlave.fetish == "boobs" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
-		You eventually cum all over $his _skin feet<<if $PC.balls >= 2>>, _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he <<if $activeSlave.boobs < 300>>pinches both $his erect nipples <<elseif $activeSlave.boobs < 500>>rubs $his hands across $his small chest <<else>>squeezes $his _boobs breasts tightly <</if>>while moaning in pleasure.
+		You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>>, _legs _nounL, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>>, and $he <<if $activeSlave.boobs < 300>>pinches both $his erect nipples <<elseif $activeSlave.boobs < 500>>rubs $his hand<<if hasBothArms($activeSlave)>>s<</if>> across $his small chest <<else>>squeezes $his _boobs breasts tightly <</if>>while moaning in pleasure.
 	<<elseif $activeSlave.fetish == "sadist" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
-		You eventually cum all over $his _skin feet<<if $PC.balls >= 2>>, _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he gasps slightly and condescendingly smiles as you soil $his feet with semen.
+		You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>>, _legs _nounL, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>>, and $he gasps slightly and condescendingly smiles as you soil $his _nounF with semen.
 	<<elseif $activeSlave.fetish == "dom" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
-		You eventually cum all over $his _skin feet<<if $PC.balls >= 2>>, _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he gasps slightly and holds your cock between $his feet tightly as you soil $him with semen.
+		You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>>, _legs _nounL, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>>, and $he gasps slightly and holds your cock between $his _nounF tightly as you soil $him with semen.
 	<<elseif $activeSlave.fetish == "pregnancy" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
 		When you start to cum, $activeSlave.slaveName moves $his hand from $his belly to
 		<<if $activeSlave.vagina >= 0>>
@@ -506,17 +505,17 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
 		<<else>>
 			hug $his stomach.
 		<</if>>
-		Your orgasm shoots across $his _skin feet<<if $PC.balls >= 2>>, _legs legs, and even $his _belly belly is marked with your massive load. $He runs $his hands through the cum on $his belly, massaging the semen into $his skin<<elseif $PC.balls >= 1>> and _legs legs<</if>>.
+		Your orgasm shoots across $his _skin _nounF<<if $PC.balls >= 2>>, _legs _nounL, and even $his _belly belly is marked with your massive load. $He runs $his hand<<if hasBothArms($activeSlave)>>s<</if>> through the cum on $his belly, massaging the semen into $his skin<<elseif $PC.balls >= 1>> and _legs _nounL<</if>>.
 	<<else>>
-		You eventually cum all over $his _skin feet<<if $PC.balls >= 2>>, _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he moans softly in pleasure as $he feels your hot semen run down $his soles.
+		You eventually cum all over $his _skin _nounF<<if $PC.balls >= 2>>, _legs _nounL, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs _nounL with your large load<</if>>, and $he moans softly in pleasure as $he feels your hot semen run down $his sole<<if hasBothLegs($activeSlave)>>s<</if>>.
 	<</if>>
 <</if>>
 
 /*Extra 3: devoted perverted slave giggles and orgasms*/
 <<if ($activeSlave.fetish != "mindbroken" && canWalk($activeSlave) && $activeSlave.sexualQuirk == "perverted" && $activeSlave.devotion >= 60 && !($activeSlave.fetish == "cumslut" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60))>>
 	$He was getting off on the footjob, but the feeling of your cum on
-	<<if $activeSlave.fetish == "buttslut" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60 && $PC.balls >=1>>
-		$his ass and thighs sets off a strong orgasm of $his own, $his _thighs legs quivering as
+	<<if $activeSlave.fetish == "buttslut" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60 && $PC.balls >= 1>>
+		$his ass and thighs sets off a strong orgasm of $his own, $his _thighs _nounL quivering as
 		<<if $activeSlave.dick > 0>>
 			<<if $activeSlave.vagina >= 0>>
 				<<if cumAmount($activeSlave) > 20>>
@@ -537,7 +536,7 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
 			$he moans in pleasure, asshole pulsating as $he tries to remain standing.
 		<</if>>
 	<<else>>
-		$his legs<<if $PC.balls >=2>>and belly<</if>> sets off a strong orgasm of $his own, even without masturbating.
+		$his _nounL<<if $PC.balls >= 2>>and belly<</if>> sets off a strong orgasm of $his own, even without masturbating.
 		<<if $activeSlave.dick > 0>> /*dick shoots*/
 			<<if cumAmount($activeSlave) > 20>>/*huge load*/
 				$His _dick dick unloads a massive amount of cum, adding $his own semen to $his body, resulting in a slave covered nearly head to toe in spunk.
@@ -569,6 +568,6 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
 			$He leans back and moans in pleasure, asshole pulsating. $He is splattered in semen, face coated in your cum, and judging by <<if canSmell($activeSlave)>>$his nostrils desperately taking in your scent and <</if>>how $he can't stop masturbating, $he couldn't be happier.
 		<</if>>
 	<<else>>
-		$activeSlave.slaveName leans down to wipe semen off $his feet, quickly bringing it into $his mouth with a blissful look as $he <<if canTaste($activeSlave)>>tastes<<else>>feels<</if>> your cum and sighs in pleasure.
+		$activeSlave.slaveName leans down to wipe semen off $his _nounF, quickly bringing it into $his mouth with a blissful look as $he <<if canTaste($activeSlave)>>tastes<<else>>feels<</if>> your cum and sighs in pleasure.
 	<</if>>
 <</if>>
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index e0dade52ffc..18ba42955ed 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -37,7 +37,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 	$He doesn't react.
 	<<set _reactionType = 0>>
 <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
-	You're not exactly lacking in ways to make <<if $activeSlave.physicalAge > 30>>$women<<else>><<= $girl>>s<</if>> burst into tears, but this one is unusually effective. When $he's gotten $himself under control again, <<if $activeSlave.amp == 1>>looking somewhat embarrassed that $he can't wipe $his own tears<<else>>distractedly cuffing away $his tears<</if>> and consciously breathing deeply,
+	You're not exactly lacking in ways to make <<if $activeSlave.physicalAge > 30>>$women<<else>><<= $girl>>s<</if>> burst into tears, but this one is unusually effective. When $he's gotten $himself under control again, <<if !hasAnyArms($activeSlave)>>looking somewhat embarrassed that $he can't wipe $his own tears<<else>>distractedly cuffing away $his tears<</if>> and consciously breathing deeply,
 	<<if canTalk($activeSlave)>>
 		$he <<say>>s,
 		<<if $activeSlave.relationship != 0>>
@@ -82,7 +82,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 			good <<wife>>,
 		<</if>>
 		<<Master>>. Oh, thank you, <<Master>>," $he blubbers, and starts crying again.
-	<<elseif $activeSlave.amp == 1>>
+	<<elseif !hasAnyArms($activeSlave)>>
 		$he painstakingly mouths $his thanks, since $he cannot speak or use hands to sign.
 		<<if $activeSlave.relationship != 0>>
 			$He struggles to tell you
@@ -164,7 +164,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 				"I need you in my life, <<Master>>, <<s>>o why don't you bend down like the bitch you are and <<if $activeSlave.dick > 0>><<s>>uck my dick<<elseif $activeSlave.vagina > -1>>eat me out<<else>>lick my a<<ss>><</if>>, <<Master>>?"
 			<</if>>
 		<</if>>
-	<<elseif $activeSlave.amp == 1>>
+	<<elseif !hasAnyArms($activeSlave)>>
 		$he painstakingly mouths $his displeasure, since $he cannot speak or use hands to sign.
 		<<if $activeSlave.relationship != 0>>
 			<<if $activeSlave.relationship == -1>>
@@ -239,7 +239,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 				"I need you in my life, <<Master>>, but not like thi<<s>>, plea<<s>>e?"
 			<</if>>
 		<</if>>
-	<<elseif $activeSlave.amp == 1>>
+	<<elseif !hasAnyArms($activeSlave)>>
 		$He painstakingly pleads with you, since $he cannot speak or use hands to sign.
 		<<if $activeSlave.relationship != 0>>
 			<<if $activeSlave.relationship == -1>>
@@ -549,7 +549,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 		<</if>>
 	<</if>>
 	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> marries $him to you in a brief ceremony adapted for slaves and their owners. You place a
-	<<if $activeSlave.amp != 1>>
+	<<if hasAnyArms($activeSlave)>>
 		simple steel ring on $his finger;
 	<<else>>
 		chain with a simple steel ring around $his neck;
diff --git a/src/pregmod/fNippleFuck.tw b/src/pregmod/fNippleFuck.tw
index d237deae55b..7a7cc70ebae 100644
--- a/src/pregmod/fNippleFuck.tw
+++ b/src/pregmod/fNippleFuck.tw
@@ -41,15 +41,17 @@ breast flesh grips you tightly. A few experimental pumps draws gasps from $him b
 
 <<if $activeSlave.fetish == "boobs" && $activeSlave.fetishKnown == 1>>
 	$He has a glassy-eyed expression as $he
-	<<if $activeSlave.amp != 1>>
-		gropes $his breasts with both hands, fingering $his unoccupied nipple in time with your thrusts.
+	<<if hasAnyArms($activeSlave)>>
+		gropes $his breasts with <<if hasBothArms($activeSlave)>>both hands<<else>>$his hand<</if>>, fingering $his unoccupied nipple in time with your thrusts.
 	<<else>>
 		savors the sensations running through $his breast.
 	<</if>>
 <<elseif $activeSlave.devotion > 20 || $activeSlave.trust > 20>>
 	$He has a glassy-eyed expression as $he
-	<<if $activeSlave.amp != 1>>
+	<<if hasBothArms($activeSlave)>>
 		gropes $his breasts with one hand and furiously abuses $his clit with the other.
+	<<elseif hasAnyArms($activeSlave)>>
+		fingers $his pussy while rubbing $his arm alongside $his breasts.
 	<<else>>
 		tries $his hardest to pleasure $himself with no hands.
 	<</if>>
@@ -62,12 +64,12 @@ As your orgasm begins to build, you roughly grasp $his shoulders and begin to pi
 <<if $activeSlave.fetish == "boobs" && $activeSlave.fetishKnown == 1>>
 	As $he reaches $his climax, $his eyes roll back into $his head and $he quivers in delight at the intense breastgasm $he just sustained.
 <<elseif $activeSlave.devotion > 20 || $activeSlave.trust > 20>>
-	$His moaning grows louder and higher in pitch, and $his self-molesting becomes furious and desperate, eager for release.
+	Eager for release, $his moaning grows louder and higher in pitch<<if hasAnyArms($activeSlave)>>, and $his self-molesting becomes furious and desperate<</if>>.
 <<else>>
 	As $he reaches $his climax, $his body seems to tense and $he bites $his lip.
 <</if>>
 
-It only takes few more thrusts before you bottom out inside $his breast and release your load deep inside $him. You pull yourself free with a lewd sound and proudly survey what you've wrought. Cum<<if $activeSlave.lactation > 0>> and milk dribble<<else>> dribbles <</if>> from $his gaping nipple. Enjoying the sight, you begin to feel yourself hardening and line up your dick at $his left nipple for a repeat performance.
+It only takes few more thrusts before you bottom out inside $his breast and release your load deep inside $him. You pull yourself free with a lewd sound and proudly survey what you've wrought. Cum <<if $activeSlave.lactation > 0>>and milk dribble<<else>>dribbles<</if>> from $his gaping nipple. Enjoying the sight, you begin to feel yourself hardening and line up your dick at $his left nipple for a repeat performance.
 
 <<if $activeSlave.lactation > 0>>
 	<<set $activeSlave.lactationDuration = 2>>
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index ddf77bea4f5..2c7516bd096 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -6,8 +6,8 @@
 <<setPlayerPronouns>>
 
 You tell $activeSlave.slaveName to
-<<if ($activeSlave.amp != 1)>>
-	move closer towards you.
+<<if !hasAnyLegs($activeSlave)>>
+	have another slave set $him up onto your desk.
 <<elseif tooBigBreasts($activeSlave)>>
 	have another slave help $him heft $his tits so $he can be near you.
 <<elseif tooBigBelly($activeSlave)>>
@@ -21,7 +21,7 @@ You tell $activeSlave.slaveName to
 <<elseif tooFatSlave($activeSlave)>>
 	have another slave help $him up so $he can be near you.
 <<else>>
-	have another slave set $him up onto your desk.
+	move closer towards you.
 <</if>>
 
 /*approach*/
@@ -124,12 +124,12 @@ You tell $activeSlave.slaveName to
 
 You walk around $him, drawing closer and slowly resting your hand on $his head. You let it rest for a few seconds to get $him accustomed to your touch.
 <<if ($activeSlave.fetish == "mindbroken")>>
-	Tenderly and lovingly you brush your fingers along $his head, enjoying the feeling of your poor mentally shattered slave's inability to resist you. $He initially reacts slightly to your physical touch, but soon stops reacting completely. Nevertheless, you continue to gingerly stroke $his <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>shaven scalp <<else>>hair <</if>>, as you gently press $his body into your chest<<if $activeSlave.amp == 1>> and onto your lap<</if>>. The warmth from your slave's body, and the action of petting $his head, combined with the sound of $his breathing, allow you to feel more relaxed by the minute.
+	Tenderly and lovingly you brush your fingers along $his head, enjoying the feeling of your poor mentally shattered slave's inability to resist you. $He initially reacts slightly to your physical touch, but soon stops reacting completely. Nevertheless, you continue to gingerly stroke $his <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>shaven scalp <<else>>hair <</if>>, as you gently press $his body into your chest<<if !hasAnyLegs($activeSlave)>> and onto your lap<</if>>. The warmth from your slave's body, and the action of petting $his head, combined with the sound of $his breathing, allow you to feel more relaxed by the minute.
 <<elseif ($activeSlave.relationship == -3) && $activeSlave.devotion+$activeSlave.trust >= 175>>
-	Tenderly and lovingly you brush your fingers along $his head, enjoying the feeling of your slave's utterly willing submission. $He slowly leans $his body closer and closer to you<<if $activeSlave.amp == 1>> and finally onto your lap<</if>>, relaxing as $he feels your caress. As $he shifts $his weight to your chest, $he feels all of the daily stresses of the day melt away, and a deep, happy sigh escapes $his lips. You smile fondly, allowing all of the troubles of being an arcology owner dissipate, in a similar fashion to your slave. For now, just for now, you are just a _womanP and _hisP devoted and content $wife.
+	Tenderly and lovingly you brush your fingers along $his head, enjoying the feeling of your slave's utterly willing submission. $He slowly leans $his body closer and closer to you<<if !hasAnyLegs($activeSlave)>> and finally onto your lap<</if>>, relaxing as $he feels your caress. As $he shifts $his weight to your chest, $he feels all of the daily stresses of the day melt away, and a deep, happy sigh escapes $his lips. You smile fondly, allowing all of the troubles of being an arcology owner dissipate, in a similar fashion to your slave. For now, just for now, you are just a _womanP and _hisP devoted and content $wife.
 <<elseif ($activeSlave.relationship == -2)>>
-	Tenderly and lovingly you brush your fingers along $his head, for a moment, appreciating how easily your slave submits to your desire to pat $his head. $He slowly leans $his body closer and closer to you<<if $activeSlave.amp == 1>> allowing you to move $him onto your lap<</if>>, relaxing as $he feels your caresses. As $his weight falls onto you, all of the stress from $his body melts away, and a small, respectful sigh escapes $his pursed lips. You smile fondly, allowing all of the troubles of being an arcology owner drift away, in a similar fashion to your slave. For now, just for now, you are just a _womanP and _hisP devoted and content servant.
-<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.amp != 1)>>
+	Tenderly and lovingly you brush your fingers along $his head, for a moment, appreciating how easily your slave submits to your desire to pat $his head. $He slowly leans $his body closer and closer to you<<if !hasAnyLegs($activeSlave)>> allowing you to move $him onto your lap<</if>>, relaxing as $he feels your caresses. As $his weight falls onto you, all of the stress from $his body melts away, and a small, respectful sigh escapes $his pursed lips. You smile fondly, allowing all of the troubles of being an arcology owner drift away, in a similar fashion to your slave. For now, just for now, you are just a _womanP and _hisP devoted and content servant.
+<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && (hasAnyArms($activeSlave))>>
 	As you start to touch $him $he smiles at you and takes your hand, following its movements. You tenderly and lovingly kiss it and let it rest on the side of $his head, before continuing with your ministrations. As opposed to your more submissive slaves, $activeSlave.slaveName takes an active role in your petting, gently guiding where your hand goes along $his head. You enjoy the feel of $his hand on yours, as well as $his <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>smooth scalp<<else>> hair<</if>>.
 <<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
 	$He stiffens at your touch but slowly relaxes at the sensation of your hand on $his head. You tenderly and lovingly stroke your fingers along $his scalp, enjoying the feeling of your slave's subservience. $He gently, submissively, presses $his head against your hand, like a dog. As you continue <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>kneading $his shaved scalp<<else>>stroking $his hair<</if>>, $he starts to clutch $his thighs, and if you listen you can hear subdued whimpers. $He looks up at you with adoring eyes, and relishes in the pureness of this act as $his master's pet to $his beloved <<= WrittenMaster($activeSlave)>>.
@@ -206,10 +206,10 @@ You move your hand down to caress $his forehead, and then slide your hand along
 	<</if>>
 	awaiting further use of $his body.
 <<elseif ($activeSlave.relationship == -2)>>
-	When you finally stop petting $him, <<if canSee($activeSlave)>>$his eyes remain closed just for a second <</if>>and $his mouth stands open in slack-jawed joy, before $he slowly <<if canSee($activeSlave)>> opens $his eyes<<else>> turns $his gaze towards you<</if>> and smiles warmly at you. Pleasure lights up $his face<<if ($activeSlave.amp != 1)>> as $his hand traces the path yours took up to $his head and mimics your last movements<<else>> as $his gaze drifts off to the right in memory, tilting $his head from side to side in sympathetic memory of how it felt to have your hand on $his head<</if>>.
+	When you finally stop petting $him, <<if canSee($activeSlave)>>$his eyes remain closed just for a second <</if>>and $his mouth stands open in slack-jawed joy, before $he slowly <<if canSee($activeSlave)>> opens $his eyes<<else>> turns $his gaze towards you<</if>> and smiles warmly at you. Pleasure lights up $his face<<if (hasAnyArms($activeSlave))>> as $his hand traces the path yours took up to $his head and mimics your last movements<<else>> as $his gaze drifts off to the right in memory, tilting $his head from side to side in sympathetic memory of how it felt to have your hand on $his head<</if>>.
 	<<if ($activeSlave.accent >= 3)>>
 		$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
-	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+	<<elseif (!hasAnyArms($activeSlave)) && (!canTalk($activeSlave))>>
 		$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he loves you.
@@ -217,11 +217,11 @@ You move your hand down to caress $his forehead, and then slide your hand along
 		"I love you, <<Master>>," $he <<say>>s dreamily.
 	<</if>>
 	$He looks as though $he wants much more than your mere caress.
-<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && !$activeSlave.amp != 1>>
+<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && (hasAnyArms($activeSlave))>>
 	$He tries hard to stop from losing $himself in your incredibly skilled hands. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, when $he starts to caress your face in turn. When you finally stop, $his eyes are closed and $he's smiling. When you are finally finished stroking your slave, they remove their hand from yours. Then you give them a playful flick on the nose, and the mischievous twinkle in your eye is only half playful, reminding $him of $his place in these walls.
 	<<if ($activeSlave.accent >= 3)>>
 		$He does $his best to communicate enjoyment with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
-	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+	<<elseif (!hasAnyArms($activeSlave)) && (!canTalk($activeSlave))>>
 		$He does $his best to communicate enjoyment with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he liked that and would love to pet you next time.
@@ -233,7 +233,7 @@ You move your hand down to caress $his forehead, and then slide your hand along
 	As you stroke $his head, $he reacts almost as though you're stroking $his nether regions, and begins to moan and press $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>. $He achieves a weak orgasm before you finally stop caressing $his head; $he is your pet, after all.
 	<<if ($activeSlave.accent >= 3)>>
 		$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
-	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+	<<elseif (!hasAnyArms($activeSlave)) && (!canTalk($activeSlave))>>
 		$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he liked that.
@@ -242,10 +242,10 @@ You move your hand down to caress $his forehead, and then slide your hand along
 	<</if>>
 	$He looks at you as if $he wants more than your hands touching $his head.
 <<elseif ($activeSlave.devotion > 50)>>
-	$He gradually closes $his eyes and when you finally stop, <<if ($activeSlave.amp != 1)>>$he runs $his hand delightedly across $his face; <</if>>a euphoric look quickly lighting up $his features.
+	$He gradually closes $his eyes and when you finally stop, <<if (hasAnyArms($activeSlave))>>$he runs $his hand delightedly across $his face and <</if>>a euphoric look quickly lights up $his features.
 	<<if ($activeSlave.accent >= 3)>>
 		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>, since $he's not confident in $his ability to express it in $language.
-	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+	<<elseif (!hasAnyArms($activeSlave)) && (!canTalk($activeSlave))>>
 		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he loves you.
@@ -255,7 +255,7 @@ You move your hand down to caress $his forehead, and then slide your hand along
 	$He <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you longingly, almost as if $he's bursting to say that $he wants more than your mere caress.
 <<elseif ($activeSlave.devotion > 20)>>
 	When you finally move your hand away, <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor($activeSlave)>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
-	<<if ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+	<<if (!hasAnyArms($activeSlave)) && (!canTalk($activeSlave))>>
 		$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
 	<<elseif !canTalk($activeSlave)>>
 		$He signs hesitantly, asking if that's all.
@@ -267,7 +267,7 @@ You move your hand down to caress $his forehead, and then slide your hand along
 	/* TODO: write this */
 <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>>
 	When you finally move your hand away, $he <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you for a long moment, as if looking for answers, before visibly catching $himself with a reminder that $he's a slave and you're $his owner.
-	<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
+	<<if ((!hasAnyArms($activeSlave)) && (!canTalk($activeSlave)))>>
 		$His <<if canSee($activeSlave)>>eyes hesitantly question<<else>>expression hesitantly questions<</if>> for an answer: is that it?
 	<<elseif !canTalk($activeSlave)>>
 		$He signs hesitantly, asking if that's all.
@@ -276,7 +276,7 @@ You move your hand down to caress $his forehead, and then slide your hand along
 	<</if>>
 <<elseif ($activeSlave.trust < -50)>>
 	$He stares <<if canSee($activeSlave)>>at you<<else>>blankly<</if>> as you move your fingers across $his stiff head, but it's like touching a statue. $He is so filled with terror that $he remains rigid even as it becomes clear to $him you're not going to hurt $him. When you bore of touching the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>> and move your hand away, $he turns to you in utter incomprehension.
-	<<if ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+	<<if (!hasAnyArms($activeSlave)) && (!canTalk($activeSlave))>>
 		$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> beg for an answer: is that it?
 	<<elseif !canTalk($activeSlave)>>
 		$He signs spastically, asking fearfully to know if that's all.
@@ -286,7 +286,7 @@ You move your hand down to caress $his forehead, and then slide your hand along
 	$He then cringes.
 <<else>>
 	When you bore of it and take your hand away, $he faces you in utter incomprehension.
-	<<if ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+	<<if (!hasAnyArms($activeSlave)) && (!canTalk($activeSlave))>>
 		$His <<if canSee($activeSlave)>>eyes demand<<else>>expression demands<</if>> an answer: is that it?
 	<<elseif !canTalk($activeSlave)>>
 		$He signs irritably, asking whether that's all.
diff --git a/src/pregmod/fillUpButt.tw b/src/pregmod/fillUpButt.tw
index 647537dc06d..8c19c33858e 100644
--- a/src/pregmod/fillUpButt.tw
+++ b/src/pregmod/fillUpButt.tw
@@ -129,7 +129,7 @@ before shoving the equipment into $his
 <<elseif $activeSlave.devotion < -20>>
 	<<if canWalk($activeSlave)>>
 		You instruct $him to present $his anus for a $activeSlave.inflationType enema. Opposed to the thought of being filled <<if $activeSlave.inflation > 0>>more <</if>>with $activeSlave.inflationType, $he tries to step back, but you catch $him and pull $him closer to you as you reach around and grab $his
-	<<elseif ($activeSlave.amp != 1)>>
+	<<elseif (hasAnyLegs($activeSlave))>>
 		You instruct $him to present $his anus for a $activeSlave.inflationType enema. $He's opposed to the thought of being filled <<if $activeSlave.inflation > 0>>more <</if>>with $activeSlave.inflationType, but since $he is immobile, can't escape. You reach around and grab $his
 	<<else>>
 		$He's opposed to the thought of being filled with <<if $activeSlave.inflation > 0>>more <</if>>$activeSlave.inflationType, but as an amputee can do nothing about it. You reach around and grab $his
@@ -154,8 +154,8 @@ before shoving the equipment into $his
 		couch-like
 	<</if>>
 	<<if $seeRace == 1>>$activeSlave.race <</if>> buttocks.
-	<<if ($activeSlave.amp != 1)>>
-		$he tries to grab your wrists to keep them away but $he cannot resist for long.
+	<<if (hasAnyArms($activeSlave))>>
+		$he tries to grab your <<if (hasBothArms($activeSlave))>>wrists to keep them<<else>>wrist to keep it<</if>> away but $he cannot resist for long.
 	<</if>>
 	You start rubbing along $his cheeks, feeling the shape of $his<<if $seeRace == 1>> $activeSlave.race<</if>> ass with your fingers and squeezing gently. $He tries to break out of your grasp as you rub fingers around $his
 	<<if ($activeSlave.anus > 3)>>
@@ -169,8 +169,8 @@ before shoving the equipment into $his
 	<<elseif ($activeSlave.anus == 0)>>
 		virgin butthole.
 	<</if>>
-	$He writhes as you continue to move around $his posterior, gently reaching to touch your fingertips against $his sphincter while rubbing $his ass at the same time. $He struggles to stay still while you circle around $his anus, not breaking contact with $him with your fingers. You look at $his face and $he has <<if !canSee($activeSlave)>>reflexively <</if>>shut $his eyes, trying not to think about what's about to happen.
-	<<if ($activeSlave.amp != 1)>>
+	$He writhes as you continue to move around $his posterior, gently reaching to touch your fingertips against $his sphincter while rubbing $his ass at the same time. $He struggles to stay still while you circle around $his anus with your fingers, not breaking contact with $him. You look at $his face and $he has <<if !canSee($activeSlave)>>reflexively <</if>>shut $his eyes, trying not to think about what's about to happen.
+	<<if (hasAnyLegs($activeSlave))>>
 		You pull $his body closer towards you by $his buttocks, turn $him around, and bend $him over your lap, <<if $activeSlave.inflation == 2>>$his soft and jiggly <<print $activeSlave.inflationType>>-filled belly spilling over your legs<<elseif $activeSlave.inflation == 1>>$his <<print $activeSlave.inflationType>> distended belly resting on your legs<<else>>$his belly resting on your legs<</if>>, while $he tries to push away.
 	<<else>>
 		You pull $his body closer towards you by $his buttocks, turn $him around, and place $him on your lap, <<if $activeSlave.inflation == 2>>$his soft and jiggly <<print $activeSlave.inflationType>>-filled belly spilling over your legs<<elseif $activeSlave.inflation == 1>>$his <<print $activeSlave.inflationType>> distended belly resting on your legs<<else>>$his belly resting on your legs<</if>>, while $he tries to squirm away.
@@ -197,7 +197,7 @@ before shoving the equipment into $his
 <<elseif ($activeSlave.devotion <= 20)>>
 	<<if canWalk($activeSlave)>>
 		You instruct $him to present $his anus for a $activeSlave.inflationType enema. $He complies without comment, standing in front of you.
-	<<elseif ($activeSlave.amp != 1)>>
+	<<elseif !isAmputee($activeSlave)>>
 		You instruct $him to present $his anus for a $activeSlave.inflationType enema. $He complies without comment, readying $his ass for you.
 	<<else>>
 		$he's hesitant of being filled with <<if $activeSlave.inflation > 0>>more <</if>>$activeSlave.inflationType, but as an amputee can do nothing about it.
@@ -235,7 +235,7 @@ before shoving the equipment into $his
 		virgin butthole.
 	<</if>>
 	$He writhes as you continue to move around $his posterior, gently reaching to touch your fingertips against $his sphincter while rubbing $his ass at the same time. $He struggles to stay still while you circle around $his anus with your fingers. You look at $his face and $he has <<if !canSee($activeSlave)>>reflexively <</if>>shut $his eyes, trying not to get aroused by your touch on $his butt. This only encourages you to continue. You keep squeezing $his buttocks tenderly — first one, then the other and then finally both and $he can't help but quiver while in your grasp.
-	<<if ($activeSlave.amp != 1)>>
+	<<if (hasAnyLegs($activeSlave))>>
 		You pull $his body closer towards you by $his buttocks, turn $him around, and bend $him over your lap, <<if $activeSlave.inflation == 2>>$his soft and jiggly <<print $activeSlave.inflationType>>-filled belly spilling over your legs<<elseif $activeSlave.inflation == 1>>$his <<print $activeSlave.inflationType>> distended belly resting on your legs<<else>>$his belly resting on your legs<</if>>.
 	<<else>>
 		You pull $his body closer towards you by $his buttocks, turn $him around, and place $his wriggling body on your lap, <<if $activeSlave.inflation == 2>>$his soft and jiggly <<print $activeSlave.inflationType>>-filled belly spilling over your legs<<elseif $activeSlave.inflation == 1>>$his <<print $activeSlave.inflationType>> distended belly resting on your legs<<else>>$his belly resting on your legs<</if>>.
@@ -263,7 +263,7 @@ before shoving the equipment into $his
 <<elseif $activeSlave.devotion <= 50>>
 	<<if canWalk($activeSlave)>>
 		You instruct $him to present $his <<if $seeRace == 1>>$activeSlave.race <</if>>anus for a $activeSlave.inflationType enema. $He hesitates but eventually stands in front of you showing $his buttocks before presenting $his anus.
-	<<elseif ($activeSlave.amp != 1)>>
+	<<elseif !isAmputee($activeSlave)>>
 		You instruct $him to present $his <<if $seeRace == 1>>$activeSlave.race <</if>>anus for a $activeSlave.inflationType enema. $He hesitates but eventually shifts $his buttocks to face you before presenting $his anus.
 	<<else>>
 		$he's mildly hesitant of being filled with <<if $activeSlave.inflation > 0>>more <</if>>$activeSlave.inflationType, but as an amputee can do nothing about it.
@@ -289,7 +289,7 @@ before shoving the equipment into $his
 		couch-like
 	<</if>>
 	buttocks. You start rubbing along $his cheeks, feeling the shape of $his <<if $seeRace == 1>>$activeSlave.race <</if>>ass with your fingers and squeezing gently. As you rub your fingers around $his anus, $he starts to relax. $He quivers as you continue to move around $his posterior gently reaching to touch your fingertips against $his sphincter while rubbing $his ass at the same time. $He purses $his lips while you circle around $his anus with your fingers. You look at $his face and $he is <<if canSee($activeSlave)>>looking back at you doe-eyed<<else>>smiling pleasantly at you<</if>>, trying but failing not to get aroused by your soft touch on $his butt. You keep squeezing $his buttocks tenderly — first one, then the other and then finally both and $he can't help but let out a moan while in your grasp.
-	<<if ($activeSlave.amp != 1)>>
+	<<if (hasAnyLegs($activeSlave))>>
 		You pull $his body closer towards you by $his buttocks, turn $him around, and bend $him over your lap, <<if $activeSlave.inflation == 2>>$his soft and jiggly <<print $activeSlave.inflationType>>-filled belly spilling over your legs<<elseif $activeSlave.inflation == 1>>$his <<print $activeSlave.inflationType>> distended belly resting on your legs<<else>>$his belly resting on your legs<</if>>.
 	<<else>>
 		You pull $his body closer towards you by $his buttocks, turn $him around, and place $him wriggling body on your lap, <<if $activeSlave.inflation == 2>>$his soft and jiggly <<print $activeSlave.inflationType>>-filled belly spilling over your legs<<elseif $activeSlave.inflation == 1>>$his <<print $activeSlave.inflationType>> distended belly resting on your legs<<else>>$his belly resting on your legs<</if>>.
@@ -317,12 +317,13 @@ before shoving the equipment into $his
 <<else>>
 	<<if canWalk($activeSlave)>>
 		You instruct $him to present $his <<if $seeRace == 1>>$activeSlave.race <</if>>anus for a $activeSlave.inflationType enema. $He eagerly stands in front of you showing $his buttocks before happily presenting $his anus to you, spreading $his butt cheeks and turning to face you.
-	<<elseif ($activeSlave.amp != 1)>>
+	<<elseif !isAmputee($activeSlave)>>
 		You instruct $him to present $his <<if $seeRace == 1>>$activeSlave.race <</if>>anus for a $activeSlave.inflationType enema. $He eagerly shifts around to show $his buttocks before happily presenting $his anus to you, spreading $his butt cheeks and turning to face you.
 	<<else>>
-		$he devotedly <<if canSee($activeSlave)>>looks<<else>>smiles<</if>> at you, awaiting the warm liquids entering $his bowels.
+		$He devotedly <<if canSee($activeSlave)>>looks<<else>>smiles<</if>> at you, awaiting the warm liquids entering $his bowels.
 	<</if>>
-	You reach around and grab $his <<if $activeSlave.butt < 2>>
+	You reach around and grab $his
+	<<if $activeSlave.butt < 2>>
 		flat
 	<<elseif $activeSlave.butt <= 2>>
 		cute
@@ -342,7 +343,7 @@ before shoving the equipment into $his
 		couch-like
 	<</if>>
 	buttocks. You start rubbing along $his cheeks, feeling the shape of $his <<if $seeRace == 1>>$activeSlave.race <</if>>ass with your fingers and squeezing gently. As you rub your fingers around $his anus, $he sighs audibly. $He moans as you continue to move around $his posterior gently reaching to touch your fingertips against $his sphincter while rubbing $his ass at the same time. $He quivers while you circle around $his anus with your fingers. You look at $his face and $he is <<if canSee($activeSlave)>>looking<<else>>gazing<</if>> back at you longingly, getting aroused by your continued touch on $his butt. You keep squeezing $his buttocks tenderly — first one, then the other and then finally both and $he can't help but let out a moan while in your grasp.
-	<<if ($activeSlave.amp != 1)>>
+	<<if (hasAnyLegs($activeSlave))>>
 		You pull $his body closer towards you by $his buttocks, turn $him around, and bend $him over your lap, <<if $activeSlave.inflation == 2>>$his soft and jiggly <<print $activeSlave.inflationType>>-filled belly spilling over your legs<<elseif $activeSlave.inflation == 1>>$his <<print $activeSlave.inflationType>> distended belly resting on your legs<<else>>$his belly resting on your legs<</if>>.
 	<<else>>
 		You pull $his body closer towards you by $his buttocks, turn $him around, and place $his wriggling body on your lap, <<if $activeSlave.inflation == 2>>$his soft and jiggly <<print $activeSlave.inflationType>>-filled belly spilling over your legs<<elseif $activeSlave.inflation == 1>>$his <<print $activeSlave.inflationType>> distended belly resting on your legs<<else>>$his belly resting on your legs<</if>>.
diff --git a/src/pregmod/fillUpFace.tw b/src/pregmod/fillUpFace.tw
index 474afdfdd9e..65837d3d565 100644
--- a/src/pregmod/fillUpFace.tw
+++ b/src/pregmod/fillUpFace.tw
@@ -63,7 +63,7 @@ You attach a hose to $dairyName tap with the pipes set to pump $activeSlave.infl
 <<elseif $activeSlave.devotion < -20>>
 	<<if canWalk($activeSlave)>>
 		You instruct $him to take a seat on your lap and open $his mouth wide for the hose. Opposed to the thought of being filled <<if $activeSlave.inflation > 0>>more <</if>>with $activeSlave.inflationType, $he tries to step back, but you catch $him and pull $him into your lap, wrapping your arms around $his
-	<<elseif ($activeSlave.amp != 1)>>
+	<<elseif (hasAnyLegs($activeSlave))>>
 		You inform $him $he'll be taking a seat on your lap, opening $his mouth wide for the hose, and drinking until you tell $him $he is full enough. $He's opposed to the thought of being filled with<<if $activeSlave.inflation > 0>> more<</if>> $activeSlave.inflationType, but since $he is immobile, $he can't escape. You heft $him onto your lap, wrapping your arms around $his
 	<<else>>
 		$He's opposed to the thought of being filled with <<if $activeSlave.inflation > 0>>more <</if>>$activeSlave.inflationType, but as an amputee can do nothing about it. You heft $him onto your lap, wrapping your arms around $him
@@ -101,7 +101,7 @@ You attach a hose to $dairyName tap with the pipes set to pump $activeSlave.infl
 <<elseif $activeSlave.devotion <= 20>>
 	<<if canWalk($activeSlave)>>
 		You instruct $him to take a seat on your lap and open $his mouth wide for the hose. $He complies without comment and settles $himself onto your lap, shuddering slightly as you wrap your arms around $his
-	<<elseif ($activeSlave.amp != 1)>>
+	<<elseif (hasAnyLegs($activeSlave))>>
 		You inform $him $he'll be taking a seat on your lap, opening $his mouth wide for the hose, and drinking until you tell $him $he is full enough. $He complies without comment. You heft $him onto your lap, wrapping your arms around $his
 	<<else>>
 		$He's hesitant of being filled with <<if $activeSlave.inflation > 0>>more <</if>>$activeSlave.inflationType, but as an amputee can do nothing about it. You heft $him onto your lap, wrapping your arms around $his
@@ -139,7 +139,7 @@ You attach a hose to $dairyName tap with the pipes set to pump $activeSlave.infl
 <<elseif $activeSlave.devotion <= 50>>
 	<<if canWalk($activeSlave)>>
 		You instruct $him to take a seat on your lap and open $his mouth wide for the hose. $He hesitates but eventually settles $himself onto your lap as you wrap your arms around $his
-	<<elseif ($activeSlave.amp != 1)>>
+	<<elseif (hasAnyLegs($activeSlave))>>
 		You inform $him $he'll be taking a seat on your lap, opening $his mouth wide for the hose, and drinking until you tell $him $he is full enough. $He hesitates for a moment, before demonstrating acceptance. You heft $him onto your lap, wrapping your arms around $his
 	<<else>>
 		$He's mildly hesitant of being filled with <<if $activeSlave.inflation > 0>>more <</if>>$activeSlave.inflationType, but as an amputee can do nothing about it. You heft $him onto your lap, wrapping your arms around $his
@@ -173,11 +173,11 @@ You attach a hose to $dairyName tap with the pipes set to pump $activeSlave.infl
 	<<else>>
 		firm, flat
 	<</if>>
-	belly. You <<if $activeSlave.amp != 1>>hand $him the hose<<else>>place the hose in $his mouth<</if>>, allowing $him to drink from it at $his own pace, as you keep a hand on the tap to control the flow. With everything in place, you place your free hand on $his gurgling stomach.<<if $activeSlave.inflation == 2>>You can feel $his $activeSlave.skin belly growing taut with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give the firm orb of $his belly a couple gentle pats, eliciting a small hiccup, that $he immediately apologizes for, from the overfilled slave and no motion at all from $his gut. $He sighs contently, hoping you'll give $him more attention. You order $him to keep $himself filled with two gallons of $activeSlave.inflationType until you say otherwise, before helping $his heavy body onto the couch to recover. $His meal attempts to come back up on $his several times, but $he dutifully holds it down. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<<elseif $activeSlave.inflation == 1>>You can feel $his $activeSlave.skin belly growing larger with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give the jiggling orb of $his belly a couple pats, eliciting a small hiccup, that $he immediately apologizes for, from the full slave and tons of motion from $his gut. $He sighs contently, hoping you'll give $him more attention. You order $him to keep $himself filled with four liters of $activeSlave.inflationType until you say otherwise, before helping $his heavy body onto the couch to recover. $His meal attempts to come back up on $him several times, but $he dutifully holds it down. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<<else>>You can feel $his $activeSlave.skin belly swelling with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give $his bloated belly a couple pats, eliciting a small hiccup, that $he immediately apologizes for, from the bloated slave and a little jiggle from $his gut. $He sighs contently, hoping you'll give $him more attention. You order $him to keep $himself filled with two liters of $activeSlave.inflationType until you say otherwise, before helping $his sloshing body onto the couch to recover. $His meal attempts to come back up on $his several times, but $he dutifully holds it down. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<</if>>.
+	belly. You <<if hasAnyArms($activeSlave)>>hand $him the hose<<else>>place the hose in $his mouth<</if>>, allowing $him to drink from it at $his own pace, as you keep a hand on the tap to control the flow. With everything in place, you place your free hand on $his gurgling stomach.<<if $activeSlave.inflation == 2>>You can feel $his $activeSlave.skin belly growing taut with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give the firm orb of $his belly a couple gentle pats, eliciting a small hiccup, that $he immediately apologizes for, from the overfilled slave and no motion at all from $his gut. $He sighs contently, hoping you'll give $him more attention. You order $him to keep $himself filled with two gallons of $activeSlave.inflationType until you say otherwise, before helping $his heavy body onto the couch to recover. $His meal attempts to come back up on $his several times, but $he dutifully holds it down. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<<elseif $activeSlave.inflation == 1>>You can feel $his $activeSlave.skin belly growing larger with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give the jiggling orb of $his belly a couple pats, eliciting a small hiccup, that $he immediately apologizes for, from the full slave and tons of motion from $his gut. $He sighs contently, hoping you'll give $him more attention. You order $him to keep $himself filled with four liters of $activeSlave.inflationType until you say otherwise, before helping $his heavy body onto the couch to recover. $His meal attempts to come back up on $him several times, but $he dutifully holds it down. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<<else>>You can feel $his $activeSlave.skin belly swelling with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give $his bloated belly a couple pats, eliciting a small hiccup, that $he immediately apologizes for, from the bloated slave and a little jiggle from $his gut. $He sighs contently, hoping you'll give $him more attention. You order $him to keep $himself filled with two liters of $activeSlave.inflationType until you say otherwise, before helping $his sloshing body onto the couch to recover. $His meal attempts to come back up on $his several times, but $he dutifully holds it down. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<</if>>.
 <<else>>
 	<<if canWalk($activeSlave)>>
 		You instruct $him to take a seat on your lap and open $his mouth wide for the hose. $He eagerly settles $himself onto your lap as you wrap your arms around $his
-	<<elseif ($activeSlave.amp != 1)>>
+	<<elseif (hasAnyLegs($activeSlave))>>
 		You inform $him $he'll be taking a seat on your lap, opening $his mouth wide for the hose, and drinking until you tell $him $he is full enough. $He squirms with excitement as you heft $him onto your lap, wrapping your arms around $his
 	<<else>>
 		$He's devotedly <<if canSee($activeSlave)>>looks<<else>>smiles<</if>> at you as you heft $him onto your lap, wrapping your arms around $his
@@ -211,7 +211,7 @@ You attach a hose to $dairyName tap with the pipes set to pump $activeSlave.infl
 	<<else>>
 		firm, flat
 	<</if>>
-	belly. You <<if $activeSlave.amp != 1>>hand $him the hose<<else>>place the hose in $his mouth<</if>>, allowing $him to drink from it at $his own pace, as you keep a hand on the tap to control the flow. With everything in place, you place your free hand on $his gurgling stomach.<<if $activeSlave.inflation == 2>>You can feel $his $activeSlave.skin belly growing taut with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give the firm orb of $his belly a couple gentle pats, eliciting a cute burp followed by $his tongue running over $his lips, from the overfilled slave and no motion at all from $his gut. $He sighs contently, before eagerly begging for more. You tell $him to keep $himself filled with two gallons of $activeSlave.inflationType until you say otherwise, before helping $his heavy body onto the couch to recover. Apart from a few hiccups, $he spends $his time settling $his stomach and teasing $his near-bursting belly. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<<elseif $activeSlave.inflation == 1>>You can feel $his $activeSlave.skin belly growing larger with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give the jiggling orb of $his belly a couple pats, eliciting a cute burp followed by $his tongue running over $his lips, from the full slave and tons of motion from $his gut. $He sighs contently, before eagerly begging for more. You tell $him to keep $himself filled with four liters of $activeSlave.inflationType until you say otherwise, before helping $his heavy body onto the couch to recover. Apart from a few hiccups, $he spends $his time settling $his stomach and teasing $his overfilled belly. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<<else>>You can feel $his $activeSlave.skin belly swelling with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give $his bloated belly a couple pats, eliciting a cute burp followed by $his tongue running over $his lips, from the bloated slave and a little jiggle from $his gut. $He sighs contently, before eagerly begging for more. You tell $him to keep $himself filled with two liters of $activeSlave.inflationType until you say otherwise, before helping $his sloshing body onto the couch to recover. Apart from a few hiccups, $he spends $his time settling $his stomach and teasing $his bloated belly. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<</if>>.
+	belly. You <<if hasAnyArms($activeSlave)>>hand $him the hose<<else>>place the hose in $his mouth<</if>>, allowing $him to drink from it at $his own pace, as you keep a hand on the tap to control the flow. With everything in place, you place your free hand on $his gurgling stomach.<<if $activeSlave.inflation == 2>>You can feel $his $activeSlave.skin belly growing taut with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give the firm orb of $his belly a couple gentle pats, eliciting a cute burp followed by $his tongue running over $his lips, from the overfilled slave and no motion at all from $his gut. $He sighs contently, before eagerly begging for more. You tell $him to keep $himself filled with two gallons of $activeSlave.inflationType until you say otherwise, before helping $his heavy body onto the couch to recover. Apart from a few hiccups, $he spends $his time settling $his stomach and teasing $his near-bursting belly. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<<elseif $activeSlave.inflation == 1>>You can feel $his $activeSlave.skin belly growing larger with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give the jiggling orb of $his belly a couple pats, eliciting a cute burp followed by $his tongue running over $his lips, from the full slave and tons of motion from $his gut. $He sighs contently, before eagerly begging for more. You tell $him to keep $himself filled with four liters of $activeSlave.inflationType until you say otherwise, before helping $his heavy body onto the couch to recover. Apart from a few hiccups, $he spends $his time settling $his stomach and teasing $his overfilled belly. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<<else>>You can feel $his $activeSlave.skin belly swelling with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give $his bloated belly a couple pats, eliciting a cute burp followed by $his tongue running over $his lips, from the bloated slave and a little jiggle from $his gut. $He sighs contently, before eagerly begging for more. You tell $him to keep $himself filled with two liters of $activeSlave.inflationType until you say otherwise, before helping $his sloshing body onto the couch to recover. Apart from a few hiccups, $he spends $his time settling $his stomach and teasing $his bloated belly. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<</if>>.
 <</if>>
 
 <<if _pregDiscovery == 0>>
diff --git a/src/pregmod/forceFeeding.tw b/src/pregmod/forceFeeding.tw
index f3576a0b43b..734acf31cad 100644
--- a/src/pregmod/forceFeeding.tw
+++ b/src/pregmod/forceFeeding.tw
@@ -53,7 +53,7 @@ buckets overflowing with slave food. $He is going to eat it all and you're going
 	<<else>>
 		$He eagerly settles $himself onto your lap as you wrap your arm
 	<</if>>
-<<elseif ($activeSlave.amp == 1)>>
+<<elseif (isAmputee($activeSlave))>>
 	<<if $activeSlave.devotion < -20>>
 		$He's opposed to the thought of being forced to eat all that food, but as an amputee can do nothing about it. You heft $him onto your lap, wrapping an arm
 	<<elseif $activeSlave.fetish == "submissive">>
@@ -124,7 +124,7 @@ You hold $him tight as you pull $his meal closer, dip in a cup and bring it to $
 	It takes little effort to get $him to gulp down the contents
 <<elseif $activeSlave.devotion < -20>>
 	$He struggles in your lap and refuses to open $his mouth. You drop the cup back into the bucket and lean in close. You quickly clip $his nose shut, eliciting a panicked thrash from the $girl.
-	<<if $activeSlave.amp != 1>>
+	<<if hasAnyLegs($activeSlave)>>
 		You warn $him that $his punishment will be severe if $he comes that close to kicking over the buckets again.
 	<</if>>
 	With $his mouth forced open, you now have a clear avenue with which to pour the slave food into $his mouth. $He sputters as $he struggles to swallow with $his nose shut. After several cups, tears are streaming down $his face from the discomfort. Weeping, $he implores you to remove the clamp so that $he may drink like a good $girl.
@@ -482,8 +482,8 @@ and a little jiggle from $his gut.
 					<</if>>
 				<</if>>
 				Once you're hilted, you bring your hands to $his distended belly, eager to feel it move as you fuck $him.
-				<<if $activeSlave.amp != 1>>
-					$His own join yours atop the taut dome.
+				<<if hasAnyArms($activeSlave)>>
+					$His own join<<if hasBothArms($activeSlave)>>s<</if>> yours atop the taut dome.
 				<</if>>
 				Every thrust into the stuffed $desc forces $his full middle to leap back before slamming into your stomach alongside a moaning groan. As you pick up the pace, $he begins to buck against you, adding even more motion to $his body. It doesn't take long for you to reach your peak and, after cumming, catch sight of $his own climax. Watching $his middle attempt to contract around the mass of slave food inside $him invigorates you for a second round.
 				<<if $PC.balls >= 3>>
-- 
GitLab