(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-16 17:12:09 +03:00
parent bd07acf26d
commit 6262b3ea54
96 changed files with 1972 additions and 825 deletions
@@ -417,7 +417,10 @@ namespace Barotrauma
                if (me.Submarine != this) { continue; }
                if (me is Item item)
                {
-                    item.Indestructible = true;
+                    if (item.GetComponent<Repairable>() != null)
+                    {
+                        item.Indestructible = true;
+                    }
                    foreach (ItemComponent ic in item.Components)
                    {
                        if (ic is ConnectionPanel connectionPanel)