From 5b15f0bb76d5c0cd8a1de94d4d2487f54dada105 Mon Sep 17 00:00:00 2001 From: theswgsource Date: Thu, 28 Jun 2018 06:18:11 -0700 Subject: [PATCH] merge conflict on master_item.tab --- .../compiled/game/datatables/item/master_item/master_item.tab | 1 - 1 file changed, 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab b/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab index b3f177c3a..37e8dcf34 100755 --- a/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab +++ b/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab @@ -8463,7 +8463,6 @@ item_empire_day_2011_painting_imperial object/tangible/holiday/empire_day/painti item_empire_day_2011_painting_rebel object/tangible/holiday/empire_day/painting_empire_day_2011_rebel.iff Rebel Painting: Leia Organa Rebel Painting: Leia Organa item_deed_atst_walker object/tangible/loot/generic_deed/vehicle_generic.iff 4 systems.vehicle_system.vehicle_deed Vehicle Deed: AT-ST Walker A deed for an AT-ST Walker item_deed_atxt_walker object/tangible/loot/generic_deed/vehicle_generic.iff 4 systems.vehicle_system.vehicle_deed Vehicle Deed: AT-XT Walker A deed for an AT-XT Walker -item_ponda_halloween_hand object/tangible/tcg/series6/consumable_ponda_baba_arm.iff 1 4 item.special.nomove,item.buff_click_item,object.autostack Ponda Baba's Arm The preserved remnant of Ponda Baba's arm after it was severed by Obi Wan Kenodi on Tatooine. Perhaps you can learn from Ponda Baba's painful experience. You will gain a 20% increase on all experience points earned for one hour. If you are level 90, this loot will grant you one random collection item. This item is consumable. item_vet_reward_lockout_remover object/tangible/veteran_reward/data_terminal_s3.iff 4 item.buff_click_item,item.vet_instance_reset Neural Recon Network Terminal When used, this item clears one of your instance cooldowns so you can re-enter immediately. Usable once every two days. item_vet_reward_sd_console_01 object/tangible/furniture/technical/sd_console_s01.iff 1 Star Destroyer System Console A Star Destroyer System Console item_vet_reward_sd_console_02 object/tangible/furniture/technical/sd_console_s02.iff 1 Star Destroyer Console Row A Star Destroyer Console Row