Tidy up body temp code

Conflicts:

	player.cpp
More minor tinkering in bodytemp code
Cleaning : made a grammar issue more compact
Cleaning up body temp code still
Added some missing ()s and {}s
Allman styling 200/450 lines of player::suffer
Allman style'd player::update_bodytemp()
Merge remote-tracking branch 'dda/pr/877' into dda-master