traffic update

more khi cleanup

code/game/gamemodes/technomancer/catalog.dm

@@ -51,8 +51,8 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance
 //VOREStation Add
 /obj/item/technomancer_catalog/universal
 	name = "universal catalog"
-	desc = "A catalog to be used with the KHI 'Universal Core', shamelessly \
-	copied by a Kitsuhana designer from some group of 'technomancers' or another.<br>\
+	desc = "A catalog to be used with the Morpheus 'Universal Core', shamelessly \
+	copied by an unknown designer from some group of 'technomancers' or another.<br>\
 	The back of the book has " + span_italics("'Export Edition'") + " stamped on it."
 	budget = 700
 	max_budget = 700

code/game/gamemodes/technomancer/core_obj.dm

@@ -357,7 +357,7 @@
 /obj/item/technomancer_core/universal
 	name = "universal core"
 	desc = "A bewilderingly complex 'black box' that allows the wearer to accomplish amazing feats. \
-	This one is a copy of a 'technomancer' core, shamelessly ripped off by a Kitsuhana pattern designer \
+	This one is a copy of a 'technomancer' core, shamelessly ripped off by an unknown pattern designer \
 	for fun, so that he could perform impressive 'magic'. The pack sloshes slightly if you shake it.<br>\
 	Under the straps, <i>'Export Edition'</i> is printed."
 	energy = 7000

code/game/objects/effects/decals/posters/voreposters_vr.dm

@@ -5,7 +5,7 @@
 /decl/poster/lewd/vore_2
 	icon_state = "sbsposter2"
 	name = "AroButt"
-	desc = "A lewd view of KHI's cutest fops."
+	desc = "A lewd view of one of the galaxy's cutest fops."
 /decl/poster/vore_3
 	icon_state = "sbsposter3"
 	name = "Poster This Dog"

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

@@ -234,8 +234,8 @@
 	starts_with = list(/obj/item/reagent_containers/pill/healing_nanites = 14)
 
 /obj/item/storage/pill_bottle/sleevingcure
-	name = "pill bottle (Kitsuhanan Cure)"
-	desc = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery."
+	name = "pill bottle (Vey-Med 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)
 
 /obj/item/storage/pill_bottle/sleevingcure/full
@@ -249,7 +249,7 @@
 	can_hold = list(/obj/item/reagent_containers/pill)
 
 /obj/item/storage/mrebag/pill/sleevingcure
-	name = "vacuum-sealed pill (Kitsuhanan Cure)"
+	name = "vacuum-sealed pill (Vey-Med 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_vr/air_traffic.dm

@@ -99,10 +99,12 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 	//to_world("DEBUG OUTPUT 3: Chose [chatter_type]")
 	//DEBUG BLOCK ENDS
 
-	var/combined_first_name = "[prefix] [firstid] |[shipname]|"
-	var/comm_first_name = "[comm_first_name]"
+	var/combined_first_name = "[prefix] [firstid] |[shipname]|"	//formal traffic control identifier for use in messages
+	var/short_first_name = "[prefix] |[shipname]|"	//special variant for certain events
+	var/comm_first_name = "[owner] [shipname]"	//corpname + shipname for speaker identity in log
 	var/combined_second_name = "[secondprefix] [secondid] |[secondshipname]|"
-	var/comm_second_name = "[secondowner] [shipname]"
+	var/comm_second_name = "[secondowner] [secondshipname]"
+	var/short_second_name = "[secondprefix] |[secondshipname]|"
 
 	var/mission_noun = pick(source.flight_types)		//pull from a list of owner-specific flight ops, to allow an extra dash of flavor
 	if(source.complex_tasks)				//if our source has the complex_tasks flag, regenerate with a two-stage assignment
@@ -137,7 +139,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 		chatter_type = "policeflee"
 	else if(org_type == "smuggler" && org_type2 == "system defense") //ditto, if an SDF ship catches them
 		chatter_type = "policeshipflee"
-	else if((org_type == "smuggler" || org_type == "pirate") && org_type2 == "system defense") //if we roll this combo instead, time for the SDF to do their fucking job
+	else if((org_type == "smuggler" || org_type == "pirate") && (org_type2 == "system defense" || org_type2 == "military")) //if we roll this combo instead, time for the SDF or Mercs to do their fucking jobs
 		chatter_type = "policeshipcombat"
 	else if((org_type == "smuggler" || org_type == "pirate") && org_type2 != "system defense") //but if we roll THIS combo, time to alert the SDF to get off their asses
 		chatter_type = "hostiledetected"
@@ -190,7 +192,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 		//mayday call
 		if("emerg")
 			var/problem = pick("We have hull breaches on multiple decks","We have unknown hostile life forms on board","Our primary drive is failing","We have [pick("asteroids","space debris")] impacting the hull","We're experiencing a total loss of engine power","We have hostile ships closing fast","There's smoke [pick("in the cockpit","on the bridge")]","We have unidentified boarders","Our reaction control system is malfunctioning and we're losing stability","Our life support [pick("is failing","has failed")]")
