Cleanup pt 2

So it turns out we were both "Cleaning up" Code at the same time. But I
fixed a few more things with weapon pickup, so I figure that I might as
well just put my changes up. Shouldn't be much of a difference.

TODO: Still sticking to walls