scale fixed
Merge branch 'master' into OwainsBranch
Player has Shiv. r or num0