In a safe there is no requirement for a trigger lock. If you take a closet and modify it for firearm storage and strengthen it, then that can count for safe storage as well. There was some case law on that point quite sometime ago.
Keep in mind that if a gun is in "use" ie you are cleaning or admiring it, then neither Transport or storage regs apply at that moment.