Object oilyness (oiliness?), partsInWater
Merge branch 'master' of github.com:paanil/project-duck

Conflicts:
	src/duck/DuckState.cpp