(1762f02b3) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -299,6 +299,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
@@ -633,11 +652,6 @@ namespace Barotrauma
         public void AddFireSource(FireSource fireSource)
         {
             FireSources.Add(fireSource);
-
-            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer && !IdFreed)
-            {
-                GameMain.NetworkMember.CreateEntityEvent(this);
-            }
         }
 
         public override void Update(float deltaTime, Camera cam)
@@ -805,11 +819,6 @@ namespace Barotrauma
         public void RemoveFire(FireSource fire)
         {
             FireSources.Remove(fire);
-
-            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer && !Removed && !IdFreed)
-            {
-                GameMain.NetworkMember.CreateEntityEvent(this);
-            }
         }
 
         public IEnumerable<Hull> GetConnectedHulls(int? searchDepth)