diff --git a/DATA/EQUIPMENT/goods.ini b/DATA/EQUIPMENT/goods.ini
index d6b6556d..758c39d4 100644
--- a/DATA/EQUIPMENT/goods.ini
+++ b/DATA/EQUIPMENT/goods.ini
@@ -675,6 +675,40 @@ 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
+
; Tractor Beam Blueprint
[Good]
diff --git a/DATA/EQUIPMENT/select_equip.ini b/DATA/EQUIPMENT/select_equip.ini
index df402252..ef24cbb3 100644
--- a/DATA/EQUIPMENT/select_equip.ini
+++ b/DATA/EQUIPMENT/select_equip.ini
@@ -990,6 +990,31 @@ 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
; Tractor Beam Blueprint
diff --git a/DATA/EQUIPMENT/weapon_equip.ini b/DATA/EQUIPMENT/weapon_equip.ini
index 939137a2..63e63769 100644
--- a/DATA/EQUIPMENT/weapon_equip.ini
+++ b/DATA/EQUIPMENT/weapon_equip.ini
@@ -21007,6 +21007,54 @@ turn_rate = 90
lootable = true
LODranges = 0, 999999
+; NEMESIS
+
+[Munition]
+nickname = special_gun19_ammo
+hp_type = hp_gun
+requires_ammo = false
+hit_pts = 2
+hull_damage = 322.8
+energy_damage = 86
+one_shot_sound = fire_tachyon5
+munition_hit_effect = nemesis_impact
+const_effect = nemesis_proj
+lifetime = 0.8
+force_gun_ori = false
+mass = 1
+volume = 0.0001
+
+[Gun]
+nickname = special_gun19
+ids_name = 299016
+ids_info = 299017
+DA_archetype = equipment\models\weapons\co_proton_cooker.cmp
+material_library = equipment\models\ge_equip.mat
+HP_child = HPConnect
+hit_pts = 6752
+explosion_resistance = 1
+debris_type = debris_normal
+parent_impulse = 20
+child_impulse = 80
+volume = 0
+mass = 10
+hp_gun_type = hp_gun_special_10
+damage_per_fire = 0
+power_usage = 79.05
+refire_delay = 0.12
+muzzle_velocity = 750
+use_animation = Sc_fire
+toughness = 17.6
+flash_particle_name = nemesis_flash
+flash_radius = 15
+light_anim = l_gun01_flash
+projectile_archetype = special_gun19_ammo
+separation_explosion = sever_debris
+auto_turret = false
+turn_rate = 90
+lootable = true
+LODranges = 0, 999999
+
[Munition]
nickname = small_station_turret_ammo
hp_type = hp_gun
diff --git a/DATA/EQUIPMENT/weapon_good.ini b/DATA/EQUIPMENT/weapon_good.ini
index e324d102..3fe478e5 100644
--- a/DATA/EQUIPMENT/weapon_good.ini
+++ b/DATA/EQUIPMENT/weapon_good.ini
@@ -8202,7 +8202,7 @@ ids_info = 299000
shop_archetype = equipment\models\weapons\li_laser_beam.cmp
material_library = equipment\models\li_equip.mat
-; Codename Chimera
+; Codename CHIMERA
[Good]
nickname = special_gun16
@@ -8216,7 +8216,7 @@ ids_info = 299011
shop_archetype = equipment\models\weapons\co_proton_cooker.cmp
material_library = equipment\models\ge_equip.mat
-; Codename Poison Claw
+; Codename POISON CLAW
[Good]
nickname = special_gun17
@@ -8242,4 +8242,18 @@ 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
\ No newline at end of file
diff --git a/DATA/FX/WEAPONS/customs/nemesis.ale b/DATA/FX/WEAPONS/customs/nemesis.ale
new file mode 100644
index 00000000..857fd301
Binary files /dev/null and b/DATA/FX/WEAPONS/customs/nemesis.ale differ
diff --git a/DATA/FX/WEAPONS/customs/nemesis_backup.ale b/DATA/FX/WEAPONS/customs/nemesis_backup.ale
new file mode 100644
index 00000000..8a913b25
Binary files /dev/null and b/DATA/FX/WEAPONS/customs/nemesis_backup.ale differ
diff --git a/DATA/FX/WEAPONS/customs/poisonclaw.ale b/DATA/FX/WEAPONS/customs/poisonclaw.ale
index 26d2ff7b..788409b2 100644
Binary files a/DATA/FX/WEAPONS/customs/poisonclaw.ale and b/DATA/FX/WEAPONS/customs/poisonclaw.ale differ
diff --git a/DATA/FX/WEAPONS/customs/poisonclaw_backup.ale b/DATA/FX/WEAPONS/customs/poisonclaw_backup.ale
new file mode 100644
index 00000000..135dc46c
Binary files /dev/null and b/DATA/FX/WEAPONS/customs/poisonclaw_backup.ale differ
diff --git a/DATA/FX/WEAPONS/weapons_ale.ini b/DATA/FX/WEAPONS/weapons_ale.ini
index f7666ce6..8f9d40e4 100644
--- a/DATA/FX/WEAPONS/weapons_ale.ini
+++ b/DATA/FX/WEAPONS/weapons_ale.ini
@@ -5192,4 +5192,34 @@ effect_crc = 500791262
textures = fx\sarma.txm
textures = fx\standardeffects.txm
textures = fx\smoke.txm
-textures = fx\newglows.txm
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/DATA/FX/beam_effects.ini b/DATA/FX/beam_effects.ini
index e7b7faac..756ee147 100644
--- a/DATA/FX/beam_effects.ini
+++ b/DATA/FX/beam_effects.ini
@@ -910,4 +910,40 @@ 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
\ No newline at end of file
diff --git a/DATA/FX/effects.ini b/DATA/FX/effects.ini
index de91edcb..e2199e5b 100644
--- a/DATA/FX/effects.ini
+++ b/DATA/FX/effects.ini
@@ -3726,4 +3726,22 @@ vis_effect = gf_br_gun02_impact
nickname = gf_br_gun02_projectile
effect_type = EFT_WEAPON_PROJ
vis_effect = gf_br_gun02_projectile
-vis_beam = br_particle_01_beam
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/EXE/REM/Lua/Infocards.lua b/EXE/REM/Lua/Infocards.lua
index 3436eb82..b94d0943 100644
--- a/EXE/REM/Lua/Infocards.lua
+++ b/EXE/REM/Lua/Infocards.lua
@@ -341,6 +341,8 @@ rem.AddInfoCard(299012, "POISON CLAW")
rem.AddInfoCard(299013, [[Weapon Codename: POISON CLAWINFORMATION CLASSIFIEDThere is no information available on this weapon other than its project name.]])
rem.AddInfoCard(299014, "AVALON")
rem.AddInfoCard(299015, [[Weapon Codename: AVALONINFORMATION CLASSIFIEDThere is no information available on this weapon other than its project name.]])
+rem.AddInfoCard(299016, "NEMESIS")
+rem.AddInfoCard(299017, [[Weapon Codename: NEMESISINFORMATION CLASSIFIEDThere is no information available on this weapon other than its project name.]])
-- Infocards Power
@@ -360,6 +362,10 @@ rem.AddInfoCard(299808, "AVALON Blueprint")
rem.AddInfoCard(299809, [[AVALON Blueprints are lootable items from special enemies and locations. It must be cloned to a AVALON Schematic to use this item for further limited crafting purposes.]])
rem.AddInfoCard(299810, "AVALON Schematic")
rem.AddInfoCard(299811, [[AVALON Schematics are limited cloned AVALON Blueprints which are usable for weapon crafting and trading purposes.]])
+rem.AddInfoCard(299812, "NEMESIS Blueprint")
+rem.AddInfoCard(299813, [[NEMESIS Blueprints are lootable items from special enemies and locations. It must be cloned to a NEMESIS Schematic to use this item for further limited crafting purposes.]])
+rem.AddInfoCard(299814, "NEMESIS Schematic")
+rem.AddInfoCard(299815, [[NEMESIS Schematics are limited cloned NEMESIS Blueprints which are usable for weapon crafting and trading purposes.]])
-- Infocards Solars