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

Barotrauma/BarotraumaShared/Source/Map/FireSource.cs

@@ -21,7 +21,8 @@ namespace Barotrauma
         protected Vector2 position;
         protected Vector2 size;
 
-        protected bool removed;
+        private readonly Submarine submarine;
+        public Submarine Submarine => submarine;
 
         protected bool removed;
 
@@ -86,7 +87,7 @@ namespace Barotrauma
             position = worldPosition - new Vector2(-5.0f, 5.0f);
             if (hull.Submarine != null)
             {
-                Submarine = hull.Submarine;
+                submarine = hull.Submarine;
                 position -= Submarine.Position;
             }
 

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

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