Add Weapon Templates in Equipment Section

Buyable at Planet Cairo

DATA/AUDIO/arc_sounds.ini

@@ -467,4 +467,373 @@ nickname = dx_REM_s062x_0201_trent
 type = voice
 is_2d = true
 attenuation = 0
-file = AUDIO\DIALOGUE\TRENT\dx_s062x_0201_trent.wav 
+file = AUDIO\DIALOGUE\TRENT\dx_s062x_0201_trent.wav
+
+; Juni
+[Sound]
+nickname = dx_s003x_0301_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s003x_0301_juni.wav
+
+[Sound]
+nickname = dx_s003x_1901_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s003x_1901_juni.wav
+
+[Sound]
+nickname = dx_s005b_0101_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s005b_0101_juni.wav
+
+[Sound]
+nickname = dx_s011x_0401_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s011x_0401_juni.wav
+
+[Sound]
+nickname = dx_s012x_0601_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s012x_0601_juni.wav
+
+[Sound]
+nickname = dx_s012x_0704a_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s012x_0704a_juni.wav
+
+[Sound]
+nickname = dx_s014d_0201_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s014d_0201_juni.wav
+
+[Sound]
+nickname = dx_s020x_0801_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s020x_0801_juni.wav
+
+[Sound]
+nickname = dx_s021x_0402_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s021x_0402_juni.wav
+
+[Sound]
+nickname = dx_s026b_0501_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s026b_0501_juni.wav
+
+[Sound]
+nickname = dx_s039x_0401_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s039x_0401_juni.wav
+
+[Sound]
+nickname = dx_s046x_1101_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s046x_1101_juni.wav
+
+[Sound]
+nickname = dx_REM_s062x_0201_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s062x_0201_juni.wav
+
+[Sound]
+nickname = dx_s071a_0201_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s071a_0201_juni.wav
+
+[Sound]
+nickname = dx_s075x_0101_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s075x_0101_juni.wav
+
+; Juni Kusari
+[Sound]
+nickname = dx_s080x_0101_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\Juni_Kusari.wav
+
+; Toledo ARC Cutscene 01
+
+[Sound]
+nickname = dx_s090x_0101_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0101_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0102_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0102_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0103_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0103_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0104_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0104_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0105_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0105_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0106_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0106_sinclair.wav
+
+; Toledo ARC Cutscene 02
+
+[Sound]
+nickname = dx_s090x_0201_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0201_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0202_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0202_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0203_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0203_sinclair.wav
+
+; Toledo ARC Cutscene 03
+
+[Sound]
+nickname = dx_s090x_0300_juni
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Juni\dx_s090x_0300_juni.wav
+
+[Sound]
+nickname = dx_s090x_0301_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0301_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0302_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0302_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0303_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0303_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0304_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0304_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0305_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0305_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0306_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0306_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0307_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0307_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0308_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0308_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0309_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0309_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0310_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0310_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0311_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0311_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0312_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0312_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0313_sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Sinclair\dx_s090x_0313_sinclair.wav
+
+[Sound]
+nickname = dx_s090x_0301_quintaine
+type = voice
+is_2d = true
+attenuation = 0
+file = AUDIO\DIALOGUE\QUINTAINE\dx_s035x_0301_quintaine.wav
+
+; West Point Exploration Arc Cutscene 01
+
+[Sound]
+nickname = dx_exp_0101_jacobi
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jacobi\dx_exp_0101_jacobi.wav
+
+[Sound]
+nickname = dx_exp_0102_jacobi
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jacobi\dx_exp_0102_jacobi.wav
+
+[Sound]
+nickname = dx_exp_0103_jacobi
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jacobi\dx_exp_0103_jacobi.wav
+
+[Sound]
+nickname = dx_exp_0103_trent
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Trent\dx_exp_0103_trent.wav
+
+[Sound]
+nickname = dx_exp_0104_jacobi
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jacobi\dx_exp_0104_jacobi.wav
+
+[Sound]
+nickname = dx_exp_0105_jacobi
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jacobi\dx_exp_0105_jacobi.wav
+
+[Sound]
+nickname = dx_exp_0106_jacobi
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jacobi\dx_exp_0106_jacobi.wav
+
+; West Point Exploration Arc Cutscene 02
+
+[Sound]
+nickname = dx_exp_0201_jacobi
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jacobi\dx_exp_0201_jacobi.wav
+
+[Sound]
+nickname = dx_exp_0202_jacobi
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jacobi\dx_exp_0202_jacobi.wav
+
+[Sound]
+nickname = dx_exp_0203_jacobi
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jacobi\dx_exp_0203_jacobi.wav
+
+[Sound]
+nickname = dx_exp_0204_jacobi
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jacobi\dx_exp_0204_jacobi.wav

DATA/AUDIO/voices_base_female.ini

@@ -49,6 +49,10 @@ attenuation = -4
 msg = GCS_ML_D01aN04
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D01aN04_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D01aN05
 attenuation = -4
@@ -61,6 +65,10 @@ attenuation = -4
 msg = GCS_ML_D01eV01
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D01eV01_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D01eV02
 attenuation = -4
@@ -73,6 +81,10 @@ attenuation = -4
 msg = GCS_ML_D01fG01
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D01fG01_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D01fG02
 attenuation = -4
@@ -81,22 +93,42 @@ attenuation = -4
 msg = GCS_ML_D01fG03
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D01fG03_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D01fG04
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D01fG04_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D01fG05
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D01fG05_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D01fG06
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D01fG06_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D01fG07
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D01fG07_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D01hG01
 attenuation = -4
@@ -113,10 +145,18 @@ attenuation = -4
 msg = GCS_ML_D01kG01
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D01kG01_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D01kG02
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D01kG02_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D01kG03
 attenuation = -4
@@ -125,14 +165,26 @@ attenuation = -4
 msg = GCS_ML_D01kG04
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D01kG04_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D03aN01
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D03aN01_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D03aN02
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_D03aN02_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_D04bB01
 attenuation = -4
@@ -249,6 +301,10 @@ attenuation = -4
 msg = GCS_ML_F08dR04
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_F08dR04_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_F10aR01
 attenuation = -4
@@ -257,6 +313,10 @@ attenuation = -4
 msg = GCS_ML_F10aR02
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_F10aR02_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_F10aR03
 attenuation = -4
@@ -269,14 +329,26 @@ attenuation = -4
 msg = GCS_ML_F10bR01
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_F10bR01_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_F10bR02
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_F10bR02_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_F10bR03
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_F10bR03_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_F10bR04
 attenuation = -4
@@ -285,10 +357,18 @@ attenuation = -4
 msg = GCS_ML_F10bR05
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_F10bR05_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_V01aV01
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_V01aV01_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_V01aV02
 attenuation = -4
@@ -305,6 +385,10 @@ attenuation = -4
 msg = GCS_ML_V05bV01
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_V05bV01_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_V05bV02
 attenuation = -4
@@ -325,6 +409,10 @@ attenuation = -4
 msg = GCS_ML_W01bB01
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_W01bB01_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_W01bB02
 attenuation = -4
@@ -1209,6 +1297,10 @@ attenuation = -4
 msg = GCS_ML_W03aF02
 attenuation = -4
 
+[Sound]
+msg = GCS_ML_W03aF02_JUNI
+attenuation = -4
+
 [Sound]
 msg = GCS_ML_W03aF03
 attenuation = -4

DATA/EQUIPMENT/goods.ini

@@ -573,6 +573,176 @@ shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = Equipment\models\commodities\nn_icons\commod_weapon_secondary_blueprint.3db
 jump_dist = 2
 
