From f3aef6cc54320dc8c86699f6da9cd830e570ec3f Mon Sep 17 00:00:00 2001
From: Howard Abrams <howard.abrams@gmail.com>
Date: Tue, 13 May 2025 21:37:37 -0700
Subject: [PATCH] Fix bugs with Steve

The 'say' command works with the webclient
Unplugging from the game makes you stand
Trying to sit on someone else's character, now uses the RP system
The fish now gets the right phrasing.
---
 commands/everyone.py      | 1 -
 typeclasses/characters.py | 9 +++++++++
 typeclasses/fishing.py    | 2 +-
 typeclasses/sittables.py  | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/commands/everyone.py b/commands/everyone.py
index ad4dcb6..e6795bf 100755
--- a/commands/everyone.py
+++ b/commands/everyone.py
@@ -193,7 +193,6 @@ class CmdSay(MuxCommand):
         targets = [item for item in self.caller.location.contents if item != self.caller]
         to_whom = chars_list(self.lhs, verb) if 'to' in self.switches else ''
         full_speech = f"/Me {adverb}{verb}s{to_whom}, \"{for_others}\""
-        # logger.info(f"send_emote('{self.caller}', {targets}, '{full_speech}', quiet=True")
         send_emote(self.caller, targets, full_speech, msg_type="say", anonymous_add=None)
 
 
diff --git a/typeclasses/characters.py b/typeclasses/characters.py
index bceb383..691dcf5 100644
--- a/typeclasses/characters.py
+++ b/typeclasses/characters.py
@@ -79,6 +79,15 @@ class Character(Object, GenderCharacter, ContribRPCharacter):
             self.msg(INTRO)
         self.account.db._last_puppet = self
 
+    def at_post_unpuppet(self, **kwargs):
+        """
+        Make sure we aren't left sitting down when logging out.
+        """
+        if sitter.db.is_sitting:
+            chair = sitter.db.is_sitting
+            chair.db.sitter = None
+            sitter.db.is_sitting = None
+
     def msg(self, text=None, from_obj=None, session=None, **kwargs):
         """
         Capitalizes messages sent to the user.
diff --git a/typeclasses/fishing.py b/typeclasses/fishing.py
index 36e619f..aab8b62 100755
--- a/typeclasses/fishing.py
+++ b/typeclasses/fishing.py
@@ -165,7 +165,7 @@ class Fish(CarriableNPC):
     def get_desc():
         return routput(random.choice([
             "A walleye with big bulbous eyes that clearly doesn't get no respect.",
-            "A bass with amazing neck confidence giving it a most excellent head bob."
+            "A bass with amazing neck confidence giving it a most excellent head bob.",
             "A rainbow trout missing the <<red ^ yellow ^ green ^ blue>> from its iridescent stripe.",
             "A brown trout colored <<red ^ blue ^ purple ^ orange>>.",
             # "A spiny perch",
diff --git a/typeclasses/sittables.py b/typeclasses/sittables.py
index e6f9cba..093447d 100755
--- a/typeclasses/sittables.py
+++ b/typeclasses/sittables.py
@@ -39,7 +39,7 @@ class Sittable(Object):
 
         if self.db.sitter and not self.multiple:
             sitter.msg(f"You can't sit {adjective} {article} {self.key} "
-                       f"- {current.key} is already sitting there!")
+                       f"- {current.get_display_name(sitter)} is already sitting there!")
             return
 
         self.db.sitter = sitter