Though a comma should be used before a coordinating conjunction joining independent clauses (see P1-a) or with a series of three or more elements (see P1-c), these rules should not be extended to other compound word groups.
The coordinating conjunction and links two verbs in a compound predicate: discovered and came.
The coordinating conjunction but links two subordinate clauses, each beginning with that.