From 3c571747d151f1aa2cfe1cafe6d9f239ddf569eb Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Tue, 12 Dec 2017 23:06:34 +1300
Subject: [PATCH] More refactoring, recounting and content.

---
 .../SpecialForceBarracksFlavourText.tw        |  84 ++++++++++++
 .../SecForceEX/SpecialForceUpgradeDec.tw      |  10 ++
 .../SecForceEX/SpecialForceUpgradeOptions.tw  | 122 ++++++++++++------
 .../SecForceEX/SpecialForceUpgradeTree.tw     |  18 +--
 src/uncategorized/SFMBarracks.tw              |  85 +-----------
 5 files changed, 185 insertions(+), 134 deletions(-)
 create mode 100644 src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw

diff --git a/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw b/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw
new file mode 100644
index 00000000000..f815dedad67
--- /dev/null
+++ b/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw
@@ -0,0 +1,84 @@
+:: SpecialForceBarracksFlavourText
+
+//You continue towards the common area, the soldiers you pass nodding respectfully, saluting, or giving slight bows, as they please, to you. You pass the briefing areas, the officers and sergeants of the force are conferring over planning tables and display screens regarding their upcoming deployments.//
+
+<br><br>
+
+<div style="margin-left:2em">
+<<if $securityForceFocus == "recruit">>
+	The commanders are viewing lists of potential recruits for $securityForceName, mercenaries and Old World soldiers who might be receptive to an offer of employment and residence within the arcology. In addition to some citizen's of $securityForceName who wish to have some excitement in their lives.
+<<elseif $securityForceFocus == "secure">>
+	The commanders are reviewing maps of trade routes to the arcology as well as those nearby merchant hubs, arranging their future deployments to best protect them and encourage business and trade.
+<<elseif $securityForceFocus == "raiding">>
+	The commanders are reviewing maps of settlements and locations reported to have choice concentrations of material loot and potential slave stock, in preparation for their coming raids.
+<</if>>
+</div>
+
+<div style="margin-left:2em">
+<<if $securityForceRulesOfEngagement == "hold">>
+	There are posted (and very strict) guidelines for the use of force against non-citizens residents, forbidding the use of heavy weapons or indiscriminate fire.
+<<elseif $securityForceRulesOfEngagement == "limited">>
+	There are some guidelines posted regarding the use of force against non-citizens, forbidding general indiscriminate fire.
+<<elseif $securityForceRulesOfEngagement == "free">>
+	Guidelines regarding the use of force are completely absent from the deployment information screens. A note affixed to the screen, probably from a soldier, says: "Pop 'em if you see 'em - better than target practice!". Another one on top of that, from The Colonel, says: "Don't shoot the pretty ones, you fucking morons, or I'll kill you myself. They're worth good money or good for fun - do you idiots really want to have to fuck month-old stock?"
+<</if>>
+</div>
+
+<div style="margin-left:2em">
+<<if $securityForceAccountability == "strict">>
+	On several screens, there are prominent warnings regarding the severe disciplinary procedures that will be taken against soldiers who commit crimes while on deployment.
+<<elseif $securityForceAccountability == "some">>
+	On several screens, there are some minor warnings regarding the mild disciplinary procedures that may be taken against soldiers who commit especially severe crimes while on deployment.
+<<elseif $securityForceAccountability == "none">>
+	There are no warnings or information regarding disciplinary procedures on any of the screens. Near one of them, a waste basket has been dragged over and a soldier has posted a note above it that says: "For Old World Complaints and Warrants."
+<</if>>
+</div>
+
+<br>
+
+//You arrive at the barracks' common area, a nest of bars, pleasure dens, public spaces, and other facilities catering to the soldiers' needs and giving them somewhere to spend their free time, since they do not mingle with your citizens on the higher levels or exit the arcology except on deployment. It is well-occupied by the soldiers not currently tasked with duties, and they respectfully move out of your way as you approach, clearing a path for you to move forward.//
+
+<br><br>
+
+<div style="margin-left:2em">
+<<if $securityForceDepravity <= 0.3 && $ColonelCore == "kind">>
+	The amenities are staffed by menial slaves, captured by the soldiers on their excursions. They are wearing plain jumpsuits and slim identification collars to set them apart from the soldiers, and look resigned but not fearful. The soldiers themselves socialize at the bars, in small groups around tables, and in the gambling parlours. Many of them can be seen entering or leaving the dens occupied by the sexual slaves they have acquired. Laughter from the carousing soldiers can be heard at all times. Small groups of slaves move freely between the plaza and their basic accommodations attached to the barracks.
+<<elseif $securityForceDepravity <= 0.6 && $ColonelCore == "kind">>
+	The amenities are staffed by menial slaves, captured by the soldiers on their excursions. They are topless, wearing only utilitarian pants and leather collars to set them apart from the soldiers, and occasionally shoot fearful looks at the soldiers. The soldiers themselves socialize at the bars, or in large groups around tables, leering at and groping slaves of interest as they pass by. Many of them can be seen entering or leaving the dens occupied by the sexual slaves they have acquired, and often emerge only partially dressed, sometimes pulling half-naked slaves out with them.
+<<elseif $securityForceDepravity <= 0.9>>
+	The amenities are staffed by menial slaves, captured by the soldiers on their excursions. They are topless, wearing only utilitarian shorts and steel collars to set them apart from the soldiers, and often shoot fearful looks at the soldiers. The soldiers themselves socialize at the bars, or in large groups around tables, leering at and heavily groping slaves of interest as they pass by. Many of them can be seen entering or leaving the dens occupied by the sexual slaves they have acquired, and often emerge stark naked, sometimes pulling naked slaves out with them for one last servicing in public. A few soldiers stagger around in drunken hazes or drugged-out stupors.
+<<elseif $securityForceDepravity <= 1.2>>
+	The amenities are staffed by menial slaves, captured by the soldiers on their excursions. They are topless, wearing only a single undergarment and heavy steel collars to set them apart from the soldiers, and often shoot fearful looks at the soldiers. The soldiers occupy themselves primarily with sex, pulling slaves onto benches and fucking them hard in public. Many soldiers stagger around or lie passed out from drug and alcohol abuse.
+<<elseif $securityForceDepravity >= 1.5 && $ColonelCore == "Warmonger" || $ColonelCore != "Shell Shocked">>
+	The amenities are staffed by menial slaves, captured by the soldiers on their excursions. To a one, they are naked, and are wearing heavy shock collars to force obedience. Most are wild-eyed with fear or dull-eyed from mental collapse, and many others bear marks of abuse. Few of the slaves are here long-term, the depraved pleasures of the soldiers resulting in enormous turnover and loss of 'damaged' stock. The extreme libations of the soldiers are ever-present. Drunken soldiers stagger around everywhere, beating slaves too slow to get out of their way. Others lie sprawled out on the ground, rendered senseless from heavy drug abuse. Some walk around naked, and hold slaves down on the benches scattered around, raping or sodomizing them with their cocks or their personal strap-ons as they desire. In alcoves, some soldier-lover pairs fuck loudly, moaning in pleasure.
+	<<if random(1,100) > 50>>
+		Off to the side, a group of soldiers brutally gangbang a very young slave girl, with one soldier buried balls-deep in her ass, another brutally sawing a barbed strap-on in and out of her pussy, and a third with his cock forced deep down her throat. The slave girl struggles and gags, desperate for breath or relief.
+	<<elseif random(1,100) > 50>>
+		Off to the side, a group of soldiers cackle amongst themselves as they take turns beating a very young slave girl with heavy batons. Sickening crunches can be heard from the screaming slave.
+	<<elseif random(1,100) > 75>>
+		Off to the side, still more soldiers crowd around an above-ground pit built from empty crates, gambling on slave gladiator fights. There's a drunken cheer as one of the fighters, a very young slave girl, straddles another one and smashes her face in with a blood-slick ammo crate. As she stands, shaking from fear and adrenaline, one of the soldiers laughs and throws a small incendiary grenade at her, changing the cheers to curses as the other soldiers jump away from the flaming, screeching slave.
+	<<else>>
+		Screams and cries of pain can be heard echoing around the area as the soldiers have their fun with their property.
+	<</if>>
+<<else>>
+	The amenities are staffed by menial slaves, captured by the soldiers on their excursions.
+<</if>>
+</div>
+
+<br>
+
+//In the middle of the common area is a pile of supply crates with a pavilion on top - The Colonel's personal throne and open quarters, the result of her preferring to live an extreme lifestyle amongst her soldiers rather than in her empty quarters on the upper levels. It's draped with the 'flag' of $securityForceName, one of her inventions. Sprawled all around it is an immense quantity of; alcohol, hard drugs,clothes, electronic devices, huge amounts of cash, jewels and precious metals looted from the outside world.//
+
+<br><br>
+
+<div style="margin-left:2em">
+<<if random(1,100) > 50>>
+	_Name raises a hand in greeting and nods as you approach. She is sprawled on a couch, wearing only her combat suit tank top and fingerless gloves. She's holding a near-empty bottle of strong liquor in her hand and you can see a naked slave girl kneeling on the floor between her legs. The Colonel has her legs wrapped tightly around the girl's head, forcing the girl to service her if she wants to breathe. The Colonel is close to her climax then suddenly tenses her lower body thus gripping the girl even tighter and throws her head back in ecstasy as she orgasms. She lets out a long breath finally releasing the girl, giving her a hard smack and shouting at her to fuck off.<br><br> The Colonel finishes off her bottle, tossing it over her shoulder then leaning back on the couch and spreading her legs wide. You look down briefly, falling into your habits of inspection. Her pussy is completely devoid of hair with heavy labia in with a very large and hard clit peaking out. Beads of moisture are visible, the result of her excitation and you can tell from long experience that she would be tight as a vise. You return your gaze to her face to find her smirking at you. "Like what you see, boss?" She waves her hand at the plaza around her, "So do they. But you're not here for pussy. You're here to talk business. So, what's up?"
+<<elseif random(1,100) > 50>>
+	_Name is in no condition initially, to greet you. She's naked except for one sock that gives you a very good view of her muscled, taut body while lunging with her feet on the table and the rest on her couch. She is face down in a drugged-out stupor in the middle of a wide variety of powders and pills. Perhaps sensing your approach, her head suddenly shoots up and looks at you with unfocused, bloodshot eyes. "Sorry, boss," she slurs, wiping her face and weakly holding up a hand. "Hold on a second, I need something to help me out here. Long fucking night." She struggles to sit on the couch and bending over the table, loudly snorts up some of the white powder on it. "Ahhh, fuck," she says, breathing heavily.<br><br> She shakes her head powerfully now looking at you, her eyes once again alert and piercing. "That's better," she says, leaning back on the couch and giving you another good view of her assets. "So, boss," she begins, "what brings you down here to our little clubhouse? I trust you're happy with how we've been handling things out there?" You nod. "excellent" she laughs. "I have to say, it's nice to have a place like this while having some top-end gear and to be able to have fun out there without worrying about anyone coming back on us. Good fucking times." She laughs again. "So - I'm assuming you want something?"
+<<elseif random(1,100) > 70 && $securityForceDepravity >= 1.5>>
+	_Name is relaxing on her couch stark naked, greeting you with a raised hand. Between her tightly clenched legs is a slave girl being forced to eat her out. "Hey, boss, what's -" she breaks off as a flash of pain crosses her features. "Fucking bitch!" she exclaims, pulling her legs away and punching the slave girl in the face. She pushes the girl to the ground, straddling her then begins hitting. You hear one crunch after another as The Colonel's powerful blows shatter the girl's face. She hisses from between clenched teeth, each word accompanied by a brutal punch. "How. Many. Fucking. Times. Have. I. Told. You. To. Watch. Your. Fucking. Teeth. On. My. Fucking. Clit!" She leans back, exhaling heavily. Before leaning back down to grip apply pressure onto the girl's neck with her powerful hands. Wordlessly, she increases the pressure and soon the girl begins to turn blue as she struggles to draw breath. Eventually her struggles weaken and then finally, end.<br><br> The Colonel relaxes her grip then wipes her brow, clearing away the sweat from her exertion. Finally rising from the girl's body, relaxing back on the couch and putting her feet back up on the table. "Sorry about that boss," she says, shrugging. "So many of these bitches we pick up from the outside don't understand that they have to behave." Shaking her head in frustration, "Now I need to find another one. But that's not your problem, you're here to talk business. So, what's up?"
+<<else>>
+	_Name is topless while reviewing the particulars of her unit on a tablet as you approach. She raises a hand in greeting. "Hey boss," she says, noticing you looking at her chest. She laughs. "Nice, aren't they? But they're not for you or them." She throws a thumb at the plaza around her. "You're down here for a reason, though. What can I do for you?"
+<</if>>
+</div>
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
index 8cf357cc0e8..49518fe4eac 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
@@ -277,6 +277,8 @@
 	The drone bay has acquired even lighter advanced armoured combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry along with specialized Drones for reconnaissance, capture, and swarm tactics.
 <<elseif $securityForceDronePower == 7>>
 	The drone bay has acquired even lighter advanced thicker armoured combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry along with specialized Drones for reconnaissance, capture, and swarm tactics.
