diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw
index b5efbe0b04a399c93039c89493957e44669bfc39..1f0d40bfd7cb175e131651678ba95dec5adda70a 100644
--- a/src/pregmod/incubatorRetrievalWorkaround.tw
+++ b/src/pregmod/incubatorRetrievalWorkaround.tw
@@ -16,7 +16,6 @@ $readySlave.slaveName has been discharged from $incubatorName and is ready for h
<<if $incubatorOrgans[_i].ID == $incubatorOldID>>
<<set _newOrgan = {type: $incubatorOrgans[_i].type, weeksToCompletion: $incubatorOrgans[_i].weeksToCompletion, ID: $activeSlave.ID}>>
<<if _newOrgan.weeksToCompletion <= 0>>
- <<set $organsCompleted++>>
<<set $completedOrgans.push($incubatorOrgans[_i])>>
<<else>>
<<set $organs.push(_newOrgan)>>
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index fd2da1a8fdaa6ea94382d24da0282efb6c676d5f..20cf2e8d2bcf2a10b018b3a6d4492c318b628329 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -49,7 +49,6 @@
<</if>>
<</for>>
-<<set $organsCompleted = 0>>
<<if $organs.length > 0>>
<<for _i = 0; _i < $organs.length; _i++>>
<<if $organs[_i].weeksToCompletion > 0>>
@@ -62,7 +61,6 @@
<</if>>
<</if>>
<<if $organs[_i].weeksToCompletion <= 0>>
- <<set $organsCompleted++>>
<<set $completedOrgans.push($organs[_i])>>
<<set $organs.deleteAt(_i)>>
<</if>>
diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw
index 101eeedfff38b6e7422f2b856dff83f5eab3ee10..a6835faa1d9ece31e21e98b6b4d9f50902ef71e1 100644
--- a/src/uncategorized/multiImplant.tw
+++ b/src/uncategorized/multiImplant.tw
@@ -2,68 +2,6 @@
You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized remote surgery<<else>>remote surgery<</if>> and start having the slaves with <<if ($organsCompleted > 0) && ($limbsCompleted > 0)>>completedOrgans or limbs <<elseif ($organsCompleted > 1)>>completedOrgans <<elseif ($limbsCompleted > 1)>>sets of limbs <</if>>that are ready be sent down.
-/* reorder $completedOrgans to insure organs are implanted in the correct order */
-<<set _newOrgans = []>>
-<<for _i = 0; _i < $slaves.length; _i++>>
- <<set _slaveOrgans = []>>
- <<set slaveOrgans = {
- penis: 0,
- testicles: 0,
- scrotum: 0,
- pigTesticles: 0,
- dogTesticles: 0,
- foreskin: 0,
- ovaries: 0,
- prostate: 0,
- pigOvaries: 0,
- dogOvaries: 0,
- eyes: 0,
- voicebox: 0,
- mpreg: 0,
- mpregPig: 0,
- mpregDog: 0}>>
- /* collects all organs of the interrogated slave and note the types */
- <<for _j = 0; _j < $completedOrgans.length; _j++>>
- <<if $completedOrgans[_j].ID == $slaves[_j].ID>>
- <<set _slaveOrgans.push($completedOrgans[_j])>>
- <<if $organs[_i].type == "penis">>
- <<set $slaveOrgans.penis = 1>>
- <<elseif $organs[_i].type == "testicles">>
- <<set $slaveOrgans.testicles = 1>>
- <<elseif $organs[_i].type == "scrotum">>
- <<set $slaveOrgans.scrotum = 1>>
- <<elseif $organs[_i].type == "pigTesticles">>
- <<set $slaveOrgans.pigTesticles = 1>>
- <<elseif $organs[_i].type == "dogTesticles">>
- <<set $slaveOrgans.dogTesticles = 1>>
- <<elseif $organs[_i].type == "foreskin">>
- <<set $slaveOrgans.foreskin = 1>>
- <<elseif $organs[_i].type == "ovaries">>
- <<set $slaveOrgans.ovaries = 1>>
- <<elseif $organs[_i].type == "prostate">>
- <<set $slaveOrgans.prostate = 1>>
- <<elseif $organs[_i].type == "pigOvaries">>
- <<set $slaveOrgans.pigOvaries = 1>>
- <<elseif $organs[_i].type == "dogOvaries">>
- <<set $slaveOrgans.dogOvaries = 1>>
- <<elseif $organs[_i].type == "eyes">>
- <<set $slaveOrgans.eyes = 1>>
- <<elseif $organs[_i].type == "voicebox">>
- <<set $slaveOrgans.voicebox = 1>>
- <<elseif $organs[_i].type == "mpreg">>
- <<set $slaveOrgans.mpreg = 1>>
- <<elseif $organs[_i].type == "mpregPig">>
- <<set $slaveOrgans.mpregPig = 1>>
- <<elseif $organs[_i].type == "mpregDog">>
- <<set $slaveOrgans.mpregDog = 1>>
- <</if>>
- <</if>>
- <</for>>
- <<for _j = 0; _j < _slaveOrgans.length; _j++>>
- <<if _slaveOrgans[j].type == "scrotum">>
-
-
-<</for>>
<<for _i = 0; _i < $slaves.length; _i++>>
<<if ($completedOrgans.length == 0) && ($limbs.length == 0)>>
@@ -118,6 +56,51 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<set $completedOrgans.deleteAt(_o)>>
+ <<elseif $activeSlave.balls == 0>>
+ /* if it finds a penis in $completedOrgans install that one first, then proceeds with the testicles */
+ <<for _j = 0; _j < $completedOrgans.length; _j++>>
+ <<if $completedOrgans[_j].ID == $slaves[_j].ID && $completedOrgans[_j].type == "penis" && $activeSlave.dick == 0>>
+ /* penis */
+ <<set $cash -= $surgeryCost>>
+ <<if $activeSlave.prostate == 0>>
+ <<set $activeSlave.prostate = 1>>
+ <</if>>
+ <<set $activeSlave.dick to 2>>
+ <<set $activeSlave.clit to 0>>
+ <<set $activeSlave.foreskin to $activeSlave.dick>>
+ <<set $activeSlave.health -= 20>>
+ <<set $surgeryType = "addDick">>
+ <br><hr>
+ <<include "Surgery Degradation">>
+ <<set $completedOrgans.deleteAt(_o)>>
+ /* testicles */
+ <<set $cash -= $surgeryCost>>
+ <<if $activeSlave.prostate == 0>>
+ <<set $activeSlave.prostate = 1>>
+ <</if>>
+ <<set $activeSlave.balls to 2>>
+ <<set $activeSlave.ballType = "human">>
+ <<set $activeSlave.scrotum to 2>>
+ <<set $activeSlave.health -= 20>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
+ <<if $activeSlave.pubertyXY == 0>>
+ <<if $precociousPuberty == 1>>
+ <<if $activeSlave.physicalAge >= $potencyAge>>
+ <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>>
+ <</if>>
+ <<else>>
+ <<if $activeSlave.physicalAge >= $potencyAge>>
+ <<set $activeSlave.pubertyXY = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set $surgeryType = "addBalls">>
+ <br><hr>
+ <<include "Surgery Degradation">>
+ <</if>>
+ <</for>>
<</if>>
<<case "scrotum">>
<<if ($activeSlave.scrotum == 0) && ($activeSlave.balls >= 0)>>