Build 0.21.6.0 (1.0 pre-patch)

2023-01-31 18:08:26 +02:00
parent e1c04bc31d
commit cf9ecd35b3
231 changed files with 4479 additions and 2276 deletions
@@ -413,7 +413,7 @@ namespace Barotrauma.Items.Components
            var wire = it.GetComponent<Wire>();
            if (wire != null && wire.Connections.Any(c => c != null)) { return false; }

-            if (it.Container?.GetComponent<ItemContainer>() is { DrawInventory: false }) { return false; }
+            if (it.Container?.GetComponent<ItemContainer>() is { DrawInventory: false } or { AllowAccess: false }) { return false; }

            if (it.HasTag("traitormissionitem")) { return false; }

@@ -519,7 +519,10 @@ namespace Barotrauma.Items.Components
                            Color color = !hasPower ? NoPowerColor : turret.ActiveUser is null ? Color.DimGray : GUIStyle.Green;
                            weaponSprite.Draw(batch, center, color, origin, rotation, scale, SpriteEffects.None);
                        }
-                    });
+                    })
+                    {
+                        CanBeFocused = false
+                    };

                    weaponChilds.Add(component, frame);
                }