+<<elseif $securityForceDronePower == 8>>
+	The drone bay has acquired even lighter advanced thicker armoured combat Drones with nanite rather than electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry along with specialized Drones for reconnaissance, capture, and swarm tactics.
 <</if>>
 <</if>>
 
@@ -322,6 +324,8 @@
 		Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 30 cm.
 	<<elseif $securityForceSatellitePower == 18>>
 		Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 15 cm.
+	<<elseif $securityForceSatellitePower == 19>>
+		Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator 50% (now can destroy effected equipment).Provided R&D funds to switch the 15 cm wide beam from lazer to nanites.
 	<</if>>
 <</if>>
 <<if $securityForceGiantRobot > 0>>
@@ -349,6 +353,8 @@
 		Upgraded the giant robot's wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with a basic optical illusion kit.
 	<<elseif $securityForceGiantRobot == 11>>
 		Upgraded the giant robot's wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit.
+	<<elseif $securityForceGiantRobot == 12>>
+		Upgraded the giant robot's wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted nanite rather than electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit.
 	<</if>>
 <</if>>
 <<if $securityForceMissileSilo > 0>>
@@ -378,6 +384,8 @@
 		Modernized the aircraft carrier's electronics and weaponry.
 	<<elseif $securityForceAircraftCarrier == 4>>
 		Modernized the aircraft carrier's electronics, weaponry and armour.
