Fixed conflicted flashbangs

rip old flashbang proc.