-			msg("+Mayday, mayday, mayday!+ [combined_first_name], declaring an emergency! [problem]!","[comm_first_name]")
+			msg("+[pick("Mayday, mayday, mayday!","Mayday, mayday!","Mayday! Mayday!")]+ [combined_first_name], declaring an emergency! [problem]!","[comm_first_name]")
 			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[combined_first_name], [callname]. Switch to emergency responder channel [ertchannel].")
 			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
@@ -311,7 +313,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 			var/orders = pick("Engage on sight","Engage with caution","Engage with extreme prejudice","Engage at will","Search and destroy","Bring them in alive, if possible","Interdict and detain","Keep your eyes peeled","Bring them in, dead or alive","Stay alert")
 			msg("This is [using_map.starsys_name] Defense Control to all SDF assets. Priority update follows.","[using_map.starsys_name] Defense Control")
 			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
-			msg("Be on the lookout for [combined_first_name], last sighted [pick("near route","in sector","near sector")] [rand(1,100)]. [orders]. DefCon, out.","[using_map.starsys_name] Defense Control")
+			msg("Be on the lookout for [short_first_name], last sighted [pick("near route","in sector","near sector")] [rand(1,100)]. [orders]. DefCon, out.","[using_map.starsys_name] Defense Control")
 		//Ship event: distress call, under attack
 		if("distress")
 			var/state = pick(66;"calm",34;"panic")
@@ -334,7 +336,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 					msg("[pick("Copy that","Understood")] [using_map.starsys_name] Defense Control, switching now!","[comm_first_name]")
 		//Control event: travel advisory
 		if("traveladvisory")
-			var/flightwarning = pick("Solar flare activity is spiking and expected to cause issues along main flight lanes [rand(1,33)], [rand(34,67)], and [rand(68,100)]","Pirate activity is on the rise, stay close to System Defense vessels","We're seeing a rise in illegal salvage operations, please report any unusual activity to the nearest SDF vessel via channel [sdfchannel]","A quarantined [pick("fleet","convoy")] is passing through the system along route [rand(1,100)], please observe minimum safe distance","A prison [pick("fleet","convoy")] is passing through the system along route [rand(1,100)], please observe minimum safe distance","Traffic volume is higher than normal, expect processing delays","Anomalous bluespace activity detected [pick("along route [rand(1,100)]","in sector [rand(1,100)]")], exercise caution","Smugglers have been particularly active lately, expect increased security scans","Depots are currently experiencing a fuel shortage, expect delays and higher rates","Asteroid mining has displaced debris dangerously close to main flight lanes on route [rand(1,100)], watch for potential impactors","A [pick("fuel tanker","cargo liner","passenger liner","freighter","transport ship","mining barge","salvage trawler")] has collided with [pick("a fuel tanker","a cargo liner","a passenger liner","a freighter","a transport ship","a mining barge","a salvage trawler","a meteoroid","a cluster of space debris","an asteroid","an ice-rich comet")] near route [rand(1,100)], watch for debris and do not impede emergency service vessels","A [pick("fuel tanker","cargo liner","passenger liner","freighter","transport ship","mining barge","salvage trawler")] on route [rand(1,100)] has experienced total engine failure. Emergency response teams are en route, please observe minimum safe distances and do not impede emergency service vessels","Transit routes have been recalculated to adjust for planetary drift. Please synch your astronav computers as soon as possible to avoid delays and difficulties","[pick("Bounty hunters","System Defense officers","Mercenaries")] are currently searching for a wanted fugitive, report any sightings of suspicious activity to System Defense via channel [sdfchannel]",10;"It's space [pick("carp","shark")] breeding season. [pick("Stars","Skies","Gods","God","Goddess","Fates")] have mercy on you all","We're reading [pick("void","drive","sensor")] echoes that are consistent with illegal cloaking devices")
+			var/flightwarning = pick("Solar flare activity is spiking and expected to cause issues along main flight lanes [rand(1,33)], [rand(34,67)], and [rand(68,100)]","Pirate activity is on the rise, stay close to System Defense vessels","We're seeing a rise in illegal salvage operations, please report any unusual activity to the nearest SDF vessel via channel [sdfchannel]","A quarantined [pick("fleet","convoy")] is passing through the system along route [rand(1,100)], please observe minimum safe distance","A prison [pick("fleet","convoy")] is passing through the system along route [rand(1,100)], please observe minimum safe distance","Traffic volume is higher than normal, expect processing delays","Anomalous bluespace activity detected [pick("along route [rand(1,100)]","in sector [rand(1,100)]")], exercise caution","Smugglers have been particularly active lately, expect increased security scans","Depots are currently experiencing a fuel shortage, expect delays and higher rates","Asteroid mining has displaced debris dangerously close to main flight lanes on route [rand(1,100)], watch for potential impactors","A [pick("fuel tanker","cargo liner","passenger liner","freighter","transport ship","mining barge","salvage trawler")] has collided with [pick("a fuel tanker","a cargo liner","a passenger liner","a freighter","a transport ship","a mining barge","a salvage trawler","a meteoroid","a cluster of space debris","an asteroid","an ice-rich comet")] near route [rand(1,100)], watch for debris and do not impede emergency service vessels","A [pick("fuel tanker","cargo liner","passenger liner","freighter","transport ship","mining barge","salvage trawler")] on route [rand(1,100)] has experienced total engine failure. Emergency response teams are en route, please observe minimum safe distances and do not impede emergency service vessels","Transit routes have been recalculated to adjust for planetary drift. Please synch your astronav computers as soon as possible to avoid delays and difficulties","[pick("Bounty hunters","System Defense officers","Mercenaries")] are currently searching for a wanted fugitive, report any sightings of suspicious activity to System Defense via channel [sdfchannel]",10;"It's space [pick("carp","shark")] breeding season. [pick("Stars","Skies","Gods","God","Goddess","Fates")] have mercy on you all","We're reading [pick("void","drive","sensor")] echoes that are consistent with illegal cloaking devices, be alert for suspicious activity in your sector")
 			msg("[callname], all vessels in the [using_map.starsys_name] system. Priority travel advisory follows.")
 			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[flightwarning]. Control out.")
