Campfire can attract barbs
Merge branch 'raincole_working'

Conflicts:
	game/campfire.lua
	r.lua