From 34b0f257d78d7bd3eeea1dcfb2a57a2e5b3350a1 Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Mon, 20 Nov 2017 13:04:12 +1300
Subject: [PATCH] Changing Security Force to Special Force.

---
 src/events/intro/introSummary.tw            | 22 +++++++++--
 src/gui/Encyclopedia/encyclopedia.tw        | 31 +++++++++++----
 src/init/storyInit.tw                       |  9 +++--
 src/uncategorized/BackwardsCompatibility.tw |  6 +--
 src/uncategorized/PESS.tw                   |  2 +-
 src/uncategorized/PETS.tw                   |  2 +-
 src/uncategorized/RECI.tw                   |  2 +-
 src/uncategorized/REFI.tw                   |  2 +-
 src/uncategorized/REFS.tw                   |  2 +-
 src/uncategorized/RESS.tw                   |  2 +-
 src/uncategorized/RESSTR.tw                 |  2 +-
 src/uncategorized/RETS.tw                   |  2 +-
 src/uncategorized/options.tw                | 43 +++++++++++++++++++--
 src/uncategorized/securityForceEOWReport.tw | 25 ++++++------
 src/uncategorized/securityForceProposal.tw  |  2 +-
 15 files changed, 112 insertions(+), 42 deletions(-)

diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index c3cbeeabfb1..2b816446d3a 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -846,14 +846,14 @@ Image display
 <br><br>
 
 <<if $SFMODToggle == 1>>
-	The Security Force Mod is ''enabled.''
+	The Special Force Mod is ''enabled.''
 [[Disable|Intro Summary][$SFMODToggle = 0]]
 <<else>>
-	The Security Force Mod is ''disabled.''
+	The Special Force Mod is ''disabled.''
 [[Enable|Intro Summary][$SFMODToggle = 1]]
 <</if>>
 <br>
-// This mod from anon1888 offers a lategame security force, triggered around week 80. It is non-canon where it conflicts with canonical updates to the base game.//
+// This mod initally from anon1888 but expanded by SFanon offers a lategame special (initally, security but changed to try and reduce confusion with crime anon's seperate Security Expansion mod) force, triggered around week 80. It is non-canon where it conflicts with canonical updates to the base game.//
 
 <br><br>
 
@@ -867,6 +867,19 @@ Image display
 <br>
 // This mod alters how prosthetics system works and adds some content.//
 
+<br><br>
+
+<<if $secExp == 1>>
+	The Security Expansion Mod is ''enabled.''
+[[Disable|Intro Summary][$secExp = 0]]
+<<else>>
+	The Security Expansion Mod is ''disabled.''
+[[Enable|Intro Summary][$secExp = 1]]
+<</if>>
+<br>
+// This mod introduces security and crime in the arcology, as well as attacks and battles.//
+
+
 <br><br>
 <<link "Continue">>
 	<<if $freshPC == 1 || $saveImported == 0>>
@@ -907,6 +920,9 @@ Image display
 	<</if>>
 	<</if>>
 	<<set $girls = 2>>
+	<<if $secExp == 1>>
+		<<set $wasToggledBefore = 1>>
+	<</if>>
 	<<goto "init Nationalities">>
 <</link>>
 
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index c36ec352dd4..8c99d145070 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2616,14 +2616,14 @@ Thanks are due to all the anons that submitted slaves for inclusion in the pre-o
 <<case "Game Mods">>
 
 
