Implementation of mass properties

we should be able to have both susbsystems and an equipment list, so shouldn't need this 'else'