Fix bugs from #1842

See merge request pregmodfan/fc-pregmod!6948

Fix double listing of smart piercing setting in slave summary

See merge request pregmodfan/fc-pregmod!6947

clamp attraction during NextWeek to avoid overshooting by so far that the RA decides to discourage it

Join both display function and display fetish or attraction if fetish is
empty.

Revert "Merge branch 'organize-descrips-int-sub-functions' into 'pregmod-master'"

See merge request pregmodfan/fc-pregmod!6945

This reverts merge request !6943

Move some parts of belly into subfunctions

See merge request pregmodfan/fc-pregmod!6943

Fixes

See merge request pregmodfan/fc-pregmod!6944

Same for drugs

See merge request pregmodfan/fc-pregmod!6942

Mind desc

See merge request pregmodfan/fc-pregmod!6941

bodyguard desc to js

See merge request pregmodfan/fc-pregmod!6940

Fixes

See merge request pregmodfan/fc-pregmod!6939

Update fc-version.js

See merge request pregmodfan/fc-pregmod!6937

Migrate from $Stewardess to $StewardessID

See merge request pregmodfan/fc-pregmod!6936

Migrate the Servants' Quarters Report to DOM

See merge request pregmodfan/fc-pregmod!6935