Added player complaints due to heat
Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA
Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA
Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA
Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA
Fix for windows, probably
Fix bionic description typo.
Give gas pumps a chance of running out of gas.
Documentation and cleanup of bodytemp stuff
Bodytemp is now updated every tick instead of every 10 ticks
Merge remote-tracking branch 'shoes/master' into dda-master

Conflicts:
	weather.h
fixing vehicle solar panels
taking a step to prevent multiple veh-veh

collision events in the same instance.

Note: this could add time to the system, and with collisions being the
way they are, they could add energy to the system.
So hopefully the resonances don't cascade with too many vehicles.
- annoying temperature message
making zombie kids more friendly
misc game.cpp chanves, from kevin
Disabled body temperature updates
Merge branch 'master' into feature/npc