Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into unstable

Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs

@@ -87,10 +87,12 @@ namespace Barotrauma
             GameSettings.SaveCurrentConfig();
             GameMain.SoundManager.SetCategoryMuffle("default", false);
             GUI.ClearMessages();
+#if !DEBUG
             if (GameMain.GameSession?.GameMode is TestGameMode)
             {
                 DebugConsole.DeactivateCheats();
             }
+#endif
 #endif
         }
         /// <summary>
@@ -167,9 +169,9 @@ namespace Barotrauma
 
             if (Character.Controlled != null)
             {
-                if (Character.Controlled.SelectedConstruction != null && Character.Controlled.CanInteractWith(Character.Controlled.SelectedConstruction))
+                if (Character.Controlled.SelectedItem != null && Character.Controlled.CanInteractWith(Character.Controlled.SelectedItem))
                 {
-                    Character.Controlled.SelectedConstruction.UpdateHUD(cam, Character.Controlled, (float)deltaTime);                
+                    Character.Controlled.SelectedItem.UpdateHUD(cam, Character.Controlled, (float)deltaTime);                
                 }
                 if (Character.Controlled.Inventory != null)
                 {

Barotrauma/BarotraumaShared/SharedSource/Screens/Screen.cs

@@ -19,6 +19,7 @@
             {
                 Selected.Deselect();
 #if CLIENT
+                GameMain.ParticleManager.ClearParticles();
                 GUIContextMenu.CurrentContextMenu = null;
                 GUI.ClearCursorWait();
                 //make sure any textbox in the previously selected screen doesn't stay selected