Skip to content
Snippets Groups Projects
Commit ed94192e authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-master' into 'pregmod-master'

Fixes

See merge request pregmodfan/fc-pregmod!11499
parents 1dded0bd 69519913
No related branches found
No related tags found
No related merge requests found
......@@ -178,7 +178,7 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
if (slave.origin === "$He put $himself up as collateral at a poker game, and lost.") {
r.push(`A bet is a bet, but that was a lonnng year. There's still room for ${him} in your ${V.mercenariesTitle}, but many of them have come to see ${him} in a new, more... intimate way. As a free ${woman}, ${he}'ll have to decide if it's worth the risk and the sex to stay here and fight for you who ${he} loathes... or else take up arms elsewhere in an ever more uncertain world.`);
if (slave.addict > 5) {
r.push(`They'll need to make money fast as they remain addicted to your aphrodisiacs.`);
r.push(`${He}'ll need to make money fast as ${he} remains addicted to your aphrodisiacs.`);
}
} else {
r.push(`It seems very unlikely that ${he}'ll stay in the arcology; ${he}'ll probably take what remains of ${his} indenture payment, held in escrow for this day, and be off to wherever it is that ${he} came from in the first place.`);
......
......@@ -93,7 +93,7 @@ App.Data.Markets = {
marketType: "wetware",
note: "Ruined bodies but keen minds. Requires some TLC, but offers outstanding training at a discount.",
encyclopedia: "Wetware CPUs",
get requirements() { return FutureSocieties.isActive('FSPaternalist') ? true : `The paternalistic nature of your society blocks the abusive Wetware CPU manufactures from operating within your arcology.`; }
get requirements() { return !FutureSocieties.isActive('FSPaternalist') ? true : `The paternalistic nature of your society blocks the abusive Wetware CPU manufactures from operating within your arcology.`; }
},
{
title: "Prisoner Sale",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment