From 2dd6f87e9df6b35d2df2bbb6a563d9896cee9f0d Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 10 Mar 2019 16:08:09 -0500
Subject: [PATCH] OYea

---
 src/uncategorized/RESS.tw                 |   2 +-
 src/uncategorized/cellblock.tw            |   2 +-
 src/uncategorized/neighborsDevelopment.tw | 136 +++++++++++-----------
 3 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index ab329e53aca..bf491aad3cb 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -17359,7 +17359,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 	<<for _ress = 0; _ress < _newSlaves.length; _ress++>>
 		<<run newSlave(_newSlaves[_ress])>> /* skip New Slave Intro */
 		<<run cashX(-8333, "slaveTransfer", _newSlaves[_ress])>>
-	<</if>>
+	<</for>>
 	You seize a tablet and hurry out of your office, working furiously and using every feature of $assistantName to the utmost. These bitches have offended you, and you quickly frame the structure of an appropriate revenge. By the time you get to where $activeSlave.slaveName is still being heckled by spoiled, drunken harpies, everyone else present in that arcology hall has mysteriously received urgent messages and gone elsewhere. $activeSlave.slaveName <<if canSee($activeSlave)>>sees you approach, and stares at you<<else>>recognizes your dominant footsteps approaching, and turns to face you<</if>>, $his sudden intense look alerting your vile little guests to your presence. One of them attempts to frame an insult for the interloper, but one of _his2 friends pokes _him2 in the side and whispers something in _his2 ear and _he2 goes silent, staring at you with wide eyes.
 	<<if $PC.title != 1>>_He2 then winces, visibly realizing that you're likely aware that _he2 called $activeSlave.slaveName's owner $his Master. Somehow, the mistake seems important to _him2 now that you're standing here, effortlessly dominating the space for all your femininity.<</if>>
 	<br><br>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index ebf0a612c18..edcfb43724c 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -49,7 +49,7 @@ $cellblockNameCaps
 <<case "Maturity Preferentialist">>
 	is subtly designed to make very clear to its inmates that they are sex objects. Many screens showing pornography make it clear to the maturest slave here that they're still an object of lust, and will be used to slake others' pleasure.
 <<case "Youth Preferentialist">>
-	is subtly designed to make the breadth of sex acts performed in the arcology clear to its inmates. A cacophony of pornography makes clear to the most innocent inmate that her pussy is a fuck hole, her mouth is a fuck hole, her anus is a fuck hole, and, in fact, all three can be fuck holes at once.
+	is subtly designed to make the breadth of sex acts performed in the arcology clear to its inmates. A cacophony of pornography makes clear to the most innocent inmate that <<if $seeDicks != 100>>her pussy is a fuck hole, <</if>>her mouth is a fuck hole, her anus is a fuck hole, and, in fact, <<if $seeDicks != 100>>all three<<else>>both<</if>> can be fuck holes at once.
 <<case "Body Purist">>
 	requires its inmates to drink as much filtered water as they can, all the time. This sounds like a petty thing, but most inmates are very aware that they're being flushed out. Cleaned. It is an oddly menacing thought.
 <<case "Slimness Enthusiast">>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 960d9ef25fb..56b4fbc6edc 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -1348,98 +1348,98 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
 	<</if>>
 	<</for>>
 	<<if $arcologies[$i].direction != 0>>
-	<<if $arcologies[$i].FSPastoralist >= $FSLockinLevel>>
-		<<set $arcologies[$i].influenceBonus += $arcologies[$i].FSPastoralist - $FSLockinLevel>>
-		<<set $arcologies[$i].FSPastoralist = $FSLockinLevel>>
-		<<set $toSearch = $arcologies[$i].name>>
-		<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
-		Pastoralism has reached stability and acceptance there. The arcology has been renamed
-		<<set $arcologies[$i].name = setup.ArcologyNamesPastoralist.random()>>
-		'' $arcologies[$i].name'' to mark the occasion.
+		<<if $arcologies[$i].FSPastoralist >= $FSLockinLevel>>
+			<<set $arcologies[$i].influenceBonus += $arcologies[$i].FSPastoralist - $FSLockinLevel>>
+			<<set $arcologies[$i].FSPastoralist = $FSLockinLevel>>
+			<<set $toSearch = $arcologies[$i].name>>
+			<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
+				Pastoralism has reached stability and acceptance there. The arcology has been renamed
+				<<set $arcologies[$i].name = setup.ArcologyNamesPastoralist.random()>>
+				'' $arcologies[$i].name'' to mark the occasion.
+			<</if>>
+		<<elseif $arcologies[$i].FSPastoralist < 0>>
+			$arcologies[$i].name @@.cyan;has given up@@ on Pastoralism.
+			<<set $arcologies[$i].FSPastoralist = "unset">>
 		<</if>>
