Merge branch 'feature/combatCanvasFixes7' into 'dev'

...vaScript/05-renderer/20-canvasmodel-combat-close-penis.js

...aScript/05-renderer/20-canvasmodel-combat-close-vagina.js

game/03-JavaScript/05-renderer/21-close-options.js

game/03-JavaScript/05-renderer/21-npc-options.js

...avaScript/05-renderer/22-canvasmodel-combat-xray-penis.js

game/03-JavaScript/05-renderer/23-xray-options.js

game/04-Variables/colours.js

img/newsex/doggy/beast/hawk/back-over.png

img/newsex/doggy/beast/hawk/front-over.png

img/newsex/doggy/shadow/harpy/anus.png

img/newsex/doggy/shadow/harpy/dp_bound.png

img/newsex/doggy/shadow/harpy/mouth.png

img/newsex/doggy/shadow/harpy/penis.png

img/newsex/doggy/shadow/harpy/thighs.png

img/newsex/doggy/shadow/harpy/vagina.png

img/newsex/missionary/shadow/harpy/anus.png

img/newsex/missionary/shadow/harpy/mouth.png

img/newsex/missionary/shadow/harpy/penis.png

img/newsex/missionary/shadow/harpy/thighs.png

img/newsex/missionary/shadow/harpy/vagina.png