@@ -342,14 +344,14 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 		if("pathwarning")
 			var/navhazard = pick("a pocket of intense radiation","a pocket of unstable gas","a debris field","a secure installation","an active combat zone","a quarantined ship","a quarantined installation","a quarantined sector","a live-fire SDF training exercise","an ongoing Search & Rescue operation","a hazardous derelict","an intense electrical storm","an intense ion storm","a shoal of space carp","a pack of space sharks","an asteroid infested with gnat hives","a protected space ray habitat","a region with anomalous bluespace activity","a rogue comet")
 			var/confirm = pick("Understood","Roger that","Affirmative","Our bad","Thanks for the heads up")
-			msg("[combined_first_name], [callname], your [pick("ship","vessel","starship")] is approaching [navhazard], observe minimum safe distance and adjust your heading appropriately.")
+			msg("[combined_first_name], [callname]. Your [pick("ship","vessel","starship")] is approaching [navhazard], observe minimum safe distance and adjust your heading appropriately.")
 			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[confirm] [callname], adjusting course.","[comm_first_name]")
 			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("Your compliance is appreciated, [combined_first_name].")
 		//Control event: personnel report to dock
 		if("report_to_dock")
-			var/situation_type = pick("medical","security","engineering","animal control")
+			var/situation_type = pick("medical","security","engineering","animal control","hazmat")
 			msg("This is [using_map.dock_name] Tower. Would a free [situation_type] team please report to [landing_zone] immediately. This is not a drill.")
 			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*10 SECONDS)
 			msg("Repeat, any free [situation_type] team, report to [landing_zone] immediately. This is +not+ a drill.")

code/modules/busy_space_vr/organizations.dm

@@ -114,6 +114,7 @@
 			"Andiamo",
 			"Aurora",
 			"Phoenix",
+			"Wayward Phoenix",
 			"Lucky",
 			"Raven",
 			"Valkyrie",
@@ -208,8 +209,15 @@
 			"Monte Carlo",
 			"Dead Man's Hand",
 			"Icebreaker",
+			"Megalith",
+			"Picasso",
 			"Spirit of Alliance",
 			"Surrounded By Idiots",
+			"Honk If You Can Read This",
+			"Sufficient Velocity",
+			"Credible Deniability",
+			"Crucible",
+			"Tunguska",
 			"Instrument of Violence",
 			"Entropic Whisper",
 			"Cash and Prizes",
@@ -237,6 +245,7 @@
 			"Full House",
 			"Wild Card",
 			"Bonaventure",
+			"Nothing Ventured",
 			"Go West",
 			"Once Upon A Time",
 			"Bygones Be",
@@ -294,9 +303,15 @@
 			"Golden Hand",
 			"White Company",
 			"Haggler",
-			"Rendezvous"
+			"Rendezvous",
+			"Two For Flinching",
+			"Uninvited Guest",
+			"Iconoclast",
+			"Bluespace Tourist"
 			)
-	var/list/destination_names = list()	//Names of static holdings that the organization's ships visit regularly.
+	var/list/added_ship_names = list()	//List of ship names to add to the above, rather than wholesale replacing
+	var/list/destination_names = list()	//Names of static holdings that the organization's ships visit
+	var/append_ship_names = FALSE
 
 	var/org_type = "neutral"		//Valid options are "neutral", "corporate", "government", "system defense", "military, "smuggler", & "pirate"
 	var/autogenerate_destination_names = TRUE //Pad the destination lists with some extra random ones? see the proc below for info on that
@@ -306,6 +321,9 @@
 /datum/lore/organization/New()
 	..()
 
+	if(append_ship_names)
+		ship_names.Add(added_ship_names)
+
 	if(autogenerate_destination_names) // Lets pad out the destination names.
 		var/i = rand(20, 30) //significantly increased from original values due to the greater length of rounds
 
@@ -369,7 +387,7 @@
 			/* other */
 			"Vazzend","Thoth","Jahan's Post","Silk","New Singapore",
 			"Stove","Viola","Isavau's Gamble","Samsara",
-			"Vounna","Relan","Whythe","Exalt's Light",
+			"Vounna","Relan","Whythe","Exalt's Light","Van Zandt",
 			/* generic territories */
 			"deep space",
 			"Commonwealth space",
@@ -523,7 +541,8 @@
 			)
 	ship_prefixes = list("HCV" = "a general operations", "HTV" = "a freight", "HLV" = "a munitions resupply", "HDV" = "an asset protection", "HDV" = "a preemptive deployment")
 	//War God Theme, updated