+	<<elseif $securityForceAircraftCarrier == 5>>
+		Modernized the aircraft carrier's electronics, weaponry and armour. Added a EMP generator.
 	<</if>>
 <</if>>
 <<if $securityForceSubmarine > 0>>
@@ -410,6 +418,8 @@
 		Modernized the heavy amphibious transport's armor and speed. Added miniaturized railguns in all four corners.
 	<<elseif $securityForceHeavyAmphibiousTransport == 5>>
 		Modernized the heavy amphibious transport's armor and speed. Added miniaturized railguns in all four corners and a lazer designator in the midle.
+	<<elseif $securityForceHeavyAmphibiousTransport == 6>>
+		Modernized the heavy amphibious transport's armor and speed. Replaced the corner miniaturized railguns with nanite ones while keeping the lazer designator in the midle.
 	<</if>>
 <</if>>
 <</if>>
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
index 6d838b68640..6e2ae9eef10 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
@@ -4,7 +4,9 @@
 <<if ( $SFAO < _max) && $securityForceUpgradeToken == 0>>
 <span id="resultX">
 	<br><br>Which facility or equipment do you wish _Name to upgrade this week?
+<<switch UpgradeOptions>>
 
+	<<case "Barracks">>
 		<<if $securityForceUpgradeToken == 0 && _Barracks < 5>>
 			<br><<link "Barracks">>
 			<<replace "#resultX">><br><br>
@@ -61,6 +63,7 @@
 			<br>//$securityForceName has fully upgraded the barracks to support it's activities//
 		<</if>>
 
+	<<case "Facility Support">>
 		<<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && $FacilitySupport == 0>>
 			<br><<link "Facility Support">>
 				<<replace "#resultX">><br><br>
