OBT/1.2.1(Summer update)

Sync with upstream
2026-06-16 22:17:29 +08:00
parent 59bc21973a
commit d109c8f827
85 changed files with 1377 additions and 497 deletions
@@ -36,7 +36,7 @@ namespace Barotrauma.Items.Components
                }
            }

-            public LocalizedString? DisplayName { get; private set; }
+            public LocalizedString DisplayName { get; private set; }

            private float supplyRatio = 1f;
            public float SupplyRatio
@@ -80,6 +80,7 @@ namespace Barotrauma.Items.Components
                    SupplyRatio = element.GetAttributeFloat("ratio", SupplyRatio);
                }

+                DisplayName = TextManager.Get(name).Fallback(name);
 #if CLIENT
                CreateGUI();
                if (Screen.Selected is not { IsEditor: true })