Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 into ProjectSWGCore-master

This commit is contained in:
Iosnowore-Kun
2014-08-08 12:09:03 -04:00
18 changed files with 188 additions and 100 deletions
@@ -10,10 +10,4 @@ def setup(core, object):
object.setIntAttribute('no_trade', 1)
object.setStringAttribute('faction_restriction', 'Rebel')
object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608)
object.setIntAttribute('cat_armor_standard_protection.energy', 4608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
return
@@ -10,10 +10,4 @@ def setup(core, object):
object.setIntAttribute('no_trade', 1)
object.setStringAttribute('faction_restriction', 'Rebel')
object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608)
object.setIntAttribute('cat_armor_standard_protection.energy', 4608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
return
@@ -10,10 +10,4 @@ def setup(core, object):
object.setIntAttribute('no_trade', 1)
object.setStringAttribute('faction_restriction', 'Rebel')
object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608)
object.setIntAttribute('cat_armor_standard_protection.energy', 4608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
return
@@ -11,10 +11,4 @@ def setup(core, object):
object.setIntAttribute('no_trade', 1)
object.setStringAttribute('faction_restriction', 'Imperial')
object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608)
object.setIntAttribute('cat_armor_standard_protection.energy', 4608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
return
@@ -11,10 +11,4 @@ def setup(core, object):
object.setIntAttribute('no_trade', 1)
object.setStringAttribute('faction_restriction', 'Imperial')
object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608)
object.setIntAttribute('cat_armor_standard_protection.energy', 4608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
return
@@ -11,10 +11,4 @@ def setup(core, object):
object.setIntAttribute('no_trade', 1)
object.setStringAttribute('faction_restriction', 'Imperial')
object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608)
object.setIntAttribute('cat_armor_standard_protection.energy', 4608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
return