@@ -70,6 +73,7 @@
 			<</link>> // Costs ¤<<print Math.trunc(150000000*(Math.max(0.99,$SFAO)/10)*$Env)>> //
 		<</if>>
 
+	<<case "Armoury">>
 		<<if $securityForceUpgradeToken == 0 && _Armoury < 5>>
 			<br><<link "Armoury">>
 				<<replace "#resultX">><br><br>
@@ -89,7 +93,8 @@
 			<br>//$securityForceName has fully upgraded the armoury to support it's activities.//
 		<</if>>
 
-			<<if $securityForceUpgradeToken == 0 && _StimulantLab < 5>>
+	<<case "Stimulant Lab">>
+		<<if $securityForceUpgradeToken == 0 && _StimulantLab < 5>>
 			<br><<link "Stimulant Lab">>
 				<<replace "#resultX">><br><br>
 				"Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it."
@@ -122,6 +127,8 @@
 			<br>//$securityForceName has fully upgraded the stimulant lab to support it's activities.//
 		<</if>>
 
+	<<case "Garage">>
+	<<switch GarageUpgrades>>
 		<<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && _Garage < _GarageMax>>
 		<br><<link "Garage">>
 		<<replace "#resultX">>
@@ -131,6 +138,7 @@
 			<<goto "SFM Barracks">>
 		<</link>>
 
+		<<case "Light and medium vehicles">>
 			<<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower < 5>>
 				<br><<link "Light and medium vehicles">>
 					<<replace "#resultB">><br><br>
@@ -157,6 +165,7 @@
 				<br>//More barracks infrastructure upgrades are needed before the vehicle fleet can be expanded.//
 			<</if>>
 
+		<<case "heavy battle tank">>
 			<<if $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank < 1 && $securityForceVehiclePower >= 7>>
 					<br><<link "A heavy battle tank">>
 					<<replace "#resultB">><br><br>
@@ -185,8 +194,11 @@
 		<</replace>>
 		<</link>>
 		<</if>>
+		<</switch>>
 		<<if _Garage >= _GarageMax>>//<br>$securityForceName has fully upgraded the garage to support it's activities.//<</if>>
 
+	<<case "Hangar">>
+	<<switch LaunchBayUpgrades>>
 		<<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && _Hangar < _HangarMax>>
 		<br><<link "Hangar">>
 		<<replace "#resultX">>
@@ -196,6 +208,7 @@
 			<<goto "SFM Barracks">>
 		<</link>>
 
+		<<case "Light and medium aircraft">>
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower < 5>>
 				<br><<link "Light and medium aircraft">>
 					<<replace "#resultY">><br><br>
@@ -228,6 +241,7 @@
 				<br>//More barracks infrastructure upgrades are needed before the air fleet can be expanded.//
 			<</if>>
 
+		<<case "space plane">>
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSpacePlanePower < 1>>
 				<br><<link "A space plane">>
 					<<replace "#resultY">><br><br>
@@ -264,6 +278,7 @@
 				<br>//$securityForceName has fully upgraded the space plane to support it's activities.//
 			<</if>>
 
+		<<case "fortress zeppelin">>
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceFortressZeppelin < 1>>
 				<br><<link "A fortress zeppelin">>
 					<<replace "#resultY">><br><br>
@@ -282,6 +297,7 @@
 				<br>//$securityForceName has fully upgraded the fortress zeppelin to support it's activities.//
 			<</if>>
 
+		<<case "AC130">>
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceAC130 < 1>>
 				<br><<link "An AC-130">>
 					<<replace "#resultY">><br><br>
@@ -301,6 +317,7 @@
 				<br>//$securityForceName has fully upgraded the AC-130 to support it's activities.//
 			<</if>>
 
+		<<case "heavy transport">>
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceHeavyTransport < 1>>
 				<br><<link "A heavy transport">>
 					<<replace "#resultY">><br><br>
@@ -323,8 +340,10 @@
 		<</replace>>
 		<</link>>
 		<</if>>
+	<</switch>>
 		<<if _Hangar >= _HangarMax>>//<br>$securityForceName has fully upgraded the hangar to support it's activities.//<</if>>
 
+	<<case "Drone bay">>
 		<<if $securityForceUpgradeToken == 0 && _DroneBay < 5 && _Barracks >= 2>>
 			<br><<link "Drone bay">>
 				<<replace "#resultX">>
@@ -346,6 +365,8 @@
 			<br>//More barracks infrastructure upgrades are needed before the drone bay can be expanded.//
 		<</if>>
 
+	<<case "Launch Bay">>
+	<<switch LaunchBayUpgrades>>
 		<<if _Barracks >= 4>>
 		<<if $securityForceUpgradeToken == 0 && _LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayNOMax>>
 			<br><<link "Launch Bay">>
@@ -356,6 +377,7 @@
 				<<goto "SFM Barracks">>
 			<</link>>
 
+			<<case "Satellite">>
 				<<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSatellitePower < 1>>
 					<br><<link "A Satellite">>
 						<<replace "#resultZ">><br><br>
@@ -380,6 +402,8 @@
 						<<set _satCost = 250000000000>>
 					<<elseif $securityForceSatellitePower == 17>>
 						<<set _satCost = 250000000000>>
+					<<elseif $securityForceSatellitePower == 18>>
+						<<set _satCost = 300000000000>>
 					<</if>>
 					<br><<link "Satellite">>
 						<<replace "#resultZ">><br><br>
