Merge remote-tracking branch 'upstream/vanta' into pronounsub

commands/cmdcustomexamine.py

@@ -0,0 +1,14 @@
+from evennia.commands.default.building import CmdExamine
+
+class CmdCustomExamine(CmdExamine):
+    def format_attributes(self, obj):
+        caller = self.caller
+        output = "\n  "
+        for attr in obj.db_attributes.all():
+            if attr.db_key == "creator_ip" and not caller.permissions.check("Admin"):
+                continue
+            output += self.format_single_attribute(attr)
+            output += "\n  "
+        if output.strip():
+            # we don't want just an empty line
+            return output

commands/default_cmdsets.py

@@ -16,6 +16,7 @@ own cmdsets by inheriting from them or directly from `evennia.CmdSet`.
 
 from evennia import default_cmds
 
+from commands.cmdcustomexamine import CmdCustomExamine
 from evennia.contrib.base_systems.building_menu import GenericBuildingCmd
 from evennia.contrib.game_systems import mail
 from evennia.contrib.game_systems.clothing import ClothedCharacterCmdSet
@@ -27,7 +28,6 @@ from lib.pronounsub import SetPronounsCommand
 from lib.rpsystem.rpsystem import RPSystemCmdSet
 
 
-
 class CharacterCmdSet(default_cmds.CharacterCmdSet):
     """
     The `CharacterCmdSet` contains general in-game commands like `look`,
@@ -72,6 +72,9 @@ class CharacterCmdSet(default_cmds.CharacterCmdSet):
         self.add(PronounAdminCommand())
         self.add(SetPronounsCommand())
 
+        # Overrides @examine
+        self.add(CmdCustomExamine())
+
 class AccountCmdSet(default_cmds.AccountCmdSet):
     """
     This is the cmdset available to the Account at all times. It is