Merge branch 'master' into new-netcode

Conflicts: Subsurface/Properties/AssemblyInfo.cs Subsurface/Source/Items/Components/Signal/Wire.cs Subsurface/Source/Items/Item.cs Subsurface/Source/Items/ItemInventory.cs Subsurface/Source/Networking/GameServer.cs
2016-11-09 17:58:56 +02:00
parent 9eaca68cea d017817878
commit ac65a431a8
25 changed files with 486 additions and 262 deletions
@@ -380,7 +380,7 @@ namespace Barotrauma.Items.Components
                return;
            }

-            List<ItemSound> matchingSounds = null;
+            List<ItemSound> matchingSounds;
            if (!sounds.TryGetValue(type, out matchingSounds)) return;

            ItemSound itemSound = null;