From 797151cdf44156747f96530cef00c6c865fb1daa Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 1 Aug 2019 15:33:44 -0400
Subject: [PATCH] fixes
---
Changelog.txt | 2 ++
src/js/datatypeCleanupJS.js | 2 +-
src/uncategorized/slaveMarkets.tw | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index c864fabf589..44072555354 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -2,6 +2,8 @@ Pregmod
0.10.7.1-2.6.x
+07/31/2019
+
0
-scar system added
-partial amputation and amp rework underway
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index f9974b18c51..7099af792e7 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -325,7 +325,7 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
*/
function SlaveDatatypeCleanup(slave, isIncubatorSlave = false) {
V = State.variables;
- if (!isIncubatorSlave) {
+ if (!isIncubatorSlave && !(slave.tankBaby < 0)) {
slaveAgeDatatypeCleanup(slave);
}
slavePhysicalDatatypeCleanup(slave);
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index 5b681867182..bef7b6a493b 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -151,7 +151,7 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<case "neighbor">>
You're in the area of the slave market that specializes in slaves from within the Free City, viewing slaves from ''<<print "$arcologies["+$numArcology+"].name">>''. Some were trained there, specifically for sale, while others are simply being sold.
- <<= generateMarketSlave("neighbor")>>
+ <<= generateMarketSlave("neighbor", $numArcology)>>
<<case "trainers">>
--
GitLab