-<<case "Security Force">>
-''NOTE: The Security Force is an optional mod, and as such will only be initialized in-game if it is enabled at game start or in the options menu.''
+<<case "Special Force">>
+''NOTE: The Special Force is an optional mod, and as such will only be initialized in-game if it is enabled at game start or in the options menu.''
 <br><br>
 <blockquote>//Man has killed man from the beginning of time, and each new frontier has brought new ways and new places to die. Why should the future be different? Make no mistake friend, the Free Cities are the future, and we can either live like kings inside them, or die in their shadow. I prefer the former. So should you.//
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; //- The Colonel, standard message to potential recruits//</blockquote>
-Once your arcology has been severely tested by external attack, and thus proven that the anti-militaristic principles of anarcho-capitalism might not be sufficient to ensure the physical security of the citizenry, you will receive an event that gives you the opportunity to establish a Security Force (with a customizable name), with the Colonel as its commander under you. This force will be a private military in all but name (unless you want that name). Once activated, you can manage its deployment from the end of week screen. You will be able to issue orders on the force's task and behavior, and this will impact its development. There are numerous events that can trigger depending on development and orders.
+Once your arcology has been severely tested by external attack, and thus proven that the anti-militaristic principles of anarcho-capitalism might not be sufficient to ensure the physical security of the citizenry, you will receive an event that gives you the opportunity to establish a Special Force (with a customizable name), with the Colonel as its commander under you. This force will be a private military in all but name (unless you want that name). Once activated, you can manage its deployment from the end of week screen. You will be able to issue orders on the force's task and behavior, and this will impact its development. There are numerous events that can trigger depending on development and orders.
 <br><br>
-Initially the force will not be very profitable, but once it expands, it can become so. The speed at which this happens, and the degree of profitability, depends both on your orders to the force and the upgrades you purchase in the Barracks. If you had mercenaries, they will still be active for the purposes of events, corporation assistance (if present), and upkeep costs, abstracted as distinct operatives from the security force.
+Initially the force will not be very profitable, but once it expands, it can become so. The speed at which this happens, and the degree of profitability, depends both on your orders to the force and the upgrades you purchase in the Barracks. If you had mercenaries, they will still be active for the purposes of events, corporation assistance (if present), and upkeep costs, abstracted as distinct operatives from the Special Force.
 <br><br>
 __Orders to the Colonel:__
 	Once the force is active, you will be able to give orders to the colonel. These will affect its income and performance. The orders are:
@@ -2637,7 +2637,7 @@ __Orders to the Colonel:__
 	Allowing them to run wild will, over time, change their character, rendering them increasingly depraved as they realize that they can do whatever they want to non-citizens. Giving them rules might correct this, but reversing such behavior once learned would take a long time indeed.
 <br><br>
 __Barracks:__
-	The Barracks are the upgrade and flavor screen for the Security Force. It is treated as a special facility, and slaves cannot be assigned to it. Here you can observe the antics and relaxation behavior of the force, which will, again, change based on your orders and its reputation. You can visit once a week to receive some extra tribute from the colonel, specially saved for its patron from its weekly acquired loot, and this 'gift' will improve in quality as the force develops.
+	The Barracks are the upgrade and flavor screen for the Special Force. It is treated as a special facility, and slaves cannot be assigned to it. Here you can observe the antics and relaxation behavior of the force, which will, again, change based on your orders and its reputation. You can visit once a week to receive some extra tribute from the colonel, specially saved for its patron from its weekly acquired loot, and this 'gift' will improve in quality as the force develops.
 <br><br>
 __Upgrades:__
 	Upgrades can be purchased in the Barracks. The upgrades that can be purchased will both increase in effectiveness of the force (i.e. how much money/reputation it makes). The upgrades focus on improving the force's infantry equipment, vehicles, aircraft, drones, and stimulants. Some upgrades are more helpful at facilitating different tasks (Vehicles/Aircraft for Slaving/Raiding, Drones for Securing Trade). Arcology upgrades enable other upgrades to be purchased. Stimulants increase overall effectiveness for the force when assigned to raiding after upgrades are considered, as well as flavor text.
@@ -2773,6 +2773,13 @@ While nearly indistinguishable from a standard satellite antenna, the satellite
 <<case "Repopulationist Breeding School">>
 With the sheer number of children being brought into the world in the average Repopulationist society, society had to come up with a way to rear them all. Breeding schools are publicly funded institutions devoted to raising children into future breeders. Their hormone levels are carefully managed both to encourage early puberty and to maximize fertility. Once a class has become sexual active, boys and girls are encouraged to pair off and explore eachother's bodies. Virginities are quickly lost, and more often than not, girls find themselves pregnant, usually with multiples. The pairings, or groups should females outnumber males, are encouraged to stay together and form caring family-like units. In addition, girls are taught to enjoy and idolize motherhood, while boys are taught that it is their duty to mount and fuck any non-gravid slave girls they see until pregnancy is assured. Free women are encouraged to avoid the schools, lest they get pinned and gang raped by horny adolescents. While administration respects rape fetishests and their desire to have a rape baby, doing this sets a poor example to the impressionable youths and may lead to the rape and impregnation of other free women later on it their lives.
 
