Merge branch 'master' into MARKS
Database testing
Added a new var to the consumable
Updated the movement keys
Fixed the shackles
Merge branch 'MARKS'