My second attempt at a merge, this time trying for more realism.

Shoutouts and heartfelt thanks to CornmeisterNL, SG_161222 and dimonapatrick243.

They've made some absolutely amazing checkpoints.

I recommend using a low-ish cfg of 4-5. Higher tends to cause odd artifacts.