+<<if $secExp == 1>>
+<<case "Security Expansion">>
+	<<include "encyclopediaSecExpMain">>
+
+<<case "Battles">>
+	<<include "encyclopediaSecExpBattles">>
+<</if>>
 
 <<default>>
 Error: bad title.
@@ -3151,14 +3158,24 @@ Interviews:
 <br>
 <</if>>
 
-<<if ["Game Mods","Security Force"].includes($encyclopedia)>>
+<<if ["Game Mods","Special Force"].includes($encyclopedia)>>
 Game Mods:
-[[Security Force|Encyclopedia][$encyclopedia = "Security Force"]]
+<br>Special Force Mod:[[Special Force|Encyclopedia][$encyclopedia = "Special Force"]]
+<</if>>
+
+<<if ["Game Mods","Security Expansion"].includes($encyclopedia)>>
+<br>The Security Expansion Mod: [[Security Expansion|Encyclopedia][$encyclopedia = "Security Expansion"]] | [[Battles in Security Expansion|Encyclopedia][$encyclopedia = "Battles"]]
 <</if>>
 
 <br>Pregmod: <<link "Repopulationism">><<set $encyclopedia = "Repopulationism">><<goto "Encyclopedia">><</link>> | <<link "Eugenics Focus">><<set $encyclopedia = "Eugenics Focus">><<goto "Encyclopedia">><</link>> | <<link "Hedonistic Decadence">><<set $encyclopedia = "Hedonistic Decadence">><<goto "Encyclopedia">><</link>> | <<link "Gender Radicalism research">><<set $encyclopedia = "Gender Radicalism research">><<goto "Encyclopedia">><</link>> | <<link "Transformation Fetishism research">><<set $encyclopedia = "Transformation Fetishism research">><<goto "Encyclopedia">><</link>> | <<link "Asset Expansionist research">><<set $encyclopedia = "Asset Expansionist research">><<goto "Encyclopedia">><</link>> | <<link "Slimness Enthusiast research">><<set $encyclopedia = "Slimness Enthusiast research">><<goto "Encyclopedia">><</link>> | <<link "Youth Preferentialism Research">><<set $encyclopedia = "Youth Preferentialism Research">><<goto "Encyclopedia">><</link>> | <<link "Hedonistic Decadence Research">><<set $encyclopedia = "Hedonistic Decadence Research">><<goto "Encyclopedia">><</link>> | <<link "Eugenics Breeding Proposal">><<set $encyclopedia = "Eugenics Breeding Proposal">><<goto "Encyclopedia">><</link>> | <<link "Repopulationist Breeding School">><<set $encyclopedia = "Repopulationist Breeding School">><<goto "Encyclopedia">><</link>> | <<link "Escort">><<set $encyclopedia = "Escort">><<goto "Encyclopedia">><</link>> | <<link "Servant">><<set $encyclopedia = "Servant">><<goto "Encyclopedia">><</link>> | <<link "Gang Leader">><<set $encyclopedia = "Gang Leader">><<goto "Encyclopedia">><</link>> | <<link "Hyper-pregnancy">><<set $encyclopedia = "Hyper-pregnancy">><<goto "Encyclopedia">><</link>> | <<link "Super Fertility Drugs">><<set $encyclopedia = "Super Fertility Drugs">><<goto "Encyclopedia">><</link>> | <<link "Pregnancy Generator">><<set $encyclopedia = "Pregnancy Generator">><<goto "Encyclopedia">><</link>> | <<link "Childbirth and C-Secs">><<set $encyclopedia = "Childbirth and C-Secs">><<goto "Encyclopedia">><</link>> | <<link "Enemas and Force-Feeding">><<set $encyclopedia = "Enemas and Force-Feeding">><<goto "Encyclopedia">><</link>> | <<link "Belly Implants">><<set $encyclopedia = "Belly Implants">><<goto "Encyclopedia">><</link>> | <<link "Cervix Micropump Filter">><<set $encyclopedia = "Cervix Micropump Filter">><<goto "Encyclopedia">><</link>> | <<link "Organic Mesh Breast Implant">><<set $encyclopedia = "Organic Mesh Breast Implant">><<goto "Encyclopedia">><</link>> | <<link "Ejaculation Boosting Prostate Implant">><<set $encyclopedia = "Ejaculation Boosting Prostate Implant">><<goto "Encyclopedia">><</link>> | <<link "Player Pregnancy">><<set $encyclopedia = "Player Pregnancy">><<goto "Encyclopedia">><</link>> | <<link "The Flesh Heap">><<set $encyclopedia = "The Flesh Heap">><<goto "Encyclopedia">><</link>> | <<link "Gestation Drugs and Labor Suppressants">><<set $encyclopedia = "Gestation Drugs and Labor Suppressants">><<goto "Encyclopedia">><</link>>
 <br>Lolimod: <<link "Lolis and the Free Cities">><<set $encyclopedia = "Lolis and the Free Cities">><<goto "Encyclopedia">><</link>> | <<link "Fertility Age">><<set $encyclopedia = "Fertility Age">><<goto "Encyclopedia">><</link>> | <<link "Male Fertility">><<set $encyclopedia = "Male Fertility">><<goto "Encyclopedia">><</link>> | <<link "Precocious Puberty">><<set $encyclopedia = "Precocious Puberty">><<goto "Encyclopedia">><</link>> | <<link "Cradle Robbers">><<set $encyclopedia = "Cradle Robbers">><<goto "Encyclopedia">><</link>> | <<link "The Incubation Facility">><<set $encyclopedia = "The Incubation Facility">><<goto "Encyclopedia">><</link>>
 <br>FCTV mod: <<link "FCTV">><<set $encyclopedia = "FCTV">><<goto "Encyclopedia">><</link>> | <<link "FCTVReceiver">><<set $encyclopedia = "FCTVReceiver">><<goto "Encyclopedia">><</link>>
