(a21f15055) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -246,6 +246,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

@@ -27,7 +27,9 @@ namespace Barotrauma
             DisallowedAdjacentLocations = element.GetAttributeStringArray("disallowedadjacentlocations", new string[0]).ToList();
             RequiredAdjacentLocations = element.GetAttributeStringArray("requiredadjacentlocations", new string[0]).ToList();
 
-            Messages = TextManager.GetAll("LocationChange." + currentType + ".ChangeTo." + ChangeToType);
+            string messageTag = element.GetAttributeString("messagetag", "LocationChange." + currentType + ".ChangeTo." + ChangeToType);
+
+            Messages = TextManager.GetAll(messageTag);
             if (Messages == null)
             {
                 DebugConsole.ThrowError("No messages defined for the location type change " + currentType + " -> " + ChangeToType);