Added weapon pickups.  Also fixed bug with using sun, using a  more elegant solution that uses Impact's inheritance.