+<<if $secExp == 1>>
+<br>The Security Expansion Mod: [[Security Expansion|Encyclopedia][$encyclopedia = "Security Expansion"]] | [[Battles in Security Expansion|Encyclopedia][$encyclopedia = "Battles"]]
+<</if>>
+<<if $securityForceActive>>
+<br>Special Force Mod:[[Special Force|Encyclopedia][$encyclopedia = "Special Force"]]
+<</if>>
 
 <br>
 <<link "Credits">><<set $encyclopedia = "Credits">><<goto "Encyclopedia">><</link>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 38e6171e737..a1ead138fd9 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1086,6 +1086,8 @@ FertilityAge($fertilityAge)
 <<set $DOLFigureHeadFamilyStatuesChildren = 0>>
 <<set $DOLFigureHeadFamilyStatuesEscorts = 0>>
 
+
+
 /% Begin mod section: toggle whether slaves lisp. %/
 <<set $disableLisping = 0>>
 /% End mod section: toggle whether slaves lisp. %/
@@ -1145,7 +1147,7 @@ FertilityAge($fertilityAge)
 
 /* INCORPORATED MODS */
 
-/* Security Force Variables [SFVAR] */
+/* Special Force Variables [SFVAR] */
 
 /* Extra content enabling */
 <<set $SFMODToggle = 0>>					/* Does the player want to see the SF module at all? */
@@ -1153,7 +1155,7 @@ FertilityAge($fertilityAge)
 /* Initial events and presentation logic */
 <<set $securityForceCreate = 0>> 					/* Has the player chosen to create the SF? Used for initial events */
 <<set $securityForceEventSeen = 0>>					/* Has the player seen the SF event? Used to avoid re-event */
-<<set $securityForceName = "Security Force">>		/* What is the SF called? */
+<<set $securityForceName = "Special Force">>		/* What is the SF called? */
 <<set $securityForceActive = 0>>					/* SF is active - activates end of turn screen logic */
 
 /* SF control panel and logic */
@@ -1246,10 +1248,9 @@ erectileImplant: 0
 } >>
 
 /* Security Expansion */