+; CHIMERA Blueprint
+
+[Good]
+nickname = commodity_chimera_blueprint
+equipment = commodity_chimera_blueprint
+msg_id_prefix = gcs_gen_commodity_chimera_blueprint
+category = commodity
+price = 75000
+combinable = false
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
+item_icon = Equipment\models\commodities\nn_icons\commod_weapon_primary_blueprint.3db
+jump_dist = 2
+
+; CHIMERA Schematic
+
+[Good]
+nickname = commodity_chimera_schematic
+equipment = commodity_chimera_schematic
+msg_id_prefix = gcs_gen_commodity_chimera_schematics
+category = commodity
+price = 25000
+combinable = false
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
+item_icon = Equipment\models\commodities\nn_icons\commod_weapon_secondary_blueprint.3db
+jump_dist = 2
+
+; POISON CLAW Blueprint
+
+[Good]
+nickname = commodity_poison_claw_blueprint
+equipment = commodity_poison_claw_blueprint
+msg_id_prefix = gcs_gen_commodity_poison_claw_blueprint
+category = commodity
+price = 75000
+combinable = false
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
+item_icon = Equipment\models\commodities\nn_icons\commod_weapon_primary_blueprint.3db
+jump_dist = 2
+
+; POISON CLAW Schematic
+
+[Good]
+nickname = commodity_poison_claw_schematic
+equipment = commodity_poison_claw_schematic
+msg_id_prefix = gcs_gen_commodity_poison_claw_schematics
+category = commodity
+price = 25000
+combinable = false
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
+item_icon = Equipment\models\commodities\nn_icons\commod_weapon_secondary_blueprint.3db
+jump_dist = 2
+
+; AVALON Blueprint
+
+[Good]
+nickname = commodity_avalon_blueprint
+equipment = commodity_avalon_blueprint
+msg_id_prefix = gcs_gen_commodity_avalon_blueprint
+category = commodity
+price = 75000
+combinable = false
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
+item_icon = Equipment\models\commodities\nn_icons\commod_weapon_primary_blueprint.3db
+jump_dist = 2
+
+; AVALON Schematic
+
+[Good]
+nickname = commodity_avalon_schematic
+equipment = commodity_avalon_schematic
+msg_id_prefix = gcs_gen_commodity_avalon_schematics
+category = commodity
+price = 25000
+combinable = false
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
+item_icon = Equipment\models\commodities\nn_icons\commod_weapon_secondary_blueprint.3db
+jump_dist = 2
+
+; NEMESIS Blueprint
+
+[Good]
+nickname = commodity_nemesis_blueprint
+equipment = commodity_nemesis_blueprint
+msg_id_prefix = gcs_gen_commodity_nemesis_blueprint
+category = commodity
+price = 75000
+combinable = false
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
+item_icon = Equipment\models\commodities\nn_icons\commod_weapon_primary_blueprint.3db
+jump_dist = 2
+
+; NEMESIS Schematic
+
+[Good]
+nickname = commodity_nemesis_schematic
+equipment = commodity_nemesis_schematic
+msg_id_prefix = gcs_gen_commodity_nemesis_schematics
+category = commodity
+price = 25000
+combinable = false
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
+item_icon = Equipment\models\commodities\nn_icons\commod_weapon_secondary_blueprint.3db
+jump_dist = 2
+
+; ECLIPSE Blueprint
+
+[Good]
+nickname = commodity_eclipse_blueprint
+equipment = commodity_eclipse_blueprint
+msg_id_prefix = gcs_gen_commodity_nemesis_blueprint
+category = commodity
+price = 75000
+combinable = false
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
+item_icon = Equipment\models\commodities\nn_icons\commod_weapon_primary_blueprint.3db
+jump_dist = 2
+
+; ECLIPSE Schematic
+
+[Good]
+nickname = commodity_eclipse_schematic
+equipment = commodity_eclipse_schematic
+msg_id_prefix = gcs_gen_commodity_nemesis_schematics
+category = commodity
+price = 25000
+combinable = false
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
+item_icon = Equipment\models\commodities\nn_icons\commod_weapon_secondary_blueprint.3db
+jump_dist = 2
+
 ; Tractor Beam Blueprint
 
 [Good]
@@ -2839,7 +3009,7 @@ nickname = chronos_relic
 equipment = chronos_relic
 item_icon = Equipment\models\commodities\nn_icons\sm_chronos_relic.3db
 category = equipment
-price = 3000
+price = 0
 combinable = false
 
 ; Hellios Shard
@@ -2849,7 +3019,7 @@ nickname = hellios_shard
 equipment = hellios_shard
 item_icon = Equipment\models\commodities\nn_icons\sm_hellios_shard.3db
 category = equipment
-price = 3000
+price = 0
 combinable = false
 
 ; Athena Orb
@@ -2859,7 +3029,7 @@ nickname = athena_orb
 equipment = athena_orb
 item_icon = Equipment\models\commodities\nn_icons\sm_athena_orb.3db
 category = equipment
-price = 3000
+price = 0
 combinable = false
 
 ; Emergency Action Documents
@@ -2869,7 +3039,7 @@ nickname = emergency_action_documents_liberty
 equipment = emergency_action_documents_liberty
 item_icon = Equipment\models\commodities\nn_icons\sm_documents_liberty.3db
 category = equipment
-price = 3000
+price = 0
 combinable = false
 
 ; Fragment Data (Liberty)
@@ -2879,7 +3049,7 @@ nickname = fragment_data_liberty
 equipment = fragment_data_liberty
 item_icon = Equipment\models\commodities\nn_icons\sm_fragment_data.3db
 category = equipment
-price = 3000
+price = 0
 combinable = false
 
 ; Genealogical Certificate
@@ -2889,7 +3059,7 @@ nickname = genealogical_certificate_kusari
 equipment = genealogical_certificate_kusari
 item_icon = Equipment\models\commodities\nn_icons\sm_gene_cert_kusari.3db
 category = equipment
-price = 3000
+price = 0
 combinable = false
 
 ; Fragment Data (Kusari)
@@ -2899,7 +3069,7 @@ nickname = fragment_data_kusari
 equipment = fragment_data_kusari
 item_icon = Equipment\models\commodities\nn_icons\sm_fragment_data.3db
 category = equipment
-price = 3000
+price = 0
 combinable = false
 
 ; Rheinland Military Black Box
@@ -2909,7 +3079,7 @@ nickname = military_black_box_rheinland
 equipment = military_black_box_rheinland
 item_icon = Equipment\models\commodities\nn_icons\sm_black_box_rheinland.3db
 category = equipment
-price = 3000
+price = 0
 combinable = false
 
 ; Fragment Data (Rheinland)
@@ -2919,7 +3089,7 @@ nickname = fragment_data_rheinland
 equipment = fragment_data_rheinland
 item_icon = Equipment\models\commodities\nn_icons\sm_fragment_data.3db
 category = equipment
-price = 3000
+price = 0
 combinable = false
 
 ; Fragment Data (Bretonia)
@@ -2929,7 +3099,27 @@ nickname = fragment_data_bretonia
 equipment = fragment_data_bretonia
 item_icon = Equipment\models\commodities\nn_icons\sm_fragment_data.3db
 category = equipment
-price = 3000
+price = 0
+combinable = false
+
+; walker_audio_log
+
+[Good]
+nickname = walker_audio_log
+equipment = walker_audio_log
+item_icon = Equipment\models\commodities\nn_icons\audio_log.3db
+category = equipment
+price = 0
+combinable = false
+
+; vanpelt_audio_log
+
+[Good]
+nickname = vanpelt_audio_log
+equipment = vanpelt_audio_log
+item_icon = Equipment\models\commodities\nn_icons\audio_log.3db
+category = equipment
+price = 0
 combinable = false
 
 ;; bh_elite3

DATA/EQUIPMENT/misc_equip.ini

@@ -446,6 +446,23 @@ thrust_capacity = 1000
 thrust_charge_rate = 100
 lootable = false
 
+; Energy Core Extension
+
+[Power]
+nickname = energy_core_extension
+ids_name = 299501
+ids_info = 299502
+volume = 0
+mass = 0
+hp_type = hp_elite_power_special_2
+DA_archetype = equipment\models\hardware\ge_heavy_power_converter.3db
+material_library = equipment\models\hardware.mat
+capacity = 300
+charge_rate = 150
+thrust_capacity = 0
+thrust_charge_rate = 0
+lootable = true
+
 [Scanner]
 nickname = ge_s_scanner_01
 ids_name = 263750
@@ -794,7 +811,23 @@ ids_name = 222150
 ids_info = 222222
 category = equipment
 HP_child = HPConnect
-hit_pts_scale = 1.020000
+hit_pts_scale = 1.120000
+explosion_resistance = 1
+DA_archetype = equipment\models\hardware\br_protective_armor.3db
+material_library = equipment\models\hardware.mat
+volume = 0.000000
+mass = 1
+lootable = true
+
+; Heavy Protection Armor
+
+[Armor]
+nickname = heavy_protection_armor
+ids_name = 222155
+ids_info = 222227
+category = equipment
+HP_child = HPConnect
+hit_pts_scale = 1.240000
 explosion_resistance = 1
 DA_archetype = equipment\models\hardware\br_protective_armor.3db
 material_library = equipment\models\hardware.mat
@@ -810,7 +843,7 @@ ids_name = 222151
 ids_info = 222223
 category = equipment
 HP_child = HPConnect
-hit_pts_scale = 1.050000
+hit_pts_scale = 1.360000
 explosion_resistance = 1
 DA_archetype = equipment\models\hardware\br_protective_armor.3db
 material_library = equipment\models\hardware.mat
@@ -826,7 +859,7 @@ ids_name = 222152
 ids_info = 222224
 category = equipment
 HP_child = HPConnect
-hit_pts_scale = 1.030000
+hit_pts_scale = 1.360000
 explosion_resistance = 1
 DA_archetype = equipment\models\hardware\br_protective_armor.3db
 material_library = equipment\models\hardware.mat
@@ -842,7 +875,7 @@ ids_name = 222153
 ids_info = 222225
 category = equipment
 HP_child = HPConnect
-hit_pts_scale = 1.030000
+hit_pts_scale = 1.360000
 explosion_resistance = 1
 DA_archetype = equipment\models\hardware\br_protective_armor.3db
 material_library = equipment\models\hardware.mat
