The sentences are already complete; the pronouns "which" and "that" are used correctly in context.
- "which" refers to the garage with rust spots.
- "that" refers to the bright yellow color of the neighbor's garage.
So the correct response is:
- Our garage, which has rust spots, needs to be painted. The people next door painted their garage a bright yellow color that we like very much.