Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into unstable

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs

@@ -348,11 +348,15 @@ namespace Barotrauma
             completed = 
                 DetermineCompleted() && 
                 (completeCheckDataAction == null ||completeCheckDataAction.GetSuccess());
-            if (Prefab.LocationTypeChangeOnCompleted != null)
+            if (completed)
             {
-                ChangeLocationType(Prefab.LocationTypeChangeOnCompleted);
+                if (Prefab.LocationTypeChangeOnCompleted != null)
+                {
+                    ChangeLocationType(Prefab.LocationTypeChangeOnCompleted);
+                }
+                GiveReward();
             }
-            GiveReward();
+
             EndMissionSpecific(completed);
         }
 

Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs

@@ -3216,6 +3216,7 @@ namespace Barotrauma
             }
 #endif
 
+            item.condition = element.GetAttributeFloat("condition", item.condition);
             foreach (XAttribute attribute in (appliedSwap?.ConfigElement ?? element).Attributes())
             {
                 if (!item.SerializableProperties.TryGetValue(attribute.NameAsIdentifier(), out SerializableProperty property)) { continue; }