@@ -858,7 +891,7 @@ ids_name = 222154
 ids_info = 222226
 category = equipment
 HP_child = HPConnect
-hit_pts_scale = 1.030000
+hit_pts_scale = 1.360000
 explosion_resistance = 1
 DA_archetype = equipment\models\hardware\br_protective_armor.3db
 material_library = equipment\models\hardware.mat

DATA/EQUIPMENT/misc_good.ini

@@ -202,6 +202,34 @@ combinable = false
 shop_archetype = equipment\models\hardware\br_protective_armor.3db
 material_library = equipment\models\hardware.mat
 
+; Heavy Protection Armor
+
+[Good]
+nickname = heavy_protection_armor
+equipment = heavy_protection_armor
+ids_name = 222155
+ids_info = 222227
+category = equipment
+price = 100000
+item_icon = Equipment\models\commodities\nn_icons\EQUIPICON__light_protection_armor.3db
+combinable = false
+shop_archetype = equipment\models\hardware\br_protective_armor.3db
+material_library = equipment\models\hardware.mat
+
+; Energy Core Extension
+
+[Good]
+nickname = energy_core_extension
+equipment = energy_core_extension
+ids_name = 299501
+ids_info = 299502
+category = equipment
+price = 100000
+item_icon = Equipment\models\commodities\nn_icons\EQUIPICON__light_protection_armor.3db
+combinable = false
+shop_archetype = equipment\models\hardware\br_protective_armor.3db
+material_library = equipment\models\hardware.mat
+
 ; Nomad Reactive Armor
 
 [Good]

DATA/EQUIPMENT/select_equip.ini

@@ -910,6 +910,138 @@ decay_per_second = 0
 volume = 1
 hit_pts = 250
 
+
+; CHIMERA Blueprint
+
+[Commodity]
+nickname = commodity_chimera_blueprint
+ids_name = 299800
+ids_info = 299801
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+; CHIMERA Schematic
+
+[Commodity]
+nickname = commodity_chimera_schematic
+ids_name = 299802
+ids_info = 299803
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+
+; POISON CLAW Blueprint
+
+[Commodity]
+nickname = commodity_poison_claw_blueprint
+ids_name = 299804
+ids_info = 299805
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+; POISON CLAW Schematic
+
+[Commodity]
+nickname = commodity_poison_claw_schematic
+ids_name = 299806
+ids_info = 299807
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+; AVALON Blueprint
+
+[Commodity]
+nickname = commodity_avalon_blueprint
+ids_name = 299808
+ids_info = 299809
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+; AVALON Schematic
+
+[Commodity]
+nickname = commodity_avalon_schematic
+ids_name = 299810
+ids_info = 299811
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+; NEMESIS Blueprint
+
+[Commodity]
+nickname = commodity_nemesis_blueprint
+ids_name = 299812
+ids_info = 299813
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+; NEMESIS Schematic
+
+[Commodity]
+nickname = commodity_nemesis_schematic
+ids_name = 299814
+ids_info = 299815
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+; ECLIPSE Blueprint
+
+[Commodity]
+nickname = commodity_eclipse_blueprint
+ids_name = 299816
+ids_info = 299817
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+; ECLIPSE Schematic
+
+[Commodity]
+nickname = commodity_eclipse_schematic
+ids_name = 299818
+ids_info = 299819
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
 ; Tractor Beam Blueprint
 
 [Commodity]
@@ -2432,6 +2564,32 @@ decay_per_second = 0
 volume = 0
 hit_pts = 250
 
+; walker_audio_log
+
+[Commodity]
+nickname = walker_audio_log
+ids_name = 290020
+ids_info = 290021
+units_per_container = 1
+pod_appearance = cargopod_blue
+loot_appearance = lootcrate_blue
+decay_per_second = 0
+volume = 0
+hit_pts = 250
+
+; vanpelt_audio_log
+
+[Commodity]
+nickname = vanpelt_audio_log
+ids_name = 290030
+ids_info = 290031
+units_per_container = 1
+pod_appearance = cargopod_blue
+loot_appearance = lootcrate_blue
+decay_per_second = 0
+volume = 0
+hit_pts = 250
+
 [TradeLane]
 nickname = basic_trade_lane_eq
 tl_ship_enter = basic_tl_ship_enter
@@ -4228,7 +4386,6 @@ explosion_arch = explosion_rock_wplatform
 debris_type = debris_vanish
 
 
-
 [CargoPod]
 nickname = ast_ice_block_mt01_base_sec
 DA_archetype = solar\asteroids\models\mining_tunnel\ast_ice_block_mt01\ast_ice_block_mt01_base_sec.3db
@@ -4240,6 +4397,17 @@ mass = 2000
 explosion_arch = explosion_asteroid_lava1_medium_shatter
 debris_type = debris_vanish
 
+[CargoPod]
+nickname = ast_ice_block_mt01_base_sec_end
+DA_archetype = solar\asteroids\models\mining_tunnel\ast_ice_block_mt01\ast_ice_block_mt01_base_sec_end.3db
+material_library = solar\asteroids\models\mining_tunnel\ast_ice_block_mt01\ast_ice_block_mt01_base_sec_end.3db
+LODranges = 0, 20000
+HP_child = HpConnect
+hit_pts = 1e36
+mass = 2000
+explosion_arch = explosion_asteroid_lava1_medium_shatter
+debris_type = debris_vanish
+
 [CargoPod]
 nickname = base_door_sec
 DA_archetype = solar\asteroids\models\mining_tunnel\ast_ice_block_mt01\base_door_sec.3db
@@ -4487,6 +4655,7 @@ parent_impulse = 0.010000
 child_impulse = 0.010000
 debris_type = debris_vanish
 
+
 ; second_level_display_buttons_red
 
 [CargoPod]
@@ -4557,4 +4726,172 @@ mass = 1e10
 HP_child = HpConnect
 parent_impulse = 0.010000
 child_impulse = 0.010000
-debris_type = debris_vanish
+debris_type = debris_vanish
+
+; neb_hollow_green_pt1
+
+[CargoPod]
+nickname = neb_hl_grn_inside_pt1
+LODranges = 0, 2000
+DA_archetype = solar\REM_MISC\neb_hl_grn_inside_pt1.3db
+material_library = solar\REM_MISC\neb_hl_grn_inside_pt1.3db
+hit_pts = 1e36
+mass = 1e10
+HP_child = HpConnect
+parent_impulse = 0.010000
+child_impulse = 0.010000
+debris_type = debris_vanish
+
+; neb_hollow_green_pt1
+
+[CargoPod]
+nickname = neb_hl_grn_outside_pt1
+LODranges = 0, 2000
+DA_archetype = solar\REM_MISC\neb_hl_grn_outside_pt1.3db
+material_library = solar\REM_MISC\neb_hl_grn_outside_pt1.3db
+hit_pts = 1e36
+mass = 1e10
+HP_child = HpConnect
+parent_impulse = 0.010000
+child_impulse = 0.010000
+debris_type = debris_vanish
+
+; nebula_warp_grn_pt1
+
+[CargoPod]
+nickname = nebula_warp_grn_pt1
+LODranges = 0, 20000
+DA_archetype = solar\REM_MISC\nebula_warp_grn_pt1.3db
+material_library = solar\REM_MISC\nebula_warp_grn_pt1.3db
+hit_pts = 1e36
+mass = 1e10
+HP_child = HpConnect
+parent_impulse = 0.010000
+child_impulse = 0.010000
+debris_type = debris_vanish
+
+; nebula_warp_grn_outside_pt1
+
+[CargoPod]
+nickname = nebula_warp_grn_outside_pt1
+LODranges = 0, 20000
+DA_archetype = solar\REM_MISC\nebula_warp_grn_outside_pt1.3db
+material_library = solar\REM_MISC\nebula_warp_grn_outside_pt1.3db
+hit_pts = 1e36
+mass = 1e10
+HP_child = HpConnect
+parent_impulse = 0.010000
+child_impulse = 0.010000
+debris_type = debris_vanish
+
+; nebula_warp_grn_pt2
+
+[CargoPod]
+nickname = nebula_warp_grn_pt2
+LODranges = 0, 20000
+DA_archetype = solar\REM_MISC\nebula_warp_grn_pt2.3db
+material_library = solar\REM_MISC\nebula_warp_grn_pt2.3db
+hit_pts = 1e36
+mass = 1e10
+HP_child = HpConnect
+parent_impulse = 0.010000
+child_impulse = 0.010000
+debris_type = debris_vanish
+
+; nebula_warp_grn_outside_pt2
+
+[CargoPod]
+nickname = nebula_warp_grn_outside_pt2
+LODranges = 0, 20000
+DA_archetype = solar\REM_MISC\nebula_warp_grn_outside_pt2.3db
+material_library = solar\REM_MISC\nebula_warp_grn_outside_pt2.3db
+hit_pts = 1e36
+mass = 1e10
+HP_child = HpConnect
+parent_impulse = 0.010000
+child_impulse = 0.010000
+debris_type = debris_vanish
+
+; nebula_warp_grn_pt3
+
+[CargoPod]
+nickname = nebula_warp_grn_pt3
+LODranges = 0, 20000
+DA_archetype = solar\REM_MISC\nebula_warp_grn_pt3.3db
+material_library = solar\REM_MISC\nebula_warp_grn_pt3.3db
+hit_pts = 1e36
+mass = 1e10
+HP_child = HpConnect
+parent_impulse = 0.010000
+child_impulse = 0.010000
+debris_type = debris_vanish
+
+; nebula_warp_grn_outside_pt3
+
+[CargoPod]
+nickname = nebula_warp_grn_outside_pt3
+LODranges = 0, 20000
+DA_archetype = solar\REM_MISC\nebula_warp_grn_outside_pt3.3db
+material_library = solar\REM_MISC\nebula_warp_grn_outside_pt3.3db
+hit_pts = 1e36
+mass = 1e10
+HP_child = HpConnect
+parent_impulse = 0.010000
+child_impulse = 0.010000
+debris_type = debris_vanish
+
+; nebula_warp_grn_pt4
+
+[CargoPod]
+nickname = nebula_warp_grn_pt4
+LODranges = 0, 20000
+DA_archetype = solar\REM_MISC\nebula_warp_grn_pt4.3db
+material_library = solar\REM_MISC\nebula_warp_grn_pt4.3db
+hit_pts = 1e36
+mass = 1e10
+HP_child = HpConnect
+parent_impulse = 0.010000
+child_impulse = 0.010000
+debris_type = debris_vanish
+
+; nebula_warp_grn_outside_pt4
+
+[CargoPod]
+nickname = nebula_warp_grn_outside_pt4
+LODranges = 0, 20000
+DA_archetype = solar\REM_MISC\nebula_warp_grn_outside_pt4.3db
+material_library = solar\REM_MISC\nebula_warp_grn_outside_pt4.3db
+hit_pts = 1e36
+mass = 1e10
+HP_child = HpConnect
+parent_impulse = 0.010000
+child_impulse = 0.010000
+debris_type = debris_vanish
+
+; nebula_warp_grn_pt5
+
+[CargoPod]
+nickname = nebula_warp_grn_pt5
+LODranges = 0, 20000
+DA_archetype = solar\REM_MISC\nebula_warp_grn_pt5.3db
+material_library = solar\REM_MISC\nebula_warp_grn_pt5.3db
+hit_pts = 1e36
+mass = 1e10
+HP_child = HpConnect
+parent_impulse = 0.010000
+child_impulse = 0.010000
+debris_type = debris_vanish
+
+; nebula_warp_grn_outside_pt5
+
+[CargoPod]
+nickname = nebula_warp_grn_outside_pt5
+LODranges = 0, 20000
+DA_archetype = solar\REM_MISC\nebula_warp_grn_outside_pt5.3db
+material_library = solar\REM_MISC\nebula_warp_grn_outside_pt5.3db
+hit_pts = 1e36
+mass = 1e10
+HP_child = HpConnect
+parent_impulse = 0.010000
+child_impulse = 0.010000
+debris_type = debris_vanish