@@ -392,44 +416,48 @@
 					<br>//$securityForceName has fully upgraded the Satellite to support it's activities.//
 				<</if>>
 
-			<<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceGiantRobot < 1 && ($terrain != "oceanic" && $terrain != "marine")>>
-					<br><<link "A giant robot">>
-						<<replace "#resultZ">><br><br>
-						"Sure, boss." she says, nodding. "A giant robot would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
-						<<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*$Env>>
-						<</replace>>
-					<</link>> // Costs ¤<<print 50000000*$Env>> //
-			<<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < _GiantRobotMax>>
-					<<if $securityForceGiantRobot < 3>>
-						<<set _robCost = 25000000>>
-					<<elseif $securityForceGiantRobot == 3>>
-						<<set _robCost = 45000000>>
-					<<elseif $securityForceGiantRobot == 4>>
-						<<set _robCost = 45000000>>
-					<<elseif $securityForceGiantRobot == 5>>
-						<<set _robCost = 65000000>>
-					<<elseif $securityForceGiantRobot == 6>>
-						<<set _robCost = 85000000>>
-					<<elseif $securityForceGiantRobot == 7>>
-						<<set _robCost = 95000000>>
-					<<elseif $securityForceGiantRobot == 8>>
-						<<set _robCost = 105000000>>
-					<<elseif $securityForceGiantRobot == 9 && $securityForceInfantryPower >= 10>>
-						<<set _robCost = 2750000000>>
-					<<elseif $securityForceGiantRobot == 10>>
-						<<set _robCost = 3150000000>>
-					<</if>>
-					<br><<link "Giant robot">>
-						<<replace "#resultZ">><br><br>
-						"Sure, boss." she says, nodding. "Upgrading the giant robot, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
-						<<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env>>
-						<</replace>>
-					<</link>> // Costs ¤<<print _robCost*$Env>> //
-			<</if>>
-				<<if $securityForceGiantRobot == 9 || $securityForceGiantRobot == _GiantRobotMax && ($terrain != "oceanic" && $terrain != "marine")>>
-					<br>//$securityForceName has fully upgraded the giant robot to support it's activities.//
+			<<case "giant robot">>
+				<<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceGiantRobot < 1 && ($terrain != "oceanic" && $terrain != "marine")>>
+						<br><<link "A giant robot">>
+							<<replace "#resultZ">><br><br>
+							"Sure, boss." she says, nodding. "A giant robot would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
+							<<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*$Env>>
+							<</replace>>
+						<</link>> // Costs ¤<<print 50000000*$Env>> //
+				<<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < _GiantRobotMax>>
+						<<if $securityForceGiantRobot < 3>>
+							<<set _robCost = 25000000>>
+						<<elseif $securityForceGiantRobot == 3>>
+							<<set _robCost = 45000000>>
+						<<elseif $securityForceGiantRobot == 4>>
+							<<set _robCost = 45000000>>
+						<<elseif $securityForceGiantRobot == 5>>
+							<<set _robCost = 65000000>>
+						<<elseif $securityForceGiantRobot == 6>>
+							<<set _robCost = 85000000>>
+						<<elseif $securityForceGiantRobot == 7>>
+							<<set _robCost = 95000000>>
+						<<elseif $securityForceGiantRobot == 8>>
+							<<set _robCost = 105000000>>
+						<<elseif $securityForceGiantRobot == 9 && $securityForceInfantryPower >= 10>>
+							<<set _robCost = 2750000000>>
+						<<elseif $securityForceGiantRobot == 10>>
+							<<set _robCost = 3150000000>>
+						<<elseif $securityForceGiantRobot == 11>>
+							<<set _robCost = 3200000000>>
+						<</if>>
+						<br><<link "Giant robot">>
+							<<replace "#resultZ">><br><br>
+							"Sure, boss." she says, nodding. "Upgrading the giant robot, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
+							<<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env>>
+							<</replace>>
+						<</link>> // Costs ¤<<print _robCost*$Env>> //
 				<</if>>
-
+					<<if $securityForceGiantRobot == 9 || $securityForceGiantRobot == _GiantRobotMax && ($terrain != "oceanic" && $terrain != "marine")>>
+						<br>//$securityForceName has fully upgraded the giant robot to support it's activities.//
+					<</if>>
+			
+			<<case "missile silo">>
 			<<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceMissileSilo < 1 && ($terrain != "oceanic" && $terrain != "marine")>>
 					<br><<link "A missile silo">>
 						<<replace "#resultZ">><br><br>
@@ -457,8 +485,11 @@
 			<</link>>
 		<</if>>
 		<</if>>
+	<</switch>>
 		<<if _LaunchBayNO >= _LaunchBayNOMax || _LaunchBayO >= _LaunchBayNOMax>>//<br>$securityForceName has fully upgraded the launch bay to support it's activities.//<</if>>
 
+	<<case "Naval Yard">>
+	<<switch NavalYardUpgrades>>
 		<<if $securityForceUpgradeToken == 0 && ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard < _NavalYardMax)>>
 			<br><<link "Naval Yard">>
 			<<replace "#resultX">>
@@ -467,7 +498,8 @@
 				<<link "Go back">>
 					<<goto "SFM Barracks">>
 				<</link>>
-
+			
+			<<case "aircraft carrier">>
 				<<if $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier < 1>>
 					<br><<link "An aircraft carrier">>
 						<<replace "#resultA">><br><br>
@@ -475,7 +507,7 @@
 						<<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 1500000*$Env>>
 						<</replace>>
 					<</link>> // Costs ¤<<print 1500000*$Env>> //