-	<<elseif $arcologies[$i].FSPastoralist < 0>>
-		$arcologies[$i].name @@.cyan;has given up@@ on Pastoralism.
-		<<set $arcologies[$i].FSPastoralist = "unset">>
-	<</if>>
 	<</if>>
 	<<if $arcologies[$i].FSPastoralist != "unset">>
-	<<if $corpIncorporated == 1>>
-	<<if $corpSpecInjection == 5>>
-		It's an @@.lightgreen;excellent market@@ for your corporation's world-class milk producers, improving sales and helping social progress.
-		<<set $arcologies[$i].FSPastoralist += 2>>
-		<<set $corpNeighborBonus += _corpBonus*2>>
-	<<elseif $corpSpecMilk > 0>>
-		It's an @@.lightgreen;excellent market@@ for your corporation's world-class milk producers, improving sales and helping social progress.
-		<<set $arcologies[$i].FSPastoralist += 2>>
-		<<set $corpNeighborBonus += _corpBonus*2>>
-	<</if>>
-	<</if>>
+		<<if $corpIncorporated == 1>>
+			<<if $corpSpecInjection == 5>>
+				It's an @@.lightgreen;excellent market@@ for your corporation's world-class milk producers, improving sales and helping social progress.
+				<<set $arcologies[$i].FSPastoralist += 2>>
+				<<set $corpNeighborBonus += _corpBonus*2>>
+			<<elseif $corpSpecMilk > 0>>
+				It's an @@.lightgreen;excellent market@@ for your corporation's world-class milk producers, improving sales and helping social progress.
+				<<set $arcologies[$i].FSPastoralist += 2>>
+				<<set $corpNeighborBonus += _corpBonus*2>>
+			<</if>>
+		<</if>>
 	<</if>>
 <<elseif $arcologies[$i].FSCummunism != "unset">>
 	<<set _societiesAdopted += 1>>
 	<<if $arcologies[$i].direction != 0>>
-	<<set $arcologies[$i].FSCummunism += $efficiency>>
+		<<set $arcologies[$i].FSCummunism += $efficiency>>
 	<</if>>
 	<<for $j = 0; $j < $arcologies.length; $j++>>
-	<<if $arcologies[$i].direction != $arcologies[$j].direction>>
-		<<if $arcologies[$j].FSCummunism > $arcologies[$i].FSCummunism + _FSCrossThresh>>
-		<<if $showNeighborDetails != 0>>Cummunism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
-		<<set $arcologies[$i].FSCummunism += 1>>
-		<<elseif $arcologies[$j].FSPastoralist > $arcologies[$i].FSCummunism + _FSCrossThresh>>
-		<<if $showNeighborDetails != 0>>Development of Cummunism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Pastoralist society.<</if>>
-		<<set $arcologies[$i].FSCummunism -= 1>>
+		<<if $arcologies[$i].direction != $arcologies[$j].direction>>
+			<<if $arcologies[$j].FSCummunism > $arcologies[$i].FSCummunism + _FSCrossThresh>>
+				<<if $showNeighborDetails != 0>>Cummunism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
+				<<set $arcologies[$i].FSCummunism += 1>>
+			<<elseif $arcologies[$j].FSPastoralist > $arcologies[$i].FSCummunism + _FSCrossThresh>>
+				<<if $showNeighborDetails != 0>>Development of Cummunism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Pastoralist society.<</if>>
+				<<set $arcologies[$i].FSCummunism -= 1>>
+			<</if>>
 		<</if>>
-	<</if>>
 	<</for>>
 	<<if $arcologies[$i].direction != 0>>
-	<<if $arcologies[$i].FSCummunism >= $FSLockinLevel>>
-		<<set $arcologies[$i].influenceBonus += $arcologies[$i].FSCummunism - $FSLockinLevel>>
-		<<set $arcologies[$i].FSCummunism = $FSLockinLevel>>
-		<<set $toSearch = $arcologies[$i].name>>
-		<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
-		Cummunism has reached stability and acceptance there. The arcology has been renamed
-		<<set $arcologies[$i].name = setup.ArcologyNamesCummunism.random()>>
-		'' $arcologies[$i].name'' to mark the occasion.
+		<<if $arcologies[$i].FSCummunism >= $FSLockinLevel>>
+			<<set $arcologies[$i].influenceBonus += $arcologies[$i].FSCummunism - $FSLockinLevel>>
+			<<set $arcologies[$i].FSCummunism = $FSLockinLevel>>
+			<<set $toSearch = $arcologies[$i].name>>
+			<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
+				Cummunism has reached stability and acceptance there. The arcology has been renamed
+				<<set $arcologies[$i].name = setup.ArcologyNamesCummunism.random()>>
+				'' $arcologies[$i].name'' to mark the occasion.
+			<</if>>
+		<<elseif $arcologies[$i].FSCummunism < 0>>
+			$arcologies[$i].name @@.cyan;has given up@@ on Cummunism.
+			<<set $arcologies[$i].FSCummunism = "unset">>
 		<</if>>
