(b5250291f) Merge branch 'dev' into human-ai

2019-05-16 05:15:16 +03:00
parent b02565796a
commit 108e42edb0
32 changed files with 574 additions and 360 deletions
@@ -46,8 +46,7 @@ namespace Barotrauma
                if (controlled == value) return;
                controlled = value;
                if (controlled != null) controlled.Enabled = true;
-                CharacterHealth.OpenHealthWindow = null;
-                
+                CharacterHealth.OpenHealthWindow = null;                
            }
        }