There, now the shotgun tracers don't lag online (at least, not too much)
Merge, put plasma impact damage to 30, made carbine beam pitch better, set vent recharge time to 6 seconds (10 was too much), changed carbine pickup sound, upped carbine damage to 150,

Conflicts:
	pk3/acs/cyberrun.c
	pk3/acs/cyberrun.o