Added flashes on Marathon armor damage
Merge branch 'master' into zdoom

Conflicts:
	pk3/acs/samsara.o