added assault rifle, added shotgun, fixed shotgun delay