Unstable 0.1500.4.0 (Shrek edition)

2021-09-23 21:29:31 +09:00
parent 5a6bbcc79e
commit 3043a9a7bc
124 changed files with 3571 additions and 1848 deletions
@@ -14,7 +14,7 @@ namespace Barotrauma.Items.Components

        public override void AddTooltipInfo(ref string name, ref string description)
        {
-            if (!string.IsNullOrEmpty(materialName))
+            if (!string.IsNullOrEmpty(materialName) && item.ContainedItems.Count() > 0)
            {
                string mergedMaterialName = materialName;
                foreach (Item containedItem in item.ContainedItems)
@@ -23,7 +23,7 @@ namespace Barotrauma.Items.Components
                    if (containedMaterial == null) { continue; }
                    mergedMaterialName += ", " + containedMaterial.materialName;
                }
-                name = TextManager.GetWithVariable("entityname.geneticmaterial", "[type]", mergedMaterialName);
+                name = name.Replace(materialName, mergedMaterialName);
            }

            if (Tainted)