2f107db...5202af9

Barotrauma/BarotraumaClient/Source/Events/EventManager.cs

@@ -17,8 +17,9 @@ namespace Barotrauma
                 Vector2 drawPos = ev.DebugDrawPos;
                 drawPos.Y = -drawPos.Y;
 
-                GUI.SubmarineIcon.Draw(spriteBatch, drawPos, Color.White * 0.5f, GUI.SubmarineIcon.size / 2, 0.0f, 40.0f);
-                GUI.DrawString(spriteBatch, drawPos, ev.ToString(), Color.White, Color.Black, 0, GUI.LargeFont);
+                var textOffset = new Vector2(-150, 0);
+                ShapeExtensions.DrawCircle(spriteBatch, drawPos, 600, 6, Color.White, thickness: 20);
+                GUI.DrawString(spriteBatch, drawPos + textOffset, ev.ToString(), Color.White, Color.Black, 0, GUI.LargeFont);
             }
         }
 

Barotrauma/BarotraumaClient/Source/Events/Missions/CombatMission.cs

@@ -0,0 +1,22 @@
+namespace Barotrauma
+{
+    partial class CombatMission
+    {
+        public override string Description
+        {
+            get
+            {
+                if (descriptions == null) return "";
+
+                if (GameMain.Client?.Character == null)
+                {
+                    //non-team-specific description
+                    return descriptions[0];
+                }
+
+                //team specific
+                return descriptions[GameMain.Client.Character.TeamID == Character.TeamType.Team1 ? 1 : 2];
+            }
+        }
+    }
+}

Barotrauma/BarotraumaClient/Source/Events/Missions/Mission.cs

@@ -11,7 +11,8 @@ namespace Barotrauma
             string header = index < Headers.Count ? Headers[index] : "";
             string message = index < Messages.Count ? Messages[index] : "";
 
-            GameServer.Log(TextManager.Get("MissionInfo") + ": " + header + " - " + message, ServerLog.MessageType.ServerMessage);
+            //TODO: reimplement
+            //GameServer.Log(TextManager.Get("MissionInfo") + ": " + header + " - " + message, ServerLog.MessageType.ServerMessage);
 
             new GUIMessageBox(header, message);
         }

Barotrauma/BarotraumaClient/Source/Events/Missions/MissionMode.cs

@@ -9,8 +9,10 @@
             var missionMsg = new GUIMessageBox(mission.Name, mission.Description, 400, 400);
             missionMsg.UserData = "missionstartmessage";
 
+#if SERVER
             Networking.GameServer.Log(TextManager.Get("Mission") + ": " + mission.Name, Networking.ServerLog.MessageType.ServerMessage);
             Networking.GameServer.Log(mission.Description, Networking.ServerLog.MessageType.ServerMessage);
+#endif
         }
     }
 }