DATA/EQUIPMENT/st_equip.ini

@@ -767,6 +767,8 @@ separation_explosion = sever_debris
 LODranges = 0, 999999
 lootable = false
 
+; Barrier Molecular Shield
+
 [ShieldGenerator]
 nickname = npc_shield02_mark09
 ids_name = 263777
@@ -799,6 +801,8 @@ separation_explosion = sever_debris
 LODranges = 0, 999999
 lootable = false
 
+; Adv. Barrier Molecular Shield
+
 [ShieldGenerator]
 nickname = npc_shield02_mark10
 ids_name = 263778
@@ -1695,6 +1699,8 @@ separation_explosion = sever_debris
 LODranges = 0, 999999
 lootable = true
 
+; Adv. Protector H. F. Shield
+
 [ShieldGenerator]
 nickname = shield01_mark08_hf
 ids_name = 263806
@@ -1727,6 +1733,8 @@ separation_explosion = sever_debris
 LODranges = 0, 999999
 lootable = true
 
+; Champion H. F. Shield
+
 [ShieldGenerator]
 nickname = shield01_mark09_hf
 ids_name = 263807
@@ -1759,6 +1767,8 @@ separation_explosion = sever_debris
 LODranges = 0, 999999
 lootable = true
 
+; Adv. Champion H. F. Shield
+
 [ShieldGenerator]
 nickname = shield01_mark10_hf
 ids_name = 263808
@@ -2687,6 +2697,8 @@ separation_explosion = sever_debris
 LODranges = 0, 999999
 lootable = true
 
+; Barrier H. F. Shield
+
 [ShieldGenerator]
 nickname = shield02_mark09_hf
 ids_name = 263837
@@ -2719,6 +2731,8 @@ separation_explosion = sever_debris
 LODranges = 0, 999999
 lootable = true
 
+; Adv. Barrier H. F. Shield
+
 [ShieldGenerator]
 nickname = shield02_mark10_hf
 ids_name = 263838
@@ -4319,8 +4333,8 @@ parent_impulse = 20
 child_impulse = 80
 volume = 0
 mass = 10
-regeneration_rate = 190
-max_capacity = 8460
+regeneration_rate = 245.3
+max_capacity = 10860
 toughness = 82.8
 hp_type = hp_elite_shield_special_10
 offline_rebuild_time = 12

DATA/EQUIPMENT/weapon_good.ini

@@ -751,6 +751,8 @@ ids_info = 264179
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Barrager Turret Mk III
+
 [Good]
 nickname = fc_j_turret01_mark03
 equipment = fc_j_turret01_mark03
@@ -763,6 +765,8 @@ ids_info = 264180
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Azrael
+
 [Good]
 nickname = fc_lr_gun01_mark01
 equipment = fc_lr_gun01_mark01
@@ -775,6 +779,8 @@ ids_info = 264181
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Drail
+
 [Good]
 nickname = fc_lr_gun01_mark02
 equipment = fc_lr_gun01_mark02
@@ -787,6 +793,8 @@ ids_info = 264182
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Raphael
+
 [Good]
 nickname = fc_lr_gun01_mark03
 equipment = fc_lr_gun01_mark03
@@ -799,6 +807,8 @@ ids_info = 264183
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Usiel
+
 [Good]
 nickname = fc_lr_gun01_mark04
 equipment = fc_lr_gun01_mark04
@@ -811,6 +821,8 @@ ids_info = 264184
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Vassago
+
 [Good]
 nickname = fc_lr_gun01_mark05
 equipment = fc_lr_gun01_mark05
@@ -823,6 +835,8 @@ ids_info = 264185
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Zaphiel Turret
+
 [Good]
 nickname = fc_lr_turret01_mark01
 equipment = fc_lr_turret01_mark01
@@ -1063,6 +1077,8 @@ ids_info = 264205
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Angelito Mk I
+
 [Good]
 nickname = fc_c_gun01_mark01
 equipment = fc_c_gun01_mark01
@@ -1075,6 +1091,8 @@ ids_info = 264206
 shop_archetype = equipment\models\weapons\co_shock_therapy.cmp
 material_library = equipment\models\ge_equip.mat
 
+; Angelito II
+
 [Good]
 nickname = fc_c_gun01_mark02
 equipment = fc_c_gun01_mark02
@@ -1087,6 +1105,8 @@ ids_info = 264207
 shop_archetype = equipment\models\weapons\co_shock_therapy.cmp
 material_library = equipment\models\ge_equip.mat
 
+; Angelito Mk III
+
 [Good]
 nickname = fc_c_gun01_mark03
 equipment = fc_c_gun01_mark03
@@ -1099,6 +1119,8 @@ ids_info = 264208
 shop_archetype = equipment\models\weapons\co_shock_therapy.cmp
 material_library = equipment\models\ge_equip.mat
 
+; Salamanca Mk I
+
 [Good]
 nickname = fc_c_gun01_mark04
 equipment = fc_c_gun01_mark04
@@ -1111,6 +1133,8 @@ ids_info = 264209
 shop_archetype = equipment\models\weapons\co_shock_therapy.cmp
 material_library = equipment\models\ge_equip.mat
 
+; Salamanca Mk II
+
 [Good]
 nickname = fc_c_gun01_mark05
 equipment = fc_c_gun01_mark05
@@ -1123,6 +1147,8 @@ ids_info = 264210
 shop_archetype = equipment\models\weapons\co_shock_therapy.cmp
 material_library = equipment\models\ge_equip.mat
 
+; Borroco
+
 [Good]
 nickname = fc_c_gun02_mark01
 equipment = fc_c_gun02_mark01
@@ -1135,6 +1161,8 @@ ids_info = 264211
 shop_archetype = equipment\models\weapons\ge_shredder_shotgun.cmp
 material_library = equipment\models\ge_equip.mat
 
+; Rapier
+
 [Good]
 nickname = fc_c_gun02_mark02
 equipment = fc_c_gun02_mark02
