Fix marriage and babies
Merge pull request #2104 from bucketh3ad/fix_affection

Fix marriage and babies
Merge branch 'master' into movingfix