(143d158cb) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -721,6 +721,25 @@ namespace Barotrauma
             }
         }
 
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
         public override Rectangle Rect
         {
             get

Barotrauma/BarotraumaShared/Source/Map/Map/LocationTypeChange.cs

@@ -28,6 +28,10 @@ namespace Barotrauma
             RequiredAdjacentLocations = element.GetAttributeStringArray("requiredadjacentlocations", new string[0]).ToList();
 
             Messages = TextManager.GetAll("LocationChange." + currentType + ".ChangeTo." + ChangeToType);
+            if (Messages == null)
+            {
+                DebugConsole.ThrowError("No messages defined for the location type change " + currentType + " -> " + ChangeToType);
+            }
         }
     }
 }

Barotrauma/BarotraumaShared/Source/Map/Submarine.cs

@@ -428,17 +428,17 @@ namespace Barotrauma
                             //prevent rewiring
                             connectionPanel.Locked = true;
                         }
-                        else if (ic is Pickable pickable)
+                        else if (ic is Holdable holdable && holdable.Attached)
                         {
-                            //prevent picking up (or deattaching) items
+                            //prevent deattaching items from walls
 #if CLIENT
                             if (GameMain.GameSession?.GameMode is TutorialMode)
                             {
                                 continue;
                             }
 #endif
-                            pickable.CanBePicked = false;
-                            pickable.CanBeSelected = false;
+                            holdable.CanBePicked = false;
+                            holdable.CanBeSelected = false;
                         }
                     }
                 }