Made some improvements to fall damage from a61da740

Fall damage on:
- no energy
- overheat
Fall damage off:
- underwater
Replaced an old icon with a new one
Functional main menu
Merge remote-tracking branch 'origin/dev' into dev-ui