The Fiesta Event Weapons

The random weapons should be a kit, meaning one main weapon and a secondary weapon. For example: spawning in with the needle and the sidekick or the sniper and a shock rifle, instead have a spawn of the sniper and sidekick etc. Thanks!