-/*
 <<set $secExp = 0>>
 <<set $showSecExp = 0>>
+<<set $wasToggledBefore = 0>>
 <<include "secInit">>
-*/
 
 <<goto "Alpha disclaimer">>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index e498031bbba..6959af341eb 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -600,7 +600,7 @@
 	<<set $DOLFigureHeadFamilyStatuesEscorts = 0>>
 <</if>>
 
-/* SF anon additional Security Force Variables [SFVAR] */
+/* SF anon additional Special Force Variables [SFVAR] */
 
 /* SF control panel and logic */
 <<set $securityForceUpgradeTokenReset = 0>>
@@ -2824,9 +2824,7 @@ Done!
 
 
 /* Sec Exp */
-/*
 <<if $secExp == 1>>
 <br>
 <<include "SecExpBackwardCompatibility">>
-<</if>>
-*/
+<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 81570b9abc8..26292558f0a 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -18,7 +18,7 @@
 /*  reXXXXX.tw:	Random Event														*/
 /*  resXXXX.tw:	Random Event, School												*/
 /*  seXXXXX.tw:	Slave Event, focuses on slaves coming or going						*/
-/*  securityForceXXXXX.tw:  Security Force event									*/
+/*  securityForceXXXXX.tw:  Special (Security) Force event									*/
 /*																					*/
 /* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw			*/
 
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index d64c69abc27..c111887b88c 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -18,7 +18,7 @@
 /*  reXXXXX.tw:	Random Event														*/
 /*  resXXXX.tw:	Random Event, School												*/
 /*  seXXXXX.tw:	Slave Event, focuses on slaves coming or going						*/
-/*  securityForceXXXXX.tw:  Security Force event									*/
+/*  securityForceXXXXX.tw:  Special (Security) Force event									*/
 /*																					*/
 /* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw			*/
 
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 416be854dc4..bd4696ffaba 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -18,7 +18,7 @@
 /*  reXXXXX.tw:	Random Event														*/
 /*  resXXXX.tw:	Random Event, School												*/
 /*  seXXXXX.tw:	Slave Event, focuses on slaves coming or going						*/
-/*  securityForceXXXXX.tw:  Security Force event									*/
+/*  securityForceXXXXX.tw:  Special (Security) Force event									*/
 /*																					*/
 /* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw			*/
 
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index 70aa3e21e7e..22ca2c0a715 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -18,7 +18,7 @@
 /*  reXXXXX.tw:	Random Event														*/
 /*  resXXXX.tw:	Random Event, School												*/
 /*  seXXXXX.tw:	Slave Event, focuses on slaves coming or going						*/
-/*  securityForceXXXXX.tw:  Security Force event									*/
+/*  securityForceXXXXX.tw:  Special (Security) Force event									*/
 /*																					*/
 /* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw			*/
 
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index 04b49a33e70..1c8d32c3667 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -18,7 +18,7 @@
 /*  reXXXXX.tw:	Random Event														*/
 /*  resXXXX.tw:	Random Event, School												*/
 /*  seXXXXX.tw:	Slave Event, focuses on slaves coming or going						*/
-/*  securityForceXXXXX.tw:  Security Force event									*/
+/*  securityForceXXXXX.tw:  Special (Security) Force event									*/
 /*																					*/
 /* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw			*/
 
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 3d74858f593..5a5de4f5d3e 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -18,7 +18,7 @@
 /*  reXXXXX.tw:	Random Event														*/
 /*  resXXXX.tw:	Random Event, School												*/
 /*  seXXXXX.tw:	Slave Event, focuses on slaves coming or going						*/
-/*  securityForceXXXXX.tw:  Security Force event									*/
+/*  securityForceXXXXX.tw:  Special (Security) Force event									*/
 /*																					*/
 /* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw			*/
 
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 19304cd2001..e667fa41742 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -18,7 +18,7 @@
 /*  reXXXXX.tw:	Random Event														*/
 /*  resXXXX.tw:	Random Event, School												*/
 /*  seXXXXX.tw:	Slave Event, focuses on slaves coming or going						*/
-/*  securityForceXXXXX.tw:  Security Force event									*/
+/*  securityForceXXXXX.tw:  Special (Security) Force event									*/
 /*																					*/
 /* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw			*/
 
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index ced62dc6d97..ad95a2a44dc 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -18,7 +18,7 @@
 /*  reXXXXX.tw:	Random Event														*/
 /*  resXXXX.tw:	Random Event, School												*/
 /*  seXXXXX.tw:	Slave Event, focuses on slaves coming or going						*/
