[MIRROR] Space Traffic Update, Cleanup, & KHI Removal (#9600)

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>

code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm

@@ -210,7 +210,6 @@
 /obj/item/ammo_casing/microbattery
 	name = "\'NSCW\' microbattery - UNKNOWN"
 	desc = "A miniature battery for an energy weapon."
-	catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus)
 	icon = 'icons/obj/ammo_vr.dmi'
 	icon_state = "nsfw_batt"
 	slot_flags = SLOT_BELT | SLOT_EARS

code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm

@@ -1,7 +1,7 @@
 // The Gun //
 /obj/item/gun/projectile/cell_loaded/medical
 	name = "cell-loaded medigun"
-	desc = "The ML-3 'Medigun', or ML3M for short, is a powerful cell-based ranged healing device based on the KHI-102b NSFW. \
+	desc = "The ML-3 'Medigun', or ML3M for short, is a powerful cell-based ranged healing device based on the Hephaestus 102b NSFW. \
 	It uses an internal nanite fabricator, powered and controlled by discrete cells, to deliver a variety of effects at range. Up to six combinations of \
 	healing beams can be configured at once, depending on cartridge used. Ammo not included."
 	catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med)
@@ -15,7 +15,7 @@
 
 /obj/item/gun/projectile/cell_loaded/medical/cmo
 	name = "advanced cell-loaded medigun"
-	desc = "This is a variation on the ML-3 'Medigun', a powerful cell-based ranged healing device based on the KHI-102b NSFW. \
+	desc = "This is a variation on the ML-3 'Medigun', a powerful cell-based ranged healing device based on the Hephaestus 102b NSFW. \
 	It has an extended sight for increased accuracy, and much more comfortable grip. Ammo not included."
 
 	icon_state = "ml3m_cmo"

code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm

@@ -1,17 +1,16 @@
 // The Gun //
 /obj/item/gun/projectile/cell_loaded/combat
 	name = "cell-loaded revolver"
-	desc = "Variety is the spice of life! The HI-102b 'Nanotech Selectable-Cell Weapon', or NSCW for short, is an unholy hybrid of an ammo-driven  \
+	desc = "Variety is the spice of life! The Hephaestus 102b 'Nanotech Selectable-Fire Weapon', or NSFW for short, is an unholy hybrid of an ammo-driven  \
 	energy weapon that allows the user to mix and match their own fire modes. Up to four combinations of \
 	energy beams can be configured at once. Ammo not included."
-	catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus)
 
-	description_fluff = "The Hephaestus 'Nanotech Selectable Cell Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding."
+	description_fluff = "The Hephaestus 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding."
 	allowed_magazines = list(/obj/item/ammo_magazine/cell_mag/combat)
 
 /obj/item/gun/projectile/cell_loaded/combat/prototype
 	name = "prototype cell-loaded revolver"
-	desc = "Variety is the spice of life! A prototype based on HI-102b 'Nanotech Selectable-Cell Weapon', or NSCW for short, is an unholy hybrid of an ammo-driven  \
+	desc = "Variety is the spice of life! A prototype based on Hephaestus 102b 'Nanotech Selectable-Fire Weapon', or NSFW for short, is an unholy hybrid of an ammo-driven  \
 	energy weapon that allows the user to mix and match their own fire modes. Up to two combinations of \
 	energy beams can be configured at once. Ammo not included."
 
@@ -29,7 +28,6 @@
 	icon_state = "nsfw_mag"
 	max_ammo = 4
 	x_offset = 4
-	catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus)
 	description_info = "This magazine holds NSCW microbatteries to power the NSCW handgun. Up to three can be loaded at once, and each provides four shots of their respective energy type. Loading multiple of the same type will provide additional shots of that type. The batteries can be recharged in a normal recharger."
 	ammo_type = /obj/item/ammo_casing/microbattery/combat
 
@@ -44,7 +42,7 @@
 
 // The Pack //
 /obj/item/storage/secure/briefcase/nsfw_pack
-	name = "\improper HI-102b \'NSCW\' gun kit"
+	name = "\improper Hephaestus 102b \'NSFW\' gun kit"
 	desc = "A storage case for a multi-purpose handgun. Variety hour!"
 	w_class = ITEMSIZE_NORMAL
 	max_w_class = ITEMSIZE_NORMAL
@@ -58,7 +56,7 @@
 		new path(src)
 
 /obj/item/storage/secure/briefcase/nsfw_pack_hos
-	name = "\improper HI-102b \'NSCW\' gun kit"
+	name = "\improper Hephaestus 102b \'NSFW\' gun kit"
 	desc = "A storage case for a multi-purpose handgun. Variety hour!"
 	w_class = ITEMSIZE_NORMAL
 	max_w_class = ITEMSIZE_NORMAL

code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm

@@ -2,7 +2,6 @@
 /obj/item/ammo_casing/microbattery/combat
 	name = "\'NSCW\' microbattery - UNKNOWN"
 	desc = "A miniature battery for an energy weapon."
-	catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus)
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 1, TECH_MAGNET = 2)
 
 /obj/item/ammo_casing/microbattery/combat/lethal

code/modules/projectiles/guns/magnetic/magnetic_railgun_vr.dm

@@ -1,12 +0,0 @@
-/obj/item/gun/magnetic/railgun/flechette/pistol/khi
-	name = "kitsuhana flechette pistol"
-	desc = "This rail pistol appears to have been 'tampered with', improving it's power storage and efficiency."
-	move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
-
-	cell = /obj/item/cell/hyper
-	capacitor = /obj/item/stock_parts/capacitor/hyper
-	
-	projectile_type = /obj/item/projectile/bullet/magnetic/flechette/small/khi
-
-	load_type = /obj/item/magnetic_ammo/pistol/khi
-	loaded = /obj/item/magnetic_ammo/pistol/khi