(6e187d247) Fixed contained items' status effects being added twice to the list of an ItemContainer's active status effects when swapping items. For example, when swapping a fuel rod with another one, the status effect that increases AvailableFuel would be applied twice, causing the reactor to act as if there were 2 rods in it. Closes #1643 + merge fix

Barotrauma/BarotraumaShared/Source/Items/RelatedItem.cs

@@ -17,7 +17,8 @@ namespace Barotrauma
         }
 
         public bool IsOptional { get; set; }
-        
+        public bool MatchOnEmpty { get; set; }
+
         public bool IgnoreInEditor { get; set; }
 
         private string[] excludedIdentifiers;
@@ -227,6 +228,7 @@ namespace Barotrauma
 
             ri.IsOptional = element.GetAttributeBool("optional", false);
             ri.IgnoreInEditor = element.GetAttributeBool("ignoreineditor", false);
+            ri.MatchOnEmpty = element.GetAttributeBool("matchonempty", false);
             return ri;
         }
     }