Barbarians trace player holding torch
Improve tracing
Merge branch 'raincole_working'
Merge branch 'davy_working' of github.com:raincole/isr

Conflicts:
	event.lua
Fix stick ox, oy

As Title