diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_bluecrystal.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_bluecrystal.3db
new file mode 100644
index 00000000..cabc69ef
Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_bluecrystal.3db differ
diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_cyancrystal.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_cyancrystal.3db
new file mode 100644
index 00000000..5b3a7256
Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_cyancrystal.3db differ
diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_greencrystal.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_greencrystal.3db
new file mode 100644
index 00000000..422f8d1d
Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_greencrystal.3db differ
diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_orangecrystal.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_orangecrystal.3db
new file mode 100644
index 00000000..2cac5130
Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_orangecrystal.3db differ
diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_purplecrystal.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_purplecrystal.3db
new file mode 100644
index 00000000..1b780d9c
Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_purplecrystal.3db differ
diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_redcrystal.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_redcrystal.3db
new file mode 100644
index 00000000..228b8406
Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_redcrystal.3db differ
diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_yellowcrystal.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_yellowcrystal.3db
new file mode 100644
index 00000000..0856ddf7
Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/commod_yellowcrystal.3db differ
diff --git a/DATA/EQUIPMENT/goods.ini b/DATA/EQUIPMENT/goods.ini
index c1e60580..57d455fc 100644
--- a/DATA/EQUIPMENT/goods.ini
+++ b/DATA/EQUIPMENT/goods.ini
@@ -127,6 +127,128 @@ item_icon = Equipment\models\commodities\nn_icons\commod_viridian.3db
 jump_dist = 2
 
 
+; Weapon Crystals
+
+; Blue Crystal
+
+[Good]
+nickname = commodity_bluecrystal
+equipment = commodity_bluecrystal
+msg_id_prefix = gcs_gen_commodity_bluecrystal
+category = commodity
+price = 15000
+combinable = true
+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_bluecrystal.3db
+jump_dist = 2
+
+; Yellow Crystal
+
+[Good]
+nickname = commodity_yellowcrystal
+equipment = commodity_yellowcrystal
+msg_id_prefix = gcs_gen_commodity_yellowcrystal
+category = commodity
+price = 15000
+combinable = true
+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_yellowcrystal.3db
+jump_dist = 2
+
+; Purple Crystal
+
+[Good]
+nickname = commodity_purplecrystal
+equipment = commodity_purplecrystal
+msg_id_prefix = gcs_gen_commodity_purplecrystal
+category = commodity
+price = 15000
+combinable = true
+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_purplecrystal.3db
+jump_dist = 2
+
+; Red Crystal
+
+[Good]
+nickname = commodity_redcrystal
+equipment = commodity_redcrystal
+msg_id_prefix = gcs_gen_commodity_redcrystal
+category = commodity
+price = 15000
+combinable = true
+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_redcrystal.3db
+jump_dist = 2
+
+; Orange Crystal
+
+[Good]
+nickname = commodity_orangecrystal
+equipment = commodity_orangecrystal
+msg_id_prefix = gcs_gen_commodity_orangecrystal
+category = commodity
+price = 15000
+combinable = true
+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_orangecrystal.3db
+jump_dist = 2
+
+; Green Crystal
+
+[Good]
+nickname = commodity_greencrystal
+equipment = commodity_greencrystal
+msg_id_prefix = gcs_gen_commodity_greencrystal
+category = commodity
+price = 15000
+combinable = true
+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_greencrystal.3db
+jump_dist = 2
+
+; Cyan Crystal
+
+[Good]
+nickname = commodity_cyancrystal
+equipment = commodity_cyancrystal
+msg_id_prefix = gcs_gen_commodity_cyancrystal
+category = commodity
+price = 15000
+combinable = true
+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_cyancrystal.3db
+jump_dist = 2
+
+
 ; Vips
 
 [Good]
diff --git a/DATA/EQUIPMENT/select_equip.ini b/DATA/EQUIPMENT/select_equip.ini
index 520b6ab8..99632d66 100644
--- a/DATA/EQUIPMENT/select_equip.ini
+++ b/DATA/EQUIPMENT/select_equip.ini
@@ -496,6 +496,7 @@ decay_per_second = 0
 volume = 0
 hit_pts = 250
 
+
 ; Dust Materials
 
 ; Azurite
@@ -511,6 +512,7 @@ decay_per_second = 0
 volume = 1
 hit_pts = 250
 
+
 ; Citrine
 
 [Commodity]
@@ -524,6 +526,7 @@ decay_per_second = 0
 volume = 1
 hit_pts = 250
 
+
 ; Morganite
 
 [Commodity]
@@ -537,6 +540,7 @@ decay_per_second = 0
 volume = 1
 hit_pts = 250
 
+
 ; Obsidian
 
 [Commodity]
@@ -550,6 +554,7 @@ decay_per_second = 0
 volume = 1
 hit_pts = 250
 
+
 ; Pyrope
 
 [Commodity]
@@ -563,6 +568,7 @@ decay_per_second = 0
 volume = 1
 hit_pts = 250
 
+
 ; Viridian
 
 [Commodity]
@@ -576,6 +582,104 @@ decay_per_second = 0
 volume = 1
 hit_pts = 250
 
+; Weapon Crystals
+
+; Blue Crystal
+
+[Commodity]
+nickname = commodity_bluecrystal
+ids_name = 222000
+ids_info = 221890
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+
+; Yellow Crystal
+
+[Commodity]
+nickname = commodity_yellowcrystal
+ids_name = 222001
+ids_info = 221891
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+
+; Purple Crystal
+
+[Commodity]
+nickname = commodity_purplecrystal
+ids_name = 222002
+ids_info = 221892
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+
+; Red Crystal
+
+[Commodity]
+nickname = commodity_redcrystal
+ids_name = 222003
+ids_info = 221893
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+
+; Orange Crystal
+
+[Commodity]
+nickname = commodity_orangecrystal
+ids_name = 222004
+ids_info = 221894
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+
+; Green Crystal
+
+[Commodity]
+nickname = commodity_greencrystal
+ids_name = 222005
+ids_info = 221895
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250
+
+
+; Cyan Crystal
+
+[Commodity]
+nickname = commodity_cyancrystal
+ids_name = 222006
+ids_info = 221896
+units_per_container = 1
+pod_appearance = cargopod_drab
+loot_appearance = lootcrate_drab
+decay_per_second = 0
+volume = 1
+hit_pts = 250