handle subject occupation with changing map + wait x or y <= UNIT to change map
Merge branch 'master' into nico