Merge branch 'bugfixes' into Combat-Extended

game/base-combat/tentacles/tentacles.twee

game/base-debug/test demon.twee

game/base-debug/test encounters.twee

game/overworld-forest/loc-forest/events.twee

game/overworld-plains/loc-moor/events.twee

game/overworld-town/loc-adultshop/events.twee

game/overworld-town/loc-school/english-play.twee

game/overworld-town/loc-school/maths-project.twee

game/overworld-town/loc-street/events.twee

game/overworld-town/special-nightmares/main.twee

game/overworld-town/special-robin/halloween.twee

game/overworld-town/special-robin/main.twee

game/overworld-town/special-robin/walk.twee

game/overworld-town/special-sydney/main.twee

game/overworld-town/special-sydney/temple.twee

game/overworld-town/special-sydney/walk.twee

game/overworld-underground/loc-underground/events.twee