diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index 7e3de01d3905a756330540435cdf886c4184987a..c4c06321702077b41ba4270cf1b90f8780add87f 100644
--- a/src/SecExp/attackOptions.tw
+++ b/src/SecExp/attackOptions.tw
@@ -57,22 +57,22 @@
The ominous message dominates the screens of your office, <<print $assistantName>> quickly gathers all information available to prepare for battle.
<<if $attackType == "raiders">>
<<if $recon >= 1>>
- A massive, disorganized horde of raiders is coming to your city. It seems a warlord of the wastelands massed enough men to try and obtain a slice of territory of his own, if he's not defeated there won't be a tomorrow for the arcology.
+ A massive, disorganized horde of raiders is coming to your city. It seems a warlord of the wastelands amassed enough men to try and obtain a slice of territory of his own; if he's not defeated there won't be a tomorrow for the arcology.
Fortunately you knew of their coming, thanks to your recon systems.
<<else>>
- Some of your citizens saw the massive, disorganized horde of raiders coming towards the city and quickly reported it. It seems a warlord of the wastelands massed enough men to try and obtain a slice of territory of his own, if he's not defeated there won't be a tomorrow for the arcology.
+ Some of your citizens saw the massive, disorganized horde of raiders coming towards the city and quickly reported it. It seems a warlord of the wastelands amassed enough men to try and obtain a slice of territory of his own; if he's not defeated there won't be a tomorrow for the arcology.
<</if>>
<br>
Raiders are roaming gangs of bandits, preying on the vulnerable supply lines of free cities and old world nations. They are rarely equipped with decent armaments and even more rarely have any formal military training, but they make up for that with high mobility and numbers.
<<elseif $attackType == "free city">>
<<if $recon >= 1>>
- A massive, menacing column of slavers and hired mercenaries is coming to your city. The quantity of money invested in this assault is staggering, it seems you made some very powerful enemies. If they're not defeated your story will end this day.
+ A massive, menacing column of slavers and hired mercenaries is coming to your city. The quantity of money invested in this assault is staggering; it seems you made some very powerful enemies. If they're not defeated your story will end this day.
Fortunately you knew of their coming, thanks to your recon systems.
<<else>>
- Some of your citizens saw the massive, menacing column of slavers and hired mercenaries and rushed to your office to bring the grim news. The quantity of money invested in this assault is staggering, it seems you made some very powerful enemies. If they're not defeated your story will end this day.
+ Some of your citizens saw the massive, menacing column of slavers and hired mercenaries and rushed to your office to bring the grim news. The quantity of money invested in this assault is staggering; it seems you made some very powerful enemies. If they're not defeated your story will end this day.
<</if>>
<br>
- Free City expeditions are usually composed of mercenaries hired to take down sensible supplies or infrastructure in order to damage the enemies of their contractor. They have on average good equipment and training, together with decent mobility, making them a formidable force. Their biggest weakness however is their low numbers.
+ Free City expeditions are usually composed of mercenaries hired to take down sensible supplies or infrastructure in order to damage the enemies of their contractor. They have, on average, good equipment and training, together with decent mobility, making them a formidable force. Their biggest weakness, however, is their low numbers.
<<elseif $attackType == "freedom fighters">>
<<if $recon >= 1>>
A massive, dangerous army of guerrillas is gathering just outside the arcology. A huge ocean of fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire once and for all. And this time they won't stop until your body is burnt to a crisp.
@@ -81,7 +81,7 @@
Some of your citizens saw the massive, dangerous army of guerrillas is gathering just outside the arcology. A huge ocean of fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire once and for all. And this time they won't stop until your body is burnt to a crisp.
<</if>>
<br>
- Freedom Fighters are groups of individuals fighting to rid the planet of "evils" such as the free cities and their way of life. Lacking the strength to assault one directly they fight guerrilla style slowly starving to death their enemies. They are rarely well equipped, but with good training and mobility they are not a threat that can be taken lightly.
+ Freedom Fighters are groups of individuals fighting to rid the planet of "evils" such as the Free Cities and their way of life. Lacking the strength to assault one directly, they fight guerrilla style, slowly starving to death their enemies. They are rarely well equipped, but with good training and mobility they are not a threat that can be taken lightly.
<<elseif $attackType == "old world">>
<<if $recon >= 1>>
A massive, disciplined old world army is approaching the confines of your arcology. It seems one of the nations of the old world is determined to put your arcology to rest once and for all or die trying.
@@ -98,22 +98,22 @@
<br>
<<if $attackType == "raiders">>
<<if $recon >= 1>>
- A massive, disorganized horde of raiders is coming to your city. It seems a warlord of the wastelands massed enough men to try and obtain a slice of territory of his own, if he's not defeated there won't be a tomorrow for the arcology.
+ A massive, disorganized horde of raiders is coming to your city. It seems a warlord of the wastelands amassed enough men to try and obtain a slice of territory of his own; if he's not defeated there won't be a tomorrow for the arcology.
Fortunately you knew of their coming, thanks to your recon systems.
<<else>>
- Some of your citizens saw the massive, disorganized horde of raiders coming towards the city and quickly reported it. It seems a warlord of the wastelands massed enough men to try and obtain a slice of territory of his own, if he's not defeated there won't be a tomorrow for the arcology.
+ Some of your citizens saw the massive, disorganized horde of raiders coming towards the city and quickly reported it. It seems a warlord of the wastelands amassed enough men to try and obtain a slice of territory of his own; if he's not defeated there won't be a tomorrow for the arcology.
<</if>>
<br>
Raiders are roaming gangs of bandits, preying on the vulnerable supply lines of free cities and old world nations. They are rarely equipped with decent armaments and even more rarely have any formal military training, but they make up for that with high mobility and numbers.
<<elseif $attackType == "free city">>
<<if $recon >= 1>>
- A massive, menacing column of slavers and hired mercenaries is coming to your city. The quantity of money invested in this assault is staggering, it seems you made some very powerful enemies. If they're not defeated your story will end this day.
+ A massive, menacing column of slavers and hired mercenaries is coming to your city. The quantity of money invested in this assault is staggering; it seems you made some very powerful enemies. If they're not defeated your story will end this day.
Fortunately you knew of their coming, thanks to your recon systems.
<<else>>
- Some of your citizens saw the massive, menacing column of slavers and hired mercenaries and rushed to your office to bring the grim news. The quantity of money invested in this assault is staggering, it seems you made some very powerful enemies. If they're not defeated your story will end this day.
+ Some of your citizens saw the massive, menacing column of slavers and hired mercenaries and rushed to your office to bring the grim news. The quantity of money invested in this assault is staggering; it seems you made some very powerful enemies. If they're not defeated your story will end this day.
<</if>>
<br>
- Free City expeditions are usually composed of mercenaries hired to take down sensible supplies or infrastructure in order to damage the enemies of their contractor. They have on average good equipment and training, together with decent mobility, making them a formidable force. Their biggest weakness however is their relatively low numbers.
+ Free City expeditions are usually composed of mercenaries hired to take down sensible supplies or infrastructure in order to damage the enemies of their contractor. They have, on average, good equipment and training, together with decent mobility, making them a formidable force. Their biggest weakness, however, is their relatively low numbers.
<<elseif $attackType == "freedom fighters">>
<<if $recon >= 1>>
A massive, dangerous army of guerrillas is gathering just outside the arcology. A huge ocean of fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire once and for all. And this time they won't stop until your body is burnt to a crisp.
@@ -122,7 +122,7 @@
Some of your citizens saw the massive, dangerous army of guerrillas is gathering just outside the arcology. A huge ocean of fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire once and for all. And this time they won't stop until your body is burnt to a crisp.
<</if>>
<br>
- Freedom Fighters are groups of individuals fighting to rid the planet of "evils" such as the free cities and their way of life. Lacking the strength to assault one directly they fight guerrilla style slowly starving to death their enemies. They are rarely well equipped, but with good training and mobility they are not a threat that can be taken lightly.
+ Freedom Fighters are groups of individuals fighting to rid the planet of "evils" such as the free cities and their way of life. Lacking the strength to assault one directly, they fight guerrilla style, slowly starving to death their enemies. They are rarely well equipped, but with good training and mobility they are not a threat that can be taken lightly.
<<elseif $attackType == "old world">>
<<if $recon >= 1>>
A massive, disciplined old world army is approaching the confines of your arcology. It seems one of the nations of the old world is determined to put your arcology to rest once and for all or die trying.
diff --git a/src/cheats/PCCheatMenu.tw b/src/cheats/PCCheatMenu.tw
index 71f5e5c7a8d2cfe4065ae148e820781dc2f20c03..4f92d8b66370701ec2b3b19d60c2788f63fd1756 100644
--- a/src/cheats/PCCheatMenu.tw
+++ b/src/cheats/PCCheatMenu.tw
@@ -71,8 +71,6 @@ Sex: ''$tempSlave.genes''
<br>''Boobs Implant'': <<textbox "$tempSlave.boobsImplant" $tempSlave.boobsImplant>> //do you have breast implants - 0: no, 1: yes//
<br>''Lactation'': <<textbox "$tempSlave.lactation" $tempSlave.lactation>> //are you lactating - 0: no, 1: yes//
<br>
-<br>''Belly'': <<textbox "$tempSlave.belly" $tempSlave.belly>>
-<br>
<br>''Butt Size'': <<textbox "$tempSlave.butt" $tempSlave.butt>> //0: normal, 1: big, 2: huge, 3: enormous//
<br>''Butt Implant'': <<textbox "$tempSlave.buttImplant" $tempSlave.buttImplant>> //do you have butt implants - 0: no, 1: yes//
<br>
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index b69371553a42fde3f8bbae7bd32e682ebbb53843..ebb7bddb9c94fb9d3a3f9e5f59f977a5810654bb 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -30,7 +30,7 @@ window.isSexuallyPure = function(slave) {
if (!slave) {
return null;
}
- return (slave.vagina < 1 && slave.anus < 1 && !slave.counter.anal && !slave.counter.vaginal && !slave.counter.oral && !slave.counter.mammary && !slave.counter.penetrative);
+ return (slave.vagina < 1 && slave.anus < 1 && !slave.counter.anal && !slave.counter.vaginal && !slave.counter.oral && !slave.counter.mammary && !slave.counter.penetrative && !slave.counter.publicUse);
};
if (typeof interpolate === "undefined") {
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 78eddb9e752b8e8508253c733790ddaa3c77fc04..43f34716b14f705a47f458f054d7e953459d8734 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -164,7 +164,7 @@
<<if $masterSuiteSlaves > 1 && $Concubine != 0>>
<<setLocalPronouns $Concubine 2>>
You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has @@.pink;$Concubine.slaveName@@ eager for some attention from _his2 own arcology owner. Of course, the same could be said for the other eager slaves living in your bedroom, and the situation quickly devolves into a lust-filled orgy.
- <<elseif $masterSuiteSlaves == 1 && $Concubine != 0>>
+ <<elseif $masterSuiteSlaves > 0 && $Concubine != 0>>
<<setLocalPronouns $Concubine 2>>
You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has @@.pink;$Concubine.slaveName@@ eager for some attention from _his2 own arcology owner. Of course, the same could be said for the other eager slave living in your bedroom, and the situation quickly devolves into a lust-filled threesome.
<<elseif $masterSuiteSlaves == 0 && $Concubine != 0>>
@@ -172,7 +172,7 @@
You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has @@.pink;$Concubine.slaveName@@ eager for some attention from _his2 own arcology owner. You've trained _him2 well, and _he2 knows exactly how to please you. You spend the rest of the evening doing something a lot more fun than watching reality TV.
<<elseif $masterSuiteSlaves > 1 && $Concubine == 0>>
You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has the pleasure slaves in your bed eager for some attention from their own arcology owner. You spend the rest of the evening doing something a lot more fun than watching reality TV.
- <<else>>
+ <<elseif $masterSuiteSlaves > 0>>
You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has the pleasure slave in your bed eager for some attention from her own arcology owner. You spend the rest of the evening doing something a lot more fun than watching reality TV.
<</if>>
<<case 2>>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 83059201cb5105fe94141f751a4291a65c98c0d0..a801d627cdcfee91db08ee851eecbdd5bf715f2c 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -310,7 +310,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
$HeadGirl.slaveName cuts the cords, swaddles your children, and hands you @@.lime;your new <<print pregNumberName(_curBabies, 2)>>.@@
<</if>>
<<elseif _concubinePresent == 1>>
- $Concubine.slaveName alternates between calming your nerves and driving your to orgasm. It works fairly well, as your child rapidly enters the world alongside a particularly powerful climax. You reach down and draw @@.lime;your new baby <<if _gender == "XX">>girl<<else>>boy<</if>>@@ into your arms, while $Concubine.slaveName shifts to eagerly "clean" your crotch with _his2 tongue.<<if $PC.pregType > 1>> _His2 over-stimulation of you quickly has _him2 licking the crowning head of your second child. _He2 diligently works you over until all of your children are born, making sure you are thoroughly exhausted; both from the birth and from _his2 ministrations.<<if canPenetrate($Concubine) && canImpreg($PC, $Concubine)>> $Concubine.slaveName eyes your spread pussy hungrily as _his2 erection bobs with anticipation. But you're too tired right now and _he2 realizes it.<</if>> _He2 helps gather your child<<if $PC.pregType > 1>>ren<</if>> to<<if $Concubine.lactation > 0>> _his2 and <</if>> your breasts with the hope that you'll reward _him2 when you recover.<</if>>
+ $Concubine.slaveName alternates between calming your nerves and driving your to orgasm. It works fairly well, as your child rapidly enters the world alongside a particularly powerful climax. You reach down and draw @@.lime;your new baby <<if _gender == "XX">>girl<<else>>boy<</if>>@@ into your arms, while $Concubine.slaveName shifts to eagerly "clean" your crotch with _his2 tongue.<<if $PC.pregType > 1>> _His2 over-stimulation of you quickly has _him2 licking the crowning head of your second child. _He2 diligently works you over until all of your children are born, making sure you are thoroughly exhausted; both from the birth and from _his2 ministrations.<<if canPenetrate($Concubine) && canImpreg($PC, $Concubine)>> $Concubine.slaveName <<if canSee($Concubine)>>eyes<<else>>faces<</if>> your spread pussy hungrily as _his2 erection bobs with anticipation. But you're too tired right now and _he2 realizes it.<</if>> _He2 helps gather your child<<if $PC.pregType > 1>>ren<</if>> to<<if $Concubine.lactation > 0>> _his2 and <</if>> your breasts with the hope that you'll reward _him2 when you recover.<</if>>
<<else>>
You keep pushing and pushing, your child slowly working its way from your body. With the last of your strength, you bear down, freeing your child from your body at last. Panting, you gather @@.lime;your new baby <<if _gender == "XX">>girl<<else>>boy<</if>>@@ <<if $PC.pregType > 1>>as another contraction ushers your next child into your birth canal<<else>>and drift off into a much deserved rest<</if>>.
<<if $PC.pregType >= 2>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index ac50590fbd30e377797117aff3d76ba6b56d8406..ade48c4b8a9869e774692ded4075fed0928ecfe8 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2879,14 +2879,10 @@ Setting missing slave variables:
<</switch>>
<<switch _Slave.origSkin>>
-<<case "red dyed">>
- <<set _Slave.origSkin = "dyed red">>
-<<case "green dyed">>
- <<set _Slave.origSkin = "dyed green">>
-<<case "blue dyed">>
- <<set _Slave.origSkin = "dyed blue">>
-<<case "tanned">>
+<<case "blue dyed" "dyed blue" "dyed green" "dyed red" "green dyed" "red dyed">>
<<set _Slave.origSkin = randomRaceSkin(_Slave.origRace)>>
+<<case "tanned">>
+ <<set _Slave.origSkin = "tan">>
<<case "lightened">>
<<set _Slave.origSkin = "light">>
<<case "bronzed">>