Merge remote-tracking branch 'upstream/master' into more-street-events

game/base-clothing/wardrobes.twee

game/base-combat/beast-images.twee

game/base-combat/ejaculation.twee

game/base-combat/npc-actions.twee

game/base-combat/speech.twee

game/base-system/cheats.twee

game/base-system/clamp.twee

game/base-system/named-npcs.twee

game/base-system/settings.twee

game/base-system/text.twee

game/base-system/widgets.twee

game/overworld-forest/loc-wolfpack/main.twee

game/overworld-forest/loc-wolfpack/widgets.twee

game/overworld-town/loc-alley/residential.twee

game/overworld-town/loc-alley/widgets.twee

game/overworld-town/loc-cafe/main.twee

game/overworld-town/loc-compound/main.twee

game/overworld-town/loc-dance-studio/main.twee

game/overworld-town/loc-docks/main.twee

game/overworld-town/loc-docks/widgets.twee