Merge branch 'safe' into no-plantbeasts

Conflicts:
	overmap.cpp
pistol brass catcher
no casings in .223 ammo