Merge branch 'lua-neatstuff' into 'next'

src/lua_hook.h

src/lua_hooklib.c

src/p_map.c

src/p_tick.c