diff --git a/src/descriptions/arcologyDescription.js b/src/descriptions/arcologyDescription.js index f25075e068ed659282904d9fb6d8abd39322d4a1..e20b22dbe062fe30e789972710d04ab7d7ffe896 100644 --- a/src/descriptions/arcologyDescription.js +++ b/src/descriptions/arcologyDescription.js @@ -196,10 +196,10 @@ App.Desc.playerArcology = function(lastElement) { let buffer = []; buffer.push(`The entryway features the first of ${A.name}'s many banks of public screens.`); if (A.FSSupremacistDecoration >= 40) { - buffer.push(`Some are showing talk shows and documentaries supporting A.FSSupremacistRace supremacy.`); + buffer.push(`Some are showing talk shows and documentaries supporting ${A.FSSupremacistRace} supremacy.`); } if (A.FSSubjugationistDecoration >= 40) { - buffer.push(`Some are showing long pseudoscientific programs explaining A.FSSubjugationistRace degeneracy.`); + buffer.push(`Some are showing long pseudoscientific programs explaining ${A.FSSubjugationistRace} degeneracy.`); } if (A.FSDegradationistDecoration >= 40) { buffer.push(`Some are showing abusive pornography involving slaves being beaten, sodomized, and modified against their will.`); diff --git a/src/js/removeActiveSlave.js b/src/js/removeActiveSlave.js index 1d34fc8386a3e90b0a268d4a4afa3212ee80fa94..d723dedac5b2052e0ef00fa7ebac042d00dd7657 100644 --- a/src/js/removeActiveSlave.js +++ b/src/js/removeActiveSlave.js @@ -136,6 +136,10 @@ window.removeActiveSlave = function removeActiveSlave() { } } + if (slave.ID === V.activeSlave.subTarget || V.activeSlave.subTarget === slave.ID) { + V.activeSlave.subTarget = 0; slave.subTarget = 0; + } + /* Remove from facility array or leadership role, if needed */ removeJob(V.activeSlave, V.activeSlave.assignment); @@ -166,7 +170,7 @@ window.removeActiveSlave = function removeActiveSlave() { V.boomerangSlave.father = V.missingParentID; } if (V.boomerangSlave.origBodyOwnerID === AS_ID) { - V.traitor.origBodyOwnerID = 0; + V.boomerangSlave.origBodyOwnerID = 0; } }