diff --git a/TODO.txt b/TODO.txt
index 76fad42ae7e2fb3792805b820204c2bf41d4a9e9..1099f0731be990705096e1aebe0a9f848874d87f 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,6 +1,3 @@
-Main:
--fix the "fix it" widgets
-
Rebellions:
-citizens mini events
diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/SecExp/SecExpBackwardCompatibility.tw
index fec5164fd88dd9b7b83d7dcfe267864d8a4e476d..432927f1c1f98ebce3158c8f0650d85bbd64fda5 100644
--- a/src/SecExp/SecExpBackwardCompatibility.tw
+++ b/src/SecExp/SecExpBackwardCompatibility.tw
@@ -195,6 +195,17 @@
<<set $mercSoldierPrivilege = 0>>
<</if>>
+/* proclamations */
+<<if ndef $proclamationsCooldown>>
+<<set $proclamationsCooldown = 0>>
+<</if>>
+<<if ndef $proclamationCurrency>>
+<<set $proclamationCurrency = "authority">>
+<</if>>
+<<if ndef $proclamationType>>
+<<set $proclamationType = "none">>
+<</if>>
+
/* buildings */
<<if ndef $secHQ>>
<<set $secHQ = 0>>
@@ -348,6 +359,9 @@
oldWorld: 1,
FC: 1}>>
<</if>>
+<<if ndef $transportHub>>
+<<set $transportHub = 0>>
+<</if>>
/* events */
<<if ndef $smilingManProgress>>
diff --git a/src/SecExp/proclamations.tw b/src/SecExp/proclamations.tw
new file mode 100644
index 0000000000000000000000000000000000000000..c4bd9ba2199df0351169053fc0c9a92d4da9c455
--- /dev/null
+++ b/src/SecExp/proclamations.tw
@@ -0,0 +1,37 @@
+:: proclamations [nobr]
+
+<<set $nextButton = "Back to Main", $nextLink = "Main">>
+
+You can dedicate the week to issue a proclamation, a powerful tool that will have an immediate noticeable effect on the arcology.
+You will use <<print $proclamationCurrency>> to enact it<<if $proclamationType != "none">> and will be about $proclamationType.<<else>>.<</if>>
+<br>
+<<link "Use authority">>
+ <<set $proclamationCurrency = "authority">>
+ <<goto "proclamations">>
+<</link>>
+|
+<<link "Use reputation">>
+ <<set $proclamationCurrency = "reputation">>
+ <<goto "proclamations">>
+<</link>>
+|
+<<link "Use cash">>
+ <<set $proclamationCurrency = "cash">>
+ <<goto "proclamations">>
+<</link>>
+<br>
+<br>
+<<link "Issue a proclamation about security">>
+ <<set $personalAttention = "proclamation", $personalAttentionChanged = 1, $proclamationType = "security">>
+ <<goto "Main">>
+<</link>>
+<br>//You will use your <<if $proclamationCurrency == "authority">>control over the arcology<<elseif $proclamationCurrency == "reputation">>great influence<<elseif $proclamationCurrency == "cash">> vast financial means<</if>>
+to force citizens to give up on sensitive information for the good of the arcology.//
+<br>
+<br>
+<<link "Issue a proclamation about crime">>
+ <<set $personalAttention = "proclamation", $personalAttentionChanged = 1, $proclamationType = "crime">>
+ <<goto "Main">>
+<</link>>
+<br>//You will use your <<if $proclamationCurrency == "authority">>control over the arcology<<elseif $proclamationCurrency == "reputation">>great influence<<elseif $proclamationCurrency == "cash">> vast financial means<</if>>
+to force the arrest of suspected citizens without passing through the normal legal procedures.//
\ No newline at end of file
diff --git a/src/SecExp/secInit.tw b/src/SecExp/secInit.tw
index 33a04f5f967aea7e4097f487e4a89f8b5660557e..709a28b4d050bb47eae0ab32f23911b499f37089 100644
--- a/src/SecExp/secInit.tw
+++ b/src/SecExp/secInit.tw
@@ -69,6 +69,11 @@
<<set $slaveSoldierPrivilege = 0>>
<<set $mercSoldierPrivilege = 0>>
+/* proclamations */
+<<set $proclamationsCooldown = 0>>
+<<set $proclamationCurrency = "authority">>
+<<set $proclamationType = "none">>
+
/* buildings */
<<set $upgradeUpkeep = 40>>
<<set $secHQ = 0>>
@@ -142,6 +147,7 @@
raiders: 1,
oldWorld: 1,
FC: 1}>>
+<<set $transportHub = 0>>
/* events */
<<set $smilingManProgress = 0>>
diff --git a/src/SecExp/transportHub.tw b/src/SecExp/transportHub.tw
index 316f56cb2d9b1515c7c5fc86241cb206e6c39c53..0515267548fcba3bce1acf054fb47c5fb77d6ade 100644
--- a/src/SecExp/transportHub.tw
+++ b/src/SecExp/transportHub.tw
@@ -1 +1,7 @@
-:: transportHub [nobr]
\ No newline at end of file
+:: transportHub [nobr]
+
+<<set $nextButton = "Back", $nextLink = "Main">>
+
+<strong>The transport hub</strong>
+<hr>
+
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index dcc071755abea55c63b41425cc489829f78c5d25..3e9b963fafc034c2e3a19307d0ba1734ad21a73f 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -9,7 +9,6 @@
<<set _flux -= Math.trunc($arcologies[0].FSPaternalist/10)>>
<<elseif $arcologies[0].FSDegradationist != "unset">>
The arcology is a cutthroat place in which falling into slavery is very easy.
- <br>FSdegradationist: <<print $arcologies[0].FSDegradationist>>
<<set _flux += Math.trunc($arcologies[0].FSDegradationist/10)>>
<</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index d07af28b7e9716f6b87f3d433c842e4c4c8db87d..f4044d0190e171629b857748373558c0ca049724 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -6,7 +6,6 @@ Displays the arcology as a table.
Yes, I am aware this is horrible. If anyone can figure out how to get widgets to play nice with tables, or otherwise unfuck this, tell me and I'll implement it.
%/
<<widget "DisplayBuilding">>
-
<<set _Pass = passage()>>
<style>
@@ -47,6 +46,7 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to
td#Pens { border-color: goldenrod; }
td#Pit { border-color: orangered; }
td#Manufacturing { border-color: slategray; }
+ td#transportHub { border-color: magenta; }
td#weapManu { border-color: springgreen; }
td#Sweatshops { border-color: gray; }
td#Barracks { border-color: olivedrab; }
@@ -78,6 +78,7 @@ if(!Macro.has('sectorblock')) {
Dairy: { extra: '<<set _SCapT9 = $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>> ($dairySlaves<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>><<if $Milkmaid>>,L<</if>>)' },
Sweatshops: { base: 'Manufacturing' },
weapManu: { base: 'weaponsManufacturing', name: 'Weapons manufacturing', cls: 'weapManu' },
+ transportHub: { base: 'transportHub', name: 'Transport Hub', cls: 'transportHub' },
Barracks: { base: 'Barracks', name: 'Armoury' },
/* speciality shop types */
'Subjugationist': { base: 'Shops', name: 'Subjugationist Shops', cls: 'FSShops' },
diff --git a/src/uncategorized/markets.tw b/src/uncategorized/markets.tw
index f8cbdb59eb3502dd12c1aff112305d195d172118..4c723e8386113fb877c16baed176ccb33a7c09de 100644
--- a/src/uncategorized/markets.tw
+++ b/src/uncategorized/markets.tw
@@ -18,6 +18,19 @@ This is an area of the concourse occupied by large stores and markets, many of w
//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
<</if>>
+<<if $secExp == 1 && $transportHub == 0>>
+ <<if $terrain == "oceanic" || $terrain == "marine">>
+ <<set _name = "dockyard">>
+ <<elseif $terrain == "urban" || $terrain == "ravine">>
+ <<set _name = "airport">>
+ <<else>>
+ <<set _name = "trainyard">>
+ <</if>>
+ <br>
+ [[Centralize and modernize the transport hub|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $transportHub = 1, $sectors[$AS].type = "transportHub"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+<</if>>
+
<<if $corpMarket == 0 && $corpIncorporated == 1>>
<br>
[[Create a flagship slave market for your corporation here|Main][$corpCash -= Math.trunc(10000*$upgradeMultiplierArcology), $corpMarket = 1, $sectors[$AS].type = "CorporateMarket"]]
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 1ea48d808c16c5b53c6011a3fd5dbc040fcf1b6f..10123123580ad11d10522c11f34efafc9687750f 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -194,6 +194,10 @@
<<set $sentUnitCooldown-->>
<</if>>
+<<if $proclamationsCooldown > 0>>
+ <<set $proclamationsCooldown-->>
+<</if>>
+
<<set _seed = random(1,10)>>
<<if $week < 25>>
<<if _seed > 4>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index e2ac09e4f5aee379ce75099d5b65df3b3fa228ab..fbce0217897426c4375df402fdb351386f7412de 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -88,6 +88,30 @@
<<else>>
You spend your free time hustling around your penthouse, cleaning and making sure everything is in order. You manage to reduce your upkeep by 25%. <<if $PC.vagina == 1>>This is much easier to do without a big baby bump in the way.<</if>>
<</if>>
+<<elseif ($personalAttention == "proclamation")>>
+ After several days of preparation you are ready to issue the proclamation. You announce to the arcology your plans and in short order you use <<if $proclamationCurrency == "authority">>control over the arcology<<elseif $proclamationCurrency == "reputation">>great influence<<elseif $proclamationCurrency == "cash">> vast financial means<</if>> to
+ <<if $proclamationType == "security">>
+ gather crucial information for your security department. In just a few many hours holes are plugged and most moles are eliminated. @@.green;Your security greatly increased@@.
+ <<set $security = Math.clamp($security + 25,0,100)>>
+ <<if $proclamationCurrency == "authority">>
+ <<set $authority = Math.clamp($authority - 2000,0,20000)>>
+ <<elseif $proclamationCurrency == "reputation">>
+ <<set $rep = Math.clamp($rep - 4000,0,20000)>>
+ <<else>>
+ <<set $cash = Math.clamp($cash - 8000,0,20000)>>
+ <</if>>
+ <<elseif $proclamationType == "crime">>
+ force the arrest of many suspected citizens. Their personal power allowed them to avoid justice for a long time, but this day is their end. @@.green;Your crime greatly decreased@@.
+ <<set $crime = Math.clamp($crime - 25,0,100)>>
+ <<if $proclamationCurrency == "authority">>
+ <<set $authority = Math.clamp($authority - 2000,0,20000)>>
+ <<elseif $proclamationCurrency == "reputation">>
+ <<set $rep = Math.clamp($rep - 4000,0,20000)>>
+ <<else>>
+ <<set $cash = Math.clamp($cash - 8000,0,20000)>>
+ <</if>>
+ <</if>>
+ <<set $proclamationsCooldown = 4, $personalAttention = "business">>
<<elseif ($personalAttention == "smuggling")>>
<<set $qualifiedFS to []>>
<<if $arcologies[0].FSDegradationistDecoration >= 80>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index 745292e8b37d74bb56b937571047ffacacefd97e..a7027b81bb434f4c7d5ee59a38957625b44da87f 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -15,7 +15,12 @@
<<if $HeadGirl != 0>>
<br>[[Support your Head Girl|Main][$personalAttention = "HG", $personalAttentionChanged = 1]]
<</if>>
-<br>[[Have as much sex with your slaves as possible|Main][$personalAttention = "sex", $personalAttentionChanged = 1]]<br><br>
+<br>[[Have as much sex with your slaves as possible|Main][$personalAttention = "sex", $personalAttentionChanged = 1]]
+<<if $proclamationsCooldown == 0>>
+ <br>[[Issue a proclamation|proclamations]]<br><br>
+<<else>>
+ <br>It's too early to issue another proclamation. Another will be available in <<if $proclamationsCooldown == 1>> one week.<<else>> $proclamationsCooldown weeks.<</if>><br><br>
+<</if>>
<<if $PC.trading >= 100>>
//You are a master trader.//
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 04cbe7d76eb66d0c935a88bc49c8faf1217ff5d0..39e1b663f775ab73fc929cde598ea3ed5259abd9 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -607,13 +607,13 @@ On formal occasions, you are announced as $PCTitle.
@@.red;Your reputation decreased this week.@@
<</if>>
-<<if !isNaN($repGain)>>
+<<if isNaN($repGain)>>
<br>@@.red;Error: repGain is outside accepted range, please report this issue@@
<</if>>
-<<if !isNaN($repLoss)>>
+<<if isNaN($repLoss)>>
<br>@@.red;Error: repLoss is outside accepted range, please report this issue@@
<</if>>
-<<if !isNaN($rep)>>
+<<if isNaN($rep)>>
<br>@@.red;Error: rep is outside accepted range, please report this issue@@
<</if>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 61ff61e0da4424f88d433e7c71683584cccaa840..b85b60c3292cd1ae070eb00229ce2a3dbf1904c6 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -18,6 +18,7 @@
<<case "slaving">>This week you will learn slaving.
<<case "engineering">>This week you will learn engineering.
<<case "medicine">>This week you will learn medicine.
+<<case "proclamation">>This week you plan to issue a proclamation about $proclamationType.
<<default>>
<<if _PA > -1>>
You plan to train ''__@@.pink;<<SlaveFullName $slaves[_PA]>>@@__'' to $trainingRegimen this week.