@@ -1147,6 +1175,8 @@ ids_info = 264212
 shop_archetype = equipment\models\weapons\ge_shredder_shotgun.cmp
 material_library = equipment\models\ge_equip.mat
 
+; Tizona del Cid
+
 [Good]
 nickname = fc_c_gun02_mark03
 equipment = fc_c_gun02_mark03
@@ -1159,6 +1189,8 @@ ids_info = 264213
 shop_archetype = equipment\models\weapons\ge_shredder_shotgun.cmp
 material_library = equipment\models\ge_equip.mat
 
+; Angelito Turret Mk I
+
 [Good]
 nickname = fc_c_turret01_mark01
 equipment = fc_c_turret01_mark01
@@ -1171,6 +1203,8 @@ ids_info = 264214
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Angelito Turret Mk II
+
 [Good]
 nickname = fc_c_turret01_mark02
 equipment = fc_c_turret01_mark02
@@ -1183,6 +1217,8 @@ ids_info = 264215
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Salamanca Turret
+
 [Good]
 nickname = fc_c_turret01_mark03
 equipment = fc_c_turret01_mark03
@@ -1195,6 +1231,8 @@ ids_info = 264216
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Borroco Turret
+
 [Good]
 nickname = fc_c_turret02_mark01
 equipment = fc_c_turret02_mark01
@@ -1207,6 +1245,8 @@ ids_info = 264217
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Rapier Turret
+
 [Good]
 nickname = fc_c_turret02_mark02
 equipment = fc_c_turret02_mark02
@@ -1219,6 +1259,8 @@ ids_info = 264218
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Single Player Weapon DH MK I
+
 [Good]
 nickname = fc_or_gun01_mark01_m1
 equipment = fc_or_gun01_mark01_m1
@@ -1231,6 +1273,8 @@ ids_info = 264219
 shop_archetype = equipment\models\weapons\li_heavy_ion_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Death's Hand Mk I
+
 [Good]
 nickname = fc_or_gun01_mark01
 equipment = fc_or_gun01_mark01
@@ -1915,6 +1959,8 @@ ids_info = 264276
 shop_archetype = equipment\models\turret\utility_turret02.cmp
 material_library = equipment\models\ge_turret.mat
 
+; Large Miner Turret
+
 [Good]
 nickname = gd_im_miner_turret03
 equipment = gd_im_miner_turret03
@@ -1927,6 +1973,8 @@ ids_info = 264277
 shop_archetype = equipment\models\turret\utility_turret03.cmp
 material_library = equipment\models\ge_turret.mat
 
+; Gunslinger Mk I
+
 [Good]
 nickname = gd_bh_gun01_mark01
 equipment = gd_bh_gun01_mark01
@@ -1939,6 +1987,8 @@ ids_info = 264278
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Gunslinger Mk II
+
 [Good]
 nickname = gd_bh_gun01_mark02
 equipment = gd_bh_gun01_mark02
@@ -1951,6 +2001,8 @@ ids_info = 264279
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Winchester Mk I
+
 [Good]
 nickname = gd_bh_gun01_mark03
 equipment = gd_bh_gun01_mark03
@@ -1963,6 +2015,8 @@ ids_info = 264280
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Winchester Mk II
+
 [Good]
 nickname = gd_bh_gun01_mark04
 equipment = gd_bh_gun01_mark04
@@ -1975,6 +2029,8 @@ ids_info = 264281
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Reaver Mk I
+
 [Good]
 nickname = gd_bh_gun01_mark05
 equipment = gd_bh_gun01_mark05
@@ -1987,6 +2043,8 @@ ids_info = 264282
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Reaver Mk II
+
 [Good]
 nickname = gd_bh_gun01_mark06
 equipment = gd_bh_gun01_mark06
@@ -1999,6 +2057,8 @@ ids_info = 264283
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Brave Mk I
+
 [Good]
 nickname = gd_bh_gun02_mark01
 equipment = gd_bh_gun02_mark01
@@ -2011,6 +2071,8 @@ ids_info = 264284
 shop_archetype = equipment\models\weapons\li_plasma_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Brave Mk II
+
 [Good]
 nickname = gd_bh_gun02_mark02
 equipment = gd_bh_gun02_mark02
@@ -2023,6 +2085,8 @@ ids_info = 264285
 shop_archetype = equipment\models\weapons\li_plasma_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Warrior Mk I
+
 [Good]
 nickname = gd_bh_gun02_mark03
 equipment = gd_bh_gun02_mark03
@@ -2035,6 +2099,8 @@ ids_info = 264286
 shop_archetype = equipment\models\weapons\li_plasma_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Warrior Mk II
+
 [Good]
 nickname = gd_bh_gun02_mark04
 equipment = gd_bh_gun02_mark04
@@ -2047,6 +2113,8 @@ ids_info = 264287
 shop_archetype = equipment\models\weapons\li_plasma_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Buckshot
+
 [Good]
 nickname = gd_bh_gun02_mark05
 equipment = gd_bh_gun02_mark05
@@ -2059,6 +2127,8 @@ ids_info = 264288
 shop_archetype = equipment\models\weapons\li_plasma_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Gunsliner Mk.1 Turret
+
 [Good]
 nickname = gd_bh_turret01_mark01
 equipment = gd_bh_turret01_mark01
@@ -2071,6 +2141,8 @@ ids_info = 264289
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Gunslinger Mk II Turret
+
 [Good]
 nickname = gd_bh_turret01_mark02
 equipment = gd_bh_turret01_mark02
@@ -2083,6 +2155,8 @@ ids_info = 264290
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Winchester Turret
+
 [Good]
 nickname = gd_bh_turret01_mark03
 equipment = gd_bh_turret01_mark03
@@ -2095,6 +2169,8 @@ ids_info = 264291
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Reaver Turret
+
 [Good]
 nickname = gd_bh_turret01_mark04
 equipment = gd_bh_turret01_mark04
@@ -2107,6 +2183,8 @@ ids_info = 264292
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Brave Turret
+
 [Good]
 nickname = gd_bh_turret02_mark01
 equipment = gd_bh_turret02_mark01
@@ -2119,6 +2197,8 @@ ids_info = 264293
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Warrior Turret
+
 [Good]
 nickname = gd_bh_turret02_mark02
 equipment = gd_bh_turret02_mark02
@@ -2131,6 +2211,8 @@ ids_info = 264294
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Buckshot Turret
+
 [Good]
 nickname = gd_bh_turret02_mark03
 equipment = gd_bh_turret02_mark03
@@ -2143,6 +2225,8 @@ ids_info = 264295
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Natter
+
 [Good]
 nickname = fc_rh_gun01_mark01
 equipment = fc_rh_gun01_mark01
@@ -2155,6 +2239,8 @@ ids_info = 264296
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Natter Zwei
+
 [Good]
 nickname = fc_rh_gun01_mark02
 equipment = fc_rh_gun01_mark02
@@ -2167,6 +2253,8 @@ ids_info = 264297
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Roter Blitz
+
 [Good]
 nickname = fc_rh_gun01_mark03
 equipment = fc_rh_gun01_mark03
@@ -2179,6 +2267,8 @@ ids_info = 264298
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Natterturn
+
 [Good]
 nickname = fc_rh_gun01_mark04
 equipment = fc_rh_gun01_mark04
@@ -2191,6 +2281,8 @@ ids_info = 264299
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Natter Turret
+
 [Good]
 nickname = fc_rh_turret01_mark01
 equipment = fc_rh_turret01_mark01
@@ -2203,6 +2295,8 @@ ids_info = 264300
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Roter Blitz Turret
+
 [Good]
 nickname = fc_rh_turret01_mark02
 equipment = fc_rh_turret01_mark02
@@ -2215,6 +2309,8 @@ ids_info = 264301
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Tanto
+
 [Good]
 nickname = fc_bd_gun01_mark01
 equipment = fc_bd_gun01_mark01
@@ -2227,6 +2323,8 @@ ids_info = 264302
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Wakizashi
+
 [Good]
 nickname = fc_bd_gun01_mark02
 equipment = fc_bd_gun01_mark02
@@ -2239,6 +2337,8 @@ ids_info = 264303
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Katana
+
 [Good]
 nickname = fc_bd_gun01_mark03
 equipment = fc_bd_gun01_mark03
@@ -2251,6 +2351,8 @@ ids_info = 264304
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Gendaito
+
 [Good]
 nickname = fc_bd_gun01_mark04
 equipment = fc_bd_gun01_mark04
@@ -2263,6 +2365,8 @@ ids_info = 264305
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Tanto Turret
+
 [Good]
 nickname = fc_bd_turret01_mark01
 equipment = fc_bd_turret01_mark01
@@ -2275,6 +2379,8 @@ ids_info = 264306
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Katana Turret
+
 [Good]
 nickname = fc_bd_turret01_mark02
 equipment = fc_bd_turret01_mark02
@@ -2287,6 +2393,8 @@ ids_info = 264307
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Luger Type A
+
 [Good]
 nickname = fc_b_gun01_mark01
 equipment = fc_b_gun01_mark01