-				<<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier >= 1 && $securityForceAircraftCarrier < _AmphibiousTransportMax>>
+				<<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier >= 1 && $securityForceAircraftCarrier < _AircraftCarrierMax>>
 					<br><<link "Aircraft carrier">>
 						<<replace "#resultA">><br><br>
 						"Sure, boss." she says, nodding. "Upgrading the aircraft carrier should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
@@ -483,10 +515,11 @@
 						<</replace>>
 					<</link>> // Costs ¤<<print 25000000*$Env>> //
 				<</if>>
-				<<if $securityForceAircraftCarrier == _AmphibiousTransportMax && ($terrain == "oceanic" || $terrain == "marine")>>
+				<<if $securityForceAircraftCarrier == _AircraftCarrierMax && ($terrain == "oceanic" || $terrain == "marine")>>
 					<br>//$securityForceName has fully upgraded the aircraft carrier to support it's activities.//
 				<</if>>
 
+			<<case "submarine">>
 				<<if $securityForceUpgradeToken == 0 && $securityForceSubmarine < 1>>
 					<br><<link "A submarine">>
 						<<replace "#resultA">><br><br>
@@ -509,6 +542,7 @@
 				<</if>>
 				<<if $securityForceSubmarine == _SubmarineMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the submarine to support it's activities.//<</if>>
 
+			<<case "heavy amphibious transport">>
 				<<if $securityForceUpgradeToken == 0 && $securityForceHeavyAmphibiousTransport < 1>>
 					<br><<link "A heavy amphibious transport">>
 						<<replace "#resultA">><br><br>
@@ -525,6 +559,8 @@
 						<<set _hatCost = 300000000>>
 					<<elseif $securityForceHeavyAmphibiousTransport == 4>>
 						<<set _hatCost = 350000000>>
+					<<elseif $securityForceHeavyAmphibiousTransport == 5>>
+						<<set _hatCost = 400000000>>
 					<</if>>
 					<br><<link "Heavy amphibious transport">>
 						<<replace "#resultA">><br><br>
@@ -539,8 +575,10 @@
 			<</replace>>
 			<</link>>
 		<</if>>
+		<</switch>>
 		<<if ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard >= _NavalYardMax)>><br>$securityForceName has fully upgraded the naval yard to support it's activities.//<</if>>
 
+<</switch>>
 </span>
 <</if>>
-<</nobr>>
\ No newline at end of file
+<</nobr>>
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
index 56b806e51de..a0265b29fe1 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
@@ -27,22 +27,22 @@
 	<<set _heavyTransportMax = 4>>
 
 <<set _DroneBay = $securityForceDronePower>>
-	<<set _DroneBayMax = 7>>
+	<<set _DroneBayMax = 8>>
 
 <<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>>
-<<set _LaunchBayNOMax = 32>>
-	<<set _SatelliteMax = 18>>
-	<<set _GiantRobotMax = 11>>
+<<set _LaunchBayNOMax = 34>>
+	<<set _SatelliteMax = 19>>
+	<<set _GiantRobotMax = 12>>
 	<<set _MissileSiloMax = 3>>
 
 <<set _LaunchBayO = $securityForceSatellitePower>>
-	<<set _LaunchBayOMax = 18>>
-	<<set _SatelliteMax = 18>>
+	<<set _LaunchBayOMax = 19>>
+	<<set _SatelliteMax = 19>>
 
-<<set _NavalYardMax = 15>>
-	<<set _AmphibiousTransportMax = 4>>
+<<set _NavalYardMax = 17>>
+	<<set _AircraftCarrierMax = 5>>
 	<<set _SubmarineMax = 6>>
-	<<set _HeavyAmphibiousTransportMax = 5>>
+	<<set _HeavyAmphibiousTransportMax = 6>>
 
 <<set _maxNO = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax+_FacilitySupportMax>>
 <<set _maxO = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayOMax+_NavalYardMax+_FacilitySupportMax>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index 0c5cee15676..8c6b91c7430 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -39,88 +39,7 @@
 <<include "SpecialForceUpgradeDec">>
 <br><br>
 
