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

Merge branch 'fixes' into 'pregmod-master'

Fixes

Closes #127 and #128

See merge request pregmodfan/fc-pregmod!1964
parents 64882bcd 20047df2
No related branches found
No related tags found
No related merge requests found
......@@ -1001,7 +1001,7 @@ window.impregnatedBy = function(slave) { /* returns array of IDs of all characte
WombInit(slave);
}
for (var i = 0; i < slave.womb.length; i++) {
IDArray.push(slave.womb.fatherID);
IDArray.push(slave.womb[i].fatherID);
}
return IDArray;
}
......
......@@ -62,7 +62,7 @@
<span id="haltproduction">
they are starting work on another unit.
<<link "Halt production">>
<<set $researchLab.productionTime = 0, $researchLab.research = "none">>
<<set $researchLab.productionTime = 0, $researchLab.manufacture = "none">>
<<replace "#haltproduction">>
they are awaiting your next instruction.
<</replace>>
......
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