@@ -2299,6 +2407,8 @@ ids_info = 264308
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Luger Type B
+
 [Good]
 nickname = fc_b_gun01_mark02
 equipment = fc_b_gun01_mark02
@@ -2311,6 +2421,8 @@ ids_info = 264309
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Luger Type C
+
 [Good]
 nickname = fc_b_gun01_mark03
 equipment = fc_b_gun01_mark03
@@ -2323,6 +2435,8 @@ ids_info = 264310
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Luger Turret Type A
+
 [Good]
 nickname = fc_b_turret01_mark01
 equipment = fc_b_turret01_mark01
@@ -2335,6 +2449,8 @@ ids_info = 264311
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Luger Turret Type B
+
 [Good]
 nickname = fc_b_turret01_mark02
 equipment = fc_b_turret01_mark02
@@ -2347,6 +2463,8 @@ ids_info = 264312
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Helios
+
 [Good]
 nickname = gd_z_gun01_mark01
 equipment = gd_z_gun01_mark01
@@ -2359,6 +2477,8 @@ ids_info = 264313
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Helios 2
+
 [Good]
 nickname = gd_z_gun01_mark02
 equipment = gd_z_gun01_mark02
@@ -2371,6 +2491,8 @@ ids_info = 264314
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Fury
+
 [Good]
 nickname = gd_z_gun01_mark03
 equipment = gd_z_gun01_mark03
@@ -2383,6 +2505,8 @@ ids_info = 264315
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Fury 2
+
 [Good]
 nickname = gd_z_gun01_mark04
 equipment = gd_z_gun01_mark04
@@ -2395,6 +2519,8 @@ ids_info = 264316
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Fury 3
+
 [Good]
 nickname = gd_z_gun01_mark05
 equipment = gd_z_gun01_mark05
@@ -2407,6 +2533,8 @@ ids_info = 264317
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Helios Turret
+
 [Good]
 nickname = gd_z_turret01_mark01
 equipment = gd_z_turret01_mark01
@@ -2419,6 +2547,8 @@ ids_info = 264318
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Fury Turret
+
 [Good]
 nickname = gd_z_turret01_mark02
 equipment = gd_z_turret01_mark02
@@ -2431,6 +2561,8 @@ ids_info = 264319
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Fury 2 Turret
+
 [Good]
 nickname = gd_z_turret01_mark03
 equipment = gd_z_turret01_mark03
@@ -2875,6 +3007,8 @@ ids_info = 264356
 shop_archetype = equipment\models\weapons\li_laser_beam.cmp
 material_library = equipment\models\li_equip.mat
 
+; Justice Mk I
+
 [Good]
 nickname = li_gun01_mark01
 equipment = li_gun01_mark01
@@ -2887,6 +3021,8 @@ ids_info = 264357
 shop_archetype = equipment\models\weapons\li_heavy_ion_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Justice Mk II
+
 [Good]
 nickname = li_gun01_mark02
 equipment = li_gun01_mark02
@@ -2899,6 +3035,8 @@ ids_info = 264358
 shop_archetype = equipment\models\weapons\li_heavy_ion_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Justice Mk III
+
 [Good]
 nickname = li_gun01_mark03
 equipment = li_gun01_mark03
@@ -2911,6 +3049,8 @@ ids_info = 264359
 shop_archetype = equipment\models\weapons\li_heavy_ion_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Vengeance Mk I
+
 [Good]
 nickname = li_gun01_mark04
 equipment = li_gun01_mark04
@@ -2923,6 +3063,8 @@ ids_info = 264360
 shop_archetype = equipment\models\weapons\li_heavy_ion_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Vengeance Mk II
+
 [Good]
 nickname = li_gun01_mark05
 equipment = li_gun01_mark05
@@ -2935,6 +3077,8 @@ ids_info = 264361
 shop_archetype = equipment\models\weapons\li_heavy_ion_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Vengeance Mk III
+
 [Good]
 nickname = li_gun01_mark06
 equipment = li_gun01_mark06
@@ -2947,6 +3091,8 @@ ids_info = 264362
 shop_archetype = equipment\models\weapons\li_heavy_ion_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; VengeanceSP Mk III
+
 [Good]
 nickname = li_gun01_mark06_m11
 equipment = li_gun01_mark06_m11
@@ -2959,6 +3105,8 @@ ids_info = 264363
 shop_archetype = equipment\models\weapons\li_heavy_ion_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Lavablade Mk I
+
 [Good]
 nickname = li_gun02_mark01
 equipment = li_gun02_mark01
@@ -2971,6 +3119,8 @@ ids_info = 264364
 shop_archetype = equipment\models\weapons\li_plasma_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Lavablade Mk II
+
 [Good]
 nickname = li_gun02_mark02
 equipment = li_gun02_mark02
@@ -2983,6 +3133,8 @@ ids_info = 264365
 shop_archetype = equipment\models\weapons\li_plasma_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Lavablade Mk III
+
 [Good]
 nickname = li_gun02_mark03
 equipment = li_gun02_mark03
@@ -2995,6 +3147,8 @@ ids_info = 264366
 shop_archetype = equipment\models\weapons\li_plasma_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Magma Hammer Mk I
+
 [Good]
 nickname = li_gun02_mark04
 equipment = li_gun02_mark04
@@ -3007,6 +3161,8 @@ ids_info = 264367
 shop_archetype = equipment\models\weapons\li_plasma_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Magma Hammer Mk II
+
 [Good]
 nickname = li_gun02_mark05
 equipment = li_gun02_mark05
@@ -3019,6 +3175,8 @@ ids_info = 264368
 shop_archetype = equipment\models\weapons\li_plasma_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Magma Hammer Mk III
+
 [Good]
 nickname = li_gun02_mark06
 equipment = li_gun02_mark06
@@ -3031,6 +3189,8 @@ ids_info = 264369
 shop_archetype = equipment\models\weapons\li_plasma_blaster.cmp
 material_library = equipment\models\li_equip.mat
 
+; Justice Turret Mk I
+
 [Good]
 nickname = li_turret01_mark01
 equipment = li_turret01_mark01
@@ -3043,6 +3203,8 @@ ids_info = 264370
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Justice Turret Mk II
+
 [Good]
 nickname = li_turret01_mark02
 equipment = li_turret01_mark02
@@ -3055,6 +3217,8 @@ ids_info = 264371
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Vengeance Turret
+
 [Good]
 nickname = li_turret01_mark03
 equipment = li_turret01_mark03
@@ -3067,6 +3231,8 @@ ids_info = 264372
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Lavablade Turret Mk I
+
 [Good]
 nickname = li_turret02_mark01
 equipment = li_turret02_mark01
@@ -3079,6 +3245,8 @@ ids_info = 264373
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Lavablade Turret Mk II
+
 [Good]
 nickname = li_turret02_mark02
 equipment = li_turret02_mark02
@@ -3091,6 +3259,8 @@ ids_info = 264374
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Magma Hammer Turret
+
 [Good]
 nickname = li_turret02_mark03
 equipment = li_turret02_mark03
@@ -3103,6 +3273,8 @@ ids_info = 264375
 shop_archetype = equipment\models\weapons\li_smlturret.cmp
 material_library = equipment\models\li_equip.mat
 
+; Cruiser Turret
+
 [Good]
 nickname = li_cruiser_turret01
 equipment = li_cruiser_turret01
@@ -3115,6 +3287,8 @@ ids_info = 264376
 shop_archetype = equipment\models\turret\li_turret05.cmp
 material_library = equipment\models\li_turret.mat
 
+; Cruiser Forward Gun
+
 [Good]
 nickname = li_cruiser_forward_gun01
 equipment = li_cruiser_forward_gun01
@@ -3127,6 +3301,8 @@ ids_info = 264377
 shop_archetype = equipment\models\turret\li_cruiser_gun01.cmp
 material_library = equipment\models\li_turret.mat
 
+; Cruiser Missile Turret
+
 [Good]
 nickname = li_cruiser_missile_turret01
 equipment = li_cruiser_missile_turret01
@@ -3139,6 +3315,8 @@ ids_info = 264378
 shop_archetype = equipment\models\turret\li_turret05b.cmp
 material_library = equipment\models\li_turret.mat
 
+; Battleship Primary Turret
+
 [Good]
 nickname = li_battleship_turret01
 equipment = li_battleship_turret01
@@ -3151,6 +3329,8 @@ ids_info = 264379
 shop_archetype = equipment\models\turret\li_turret01.cmp
 material_library = equipment\models\li_turret.mat
 
+; Battleship Secondary Turret
+
 [Good]
 nickname = li_battleship_turret02
 equipment = li_battleship_turret02
@@ -3163,6 +3343,8 @@ ids_info = 264380
 shop_archetype = equipment\models\turret\li_turret02.cmp
 material_library = equipment\models\li_turret.mat
 
+; Battleship Tertiary Turret
+
 [Good]
 nickname = li_battleship_turret03
 equipment = li_battleship_turret03
