space traffic updates

code/game/objects/items/weapons/storage/firstaid_vr.dm

@@ -235,7 +235,7 @@
 	starts_with = list(/obj/item/reagent_containers/pill/healing_nanites = 14)
 
 /obj/item/storage/pill_bottle/sleevingcure
-	name = "pill bottle (Vey-Med Cure)"
+	name = "pill bottle (resleeving sickness cure)"
 	desc = "A rare cure provided by Vey-Medical that helps counteract negative side effects of using imperfect resleeving machinery."
 	starts_with = list(/obj/item/reagent_containers/pill/sleevingcure = 7)
 
@@ -250,7 +250,7 @@
 	can_hold = list(/obj/item/reagent_containers/pill)
 
 /obj/item/storage/mrebag/pill/sleevingcure
-	name = "vacuum-sealed pill (Vey-Med Cure)"
+	name = "vacuum-sealed pill (resleeving sickness cure)"
 	desc = "A small vacuum-sealed package containing a singular pill. For emergencies only."
 	starts_with = list(/obj/item/reagent_containers/pill/sleevingcure)
 

code/modules/busy_space/organizations_vr.dm

@@ -611,60 +611,6 @@
 						"the USDF Naval Academy on Earth",
 						"Fort Rain on Tal")
 
-/datum/lore/organization/gov/kitsuhana
-	name = "Kitsuhana Heavy Industries"
-	short_name = "Kitsuhana"
-	desc = "A large post-scarcity amalgamation of races, Kitsuhana is no longer a company but rather a loose association of 'members' \
-			who only share the KHI name and their ideals in common. Kitsuhana accepts interviews to join their ranks, and though they have no \
-			formal structure with regards to government or law, the concept of 'consent' drives most of the large decision making. Kitsuhanans \
-			pride themselves on their ability to avoid consequence, essentially preferring to live care-free lives. Their post-scarcity allows \
-			them to rebuild, regrow, and replenish almost any lost asset or resource nearly instantly. It leads to many of the Kitsuhana \
-			'members' treating everything with frivolity and lends them a care-free demeanor."
-	history = "Originally a heavy industrial equipment and space mining company. During a forced evacuation of their homeworld, \
-			they were they only organization with enough ship capacity to relocate any significant portion of the population, starting with \
-			their own employees. After the resulting slowship travel to nearby starsystems, most of the population decided to keep the moniker \
-			of the company name. Over the years, Kitsuhana developed into a post-scarcity anarchy where virtually nothing has consequences and \
-			Kitsuhana 'members' can live their lives as they see fit, often in isolation."
-	work = "utopian anarchy"
-	headquarters = "Kitsuhana Prime"
-	motto = "Do what you want. We know we will."
-
-	//Culture ship names!
-	ship_prefixes = list("KHI" = "personal") //Everybody's out for themselves, yanno.
-	ship_names = list("Nervous Energy",
-						"Prosthetic Conscience",
-						"Revisionist",
-						"Trade Surplus",
-						"Flexible Demeanour",
-						"Just Read The Instructions",
-						"Limiting Factor",
-						"Cargo Cult",
-						"Gunboat Diplomat",
-						"A Ship With A View",
-						"Cantankerous",
-						"I Thought He Was With You",
-						"Never Talk To Strangers",
-						"Sacrificial Victim",
-						"Unwitting Accomplice",
-						"Bad For Business",
-						"Just Testing",
-						"Size Isn't Everything",
-						"Yawning Angel",
-						"Liveware Problem",
-						"Very Little Gravitas Indeed",
-						"Zero Gravitas",
-						"Gravitas Free Zone",
-						"Absolutely No You-Know-What")
-	destination_names = list("Kitsuhana Prime",
-						"Kitsuhana Beta",
-						"Kitsuhana Gamma",
-						"the Kitsuhana Forge",
-						"a Kitsuhanan's home",
-						"a Kitsuhana ringworld in Pleis Ceti V",
-						"a Kitsuhana ringworld in Lund VI",
-						"a Kitsuhana ringworld in Dais IX",
-						"a Kitsuhana ringworld in Leibert II-b")
-
 /datum/lore/organization/gov/ares
 	name = "Ares Confederation"
 	short_name = "ArCon"
@@ -739,21 +685,21 @@
 						"New Berlin on Nov-Ferrum",
 						"a settlement needing our help",
 						"Forward Base Sigma-Alpha in ArCon space")
