Merge branch 'master' into i18n

This commit is contained in:
blitzmann
2020-07-05 14:10:04 -04:00
5 changed files with 91 additions and 4 deletions

View File

@@ -324,7 +324,8 @@ def activeStateLimit(itemIdentity):
'microJumpDrive', 'microJumpPortalDrive', 'emergencyHullEnergizer',
'cynosuralGeneration', 'jumpPortalGeneration', 'jumpPortalGenerationBO',
'cloneJumpAccepting', 'cloakingWarpSafe', 'cloakingPrototype', 'cloaking',
'massEntanglerEffect5', 'electronicAttributeModifyOnline', 'targetPassively'
'massEntanglerEffect5', 'electronicAttributeModifyOnline', 'targetPassively',
'cargoScan', 'shipScan', 'surveyScan'
}.intersection(item.effects):
return FittingModuleState.ONLINE
return FittingModuleState.ACTIVE