Merge and fix conflicts with develop

2018-07-21 14:34:26 +02:00 · 2018-07-21 14:34:26 +02:00 · a954f9c723
commit a954f9c723
parent 9c68b84ad3 63cae2b187
13 changed files with 3281 additions and 214 deletions
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@ -798,7 +798,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
            # any was deleted in the interim.
            self.db._playable_characters = [char for char in self.db._playable_characters if char]
            self.msg(self.at_look(target=self.db._playable_characters,
-                                  session=session))
+                                  session=session), session=session)

    def at_failed_login(self, session, **kwargs):
        """