Release preparations
Revert "Revert Wareya's collision system changes for now"

This reverts commit 20c32ddbe29a7622e81367ed95e2d5c647fff3b5.
Re-revert the collision overhaul, but correctly this time (fixes bodyblocking)
Release preparations