Code cleanup
Merge remote-tracking branch 'origin/pr/1' into new-weather

Conflicts:
	src/weather_gen.cpp
Added weather condition function
Added first draft of function to resolve a weather object to an in-game weather condition such as rain. Using the old weather enum for now.
Merge remote-tracking branch 'origin/pr/1' into new-weather

Conflicts:
	src/weather_gen.cpp
Merge remote-tracking branch 'effin/new-weather' into new-weather-rework
Minor consistency fixes