DM Brick, bugfixed barrel.
Merge remote-tracking branch 'origin/Recent' into Recent

Conflicts:
	Avalon/NPCs/Normal/Dark Slime.cs