Merge branch 'permission-overhaul'. Closes #49

Conflicts: Barotrauma/BarotraumaShared/Source/DebugConsole.cs Barotrauma/BarotraumaShared/Source/Networking/ChatMessage.cs
2017-12-20 19:35:58 +02:00
parent d03dd40336 b3c3970209
commit ce37411a29
19 changed files with 1126 additions and 268 deletions
@@ -1,9 +1,5 @@
 using Lidgren.Network;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace Barotrauma.Networking
 {
@@ -40,6 +36,10 @@ namespace Barotrauma.Networking
                {
                    new GUIMessageBox("", txt);
                }
+                else if (type == ChatMessageType.Console)
+                {
+                    DebugConsole.NewMessage(txt, MessageColor[(int)ChatMessageType.Console]);
+                }
                else
                {
                    GameMain.Client.AddChatMessage(txt, type, senderName, senderCharacter);