diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 567cb03a936153cc9cdbd58f1735924bed08f1a0..b907c15e8b76edbecf6ff868c877e55119687157 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
0.10.7.1-0.3.x
+6/08/2018
+
+ 14
+ -added anon's wetware cpu market
+ -fixes
+
6/07/2018
13
diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index be3a661a999e7992067b94bbd6cdd13fb56d6286..58b8f2c7b56024e1235fac1558a9cd60ccc8c014 100644
--- a/src/SecExp/propagandaHub.tw
+++ b/src/SecExp/propagandaHub.tw
@@ -79,8 +79,8 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
<br>
<<if $propCampaign < 5>>
<<link "Invest more resources in the propaganda machine">>
- <<set $propCampaign += 1>>
<<set $cash -= 5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$HackingSkillMultiplier>>
+ <<set $propCampaign += 1>>
<<set $PC.hacking += .5>>
<<set $propHubUpkeep += $upgradeUpkeep>>
<<goto "propagandaHub">>
@@ -108,8 +108,8 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
<<else>>
<<if $miniTruth < 5>>
<<link "Enlarge the authenticity department">>
- <<set $miniTruth += 1>>
<<set $cash -= 5000*$upgradeMultiplierArcology * ($miniTruth + 1) * _HistoryDiscount>>
+ <<set $miniTruth += 1>>
<<set $propHubUpkeep += $upgradeUpkeep>>
<<goto "propagandaHub">>
<</link>>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 469f525c8106c3a6751cb1294eb4755b83e0dc96..643efdc72e2db9c4e6c4da19adaf3e97fa750ded 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2578,7 +2578,10 @@ LORE: INTERVIEWS
<br>''deepmurk'' for a massive expansion in conjunction with Nox to the original embedded vector art. Also more hairs, shoes and clothes. Overhauled skin colors too.
<br>''Channel8'' for FCTV content (and likely giving the spellCheck an aneurysm).
<br>''Channel13'' for FCTV content.
- <br>''kidkinster'' for slave management ui stuff.
+ <br>''kidkinster'' for slave management ui stuff and induced NCS.
+ <br>''editoranon'' for cleaning text and drafting up bodyswap reactions.
+ <br>''anon'' for the wetware CPU market.
+ <br>''git contributors lost to time'' for their submissions and work through pregmod's git.
<br>''Bane70'' optimized huge swaths of code with notable professionalism.
<br>''Circle Tritagonist'' provided several new collars and outfits.
<br>''Qotsafan'' submitted bugfixes.
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index cb1298500aeb39239a2e5fc5ad55229cde1c3bc7..ae306b5d7ae26793461ed515c413a97ec5a8cfbb 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -185,6 +185,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.pregKnown = 1>>
<<set $activeSlave.pregWeek = $activeSlave.preg>>
<<SetBellySize $activeSlave>>
+ <<set $activeSlave.pregAdaptation = 300>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.lips = random(20,50)>>
<<set $activeSlave.teeth = "normal">>
diff --git a/src/pregmod/wetwareCPUs.tw b/src/pregmod/wetwareCPUs.tw
new file mode 100644
index 0000000000000000000000000000000000000000..de6987dfefefdf674b5995cb5ba514f662bfb51b
--- /dev/null
+++ b/src/pregmod/wetwareCPUs.tw
@@ -0,0 +1,37 @@
+:: Wetware CPUs [nobr]
+
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+/* Multi-Purchase Support */
+<<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
+<<if $newSlaves.length > 0>>
+ <<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "wetware", $returnTo = "Main", $newSlaveIndex = 0>>
+<</if>>
+
+//Wetware CPUs offer highly trained slaves with useful career experience at a discount; That is, at the cost of the physical health of the merchandise.//
+
+<br><br>
+
+<<GenerateMarketSlave "wetware">>
+<<slaveCost $activeSlave>>
+<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += Math.trunc($slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
+
+
+<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
+
+<<if $cash >= $slaveCost>>
+ <br>[[Buy her and check out other slaves to order|Wetware CPUs][$cash -= $slaveCost, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <<if $newSlaves.length == 0>>
+ <br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
+ <<else>>
+ <br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $newSlaves.push($activeSlave)]]
+ <</if>>
+<<else>>
+ //You lack the necessary funds to buy this slave.//
+<</if>>
+<br>[[Decline to purchase her and check out another slave|Wetware CPUs][$slavesSeen += 1]]
+<<if $newSlaves.length > 0>>
+ <br>[[Finish your order of slaves|Bulk Slave Intro]]
+<</if>>
+
+<br><br>
+<<set $saleDescription = 1>><<include "Long Slave Description">>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 5b7f9e9eb24ada93d69c3ccde272b6132bd9cff6..ed670c19aabd1c7b34a35df1b12a96f5fd41de2c 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -575,7 +575,7 @@ $activeSlave.slaveName is up for review:
<br>She @@.red;FAILED@@ the carcinogen test.
<<set _passing-->>
<</if>>
-<<if $activeSlave.addict >= $activeStandard.addict>>
+<<if $activeSlave.addict <= $activeStandard.addict>>
<br>She @@.lime;PASSED@@ the drug test.
<<else>>
<br>She @@.red;FAILED@@ the drug test.
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index ef77f0e4757da1bea54cbc2c66129b11d375b50c..62681f8ef591ccf20eb0a9e47a041e5f070cb336 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1890,7 +1890,11 @@ At your <<if canSee($activeSlave)>>nod<<else>>acknowledgement<</if>>, she
<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
<<if $activeSlave.fetish == "dom">>
<<if $activeSlave.dick > 0 && $activeSlave.dick < 5 && canPenetrate($activeSlave)>>
- <<set _possibleDrugs.push({type: "dick", text: "peni<<s>> enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but when I do get to do a girl, <<Master>>, I want to <<if canSee($activeSlave)>><<s>>ee a little fear in her eye<<s>><<else>>feel her a<<ss>> clench in fear<</if>>."})>>
+ <<if canSee($activeSlave)>> /* not taking chances on the condition in there */
+ <<set _possibleDrugs.push({type: "dick", text: "peni<<s>> enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but when I do get to do a girl, <<Master>>, I want to <<s>>ee a little fear in her eye<<s>>."})>>
+ <<else>>
+ <<set _possibleDrugs.push({type: "dick", text: "peni<<s>> enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but when I do get to do a girl, <<Master>>, I want to feel her a<<ss>> clench in fear."})>>
+ <</if>>
<</if>>
<<if canPenetrate($activeSlave) && $activeSlave.scrotum > 0 && $activeSlave.balls < 10>>
<<set _possibleDrugs.push({type: "balls", text: "te<<s>>ticle enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but when I do get to do a girl, <<Master>>, I want to hear her grunt every <<s>>ingle time the weight of my ball<<s>> <<s>>lap<<s>> again<<s>>t her body."})>>
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index addeef16f6ec1eba263910d6eb0fe045120d2e29..256348e5ec62c1aebebe401ab6413392dfceb993 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -118,6 +118,19 @@ __Sex Slave Purchase Options__
[[(x10)|Bulk Slave Generate][$slaveMarket = "trainers", $introType = "bulk", $numSlaves = 10]] |
<</if>>
//Slaves will tend to be good quality and obedient.//
+
+ <<if $arcologies[0].FSPaternalist == "unset">>
+ <br>[[Wetware CPUs|Slave Markets][$slaveMarket = "wetware", $slavesSeen += 1]] |
+ <<if $cash > _minimumFive>>
+ [[(x5)|Bulk Slave Generate][$slaveMarket = "wetware", $introType = "bulk", $numSlaves = 5]] |
+ <</if>>
+ <<if $cash > _minimumTen>>
+ [[(x10)|Bulk Slave Generate][$slaveMarket = "wetware", $introType = "bulk", $numSlaves = 10]] |
+ <</if>>
+ //Ruined bodies but keen minds. Requires some TLC, but offers outstanding training at a discount.//
+ <<else>>
+ <br>//The paternalistic nature of your society blocks the abusive Wetware CPU manufactures from operating within your arcology.//
+ <</if>>
<</if>>
<<if ($rep > 5500)>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 4919db8e7724dc53d14387e71b407553170b1dcd..9c07ef0e93082b250bce4fc4d5270aba8adea9e3 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -370,6 +370,7 @@ $He comes to you for an inspection
<<ageAndHealthDescription>>
+<<if $saleDescription != 1>>
<<if $clinic != 0 && $clinicUpgradeScanner == 1>>
<<if $activeSlave.chem > 15>>
$clinicNameCaps's scanners score long term carcinogenic buildup in $his body at @@.cyan;<<print Math.ceil($activeSlave.chem/10)>>@@.
@@ -537,6 +538,7 @@ $He comes to you for an inspection
$He's the father of $activeSlave.PCChildrenFathered of your children.
<</if>>
<</if>>
+<</if>>
<<if $activeSlave.fuckdoll == 0>> /* NORMAL NON-FUCKDOLL MENTAL REPORT */
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 98bf10fb362b99b5211bc5188c10abcf72b110eb..34b270a7827989279bf9858d7c4382cd2409c870 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -521,6 +521,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<set $arcologies[0].prosperity = Math.clamp($arcologies[0].prosperity, 1, 300)>>
<</if>>
You target $arcologies[$i].name for @@.yellow;digital economic warfare,@@ successfully raiding its coffers for @@.yellowgreen;<<print cashFormat(_WarSpoils)>>@@ this week.
+ <<set $cash += _WarSpoils>>
<<if _redHanded == 1>>
A successful trace back to your arcology has exposed your actions, @@.red;damaging your reputation@@ and @@.red;scaring away potential investors.@@
<<if $secExp == 1>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index f51a4cc51d574867a05ebffb105ad633eaf7beaf..8bd86f5f248d7e48b43629850c45b9db97e0c373 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6323,7 +6323,7 @@
$possessiveCap @@.orange;NCS@@ has @@.lime;changed $possessive nipples to <<= _target>>.@@
<<set $slaves[$i].nipples = _target>>
<<if ($slaves[$i].areolae > 1)>>
- $possessiveCap areolae also shrink down to a more normal size<<if ($slaves[$i].areolae > 3)>>, loosing the surgial shape alteration<</if>>.
+ $possessiveCap areolae also shrink down to a more normal size<<if ($slaves[$i].areolae > 3)>>, losing the surgical shape alteration<</if>>.
<<set $slaves[$i].areolae = 1, _countNCS++>>
<</if>>
<<elseif (($slaves[$i].boobs-$slaves[$i].boobsImplant >= 300) && (($slaves[$i].NCSyouthening >= 6) || (random(1,100) < 50)))>>
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index 7145cc65a8a0066fb24c586d33bbfc84af41c81c..8657b31b57969c9387ab3763022d08266cd390bf 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -26,6 +26,21 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<</if>>
<<GenerateMarketSlave "heap">>
+<<case "wetware">>
+
+ You're in the corner of the slave market occupied by scientists and programmers, pioneers in perfecting the skills of slaves by removing all external stimuli and subjecting them to an inhumane regimen of simulated sexual and career training. Although their bodies are ruined, these slaves are guarranteed to be intelligent, skilled and trained in a variety of jobs. If you're willing to perform extensive repairs<<if $bodyswapAnnounced>>, or have a spare body ready<</if>>, these slaves have high potential in almost any role in your arcology.
+
+ <<set $seed = random(1,4)>>
+ <<if $seed == 1>>
+ Just past a scientist, you can see a <<if $seeExtreme == 1>>limbless <</if>>slave being extracted from a tank filled with fluid wearing a bizarre helmet. As the device is removed by a technician, the slave begins to panic as she is dragged from her virtual life and realizes exactly what has happened to her body.
+ <<elseif $seed == 2>>
+ A scientist turns to you and remarks "I almost envy the hardware. They believe they're having a fulfilling career with a loving family and meaningful relationships for a lifetime. Honestly, if the mental imprinting process wasn't so destructive to the human body, I'd probably hop in myself!"
+ <<elseif $seed == 3>>
+ Racks of ravaged bodies are layed across tables with plaques stating slave IQ, career, and sexual skill exam results.
+ <<else>>
+ Curious, you ask a technician why it's necessary for the merchandise to be so badly treated. He replies "Forcing stimulus on the hardware takes an enormous toll on their nervous and circulatory system. The nonfunctional components are disabled and removed as necessary to ensure optimal response to the imprinting process."
+ <</if>>
+ <<GenerateMarketSlave "wetware">>
<<case "kidnappers">>
You're in the area of the slave market populated by slave kidnappers, though of course they prefer more polite titles. The slaves here are cheap, and they look it. They're almost all recent catches from bad parts of the old world, and most of them have seen considerable abuse between the moment of their capture and entering your arcology.
@@ -195,7 +210,7 @@ The offered price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveM
<</if>>
<br><br>
-<<if $slaveMarket != "indentures" && $slaveMarket != "neighbor" && $slaveMarket != "heap">>
+<<if $slaveMarket != "indentures" && $slaveMarket != "neighbor" && $slaveMarket != "heap" && $slaveMarket != "wetware">>
<<set $applyLaw = 1>>
<</if>>
<<set $saleDescription = 1>><<include "Long Slave Description">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 29f009a074d175db047ab3c97edf4d50b2a66f5a..acf993924a847849dc2ee17ad4ebacd5c4f69286 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -2812,6 +2812,87 @@
<<set $activeSlave.sexualQuirk = "none">>
<<set $activeSlave.fetish = "mindbroken">>
<<set $activeSlave.fetishStrength = 0>>
+
+<<case "wetware">>
+ <<include "Generate New Slave">>
+ <<set $activeSlave.origin = "You bought her from a wetware CPU farm, her body ruined but her mind subjected to a simulated career.">>
+ <<set $activeSlave.nationality = "Stateless">>
+ <<set $activeSlave.devotion = 40>>
+ <<set $activeSlave.trust = -100>>
+ <<set $activeSlave.career = either("a politician", "a college scout", "a business owner", "a house DJ", "a soldier", "a prison guard", "a doctor", "a counselor", "a dairy worker", "a secretary", "a teacher")>>
+ <<set $activeSlave.intelligence = either(3, 2, 2, 1, 1)>>
+ <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.health = random(-99,-50)>>
+ <<set $activeSlave.weight = random(-100,-50)>>
+ <<set $activeSlave.muscles = random(-100,-50)>>
+ <<set $activeSlave.eyes = -2>>
+ <<if $seeExtreme == 1>>
+ <<set $activeSlave.amp = 1>>
+ <</if>>
+ <<if $activeSlave.amp != 1>>
+ <<set $activeSlave.heels = 1>>
+ <</if>>
+ <<set $activeSlave.voice = 0>>
+ <<set $activeSlave.face = random(-100,-50)>>
+ <<set $activeSlave.butt = 0>>
+ <<if $activeSlave.vagina > -1>>
+ <<set $activeSlave.vagina = either(1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 10)>>
+ <<set $activeSlave.preg = random(-3,-1)>>
+ <<set $activeSlave.vaginalCount += random(0,300)>>
+ <</if>>
+ <<set $activeSlave.anus = either(1, 2, 2, 3, 3, 3, 3, 4, 4, 4)>>
+ <<if $activeSlave.balls > 1 && random(1,100) > 50>>
+ <<set $activeSlave.balls = 0>>
+ <</if>>
+ <<set $activeSlave.oralCount += random(0,300)>>
+ <<set $activeSlave.analCount += random(0,300)>>
+ <<if $activeSlave.boobs > 500>>
+ <<set $activeSlave.mammaryCount += random(0,300)>>
+ <</if>>
+ <<set $activeSlave.vaginalSkill = random(50,100)>>
+ <<set $activeSlave.oralSkill = random(50,100)>>
+ <<set $activeSlave.analSkill = random(50,100)>>
+ <<set $activeSlave.whoreSkill = random(50,100)>>
+ <<set $activeSlave.entertainSkill = random(50,100)>>
+ <<switch $activeSlave.career>>
+ <<case "a lawyer">>
+ <<set $activeSlave.slaveName = "WCPU-HG">>
+ <<case "a college scout">>
+ <<set $activeSlave.slaveName = "WCPU-RC">>
+ <<case "a business owner">>
+ <<set $activeSlave.slaveName = "WCPU-MD">>
+ <<case "a house DJ">>
+ <<set $activeSlave.slaveName = "WCPU-DJ">>
+ <<case "a soldier">>
+ <<set $activeSlave.slaveName = "WCPU-BG">>
+ <<case "a prison guard">>
+ <<set $activeSlave.slaveName = "WCPU-WD">>
+ <<case "a doctor">>
+ <<set $activeSlave.slaveName = "WCPU-NS">>
+ <<case "a counselor">>
+ <<set $activeSlave.slaveName = "WCPU-AT">>
+ <<case "a dairy worker">>
+ <<set $activeSlave.slaveName = "WCPU-MK">>
+ <<case "a secretary">>
+ <<set $activeSlave.slaveName = "WCPU-ST">>
+ <<case "a teacher">>
+ <<set $activeSlave.slaveName = "WCPU-TE">>
+ <</switch>>
+ <<set $activeSlave.slaveSurname = "#"+$activeSlave.vaginalSkill+$activeSlave.oralSkill+$activeSlave.analSkill+$activeSlave.whoreSkill+$activeSlave.entertainSkill+"-"+$activeSlave.intelligence>>
+ <<set $activeSlave.birthName = "", $activeSlave.birthSurname = "">>
+ <<if $activeSlave.career == "a soldier">>
+ <<set $activeSlave.combatSkill = 1>>
+ <<else>>
+ <<set $activeSlave.combatSkill = 0>>
+ <</if>>
+ <<set $activeSlave.addict = either(0, 0, 0, 10, 10, 20, 30)>>
+ <<set $activeSlave.chem = random(500,1000)>>
+ <<set $activeSlave.behavioralFlaw = "none">>
+ <<set $activeSlave.behavioralQuirk = "none">>
+ <<set $activeSlave.sexualFlaw = "none">>
+ <<set $activeSlave.sexualQuirk = "none">>
+ <<set $activeSlave.fetish = "none">>
+ <<set $activeSlave.fetishStrength = 0>>
<<case "kidnappers">>
<<include "Generate New Slave">>
@@ -3696,6 +3777,8 @@
the Raiders' Black Market
<<case "heap">>
the Flesh Heap as alive as when you purchased them.
+<<case "wetware">>
+ the Wetware CPU market
<<case "trainers">>
the Trainers' Market
<<case "TSS">>
@@ -3753,6 +3836,8 @@
the Raiders' Black Market.
<<case "heap">>
the Flesh Heap, alive and not dead.
+<<case "wetware">>
+ the Wetware CPU market.
<<case "trainers">>
the Trainers' Market.
<<case "TSS">>