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

2022-09-30 12:14:01 -03:00
parent 6c38a555bb d461d504dc
commit a3eff91c1a
10 changed files with 28 additions and 14 deletions
@@ -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; }