This PR is to be merged with 6416 Note: I am missing assets for the dual pulse pistol, which is just a small easter egg so should be fine.