Resolve merge conflicts

2020-07-18 23:30:23 +02:00 · 2020-07-18 23:30:23 +02:00 · 90e149dc27
commit 90e149dc27
parent 8434907d9e f615886d24
14 changed files with 214 additions and 63 deletions
--- a/evennia/typeclasses/attributes.py
+++ b/evennia/typeclasses/attributes.py
@ -1094,13 +1094,13 @@ class AttributeHandler:
        repeat-calling add when having many Attributes to add.

        Args:
-            *args (tuple): Tuples of varying length representing the
-                Attribute to add to this object. Supported tuples are
-
-                - (key, value)
-                - (key, value, category)
-                - (key, value, category, lockstring)
-                - (key, value, category, lockstring, default_access)
+            *args (tuple): Each argument should be a tuples (can be of varying
+                length) representing the Attribute to add to this object.
+                Supported tuples are
+                    - `(key, value)`
+                    - `(key, value, category)`
+                    - `(key, value, category, lockstring)`
+                    - `(key, value, category, lockstring, default_access)`

        Keyword args:
            strattr (bool): If `True`, value must be a string. This