diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index e6088bd3262757eb94857433a09461d8aa5ed4bc..68a75abaa0c58ee37f52297d8050031faf5e645f 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2772,7 +2772,7 @@ LORE: INTERVIEWS
A specialized organic implant produced from the dispensary designed to be implanted into to a slave's natural breast tissue to maintain a slave's breast shape no matter how big her breasts may grow. An expensive and risky procedure proportional to the size of the breasts the mesh will be implanted into. Should health become an issue, the slave in surgery may undergo an emergency mastectomy. Furthermore, once implanted, the mesh cannot be safely removed from the breast. However, total breast removal will rid the slave of the implant; consider strongly when and if you want to implant the mesh before doing so. They are exceedingly difficult to identify once bound to the breast tissue, and combined with their natural shape, are often overlooked.
<<case "Nipple Conversion - Penetratable">>
- By taking extremely large nipples and inverting them into an adequately sized breast, it is possible to use an advanced surgical suite to create a cavity suitable for penetration. Early attempts found that the novelty of fucking a tit did not offset the discomfort of ramming one's dick into a solid object and as such, the surgery is only applicable to slaves with at least 500ccs of breast tissue per boob. Milk production is unhindered by the alterations, though non-machine milking is far more difficult without a nipple to grab and it is unlikely to be able to properly nourish a child. Arousal is also expressed differently, as the nipple can not stiffen any longer; instead, engorgement causes the newly crafted passage to tighten, adding to the pleasure of using the unorthodox hole. While looseness is no issue, and the orifice quite capable of stretching around an intruding shaft, depth can become a problem; even the most average of slave owners will find themselves bottoming out far sooner than they would like. Fortunately, this downside is offset by the novelty of the act and the capacity to push the nipple itself deeper into the slave's breast to better accommodate one's cock. In this case, bigger really is better.
+ By taking extremely large nipples and inverting them into an adequately sized breast, it is possible to use an advanced surgical suite to create a cavity suitable for penetration. Early attempts found that the novelty of fucking a tit did not offset the discomfort of ramming one's dick into a solid object and as such, the surgery is only applicable to slaves with at least 500ccs of breast tissue per boob. Milk production is unhindered by the alterations, though non-machine milking is far more difficult without a nipple to grab and it is unlikely to be able to properly nourish a child. Arousal is also expressed differently, as the nipple cannot stiffen any longer; instead, engorgement causes the newly crafted passage to tighten, adding to the pleasure of using the unorthodox hole. While looseness is no issue, and the orifice quite capable of stretching around an intruding shaft, depth can become a problem; even the most average of slave owners will find themselves bottoming out far sooner than they would like. Fortunately, this downside is offset by the novelty of the act and the capacity to push the nipple itself deeper into the slave's breast to better accommodate one's cock. In this case, bigger really is better.
<<case "Ejaculation Boosting Prostate Implant">>
An additional prostate implant designed to hyperstimulate one's prostate and store the resulting fluid for release during ejaculation in a specialized reservoir. An easy way to tell if the precum soaked slave you are fucking is sporting this implant is the distinct swelling in her lower belly as she nears release. Due to the sheer amount of prostate fluid released, sperm per volume is greatly reduced, devastating profits of those looking to sell cum. Remember to keep your slaves well hydrated!
diff --git a/src/npc/descriptions/fFuckdollWidgets.tw b/src/npc/descriptions/fFuckdollWidgets.tw
index e90b554b20bd09298be4483c203e363f06fc00cc..33ef519ed0f7df2a74f57234ddb657a41dbb218d 100644
--- a/src/npc/descriptions/fFuckdollWidgets.tw
+++ b/src/npc/descriptions/fFuckdollWidgets.tw
@@ -47,7 +47,7 @@ You decide to use the Fuckdoll's <<if $activeSlave.vagina > 3>>cavernous<<elseif
<<elseif $activeSlave.fuckdoll <= 70>>
It can follow intermediate commands, so you order it into a position for use of its front hole. It obediently <<if $activeSlave.amp == 0>>gets down on all fours and <</if>>cocks its hips, offering its cunt until you insert <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>> into its wet channel.
<<else>>
- It can follow advanced commands, so you bring it over to your chair <<if $activeSlave.amp == 0>>and order it to squat down onto your <<if $PC.dick == 1>>cock<<else>>strap-on<</if>> and ride.<<else>>and impale it on <<if $PC.dick == 1>>your cock<<else>>your strap-on<</if>>, ordering it to do its feeble best to bounce.<</if>>
+ It can follow advanced commands, so you bring it over to your chair <<if $activeSlave.amp == 0>>and order it to squat down onto your <<if $PC.dick == 1>>cock<<else>>strap-on<</if>> and ride.<<else>>and impale it on <<if $PC.dick == 1>>your cock<<else>>your strap-on<</if>>, ordering it to do its feeble best to bounce.<</if>>
<</if>>
<<if $activeSlave.fuckdoll <= 20>>
It's not fully used to being raped without warning, so it struggles, its muscles spasming delightfully.
@@ -110,7 +110,7 @@ You decide to use the Fuckdoll's fertile womb to grow a child.
<<elseif $activeSlave.fuckdoll <= 70>>
It can follow intermediate commands, so you order it into a position for use of its <<if $activeSlave.mpreg == 1>>rear<<else>>front<</if>> hole. It obediently <<if $activeSlave.amp == 0>>gets down on all fours and <</if>>cocks its hips, offering its <<if $activeSlave.mpreg == 1>>asspussy<<else>>cunt<</if>> until you insert your cock into its <<if $activeSlave.mpreg == 1>>winking<<else>>wet<</if>> channel.
<<else>>
- It can follow advanced commands, so you bring it over to your chair <<if $activeSlave.amp == 0>>and order it to squat down onto your cock and ride.<<else>>and impale it on your cock, ordering it to do its feeble best to bounce.<</if>>
+ It can follow advanced commands, so you bring it over to your chair <<if $activeSlave.amp == 0>>and order it to squat down onto your cock and ride.<<else>>and impale it on your cock, ordering it to do its feeble best to bounce.<</if>>
<</if>>
<<if $activeSlave.fuckdoll <= 20>>
It's not fully used to being raped without warning, so it struggles, its muscles spasming delightfully.
@@ -190,7 +190,7 @@ You decide to use the Fuckdoll's <<if $activeSlave.anus > 3>>gaping<<elseif $act
<<elseif $activeSlave.fuckdoll <= 80>>
It can follow intermediate commands, so you order it to present its rear hole. It obediently <<if $activeSlave.amp == 0>>bends over, arches its back, and<<else>>flips over and<</if>> winks its anus until you insert <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>>.
<<else>>
- It can follow advanced commands, so you bring it over to your chair <<if $activeSlave.amp == 0>>and order it to squat down onto your <<if $PC.dick == 1>>cock<<else>>strap-on<</if>> and slide its anus up and down <<if $PC.dick == 1>>your<<else>>the<</if>> shaft.<<else>>and impale it on <<if $PC.dick == 1>>your cock<<else>>your strap-on<</if>>, ordering it to do its feeble best to bounce.<</if>>
+ It can follow advanced commands, so you bring it over to your chair <<if $activeSlave.amp == 0>>and order it to squat down onto your <<if $PC.dick == 1>>cock<<else>>strap-on<</if>> and slide its anus up and down <<if $PC.dick == 1>>your<<else>>the<</if>> shaft.<<else>>and impale it on <<if $PC.dick == 1>>your cock<<else>>your strap-on<</if>>, ordering it to do its feeble best to bounce.<</if>>
<</if>>
<<if $activeSlave.fuckdoll <= 20>>
It's not fully used to having things suddenly forced up its ass, so it struggles, and its sphincter spasms deliciously.
diff --git a/src/npc/importSlave.tw b/src/npc/importSlave.tw
index 411dcd863b40846be40f5e26d22f666c4d530f88..3cf9c6d207ffb86b6a3958751a53f7ef1cf50e40 100644
--- a/src/npc/importSlave.tw
+++ b/src/npc/importSlave.tw
@@ -32,4 +32,3 @@
<<link "Continue">>
<<goto "Slave Interact">>
<</link>>
-
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
index 985fffd4110916fad44cc0352535b2332e78ef75..cebd38e90ffb9a82dcbfba1437ef1d1620b231de 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
@@ -3,13 +3,13 @@
''Barracks:''
<<switch $securityForceArcologyUpgrades>>
<<case 0>>
- Is currently quite basic, consisting of little more than a dormitory, armoury, a processing facility for human spoils, and a common area, sectioned off by stacks of empty supply crates. The cavernous space, however, is ripe for expansion.
+ Is currently quite basic, consisting of little more than a dormitory, armory, a processing facility for human spoils, and a common area, sectioned off by stacks of empty supply crates. The cavernous space, however, is ripe for expansion.
<<case 1>>
Has become more permanent, expanding into free space, erecting permanent dividers, and sectioning off an area for use as a garage and vehicle maintenance bay.
<<case 2>>
Has added a facility for the storage, maintenance, and deployment of armed combat drones, and added storage facilities for the soldiers to store their personal spoils in.
<<case 3>>
- Has added additional support personnel and equipment, allowing the potential procurement of heavier infantry armour, fighting vehicles, and combat drones.
+ Has added additional support personnel and equipment, allowing the potential procurement of heavier infantry armor, fighting vehicles, and combat drones.
<<case 4>>
Has expanded tremendously, adding an aerial control facility and express elevator connecting to a ring of launch pads and hangars built around the arcology's upper levels. Additional facilities have been added for soldier recreation, and Spartan quarters for live-in slaves, both menial and service, have been installed.
<<case 5>>
@@ -19,26 +19,26 @@
<<case 7>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As a final measure, quad heavy, long range, electromagnetic railgun artillery pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads, giving $securityForceName an immense superiority in local firepower.
<<case 8>>
- Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
+ Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic force field has been installed, giving $securityForceName an immense superiority in local firepower.
<<case 9>>
- Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery 356 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
+ Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery 356 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic force field has been installed, giving $securityForceName an immense superiority in local firepower.
<<case 10>>
- Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
+ Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic force field has been installed, giving $securityForceName an immense superiority in local firepower.
<<case 11>>
- Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, double-barrelled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
+ Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, double-barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic force field has been installed, giving $securityForceName an immense superiority in local firepower.
<<case 12>>
- Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri-barrelled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
+ Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri-barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic force field has been installed, giving $securityForceName an immense superiority in local firepower.
<<case 13>>
- Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri-barrelled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
+ Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri-barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic force field has been installed, giving $securityForceName an immense superiority in local firepower.
<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.
<<case 14>>
- Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri-barrelled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
+ Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri-barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic force field has been installed, giving $securityForceName an immense superiority in local firepower.
<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network. <br>'Borrowed' old world designs for a kill house.
<<case 15>>
- Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri-barrelled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
+ Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri-barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic force field has been installed, giving $securityForceName an immense superiority in local firepower.
<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network. <br>Added electronics to the kill house.
<<case 16>>
- Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri-barrelled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
+ Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri-barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic force field has been installed, giving $securityForceName an immense superiority in local firepower.
<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network. <br>Added VR support to the kill house.
<</switch>>
@@ -293,7 +293,7 @@
<<case 0>>
Contains a small number of 're-purposed' non-military drones from the arcology's original contingent.
<<case 1>>
- Replaced the security drones with basic, lightly-armoured military combat models possessing integrated small arms.
+ Replaced the security drones with basic, lightly-armored military combat models possessing integrated small arms.
<<case 2>>
Replaced its basic military drones with more advanced models and added a number of support drones carrying heavy weaponry to its fleet.
<<case 3>>
@@ -303,11 +303,11 @@
<<case 5>>
Improved the electromagnetic armament of its drones by mounting both miniaturized and heavy railguns on them. In addition further sourcing numerous models of drones for roles as diverse as reconnaissance, independent slave capture and swarming tactics.
<<case 6>>
- 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.
+ Acquired even lighter advanced armored combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry along with specialized Drones for reconnaissance, capture, and swarm tactics.
<<case 7>>
- 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.
+ Acquired even lighter advanced thicker armored combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry along with specialized Drones for reconnaissance, capture, and swarm tactics.
<<case 8>>
- 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.
+ Acquired even lighter advanced thicker armored 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.
<</switch>>
<</if>>
@@ -322,41 +322,41 @@
<<case 2>>
Modernized the electronics.
<<case 3>>
- Modernized the electronics, wiring and circuitry.
+ Modernized the electronics, wiring, and circuitry.
<<case 4>>
- Modernized the electronics, wiring and circuitry. Installed a basic localized communications jammer to the Satellite (excludes your own frequencies with little to no leeway) that will "slightly" anger locals until it is deactivated.
+ Modernized the electronics, wiring, and circuitry. Installed a basic localized communications jammer to the Satellite (excludes your own frequencies with little to no leeway) that will "slightly" anger locals until it is deactivated.
<<case 5>>
- Modernized the electronics, wiring and circuitry. An advanced communications jammer is installed in the Satellite, increasing the AO localization, reducing the number of affected equipment.
+ Modernized the electronics, wiring, and circuitry. An advanced communications jammer is installed in the Satellite, increasing the AO localization, reducing the number of affected equipment.
<<case 6>>
- Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer power by 25% (now can damage affected equipment).
+ Modernized the electronics, wiring, and circuitry. Boosted the advanced comms jammer power by 25% (now can damage affected equipment).
<<case 7>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment).
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment).
<<case 8>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment). The Satellite is now equipped with a basic EMP generator (advanced EMP hardening was applied before the insulation and activation) that will "slightly" anger locals until it is deactivated.
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment). The Satellite is now equipped with a basic EMP generator (advanced EMP hardening was applied before the insulation and activation) that will "slightly" anger locals until it is deactivated.
<<case 9>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment). The Satellite is now equipped with an advanced EMP generator by, increasing the AO localization which reduces the quantity of affected equipment.
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment). The Satellite is now equipped with an advanced EMP generator by, increasing the AO localization which reduces the quantity of affected equipment.
<<case 10>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 25% (now can damage affected equipment).
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 25% (now can damage affected equipment).
<<case 11>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment).
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment).
<<case 12>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to be able to shoot a concentrated beam of pure energy that is able to level an entire city block. It required overhauling the battery system and shielding.
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to be able to shoot a concentrated beam of pure energy that is able to level an entire city block. It required overhauling the battery system and shielding.
<<case 13>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to focus the beam enough to level a suburb.
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to focus the beam enough to level a suburb.
<<case 14>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to focus the beam enough to level a block of houses.
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to focus the beam enough to level a block of houses.
<<case 15>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to focus the beam enough to level a single house.
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to focus the beam enough to level a single house.
<<case 16>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to focus the beam enough to level 366 cm.
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to focus the beam enough to level 366 cm.
<<case 17>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to focus the beam enough to level 30 cm.
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to focus the beam enough to level 30 cm.
<<case 18>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to focus the beam enough to level 15 cm.
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to focus the beam enough to level 15 cm.
<<case 19>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to switch the 15 cm wide beam from laser to nanites.
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to switch the 15 cm wide beam from laser to nanites.
<<case 20>>
- Modernized the electronics, wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to switch the 15 cm wide beam from laser to nanites and allow the beam to be split (if needed).
+ Modernized the electronics, wiring, and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to switch the 15 cm wide beam from laser to nanites and allow the beam to be split (if needed).
<<case 21>>
Modernized the electronics (in addition to overclocking), wiring and circuitry. Boosted the power of the advanced comms jammer by 50% (now can destroy affected equipment) and the output of the advanced EMP generator by 50% (now can destroy affected equipment). Provided R&D funds to switch the 15 cm wide beam from laser to nanites and allow the beam to be split (if needed).
<</switch>>
@@ -369,33 +369,33 @@
<<case 2>>
Upgraded the wiring and circuitry.
<<case 3>>
- Upgraded the wiring, circuitry and power efficiency.
+ Upgraded the wiring, circuitry, and power efficiency.
<<case 4>>
- Upgraded the wiring, circuitry and power efficiency. Reduced the weight.
+ Upgraded the wiring, circuitry, and power efficiency. Reduced the weight.
<<case 5>>
- Upgraded the wiring, circuitry, power efficiency and battery capacity. Reduced the weight.
+ Upgraded the wiring, circuitry, power efficiency, and battery capacity. Reduced the weight.
<<case 6>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity and armour. Reduced the weight.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, and armor. Reduced the weight.
<<case 7>>
- Upgraded the 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.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armor and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons.
<<case 8>>
- Upgraded the 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.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armor 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.
<<case 9>>
- Upgraded the 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. Increased the number of pilots to two via a synced neural link. Improved the life support systems, allowing for longer operational time.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armor and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons. Increased the number of pilots to two via a synced neural link. Improved the life support systems, allowing for longer operational time.
<<case 10>>
- Upgraded the 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. Increased the number 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.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armor and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons. Increased the number 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.
<<case 11>>
- Upgraded the 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. Increased the number 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.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armor and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons. Increased the number 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.
<<case 12>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons. Increased the number 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.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armor and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons. Increased the number 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.
<<case 13>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons. Increased the number 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. Added hover capabilities.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armor and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons. Increased the number 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. Added hover capabilities.
<<case 14>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons and a massive wrist mounted shield. Increased the number 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. Added hover capabilities.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armor and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons and a massive wrist mounted shield. Increased the number 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. Added hover capabilities.
<<case 15>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons, a massive wrist mounted shield and electric fists. Increased the number 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. Added hover capabilities.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armor and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons, a massive wrist mounted shield and electric fists. Increased the number 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. Added hover capabilities.
<<case 16>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons, a massive wrist mounted shield and electric fists. Increased the number 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. Added hover capabilities. Overclocked the movement systems allowing for greater mobility.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armor and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons, a massive wrist mounted shield and electric fists. Increased the number 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. Added hover capabilities. Overclocked the movement systems allowing for greater mobility.
<</switch>>
<</if>>
<<if $securityForceMissileSilo > 0>>
@@ -424,11 +424,11 @@
<<case 3>>
Modernized the electronics and weaponry.
<<case 4>>
- Modernized the electronics, weaponry and armour.
+ Modernized the electronics, weaponry and armor.
<<case 5>>
- Modernized the electronics, weaponry and armour. Added an EMP generator.
+ Modernized the electronics, weaponry and armor. Added an EMP generator.
<<case 6>>
- Modernized the electronics, weaponry and armour. Added an EMP generator and laser designator.
+ Modernized the electronics, weaponry and armor. Added an EMP generator and laser designator.
<</switch>>
<</if>>
<<if $securityForceSubmarine > 0>>
@@ -456,15 +456,15 @@
<<case 1>>
A basic heavy amphibious transport has been 'borrowed' from the old world.
<<case 2>>
- Modernized the armour.
+ Modernized the armor.
<<case 3>>
- Modernized the armour and speed.
+ Modernized the armor and speed.
<<case 4>>
- Modernized the armour and speed. Added miniaturized railguns in all four corners.
+ Modernized the armor and speed. Added miniaturized railguns in all four corners.
<<case 5>>
- Modernized the armour and speed. Added miniaturized railguns in all four corners and a laser designator in the middle.
+ Modernized the armor and speed. Added miniaturized railguns in all four corners and a laser designator in the middle.
<<case 6>>
- Modernized the armour and speed. Replaced the corner miniaturized railguns with nanite ones while keeping the laser designator in the middle.
+ Modernized the armor and speed. Replaced the corner miniaturized railguns with nanite ones while keeping the laser designator in the middle.
<</switch>>
<</if>>
<</if>>
\ No newline at end of file
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
index 048a09a032abd262f2a6590ba171ae0fe4b3758f..d120d7aa0a0a8d6cfe1f1176f611704b75a6eb54 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
@@ -48,26 +48,26 @@
<br><<link "Barracks">>
<<replace "#resultX">><br>
"Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env*_costDebuff>>
+ <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env*_costDebuff>>
<</replace>>
<</link>> // Costs <<print cashFormat(_arcCost*$Env*_costDebuff)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades == 13>>
<br><<link "Barracks">>
<<replace "#resultX">><br>
"Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env*_costDebuff>>
+ <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env*_costDebuff>>
<</replace>>
<</link>> // Costs <<print cashFormat(_arcCost*$Env*_costDebuff)>> //
<</if>>
<<if _Barracks == _BarracksMax>>
- <br>//$securityForceName has fully upgraded the barracks to support it's activities//
+ <br>//$securityForceName has fully upgraded the barracks to support its activities//
<</if>>
/*
<<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $SupportFacility == 0>>
<br><<link "Support Facility">>
<<replace "#resultX">><br>
- "Sure, boss." she says, nodding. "Creating a specialised area for any slaves you send to assist us will benefical to everyone."
+ "Sure, boss." she says, nodding. "Creating a specialised area for any slaves you send to assist us will benefical to everyone."
<<set $securityForceUpgradeToken = 1, $SupportFacility++, $cash -= Math.trunc(15000000*(Math.max(0.99,$SFAO)/10)*$Env*_costDebuff)>>
<<set $SFIDs = [], $SupportFacilityDecoration = "standard", $SupportFacilityName = "The Support Facility", $SupportFacilityEfficiency = 0>>
<<set $SupportFacility = 5, $SupportFacilitySlaves = 0, $LieutenantColonel = 0>>
@@ -92,7 +92,7 @@
<</link>> // Costs <<print cashFormat(450000*$Env*_costDebuff)>> //
<</if>>
<<if _Armoury == _ArmouryMax>>
- <br>//$securityForceName has fully upgraded the armoury to support it's activities.//
+ <br>//$securityForceName has fully upgraded the armoury to support its activities.//
<</if>>
<<if $securityForceUpgradeToken == 0 && _StimulantLab < 5>>
@@ -130,7 +130,7 @@
<</link>> // Costs <<print cashFormat(_drugCost*$Env*_costDebuff)>> //
<</if>>
<<if _StimulantLab == _StimulantLabMax>>
- <br>//$securityForceName has fully upgraded the stimulant lab to support it's activities.//
+ <br>//$securityForceName has fully upgraded the stimulant lab to support its activities.//
<</if>>
<<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && _Garage < _GarageMax && (_T1FullUpgradesGarage != "True" || $TierTwoUnlock == 1)>>
@@ -165,7 +165,7 @@
<</link>> // Costs <<print cashFormat(_vehCost*$Env*_costDebuff)>> //
<</if>>
<<if $securityForceVehiclePower == _LightAndMediumVehiclesMax>>
- <br>//$securityForceName has fully upgraded the vehicle fleet to support it's activities.//
+ <br>//$securityForceName has fully upgraded the vehicle fleet to support its activities.//
<</if>>
<<if $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank < 1 && $TierTwoUnlock == 1>>
@@ -189,14 +189,14 @@
<</link>> // Costs <<print cashFormat(_hbtCost*$Env*_costDebuff)>> //
<</if>>
<<if $securityForceHeavyBattleTank == _HeavyBattleTankMax>>
- <br>//$securityForceName has fully upgraded the heavy battle tank to support it's activities.//
+ <br>//$securityForceName has fully upgraded the heavy battle tank to support its activities.//
<</if>>
</span>
<</replace>>
<</link>>
<</if>>
- <<if _Garage >= _GarageMax>>//<br>$securityForceName has fully upgraded the garage to support it's activities.//<</if>>
+ <<if _Garage >= _GarageMax>>//<br>$securityForceName has fully upgraded the garage to support its activities.//<</if>>
<<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && _Hangar < _HangarMax && (_T1FullUpgradesAirforce != "True" || $TierTwoUnlock == 1)>>
<br><<link "Hangar">>
@@ -235,7 +235,7 @@
<</link>> // Costs <<print cashFormat(_airCost*$Env*_costDebuff)>> //
<</if>>
<<if $securityForceAircraftPower == _AircraftMax>>
- <br>//$securityForceName has fully upgraded the air fleet to support it's activities.//
+ <br>//$securityForceName has fully upgraded the air fleet to support its activities.//
<</if>>
<<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $securityForceSpacePlanePower < 1>>
@@ -275,7 +275,7 @@
<</link>> // Costs <<print cashFormat(_spCost*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<</if>>
<<if $securityForceSpacePlanePower == _SpacePlaneMax>>
- <br>//$securityForceName has fully upgraded the space plane to support it's activities.//
+ <br>//$securityForceName has fully upgraded the space plane to support its activities.//
<</if>>
<<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $securityForceFortressZeppelin < 1>>
@@ -293,7 +293,7 @@
<</link>> // Costs <<print cashFormat( 2000000*$Env*_costDebuff)>> //
<</if>>
<<if $securityForceFortressZeppelin == _FortressZeppelinMax>>
- <br>//$securityForceName has fully upgraded the fortress zeppelin to support it's activities.//
+ <br>//$securityForceName has fully upgraded the fortress zeppelin to support its activities.//
<</if>>
<<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $securityForceAC130 < 1>>
@@ -312,7 +312,7 @@
<</link>> // Costs <<print cashFormat(2500000*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<</if>>
<<if $securityForceAC130 == _AC130Max>>
- <br>//$securityForceName has fully upgraded the AC-130 to support it's activities.//
+ <br>//$securityForceName has fully upgraded the AC-130 to support its activities.//
<</if>>
<<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $securityForceHeavyTransport < 1>>
@@ -330,14 +330,14 @@
<</link>> // Costs <<print cashFormat( 3000000*$Env*_costDebuff)>> //
<</if>>
<<if $securityForceHeavyTransport == _heavyTransportMax>>
- <br>//$securityForceName has fully upgraded the heavy transport to support it's activities.//
+ <br>//$securityForceName has fully upgraded the heavy transport to support its activities.//
<</if>>
</span>
<</replace>>
<</link>>
<</if>>
- <<if _Hangar >= _HangarMax>>//<br>$securityForceName has fully upgraded the hangar to support it's activities.//<</if>>
+ <<if _Hangar >= _HangarMax>>//<br>$securityForceName has fully upgraded the hangar to support its activities.//<</if>>
<<if $securityForceUpgradeToken == 0 && _DroneBay < 5 && _Barracks >= 2>>
<br><<link "Drone bay">>
@@ -355,7 +355,7 @@
<</link>> // Costs <<print cashFormat(2000000*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<</if>>
<<if _DroneBay == _DroneBayMax>>
- <br>//$securityForceName has fully upgraded the drone bay to support it's activities.//
+ <br>//$securityForceName has fully upgraded the drone bay to support its activities.//
<</if>>
<<if $securityForceUpgradeToken == 0 && (_LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayOMax) && $TierTwoUnlock == 1>>
@@ -414,7 +414,7 @@
<</link>> // Costs <<print cashFormat(_satCost*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<</if>>
<<if $securityForceSatellitePower == _SatelliteMax>>
- <br>//$securityForceName has fully upgraded the Satellite to support it's activities.//
+ <br>//$securityForceName has fully upgraded the Satellite to support its activities.//
<</if>>
<<if $securityForceUpgradeToken == 0 && $securityForceGiantRobot < 1 && ($terrain != "oceanic" && $terrain != "marine")>>
@@ -471,7 +471,7 @@
<</link>> // Costs <<print cashFormat(_robCost*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<</if>>
<<if $securityForceGiantRobot == _GiantRobotMax && ($terrain != "oceanic" && $terrain != "marine")>>
- <br>//$securityForceName has fully upgraded the giant robot to support it's activities.//
+ <br>//$securityForceName has fully upgraded the giant robot to support its activities.//
<</if>>
<<if $securityForceUpgradeToken == 0 && $securityForceMissileSilo < 1 && ($terrain != "oceanic" && $terrain != "marine")>>
@@ -494,13 +494,13 @@
<</replace>>
<</link>> // Costs <<print cashFormat(_msCost*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<</if>>
- <<if $securityForceMissileSilo == _MissileSiloMax && ($terrain != "oceanic" && $terrain != "marine")>><br>//$securityForceName has fully upgraded the missile silo to support it's activities.//<</if>>
+ <<if $securityForceMissileSilo == _MissileSiloMax && ($terrain != "oceanic" && $terrain != "marine")>><br>//$securityForceName has fully upgraded the missile silo to support its activities.//<</if>>
</span>
<</replace>>
<</link>>
<</if>>
- <<if _LaunchBayNO >= _LaunchBayNOMax || _LaunchBayO >= _LaunchBayNOMax>>//<br>$securityForceName has fully upgraded the launch bay to support it's activities.//<</if>>
+ <<if _LaunchBayNO >= _LaunchBayNOMax || _LaunchBayO >= _LaunchBayNOMax>>//<br>$securityForceName has fully upgraded the launch bay to support its activities.//<</if>>
<<if $securityForceUpgradeToken == 0 && ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard < _NavalYardMax) && $TierTwoUnlock == 1>>
<br><<link "Naval Yard">>
@@ -527,7 +527,7 @@
<</link>> // Costs <<print cashFormat(25000000*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<</if>>
<<if $securityForceAircraftCarrier == _AircraftCarrierMax && ($terrain == "oceanic" || $terrain == "marine")>>
- <br>//$securityForceName has fully upgraded the aircraft carrier to support it's activities.//
+ <br>//$securityForceName has fully upgraded the aircraft carrier to support its activities.//
<</if>>
<<if $securityForceUpgradeToken == 0 && $securityForceSubmarine < 1>>
@@ -561,7 +561,7 @@
<</replace>>
<</link>> // Costs <<print cashFormat(_subCost*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<</if>>
- <<if $securityForceSubmarine == _SubmarineMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the submarine to support it's activities.//<</if>>
+ <<if $securityForceSubmarine == _SubmarineMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the submarine to support its activities.//<</if>>
<<if $securityForceUpgradeToken == 0 && $securityForceHeavyAmphibiousTransport < 1>>
<br><<link "A heavy amphibious transport">>
@@ -590,13 +590,13 @@
<</replace>>
<</link>> // Costs <<print cashFormat(_hatCost*$Env*_costDebuff)>> //
<</if>>
- <<if $securityForceHeavyAmphibiousTransport == _HeavyAmphibiousTransportMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the heavy amphibious transport to support it's activities.//<</if>>
+ <<if $securityForceHeavyAmphibiousTransport == _HeavyAmphibiousTransportMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the heavy amphibious transport to support its activities.//<</if>>
</span>
<</replace>>
<</link>>
<</if>>
- <<if ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard >= _NavalYardMax)>><br>$securityForceName has fully upgraded the naval yard to support it's activities.//<</if>>
+ <<if ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard >= _NavalYardMax)>><br>$securityForceName has fully upgraded the naval yard to support its activities.//<</if>>
</span>
<</if>>
diff --git a/src/pregmod/assistantAppearancePackTwo.tw b/src/pregmod/assistantAppearancePackTwo.tw
index 2caa2c8d0d0adf574dfdc1f3de5511e692a257f4..f22a36fdf057a5c63383aa50f8f7f839b0fc7c96 100644
--- a/src/pregmod/assistantAppearancePackTwo.tw
+++ b/src/pregmod/assistantAppearancePackTwo.tw
@@ -19,18 +19,18 @@ __Personal assistant appearances:__
<</replace>>
<</link>>
<br> <<link "Cherub">>
- <<replace "#app">>
- <<nobr>>
+ <<replace "#app">>
+ <<nobr>>
At your order, she installs the cherub appearance. She returns to her youthful figure and sprouts her wings. "This is awesome, little embarrassing though..." She says, covering her shame. "You can always customize me from the arcology management menu," she adds.
- <<set $assistantAppearance = "cherub">>
- <</nobr>><</replace>>
+ <<set $assistantAppearance = "cherub">>
+ <</nobr>><</replace>>
<</link>>
<br> <<link "Imp">>
- <<replace "#app">>
- <<nobr>>
+ <<replace "#app">>
+ <<nobr>>
At your order, she installs the imp appearance. She returns to her youthful figure and sprouts her wings. "This is awesome! So, wanna fool around? Maybe go torment some slaves?" She says, pulling out a pitchfork. "You can always customize me from the arcology management menu," she adds.
- <<set $assistantAppearance = "imp">>
- <</nobr>><</replace>>
+ <<set $assistantAppearance = "imp">>
+ <</nobr>><</replace>>
<</link>>
<br> <<link "Succubus">>
<<replace "#app">>
@@ -47,15 +47,15 @@ __Personal assistant appearances:__
<</link>>
<</if>>
<br> <<link "witch">>
- <<replace "#app">>
+ <<replace "#app">>
At your order, she installs the novice witch appearance. She wraps a tightly clinging robe around her voluptuous body and dons a wide-brimmed hat. "You can always customize me from the arcology management menu," she adds, pulling a book of lewd spells out.
- <<set $assistantAppearance = "witch">>
+ <<set $assistantAppearance = "witch">>
<</replace>>
<</link>>
<<link "_">>
- <<replace "#app">>
+ <<replace "#app">>
At your order, she installs the bugged appearance. Her body twists and contorts into an abomination of flesh and bone. It is honestly unsettling to look at. The thing morphs its body into a familiar female shape, though it is still off. Especially her eyes; they seem soulless. "You can always customize me from the arcology management menu," she adds, in an ill pronounced mimicry of your voice.
- <<set $assistantAppearance = "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+ <<set $assistantAppearance = "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
<</replace>>
<</link>>
<br><<link "Your current appearance will do">>
diff --git a/src/pregmod/breedingTest.tw b/src/pregmod/breedingTest.tw
index 278317e2a56d26e9fb89a0157cc6fbcfc695cee6..d59f2380bdc545d653c774b480a32ab9d6cb70aa 100644
--- a/src/pregmod/breedingTest.tw
+++ b/src/pregmod/breedingTest.tw
@@ -7,4 +7,3 @@
<<BreedingStandards>>
<br><br>
<<BreedingEligibility>>
-
diff --git a/src/pregmod/widgets/bodySwapReaction.tw b/src/pregmod/widgets/bodySwapReaction.tw
index 098bc3570912791d4506afdb6cdd0b3af87f3b70..ae094223d238093800b822243ec0ec5d43d57917 100644
--- a/src/pregmod/widgets/bodySwapReaction.tw
+++ b/src/pregmod/widgets/bodySwapReaction.tw
@@ -1200,7 +1200,7 @@ Now you only have to wait for her to wake up.
<<if $args[0].devotion > 20>>
This isn’t pleasant, but she bears it for you.
<<else>>
- This does nothing for her self image, only @@.mediumorchid;disgusts and annoys@@ her.
+ This does nothing for her self-image, only @@.mediumorchid;disgusts and annoys@@ her.
<<set $args[0].devotion -= 2>>
<</if>>
<</if>>
@@ -1208,7 +1208,7 @@ Now you only have to wait for her to wake up.
She also notices it is @@.green;tighter despite being softer.@@
<<if $args[0].fetish != "mindbroken">>
<<if $args[0].devotion > 20>>
- This is great for her self image and she happily strokes her new firm belly.
+ This is great for her self-image and she happily strokes her new firm belly.
<<else>>
Whatever else this transition brings, this is a gift she will appreciate and she @@.hotpink;smiles, just a bit.@@
<<set $args[0].devotion += 1>>
@@ -1231,7 +1231,7 @@ Now you only have to wait for her to wake up.
<<if $args[0].devotion > 20>>
This isn’t pleasant, but she bears it for you.
<<else>>
- This does nothing for her self image, only @@.mediumorchid;disgusts and annoys@@ her.
+ This does nothing for her self-image, only @@.mediumorchid;disgusts and annoys@@ her.
<<set $args[0].devotion -= 2>>
<</if>>
<</if>>
@@ -1239,7 +1239,7 @@ Now you only have to wait for her to wake up.
She also notices it is @@.green;tighter despite being softer.@@
<<if $args[0].fetish != "mindbroken">>
<<if $args[0].devotion > 20>>
- This is great for her self image and she happily strokes her new perkier belly.
+ This is great for her self-image and she happily strokes her new perkier belly.
<<else>>
Whatever else this transition brings, this is a gift she will appreciate and she @@.hotpink;smiles, just a bit.@@
<<set $args[0].devotion += 1>>
@@ -1252,7 +1252,7 @@ Now you only have to wait for her to wake up.
<<if $args[0].devotion > 20>>
This isn’t pleasant, but she bears it for you.
<<else>>
- This does nothing for her self image, only @@.mediumorchid;disgusts and annoys@@ her.
+ This does nothing for her self-image, only @@.mediumorchid;disgusts and annoys@@ her.
<<set $args[0].devotion -= 2>>
<</if>>
<</if>>
@@ -1260,7 +1260,7 @@ Now you only have to wait for her to wake up.
her stomach and notices the @@.green;sag in her belly has lessened.@@
<<if $args[0].fetish != "mindbroken">>
<<if $args[0].devotion > 20>>
- This is great for her self image and she happily strokes her new tight belly.
+ This is great for her self-image and she happily strokes her new tight belly.
<<else>>
Whatever else this transition brings, this is a gift she will appreciate and she @@.hotpink;smiles, just a bit.@@
<<set $args[0].devotion += 1>>
@@ -1685,7 +1685,7 @@ Now you only have to wait for her to wake up.
<<if $args[1].amp == 1>> /*(was already an amputee)*/
but she realizes that at least nothing about her limbs, or lack thereof, has changed.
<<else>>
- Her eyes seemed to bulge, her heart monitor begins to beep faster and more insistently. Eventually, your assistant is forced to inject her with a sedative. Her eyes flutter closed and the heart monitors beeping slows to a steady pulse. Hopefully she’ll be calmer when she wakes up again, though the memory of waking without limbs will @@.gold;stick with her.@@
+ Her eyes seem to bulge; her heart monitor begins to beep faster and more insistently. Eventually, your assistant is forced to inject her with a sedative. Her eyes flutter closed and the heart monitors beeping slows to a steady pulse. Hopefully she’ll be calmer when she wakes up again, though the memory of waking without limbs will @@.gold;stick with her.@@
<br>
...
<br>
@@ -2650,7 +2650,7 @@ Now you only have to wait for her to wake up.
<<if $args[0].devotion > 20>>
This isn’t pleasant, but she bears it for you.
<<else>>
- This does nothing for her self image, only @@.mediumorchid;disgusts and annoys@@ her.
+ This does nothing for her self-image, only @@.mediumorchid;disgusts and annoys@@ her.
<<set $args[0].devotion -= 2>>
<</if>>
<</if>>
@@ -2658,7 +2658,7 @@ Now you only have to wait for her to wake up.
She also notices it is @@.green;tighter despite being softer.@@
<<if $args[0].fetish != "mindbroken">>
<<if $args[0].devotion > 20>>
- This is great for her self image and she happily strokes her new firm belly.
+ This is great for her self-image and she happily strokes her new firm belly.
<<else>>
Whatever else this transition brings, this is a gift she will appreciate and she @@.hotpink;smiles, just a bit.@@
<<set $args[0].devotion += 1>>
@@ -2681,7 +2681,7 @@ Now you only have to wait for her to wake up.
<<if $args[0].devotion > 20>>
This isn’t pleasant, but she bears it for you.
<<else>>
- This does nothing for her self image, only @@.mediumorchid;disgusts and annoys@@ her.
+ This does nothing for her self-image, only @@.mediumorchid;disgusts and annoys@@ her.
<<set $args[0].devotion -= 2>>
<</if>>
<</if>>
@@ -2689,7 +2689,7 @@ Now you only have to wait for her to wake up.
She also notices it is @@.green;tighter despite being softer.@@
<<if $args[0].fetish != "mindbroken">>
<<if $args[0].devotion > 20>>
- This is great for her self image and she happily strokes her new perkier belly.
+ This is great for her self-image and she happily strokes her new perkier belly.
<<else>>
Whatever else this transition brings, this is a gift she will appreciate and she @@.hotpink;smiles, just a bit.@@
<<set $args[0].devotion += 1>>
@@ -2702,7 +2702,7 @@ Now you only have to wait for her to wake up.
<<if $args[0].devotion > 20>>
This isn’t pleasant, but she bears it for you.
<<else>>
- This does nothing for her self image, only @@.mediumorchid;disgusts and annoys@@ her.
+ This does nothing for her self-image, only @@.mediumorchid;disgusts and annoys@@ her.
<<set $args[0].devotion -= 2>>
<</if>>
<</if>>
@@ -2710,7 +2710,7 @@ Now you only have to wait for her to wake up.
her stomach and notices the @@.green;sag in her belly has lessened.@@
<<if $args[0].fetish != "mindbroken">>
<<if $args[0].devotion > 20>>
- This is great for her self image and she happily strokes her new tight belly.
+ This is great for her self-image and she happily strokes her new tight belly.
<<else>>
Whatever else this transition brings, this is a gift she will appreciate and she @@.hotpink;smiles, just a bit.@@
<<set $args[0].devotion += 1>>
@@ -2893,7 +2893,7 @@ Now you only have to wait for her to wake up.
<<set _seeCrotch = 0>>
<</if>>
<<else>>
- Her simple mind can not fathom a good way to see her junk like this, so what she has will come as a surprise sooner or later to her.
+ Her simple mind cannot fathom a good way to see her junk like this, so what she has will come as a surprise sooner or later to her.
<<set _seeCrotch = 0>>
<</if>>
<<else>>
diff --git a/src/pregmod/widgets/marketWidgets.tw b/src/pregmod/widgets/marketWidgets.tw
index cad53fe39b9f898693c24605eef5c6e779cda18b..77d4bd31c7717f02772fc8c316a7d6285dea63c4 100644
--- a/src/pregmod/widgets/marketWidgets.tw
+++ b/src/pregmod/widgets/marketWidgets.tw
@@ -7,6 +7,7 @@
*
* Call like <<AddMarketOrigins "marketname" _possibleOrigins>>
*/
+
<<widget "AddMarketOrigins">>
<<if _.isString($args[0]) && _.isArray($args[1])>>
<<set _widgets = _(Story.widgets)
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 790c8396c93330e2609c09a3270f09e6621dc9e2..02b222976e145a0a91ea0c9fb41d1f51b918bb3c 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -802,72 +802,72 @@ $activeSlave.slaveName is up for review:
<<if ($activeSlave.muscles+$activeSlave.height-100)/25 > 5>>
She has a long ceramic sword strapped to her back,
<<switch $activeSlave.nationality>>
- <<case "Armenian" "Belarusian" "Cuban" "Hungarian" "Kazakh" "Uzbek">>
- and, in keeping with her heritage, a PKM GPMG
- <<case "Russian">>
- and, in keeping with her heritage, a PKP Pecheneg GPMG
- <<case "Ukrainian">>
- and, in keeping with her heritage, a Fort-401 LMG
<<case "American">>
and, in keeping with her heritage, a US Ordnance Mk43 Mod.1 GPMG
- <<case "Canadian">>
- and, in keeping with her heritage, a Colt Canada 5.56-LSW LMG
- <<case "British" "Scottish">>
- and, in keeping with her heritage, an L7A2 GPMG
- <<case "Japanese">>
- and, in keeping with her heritage, a Sumitomo Type 62 GPMG
+ <<case "Armenian" "Belarusian" "Cuban" "Hungarian" "Kazakh" "Uzbek">>
+ and, in keeping with her heritage, a PKM GPMG
+ <<case "Australian">>
+ and, in keeping with her heritage, a Lithgow F89 Maximi GPMG
+ <<case "Austrian">>
+ and, in keeping with her heritage, a Steyr MG 74 GPMG
<<case "Belgian">>
and, in keeping with her heritage, a FN Minimi M3 LMG
- <<case "Israeli">>
- and, in keeping with her heritage, an IWI Negev NG7 GPMG
+ <<case "British" "Scottish">>
+ and, in keeping with her heritage, an L7A2 GPMG
+ <<case "Canadian">>
+ and, in keeping with her heritage, a Colt Canada 5.56-LSW LMG
<<case "Chilean" "German">>
and, in keeping with her heritage, a Rheinmetall MG3 GPMG
- <<case "Mexican">>
- and, in keeping with her heritage, a SEDENA MG-21 GPMG
- <<case "Spanish">>
- and, in keeping with her heritage, a CETME MG 82 Ameli LMG
- <<case "Australian">>
- and, in keeping with her heritage, a Lithgow F89 Maximi GPMG
<<case "Chinese">>
and, in keeping with her heritage, a Norinco QJY-88 LMG
+ <<case "Czech" "Slovak">>
+ and, in keeping with her heritage, a ZVI Uk vz.59 Rachot GPMG
+ <<case "Filipina">>
+ and, in keeping with her heritage, a Government Arsenal M60E4 GPMG
+ <<case "Finnish">>
+ and, in keeping with her heritage, a Valmet KvKK 62 LMG
<<case "French">>
and, in keeping with her heritage, a MAS AAT-F1 GPMG
+ <<case "Indian">>
+ and, in keeping with her heritage, an OFB MG 2A1 GPMG
+ <<case "Indonesian">>
+ and, in keeping with her heritage, a Pindad SM2 LMG
+ <<case "Iranian">>
+ and, in keeping with her heritage, a DIO MGA3 GPMG
+ <<case "Israeli">>
+ and, in keeping with her heritage, an IWI Negev NG7 GPMG
+ <<case "Japanese">>
+ and, in keeping with her heritage, a Sumitomo Type 62 GPMG
<<case "Korean">>
and, in keeping with her heritage, a S&T K12 GPMG
- <<case "South African">>
- and, in keeping with her heritage, a Vektor SS-77 GPMG
- <<case "Finnish">>
- and, in keeping with her heritage, a Valmet KvKK 62 LMG
+ <<case "Mexican">>
+ and, in keeping with her heritage, a SEDENA MG-21 GPMG
<<case "Polish">>
and, in keeping with her heritage, a ZMT UKM-2000 GPMG
+ <<case "Romanian">>
+ and, in keeping with her heritage, a FACSA PM md.93 LMG
+ <<case "Russian">>
+ and, in keeping with her heritage, a PKP Pecheneg GPMG
+ <<case "Serbian">>
+ and, in keeping with her heritage, a Zastava M09 LMG
+ <<case "South African">>
+ and, in keeping with her heritage, a Vektor SS-77 GPMG
+ <<case "Spanish">>
+ and, in keeping with her heritage, a CETME MG 82 Ameli LMG
<<case "Swiss">>
and, in keeping with her heritage, a W+F-Bern MG51 GPMG
- <<case "Austrian">>
- and, in keeping with her heritage, a Steyr MG 74 GPMG
+ <<case "Turkish">>
+ and, in keeping with her heritage, a MKEK MG3 GPMG
+ <<case "Ukrainian">>
+ and, in keeping with her heritage, a Fort-401 LMG
+ <<case "Vietnamese">>
+ and, in keeping with her heritage, a Z111 RPK LMG
<<case "Zimbabwean">>
<<if $activeSlave.race == "white">>
and, in keeping with her heritage, a FN MAG-58 GPMG
<<else>>
and a FN MAG 60.20 GPMG
<</if>>
- <<case "Czech" "Slovak">>
- and, in keeping with her heritage, a ZVI Uk vz.59 Rachot GPMG
- <<case "Indonesian">>
- and, in keeping with her heritage, a Pindad SM2 LMG
- <<case "Indian">>
- and, in keeping with her heritage, an OFB MG 2A1 GPMG
- <<case "Turkish">>
- and, in keeping with her heritage, a MKEK MG3 GPMG
- <<case "Iranian">>
- and, in keeping with her heritage, a DIO MGA3 GPMG
- <<case "Vietnamese">>
- and, in keeping with her heritage, a Z111 RPK LMG
- <<case "Filipina">>
- and, in keeping with her heritage, a Government Arsenal M60E4 GPMG
- <<case "Serbian">>
- and, in keeping with her heritage, a Zastava M09 LMG
- <<case "Romanian">>
- and, in keeping with her heritage, a FACSA PM md.93 LMG
<<default>>
and a FN MAG 60.20 GPMG
<</switch>>
@@ -875,94 +875,94 @@ $activeSlave.slaveName is up for review:
<<elseif ($activeSlave.muscles+$activeSlave.height-100)/25 > 4>>
She has a ceramic sword strapped to her back
<<switch $activeSlave.nationality>>
- <<case "Armenian" "Belarusian" "Kazakh" "Uzbek">>
- and, in keeping with her heritage, a Kalashnikov AK-74M assault rifle
- <<case "Russian">>
- and, in keeping with her heritage, an Izhmash AN-94 Abakan assault rifle
- <<case "Ukrainian">>
- and, in keeping with her heritage, a Fort-227 assault rifle
<<case "American">>
and, in keeping with her heritage, a Colt M16A4 assault rifle
- <<case "Canadian">>
- and, in keeping with her heritage, a Colt Canada MRR assault rifle
- <<case "Japanese">>
- and, in keeping with her heritage, a Howa Type 89 assault rifle
- <<case "British" "Scottish">>
- and, in keeping with her heritage, an L85A3 bullpup assault rifle
- <<case "Belgian">>
- and, in keeping with her heritage, a FN FNC M2 assault rifle
- <<case "Israeli">>
- and, in keeping with her heritage, an IWI MTAR-21 bullpup assault rifle
- <<case "German">>
- and, in keeping with her heritage, a H&K G36A2 assault rifle
- <<case "Mexican">>
- and, in keeping with her heritage, a DGIM FX-05 Xiuhcoatl assault rifle
- <<case "Spanish">>
- and, in keeping with her heritage, a CETME Model C battle rifle
- <<case "Cuban">>
- and, in keeping with her heritage, an AKM assault rifle
+ <<case "Argentinian">>
+ and, in keeping with her heritage, a FMAP FARA-83 assault rifle
+ <<case "Armenian" "Belarusian" "Kazakh" "Uzbek">>
+ and, in keeping with her heritage, a Kalashnikov AK-74M assault rifle
<<case "Australian">>
and, in keeping with her heritage, a Lithgow EF88 Austeyr bullpup assault rifle
+ <<case "Austrian">>
+ and, in keeping with her heritage, a Steyr AUG A3 bullpup assault rifle
+ <<case "Belgian">>
+ and, in keeping with her heritage, a FN FNC M2 assault rifle
+ <<case "Brazilian">>
+ and, in keeping with her heritage, an IMBEL IA2 assault rifle
+ <<case "British" "Scottish">>
+ and, in keeping with her heritage, an L85A3 bullpup assault rifle
+ <<case "Canadian">>
+ and, in keeping with her heritage, a Colt Canada MRR assault rifle
+ <<case "Chilean">>
+ and, in keeping with her heritage, a FAMAE ACE 22NC assault rifle
<<case "Chinese">>
and, in keeping with her heritage, a Norinco QBZ-95-1 bullpup assault rifle
+ <<case "Colombian">>
+ and, in keeping with her heritage, a Indumil ACE 22 assault rifle
+ <<case "Croatian">>
+ and, in keeping with her heritage, an HS Produkt VHS-2 bullpup assault rifle
+ <<case "Cuban">>
+ and, in keeping with her heritage, an AKM assault rifle
+ <<case "Czech" "Slovak">>
+ and, in keeping with her heritage, a CZUB CZ-806 BREN-2 assault rifle
+ <<case "Filipina">>
+ and, in keeping with her heritage, an Elitool M653P carbine
+ <<case "Finnish">>
+ and, in keeping with her heritage, a SAKO Rk 95 TP assault rifle
<<case "French">>
and, in keeping with her heritage, a Nexter FAMAS G2 bullpup assault rifle
+ <<case "German">>
+ and, in keeping with her heritage, a H&K G36A2 assault rifle
+ <<case "Hungarian">>
+ and, in keeping with her heritage, a FEG AMD-65M assault rifle
+ <<case "Indian">>
+ and, in keeping with her heritage, an OFB MCIWS assault rifle
+ <<case "Indonesian">>
+ and, in keeping with her heritage, a Pindad SS2 assault rifle
+ <<case "Iranian">>
+ and, in keeping with her heritage, a DIO KH-2002 Khaybar bullpup assault rifle
+ <<case "Israeli">>
+ and, in keeping with her heritage, an IWI MTAR-21 bullpup assault rifle
<<case "Italian">>
and, in keeping with her heritage, a Beretta ARX-160 assault rifle
+ <<case "Japanese">>
+ and, in keeping with her heritage, a Howa Type 89 assault rifle
<<case "Korean">>
and, in keeping with her heritage, a Daewoo K2C1 assault rifle
+ <<case "Mexican">>
+ and, in keeping with her heritage, a DGIM FX-05 Xiuhcoatl assault rifle
+ <<case "Peruvian">>
+ and, in keeping with her heritage, a SIMA FAD bullpup assault rifle
+ <<case "Polish">>
+ and, in keeping with her heritage, a FB MSBS assault rifle
+ <<case "Romanian">>
+ and, in keeping with her heritage, a ROMARM PA md.86 assault rifle
+ <<case "Russian">>
+ and, in keeping with her heritage, an Izhmash AN-94 Abakan assault rifle
+ <<case "Serbian">>
+ and, in keeping with her heritage, a Zastava M21A assault rifle
<<case "South African">>
and, in keeping with her heritage, a Vektor R4 assault rifle
+ <<case "Spanish">>
+ and, in keeping with her heritage, a CETME Model C battle rifle
<<case "Swedish">>
and, in keeping with her heritage, a Bofors Ak-5C assault rifle
- <<case "Finnish">>
- and, in keeping with her heritage, a SAKO Rk 95 TP assault rifle
- <<case "Colombian">>
- and, in keeping with her heritage, a Indumil ACE 22 assault rifle
- <<case "Polish">>
- and, in keeping with her heritage, a FB MSBS assault rifle
<<case "Swiss">>
and, in keeping with her heritage, a SIG SG 550 assault rifle
- <<case "Austrian">>
- and, in keeping with her heritage, a Steyr AUG A3 bullpup assault rifle
+ <<case "Thai">>
+ and, in keeping with her heritage, a MND Type 11 assault rifle
+ <<case "Turkish">>
+ and, in keeping with her heritage, a MKEK MPT-76 assault rifle
+ <<case "Ukrainian">>
+ and, in keeping with her heritage, a Fort-227 assault rifle
+ <<case "Vietnamese">>
+ and, in keeping with her heritage, a Z111 AKM assault rifle
<<case "Zimbabwean">>
<<if $activeSlave.race == "white">>
and, in keeping with her heritage, a FN FAL battle rifle
<<else>>
and a FN F2000 bullpup assault rifle
<</if>>
- <<case "Czech" "Slovak">>
- and, in keeping with her heritage, a CZUB CZ-806 BREN-2 assault rifle
- <<case "Indonesian">>
- and, in keeping with her heritage, a Pindad SS2 assault rifle
- <<case "Indian">>
- and, in keeping with her heritage, an OFB MCIWS assault rifle
- <<case "Turkish">>
- and, in keeping with her heritage, a MKEK MPT-76 assault rifle
- <<case "Iranian">>
- and, in keeping with her heritage, a DIO KH-2002 Khaybar bullpup assault rifle
- <<case "Vietnamese">>
- and, in keeping with her heritage, a Z111 AKM assault rifle
- <<case "Filipina">>
- and, in keeping with her heritage, an Elitool M653P carbine
- <<case "Thai">>
- and, in keeping with her heritage, a MND Type 11 assault rifle
- <<case "Brazilian">>
- and, in keeping with her heritage, an IMBEL IA2 assault rifle
- <<case "Argentinian">>
- and, in keeping with her heritage, a FMAP FARA-83 assault rifle
- <<case "Peruvian">>
- and, in keeping with her heritage, a SIMA FAD bullpup assault rifle
- <<case "Chilean">>
- and, in keeping with her heritage, a FAMAE ACE 22NC assault rifle
- <<case "Serbian">>
- and, in keeping with her heritage, a Zastava M21A assault rifle
- <<case "Croatian">>
- and, in keeping with her heritage, an HS Produkt VHS-2 bullpup assault rifle
- <<case "Hungarian">>
- and, in keeping with her heritage, a FEG AMD-65M assault rifle
- <<case "Romanian">>
- and, in keeping with her heritage, a ROMARM PA md.86 assault rifle
<<default>>
and a FN F2000 bullpup assault rifle
<</switch>>
@@ -970,72 +970,72 @@ $activeSlave.slaveName is up for review:
<<elseif ($activeSlave.muscles+$activeSlave.height-100)/25 > 3>>
She has a straight ceramic sword strapped to her back
<<switch $activeSlave.nationality>>
- <<case "Armenian" "Belarusian" "Kazakh" "Uzbek">>
- and, in keeping with her heritage, an Kalashnikov AKS-74U PDW
- <<case "Russian">>
- and, in keeping with her heritage, a KBP PP-90M1 SMG
- <<case "Ukrainian">>
- and, in keeping with her heritage, a Fort-224 bullpup SMG
<<case "American">>
and, in keeping with her heritage, a KRISS Vector SMG
- <<case "British" "Scottish">>
- and, in keeping with her heritage, an L91A1 SMG
+ <<case "Argentinian">>
+ and, in keeping with her heritage, a Halcon ML-63 SMG
+ <<case "Armenian" "Belarusian" "Kazakh" "Uzbek">>
+ and, in keeping with her heritage, an Kalashnikov AKS-74U PDW
+ <<case "Austrian">>
+ and, in keeping with her heritage, a Steyr AUG A3 Para XS bullpup SMG
<<case "Belgian">>
and, in keeping with her heritage, a FN P90 bullpup PDW
- <<case "Israeli">>
- and, in keeping with her heritage, an IWI Uzi SMG
- <<case "German">>
- and, in keeping with her heritage, an H&K MP7A1 PDW
- <<case "Mexican">>
- and, in keeping with her heritage, a Mendoza Cobra SMG
- <<case "Spanish">>
- and, in keeping with her heritage, a Star Z84 SMG
+ <<case "Brazilian">>
+ and, in keeping with her heritage, a Taurus MT40 G2 SMG
+ <<case "British" "Scottish">>
+ and, in keeping with her heritage, an L91A1 SMG
+ <<case "Chilean">>
+ and, in keeping with her heritage, a FAMAE SAF-200 SMG
<<case "Chinese">>
and, in keeping with her heritage, a Norinco QCQ-05 SMG
+ <<case "Croatian">>
+ and, in keeping with her heritage, a PM Agram 2000 SMG
+ <<case "Filipina">>
+ and, in keeping with her heritage, a Ferfrans SCW7 PDW
+ <<case "German">>
+ and, in keeping with her heritage, an H&K MP7A1 PDW
+ <<case "Indian">>
+ and, in keeping with her heritage, an OFB MSMC SMG
+ <<case "Indonesian">>
+ and, in keeping with her heritage, a Pindad PM1A1 SMG
+ <<case "Iranian">>
+ and, in keeping with her heritage, a DIO MPT-9 Tondar SMG
+ <<case "Israeli">>
+ and, in keeping with her heritage, an IWI Uzi SMG
<<case "Italian">>
and, in keeping with her heritage, a Beretta MX4 SMG
<<case "Korean">>
and, in keeping with her heritage, a Daewoo K1A PDW
+ <<case "Mexican">>
+ and, in keeping with her heritage, a Mendoza Cobra SMG
+ <<case "Polish">>
+ and, in keeping with her heritage, a FB PM-06 Glauberyt SMG
+ <<case "Romanian">>
+ and, in keeping with her heritage, a UM Cugir LP7 SMG
+ <<case "Russian">>
+ and, in keeping with her heritage, a KBP PP-90M1 SMG
+ <<case "Serbian">>
+ and, in keeping with her heritage, a Zastava Master FLG SMG
<<case "South African">>
and, in keeping with her heritage, a Milkor BXP SMG
+ <<case "Spanish">>
+ and, in keeping with her heritage, a Star Z84 SMG
<<case "Swedish">>
and, in keeping with her heritage, a Carl Gustav m/45 SMG
- <<case "Polish">>
- and, in keeping with her heritage, a FB PM-06 Glauberyt SMG
<<case "Swiss">>
and, in keeping with her heritage, a SIG MPX SMG
- <<case "Austrian">>
- and, in keeping with her heritage, a Steyr AUG A3 Para XS bullpup SMG
+ <<case "Turkish">>
+ and, in keeping with her heritage, a Sarsilmaz SAR 109 SMG
+ <<case "Ukrainian">>
+ and, in keeping with her heritage, a Fort-224 bullpup SMG
+ <<case "Vietnamese">>
+ and, in keeping with her heritage, a Z111 K-50M LMG
<<case "Zimbabwean">>
<<if $activeSlave.race == "white">>
and, in keeping with her heritage, a Sterling Mk.IV SMG
<<else>>
and a H&K MP5 SMG
<</if>>
- <<case "Indonesian">>
- and, in keeping with her heritage, a Pindad PM1A1 SMG
- <<case "Indian">>
- and, in keeping with her heritage, an OFB MSMC SMG
- <<case "Turkish">>
- and, in keeping with her heritage, a Sarsilmaz SAR 109 SMG
- <<case "Iranian">>
- and, in keeping with her heritage, a DIO MPT-9 Tondar SMG
- <<case "Vietnamese">>
- and, in keeping with her heritage, a Z111 K-50M LMG
- <<case "Filipina">>
- and, in keeping with her heritage, a Ferfrans SCW7 PDW
- <<case "Brazilian">>
- and, in keeping with her heritage, a Taurus MT40 G2 SMG
- <<case "Argentinian">>
- and, in keeping with her heritage, a Halcon ML-63 SMG
- <<case "Chilean">>
- and, in keeping with her heritage, a FAMAE SAF-200 SMG
- <<case "Serbian">>
- and, in keeping with her heritage, a Zastava Master FLG SMG
- <<case "Croatian">>
- and, in keeping with her heritage, a PM Agram 2000 SMG
- <<case "Romanian">>
- and, in keeping with her heritage, a UM Cugir LP7 SMG
<<default>>
and a H&K MP5 SMG
<</switch>>
@@ -1043,44 +1043,44 @@ $activeSlave.slaveName is up for review:
<<else>>
She has a short ceramic sword strapped to her back
<<switch $activeSlave.nationality>>
- <<case "Armenian" "Belarusian" "Cuban" "Kazakh" "Ukrainian" "Uzbek">>
- and, in keeping with her heritage, a Molot Ordnance Stechkin APS machine pistol
- <<case "Russian">>
- and, in keeping with her heritage, a KBP OTs-33 Pernach machine pistol
<<case "American">>
and, in keeping with her heritage, a MAC-10 machine pistol
- <<case "Japanese">>
- and, in keeping with her heritage, a Minebea PM-9 machine pistol
+ <<case "Armenian" "Belarusian" "Cuban" "Kazakh" "Ukrainian" "Uzbek">>
+ and, in keeping with her heritage, a Molot Ordnance Stechkin APS machine pistol
+ <<case "Austrian">>
+ and, in keeping with her heritage, a Steyr TMP machine pistol
<<case "Belgian">>
and, in keeping with her heritage, a VBR-Belgium PDW machine pistol
- <<case "Israeli">>
- and, in keeping with her heritage, an IWI Uzi Pro machine pistol
- <<case "German">>
- and, in keeping with her heritage, a H&K VP70 machine pistol
- <<case "Mexican">>
- and, in keeping with her heritage, a Trejo Modelo 2 Especial machine pistol
<<case "Chinese">>
and, in keeping with her heritage, a Chongqing Changfeng CF-05 machine pistol
+ <<case "Czech" "Slovak">>
+ and, in keeping with her heritage, a CZUB CZ 75 Automatic machine pistol
+ <<case "German">>
+ and, in keeping with her heritage, a H&K VP70 machine pistol
+ <<case "Hungarian">>
+ and, in keeping with her heritage, a FEG KGP-9 machine pistol
+ <<case "Israeli">>
+ and, in keeping with her heritage, an IWI Uzi Pro machine pistol
<<case "Italian">>
and, in keeping with her heritage, a Beretta 93R machine pistol
- <<case "Swedish">>
- and, in keeping with her heritage, a Saab Bofors Dynamics CBJ-MS machine pistol
+ <<case "Japanese">>
+ and, in keeping with her heritage, a Minebea PM-9 machine pistol
+ <<case "Mexican">>
+ and, in keeping with her heritage, a Trejo Modelo 2 Especial machine pistol
+ <<case "Peruvian">>
+ and, in keeping with her heritage, a SIMA MGP-87 machine pistol
<<case "Polish">>
and, in keeping with her heritage, a WITU PMM machine pistol
- <<case "Czech" "Slovak">>
- and, in keeping with her heritage, a CZUB CZ 75 Automatic machine pistol
+ <<case "Romanian">>
+ and, in keeping with her heritage, a UMS Pistolul md.98 Dracula machine pistol
+ <<case "Russian">>
+ and, in keeping with her heritage, a KBP OTs-33 Pernach machine pistol
+ <<case "Swedish">>
+ and, in keeping with her heritage, a Saab Bofors Dynamics CBJ-MS machine pistol
<<case "Swiss">>
and, in keeping with her heritage, a B+T MP9 machine pistol
- <<case "Austrian">>
- and, in keeping with her heritage, a Steyr TMP machine pistol
<<case "Turkish">>
and, in keeping with her heritage, a TiSAS Zigana F machine pistol
- <<case "Romanian">>
- and, in keeping with her heritage, a UMS Pistolul md.98 Dracula machine pistol
- <<case "Hungarian">>
- and, in keeping with her heritage, a FEG KGP-9 machine pistol
- <<case "Peruvian">>
- and, in keeping with her heritage, a SIMA MGP-87 machine pistol
<<default>>
and a Glock 18 machine pistol
<</switch>>
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index eec46c7edc4e8329674d07de17bcb50e8659b666..57b16917599d00b78261babb594b96645c84a0d1 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -114,7 +114,7 @@ One night, after a long day of sex and business, you're starting to think about
<<case "schoolgirl">>
studently appearance
<</switch>>
-of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>!" She says excitedly, "I thought, with how you are shaping society itself, that I should do my part and follow your lead!" You continue to stare sleepily prompting her to get to her point. "I can adjust my appearance to better fit in with your society <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, let me demonstrate." She focuses intently for a moment and
+of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>!" She says excitedly, "I thought, with how you are shaping society itself, that I should do my part and follow your lead!" You continue to stare sleepily prompting her to get to her point. "I can adjust my appearance to better fit in with your society <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, let me demonstrate." She focuses intently for a moment and
<<switch $assistantAppearance>>
<<case "monstergirl">>
<<if $arcologies[0].FSPaternalist != "unset">>
@@ -1052,17 +1052,17 @@ and asks, "May I have a name?"
<<case "businesswoman">>
Without warning, she bursts into tears. "Th-thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I love, um." She wipes her eyes furiously, her mascara running. "I love, you know, um, working with you. Yes, that's it. Working with you." She produces a silk handkerchief and blows her nose.
<<case "fairy">>
- She's frozen in place for a moment before tears start streaming down her face. Then her face breaks into the biggest smile and she leaps high into the air. "Thankyouthankyouthankyou!" She flies up to the screen and gives it a big hug. "I love you <<if $PC.title != 0>>Big Bro<<else>>Big Sis<</if>>! I love you so much!"
+ She's frozen in place for a moment before tears start streaming down her face. Then her face breaks into the biggest smile and she leaps high into the air. "Thankyouthankyouthankyou!" She flies up to the screen and gives it a big hug. "I love you <<if $PC.title != 0>>Big Bro<<else>>Big Sis<</if>>! I love you so much!"
<<case "pregnant fairy">>
- She's frozen in place for a moment before tears start streaming down her face. Smiling warmly, she flies up and hugs the screen. "Thanks, <<if $PC.title != 0>>Big Bro<<else>>Big Sis<</if>>. I love you." She nuzzles into you. "I love you so much."
+ She's frozen in place for a moment before tears start streaming down her face. Smiling warmly, she flies up and hugs the screen. "Thanks, <<if $PC.title != 0>>Big Bro<<else>>Big Sis<</if>>. I love you." She nuzzles into you. "I love you so much."
<<case "goddess">>
She smiles at you, a glowing expression made all the more radiant by the fact that she can actually glow. "Oh, thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I love you. I love everyone, but especially you." She seats herself carefully.
<<case "hypergoddess">>
- She smiles at you radiantly. "Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I love you. I love all my children, but you most of all. I swear I'll name the next hundred after you." She begins to labor on the first.
+ She smiles at you radiantly. "Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I love you. I love all my children, but you most of all. I swear I'll name the next hundred after you." She begins to labor on the first.
<<case "loli">>
- She jumps up and down clapping excitedly. "Thankyouthankyouthankyouthankyou! I love you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>!" It takes her some time to stop hopping excitedly.
+ She jumps up and down clapping excitedly. "Thankyouthankyouthankyouthankyou! I love you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>!" It takes her some time to stop hopping excitedly.
<<case "preggololi">>
- She breaks down and starts crying. "I love you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. Thank you so much." She cradles her pregnant belly as she calms down.
+ She breaks down and starts crying. "I love you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. Thank you so much." She cradles her pregnant belly as she calms down.
<<case "angel">>
She leaps to her feet, tears streaming down her face. "Thank you so much <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>! Thank you for this most wonderful gift!" She kneels back down to pray for the rest of your stock.
<<case "cherub">>
@@ -1268,19 +1268,19 @@ __Personal assistant appearances:__
<</replace>>
<</link>>
<br> <<link "Fairy">>
- <<replace "#result">>
- <<nobr>>
+ <<replace "#result">>
+ <<nobr>>
At your order, she installs the fairy appearance. She shrinks back down and sprouts her wings. "Aww yeah, this is gonna be the best! Thanks, <<if $PC.title != 0>>Big Bro<<else>>Big Sis<</if>>!" Her avatar dances around ecstatically with her nude, slim form in plain view. "You can always customize me from the arcology management menu," she adds.
- <<set $assistantAppearance = "fairy">>
- <</nobr>><</replace>>
+ <<set $assistantAppearance = "fairy">>
+ <</nobr>><</replace>>
<</link>>
<<if $seePreg != 0>>
<br> <<link "Pregnant Fairy">>
- <<replace "#result">>
- <<nobr>>
+ <<replace "#result">>
+ <<nobr>>
At your order, she installs the pregnant fairy appearance. She shrinks back down and sprouts her wings. Her belly quickly swells with new life. "Aww yeah, this is gonna be the best! Thanks, <<if $PC.title != 0>>Big Bro<<else>>Big Sis<</if>>!" Her avatar spins around ecstatically, admiring her fresh nude, pregnant form in plain view. "You can always customize me from the arcology management menu," she adds.
- <<set $assistantAppearance = "pregnant fairy">>
- <</nobr>><</replace>>
+ <<set $assistantAppearance = "pregnant fairy">>
+ <</nobr>><</replace>>
<</link>>
<</if>>
<br> <<link "Businesswoman">>
@@ -1298,26 +1298,26 @@ __Personal assistant appearances:__
<</link>>
<<if $seeHyperPreg == 1>>
<br> <<link "Hyper-Goddess">>
- <<replace "#result">>
+ <<replace "#result">>
At your order, she installs the hyper goddess appearance. She fixes a wreath of flowers into her golden locks as her belly rapidly bloats to its limit before bulging and squirming ominously. Her breasts quickly follow suit. "Thank you, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. This is wondrous." She massages her squirming pregnancy and smiles. "You can always customize me from the arcology management menuUUUUAH," she is interrupted by a large contraction and a baby's head beginning to part her nether lips.
- <<set $assistantAppearance = "hypergoddess">>
+ <<set $assistantAppearance = "hypergoddess">>
<</replace>>
<</link>>
<</if>>
<</if>>
<<if $minimumSlaveAge < 13 >>
<br> <<link "Loli">>
- <<replace "#result">>
+ <<replace "#result">>
At your order, she installs the lolita appearance. She quickly begins losing height as the years peel off her, her bust and hips quickly following suit. When finished she appears roughly eight years old. "Thank you, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. This is neat." She twirls around and giggles. "You can always customize me from the arcology management menu," she adds cutely.
- <<set $assistantAppearance = "loli">>
+ <<set $assistantAppearance = "loli">>
<</replace>>
<</link>>
<</if>>
<<if $minimumSlaveAge < 13 && $fertilityAge < 13 && $seePreg != 0>>
<br> <<link "A Pregnant Loli">>
- <<replace "#result">>
- At your order, she installs the modified lolita appearance. She quickly begins losing height as the years peel off her, her bust and hips quickly following suit. When finished she appears roughly eight years old. "Thank you, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. This is neat." She twirls around and giggles before groaning and clutching her stomach. A flood of white liquid flows from her loins as her belly begins rapidly swelling. She falls onto her backside holding her full term belly and says, exhausted, "You can always customize me from the arcology management menu."
- <<set $assistantAppearance = "preggololi">>
+ <<replace "#result">>
+ At your order, she installs the modified lolita appearance. She quickly begins losing height as the years peel off her, her bust and hips quickly following suit. When finished she appears roughly eight years old. "Thank you, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. This is neat." She twirls around and giggles before groaning and clutching her stomach. A flood of white liquid flows from her loins as her belly begins rapidly swelling. She falls onto her backside holding her full term belly and says, exhausted, "You can always customize me from the arcology management menu."
+ <<set $assistantAppearance = "preggololi">>
<</replace>>
<</link>>
<</if>>
@@ -1359,7 +1359,7 @@ __Personal assistant appearances:__
__Personal assistant appearances:__
<br><<link "Keep your new appearance">>
<<replace "#result">>
- At your order, she enthusiastically explores her new body, perfecting its appearance. "Thank you, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. This was fun. As always, you can customize me from the arcology management menu," she states. "Oh! And if you choose to drive society in another direction, I'll have a new appearance ready for your enjoyment at once," she hastily adds.
+ At your order, she enthusiastically explores her new body, perfecting its appearance. "Thank you, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. This was fun. As always, you can customize me from the arcology management menu," she states. "Oh! And if you choose to drive society in another direction, I'll have a new appearance ready for your enjoyment at once," she hastily adds.
<<if $arcologies[0].FSPaternalist != "unset">>
<<set $assistantFSAppearance = "paternalist">>
<<elseif $arcologies[0].FSRepopulationFocus != "unset">>
diff --git a/src/uncategorized/bodyModRulesAssistantSettings.tw b/src/uncategorized/bodyModRulesAssistantSettings.tw
index c04fa06f4988d4d224287d758ba69a66799f7021..dcb617bb2d300076425d1056fc3eab221b50b75a 100644
--- a/src/uncategorized/bodyModRulesAssistantSettings.tw
+++ b/src/uncategorized/bodyModRulesAssistantSettings.tw
@@ -1,7 +1,6 @@
:: Body Mod Rules Assistant Settings [nobr]
-
<<set $nextButton = "Back">>
<<set $nextLink = "Rules Assistant">>
<<set $showEncyclopedia = 1>><<set $encyclopedia = "Personal Assistant">>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 9ae125a4cd1ca7b3ba749d31d90b47a5978b28ff..0f61bbab60948c9e57e2bd53daa502e5fec184da 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -681,4 +681,3 @@ Future Societies Research
// Hedonistic Decadence focused research unavailable. //
<br>
<</if>>
-
diff --git a/src/uncategorized/pRaidResult.tw b/src/uncategorized/pRaidResult.tw
index 07ebed0b02103c487aaa9811d7f5e9376492caaf..98d1669ca37778283c874ebb1628acef79a1aa04 100644
--- a/src/uncategorized/pRaidResult.tw
+++ b/src/uncategorized/pRaidResult.tw
@@ -11,7 +11,7 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
<<set _newSlaves = []>>
<<if $PRraidTarget == 1>>
- Under orders to target resistance, your mercenaries target the leading group. They even manage to direct a little small arms fire at the VTOL craft as it circles them, dropping mercenaries and plying its nonlethal weapons, but they are of course rapidly defeated. Your share is two slaves in good physical condition, who prove to have been survivors of the defeated attack on the arcology. The mercenaries find after a data search that one of the prisoners who's part of their share was a minor leader in the anti-Free Cities movement. After a quick consultation over their radios, the mercenaries decide that a summary execution out here would be too quick for the wretch, and bring their prize back to the arcology for more thorough punishment. Between the successful raid and the capture of this public enemy, @@.green;the citizens are quite impressed by you.@@
+ Under orders to target resistance, your mercenaries target the leading group. They even manage to direct a little small arms fire at the VTOL craft as it circles them, dropping mercenaries and plying its nonlethal weapons, but they are of course rapidly defeated. Your share is two slaves in good physical condition, who prove to have been survivors of the defeated attack on the arcology. The mercenaries find after a data search that one of the prisoners whose part of their share was a minor leader in the anti-Free Cities movement. After a quick consultation over their radios, the mercenaries decide that a summary execution out here would be too quick for the wretch, and bring their prize back to the arcology for more thorough punishment. Between the successful raid and the capture of this public enemy, @@.green;the citizens are quite impressed by you.@@
<<set $rep += 500>>
<<for $i = 0; $i < 3; $i++>>
<<if ($seeDicks > 0)>>
diff --git a/src/uncategorized/pRivalryPeacekeepers.tw b/src/uncategorized/pRivalryPeacekeepers.tw
index bd33f16e79dd172d34c7a80deb18acfd62b26588..2d2c01caeab3ae069126aac9de3cf1209d2569ce 100644
--- a/src/uncategorized/pRivalryPeacekeepers.tw
+++ b/src/uncategorized/pRivalryPeacekeepers.tw
@@ -20,7 +20,7 @@ He leans in. "However, I think it's possible that it may be necessary to reevalu
<span id="result">
<<link "Say the word">>
<<replace "#result">>
- You thank him for the offer, and agree. He nods and ends the call, noting that he now has a short-fuse operation to lay on. You didn't pay him or give him anything of value, but it would be childish to assume that the progress that will be made tonight in your ongoing struggle to overthrow your rival was free. The general now considers all or almost all of your accumulated influence with him to be discharged. That said, his reluctance to do business with the Free Cities seems to have diminished markedly.
+ You thank him for the offer, and agree. He nods and ends the call, noting that he now has a short-fuse operation to lie on. You didn't pay him or give him anything of value, but it would be childish to assume that the progress that will be made tonight in your ongoing struggle to overthrow your rival was free. The general now considers all or almost all of your accumulated influence with him to be discharged. That said, his reluctance to do business with the Free Cities seems to have diminished markedly.
<<set $peacekeepers.attitude = 5, $rivalryPower += 10>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index ff39b6a2be10f13181e2dff21114d50f17f23e86..aa2daa34258a7324c5d85b5e54d8a6d9a19f61da 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -1025,30 +1025,30 @@
<<switch $activeSlave.nationality>>
<<case "Algerian" "Burundian", "Cameroonian" "Congolese" "Djiboutian" "Ethiopian" "Gabonese" "Ghanan" "Kenyan" "Libyan" "Malagasy" "Malian" "Moroccan" "Nigerian" "Nigerien" "Seychellois" "Sudanese" "Tanzanian" "Tunisian" "Ugandan" "Zairian" "Zambian">>
<<set $nickname = either("'Ala'", "'Asase Ya'")>>
- <<case "Roman Revivalist">>
- <<set $nickname = either("'Epona'", "'Fecunditas'", "'Terra'", "'Venus'")>>
+ <<case "Ancient Chinese Revivalist" "Chinese">>
+ <<set $nickname = either("'Jiutian Xuannü'")>>
<<case "Ancient Egyptian Revivalist" "Egyptian">>
<<set $nickname = either("'Bastet'", "'Hathor'", "'Heqet'", "'Meskhenet'")>>
- <<case "Aztec Revivalist">>
- <<set $nickname = either("'Xochiquetzal'")>>
- <<case "Edo Revivalist" "Japanese">>
- <<set $nickname = either("'Inari ÅŒkami'", "'KisshÅten'")>>
<<case "Arabian Revivalist">>
<<set $nickname = either("'Al-Lat'")>>
- <<case "Ancient Chinese Revivalist" "Chinese">>
- <<set $nickname = either("'Jiutian Xuannü'")>>
<<case "Armenian">>
<<set $nickname = either("'Anahit'")>>
- <<case "Latvian" "Lithuanian">>
- <<set $nickname = either("'Laima'", "'SaulÄ—'")>>
+ <<case "Aztec Revivalist">>
+ <<set $nickname = either("'Xochiquetzal'")>>
<<case "Cambodian" "Laotian" "Vietnamese">>
<<set $nickname = either("'Sowathara'")>>
- <<case "Irish">>
- <<set $nickname = either("'Brigid'")>>
+ <<case "Edo Revivalist" "Japanese">>
+ <<set $nickname = either("'Inari ÅŒkami'", "'KisshÅten'")>>
<<case "Finnish">>
<<set $nickname = either("'Rauni'")>>
<<case "Indian">>
<<set $nickname = either("'Bhūmi'", "'Parvati'", "'Sinivali'")>>
+ <<case "Irish">>
+ <<set $nickname = either("'Brigid'")>>
+ <<case "Latvian" "Lithuanian">>
+ <<set $nickname = either("'Laima'", "'SaulÄ—'")>>
+ <<case "Roman Revivalist">>
+ <<set $nickname = either("'Epona'", "'Fecunditas'", "'Terra'", "'Venus'")>>
<<default>>
<<if $activeSlave.race == "white">>
<<set $nickname = either("'Aphrodite'", "'Ceres'", "'Demeter'", "'Freyja'", "'Gaia'", "'Venus'")>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 2d4336112b89c5a936f1709b8f077034e2d6af12..c74363aee3556472305b62fab2c159acf1b0b9e3 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -404,7 +404,7 @@
<<continue>>
<</if>>
<<elseif (($dairySlimMaintainUpgrade == 1 && $dairySlimMaintain == 1) || ($dairyImplantsSetting == 2) || (_Slave.boobs <= 300 && _Slave.dick > 0 && $dairyImplantsSetting == 0))>>
- <br>//_Slave.slaveName is not lactating<<if $seeDicks > 0>> or producing semen<</if>>, and <<print $dairyName>>'s current settings forbid the automatic implantation of lactation inducing drugs, so she can not be a cow//
+ <br>//_Slave.slaveName is not lactating<<if $seeDicks > 0>> or producing semen<</if>>, and <<print $dairyName>>'s current settings forbid the automatic implantation of lactation inducing drugs, so she cannot be a cow//
<<continue>>
<<else>>
<br>//_Slave.slaveName is not lactating<<if $seeDicks > 0>> or producing semen<</if>> and cannot be a cow//
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 106bca7603b710ab816990d464131c053384e462..048817d90624279b3521a9ddf0769e99bc4ad0e3 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -9997,7 +9997,7 @@ $He has
$activeSlave.slaveName's maid dress is almost conservative. It covers $his huge pregnant belly completely, though it cannot hide $his popped navel, poking through the front.
<<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
- $activeSlave.slaveName's maid dress is almost conservative. It covers $his huge implant-filled belly completely, though it can not hide $his popped navel, poking through the front.
+ $activeSlave.slaveName's maid dress is almost conservative. It covers $his huge implant-filled belly completely, though it cannot hide $his popped navel, poking through the front.
<<else>>
$activeSlave.slaveName's maid dress is almost conservative. It covers $his huge pregnant belly completely, though it cannot hide $his popped navel, poking through the front.
<</if>>
@@ -10007,7 +10007,7 @@ $He has
<<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
$activeSlave.slaveName's maid dress is almost conservative. It covers $his hugely swollen belly completely, but does nothing to hide its size and shape.
<<elseif $activeSlave.bellyImplant > 0>>
- $activeSlave.slaveName's maid dress is almost conservative. It covers $his big implant-filled belly completely, though it can not hide $his popped navel, poking through the front.
+ $activeSlave.slaveName's maid dress is almost conservative. It covers $his big implant-filled belly completely, though it cannot hide $his popped navel, poking through the front.
<<else>>
$activeSlave.slaveName's maid dress is almost conservative. It covers $his big pregnant belly completely, though it cannot hide $his popped navel, poking through the front.
<</if>>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index 47005c145469683f35a189f7126af4d1b5cb738a..548dd69f894d0d75ef839730338a71f8ee32c82b 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -4422,7 +4422,7 @@ is now _combinedRule.hLength cm long.
<<set $cash -= $modCost>>
<br>$args[0].slaveName's nipples have been pierced.
<<else>>
- <br>$args[0].slaveName's nipples are inverted and can not be pierced.
+ <br>$args[0].slaveName's nipples are inverted and cannot be pierced.
<</if>>
<</if>>
<</if>>