Liquid handling fix - closes #977, #978, #973

Looks like the phase of most liquids got borked when comestibles and gasoline were moved to JSON. This should fix the biggest issues with that..

Closes #977. Closes #978. Closes #973.