redid item making

with a dictionary but then everything broke
fixed things, added item pickup logic in player
Merge branch 'master' into items