Fire extinguisher, burnt limbs, spectating improvements, option to disable spectating, jumpsuits for engi & mech, fireproof items, stuff

2015-11-18 20:02:45 +02:00
parent 7b6d92bb27
commit 9b08201972
36 changed files with 429 additions and 85 deletions
@@ -119,7 +119,7 @@ namespace Barotrauma
            if (item.inventory != null && removeItem)
            {
                item.Drop(null, false);
-                item.inventory.RemoveItem(item);
+                if (item.inventory != null) item.inventory.RemoveItem(item);
            }

            items[i] = item;
@@ -139,6 +139,7 @@ namespace Barotrauma
            {
                if (items[n] != item) continue;
                items[n] = null;
+                item.inventory = null;
            }
        }