Merge branch 'master' into new-netcode

Conflicts: Subsurface/Properties/AssemblyInfo.cs Subsurface/Source/Items/Components/DockingPort.cs Subsurface/Source/Items/Components/Signal/Wire.cs Subsurface/Source/Items/Item.cs
2016-12-29 22:18:27 +02:00
parent 020aac55ea 12b7290bad
commit 1f07b18e5b
134 changed files with 1799 additions and 683 deletions
@@ -125,6 +125,8 @@ namespace Barotrauma.Items.Components
                    Item it = recipient.Item;
                    if (it == null) continue;

+                    if (it.Condition <= 0.0f) continue;
+
                    Powered powered = it.GetComponent<Powered>();
                    if (powered == null || !powered.IsActive) continue;