@@ -3175,6 +3357,8 @@ ids_info = 264381
 shop_archetype = equipment\models\turret\li_turret03.cmp
 material_library = equipment\models\li_turret.mat
 
+; Battleship Defense Turret
+
 [Good]
 nickname = li_battleship_turret04
 equipment = li_battleship_turret04
@@ -3187,6 +3371,8 @@ ids_info = 264382
 shop_archetype = equipment\models\turret\li_turret04.cmp
 material_library = equipment\models\li_turret.mat
 
+; Battleship Flak Turret
+
 [Good]
 nickname = li_battleship_flak_turret01
 equipment = li_battleship_flak_turret01
@@ -7730,6 +7916,117 @@ ids_info = 264233
 shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
 material_library = equipment\models\ge_equip.mat
 
+;Template red
+[Good]
+nickname = template_3_red_40
+equipment = template_3_red_40
+category = equipment
+price = 120000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 263199
+ids_info = 264199
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+[Good]
+nickname = template_3_red_588
+equipment = template_3_red_588
+category = equipment
+price = 120000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 263448
+ids_info = 264448
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+[Good]
+nickname = template_3_red_833
+equipment = template_3_red_833
+category = equipment
+price = 120000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 263233
+ids_info = 264233
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+;Template yellow
+[Good]
+nickname = template_3_yellow_40
+equipment = template_3_yellow_40
+category = equipment
+price = 120000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 263199
+ids_info = 264199
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+[Good]
+nickname = template_3_yellow_588
+equipment = template_3_yellow_588
+category = equipment
+price = 120000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 263448
+ids_info = 264448
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+[Good]
+nickname = template_3_yellow_833
+equipment = template_3_yellow_833
+category = equipment
+price = 120000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 263233
+ids_info = 264233
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+;Template orange
+[Good]
+nickname = template_3_orange_40
+equipment = template_3_orange_40
+category = equipment
+price = 120000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 263199
+ids_info = 264199
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+[Good]
+nickname = template_3_orange_588
+equipment = template_3_orange_588
+category = equipment
+price = 120000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 263448
+ids_info = 264448
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+[Good]
+nickname = template_3_orange_833
+equipment = template_3_orange_833
+category = equipment
+price = 120000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 263233
+ids_info = 264233
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
 ;Template green
 [Good]
 nickname = template_3_green_40
@@ -7990,4 +8287,112 @@ free_ammo = cruise_disruptor01_mark01_ammo, 5
 ids_name = 263526
 ids_info = 264526
 shop_archetype = equipment\models\weapons\li_rad_launcher.cmp
-material_library = equipment\models\li_equip.mat
+material_library = equipment\models\li_equip.mat
+
+; Liberty Gatling Gun
+
+[Good]
+nickname = li_gatling_gun_ammo
+equipment = li_gatling_gun_ammo
+shop_archetype = equipment\models\weapons\li_rad_missile.3db
+material_library = equipment\models\li_equip.mat
+category = equipment
+price = 1
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
+combinable = true
+
+[Good]
+nickname = li_gatling_gun
+equipment = li_gatling_gun
+category = equipment
+price = 100
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 299000
+ids_info = 299000
+shop_archetype = equipment\models\weapons\li_laser_beam.cmp
+material_library = equipment\models\li_equip.mat
+
+; Codename CHIMERA
+
+[Good]
+nickname = special_gun16
+equipment = special_gun16
+category = equipment
+price = 150000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 299010
+ids_info = 299011
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+; Codename POISON CLAW
+
+[Good]
+nickname = special_gun17
+equipment = special_gun17
+category = equipment
+price = 150000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 299012
+ids_info = 299013
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+; Codename AVALON
+
+[Good]
+nickname = special_gun18
+equipment = special_gun18
+category = equipment
+price = 150000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 299014
+ids_info = 299015
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+; Codename NEMESIS
+
+[Good]
+nickname = special_gun19
+equipment = special_gun19
+category = equipment
+price = 150000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 299016
+ids_info = 299017
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+; Scythe Mk II
+
+[Good]
+nickname = or_gun01_mark05
+equipment = or_gun01_mark05
+category = equipment
+price = 150000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 299052
+ids_info = 299053
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+
+; Scythe Mk II
+
+[Good]
+nickname = or_gun01_mark05
+equipment = or_gun01_mark05
+category = equipment
+price = 150000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db
+combinable = false
+ids_name = 299050
+ids_info = 299051
+shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat

DATA/FX/WEAPONS/weapons_ale.ini

@@ -5135,4 +5135,184 @@ effect_crc = 258104849
 textures = fx\planetflare.txm
 textures = fx\sarma.txm
 textures = fx\missleeffect.txm
-textures = fx\lightning2.txm
+textures = fx\lightning2.txm
+
+;Template Red
+[VisEffect]
+nickname = template_3_red_flash
+alchemy = fx\weapons\customs\template_3_red.ale
+effect_crc = 207127975
+textures = fx\planetflare.txm
+textures = fx\sarma.txm
+textures = fx\missleeffect.txm
+textures = fx\lightning2.txm
+
+[VisEffect]
+nickname = template_3_red_impact
+alchemy = fx\weapons\customs\template_3_red.ale
+effect_crc = 413617125
+textures = fx\planetflare.txm
+textures = fx\sarma.txm
+textures = fx\missleeffect.txm
+textures = fx\lightning2.txm
+
+[VisEffect]
+nickname = template_3_red_proj
+alchemy = fx\weapons\customs\template_3_red.ale
+effect_crc = -247148054
+textures = fx\planetflare.txm
+textures = fx\sarma.txm
+textures = fx\missleeffect.txm
+textures = fx\lightning2.txm
+
+;Template Yellow
+[VisEffect]
+nickname = template_3_yellow_flash
+alchemy = fx\weapons\customs\template_3_yellow.ale
+effect_crc = -301669967
+textures = fx\planetflare.txm
+textures = fx\sarma.txm
+textures = fx\missleeffect.txm
+textures = fx\lightning2.txm
+
+[VisEffect]
+nickname = template_3_yellow_impact
+alchemy = fx\weapons\customs\template_3_yellow.ale
+effect_crc = 143762128
+textures = fx\planetflare.txm
+textures = fx\sarma.txm
+textures = fx\missleeffect.txm
+textures = fx\lightning2.txm
+
+[VisEffect]
+nickname = template_3_yellow_proj
+alchemy = fx\weapons\customs\template_3_yellow.ale
+effect_crc = 277203165
+textures = fx\planetflare.txm
+textures = fx\sarma.txm
+textures = fx\missleeffect.txm
+textures = fx\lightning2.txm
+
+;Template Orange
+[VisEffect]
+nickname = template_3_orange_flash
+alchemy = fx\weapons\customs\template_3_orange.ale
+effect_crc = 395205601
+textures = fx\planetflare.txm
+textures = fx\sarma.txm
+textures = fx\missleeffect.txm
+textures = fx\lightning2.txm
+
+[VisEffect]
+nickname = template_3_orange_impact
+alchemy = fx\weapons\customs\template_3_orange.ale
+effect_crc = 50559390
+textures = fx\planetflare.txm
+textures = fx\sarma.txm
+textures = fx\missleeffect.txm
+textures = fx\lightning2.txm
+
+[VisEffect]
+nickname = template_3_orange_proj
+alchemy = fx\weapons\customs\template_3_orange.ale
+effect_crc = -169002897
+textures = fx\planetflare.txm
+textures = fx\sarma.txm
+textures = fx\missleeffect.txm
+textures = fx\lightning2.txm
+
+; Codename: CHIMERA
+[VisEffect]
+nickname = chimera_flash
+alchemy = fx\weapons\customs\chimera.ale
+effect_crc = -491373339
+textures = fx\planetflare.txm
+textures = fx\sarma.txm
+textures = fx\missleeffect.txm
+textures = fx\lightning2.txm
+
+[VisEffect]
+nickname = chimera_impact
+alchemy = fx\weapons\customs\chimera.ale
+effect_crc = -56916512
+textures = fx\planetflare.txm
+textures = fx\sarma.txm
+textures = fx\missleeffect.txm
+textures = fx\lightning2.txm
+
+[VisEffect]
+nickname = chimera_proj
+alchemy = fx\weapons\customs\chimera.ale
+effect_crc = 281080052
+textures = fx\planetflare.txm
+textures = fx\sarma.txm
+textures = fx\missleeffect.txm
+textures = fx\lightning2.txm
+textures = fx\nomad.txm
+
+; Codename: POISON CLAW
+[VisEffect]
+nickname = poisonclaw_flash
+alchemy = fx\weapons\customs\poisonclaw.ale
+effect_crc = -184488780
+textures = fx\sarma.txm
+textures = fx\standardeffects.txm
+textures = fx\smoke.txm
+textures = fx\newglows.txm
+
+[VisEffect]
+nickname = poisonclaw_impact
+alchemy = fx\weapons\customs\poisonclaw.ale
+effect_crc = -18853294
+textures = fx\sarma.txm
+textures = fx\standardeffects.txm
+textures = fx\smoke.txm
+textures = fx\newglows.txm
+
+[VisEffect]
+nickname = poisonclaw_proj
+alchemy = fx\weapons\customs\poisonclaw.ale
+effect_crc = 500791262
+textures = fx\sarma.txm
+textures = fx\standardeffects.txm
+textures = fx\smoke.txm
+textures = fx\newglows.txm
+
+; Codename: NEMESIS
+[VisEffect]
+nickname = nemesis_flash
+alchemy = fx\weapons\customs\nemesis.ale
+effect_crc = -123118272
+textures = fx\sarma.txm
+textures = fx\standardeffects.txm
+textures = fx\smoke.txm
+textures = fx\newglows.txm
+
+[VisEffect]
+nickname = nemesis_impact
+alchemy = fx\weapons\customs\nemesis.ale
+effect_crc = 473812454
+textures = fx\sarma.txm
+textures = fx\standardeffects.txm
+textures = fx\smoke.txm
+textures = fx\newglows.txm
+
+[VisEffect]
+nickname = nemesis_proj
+alchemy = fx\weapons\customs\nemesis.ale
+effect_crc = 101309374
+textures = fx\sarma.txm
+textures = fx\standardeffects.txm
+textures = fx\smoke.txm
+textures = fx\newglows.txm
+textures = fx\nomad.txm
+textures = fx\hexagon.txm
+
+; Scythe
+
+[VisEffect]
+nickname = scythe_proj
+alchemy = fx\weapons\customs\scythe.ale
+effect_crc = -112767069
+textures = fx\planetflare.txm
+textures = fx\efx.txm

