Merge pull request #379 from Markolie/master

Bug fixes
This commit is contained in:
ZomgPonies
2015-02-21 15:02:56 -05:00
9 changed files with 75 additions and 38 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ var/global/image/typing_indicator
typing_indicator = image('icons/mob/talk.dmi',null,"typing")
if(client)
if(client.prefs.toggles & SHOW_TYPING)
if((client.prefs.toggles & SHOW_TYPING) || stat != CONSCIOUS)
overlays -= typing_indicator
else
if(state)