work done on jon's dialogs

title
Merge branch 'master' of https://github.com/GrahamCrackers42/ZERO-Beacon