-/*  securityForceXXXXX.tw:  Security Force event									*/
+/*  securityForceXXXXX.tw:  Special (Security) Force event									*/
 /*																					*/
 /* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw			*/
 
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 2d1b5c9f599..b79acf2499f 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -5,8 +5,10 @@
 ''SAVES''
 <br>
 This save was created using FC version $ver build $releaseID.
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;[[Apply Backwards Compatibility Update|Backwards Compatibility]]
+<br>&nbsp;&nbsp;&nbsp;&nbsp;[[Apply Backwards Compatibility Update|Backwards Compatibility]]
+<<if $secExp == 1>>
+<br>&nbsp;&nbsp;&nbsp;&nbsp;[[Apply Security Expansion mod backwards compatibility |SecExpBackwardCompatibility]]
+<</if>>
 
 <br>
 <<if ($autosave == 0)>>
@@ -333,9 +335,9 @@ Curative side effects are @@.red;DISABLED@@. [[Enable|Options][$curativeSideEffe
 ''MODS''
 <br>
 <<if ($SFMODToggle == 0)>>
-	The Security Force Mod is @@.red;DISABLED@@. [[Enable|Options][$SFMODToggle = 1]]
+	The Special Force Mod is @@.red;DISABLED@@. [[Enable|Options][$SFMODToggle = 1]]
 <<else>>
-	The Security Force Mod is currently @@.cyan;ENABLED@@. [[Disable|Options][$SFMODToggle = 0]]
+	The Special Force Mod is currently @@.cyan;ENABLED@@. [[Disable|Options][$SFMODToggle = 0]]
 <</if>> //Will not affect mod content that has already been encountered.//
 
 <br>
@@ -346,6 +348,39 @@ Curative side effects are @@.red;DISABLED@@. [[Enable|Options][$curativeSideEffe
 	Cybernetics Mod is currently @@.cyan;ENABLED@@. [[Disable|Options][$cyberMod = 0]]
 <</if>>
 
+<br>
+
+<<if $secExp == 0>>
+	The Security Expansion mod is @@.red;DISABLED@@.
+	<<link "Enable">>
+		<<set $secExp = 1>>
+		<<include "SecExpBackwardCompatibility">>
+		<<if $wasToggledBefore == 0>>
+			<<set $wasToggledBefore = 1>>
+		<</if>>
+		<<goto "Options">>
+	<</link>>
+<<elseif ndef $secExp>>
+	<<set $secExp = 0>>
+	The Security Expansion mod is @@.red;DISABLED@@.
+	<<link "Enable">>
+		<<set $secExp = 1>>
+		<<include "SecExpBackwardCompatibility">>
+		<<if $wasToggledBefore == 0>>
+			<<set $wasToggledBefore = 1>>
+		<</if>>
+		<<goto "Options">>
+	<</link>>
+<<else>>
+	The Security Expansion Mod is currently @@.cyan;ENABLED@@. [[Disable|Options][$secExp = 0]]
+<</if>> 
+//The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late in the game.//
+<<if def $secExp>>
+	<<if $secExp == 1>>
+		<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[[Security Expansion Options|secExpOptions]]
+	<</if>>
+<</if>>
+
 <br><br>
 ''CHEATING/DEV OPTIONS''
 <br>
diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw
index 84b3a7113ae..f04cbbc34c5 100644
--- a/src/uncategorized/securityForceEOWReport.tw
+++ b/src/uncategorized/securityForceEOWReport.tw
@@ -1,6 +1,8 @@
+/* DeleteMe */
 :: Security Force EOW Report
 
-/* The upgrades are currently ordered as:
+/* 
+The upgrades are currently ordered as:
 	Barracks(16)
 		securityForceArcologyUpgrades(16)
 	Armory(11)
@@ -34,7 +36,8 @@
 		securityForceAircraftCarrier(4)
 		securityForceSubmarine(5)
 		securityForceHeavyAmphibiousTransport (3)
-securityForceX */
+securityForceX 
+*/
 <<silently>>
 /* Manpower Fluctuation Calculations - loss from attrition, random casualties, etc. Baseline is ~3%/week. Heavier for raiding/slaving, reduced for securing trade. Maxes out between 1000-1500, though never exactly that. If over 1500 for some reason, set to 1455-1495. If under 100, cannot fluctuate further negatively. */
 
@@ -238,12 +241,12 @@ securityForceX */
 		<<if $securityForceStimulantPower > 0>>								/* (9) 	*/ 						
 			<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceStimulantPower*_RaidingEfficienyPercentage)))>> 
 		<</if>> 
-	<<if $securityForceArcologyUpgrades >= 1>>Garage(7)
+	<<if $securityForceArcologyUpgrades >= 1>>								/* Garage - 7 */
 		<<if $securityForceVehiclePower > 0>>								/* (7)	*/		
 			<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceVehiclePower*_RaidingEfficienyPercentage))>> 
 		<</if>>
