Further conversions, enable partial stat scaling penalties
Merge remote-tracking branch 'i2amroy/Health' into FrankenMod

Conflicts:
	src/disease.cpp
	src/monattack.cpp
	src/npcmove.cpp
	src/player.cpp