Merge branch 'master' into 'familiars'

# Conflicts:
#   squirrelbattle/display/display_manager.py
#   squirrelbattle/display/logsdisplay.py
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/display/menudisplay.py
#   squirrelbattle/menus.py

squirrelbattle/display/messagedisplay.py

@@ -3,6 +3,7 @@
 import curses
 
 from squirrelbattle.display.display import Box, Display
+from squirrelbattle.game import Game
 
 
 class MessageDisplay(Display):
@@ -17,8 +18,8 @@ class MessageDisplay(Display):
         self.message = ""
         self.pad = self.newpad(1, 1)
 
-    def update_message(self, msg: str) -> None:
-        self.message = msg
+    def update(self, game: Game) -> None:
+        self.message = game.message
 
     def display(self) -> None:
         self.box.refresh(self.y - 1, self.x - 2,