Merge remote-tracking branch 'upstream/master' into develop

2026-04-09 09:12:16 -03:00
parent ef66d27ffe a4607dffad
commit 790378d2a5
198 changed files with 5587 additions and 3462 deletions
@@ -27,6 +27,11 @@ namespace Barotrauma.Items.Components
            private init => _displayName = value;
        }

+        /// <summary>
+        /// Display name ignoring <see cref="DisplayNameOverride"/>
+        /// </summary>
+        public LocalizedString DefaultDisplayName => _displayName;
+
        public LocalizedString DisplayNameOverride;

        private readonly HashSet<Wire> wires;