-						
+
 /datum/lore/organization/gov/elysian
-	name = "The Elysian Colonies"				
+	name = "The Elysian Colonies"
 	short_name = "Demi-Monde"
-	acronym = "ECS"			
+	acronym = "ECS"
 	desc = "The Elysian Colonies, located spinwards from the Commonwealth, are a disunited bunch of \
 				vanity states, utopia projects and personal autocracies, whose only unifying characteristic is \
 				a general disregard of 'normal' social conventions of Humanity as well as their inherent desire \
 				to keep to their ways, in which cases they do sometimes unite to fight off an outside threat. \
 				The Elysian Colonies are one of the few places where true slavery is not only accepted, but sadly also \
-				rather commonplace if you go to the wrong worlds. Not that they don't internally have at least a dozen would-be liberators."			
-	history = ""			
-	work = "fracturous vanity colonies"				
-	headquarters = ""		
-	motto = ""				
+				rather commonplace if you go to the wrong worlds. Not that they don't internally have at least a dozen would-be liberators."
+	history = ""
+	work = "fracturous vanity colonies"
+	headquarters = ""
+	motto = ""
 
 	ship_prefixes = list("ECS" = "military", "ECS" = "Transport", "ECS" = "Special Transport", "ECS" = "Diplomat")	//The Special Transport is SLAAAAVES.
 	ship_names = list("Bring Me Wine!",
@@ -779,7 +725,7 @@
 					"There Is a Character Limit?",
 					"Slave Galley I",
 					"The Unconquered CCXXII"
-		
+
 		)
 	destination_names = list("Cygnus",
 									"The Ultra Dome of Brutal Kill Death",
@@ -793,22 +739,22 @@
 									"a liberation intervention",
 									"a nav bouy within Cygnus Space",
 									"a Elysian only refuel outpost",
-									"to a killer party the Fredperor is holding right now")	
-				
-				
+									"to a killer party the Fredperor is holding right now")
+
+
 /datum/lore/organization/gov/fyrds
-	name = "Unitary Alliance of Salthan Fyrds"				
-	short_name = "Fyrds"			
-	acronym = "SMS"			
+	name = "Unitary Alliance of Salthan Fyrds"
+	short_name = "Fyrds"
+	acronym = "SMS"
 	desc = "Born out of neglect, the Salthan Fyrds are cast-off colonies of the Commonwealth after giving up on \
 				pacifying the wartorn region and fighting off the stray Unathi Raiders after the Hegemony War. \
 				In the end they self-organized into military pacts and have formed a militaristic society, in which \
 				every person, be it organic or robot, is a soldier for the continued cause in serving as aegis against \
-				another Unathi Incursion. They are very no-nonsense."				
-	history = ""			
-	work = "human stratocracy"				
-	headquarters = "The Pact,Myria"		
-	motto = ""				
+				another Unathi Incursion. They are very no-nonsense."
+	history = ""
+	work = "human stratocracy"
+	headquarters = "The Pact,Myria"
+	motto = ""
 
 	ship_prefixes = list("SMS" = "Military")	 // The Salthans don't do anything else.
 	ship_names = list("Yi Sun-sin",
@@ -836,4 +782,4 @@
 									"Base Epsilon-Epsilon",
 									"Base Xray-Beta",
 									"Base Gamma-Delta",
-									"Base Yotta-Epsilon")	
+									"Base Yotta-Epsilon")

code/modules/busy_space_vr/organizations.dm

@@ -1822,51 +1822,6 @@
 			"a Chimera research lab"
 			)
 
-/datum/lore/organization/tsc/kitsuhana	//reassigned category
-	name = "Kitsuhana Heavy Industries"
-	short_name = "KHI"
-	desc = "Data pending replacement, please stand by!"
-	history = "Data pending replacement, please stand by!"
-	work = "data pending"
-	headquarters = "Kitsuhana Prime"
-	motto = "Data pending."
-
-	org_type = "neutral"	//in lieu of coming up with mottos, for now
-	//Culture ship names!
-	ship_prefixes = list("KHT" = "transport", "KHI" = "general operations")
-	append_ship_names = TRUE
-	added_ship_names = list(
-			"Nervous Energy",
-			"Prosthetic Conscience",
-			"Revisionist",
-			"Trade Surplus",
-			"Flexible Demeanour",
-			"Just Read The Instructions",
-			"Limiting Factor",
-			"Cargo Cult",
-			"Gunboat Diplomat",
-			"A Ship With A View",
-			"Cantankerous",
-			"I Thought He Was With You",
-			"Never Talk To Strangers",
-			"Sacrificial Victim",
-			"Unwitting Accomplice",
-			"Bad For Business",
-			"Just Testing",
-			"Size Isn't Everything",
-			"Yawning Angel",
-			"Liveware Problem",
-			"Very Little Gravitas Indeed",
-			"Zero Gravitas",
-			"Gravitas Free Zone",
-			"Absolutely No You-Know-What"
-			)
-	destination_names = list(
-			"the Kitsuhana Forge",
-			"a KHI supply depot",
-			"a KHI industrial complex"
-			)
-
 //////////////////////////////////////////////////////////////////////////////////
 
 // Other

