Resolve merge conflicts

2022-08-02 16:19:25 +02:00 · 2022-08-02 16:19:25 +02:00 · 19bd7ce0b7
commit 19bd7ce0b7
parent b4cccc9703 214a601916
19 changed files with 32231 additions and 105 deletions
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@ -314,7 +314,7 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
            return
        if not obj.access(self, "puppet"):
            # no access
-            self.msg("You don't have permission to puppet '{obj.key}'.")
+            self.msg(f"You don't have permission to puppet '{obj.key}'.")
            return
        if obj.account:
            # object already puppeted