diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 144bbe80a68815ab91d62097edf1adb1ef496bf1..9c48ecb64983d85fcabd96cfaffbca5ce77f6b3f 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -683,7 +683,7 @@ window.FlavourText = function(View) {
if (S.AA >= 8) stealth=`The old skin has been replaced with a radar-absorbent material, making the aircraft difficult to pick up on radar.`;
if (S.AA >= 9) scramble=`The VTOLs can scramble to react to any threat in under three minutes.`;
if (S.AA >= 10) PAI=`A piloting AI has been installed, allowing the VTOLs to perform impossible maneuvers that cannot be done by a human pilot. This removes the need for a human in the aircraft altogether.`;
- return `${group}. Several of the landing pads around $arcologies[0].name host groups of four fighters, ready to defend the arcology. ${scramble} The attack VTOL are currently ${W1} with a Gatling cannon${W2} ${W3}${support}. ${TAI} ${PAI} ${engines} ${lock} ${stealth}`;
+ return `${group}. Several of the landing pads around ${V.arcologies[0].name} host groups of four fighters, ready to defend the arcology. ${scramble} The attack VTOL are currently ${W1} with a Gatling cannon${W2} ${W3}${support}. ${TAI} ${PAI} ${engines} ${lock} ${stealth}`;
}
function TA() {
@@ -730,7 +730,7 @@ window.FlavourText = function(View) {
function AC() {
let recom=`has been recommissioned from the Old World for ${V.SF.Lower}. It`, jets=`Formerly mothballed strike jets`, loc=``, radar=``, AAG=``, prop=``, torp=``, armor=``, power=``, scramble=``;
- if (V.week % 6 === 0) { loc=`moored to the pier in the Naval Yard`; } else { loc=`patrolling the waters near $arcologies[0].name`; }
+ if (V.week % 6 === 0) { loc=`moored to the pier in the Naval Yard`; } else { loc=`patrolling the waters near ${V.arcologies[0].name}`; }
if (S.AircraftCarrier >= 2) { radar=`The island's radar and comms have been improved.`; recom=``; }
if (S.AircraftCarrier >= 3) AAG=`The antiair guns have been updated to automatically track and predict enemy aircraft movement.`;
if (S.AircraftCarrier >= 4) jets=`Modern strike jets with state-of-the-art armaments`;
diff --git a/src/SpecialForce/TrickShotNight.tw b/src/SpecialForce/TrickShotNight.tw
index fa046dc9db2c1f7ffe360f58e3a05c6864691ef1..1bcfada098a24753297800026b5ad61cee67650c 100644
--- a/src/SpecialForce/TrickShotNight.tw
+++ b/src/SpecialForce/TrickShotNight.tw
@@ -23,9 +23,9 @@ Despite your direct elevator, interaction with the majority of your security for
<br>//You lack the necessary funds to attend.//
<<else>> /* cash >= 500000 */
-<<link "Attend the trick shot night">>
+<br><<link "Attend the trick shot night">>
<<replace "#result">> <<set $PC.warfare += 1>>
- You instruct $assistantName to inform $SF.Lower that you will be attending their trick shot night, and after settling your affairs in the penthouse you head down to the firebase. The atmosphere in the firebase is casual, especially in comparison to the usual situations you meet them, though your security force still maintain some measure of decorum towards you as their employer. Eventually, you settle in at the table with a handful of $SF.Lower officers and cash in your @@.yellowgreen;<<print cashFormat(500000)>>@@ into bullets. All that remains is to decide your strategy for the night.
+ You instruct $assistantName to inform $SF.Lower that you will be attending their trick shot night, and after settling your affairs in the penthouse you head down to the firebase. The atmosphere in the firebase is casual, especially in comparison to the usual situations you meet them, though your security force still maintain some measure of decorum towards you as their employer. Eventually, you settle in at the table with a handful of $SF.Lower officers and turn your @@.yellowgreen;<<print cashFormat(500000)>>@@ into bullets. All that remains is to decide your strategy for the night.
<br><br> <span id="bountyresult">
<<link "Play it safe">>
@@ -73,13 +73,41 @@ Despite your direct elevator, interaction with the majority of your security for
<<set $activeSlave.analSkill = 0>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.accent = random(0,1)>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
+ <<set $activeSlave.hLength = 1>>
<<set $activeSlave.hStyle = "buzzcut">>
+ <<set $activeSlave.clothes = "a military uniform">>
<<setLocalPronouns $activeSlave>>
+ <span id="artFrame">
+ /* 000-250-006 */
+ <<if $seeImages == 1>>
+ <<if $imageChoice == 1>>
+ <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <<else>>
+ <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <</if>>
+ <</if>>
+ /* 000-250-006 */
+ </span>
Some aggressive play and an eye for riling up your fellow players has resulted in an immense payout, and all but one of your adversaries have folded as the situation has escalated. The only player still in contention is a wily old mercenary, the veteran of $his fair share of battles on the battlefield and at the firing range. $He's short on bullets, however, and $he'll have to buy in with something else as collateral.
<br><br> <span id="aliveresult">
<<link "A year of servitude">>
+ <<set $activeSlave.clothes = "no clothing">>
+ <<replace "#artFrame">>
+ <span id="artFrame">
+ /* 000-250-006 */
+ <<if $seeImages == 1>>
+ <<if $imageChoice == 1>>
+ <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <<else>>
+ <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <</if>>
+ <</if>>
+ /* 000-250-006 */
+ </span>
+ <</replace>>
<<replace "#aliveresult">>
<<if random(1,100) > 50>>
For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other security force clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index 39f6a270a8365e934fe81ae83ab847d4714516e9..745fd0c905ff883e8e5d29d742ac3c8646751e5a 100644
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
@@ -1965,7 +1965,7 @@ window.boobWatch = function(slave) {
case "a scalemail bikini":
t += `${His} scalemail bikini covers `;
if (slave.boobs < 300) {
- t += `all of $his flat chest.`;
+ t += `all of ${his} flat chest.`;
} else if (slave.boobs < 700) {
t += `${his} breasts entirely.`;
} else if (slave.boobs < 1500) {
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index 8c4ee797e47d4325c9c6e1a525ef15da8b2a4a13..025ca0d93ee7cd9ce22239c89ca4f874aa825b34 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -95,6 +95,7 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<<set $activeSlave.combatSkill = 1>>
<<set $activeSlave.accent = random(0,1)>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
+ <<set $activeSlave.hLength = 1>>
<<set $activeSlave.hStyle = "shaved into a mohawk">>
<<set $activeSlave.customTat = "She has a number of tattoos from a variety of mercenary companies.">>
<<set $activeSlave.clothes = "a military uniform">>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 24d79cb0092b7518df1b2eb12ec61b299f3cade5..04d7daff0c1d4c6ad91efc45ee18973a7cd53254 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -7964,7 +7964,7 @@
<</if>>
<</if>>
-<<if ($slaves[$i].hStyle != "shaved" && $slaves[$i].bald != 1 && $slaves[$i].haircuts == 0)>>
+<<if (($slaves[$i].hStyle != "shaved" || $slaves[$i].hStyle != "buzzcut" || $slaves[$i].hStyle != "trimmed") && $slaves[$i].bald != 1 && $slaves[$i].haircuts == 0)>>
<<if ($slaves[$i].hLength < 150)>>
<<set $slaves[$i].hLength += 1>>
<</if>>