(6e187d247) Fixed contained items' status effects being added twice to the list of an ItemContainer's active status effects when swapping items. For example, when swapping a fuel rod with another one, the status effect that increases AvailableFuel would be applied twice, causing the reactor to act as if there were 2 rods in it. Closes #1643 + merge fix

Barotrauma/BarotraumaServer/Source/DebugConsole.cs

@@ -90,7 +90,16 @@ namespace Barotrauma
                             while (queuedMessages.Count > 0)
                             {
                                 ColoredText msg = queuedMessages.Dequeue();
-                                
+                                if (GameSettings.SaveDebugConsoleLogs)
+                                {
+                                    unsavedMessages.Add(msg);
+                                    if (unsavedMessages.Count >= messagesPerFile)
+                                    {
+                                        SaveLogs();
+                                        unsavedMessages.Clear();
+                                    }
+                                }
+
                                 string msgTxt = msg.Text;
 
                                 if (msg.IsCommand) commandMemory.Add(msgTxt);
@@ -167,7 +176,8 @@ namespace Barotrauma
                         RewriteInputToCommandLine(input);
                     }
                     
-                    Thread.Yield();
+                    //TODO: be more clever about it
+                    Thread.Sleep(10); //sleep for 10ms to not pin the CPU super hard
                 }
             }
             catch (ThreadAbortException)