code/modules/catalogue/catalogue_data.dm

@@ -351,10 +351,6 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new)
 	name = "TSC - Major Bill's Transportation"
 	datum_to_copy = /datum/lore/organization/tsc/mbt
 
-/datum/category_item/catalogue/information/organization/khi
-	name = "TSC - Kitsuhana Heavy Industries"
-	datum_to_copy = /datum/lore/organization/tsc/kitsuhana
-
 /datum/category_item/catalogue/information/organization/commonwealth //VS EDIT 1
 	name = "Government - Commonwealth of Sol-Procyon" //VS EDIT 2
 	datum_to_copy = /datum/lore/organization/gov/commonwealth //VS EDIT 3

code/modules/looking_glass/lg_console.dm

@@ -1,6 +1,6 @@
 /obj/machinery/computer/looking_glass
 	name = "looking glass control"
-	desc = "Controls the looking glass displays in this room. Provided courtesy of Morpheus."
+	desc = "Controls the looking glass displays in this room. Provided courtesy of NT's Advanced Spatial Imaging Division."
 
 	icon_keyboard = "tech_key"
 	icon_screen = "holocontrol"

code/modules/nifsoft/nif.dm

@@ -15,7 +15,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
 //Nanotech Implant Foundation
 /obj/item/nif
 	name = "nanite implant framework"
-	desc = "A mass-production model of a KHI nano working surface, in a box. Can print new \
+	desc = "A mass-production model of a nano working surface, in a box. Can print new \
 	implants inside living hosts on the fly based on software uploads. Must be surgically \
 	implanted in the head to work, and requires periodical maintenance. Warning: this device \
 	is extremely sensitive to electromagnetic pulse waves."
@@ -626,8 +626,8 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
 	starting_software = null
 
 /obj/item/nif/authentic
-	name = "\improper KHI NIF"
-	desc = "An actual KHI working surface, in a box. These are the high-end models, usually only available to big spenders and those with serious contacts. \
+	name = "luxury NIF"
+	desc = "An actual nano working surface, in a box. These are the high-end models, usually only available to big spenders and those with serious contacts. \
 	Despite the all the marketing speak, they're really just a high-endurance NIF when it comes down to it."
 	durability = 1000
 

code/modules/projectiles/ammunition/magnetic.dm

@@ -17,9 +17,3 @@
 	name = "flechette magazine (small)"
 	desc = "A magazine containing smaller steel flechettes, intended for a pistol."
 	icon_state = "caseless-mag-short"
-
-/obj/item/magnetic_ammo/pistol/khi
-	name = "flechette magazine (small, khi)"
-	desc = "A magazine containing smaller carbyne flechettes, intended for a pistol."
-	icon_state = "caseless-mag-short-alt"
-	remaining = 12

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

@@ -1,11 +0,0 @@
-/obj/item/gun/magnetic/railgun/flechette/pistol/khi
-	name = "morpheus flechette pistol"
-	desc = "This rail pistol appears to have been 'tampered with', improving it's power storage and efficiency."
-
-	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

code/modules/projectiles/projectile/magnetic.dm

@@ -33,15 +33,6 @@
 	armor_penetration = 100
 	hud_state = "alloy_spike"
 
-/obj/item/projectile/bullet/magnetic/flechette/small/khi
-	name = "small carbyne flechette"
-	icon_state = "flechette"
-	fire_sound = 'sound/weapons/rapidslice.ogg'
-	damage = 18
-	armor_penetration = 100
-	penetrating = 10
-	hud_state = "alloy_spike"
-
 /obj/item/projectile/bullet/magnetic/flechette/hunting
 	name = "shredder slug"
 	armor_penetration = 30

