Better Logic for some stuff

Non Weapon Modules with more then 1 Charge getting reloaded out of
combat