diff --git a/Changelog.txt b/Changelog.txt
index 13506888fef4d7b80dafeb01bf6bc8f926bb3736..a7ad3912e1cd8cebfd89cc6715b6d5997ca61269 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -13,7 +13,7 @@ Pregmod
0.10.7.1-2.4.x
05/25/2019
-
+
0
-unified cybermod with vanilla
-major pronoun work (99.9% completion)
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 20e7bfb11e0c4af4c20b64cd9068a60ec35ca9f8..7b199d5573f4f3fb26645669e7b92bb320d80437 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -1174,7 +1174,7 @@ $He is
<<= App.Desc.brand($activeChild, "right lower arm")>>
<<= App.Desc.brand($activeChild, "right hand")>>
<<= App.Desc.brand($activeChild, "right wrist")>>
-
+
/* Legs */
/*buttock and thigh are displayed in descriptionWidgetsTattoos, if you can believe it */
<<= App.Desc.brand($activeChild), "left calf")>>
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index c690428cf13693d28af870f7280fb5bb639d88e6..506d6e3ed6b0663524a3eefa71e8b9115e70dab7 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1761,9 +1761,6 @@ window.pronounReplacer = function(slavetext) {
case "Many people remember her from the slavegirl races where she slammed her cock into countless runners' pussies after catching them.":
slavetext = "Many people remember $him from the slavegirl races where $he slammed $his cock into countless runners' pussies after catching them.";
break;
- case "Once she was an arcology security officer, lured to aphrodisiacs addiction and feminized by her boss (and former wife), to whom she was sold as a slave to satisfy her spousal maintenance after divorce.":
- slavetext = "Once $he was an arcology security officer, lured to aphrodisiacs addiction and feminized by $his boss (and former wife), to whom $he was sold as a slave to satisfy her spousal maintenance after divorce.";
- break;
case "She asked to be enslaved in the hope you'd treat a fellow woman well.":
slavetext = "$He asked to be enslaved in the hope you'd treat a fellow woman well.";
break;
@@ -1884,9 +1881,6 @@ window.pronounReplacer = function(slavetext) {
case "She sold herself to you in the hope of someday bearing children.":
slavetext = "$He sold $himself to you in the hope of someday bearing children.";
break;
- case "She submitted to enslavement as her only way to obtain surgery to transform her into a woman.":
- slavetext = "$He submitted to enslavement as $his only way to obtain surgery to transform $him into a woman.";
- break;
case "She submitted to enslavement for a better chance at survival than she had as a migrant.":
slavetext = "$He submitted to enslavement for a better chance at survival than $he had as a migrant.";
break;
@@ -1932,15 +1926,9 @@ window.pronounReplacer = function(slavetext) {
case "She was once the princess of an old world kingdom up until her loose habits caught up with her and she was exiled.":
slavetext = "$He was once the princess of an old world kingdom up until $his loose habits caught up with $him and $he was exiled.";
break;
- case "She was once the young trophy husband of a powerful woman in the old world, but she sold her into slavery in revenge for her infidelities.":
- slavetext = "$He was once the young trophy husband of a powerful woman in the old world, but she sold $him into slavery in revenge for $his infidelities.";
- break;
case "She was once the young trophy wife of a powerful man in the old world, but he sold her into slavery in revenge for her infidelity.":
slavetext = "$He was once the young trophy wife of a powerful man in the old world, but he sold $him into slavery in revenge for $his infidelity.";
break;
- case "She was raised as a girl despite her gargantuan dick to be a truly unique slave.":
- slavetext = "$He was raised as a girl despite $his gargantuan dick to be a truly unique slave.";
- break;
case "She was raised in a radical slave school that treated her from a very young age, up to the point that she never experienced male puberty.":
slavetext = "$He was raised in a radical slave school that treated $him from a very young age, up to the point that $he never experienced male puberty.";
break;
@@ -2079,15 +2067,9 @@ window.pronounReplacer = function(slavetext) {
case "You sentenced her to enslavement as a punishment for dereliction of her duty to you as a mercenary and for theft.":
slavetext = "You sentenced $him to enslavement as a punishment for dereliction of $his duty to you as a mercenary and for theft.";
break;
- case "You sentenced her to enslavement as a punishment for rape of a free woman.":
- slavetext = "You sentenced $him to enslavement as a punishment for the rape of a free woman.";
- break;
case "You sentenced her to enslavement as a punishment for smuggling slaves within her body.":
slavetext = "You sentenced $him to enslavement as a punishment for smuggling slaves within $his body.";
break;
- case "You sentenced her to enslavement for the attempted rape of a free woman.":
- slavetext = "You sentenced $him to enslavement for the attempted rape of a free woman.";
- break;
case "You stormed her arcology, killed her guards and enslaved her in revenge for insulting you at a dinner party.":
slavetext = "You stormed $his arcology, killed $his guards, and enslaved $him in revenge for insulting you at a dinner party.";
break;
@@ -2186,7 +2168,7 @@ window.pronounReplacer = function(slavetext) {
slavetext = slavetext.replace(/\bHer\b/g, "$His");
slavetext = slavetext.replace(/\b girl\b/g, " $girl");
slavetext = slavetext.replace(/\b woman\b/g, " $woman");
- slavetext = slavetext.replace(/\${2,}/g, ''); /* requied since $girl becomes $$$$$$$$girl over time, oops. */
+ slavetext = slavetext.replace(/\${2,}/g, ''); /* required since $girl becomes $$$$$$$$girl over time, oops. */
break;
default:
if ((slavetext.includes("was serving the public")) || (slavetext.includes("You bought her from"))) {
@@ -2194,6 +2176,18 @@ window.pronounReplacer = function(slavetext) {
} else if ((slavetext.includes("Your lurcher")) || (slavetext.includes("while raiding"))) {
slavetext = slavetext.replace(/\bher\b/g, "$him");
slavetext = slavetext.replace(/\bshe\b/g, "$he");
+ } else if (slavetext.includes("young trophy husband")) {
+ slavetext = "$He was once the young trophy husband of a powerful woman in the old world, but she sold $him into slavery in revenge for $his infidelities.";
+ } else if (slavetext.includes("gargantuan dick")) {
+ slavetext = "$He was raised as a girl despite $his gargantuan dick to be a truly unique slave.";
+ } else if (slavetext.includes("attempted rape of a free woman")) {
+ slavetext = "You sentenced $him to enslavement for the attempted rape of a free woman.";
+ } else if (slavetext.includes("rape of a free woman")) {
+ slavetext = "You sentenced $him to enslavement as a punishment for the rape of a free woman.";
+ } else if (slavetext.includes("obtain surgery to transform")) {
+ slavetext = "$He submitted to enslavement as $his only way to obtain surgery to transform $him into a woman.";
+ } else if (slavetext.includes("spousal maintenance")) {
+ slavetext = "Once $he was an arcology security officer, lured to aphrodisiacs addiction and feminized by $his boss (and former wife), to whom $he was sold as a slave to satisfy her spousal maintenance after divorce.";
} else {
slavetext = slavetext.replace(/\bherself\b/g, "$himself");
slavetext = slavetext.replace(/\bHerself\b/g, "$Himself");
@@ -2203,7 +2197,7 @@ window.pronounReplacer = function(slavetext) {
slavetext = slavetext.replace(/\bHer\b/g, "$His");
slavetext = slavetext.replace(/\b girl\b/g, " $girl");
slavetext = slavetext.replace(/\b woman\b/g, " $woman");
- slavetext = slavetext.replace(/\${2,}/g, ''); /* requied since $girl becomes $$$$$$$$girl over time, oops. */
+ slavetext = slavetext.replace(/\${2,}/g, ''); /* required since $girl becomes $$$$$$$$girl over time, oops. */
}
break;
}
diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw
index c1983ff0a0aeb56c249843fa061db24b8ea22072..10955d2cd05c81cedc1db7c7b5b7a3c8c9f4f491 100644
--- a/src/npc/uploadSlave.tw
+++ b/src/npc/uploadSlave.tw
@@ -137,7 +137,7 @@ makeup: $activeSlave.makeup,
nails: $activeSlave.nails,
brand: <<if (!jQuery.isEmptyObject($activeSlave.brand))>>0,<<else>>
<<for _brandName, _brand range $activeSlave.brand>>
- _brandName: _brand,
+ _brandName: _brand,
<</for>>
<</if>>
earPiercing: $activeSlave.earPiercing,
diff --git a/src/pregmod/forceFeeding.tw b/src/pregmod/forceFeeding.tw
index 7f215aae01d6e498a9b72123d3c394650f8d2d7b..c79350e87b7130cc7eab60ebda2c916feb2c369f 100644
--- a/src/pregmod/forceFeeding.tw
+++ b/src/pregmod/forceFeeding.tw
@@ -99,7 +99,7 @@ $He is going to eat it all and you're going to enjoy $him as $he does it.
<</if>>
<</if>>
<<if $activeSlave.fetish == "mindbroken">>
- You reach out and wrap youe arms
+ You reach out and wrap your arms
<</if>>
around $his
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 71d19f334cdbcc30d2a87f9a0b9ae9677fcae1a5..ad228739cc0ba40146b6311872e2e0bf595de894 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -19888,7 +19888,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>>
Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you can feel the slight hesitations as $he takes care to keep $his braces off you.
<</if>>
- You have an enjoyable evening glued to your wallscreen, punctuated by the playful ruffling <<if $activeSlave.hLength > 1>>of $activeSlave.slaveName's $activeSlave.hColor hair<<else>>across $activeSlave.slaveName's scalp<</if>> and the occasional orgasm into $his waiting mouth.
+ You have an enjoyable evening glued to your wallscreen, punctuated by the playful ruffling <<if $activeSlave.hLength > 1>>of $activeSlave.slaveName's $activeSlave.hColor hair<<else>>across $activeSlave.slaveName's scalp<</if>> and the occasional orgasm into $his waiting mouth.
<<if $activeSlave.sexualFlaw !== "hates oral">>
Though your experience was more stimulating than $hers, $activeSlave.slaveName enjoyed @@.hotpink;being used while you enjoyed yourself.@@
<<set $activeSlave.devotion += 4>>
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index e26dbdfaff2149b7feba71f1d73677d10997bf68..bd81e81e61fdd8857d07f0b7dbb0ad701aef05d7 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -645,7 +645,7 @@
<<= App.Desc.brand($activeSlave, "left calf")>>
<<= App.Desc.brand($activeSlave, "left ankle")>>
<<= App.Desc.brand($activeSlave, "left foot")>>
-
+
<<= App.Desc.brand($activeSlave, "right thigh")>>
<<= App.Desc.brand($activeSlave, "right calf")>>
<<= App.Desc.brand($activeSlave, "right ankle")>>