code/modules/reagents/reagents/medicine_vr.dm

@@ -81,7 +81,7 @@
 /datum/reagent/sleevingcure
 	name = "Resleeving Sickness Cure"
 	id = "sleevingcure"
-	description = "A rare cure provided by Vey-Med that helps counteract negative side effects of using imperfect resleeving machinery."
+	description = "A rare medication provided by Vey-Med that helps counteract negative side effects of using imperfect resleeving machinery."
 	taste_description = "chocolate peanut butter"
 	taste_mult = 2
 	reagent_state = LIQUID
@@ -98,7 +98,7 @@
 /datum/reagent/prussian_blue //We don't have iodine, so prussian blue we go.
 	name = "Prussian Blue"
 	id = "prussian_blue"
-	description = "Prussian Blue is an medication used to temporarily pause the effects of radiation poisoning to allow for treatment. Does not treat radiation sickness on its own."
+	description = "Prussian Blue is a medication used to temporarily pause the effects of radiation poisoning to allow for treatment. Does not treat radiation sickness on its own."
 	taste_description = "salt"
 	reagent_state = SOLID
 	color = "#003153" //Blue!

code/modules/vore/fluffstuff/custom_clothes_vr.dm

@@ -817,22 +817,6 @@
 		if(H.head == src)
 			H.update_inv_head()
 
-/obj/item/rig/light/hacker/fluff/aronai
-	name = "KHI-99-AAR suit module"
-	suit_type = "nano"
-	desc = "A thin collapsable spacesuit for synths from Kitsuhana Heavy Industries."
-	airtight = 1 //Not because it should be airtight but because suit coolers don't work w/o it.
-	armor = list(melee = 25, bullet = 15, laser = 15, energy = 60, bomb = 30, bio = 70, rad = 100)
-	air_type = null //No O2 tank, why would it have one?
-
-	cell_type =  /obj/item/cell/hyper
-	req_access = list(access_medical)
-
-	initial_modules = list(
-		/obj/item/rig_module/maneuvering_jets,
-		/obj/item/rig_module/teleporter
-		)
-
 //Viveret:Keturah
 /obj/item/clothing/under/dress/maid
 	name = "Maid Outfit"
@@ -921,43 +905,43 @@
 	icon_state = "khi_uniform"
 
 /obj/item/clothing/under/rank/khi/cmd //Command version
-	name = "KHI command suit"
+	name = "sleek command suit"
 	desc = "A sleek, neocorporate style uniform. An extra-comfortable command one, at that."
 	icon_state = "khi_uniform_cmd"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/rank/khi/sec //Security version
-	name = "KHI security suit"
+	name = "sleek security suit"
 	desc = "A sleek, neocorporate style uniform. This one has angry red security stripes. Keepin' the peace in style."
 	icon_state = "khi_uniform_sec"
 	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/rank/khi/med //Medical version
-	name = "KHI medical suit"
+	name = "sleek medical suit"
 	desc = "A sleek, neocorporate style uniform. The medical version. Why not just get a new body, anyway?"
 	icon_state = "khi_uniform_med"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/khi/eng //Engineering version
-	name = "KHI engineering suit"
-	desc = "A sleek, neocorporate style uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time."
+	name = "sleek engineering suit"
+	desc = "A sleek, neocorporate style uniform. One fit for an engineer, by the looks of it."
 	icon_state = "khi_uniform_eng"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
 
 /obj/item/clothing/under/rank/khi/sci //Science version
-	name = "KHI science suit"
-	desc = "A sleek, neocorporate style uniform. For performing science in, based on the color! Only SCIENCE can save us now."
+	name = "sleek science suit"
+	desc = "A sleek, neocorporate style uniform. For performing science in, based on the color!"
 	icon_state = "khi_uniform_sci"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
 
 /obj/item/clothing/under/rank/khi/crg //Cargo version
-	name = "KHI cargo suit"
+	name = "sleek cargo suit"
 	desc = "A sleek, neocorporate style uniform. Looks like it's in supply and cargo division colors. Heavy industry means heavy lifting, after all."
 	icon_state = "khi_uniform_crg"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/rank/khi/civ //Science version
-	name = "KHI civilian suit"
+	name = "sleek civilian suit"
 	desc = "A sleek, neocorporate style uniform. Snazzy silver trim marks this is as the general civilian branch. Smells like paperwork and bureaucracy."
 	icon_state = "khi_uniform_civ"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)