Allow puppets to have two descriptions

typeclasses/characters.py

@@ -83,6 +83,8 @@ class Character(Object, GenderCharacter, ContribRPCharacter):
         """
         Make sure we aren't left sitting down when logging out.
         """
+        self.execute_cmd("pose reset")
+
         if self.db.is_sitting:
             chair = self.db.is_sitting
             chair.db.sitter = None

typeclasses/puppets.py

@@ -45,3 +45,19 @@ class Puppet(Character):
 
         """
         self.msg("\nNo longer puppeting |c{name}|n.\n".format(name=self.key))
+
+    def return_appearance(self, viewer, **kwargs):
+        """
+        Return one of two appearances based on if it is being puppeted or not.
+
+        Set either or both:
+
+        @set me/desc_puppeted = "A clown bouncing up and down from a box."
+        @set me/desc_uppuppeted = "A colorful box with a closed lid."
+
+        If either is not specified, it uses the standard description.
+        """
+        if self.tags.get(key='puppeted', category='account'):
+            return self.db.desc_puppeted if self.db.desc_puppeted else self.db.desc
+        else:
+            return self.db.desc_unpuppeted if self.db.desc_unpuppeted else self.db.desc