-	<</if>> 	
-	<<if $securityForceArcologyUpgrades >= 4>>Hangar(27)
+	<</if>> 
+	<<if $securityForceArcologyUpgrades >= 4>>								/* Hangar - 27 */
 		<<if $securityForceAircraftPower > 0>> 								/*	(8) */					
 			<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceAircraftPower*_RaidingEfficienyPercentage)))>> 
 		<</if>>
@@ -257,23 +260,23 @@ securityForceX */
 			<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceAC130*_RaidingEfficienyPercentage)))>> 
 		<</if>>
 	<</if>>
-	<<if $securityForceArcologyUpgrades >= 2>>Drone Bay(6)
+	<<if $securityForceArcologyUpgrades >= 2>>								/* Drone Bay - 6 */
 		<<if $securityForceDronePower > 0>> 								/*	(6)	*/							
 			<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceDronePower*_RaidingEfficienyPercentage))>> 
 		<</if>>
 	<</if>>
-	<<if $securityForceArcologyUpgrades >= 4>>Launch Bay(29)
-		<<if $securityForceSatalitePower > 0>>	 	/* (17) */
+	<<if $securityForceArcologyUpgrades >= 4>>								/* Launch Bay - 29 */
+		<<if $securityForceSatalitePower > 0>>	 							/* (17) */
 			<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceSatalitePower*_RaidingEfficienyPercentage)))>> 
 		<</if>>
-		<<if $securityForceGiantRobot > 0 && $terrain != "oceanic">> 								/* (9) 	*/		
+		<<if $securityForceGiantRobot > 0 && $terrain != "oceanic">> 		/* (9) 	*/		
 			<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceGiantRobot*_RaidingEfficienyPercentage))>> 
 		<</if>> 
 		<<if $securityForceMissileSilo > 0 && $terrain != "oceanic">> 		/* (3) 	*/
 			<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceMissileSilo*_RaidingEfficienyPercentage))>> 
 		<</if>> 
 	<</if>>
-	<<if $terrain == "oceanic">>Naval Yard (12)
+	<<if $terrain == "oceanic">>											/* Naval Yard - 12 */
 		<<if $securityForceAircraftCarrier > 0>> 							/* (4) */
 			<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*($securityForceAircraftCarrier*_RaidingEfficienyPercentage))>> 
 		<</if>>
@@ -398,7 +401,7 @@ securityForceX */
 <<nobr>>
 	__Status and Activities of the $securityForceName __:
 	<br>This week, $securityForceName, $securityForcePersonnel strong, focused on <<if $securityForceFocus == "recruit">>recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity.<<elseif $securityForceFocus == "secure">>securing the trade routes between the arcology and the surrounding area. Smaller parties ventured out to strike targets of opportunity and process new recruits.
