Merge branch 'master' into animcontroller-overhaul

This commit is contained in:
Regalis
2016-10-22 13:38:25 +03:00
@@ -411,6 +411,8 @@ namespace Barotrauma
}
}
}
selectedSlot = -1;
}
public void DrawOwn(SpriteBatch spriteBatch)