Merge from naval_update, re-add new scientists to oilrigs and islands, put scientists to sleep when players are far away