-//You continue towards the common area, the soldiers you pass nodding respectfully, saluting, or giving slight bows, as they please, to you. You pass the briefing areas, the officers and sergeants of the force are conferring over planning tables and display screens regarding their upcoming deployments.//
-
-<br><br>
-
-<div style="margin-left:2em">
-<<if $securityForceFocus == "recruit">>
-	The commanders are viewing lists of potential recruits for $securityForceName, mercenaries and Old World soldiers who might be receptive to an offer of employment and residence within the arcology. In addition to some citizen's of $securityForceName who wish to have some excitement in their lives.
-<<elseif $securityForceFocus == "secure">>
-	The commanders are reviewing maps of trade routes to the arcology as well as those nearby merchant hubs, arranging their future deployments to best protect them and encourage business and trade.
-<<elseif $securityForceFocus == "raiding">>
-	The commanders are reviewing maps of settlements and locations reported to have choice concentrations of material loot and potential slave stock, in preparation for their coming raids.
-<</if>>
-</div>
-
-<div style="margin-left:2em">
-<<if $securityForceRulesOfEngagement == "hold">>
-	There are posted (and very strict) guidelines for the use of force against non-citizens residents, forbidding the use of heavy weapons or indiscriminate fire.
-<<elseif $securityForceRulesOfEngagement == "limited">>
-	There are some guidelines posted regarding the use of force against non-citizens, forbidding general indiscriminate fire.
-<<elseif $securityForceRulesOfEngagement == "free">>
-	Guidelines regarding the use of force are completely absent from the deployment information screens. A note affixed to the screen, probably from a soldier, says: "Pop 'em if you see 'em - better than target practice!". Another one on top of that, from The Colonel, says: "Don't shoot the pretty ones, you fucking morons, or I'll kill you myself. They're worth good money or good for fun - do you idiots really want to have to fuck month-old stock?"
-<</if>>
-</div>
-
-<div style="margin-left:2em">
-<<if $securityForceAccountability == "strict">>
-	On several screens, there are prominent warnings regarding the severe disciplinary procedures that will be taken against soldiers who commit crimes while on deployment.
-<<elseif $securityForceAccountability == "some">>
-	On several screens, there are some minor warnings regarding the mild disciplinary procedures that may be taken against soldiers who commit especially severe crimes while on deployment.
-<<elseif $securityForceAccountability == "none">>
-	There are no warnings or information regarding disciplinary procedures on any of the screens. Near one of them, a waste basket has been dragged over and a soldier has posted a note above it that says: "For Old World Complaints and Warrants."
-<</if>>
-</div>
-
-<br>
-
-//You arrive at the barracks' common area, a nest of bars, pleasure dens, public spaces, and other facilities catering to the soldiers' needs and giving them somewhere to spend their free time, since they do not mingle with your citizens on the higher levels or exit the arcology except on deployment. It is well-occupied by the soldiers not currently tasked with duties, and they respectfully move out of your way as you approach, clearing a path for you to move forward.//
-
-<br><br>
-
-<div style="margin-left:2em">
-<<if $securityForceDepravity <= 0.3 && $ColonelCore == "kind">>
-	The amenities are staffed by menial slaves, captured by the soldiers on their excursions. They are wearing plain jumpsuits and slim identification collars to set them apart from the soldiers, and look resigned but not fearful. The soldiers themselves socialize at the bars, in small groups around tables, and in the gambling parlours. Many of them can be seen entering or leaving the dens occupied by the sexual slaves they have acquired. Laughter from the carousing soldiers can be heard at all times. Small groups of slaves move freely between the plaza and their basic accommodations attached to the barracks.
-<<elseif $securityForceDepravity <= 0.6 && $ColonelCore == "kind">>
-	The amenities are staffed by menial slaves, captured by the soldiers on their excursions. They are topless, wearing only utilitarian pants and leather collars to set them apart from the soldiers, and occasionally shoot fearful looks at the soldiers. The soldiers themselves socialize at the bars, or in large groups around tables, leering at and groping slaves of interest as they pass by. Many of them can be seen entering or leaving the dens occupied by the sexual slaves they have acquired, and often emerge only partially dressed, sometimes pulling half-naked slaves out with them.
-<<elseif $securityForceDepravity <= 0.9>>
-	The amenities are staffed by menial slaves, captured by the soldiers on their excursions. They are topless, wearing only utilitarian shorts and steel collars to set them apart from the soldiers, and often shoot fearful looks at the soldiers. The soldiers themselves socialize at the bars, or in large groups around tables, leering at and heavily groping slaves of interest as they pass by. Many of them can be seen entering or leaving the dens occupied by the sexual slaves they have acquired, and often emerge stark naked, sometimes pulling naked slaves out with them for one last servicing in public. A few soldiers stagger around in drunken hazes or drugged-out stupors.
-<<elseif $securityForceDepravity <= 1.2>>
-	The amenities are staffed by menial slaves, captured by the soldiers on their excursions. They are topless, wearing only a single undergarment and heavy steel collars to set them apart from the soldiers, and often shoot fearful looks at the soldiers. The soldiers occupy themselves primarily with sex, pulling slaves onto benches and fucking them hard in public. Many soldiers stagger around or lie passed out from drug and alcohol abuse.
-<<elseif $securityForceDepravity >= 1.5 && $ColonelCore == "Warmonger" || $ColonelCore != "Shell Shocked">>
-	The amenities are staffed by menial slaves, captured by the soldiers on their excursions. To a one, they are naked, and are wearing heavy shock collars to force obedience. Most are wild-eyed with fear or dull-eyed from mental collapse, and many others bear marks of abuse. Few of the slaves are here long-term, the depraved pleasures of the soldiers resulting in enormous turnover and loss of 'damaged' stock. The extreme libations of the soldiers are ever-present. Drunken soldiers stagger around everywhere, beating slaves too slow to get out of their way. Others lie sprawled out on the ground, rendered senseless from heavy drug abuse. Some walk around naked, and hold slaves down on the benches scattered around, raping or sodomizing them with their cocks or their personal strap-ons as they desire. In alcoves, some soldier-lover pairs fuck loudly, moaning in pleasure.
-	<<if random(1,100) > 50>>
-		Off to the side, a group of soldiers brutally gangbang a very young slave girl, with one soldier buried balls-deep in her ass, another brutally sawing a barbed strap-on in and out of her pussy, and a third with his cock forced deep down her throat. The slave girl struggles and gags, desperate for breath or relief.
-	<<elseif random(1,100) > 50>>
-		Off to the side, a group of soldiers cackle amongst themselves as they take turns beating a very young slave girl with heavy batons. Sickening crunches can be heard from the screaming slave.
-	<<elseif random(1,100) > 75>>
-		Off to the side, still more soldiers crowd around an above-ground pit built from empty crates, gambling on slave gladiator fights. There's a drunken cheer as one of the fighters, a very young slave girl, straddles another one and smashes her face in with a blood-slick ammo crate. As she stands, shaking from fear and adrenaline, one of the soldiers laughs and throws a small incendiary grenade at her, changing the cheers to curses as the other soldiers jump away from the flaming, screeching slave.
-	<<else>>
-		Screams and cries of pain can be heard echoing around the area as the soldiers have their fun with their property.
-	<</if>>
-<<else>>
-	The amenities are staffed by menial slaves, captured by the soldiers on their excursions.
-<</if>>
-</div>
-
-<br>
-
-//In the middle of the common area is a pile of supply crates with a pavilion on top - The Colonel's personal throne and open quarters, the result of her preferring to live an extreme lifestyle amongst her soldiers rather than in her empty quarters on the upper levels. It's draped with the 'flag' of $securityForceName, one of her inventions. Sprawled all around it is an immense quantity of; alcohol, hard drugs,clothes, electronic devices, huge amounts of cash, jewels and precious metals looted from the outside world.//
-
-<br><br>
-
-<div style="margin-left:2em">
-<<if random(1,100) > 50>>
-	_Name raises a hand in greeting and nods as you approach. She is sprawled on a couch, wearing only her combat suit tank top and fingerless gloves. She's holding a near-empty bottle of strong liquor in her hand and you can see a naked slave girl kneeling on the floor between her legs. The Colonel has her legs wrapped tightly around the girl's head, forcing the girl to service her if she wants to breathe. The Colonel is close to her climax then suddenly tenses her lower body thus gripping the girl even tighter and throws her head back in ecstasy as she orgasms. She lets out a long breath finally releasing the girl, giving her a hard smack and shouting at her to fuck off.<br><br> The Colonel finishes off her bottle, tossing it over her shoulder then leaning back on the couch and spreading her legs wide. You look down briefly, falling into your habits of inspection. Her pussy is completely devoid of hair with heavy labia in with a very large and hard clit peaking out. Beads of moisture are visible, the result of her excitation and you can tell from long experience that she would be tight as a vise. You return your gaze to her face to find her smirking at you. "Like what you see, boss?" She waves her hand at the plaza around her, "So do they. But you're not here for pussy. You're here to talk business. So, what's up?"
-<<elseif random(1,100) > 50>>
-	_Name is in no condition initially, to greet you. She's naked except for one sock that gives you a very good view of her muscled, taut body while lunging with her feet on the table and the rest on her couch. She is face down in a drugged-out stupor in the middle of a wide variety of powders and pills. Perhaps sensing your approach, her head suddenly shoots up and looks at you with unfocused, bloodshot eyes. "Sorry, boss," she slurs, wiping her face and weakly holding up a hand. "Hold on a second, I need something to help me out here. Long fucking night." She struggles to sit on the couch and bending over the table, loudly snorts up some of the white powder on it. "Ahhh, fuck," she says, breathing heavily.<br><br> She shakes her head powerfully now looking at you, her eyes once again alert and piercing. "That's better," she says, leaning back on the couch and giving you another good view of her assets. "So, boss," she begins, "what brings you down here to our little clubhouse? I trust you're happy with how we've been handling things out there?" You nod. "excellent" she laughs. "I have to say, it's nice to have a place like this while having some top-end gear and to be able to have fun out there without worrying about anyone coming back on us. Good fucking times." She laughs again. "So - I'm assuming you want something?"
-<<elseif random(1,100) > 70 && $securityForceDepravity >= 1.5>>
-	_Name is relaxing on her couch stark naked, greeting you with a raised hand. Between her tightly clenched legs is a slave girl being forced to eat her out. "Hey, boss, what's -" she breaks off as a flash of pain crosses her features. "Fucking bitch!" she exclaims, pulling her legs away and punching the slave girl in the face. She pushes the girl to the ground, straddling her then begins hitting. You hear one crunch after another as The Colonel's powerful blows shatter the girl's face. She hisses from between clenched teeth, each word accompanied by a brutal punch. "How. Many. Fucking. Times. Have. I. Told. You. To. Watch. Your. Fucking. Teeth. On. My. Fucking. Clit!" She leans back, exhaling heavily. Before leaning back down to grip apply pressure onto the girl's neck with her powerful hands. Wordlessly, she increases the pressure and soon the girl begins to turn blue as she struggles to draw breath. Eventually her struggles weaken and then finally, end.<br><br> The Colonel relaxes her grip then wipes her brow, clearing away the sweat from her exertion. Finally rising from the girl's body, relaxing back on the couch and putting her feet back up on the table. "Sorry about that boss," she says, shrugging. "So many of these bitches we pick up from the outside don't understand that they have to behave." Shaking her head in frustration, "Now I need to find another one. But that's not your problem, you're here to talk business. So, what's up?"
-<<else>>
-	_Name is topless while reviewing the particulars of her unit on a tablet as you approach. She raises a hand in greeting. "Hey boss," she says, noticing you looking at her chest. She laughs. "Nice, aren't they? But they're not for you or them." She throws a thumb at the plaza around her. "You're down here for a reason, though. What can I do for you?"
-<</if>>
-</div>
+<<include "SpecialForceBarracksFlavourText">>
 
 <<if $securityForceGiftToken == 0>>
 <br>
@@ -657,4 +576,4 @@
 		<</link>>
 	</span>
 <</if>>
-<</nobr>>
\ No newline at end of file
+<</nobr>>
-- 
GitLab