Remove Flicker
Merge branch 'Flickering' of https://github.com/Dirkkun/Cataclysm-DDA into Flickering