diff --git a/devTools/AutoGitVersionUpload.sh b/devTools/AutoGitVersionUpload.sh
new file mode 100644
index 0000000000000000000000000000000000000000..e90875c2eb148c2bf5630524b17296c45462dafb
--- /dev/null
+++ b/devTools/AutoGitVersionUpload.sh
@@ -0,0 +1,11 @@
+## Requires megatools
+LocalDIR=~/fc-pregmod/
+RemoteDIR=FCGIT
+Uname=anon
+Upass=13245
+cd $LocalDIR/
+git pull
+rm bin/*.html
+./compile-git
+mv bin/*.html bin/html/
+megacopy -l bin/html/ -r /Root/$RemoteDIR --disable-previews --no-ask-password -u $Uname -p $Upass
diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw
index e6160101738dd660f6657a3ecbd8e182cb148bd2..93b418a93303baa3005bbf872aa59f6675ffacc2 100644
--- a/src/SecExp/edicts.tw
+++ b/src/SecExp/edicts.tw
@@ -307,7 +307,7 @@
<</if>>
<</if>>
-<<if $securityForceCreate == 1>>
+<<if $securityForceCreate == 1 && $SFSupportLevel < 5>>
<br><br>__Special Force:__
<<if $SFSupportLevel == 0 && $reqHelots > 5>>
<br>''Equipment provision:'' $securityForceName will provide the security HQ with advanced equipment.
diff --git a/src/SecExp/rebellionOptions.tw b/src/SecExp/rebellionOptions.tw
index 0bd115bc65fad7c60c395749be8d91d65d560427..e56c105cee89890e306dfe472b8944a8c7e52768 100644
--- a/src/SecExp/rebellionOptions.tw
+++ b/src/SecExp/rebellionOptions.tw
@@ -11,7 +11,7 @@
<<if $slaveRebellion == 1>>
In the end it happened, the slaves of your arcology dared took up arms and raised up against their betters. Your penthouse is flooded with reports from all over the arcology of small skirmishes between the rioting slaves and the security forces.
- It appears <strong><<print Math.trunc($attackTroops)>></strong> rebels are in the streets right now, building barricades and freeing their peers. They are
+ It appears <strong><<print commaNum(Math.trunc($attackTroops))>></strong> rebels are in the streets right now, building barricades and freeing their peers. They are
<<if $attackEquip <= 0>>
<strong>poorly armed</strong>.
<<elseif $attackEquip == 1>>
@@ -24,7 +24,7 @@
<strong>extremely well armed</strong>.
<</if>>
<<if $irregulars > 0>>
- <<print Math.trunc($irregulars)>> of your citizens took up arms to defend their arcology owner.
+ <<print commaNum(Math.trunc($irregulars))>> of your citizens took up arms to defend their arcology owner.
<</if>>
<<set _count = 0>>
<<if $rebellingID.length > 0>>
@@ -106,7 +106,7 @@
<hr>
<<else>>
In the end it happened, the citizens of your arcology dared took up arms and raised up against their betters. Your penthouse is flooded with reports from all over the arcology of small skirmishes between the rioting residents and the security forces.
- It appears <<print Math.trunc($attackTroops)>> rebels are in the streets right now, building barricades and destroying your property. They are
+ It appears <<print commaNum(Math.trunc($attackTroops))>> rebels are in the streets right now, building barricades and destroying your property. They are
<<if $attackEquip <= 0>>
<strong>poorly armed</strong>.
<<elseif $attackEquip == 1>>
@@ -119,7 +119,7 @@
<strong>extremely well armed</strong>.
<</if>>
<<if $irregulars > 0>>
- <<print Math.trunc($irregulars)>> of your citizens took up arms to defend their arcology owner.
+ <<print commaNum(Math.trunc($irregulars))>> of your citizens took up arms to defend their arcology owner.
<</if>>
<<set _count = 0>>
<br>
diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw
index ae758e2a636a81b6f8c0b9688b9e9edc19444827..91ffe6463710205ddeebd3da88eb832d5e3d45ef 100644
--- a/src/SecExp/secBarracks.tw
+++ b/src/SecExp/secBarracks.tw
@@ -6,7 +6,7 @@ The Barracks
<hr>
__Upgrades__
<br>
-While for many a sore sight in a free city, the barracks stand proud before you.
+While this a sore sight for many citiens of $arcologies[0].name, the barracks stand proud before you.
<<if $secBarracksUpgrades.size == 0>>
The building is relatively small and able to house a limited number of units.
<<elseif $secBarracksUpgrades.size == 1>>
@@ -139,7 +139,7 @@ While for many a sore sight in a free city, the barracks stand proud before you.
<hr>
__Units__
<br>
-Your maximum number of units is <<print $maxUnits>>, currently you have <<print $activeUnits>>. <<if $secBarracksUpgrades.luxury > 0>>The barracks provide <<print $secBarracksUpgrades.luxury * 5>>% bonus morale in case of a battle.<</if>><<if $secBarracksUpgrades.training > 0>> The training facility will increase the effectiveness of your units with time.<</if>>
+Your maximum number of units is <<print $maxUnits>>, currently you have <<print $activeUnits>>. <<if $secBarracksUpgrades.luxury > 0>>The barracks provides <<print $secBarracksUpgrades.luxury * 5>>% bonus morale when battle occurs.<</if>><<if $secBarracksUpgrades.training > 0>> The training facility will increase the effectiveness of your units with time.<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset" || $arcologies[0].FSChineseRevivalist != "unset" || $arcologies[0].FSArabianRevivalist != "unset" || $arcologies[0].FSEdoRevivalist != "unset" || $arcologies[0].FSEgyptianRevivalist != "unset" || $arcologies[0].FSAztecRevivalist != "unset">>
<</if>>
<br>
@@ -177,7 +177,7 @@ __Security Drones__
__Slaves__
<br>/* slaves */
-You are free to organize your menial slaves into fighting units. Currently you have <<print $helots>> slaves available, while <<print $slavesEmployedManpower>> are already employed as soldiers. During all your battles you lost a total of <<print $slavesTotalCasualties>>.
+You are free to organize your menial slaves into fighting units. Currently you have <<print <<print commaNum($helots)>> slaves available, while <<print <<print commaNum($slavesEmployedManpower)>> are already employed as soldiers. During all your battles you lost a total of <<print <<print commaNum($slavesTotalCasualties)>>.
<<set _menialPrice = Math.trunc(($slaveCostFactor*1000)/100)*100>>
<<set _menialPrice = Math.clamp(_menialPrice, 500, 1500)>>
<<silently>><<MenialPopCap>><</silently>>
@@ -358,7 +358,7 @@ __Militia__
<<elseif $militiaRecruitment == 2>>
By establishing obligatory military service to obtain citizenship you have enlarged your manpower pool to be approximately 5% of the arcology's citizens population.
<</if>>
- Your current total manpower is <<print $militiaTotalManpower>>, of which <<print $militiaEmployedManpower>> is in active duty. You lost in total <<print $militiaTotalCasualties>> citizens, leaving you with <<print $militiaFreeManpower>> available citizens.
+ Your current total manpower is <<print <<print commaNum($militiaTotalManpower)>>, of which <<print commaNum($militiaEmployedManpower)>> is in active duty. You lost in total <<print <<print commaNum($militiaTotalCasualties)>> citizens, leaving you with <<print <<print commaNum($militiaFreeManpower)>> available citizens.
<br>
<<set _mL = $militiaUnits.length>>
<<if $militiaFreeManpower > 0 && $activeUnits < $maxUnits>>
@@ -523,7 +523,7 @@ __Militia__
__Mercenaries__
<br>/* mercenaries */
With the installation of a mercenary company in the arcology, many other are attracted to your free city, hoping to land a contract with you.
- You are able to organize them in units to use in the defense of the arcology. Excluding the defense force you set up, there are <<print $mercTotalManpower>> mercenaries in your arcology, of which <<print $mercEmployedManpower>> actively employed and <<print $mercFreeManpower>> not yet under contract. In total <<print $mercTotalCasualties>> mercenaries have died defending your arcology.
+ You are able to organize them in units to use in the defense of the arcology. Excluding the defense force you set up, there are <<print <<print commaNum($mercTotalManpower)>> mercenaries in your arcology, of which <<print <<print commaNum($mercEmployedManpower)>> actively employed and <<print $mercFreeManpower>> not yet under contract. In total <<print <<print commaNum($mercTotalCasualties)>> mercenaries have died defending your arcology.
<br>
<<set _meL = $mercUnits.length>>
<<if $mercFreeManpower > 0 && $activeUnits < $maxUnits>>
diff --git a/src/SecExp/widgets/unitsWidgets.tw b/src/SecExp/widgets/unitsWidgets.tw
index 61029b7278450ea8632f4c4c170da83c4ea7283b..4a95af800e6ee68ba985bd1454f98eb06bdc6d23 100644
--- a/src/SecExp/widgets/unitsWidgets.tw
+++ b/src/SecExp/widgets/unitsWidgets.tw
@@ -140,7 +140,7 @@
<<widget "secBotsDescription">>
<<if $secBots.active == 1>>
- <strong>The security drones</strong> assemble in an ordered line in front of you, ready to receive their orders. All <<print $secBots.troops>> stand before you in absolute silence.
+ <strong>The <<print $secBots.troops>> security drones</strong> are assembled in an ordered line in front of you, absolutely silent and ready to receive their orders.
<<if $secBots.troops < $secBots.maxTroops>> The unit is not at its full strength of $secBots.maxTroops drones.<</if>>
<<if $secBots.equip == 0>>
They are equipped with light weaponry, mainly anti-riot non lethal weapons. Not particularly effective in battle.
@@ -178,4 +178,4 @@
<</for>>
<<set $args[0].ID = _newID>>
-<</widget>>
\ No newline at end of file
+<</widget>>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 570152d3d2b045a755af11e7f5f597249798e00a..e1943b2a98e2036d0471fcd50bd5c8147438d3c6 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -21,7 +21,7 @@ $incubatorNameCaps is a clean, cold hall designed to be lined with tanks and the
It's empty and quiet. [[Decommission the incubator|Main][$incubator = 0, $incubatorUpgradeSpeed = 5, $incubatorUpgradeWeight = 0, $incubatorUpgradeMuscles = 0, $incubatorUpgradeReproduction = 0, $incubatorUpgradeGrowthStims = 0, $incubatorWeightSetting = 0, $incubatorMusclesSetting = 0, $incubatorReproductionSetting = 0, $incubatorGrowthStimsSetting = 0, $tanks = []]]
<</if>>
-<br>It can support $incubator <<if $incubator == 1>>child<<else>>children<</if>>.
+<br>It can support $incubator <<if $incubator == 1>>child<<else>>children<</if>>. Currently $incubatorSlaves tanks are in use.
[[Add another incubation tank|Incubator][$cash -= Math.trunc(60000*$upgradeMultiplierArcology), $incubator += 1]] //Costs <<print cashFormat(Math.trunc(60000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
<<if $freeTanks == 0>>
All of the tanks are currently occupied by growing children.
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index f9d0bc1e393b7d46398b266a646dd1d0b93ce0b0..09737e15a6081c4791a370f86755553a624f168c 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -77,7 +77,7 @@ $arcadeNameCaps
<</link>>
<</if>>
-<br>It can support $arcade inmates.
+<br>It can support $arcade inmates. Currently $arcadeSlaves slaves are incarcerated.
<<if ($arcade < $arcadeSlaves) && ($arcadeUpgradeFuckdolls == 1)>>
@@.yellow;$arcadeNameCaps is overcrowded;@@ the least popular inmate will be converted to a standard Fuckdoll this week.
<</if>>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 976a4859db41f6e875e75b83205d85adc329a7c3..61849a6e999a120c4e3284e92e27bab27d2e039a 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -133,16 +133,17 @@ if(!Macro.has('sectorblock')) {
<td colspan="3"></td>
<td id="Penthouse" colspan="4">
<<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> @@.cyan;[P]@@
- <<if $masterSuite||$servantsQuarters||$spa||$clinic||$schoolroom||$cellblock||$incubator||$HGSuite||$researchLab.built=="true">>
+ <<if $masterSuite||$HGSuite||$dojo||$servantsQuarters||$spa||$clinic||$schoolroom||$cellblock||$incubator||$researchLab.built=="true">>
<br>
<<if $masterSuite>>[[Suite|Master Suite]] ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)<</if>>
+ <<if $HGSuite>>[[HG Suite|Head Girl Suite]] <<if $HeadGirl == 1>>(HG) <<elseif $HGSuiteSlaves == 2>> (HG and roommate)<</if>> <</if>>
+ <<if $dojo>>[[BG Dojo|BG Select]] <<if $Bodyguard != 0>>(BG) <<else>> (0)<</if>> <</if>>
<<if $servantsQuarters>>[[Quarters|Servants' Quarters]] ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>>
<<if $spa>>[[Spa]] ($spaSlaves/$spa<<if $Attendant>>, L<</if>>)<</if>>
<<if $clinic>>[[Clinic]] ($clinicSlaves/$clinic<<if $Nurse>>, L<</if>>)<</if>>
<<if $schoolroom>>[[Schoolroom]] ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>>
<<if $cellblock>>[[Cellblock]] ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>)<</if>>
<<if $incubator>>[[Incubator]] (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>)<</if>>
- <<if $HGSuite>>[[HG Suite|Head Girl Suite]] ($HGSuiteSlaves)<</if>>
<<if $researchLab.built == "true">>[[Research Lab][$temp = 0]]<</if>>
<</if>>
</td>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index aa1fe88262eefabe9f5c338ffc34115e5c0207cb..e3ce235f0e82d6ca4cac92056fe5bbcfbaa201c3 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -71,7 +71,7 @@ $cellblockNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($cellblock*1000*$upgradeMultiplierArcology)>>
-<br>$cellblockNameCaps has room for $cellblock slaves to be kept in close confinement.
+<br>$cellblockNameCaps has room for $cellblock slaves to be kept in close confinement. Currently $cellblockSlaves are kept in close confinement.
[[Expand the cellblock|Cellblock][$cash -= _Tmult0, $cellblock += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index 3e04e09a1b74c64bb040c758dcb5e0ea6d2d0efa..16ca2bd77ea6daee1b05f2c80c433a57e49139b6 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -71,7 +71,7 @@ $clinicNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($clinic*1000*$upgradeMultiplierArcology)>>
-<br>$clinicNameCaps has room to support $clinic slaves while they receive treatment.
+<br>$clinicNameCaps has room to support $clinic slaves while they receive treatment. Currently $clinicSlaves slaves are reciving treatement.
[[Expand the clinic|Clinic][$cash -= _Tmult0, $clinic += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index b5e9aa797944b53059c2c9e8f4771085a32303fd..8b05c643dc7fa06a06ebdd5621701891ce95680c 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -307,7 +307,7 @@ $dairyNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($dairy*1000*$upgradeMultiplierArcology)>>
-<br>$dairyNameCaps can support $dairy milkers. [[Expand the dairy|Dairy][$cash -= _Tmult0, $dairy += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
+<br>$dairyNameCaps can support $dairy milkers. There are currently $dairySlaves cows. [[Expand the dairy|Dairy][$cash -= _Tmult0, $dairy += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
<br>
diff --git a/src/uncategorized/manufacturing.tw b/src/uncategorized/manufacturing.tw
index b427db51bbc901135cfe669fab1bb1ecbce17479..30812a44b569422a4bda989ccd0ce1842c5b7425 100644
--- a/src/uncategorized/manufacturing.tw
+++ b/src/uncategorized/manufacturing.tw
@@ -16,7 +16,7 @@ This is a space in the arcology's service areas,
<<if $sectors[$AS].type == "Sweatshops">>
<<if $helots > 0>>
<br><br>
- You own $helots menial slaves. All your sweatshops together can use only <<print $Sweatshops*500>>,
+ You own <<print commaNum($helots)>> menial slaves. All your sweatshops together can use only <<print $Sweatshops*500>>,
<<if $helots > $Sweatshops*500>>
the remainder is assigned to various odd-jobs in the arcology.
<<elseif $helots == $Sweatshops*500>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 003848dc3ee1eb4fb3d85184b0b8e9ebec8e885d..ba45d25cb543ba5606d6725dc4cc7e59d217ee2f 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -219,7 +219,7 @@ The true focus of the suite is, however, the fuckpit. This stepped depression in
is desolate and unpopulated.
<</if>>
-<br> [[Refit the suite to the height of traditional opulence|Master Suite][$cash -= _Tmult1, $masterSuiteUpgradeLuxury = 1]] //Costs _Tmult1; will focus the suite on you//
+<br> [[Refit the suite to the height of traditional opulence|Master Suite][$cash -= _Tmult1, $masterSuiteUpgradeLuxury = 1]] //Costs <<print cashFormat(_Tmult1)>>; will focus the suite on you//
<<else>>
@@ -294,7 +294,7 @@ $masterSuiteNameCaps is furnished
<</if>>
-<br>$masterSuiteNameCaps has room for $masterSuite slaves to live comfortably<<if $masterSuiteUpgradeLuxury == 2>> in the moments when they're not in the fuckpit<<elseif $masterSuiteUpgradeLuxury == 1>> on its huge bed<</if>>.
+<br>$masterSuiteNameCaps has room for $masterSuite slaves to live comfortably<<if $masterSuiteUpgradeLuxury == 2>> in the moments when they're not in the fuckpit<<elseif $masterSuiteUpgradeLuxury == 1>> on its huge bed<</if>>. There are currently $masterSuiteSlaves in $masterSuiteNameCaps.
<<set _Tmult0 = Math.trunc($masterSuite*1000*$upgradeMultiplierArcology)>>
[[Expand the Master Suite|Master Suite][$cash -= _Tmult0, $masterSuite += 2, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
diff --git a/src/uncategorized/pens.tw b/src/uncategorized/pens.tw
index 70e0fa4fc6c0423de11d20ffb6338f11dc2b9ff9..46b09be4999a5187e410dbd491561e657fafc2b8 100644
--- a/src/uncategorized/pens.tw
+++ b/src/uncategorized/pens.tw
@@ -10,14 +10,14 @@ This is a space in the arcology's service areas, designed to house hundreds of s
<br><br>
You own
<<if $helots > 0>>
- <<if $helots > 1>>$helots menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>>
+ <<if $helots > 1>><<print commaNum($helots)>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>>
<</if>>
<<if $menialBioreactors > 0>>
- <<if $menialBioreactors > 1>>$menialBioreactors standard bioreactors,<<else>>one standard bioreactor,<</if>>
+ <<if $menialBioreactors > 1>><<print commaNum($menialBioreactors)>> standard bioreactors,<<else>>one standard bioreactor,<</if>>
<<if $fuckdolls > 0>>and<</if>>
<</if>>
<<if $fuckdolls > 0>>
- <<if $fuckdolls > 1>>$fuckdolls standard fuckdolls,<<else>>one fuckdoll,<</if>>
+ <<if $fuckdolls > 1>><<print commaNum($fuckdolls)>> standard fuckdolls,<<else>>one fuckdoll,<</if>>
<</if>>
<<if $helots+$menialBioreactors+$fuckdolls > 0>>partially<</if>>
housed in this sector.
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index afabbd18d11561500313c48730766819ae61c96a..461bf359c2e73b0ce8d67e283f138bb157c33313 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -71,7 +71,7 @@ $schoolroomNameCaps is well-equipped, with wall screens to display lessons. Thes
[[Decommission the schoolroom|Main][$schoolroom = 0, $schoolroomUpgradeSkills = 0, $schoolroomUpgradeLanguage = 0, $schoolroomUpgradeRemedial = 0, $schoolroomDecoration = "standard"]]
<</if>>
<<set _Tmult0 = Math.trunc($schoolroom*1000*$upgradeMultiplierArcology)>>
-<br>$schoolroomNameCaps has room to house $schoolroom slaves while they learn.
+<br>$schoolroomNameCaps has room to house $schoolroom slaves while they learn. Currently $schoolroomSlaves are learning.
[[Expand the schoolroom|Schoolroom][$cash -= _Tmult0, $schoolroom += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index 2450538838694e76073a85b43bf4fedde80b1d2f..86b9d9f55c2acafd951f5f6be649a774d3fa369b 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -71,7 +71,7 @@ $servantsQuartersNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($servantsQuarters*1000*$upgradeMultiplierArcology)>>
-<br>$servantsQuartersNameCaps has room to keep $servantsQuarters slaves while they serve.
+<br>$servantsQuartersNameCaps has room to keep $servantsQuarters slaves while they serve. Currently $servantsQuartersSlaves are serving.
[[Expand the Servants' Quarters|Servants' Quarters][$cash -= _Tmult0, $servantsQuarters += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index 322d930ed4b9ed7099a9fafbcf1b06736587cccd..194057cf770a47125a05a679483e456d049f6710 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -71,7 +71,7 @@ $spaNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($spa*1000*$upgradeMultiplierArcology)>>
-<br>$spaNameCaps has rooms to house slaves while they recuperate here. They can support $spa slaves.
+<br>$spaNameCaps can house $spa while they recuperate here. Curretly $spaSlaves are recuperating.
[[Expand the spa|Spa][$cash -= _Tmult0, $spa += 5]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index b45e694ef2c0681a0c812d4f5498cb09ca09eae1..dd4b80b855bd2be82e608a459375dc05ee5665e5 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -128,7 +128,7 @@
<<else>>
<br>Upkeep |
<</if>><<print cashFormat($costs)>>
-<br>@@.pink;Total Sex Slaves@@ | <<print commaNum(_SL)>>
+<br><br>@@.pink;Total Sex Slaves@@ | <<print commaNum(_SL)>>
<br>@@.pink;Penthouse Beds@@ |
<<if $dormitoryPopulation+$roomsPopulation > ($dormitory+$rooms)>>@@.red;<<print $dormitoryPopulation+$roomsPopulation>>@@<<else>><<print $dormitoryPopulation+$roomsPopulation>><</if>>/<<print ($dormitory+$rooms)>>
<br>@@.pink;Dormitory Beds@@ | <<if $dormitoryPopulation > $dormitory>>@@.red;<<print $dormitoryPopulation>>@@<<else>><<print $dormitoryPopulation>><</if>>/<<print $dormitory>>
@@ -391,14 +391,19 @@
<<if $newModelUI == 0>>
<<if ($HGSuite)>>
<br>[[$HGSuiteNameCaps|Head Girl Suite]]
- <<if $HGSuiteSlaves>>
<<if $abbreviateSidebar == 2>>
- ($HGSuiteSlaves slave)
- <<else>>
- ($HGSuiteSlaves)
+ <<if $HeadGirl == 1>>(HG)
+ <<elseif $HeadGirl == 1 && $HGSuiteSlaves == 1>>(HG and roommate)
+ <</if>>
<</if>>
<</if>>
<</if>>
+ <<if ($dojo)>>
+ <br>[[BG Dojo|BG Select]]
+ <<if $Bodyguard != 0>>
+ (BG)
+ <</if>>
+ <</if>>
<<if ($brothel)>>
<br>[[$brothelNameCaps|Brothel]]
<<if $abbreviateSidebar == 2>>
@@ -600,4 +605,16 @@
<br>
<<link "Bug Report">><<bugreport>><</link>>
<</if>>
+
+<<if $HGSuiteSlaves > 0>>
+<<if $HeadGirl == 1>> Your head girl <<elseif $HGSuiteSlaves == 2>> and her roommate<</if>>
+<<if $HGSuite == 1>> has a little luxurious room in the penthouse with everything <<if $HeadGirl == 1>> she needs <<elseif $HGSuiteSlaves == 2>> they need<</if>> to be a proper Head Girl.
+<<else>> As there is no little luxurious room in the penthouse dedicated to being a headgirl, <<if $HeadGirl == 1>> she <<elseif $HGSuiteSlaves == 2>> they<</if>> live with the rest of your slaves in the dormitory.
+<</if>>
+<</if>>
+
+<<if $bodyguard != 0>>
+<<if $dojo>> Your bodyguard has a comfortable room in the armory to call her own. <<else>> As your bodyguard doesn't have a comfortable room in the armory to call her own she lives with the rest of your slaves in the dormitory.<</if>>
+<</if>>
+
<</nobr>>