-	ship_names = list(
+	append_ship_names = TRUE
+	added_ship_names = list(
 			"Anhur",
 			"Bast",
 			"Horus",
@@ -633,7 +652,8 @@
 			)
 	ship_prefixes = list("VMV" = "a general operations", "VTV" = "a transportation", "VHV" = "a medical resupply", "VSV" = "a research", "VRV" = "an emergency medical support")
 	// Diona names, mostly
-	ship_names = list(
+	append_ship_names = TRUE
+	added_ship_names = list(
 			"Wind That Stirs The Waves",
 			"Sustained Note Of Metal",
 			"Bright Flash Reflecting Off Glass",
@@ -689,7 +709,8 @@
 			)
 	ship_prefixes = list("ZHV" = "a general operations", "ZTV" = "a transportation", "ZMV" = "a medical resupply", "ZRV" = "a medical research")
 	//ship names: a selection of famous physicians who advanced the cause of medicine
-	ship_names = list(
+	append_ship_names = TRUE
+	added_ship_names = list(
 			"Averroes",
 			"Avicenna",
 			"Banting",
@@ -774,7 +795,8 @@
 			"Ward-Takahashi Electronics - keeping you in touch with the galaxy."
 			)
 	ship_prefixes = list("WTV" = "a general operations", "WTFV" = "a freight", "WTGV" = "a transport", "WTDV" = "an asset protection")
-	ship_names = list(
+	append_ship_names = TRUE
+	added_ship_names = list(
 			"Comet",
 			"Meteor",
 			"Heliosphere",
@@ -838,7 +860,8 @@
 			)
 	ship_prefixes = list("BCV" = "a general operations", "BCTV" = "a transportation", "BCSV" = "a research exchange")
 	//famous mechanical engineers
-	ship_names = list(
+	append_ship_names = TRUE
+	added_ship_names = list(
 			"Al-Jazari",
 			"Al-Muradi",
 			"Al-Zarqali",
@@ -921,7 +944,8 @@
 	*/
 	ship_prefixes = list("MCV" = "a general operations", "MTV" = "a freight", "MDV" = "a market protection", "MSV" = "an outreach")
 	//periodic elements; something 'unusual' for the posibrain TSC without being full on 'quirky' culture ship names (much as I love them, they're done to death)
-	ship_names = list(
+	append_ship_names = TRUE
+	added_ship_names = list(
 			"Hydrogen",
 			"Helium",
 			"Lithium",
@@ -1016,7 +1040,8 @@
 			)
 	ship_prefixes = list("XMV" = "a general operations", "XTV" = "a hauling", "XFV" = "a bulk transport", "XIV" = "a resupply")
 	//martian mountains
-	ship_names = list(
+	append_ship_names = TRUE
+	added_ship_names = list(
 			"Olympus Mons",
 			"Ascraeus Mons",
 			"Arsia Mons",
@@ -1077,7 +1102,8 @@
 			)
 	ship_prefixes = list("FTV" = "a general operations", "FTRP" = "a trade protection", "FTRR" = "a piracy suppression", "FTLV" = "a logistical support", "FTTV" = "a mercantile", "FTDV" = "a market establishment")
 	//famous merchants and traders, taken from Civ6's Great Merchants, plus the TSC's founder
-	ship_names = list(
+	append_ship_names = TRUE
+	added_ship_names = list(
 			"Isaac Adler",
 			"Colaeus",
 			"Marcus Licinius Crassus",
@@ -1126,7 +1152,8 @@
 			)
 	ship_prefixes = list("TTV" = "a general operations", "TTV" = "a transport", "TTV" = "a luxury transit", "TTV" = "a priority transit", "TTV" = "a secure data courier")
 	//ship names: big rivers
-	ship_names = list (
+	append_ship_names = TRUE
+	added_ship_names = list (
 			"Nile",
 			"Kagera",
 			"Nyabarongo",
@@ -1202,7 +1229,8 @@
 			)
 	ship_prefixes = list("GMV" = "a general operations", "GMT" = "a transport", "GMR" = "a resourcing", "GMS" = "a surveying", "GMH" = "a bulk transit")
 	//rocks
-	ship_names = list(
+	append_ship_names = TRUE
+	added_ship_names = list(
 			"Adakite",
 			"Andesite",
 			"Basalt",
@@ -1268,7 +1296,8 @@
 			)
 	ship_prefixes = list("AARV" = "a general operations", "AARE" = "a resource extraction", "AARG" = "a gas transport", "AART" = "a transport")
 	//weather systems/patterns
-	ship_names = list (
+	append_ship_names = TRUE
+	added_ship_names = list (
 			"Cloud",
 			"Nimbus",
 			"Fog",
@@ -1323,7 +1352,8 @@
 			)
 	ship_prefixes = list("FPV" = "a general operations", "FPH" = "a transport", "FPC" = "an energy relay", "FPT" = "a fuel transport")
 	//famous electrical engineers
-	ship_names = list (
+	append_ship_names = TRUE
+	added_ship_names = list (
 			"Erlang",
 			"Blumlein",
 			"Taylor",
@@ -1424,6 +1454,8 @@
 			"Kite",
 			"Hawk",
 			"Falcon",
+			"Hummingbird",
+			"Toucan",
 			"Caracara"
 			)
 	destination_names = list(
@@ -1626,7 +1658,8 @@
 			)
 	ship_prefixes = list("CSV" = "a salvage", "CRV" = "a recovery", "CTV" = "a transport", "CSV" = "a shipbreaking", "CHV" = "a towing")
 	//mostly-original, maybe some references, and more than a few puns
-	ship_names = list(
+	append_ship_names = TRUE
+	added_ship_names = list(
 			"Road Hog",
 			"Mine, Not Yours",
 			"Legal Salvage",
@@ -1658,6 +1691,7 @@
 			"T-Wrecks",
 			"Dust Bunny",
 			"No Gears No Glory",
+			"Two Drink Minimum",
 			"Three Drinks In",
 			"The Almighty Janitor",
 			"Wreckless Endangerment",
@@ -1701,40 +1735,44 @@
 	ship_prefixes = list("CGV" = "a general operations", "CGT" = "a transport", "CGT" = "a delivery", "CGH" = "a medical")
 	//edgy mythological critters!
 	ship_names = list(
-			"Dragon",
-			"Chimera",
-			"Titan",
-			"Hekatonchires",
-			"Gorgon",
-			"Scylla",
-			"Minotaur",
+			"Bandersnatch",
 			"Banshee",
 			"Basilisk",
 			"Black Dog",
 			"Centaur",
 			"Cerberus",
 			"Charybdis",
+			"Chimera",
 			"Cyclops",
 			"Cynocephalus",
 			"Demon",
 			"Daemon",
+			"Dragon",
 			"Echidna",
+			"Ghoul",
 			"Goblin",
 			"Golem",
+			"Gorgon",
 			"Griffin",
+			"Hekatonchires",
 			"Hobgoblin",
 			"Hydra",
 			"Imp",
 			"Ladon",
+			"Loup-Garou",
 			"Manticore",
 			"Medusa",
+			"Minotaur",
+			"Naga",
 			"Nosferatu",
 			"Ogre",
 			"Pegasus",
 			"Sasquatch",
+			"Scylla",
 			"Shade",
 			"Siren",
 			"Sphinx",
+			"Titan",
 			"Typhon",
 			"Valkyrie",
 			"Vampir",
@@ -1919,7 +1957,7 @@
 
 /datum/lore/organization/other/smugglers/New()
 	..()
-	var/i = 20 //give us twenty random names
+	var/i = 20 //give us twenty random names. for smugglers, I grabbed a bunch of two-syllable s-words, in keeping with NATO reporting names. I figured a fixed name list didn't make very much sense.
 	var/list/first_word = list(
 			"Smuggler","Safety","Scanner","Season","Secret","Section","Seeker","Server","Seller","Sequence","Shadow","Solar","Software","Smoker","Southwest","Spectrum","Spirit","Sponsor","Stainless","Stable","Study","Subject","Student","Surface","Symbol","Supreme","Surprise","Syntax","Sterling","Statement"
 			)
@@ -1952,9 +1990,9 @@
 
 /datum/lore/organization/other/pirates/New()
 	..()
-	var/i = 20 //give us twenty random names
+	var/i = 20 //give us twenty random names. as for smugglers, so for pirates. in this case I went with two-syllable b-words.
 	var/list/first_word = list(
-			"Bandit","Backup","Baker","Balance","Bandwidth","Banker","Banner","Bargain","Baseball","Basket","Bathroom","Berlin","Beyond","Bidder","Bishop","Bookmark","Border","Boston","Bracelet","Brazil","Breakfast","Brian","Broadband","Brochure","Broken","Broker","Brother","Buddy","Budget","Bureau","Business"
+			"Bandit","Bogey","Backup","Baker","Balance","Bandwidth","Banker","Banner","Bargain","Baseball","Basket","Bathroom","Berlin","Beyond","Bidder","Bishop","Bookmark","Border","Boston","Bracelet","Brazil","Breakfast","Brian","Broadband","Brochure","Broken","Broker","Brother","Buddy","Budget","Bureau","Business"
 			)
 	var/list/nato_phonetic = list(
 			"Alfa","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","Xray","Yankee","Zulu"
@@ -2223,7 +2261,11 @@
 			"Posadism Gang",
 			"Accelerationism Doesn't Work In A Vaccuum",
 			"Don't Shoot, We're Unarmed I Think",
+			"Sir, It's One Of Ours",
 			"The Big Stick For Speaking Softly",
+			"Per Our Last E-Mail",
+			"A Slight Weight Discrepancy",
+			"I Think It's An Asteroid",
 			"Bull Moose",
 			"Engels Needs Some Love Too",
 			"The Icepick",
@@ -2316,6 +2358,7 @@
 			"A Thousand Cultures",
 			"There Is a Character Limit?",
 			"Slave Galley I",
+			"The Memes of Production",
 			"The Unconquered CCXXII"
 			)
 	destination_names = list(

code/modules/client/preference_setup/loadout/loadout_uni_selector.dm

@@ -33,7 +33,7 @@
 	..()
 	var/list/selector_uniforms = list(
 		"uniform w/ dress"=/obj/item/clothing/under/dress/dress_cap,
-		"KHI uniform"=/obj/item/clothing/under/rank/khi/cmd,
+		"neocorporate uniform"=/obj/item/clothing/under/rank/khi/cmd,
 		"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
 		"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
 		"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -64,7 +64,7 @@
 	var/list/selector_uniforms = list(
 		"uniform w/ dress"=/obj/item/clothing/under/dress/dress_hop,
 		"HR director"=/obj/item/clothing/under/dress/dress_hr,
-		"KHI uniform"=/obj/item/clothing/under/rank/khi/cmd,
+		"neocorporate uniform"=/obj/item/clothing/under/rank/khi/cmd,
 		"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
 		"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
 		"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -130,7 +130,7 @@
 /datum/gear/uniform/civvie_uniform_selector/New()
 	..()
 	var/list/selector_uniforms = list(
-		"KHI uniform"=/obj/item/clothing/under/rank/khi/civ,
+		"neocorporate uniform"=/obj/item/clothing/under/rank/khi/civ,
 		"TG&C plain turtleneck"=/obj/item/clothing/under/rank/neo_suspect_turtleneck,
 		"TG&C plain turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_suspect_turtleskirt,
 		"TG&C blue turtleneck"=/obj/item/clothing/under/rank/neo_suspect_turtleneck_blue,
@@ -200,7 +200,7 @@
 	..()
 	var/list/selector_uniforms = list(
 		"undersuit, modernized"=/obj/item/clothing/under/rank/security/modern,
-		"KHI uniform"=/obj/item/clothing/under/rank/khi/sec,
+		"neocorporate uniform"=/obj/item/clothing/under/rank/khi/sec,
 		"voidsuit underlayer"=/obj/item/clothing/under/undersuit/sec,
 		"skirt"=/obj/item/clothing/under/rank/security/skirt,
 		"turtleneck"=/obj/item/clothing/under/rank/security/turtleneck,
@@ -300,7 +300,7 @@
 		"TG&C blue turtleneck & skirt"=/obj/item/clothing/under/rank/neo_hos_blackblue_skirt,
 		"TG&C blue parade uniform"=/obj/item/clothing/under/rank/neo_hos_parade_blue,
 		"TG&C blue parade uniform, feminine"=/obj/item/clothing/under/rank/neo_hos_parade_blue_fem,
-		"KHI uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
+		"neocorporate uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
 		"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
 		"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
 		"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -327,7 +327,7 @@
 		"skirt"=/obj/item/clothing/under/rank/cargo/skirt,
 		"jeans"=/obj/item/clothing/under/rank/cargo/jeans,
 		"jeans, feminine cut"=/obj/item/clothing/under/rank/cargo/jeans/female,
-		"KHI uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
+		"neocorporate uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
 		"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_qm,
 		"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_qm_skirt,
 		"TG&C casualwear"=/obj/item/clothing/under/rank/neo_qm_jacket,
@@ -359,7 +359,7 @@
 		"skirt"=/obj/item/clothing/under/rank/cargotech/skirt,
 		"jeans"=/obj/item/clothing/under/rank/cargotech/jeans,
 		"jeans, feminine cut"=/obj/item/clothing/under/rank/cargotech/jeans/female,
-		"KHI uniform"=/obj/item/clothing/under/rank/khi/crg,
+		"neocorporate uniform"=/obj/item/clothing/under/rank/khi/crg,
 		"TG&C shorts"=/obj/item/clothing/under/rank/neo_cargo_shorts,
 		"TG&C skirt"=/obj/item/clothing/under/rank/neo_cargo_skirt,
 		"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_cargo,
@@ -405,7 +405,7 @@
 	..()
 	var/list/selector_uniforms = list(
 		"skirt"=/obj/item/clothing/under/rank/chief_engineer/skirt,
-		"KHI uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
+		"neocorporate uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
 		"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
 		"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
 		"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -431,7 +431,7 @@
 	var/list/selector_uniforms = list(
 		"skirt"=/obj/item/clothing/under/rank/engineer/skirt,
 		"turtleneck"=/obj/item/clothing/under/rank/engineer/turtleneck,
-		"KHI uniform"=/obj/item/clothing/under/rank/khi/eng,
+		"neocorporate uniform"=/obj/item/clothing/under/rank/khi/eng,
 		"ST: Original Series Ops"=/obj/item/clothing/under/rank/trek/engsec,
 		"ST: Next Generation Ops"=/obj/item/clothing/under/rank/trek/engsec/next,
 		"ST: Voyager Ops"=/obj/item/clothing/under/rank/trek/engsec/voy,
@@ -481,7 +481,7 @@
 		"virologist skirt"=/obj/item/clothing/under/rank/virologist/skirt,
 		"turtleneck"=/obj/item/clothing/under/rank/medical/turtleneck,
 		"vey-medical jumpsuit"=/obj/item/clothing/under/corp/veymed,
-		"KHI uniform"=/obj/item/clothing/under/rank/khi/med,
+		"neocorporate uniform"=/obj/item/clothing/under/rank/khi/med,
 		"ST: Original Series Med-Sci"=/obj/item/clothing/under/rank/trek/medsci,
 		"ST: Next Generation Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/next,
 		"ST: Voyager Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/voy,
@@ -554,7 +554,7 @@
 	..()
 	var/list/selector_uniforms = list(
 		"skirt"=/obj/item/clothing/under/rank/chief_medical_officer/skirt,
-		"KHI uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
+		"neocorporate uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
 		"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
 		"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
 		"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -582,7 +582,7 @@
 /datum/gear/uniform/research_director_selector/New()
 	..()
 	var/list/selector_uniforms = list(
-		"KHI uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
+		"neocorporate uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
 		"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
 		"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
 		"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -611,7 +611,7 @@
 		"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_science,
 		"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_science_skirt,
 		"TG&C utility"=/obj/item/clothing/under/rank/neo_util_sci,
-		"KHI uniform"=/obj/item/clothing/under/rank/khi/sci,
+		"neocorporate uniform"=/obj/item/clothing/under/rank/khi/sci,
 		"ST: Original Series Med-Sci"=/obj/item/clothing/under/rank/trek/medsci,
 		"ST: Next Generation Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/next,
 		"ST: Voyager Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/voy,

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 KHI."
+	desc = "Controls the looking glass displays in this room. Provided courtesy of Morpheus."
 
 	icon_keyboard = "tech_key"
 	icon_screen = "holocontrol"

code/modules/lore_codex/lore_data_vr/orgs.dm

@@ -29,7 +29,7 @@
 
 /datum/lore/codex/category/auto_org/other
 	name = "Other Factions"
-	auto_keywords = list("KHI","SDF","Smuggler","Smugglers","Pirate","Pirates")
+	auto_keywords = list("SDF","Smuggler","Smugglers","Pirate","Pirates")
 	desired_type = /datum/lore/organization/other
 
 /datum/lore/codex/category/auto_org/gov

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 somewhat diminished knockoff of a Kitsuhana nano working surface, in a box. Can print new \
+	desc = "A somewhat diminished knockoff of a Morpheus 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. May eventually wear out and break."
 
@@ -625,8 +625,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 Kitsuhana NIF"
-	desc = "An actual Kitsuhana working surface, in a box. From a society slightly less afraid \
+	name = "\improper Morpheus NIF"
+	desc = "An actual Morpheus working surface, in a box. From a society slightly less afraid \
 	of self-replicating nanotechnology. Basically just a high-endurance NIF."
 	durability = 1000
 

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

@@ -42,7 +42,7 @@
 
 // The Pack //
 /obj/item/storage/secure/briefcase/nsfw_pack
-	name = "\improper KHI-102b \'NSFW\' 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/magnetic/magnetic_railgun_vr.dm

@@ -1,10 +1,10 @@
 /obj/item/gun/magnetic/railgun/flechette/pistol/khi
-	name = "kitsuhana flechette pistol"
+	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

code/modules/reagents/reagent_containers/pill_vr.dm

@@ -138,8 +138,8 @@
 	color = reagents.get_color()
 
 /obj/item/reagent_containers/pill/sleevingcure
-	name = "Kitsuhanan Cure (1u)"
-	desc = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery."
+	name = "Resleeving Sickness Cure (1u)"
+	desc = "A rare cure provided by that helps counteract negative side effects of using imperfect resleeving machinery."
 	icon_state = "pill3"
 
 /obj/item/reagent_containers/pill/sleevingcure/Initialize()

code/modules/reagents/reagents/medicine_vr.dm

@@ -79,9 +79,9 @@
 		M.heal_organ_damage(8 * removed * chem_effective, 0)
 
 /datum/reagent/sleevingcure
-	name = "Kitsuhanan Cure"
+	name = "Resleeving Sickness Cure"
 	id = "sleevingcure"
-	description = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery."
+	description = "A rare cure 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

code/modules/resleeving/documents.dm

@@ -27,7 +27,7 @@
 				<br>
 				<h1><a name="Foreword">Foreword: A Licensed Technology</a></h1>
 				This message must remain attached to all documentation regarding Nanotrasen Resleeving Technology.<br>
-				All Nanotrasen Resleeving Technology (NRT) is licensed to Nanotrasen by Kitsuhana Heavy Industries. It should only be used in the ways set forth in this guide.
+				All Nanotrasen Resleeving Technology (NRT) is licensed to Nanotrasen by Vey Medical. It should only be used in the ways set forth in this guide.
 				Special consideration to the moral and ethical use of this technology should be undertaken before applying it in the field. Make sure you understand the technology fully before using the machinery.<br>
 				<a href="#Contents">Contents</a>
 

code/modules/resleeving/implant.dm

@@ -22,7 +22,7 @@
 <b>Implant Specifications:</b><BR>
 <b>Name:</b> [using_map.company_name] Employee Backup Implant<BR>
 <b>Life:</b> ~8 hours.<BR>
-<b>Important Notes:</b> Implant is life-limited due to KHI licensing restrictions. Dissolves into harmless biomaterial after around ~8 hours, the typical work shift.<BR>
+<b>Important Notes:</b> Implant is life-limited due to licensing restrictions. Dissolves into harmless biomaterial after around ~8 hours, the typical work shift.<BR>
 <HR>
 <b>Implant Details:</b><BR>
 <b>Function:</b> Contains a small swarm of nanobots that perform neuron scanning to create mind-backups.<BR>
@@ -52,7 +52,7 @@
 //New, modern implanter instead of old style implanter.
 /obj/item/backup_implanter
 	name = "backup implanter"
-	desc = "After discovering that Nanotrasen was just re-using the same implanters over and over again on organics, leading to cross-contamination, Kitsuhana Heavy industries designed this self-cleaning model. Holds four backup implants at a time."
+	desc = "After discovering that Nanotrasen was just re-using the same implanters over and over again on organics, leading to cross-contamination, Vey-Medical designed this self-cleaning model. Holds four backup implants at a time."
 	catalogue_data = list(/datum/category_item/catalogue/technology/resleeving)
 	icon = 'icons/obj/device_alt.dmi'
 	icon_state = "bimplant"
@@ -154,5 +154,5 @@
 
 //Purely for fluff
 /obj/item/implant/backup/full
-	name = "khi backup implant"
-	desc = "A normal KHI wireless cortical stack with neutrino and QE transmission for constant-stream consciousness upload."
+	name = "backup implant"
+	desc = "A normal wireless cortical stack with neutrino and QE transmission for constant-stream consciousness upload."

code/modules/resleeving/sleevecard.dm

@@ -1,6 +1,6 @@
 /obj/item/paicard/sleevecard
 	name = "sleevecard"
-	desc = "This KHI-upgraded pAI module has enough capacity to run a whole mind of human-level intelligence."
+	desc = "This upgraded pAI module has enough capacity to run a whole mind of human-level intelligence."
 	catalogue_data = list(/datum/category_item/catalogue/technology/resleeving)
 	origin_tech = list(TECH_DATA = 2)
 	show_messages = 0

code/modules/vore/fluffstuff/custom_clothes_vr.dm

@@ -921,44 +921,44 @@
 	icon_state = "khi_uniform"
 
 /obj/item/clothing/under/rank/khi/cmd //Command version
-	name = "KHI command suit"
-	desc = "Kitsuhana Heavy Industries uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason."
+	name = "sleek command suit"
+	desc = "A sleek, neocorporate style uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason."
 	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"
-	desc = "Kitsuhana Heavy Industries uniform. This one has angry red security stripes. Keepin' the peace in style."
+	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"
-	desc = "Kitsuhana Heavy Industries uniform. The medical version. Why not just get a new body, anyway?"
+	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 = "Kitsuhana Heavy Industries 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. Building the future, one disaster at a time."
 	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 = "Kitsuhana Heavy Industries 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! Only SCIENCE can save us now."
 	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"
-	desc = "Kitsuhana Heavy Industries uniform. Looks like it's in supply and cargo division colors. Even post-scarcity societies need things moved and mined sometimes."
+	name = "sleek cargo suit"
+	desc = "A sleek, neocorporate style uniform. Looks like it's in supply and cargo division colors. Even post-scarcity societies need things moved and mined sometimes."
 	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"
-	desc = "Kitsuhana Heavy Industries uniform. Snazzy silver trim marks this is as the general civilian branch. Smells like paperwork and bureaucracy."
+	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)
 

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -573,8 +573,8 @@
 	update_icon()
 
 /obj/item/paper/khcrystal_manual
-	name = "KH-LC91-1 manual"
-	info = {"<h4>KH-LC91-1 Life Crystal</h4>
+	name = "VM-LC91-1 manual"
+	info = {"<h4>VM-LC91-1 Life Crystal</h4>
 	<h5>Usage</h5>
 	<ol>
 		<li>Hold new crystal in hand.</li>
@@ -583,8 +583,8 @@
 	</ol>
 	<br />
 	<h5>Purpose</h5>
-	<p>The Kitsuhana Life Crystal is a small device typically worn around the neck for the purpose of reporting your status to the HAVENS (Kitsuhana's High-AVailability ENgram Storage) system, so that appropriate measures can be taken in the case of your body's demise. The whole device is housed inside a pleasing-to-the-eye elongated diamond.</p>
-	<p>Upon your body's desmise, the crystal will send a transmission to HAVENS. Depending on your membership level, the appropriate actions can be taken to ensure that you are back up and enjoying existence as soon as possible.</p>
+	<p>The Vey-Medical Life Crystal is a small device typically worn around the neck for the purpose of reporting your status to the HAVENS (High-AVailability ENgram Storage) system, so that appropriate measures can be taken in the case of your body's demise. The whole device is housed inside a pleasing-to-the-eye elongated diamond.</p>
+	<p>Upon your body's demise, the crystal will send a transmission to HAVENS. Depending on your membership level, the appropriate actions can be taken to ensure that you are back up and enjoying existence as soon as possible.</p>
 
 	<p>Nanotrasen has negotiated a <i>FREE</i> Star membership for you in the HAVENS system, though an upgrade can be obtained depending on your citizenship and reputation level.</p>
 
@@ -615,7 +615,7 @@
 	name = "life crystal case"
 	icon = 'icons/vore/custom_items_vr.dmi'
 	icon_state = "khlifebox"
-	desc = "This case can only hold the KH-LC91-1 and a manual."
+	desc = "This case can only hold the VM-LC91-1 and a manual."
 	item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
 	storage_slots = 2
 	can_hold = list(/obj/item/paper/khcrystal_manual, /obj/item/clothing/accessory/collar/khcrystal)