diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index b84135885925d5456c90c96b7db6ea179787aeb7..876212c02681ef5ae7246a1ab783df2f47a63300 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -472,6 +472,17 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<br>
<span id="mass">
+<<if $arcologies[0].FSChattelReligionist != "unset"
+ || $arcologies[0].FSPastoralist != "unset"
+ || $arcologies[0].FSRomanRevivalist != "unset"
+ || $arcologies[0].FSAztecRevivalist != "unset"
+ || $arcologies[0].FSEgyptianRevivalist != "unset"
+ || $arcologies[0].FSEdoRevivalist != "unset"
+ || $arcologies[0].FSDegradationist != "unset"
+ || $arcologies[0].FSPaternalist != "unset">>
+<br>__Names__
+<</if>>
+
<<if $arcologies[0].FSChattelReligionist != "unset">>
<br>
<<link "Give all your slaves devotional names">>
@@ -482,7 +493,6 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<br>Slaves renamed.<br>
<</replace>>
<</link>>
- <br>
<</if>>
<<if $arcologies[0].FSPastoralist != "unset">>
<br>
@@ -496,7 +506,6 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<br>Slaves renamed.<br>
<</replace>>
<</link>>
- <br>
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<br>
@@ -508,7 +517,6 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<br>Slaves renamed.<br>
<</replace>>
<</link>>
- <br>
<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
<br>
<<link "Rename all your slaves according to ancient Aztec custom">>
@@ -519,7 +527,6 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<br>Slaves renamed.<br>
<</replace>>
<</link>>
- <br>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<br>
<<link "Rename all your slaves according to ancient Egyptian custom">>
@@ -530,7 +537,6 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<br>Slaves renamed.<br>
<</replace>>
<</link>>
- <br>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
<br>
<<link "Rename all your slaves according to feudal Japanese custom">>
@@ -541,7 +547,6 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<br>Slaves renamed.<br>
<</replace>>
<</link>>
- <br>
<</if>>
<<if $arcologies[0].FSDegradationist != "unset">>
<br>
@@ -553,7 +558,6 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<br>Slaves renamed.<br>
<</replace>>
<</link>>
- <br>
<</if>>
<<if $arcologies[0].FSPaternalist != "unset">>
<br>
@@ -587,11 +591,12 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<br>Obedient slaves renamed.<br>
<</replace>>
<</link>>
- <br>
<</if>>
</span>
+<br><br>__Future Societies__
+
<<if $arcologies[0].FSSupremacist != "unset">>
<br>''You are pursuing'' $arcologies[0].FSSupremacistRace superiority. //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSSupremacist")>><<if $assistantFSAppearance == "supremacist">><<set $assistantFSAppearance = "default">><</if>><</link>>//<br>
<<FSChangeDecoration "FSSupremacist">>
@@ -650,6 +655,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
+<br>
+
<<if $seePreg != 0>>
<<if $arcologies[0].FSRestart == "unset">>
<<if $arcologies[0].FSRepopulationFocus != "unset">>
@@ -702,6 +709,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
+<br>
+
<<if $seeDicks != 0 || $makeDicks == 1>>
<<if $arcologies[0].FSGenderFundamentalist == "unset">>
<<if $arcologies[0].FSGenderRadicalist != "unset">>
@@ -725,7 +734,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<if $arcologies[0].FSGenderRadicalist == "unset">>
<<if $arcologies[0].FSGenderFundamentalist != "unset">>
- <br>''You are pursuing'' gender traditionalism, including a societal preference for feminine slaves and support for slave pregnancy.
+ <br>''You are pursuing'' gender traditionalism, including a societal preference for feminine slaves<<if $seePreg != 0>> and support for slave pregnancy<</if>>.
//<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSGenderFundamentalist")>><<if $assistantFSAppearance == "gender fundamentalist">><<set $assistantFSAppearance = "default">><</if>><</link>>//<br>
<<FSChangeDecoration "FSGenderFundamentalist" "clothesBoughtBunny">>
<<if $PAPublic == 1>>
@@ -735,13 +744,15 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<<else>>
<<if $FSCredits > 0>>
- <br>''''[[Gender traditionalism|Future Society][$arcologies[0].FSGenderFundamentalist = 4, $FSCredits -= 1]]: a societal preference for feminine slaves and support for slave pregnancy.
+ <br>''''[[Gender traditionalism|Future Society][$arcologies[0].FSGenderFundamentalist = 4, $FSCredits -= 1]]: a societal preference for feminine slaves<<if $seePreg != 0>> and support for slave pregnancy<</if>>.
<<else>>
- /*//''Gender traditionalism'': a societal preference for feminine slaves and support for slave pregnancy.//*/
+ /*//''Gender traditionalism'': a societal preference for feminine slaves<<if $seePreg != 0>> and support for slave pregnancy<</if>>.//*/
<</if>>
<</if>>
<</if>>
+<br>
+
<<if $arcologies[0].FSDegradationist == "unset">>
<<if $arcologies[0].FSPaternalist != "unset">>
<br>''You are pursuing'' a vision of slave improvement, including slaves' health, mental well-being, and education.
@@ -780,6 +791,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
+<br>
+
<<if $arcologies[0].FSTransformationFetishist == "unset">>
<<if $arcologies[0].FSBodyPurist != "unset">>
<br>''You are pursuing'' societal disapproval of implant surgery.
@@ -818,6 +831,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
+<br>
+
<<if $arcologies[0].FSMaturityPreferentialist == "unset">>
<<if $arcologies[0].FSYouthPreferentialist != "unset">>
<br>''You are pursuing'' an accentuated societal preference for younger slaves.
@@ -856,6 +871,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
+<br>
+
<<if $arcologies[0].FSAssetExpansionist == "unset">>
<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
<br>''You are supporting'' enthusiasm for slaves with girlish figures.
@@ -894,6 +911,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
+<br>
+
<<if $arcologies[0].FSPastoralist != "unset">>
<br>''You are pursuing'' societal normalization of slave milking.
//<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSPastoralist")>><<if $assistantFSAppearance == "pastoralist">><<set $assistantFSAppearance = "default">><</if>><</link>>//<br>
@@ -911,6 +930,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
+<br>
+
<<if $arcologies[0].FSHedonisticDecadence == "unset">>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
<br>''You are pursuing'' societal reverence for the idealized human form, including height, health and muscle.
@@ -949,6 +970,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
+<br>
+
<<if $arcologies[0].FSNull == "unset">>
<<if $arcologies[0].FSChattelReligionist != "unset">>
<br>''You are pursuing'' a new strain of religion that emphasizes the slaveholding portions of religious history.
@@ -968,6 +991,88 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
+<<if $arcologies[0].FSChattelReligionist == "unset">>
+ <<if $FSCreditCount == 4>>
+ <<if $arcologies[0].FSNull != "unset">>
+ <br>''You are permitting <<if $arcologies[0].FSNull <= 25>>basic<<elseif $arcologies[0].FSNull <= 50>>considerable<<elseif $arcologies[0].FSNull <= 75>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology.
+ <<if $arcologies[0].FSNull <= 25>>
+ //[[Abandon|Future Society][FutureSocieties.remove("FSNull")]]//
+ <<else>>
+ //[[Withdraw|Future Society][$arcologies[0].FSNull -= 25, $FSCredits += 1]]//
+ <</if>>
+ <<if $FSCredits > 0>>
+ <<if $arcologies[0].FSNull < $FSLockinLevel>>
+ <br> [[Advance|Future Society][$arcologies[0].FSNull += 25, $FSCredits -= 1]]: further commitment to allow your arcology's citizens cultural freedom.
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if $FSCredits > 0>>
+ <br>[[Multiculturalism|Future Society][$arcologies[0].FSNull = 25, $FSCredits -= 1]]: a commitment to allow your arcology's citizens cultural freedom.
+ <br> //This option is an alternative to societal advancement, and will not advance naturally.//
+ <</if>>
+ <</if>>
+ <<elseif $FSCreditCount == 6>>
+ <<if $arcologies[0].FSNull != "unset">>
+ <br>''You are permitting <<if $arcologies[0].FSNull <= 17>>basic<<elseif $arcologies[0].FSNull <= 34>>some<<elseif $arcologies[0].FSNull <= 51>>considerable<<elseif $arcologies[0].FSNull <= 68>>great<<elseif $arcologies[0].FSNull <= 85>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology.
+ <<if $arcologies[0].FSNull <= 20>>
+ //[[Abandon|Future Society][FutureSocieties.remove("FSNull")]]//
+ <<else>>
+ //[[Withdraw|Future Society][$arcologies[0].FSNull -= 17, $FSCredits += 1]]//
+ <</if>>
+ <<if $FSCredits > 0>>
+ <<if $arcologies[0].FSNull < $FSLockinLevel>>
+ <br> [[Advance|Future Society][$arcologies[0].FSNull += 17, $FSCredits -= 1]]: further commitment to allow your arcology's citizens cultural freedom.
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if $FSCredits > 0>>
+ <br>[[Multiculturalism|Future Society][$arcologies[0].FSNull = 17, $FSCredits -= 1]]: a commitment to allow your arcology's citizens cultural freedom.
+ <br> //This option is an alternative to societal advancement, and will not advance naturally.//
+ <</if>>
+ <</if>>
+ <<elseif $FSCreditCount == 7>>
+ <<if $arcologies[0].FSNull != "unset">>
+ <br>''You are permitting <<if $arcologies[0].FSNull <= 15>>basic<<elseif $arcologies[0].FSNull <= 30>>some<<elseif $arcologies[0].FSNull <= 45>>notable<<elseif $arcologies[0].FSNull <= 60>>considerable<<elseif $arcologies[0].FSNull <= 75>>great<<elseif $arcologies[0].FSNull <= 90>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology.
+ <<if $arcologies[0].FSNull <= 20>>
+ //[[Abandon|Future Society][FutureSocieties.remove("FSNull")]]//
+ <<else>>
+ //[[Withdraw|Future Society][$arcologies[0].FSNull -= 15, $FSCredits += 1]]//
+ <</if>>
+ <<if $FSCredits > 0>>
+ <<if $arcologies[0].FSNull < $FSLockinLevel>>
+ <br> [[Advance|Future Society][$arcologies[0].FSNull += 15, $FSCredits -= 1]]: further commitment to allow your arcology's citizens cultural freedom.
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if $FSCredits > 0>>
+ <br>[[Multiculturalism|Future Society][$arcologies[0].FSNull = 15, $FSCredits -= 1]]: a commitment to allow your arcology's citizens cultural freedom.
+ <br> //This option is an alternative to societal advancement, and will not advance naturally.//
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if $arcologies[0].FSNull != "unset">>
+ <br>''You are permitting <<if $arcologies[0].FSNull <= 20>>basic<<elseif $arcologies[0].FSNull <= 40>>considerable<<elseif $arcologies[0].FSNull <= 60>>great<<elseif $arcologies[0].FSNull <= 80>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology.
+ <<if $arcologies[0].FSNull <= 20>>
+ //[[Abandon|Future Society][FutureSocieties.remove("FSNull")]]//
+ <<else>>
+ //[[Withdraw|Future Society][$arcologies[0].FSNull -= 20, $FSCredits += 1]]//
+ <</if>>
+ <<if $FSCredits > 0>>
+ <<if $arcologies[0].FSNull < $FSLockinLevel>>
+ <br> [[Advance|Future Society][$arcologies[0].FSNull += 20, $FSCredits -= 1]]: further commitment to allow your arcology's citizens cultural freedom.
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if $FSCredits > 0>>
+ <br>[[Multiculturalism|Future Society][$arcologies[0].FSNull = 20, $FSCredits -= 1]]: a commitment to allow your arcology's citizens cultural freedom.
+ <br> //This option is an alternative to societal advancement, and will not advance naturally.//
+ <</if>>
+ <</if>>
+ <</if>>
+<</if>>
+
+<br>
+
<<if ($arcologies[0].FSAztecRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<br>''You are pursuing'' a vision of a new Rome.
@@ -1082,89 +1187,10 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
-<<if $arcologies[0].FSChattelReligionist == "unset">>
- <<if $FSCreditCount == 4>>
- <<if $arcologies[0].FSNull != "unset">>
- <br>''You are permitting <<if $arcologies[0].FSNull <= 25>>basic<<elseif $arcologies[0].FSNull <= 50>>considerable<<elseif $arcologies[0].FSNull <= 75>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology.
- <<if $arcologies[0].FSNull <= 25>>
- //[[Abandon|Future Society][FutureSocieties.remove("FSNull")]]//
- <<else>>
- //[[Withdraw|Future Society][$arcologies[0].FSNull -= 25, $FSCredits += 1]]//
- <</if>>
- <<if $FSCredits > 0>>
- <<if $arcologies[0].FSNull < $FSLockinLevel>>
- <br> [[Advance|Future Society][$arcologies[0].FSNull += 25, $FSCredits -= 1]]: further commitment to allow your arcology's citizens cultural freedom.
- <</if>>
- <</if>>
- <<else>>
- <<if $FSCredits > 0>>
- <br>[[Multiculturalism|Future Society][$arcologies[0].FSNull = 25, $FSCredits -= 1]]: a commitment to allow your arcology's citizens cultural freedom.
- <br> //This option is an alternative to societal advancement, and will not advance naturally.//
- <</if>>
- <</if>>
- <<elseif $FSCreditCount == 6>>
- <<if $arcologies[0].FSNull != "unset">>
- <br>''You are permitting <<if $arcologies[0].FSNull <= 17>>basic<<elseif $arcologies[0].FSNull <= 34>>some<<elseif $arcologies[0].FSNull <= 51>>considerable<<elseif $arcologies[0].FSNull <= 68>>great<<elseif $arcologies[0].FSNull <= 85>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology.
- <<if $arcologies[0].FSNull <= 20>>
- //[[Abandon|Future Society][FutureSocieties.remove("FSNull")]]//
- <<else>>
- //[[Withdraw|Future Society][$arcologies[0].FSNull -= 17, $FSCredits += 1]]//
- <</if>>
- <<if $FSCredits > 0>>
- <<if $arcologies[0].FSNull < $FSLockinLevel>>
- <br> [[Advance|Future Society][$arcologies[0].FSNull += 17, $FSCredits -= 1]]: further commitment to allow your arcology's citizens cultural freedom.
- <</if>>
- <</if>>
- <<else>>
- <<if $FSCredits > 0>>
- <br>[[Multiculturalism|Future Society][$arcologies[0].FSNull = 17, $FSCredits -= 1]]: a commitment to allow your arcology's citizens cultural freedom.
- <br> //This option is an alternative to societal advancement, and will not advance naturally.//
- <</if>>
- <</if>>
- <<elseif $FSCreditCount == 7>>
- <<if $arcologies[0].FSNull != "unset">>
- <br>''You are permitting <<if $arcologies[0].FSNull <= 15>>basic<<elseif $arcologies[0].FSNull <= 30>>some<<elseif $arcologies[0].FSNull <= 45>>notable<<elseif $arcologies[0].FSNull <= 60>>considerable<<elseif $arcologies[0].FSNull <= 75>>great<<elseif $arcologies[0].FSNull <= 90>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology.
- <<if $arcologies[0].FSNull <= 20>>
- //[[Abandon|Future Society][FutureSocieties.remove("FSNull")]]//
- <<else>>
- //[[Withdraw|Future Society][$arcologies[0].FSNull -= 15, $FSCredits += 1]]//
- <</if>>
- <<if $FSCredits > 0>>
- <<if $arcologies[0].FSNull < $FSLockinLevel>>
- <br> [[Advance|Future Society][$arcologies[0].FSNull += 15, $FSCredits -= 1]]: further commitment to allow your arcology's citizens cultural freedom.
- <</if>>
- <</if>>
- <<else>>
- <<if $FSCredits > 0>>
- <br>[[Multiculturalism|Future Society][$arcologies[0].FSNull = 15, $FSCredits -= 1]]: a commitment to allow your arcology's citizens cultural freedom.
- <br> //This option is an alternative to societal advancement, and will not advance naturally.//
- <</if>>
- <</if>>
- <<else>>
- <<if $arcologies[0].FSNull != "unset">>
- <br>''You are permitting <<if $arcologies[0].FSNull <= 20>>basic<<elseif $arcologies[0].FSNull <= 40>>considerable<<elseif $arcologies[0].FSNull <= 60>>great<<elseif $arcologies[0].FSNull <= 80>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology.
- <<if $arcologies[0].FSNull <= 20>>
- //[[Abandon|Future Society][FutureSocieties.remove("FSNull")]]//
- <<else>>
- //[[Withdraw|Future Society][$arcologies[0].FSNull -= 20, $FSCredits += 1]]//
- <</if>>
- <<if $FSCredits > 0>>
- <<if $arcologies[0].FSNull < $FSLockinLevel>>
- <br> [[Advance|Future Society][$arcologies[0].FSNull += 20, $FSCredits -= 1]]: further commitment to allow your arcology's citizens cultural freedom.
- <</if>>
- <</if>>
- <<else>>
- <<if $FSCredits > 0>>
- <br>[[Multiculturalism|Future Society][$arcologies[0].FSNull = 20, $FSCredits -= 1]]: a commitment to allow your arcology's citizens cultural freedom.
- <br> //This option is an alternative to societal advancement, and will not advance naturally.//
- <</if>>
- <</if>>
- <</if>>
-<</if>>
+<br><br>
-<br>
+__Facility Redecoration__
-/* FACILITY REDECORATION */
<<if $brothel > 0>>
<<run ValidateFacilityDecoration("brothelDecoration")>>
<br>$brothelNameCaps is decorated in $brothelDecoration style.