All proxies done except events and jokers

Also a small bug with bullets appearing in all goods