-	<<elseif $securityForceFocus == "raiding">>locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.<</if>> <<if $securityForceStimulantPower == 8>> _OverdoseDeaths soldiers fatly overdosed. The Colonel's much heavier than average drug use saves her from this side effect.<</if>> These activities have, overall, @@.green;improved@@ your arcology's prosperity. <<if $securityForceProfitable == 1>>The goods procured by the $securityForceName this week, after accounting for the spoils retained by individual soldiers, were @@.green;more than sufficient@@ to cover expenses. Excess material and human assets totalling @@.yellowgreen;¤$securityForceIncome@@ (after liquidation) were transferred to your accounts. <<elseif $securityForceProfitable == 0>>The goods procured by the security force were, after accounting for the spoils retained by individual soldiers, @@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability.<</if>> $securityForceName managed to recruit $securityForceRecruit new soldiers this week, and your reputation has @@.green;improved@@ through the improvement of trade security.
+	<<elseif $securityForceFocus == "raiding">>locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.<</if>> <<if $securityForceStimulantPower == 8>> _OverdoseDeaths soldiers fatly overdosed. The Colonel's much heavier than average drug use saves her from this side effect.<</if>> These activities have, overall, @@.green;improved@@ your arcology's prosperity. <<if $securityForceProfitable == 1>>The goods procured by the $securityForceName this week, after accounting for the spoils retained by individual soldiers, were @@.green;more than sufficient@@ to cover expenses. Excess material and human assets totalling @@.yellowgreen;¤$securityForceIncome@@ (after liquidation) were transferred to your accounts. <<elseif $securityForceProfitable == 0>>The goods procured by the special force were, after accounting for the spoils retained by individual soldiers, @@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability.<</if>> $securityForceName managed to recruit $securityForceRecruit new soldiers this week, and your reputation has @@.green;improved@@ through the improvement of trade security.
 	/* FacilitySupportShortSummary */
 	/* <br>
 	<<SlaveFullName $LieutenantColonel>> is the Lieutenant Colonel of $securityForceName, primarly in charge of $FacilitySupportName. There are $FacilitySupportSlaves slaves serving in $FacilitySupportName. The <<if $FacilitySupportUpgrade == 3>>quantum teleportation system greatly improves efficency>><<elseif $FacilitySupportUpgrade == 2>>rapid tube system somewhat improves efficency<<elseif $FacilitySupportUpgrade == 1>>specialized pathways slightly improves efficency<<else>>general pathways does nothing to improve efficency<</if>>  */
diff --git a/src/uncategorized/securityForceProposal.tw b/src/uncategorized/securityForceProposal.tw
index c0dc66b3898..a8fdfd4a9b0 100644
--- a/src/uncategorized/securityForceProposal.tw
+++ b/src/uncategorized/securityForceProposal.tw
@@ -10,7 +10,7 @@ The Free Cities were founded on the principles of unrestrained anarcho-capitalis
 
 In the period since, however, your citizens have seen the value in weaponry. They watched on their news-feed as some Free Cities were sacked by the armies and mobs of the Old World, driven by their hatred of the citizens' luxurious lifestyles. They've seen other Cities toppled from within, by slave conspiracies or infighting among citizen groupings with differing beliefs. They've witnessed the distressingly rapid rise of fanatical anti-slavery organizations, who would like nothing more than to see them slowly bled by their own chattel. They are learned people, and they know what happens to slaveowners who lose their power.
 
-They've also seen the results of your policies. Your actions towards the arming of both yourself and the arcology proved critical, and ensured their safety when the Old World came for them. And your victory over the Daughters of Liberty, who the citizens know would have executed every single one of them, has created an opportunity. If you insisted upon the creation of a standing 'security' force for the arcology, many would support you and, more importantly, nobody of note would object.
+They've also seen the results of your policies. Your actions towards the arming of both yourself and the arcology proved critical, and ensured their safety when the Old World came for them. And your victory over the Daughters of Liberty, who the citizens know would have executed every single one of them, has created an opportunity. If you insisted upon the creation of a standing 'special' force for the arcology, many would support you and, more importantly, nobody of note would object.
 
 Such a force would solve many problems. More soldiers would mean more control, which is very good for you. More soldiers would mean more security for the arcology and the approaches to it, which is very good for business. More soldiers would mean more obedience from rebellious slaves who can see how powerless they truly are, which is very good for everybody. The force would be tiny compared to the Old World militaries that still exist, but money and technology can, of course, overcome massive numerical inferiority. This being the Free Cities, they would have other uses besides security. Perhaps, in time, you could exert some manner of influence on the Old World itself.
 
-- 
GitLab