adjust ships to use fill/drain/full/empty macros