Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
more sad
Merge branch 'master' into Dunn_Works
meeeerge w// da pizza
TOPDOG WEAPON
Start of inventory loop

don’t fuck it up
added maxHealth and setHealth override in Person
Player can equip items

Typos as well
added heal method to player
Statues can be used, potions have shell
Merge remote-tracking branch 'origin/master' into lockhart
Can use potions, typos
Player can equip items

Typos as well
Statues can be used, potions have shell