diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index bb3295197089f7357211725ad81c85bcb823b599..c4c3ce0092d02c5a6203b713c43abd5ae9d963b1 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4708,4 +4708,10 @@ Pregmod 0.10.3.0 -fixed reRecruit 161 - -fixed custom slaves making all slaves their race \ No newline at end of file + -fixed custom slaves making all slaves their race + + 11/28/17 + + -fixes + -SFanon's fixes + -Crimeanon's fixes \ No newline at end of file diff --git a/src/init/dummy.tw b/src/init/dummy.tw index 1b460669a09dfed5645779d29239bb8853f12778..f431ef4371f14557741c249fb844f6f866854e54 100644 --- a/src/init/dummy.tw +++ b/src/init/dummy.tw @@ -21,6 +21,7 @@ $belarusianSlaveNames, $dominicanSlaveNames, $scottishSlaveNames $ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticDecadence $hare1, $hare2, $hare3, $hareSpeed, $hareSpeed1, $hareSpeed2, $hareSpeed3, $origin1, $origin2, $origin3, $LurcherSpeed $$i +$SSSlavesIDs, $SSLevel, $SSLBSCA, $SSLBCA, $SSLBHC, $SSLBC, $SSLASAST, $SSLASM, $SSLAM, $SSLSLPH, $SSLSLSC, $SSLSLAC, $SSLC, $SSLAAST, $SSLevelGarage, $SSLevelHangar, $SSLevelDroneBay, $SSLevelLaunchBay $activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor $drugs $PC.origRace, $PC.origSkin diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw index 87e371da3048e2cc9073c032582b7dc3963f3c13..8dfee38f98915ba4b91aaeb28ecc48e56575f449 100644 --- a/src/uncategorized/policies.tw +++ b/src/uncategorized/policies.tw @@ -135,7 +135,7 @@ <<if $sexualOpeness == 1>> <br>''Penetrative Sex Campaign:'' you are use your personal influence to attempt to make getting fucked by slaves fashionable, but mostly to garner acceptance for your sexual preference. - [[Repeal|Policies][$sexualOpeness = 0]] + [[Repeal|Policies][$sexualOpeness = 0, $PC.degeneracy += 30]] <</if>> <</if>> diff --git a/src/uncategorized/recETSWorkaround.tw b/src/uncategorized/recETSWorkaround.tw index 5578f2ded80073bacd62d0c1b0ba836325cb6e76..fc31073305fa44e67ecd730d184b9fb284341430 100644 --- a/src/uncategorized/recETSWorkaround.tw +++ b/src/uncategorized/recETSWorkaround.tw @@ -132,6 +132,7 @@ The son cheers happily and hugs his relieved mother. She leans in and kisses him <<set $activeSlave.physicalAge = $activeSlave.actualAge>> <<set $activeSlave.visualAge = $activeSlave.actualAge>> <<set $activeSlave.ovaryAge = $activeSlave.actualAge>> +<<set $activeSlave.genes = "XY">> <<ResyncHeight $activeSlave>> <<set $activeSlave.vagina = -1>> <<set $activeSlave.pubertyXX = 0>> @@ -184,6 +185,7 @@ The daughter cheers happily and hugs her relieved father. He leans in and kisses <<set $activeSlave.physicalAge = $activeSlave.actualAge>> <<set $activeSlave.visualAge = $activeSlave.actualAge>> <<set $activeSlave.ovaryAge = $activeSlave.actualAge>> +<<set $activeSlave.genes = "XX">> <<ResyncHeight $activeSlave>> <<set $activeSlave.pubertyXX = 1>> <<set $activeSlave.pubertyXY = 0>> diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw index 557dbd58e7fbe8f8d98e51e9029c06c95e44e714..8b8abd5f033089eaae7435a6a56af20aa331bd82 100644 --- a/src/uncategorized/securityForceEOWReport.tw +++ b/src/uncategorized/securityForceEOWReport.tw @@ -215,9 +215,9 @@ securityForceX <<if $securityForceArcologyUpgrades >= 4>> <<if $securityForceSatalitePower > 0>> <<set $securityForceTrade += (0.25*($securityForceSatalitePower))>> <</if>> - <<if $securityForceGiantRobot > 0 && $terrain != "oceanic" || $terrain != "marine">>>> + <<if $securityForceGiantRobot > 0 && $terrain != "oceanic" || $terrain != "marine">> <<set $securityForceTrade += (0.25*($securityForceGiantRobot))>> <</if>> - <<if $securityForceMissileSilo > 0 && $terrain != "oceanic" || $terrain != "marine">>>> + <<if $securityForceMissileSilo > 0 && $terrain != "oceanic" || $terrain != "marine">> <<set $securityForceTrade += (0.25*($securityForceMissileSilo))>> <</if>> <</if>>