Minor changes to achievement variables
Added cowboy check when picking up weapon