Add fluid extraction (pipes only) and fix liquid dupes (bad @MomoNasty)