(d779d70f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs

@@ -396,6 +396,8 @@ namespace Barotrauma
 
         private GUILayoutGroup subPreviewContainer;
 
+        private GUILayoutGroup subPreviewContainer;
+
         private GUIButton loadGameButton;
         
         public Action<Submarine, string, string> StartNewGame;

Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs

@@ -789,6 +789,10 @@ namespace Barotrauma
 
             GUI.Draw(Cam, spriteBatch);
 
+            spriteBatch.Begin(SpriteSortMode.Deferred, null, null, null, GameMain.ScissorTestEnable);
+
+            GUI.Draw(Cam, spriteBatch);
+
             GUI.Draw(Cam, spriteBatch);
             
 #if DEBUG

Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs

@@ -835,6 +835,7 @@ namespace Barotrauma
             //make space for the entity menu
             for (int i = 0; i < dummyCharacter.Inventory.SlotPositions.Length; i++)
             {
+                if (CharacterInventory.PersonalSlots.HasFlag(dummyCharacter.Inventory.SlotTypes[i])) { continue; }
                 if (dummyCharacter.Inventory.SlotPositions[i].Y > GameMain.GraphicsHeight / 2)
                 {
                     dummyCharacter.Inventory.SlotPositions[i].Y -= 50 * GUI.Scale;