Not sure if this is complete, or even correct. #7255
Included more fixes.
No comma there.
More tweaks

Descriptions and moves Shaggy Fur direct from Lightly.  Should speed the
process and might knock down the sharing.
Further conversions, move some stuff to the Character class
Merge Wishbringer PR

Conflicts:
	src/creature.cpp
	src/creature.h
Merge remote-tracking branch 'KA101/MutationTweaks' into FrankenMod
Merge remote-tracking branch 'i2amroy/Health' into FrankenMod

Conflicts:
	src/creature.cpp
	src/creature.h
	src/disease.cpp
	src/player.cpp