Merge branch 'master' into 'moreitems'

# Conflicts:
#   squirrelbattle/entities/items.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py

squirrelbattle/display/texturepack.py

@@ -93,6 +93,7 @@ TexturePack.ASCII_PACK = TexturePack(
     HEDGEHOG='*',
     HELMET='0',
     MERCHANT='M',
+    MONOCLE='ô',
     PLAYER='@',
     RABBIT='Y',
     RING_OF_CRITICAL_DAMAGE='o',
@@ -133,9 +134,10 @@ TexturePack.SQUIRREL_PACK = TexturePack(
     HAZELNUT='🌰',
     HEART='💜',
     HEDGEHOG='🦔',
-    HELMET='⛑️',
+    HELMET='⛑️ ',
     PLAYER='🐿️ ️',
     MERCHANT='🦜',
+    MONOCLE='🧐',
     RABBIT='🐇',
     RING_OF_CRITICAL_DAMAGE='💍',
     RING_OF_MORE_EXPERIENCE='💍',