DATA/FX/beam_effects.ini

@@ -894,3 +894,56 @@ head_texture = star
 trail_texture = thin
 flash_size = 4
 
+; POISON CLAW Beam effect
+
+[BeamSpear]
+nickname = poison_claw_01_beam
+tip_length = 20
+tail_length = 30
+head_width = 0.7
+core_width = 1
+tip_color = 13, 115, 13
+core_color = 25, 135, 25
+outter_color = 13, 115, 13
+tail_color = 225, 225, 15
+head_brightness = 0.8
+trail_brightness = 0.7
+head_texture = ball
+trail_texture = wide
+flash_size = 3
+
+; AVALON Beam effect
+
+[BeamSpear]
+nickname = avalon_beam
+tip_length = 5
+tail_length = 60
+head_width = 3
+core_width = 2
+tip_color = 0, 64, 128
+core_color = 20, 85, 150
+outter_color = 0, 64, 128
+tail_color = 255, 255, 255
+head_brightness = 1
+trail_brightness = 1
+head_texture = star
+trail_texture = wide
+flash_size = 3
+
+; NEMESIS Beam effect
+
+[BeamSpear]
+nickname = nemesis_01_beam
+tip_length = 20
+tail_length = 30
+head_width = 0.7
+core_width = 1
+tip_color = 194, 223, 32
+core_color = 225, 250, 0
+outter_color = 194, 223, 32
+tail_color = 194, 223, 32
+head_brightness = 0.8
+trail_brightness = 0.7
+head_texture = ball
+trail_texture = wide
+flash_size = 3

DATA/FX/effects.ini

@@ -3486,6 +3486,57 @@ vis_effect = template_3_green_proj
 ;vis_beam = template_3_green_beam
 vis_beam = pi_particle_04_beam
 
+;Template Red
+[Effect]
+nickname = template_3_red_flash
+effect_type = EFT_MUZZLE_FLASH
+vis_effect = template_3_red_flash
+
+[Effect]
+nickname = template_3_red_impact
+effect_type = EFT_WEAPON_IMPACT
+vis_effect = template_3_red_impact
+
+[Effect]
+nickname = template_3_red_proj
+effect_type = EFT_WEAPON_PROJ
+vis_effect = template_3_red_proj
+vis_beam = pi_particle_04_beam
+
+;Template yellow
+[Effect]
+nickname = template_3_yellow_flash
+effect_type = EFT_MUZZLE_FLASH
+vis_effect = template_3_yellow_flash
+
+[Effect]
+nickname = template_3_yellow_impact
+effect_type = EFT_WEAPON_IMPACT
+vis_effect = template_3_yellow_impact
+
+[Effect]
+nickname = template_3_yellow_proj
+effect_type = EFT_WEAPON_PROJ
+vis_effect = template_3_yellow_proj
+vis_beam = pi_particle_04_beam
+
+;Template orange
+[Effect]
+nickname = template_3_orange_flash
+effect_type = EFT_MUZZLE_FLASH
+vis_effect = template_3_orange_flash
+
+[Effect]
+nickname = template_3_orange_impact
+effect_type = EFT_WEAPON_IMPACT
+vis_effect = template_3_orange_impact
+
+[Effect]
+nickname = template_3_orange_proj
+effect_type = EFT_WEAPON_PROJ
+vis_effect = template_3_orange_proj
+vis_beam = pi_particle_04_beam
+
 ;Template Cyan
 [Effect]
 nickname = template_3_cyan_flash
@@ -3672,4 +3723,84 @@ vis_effect = dsy_no2_smallengine02
 [Effect]
 nickname = dsy_no2_smallengine03
 effect_type = EFT_ENGINE_FIRE
-vis_effect = dsy_no2_smallengine03
+vis_effect = dsy_no2_smallengine03
+
+
+; New Codename Weapon Effects
+
+; CHIMERA
+[Effect]
+nickname = chimera_flash
+effect_type = EFT_MUZZLE_FLASH
+vis_effect = chimera_flash
+
+[Effect]
+nickname = chimera_impact
+effect_type = EFT_WEAPON_IMPACT
+vis_effect = chimera_impact
+
+[Effect]
+nickname = chimera_proj
+effect_type = EFT_WEAPON_PROJ
+vis_effect = chimera_proj
+vis_beam = pi_particle_04_beam
+
+; POISON CLAW
+[Effect]
+nickname = poisonclaw_flash
+effect_type = EFT_MUZZLE_FLASH
+vis_effect = poisonclaw_flash
+
+[Effect]
+nickname = poisonclaw_impact
+effect_type = EFT_WEAPON_IMPACT
+vis_effect = poisonclaw_impact
+
+[Effect]
+nickname = poisonclaw_proj
+effect_type = EFT_WEAPON_PROJ
+vis_effect = poisonclaw_proj
+vis_beam = poison_claw_01_beam
+
+; AVALON
+[Effect]
+nickname = gf_br_gun02_flash
+effect_type = EFT_MUZZLE_FLASH
+vis_effect = gf_br_gun02_flash
+
+[Effect]
+nickname = gf_br_gun02_impact
+effect_type = EFT_WEAPON_IMPACT
+vis_effect = gf_br_gun02_impact
+
+[Effect]
+nickname = gf_br_gun02_projectile
+effect_type = EFT_WEAPON_PROJ
+vis_effect = gf_br_gun02_projectile
+vis_beam = avalon_beam
+;vis_generic = min_photon_01_proj
+
+; NEMESIS
+[Effect]
+nickname = nemesis_flash
+effect_type = EFT_MUZZLE_FLASH
+vis_effect = nemesis_flash
+
+[Effect]
+nickname = nemesis_impact
+effect_type = EFT_WEAPON_IMPACT
+vis_effect = nemesis_impact
+
+[Effect]
+nickname = nemesis_proj
+effect_type = EFT_WEAPON_PROJ
+vis_effect = nemesis_proj
+vis_beam = nemesis_01_beam
+
+
+; Scythe
+[Effect]
+nickname = scythe_proj
+effect_type = EFT_WEAPON_PROJ
+vis_effect = scythe_proj
+vis_generic = min_photon_01_proj

DATA/MISSIONS/mbases.ini

@@ -45958,10 +45958,10 @@ room = bar
 
 [GF_NPC]
 nickname = st0301_blood_005_f
-body = pl_male2_journeyman_body
+body = pl_female2_journeyman_body
 head = ku_newscaster_head_gen
-lefthand = benchmark_male_hand_left
-righthand = benchmark_male_hand_right
+lefthand = benchmark_female_hand_left
+righthand = benchmark_female_hand_right
 individual_name = 200027
 affiliation = fc_or_grp
 voice = rvp511

DATA/MISSIONS/news.ini

@@ -8116,3 +8116,31 @@ base = Bw08_01_Base
 base = Ew02_01_Base
 base = Hi01_01_Base
 
+; REM
+[NewsItem]
+rank = mission_13_accepted, mission_end
+icon = world
+logo = news_jacobi
+category = 250000
+headline = 250000
+text = 250001
+base = Li01_01_Base
+
+[NewsItem]
+rank = mission_13_accepted, mission_end
+icon = world
+logo = news_westpoint
+category = 250100
+headline = 250100
+text = 250101
+base = Li01_09_Base
+
+[NewsItem]
+rank = mission_13_accepted, mission_end
+icon = world
+logo = news_schultzsky_shipexplo
+category = 251000
+headline = 251000
+text = 251001
+base = Rh01_01_Base
+