-	<<elseif $arcologies[$i].FSCummunism < 0>>
-		$arcologies[$i].name @@.cyan;has given up@@ on Cummunism.
-		<<set $arcologies[$i].FSCummunism = "unset">>
-	<</if>>
 	<</if>>
 	<<if $arcologies[$i].FSCummunism != "unset">>
-	<<if $corpIncorporated == 1>>
-	<<if $corpSpecInjection == 5>>
-		It's an @@.lightgreen;excellent market@@ for your corporation's world-class cum producers, improving sales and helping social progress.
-		<<set $arcologies[$i].FSCummunism += 2>>
-		<<set $corpNeighborBonus += _corpBonus*2>>
-	<<elseif $corpSpecHormones == 2>>
-		It's a @@.lightgreen;good market@@ for your corporation's masculinized slaves, improving sales and helping social progress.
-		<<set $arcologies[$i].FSCummunism += 1>>
-		<<set $corpNeighborBonus += _corpBonus>>
-	<<elseif $corpSpecDick == 1 && $corpSpecBalls == 1>>
-		It's a @@.lightgreen;good market@@ for your corporation's slaves standard dicks and balls, improving sales and helping social progress.
-		<<set $arcologies[$i].FSCummunism += 1>>
-		<<set $corpNeighborBonus += _corpBonus>>
-	<</if>>
-	<</if>>
+		<<if $corpIncorporated == 1>>
+			<<if $corpSpecInjection == 5>>
+				It's an @@.lightgreen;excellent market@@ for your corporation's world-class cum producers, improving sales and helping social progress.
+				<<set $arcologies[$i].FSCummunism += 2>>
+				<<set $corpNeighborBonus += _corpBonus*2>>
+			<<elseif $corpSpecHormones == 2>>
+				It's a @@.lightgreen;good market@@ for your corporation's masculinized slaves, improving sales and helping social progress.
+				<<set $arcologies[$i].FSCummunism += 1>>
+				<<set $corpNeighborBonus += _corpBonus>>
+			<<elseif $corpSpecDick == 1 && $corpSpecBalls == 1>>
+				It's a @@.lightgreen;good market@@ for your corporation's slaves standard dicks and balls, improving sales and helping social progress.
+				<<set $arcologies[$i].FSCummunism += 1>>
+				<<set $corpNeighborBonus += _corpBonus>>
+			<</if>>
+		<</if>>
 	<</if>>
 <</if>>
 
 <<if $arcologies[$i].FSPhysicalIdealist != "unset">>
 	<<set _societiesAdopted += 1>>
 	<<if $arcologies[$i].direction != 0>>
-	<<set $arcologies[$i].FSPhysicalIdealist += $efficiency>>
+		<<set $arcologies[$i].FSPhysicalIdealist += $efficiency>>
 	<</if>>
 	<<for $j = 0; $j < $arcologies.length; $j++>>
-	<<if $arcologies[$i].direction != $arcologies[$j].direction>>
-		<<if $arcologies[$j].FSPhysicalIdealist > $arcologies[$i].FSPhysicalIdealist + _FSCrossThresh>>
-		<<if $showNeighborDetails != 0>>Physical Idealism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
-		<<set $arcologies[$i].FSPhysicalIdealist += 1>>
-		<<elseif $arcologies[$j].FSHedonisticDecadence > $arcologies[$i].FSPhysicalIdealist + _FSCrossThresh>>
-		<<if $showNeighborDetails != 0>>Development of Physical Idealism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Decadent Hedonism society.<</if>>
-		<<set $arcologies[$i].FSPhysicalIdealist -= 1>>
+		<<if $arcologies[$i].direction != $arcologies[$j].direction>>
+			<<if $arcologies[$j].FSPhysicalIdealist > $arcologies[$i].FSPhysicalIdealist + _FSCrossThresh>>
+				<<if $showNeighborDetails != 0>>Physical Idealism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
+				<<set $arcologies[$i].FSPhysicalIdealist += 1>>
+			<<elseif $arcologies[$j].FSHedonisticDecadence > $arcologies[$i].FSPhysicalIdealist + _FSCrossThresh>>
+				<<if $showNeighborDetails != 0>>Development of Physical Idealism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Decadent Hedonism society.<</if>>
+				<<set $arcologies[$i].FSPhysicalIdealist -= 1>>
+			<</if>>
 		<</if>>
-	<</if>>
 	<</for>>
 	<<if $arcologies[$i].direction != 0>>
 	<<if $arcologies[$i].FSPhysicalIdealist >= $FSLockinLevel>>
-- 
GitLab