Changed waiting options as suggested in https://github.com/CleverRaven/Cataclysm-DDA/issues/4501.
Always show: Wait until dusk/noon/midnight/dawn
New option: Wait until weather changes
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA