ALPHA APPROACHING

can't go through walls anymore
Merge branch 'master' of github.com:Logicon211/LAMER

Conflicts:
	objects/object156.object.gmx