Merge pull request #10163 from Novacat/nova-ert

Whitelist and Catalog Updates

code/modules/catalogue/catalogue_data_vr.dm

@@ -5,63 +5,124 @@
 
 /datum/category_item/catalogue/fauna/akula
 	name = "Sapients - Akula"
-	desc = ""
+	desc = "A pelagic species hailing from the Barkalis System originally\
+	the Akula have been incidentally uplifted by free Kosaky \
+	sharing much of their more modern culture with interstellar\
+	Humanity. Many of them have spread among the stars, either\
+	in the nomad fleets or joining colonies as capable hard labour."
 	value = CATALOGUER_REWARD_TRIVIAL
 
 /datum/category_item/catalogue/fauna/sergal
 	name = "Sapients - Sergal"
-	desc = ""
+	desc = "The dominant species in the Vilous System, the Sergal are a\
+	strange mammalian clade which shares similarities with \
+	masurpials, pelagic creatures and wolves. Collectivist and\
+	organising themselves in tribes and city states, they have\
+	eclipsed the private colony venture trying to hold them \
+	economically beholden and now have joined the sapient \
+	diaspora on more equal terms."
 	value = CATALOGUER_REWARD_TRIVIAL
 
 /datum/category_item/catalogue/fauna/nevrean
 	name = "Sapients - Nevrean"
-	desc = ""
+	desc = "A co-sapient species from Vilous, the Nevrean have found their\
+	ecological niche as nomadic traders and craftsmen, \
+	developing a rich oral tradition, that is being slowly \
+	codified by the Sergals in an efforts to culturally export \
+	it through the stars. The modern Nevrean co-inhabits most \
+	places the Sergals do as comrades and historical allies."
 	value = CATALOGUER_REWARD_TRIVIAL
 
 /datum/category_item/catalogue/fauna/rapala
 	name = "Sapients - Rapala"
-	desc = ""
+	desc = "The Rapala, formally “Rapala-Unathi” are a vassal species of the Unathi \
+	in form of winged Humanoids. While they share a similar outwards appearance with humans, \
+	they have a much more complex system of sexual genetics, as well superior 3D awareness. \
+	The Rapala act as emissaries, diplomats and spies for their overlords, although it is an open \
+	secret that they work for more autonomy and self-governance."
 	value = CATALOGUER_REWARD_TRIVIAL
 
 /datum/category_item/catalogue/fauna/xenochimera
 	name = "Sapients - Xenochimera"
-	desc = ""
+	desc = "ERROR : DNA corruption detected. The likely outcome of this is this specimen being \
+	a Xenochimera. Xenochimeras are the end stage of “Roanoke Syndrome”, a microbial infection \
+	that infiltrates the immune system of a host species by mimicking cells. Upon expiration of \
+	the host (preventable by medical attention), the cells cannibalize and take over the body, \
+	creating a xenochimera. If the body has been capable of sapient thought, the resultant morph \
+	is also capable of thought. \
+	<br> <br>\
+	Contrary to popular belief, Roanoke Syndrome colonies do not seek out sapient life. Any exposure \
+	is incidental and not part of a plot – xenochimera without sapient thought are simply wild animals or disease vectors."
 	value = CATALOGUER_REWARD_TRIVIAL
 
 /datum/category_item/catalogue/fauna/vulpkanin
 	name = "Sapients - Vulpkanin"
-	desc = ""
+	desc = "The Vulpkanin are the remnants of an ancient precursor which resided in the Coreward Periphery \
+	3000 to 4000 years ago, residing on a planet called “Altam”. Vulpkanin diverged from the precursors due \
+	to heavy isolation after the fall, presumably due to being a freshly found colony. A lack of material support \
+	regressed their technology to pre-industrial standards until being found again by Humanity. At this point \
+	they have formed an early spacefaring society and accession into the Diaspora went over relatively smoothly. \
+	Vulpkanin are the closest successor to the precursors, genetically, although genelocked devices still do not \
+	recognize them due to genetic drift."
 	value = CATALOGUER_REWARD_TRIVIAL
 
 /datum/category_item/catalogue/fauna/alraune
 	name = "Sapients - Alraune"
-	desc = ""
+	desc = "Alraune are enigmatic, strange creatures from the Elysian Colonies. While their main culture is still \
+	in the early neolithic, a large diaspora has formed from previous abductions and trade with these creatures, who \
+	seem to mimic many cultivars throughout space through yet an unknown mechanism. Alraune are pleasant, but \
+	predatory who autocannibalize their own products as a form of nutriment transfer and storage."
 	value = CATALOGUER_REWARD_TRIVIAL
 
 /datum/category_item/catalogue/fauna/vasilissan
 	name = "Sapients - Vasilissan"
-	desc = ""
+	desc = "Vasilissans are an arachnid species uplifted by NT due to their propensity for architectural feats for \
+	surface-to-orbit buildings with relatively primitive materials. Exploited for a while, they have managed to \
+	connect to the greater commerce of the Diaspora, making them less dependent of our favourite TSCs, sadly. \
+	Vasilissans are happily adopted into Coreward Periphery colonies, valued for their infrastructural acumen \
+	and their craftsmanship with their natural silk."
 	value = CATALOGUER_REWARD_TRIVIAL
 
 /datum/category_item/catalogue/fauna/zorren
 	name = "Sapients - Zorren"
-	desc = ""
+	desc = "The Zorren are the remnants of an ancient precursor which resided in the Coreward Periphery 3000 to 4000 \
+	years ago, residing on a planet called “Menhir”, which we call Virgo 4. Zorren organise themselves through various \
+	feudal-styled kingdoms and monarchies, of which the most prominent is the Kingdom of An-Tahk-Et. They are obsessed \
+	over their ancient heritage and the power of the noble houses comes through the control and excavation of old technology \
+	of their precursors, leading to a massive divide between commoners, who live as serfs and the nobility, who live in \
+	comparable conditions as wealthy members of the Diaspora."
 	value = CATALOGUER_REWARD_TRIVIAL
 
 /datum/category_item/catalogue/fauna/shadekin
 	name = "Sapients - Shadekin"
-	desc = ""
+	desc = "ERROR : No DNA found. ERROR : Ambient energy signature detected. Likely origin from attempt of scanning \
+	Specimen NT-495. \
+	<br> <br>\
+	NT-495, also colloquial known as “Shadekin”, “Deep People”, “Mar Beast”, “Shadow creature” are an enigmatic species \
+	capable of localized bluespace events (although the credibility of them actually manipulating bluespace effects \
+	still is in question), allowing them to “shift” through phases of existence without assistance of machines. \
+	Observation of NT-495 is notoriously difficult, as they do not exhibit these traits when in direct view unless \
+	they seem to feel threatened. \
+	<br> <br>\
+	Their definite sapience has been proven as several NT-495 sightings supports them to be capable of galactic common, \
+	especially under the variant that does not seem to possess the innate ability to phase – in fact, NT has recently \
+	started to hire those for closer observation."
 	value = CATALOGUER_REWARD_EASY
 
 /datum/category_item/catalogue/fauna/custom_species
 	name = "Sapients - Other"
-	desc = "Remote frontiers require people of all sorts of life...\
-	Sometimes species one would never see anywhere close to core worlds can be met here."
+	desc = "ERROR : DNA scan inconclusive. Please interview subject to catalogue them manually. \
+	We apologise for the inconvenience. \
+	<br> <br>\
+	Likely reasons for failure : Genetic Engineering, Hybridization, minor species of Orion Spur Diaspora."
 	value = CATALOGUER_REWARD_TRIVIAL
 
 /datum/category_item/catalogue/technology/resleeving
 	name = "Resleeving"
-	desc = ""
+	desc = "The premier technology of the early 2280s, Resleeving is a direct upgrade to the antiquated flash \
+	cloning by creating near perfect copies of a body within the database, capable of uploading a consciousness \
+	in the dormant brain via direct electro-uploading. However, this technology is not perfect and small, but \
+	non-zero error margins exist. Handle with care! Or don't. Stress testing this stuff makes a lucrative market."
 	value = CATALOGUER_REWARD_TRIVIAL
 
 /datum/category_item/catalogue/information/organization/khi

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

@@ -95,11 +95,17 @@
 	character_name = list("Aronai Sieyes")
 
 /datum/gear/fluff/astra_ritualknife
-    path = /obj/item/weapon/material/knife/ritual/fluff/astra
-    display_name = "Polished Ritual Knife"
-    description = "A well kept strange ritual knife, There is a small tag with the name 'Astra Ether' on it. They are probably looking for this."
-    ckeywhitelist = list("astraether")
-    character_name = list("Astra Ether")
+	path = /obj/item/weapon/material/knife/ritual/fluff/astra
+	display_name = "Polished Ritual Knife"
+	description = "A well kept strange ritual knife, There is a small tag with the name 'Astra Ether' on it. They are probably looking for this."
+	ckeywhitelist = list("astraether")
+	character_name = list("Astra Ether")
+
+/datum/gear/fluff/astra_medal
+	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Astra's Conduct Medal"
+	ckeywhitelist = list("astraether")
+	character_name = list("Astra Ether")
 
 /datum/gear/fluff/collar/azura
 	path = /obj/item/clothing/accessory/collar/azura
@@ -155,6 +161,12 @@
 	ckeywhitelist = list("blakeryan")
 	character_name = list("Nolan Conaway")
 
+/datum/gear/fluff/amber_medal
+	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Amber's Conduct Medal"
+	ckeywhitelist = list("bluewolf128")
+	character_name = list("Amber Wresspenn")
+
 /datum/gear/fluff/charles_hat
 	path = /obj/item/clothing/head/that/fluff/gettler
 	display_name = "Charles' Top-Hat"
@@ -195,6 +207,12 @@
 	ckeywhitelist = list("bacon12366")
 	character_name = list("Elly Brown")
 
+/datum/gear/fluff/alibig_medal
+	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Ali Big's Conduct Medal"
+	ckeywhitelist = list("bigbababooey")
+	character_name = list("Ali Big")
+
 //  C CKEYS
 /datum/gear/fluff/cappy_watch
 	path = /obj/item/clothing/accessory/watch
@@ -266,6 +284,18 @@
 	ckeywhitelist = list("dickfreedomjohnson")
 	character_name = list("Elliot Richards")
 
+/datum/gear/fluff/donald_medal
+	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Donald's Conduct Medal"
+	ckeywhitelist = list("drainquake")
+	character_name = list("Donald Weinbeck")
+
+/datum/gear/fluff/donald_medal_2
+	path = /obj/item/clothing/accessory/medal/bronze_heart
+	display_name = "Donald's Heart Medal"
+	ckeywhitelist = list("drainquake")
+	character_name = list("Donald Weinbeck")
+
 /datum/gear/fluff/drake_box
 	path = /obj/item/weapon/storage/box/fluff/drake
 	display_name = "Drake's Box"
@@ -576,6 +606,12 @@
 	character_name = list("Ashley Kifer")
 
 //  L CKEYS
+/datum/gear/fluff/kenzie_medal
+	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Kenzie's Conduct Medal"
+	ckeywhitelist = list("lm40")
+	character_name = list("Kenzie Houser")
+
 /datum/gear/fluff/kenzie_hypospray
 	path = /obj/item/weapon/reagent_containers/hypospray/vial/kenzie
 	display_name = "Kenzie's Hypospray"
@@ -783,6 +819,18 @@
 	ckeywhitelist = list("sageofaether12")
 	character_name = list("Brynhild Vandradottir")
 
+/datum/gear/fluff/brynhild_medal_3
+	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Brynhild's Conduct Medal"
+	ckeywhitelist = list("sageofaether12")
+	character_name = list("Brynhild Vandradottir")
+
+/datum/gear/fluff/brynhild_medal_4
+	path = /obj/item/clothing/accessory/medal/bronze_heart
+	display_name = "Brynhild's Heart Medal"
+	ckeywhitelist = list("sageofaether12")
+	character_name = list("Brynhild Vandradottir")
+
 /datum/gear/fluff/kateryna_voidsuit
 	path = /obj/item/clothing/suit/space/void/engineering/kate
 	display_name = "Kateryna's Voidsuit"
@@ -918,6 +966,12 @@
 	ckeywhitelist = list("tabiranth")
 	character_name = list("Ascian")
 
+/datum/gear/fluff/ascian_medal_3
+	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Ascian's Conduct Medal"
+	ckeywhitelist = list("tabiranth")
+	character_name = list("Ascian")
+
 /datum/gear/fluff/ascian_spiritspawner
 	path = /obj/item/weapon/grenade/spawnergrenade/spirit
 	display_name = "The Best Kitten"

config/alienwhitelist.txt

@@ -46,6 +46,7 @@ mrsebbi - Xenochimera
 natje - Xenochimera
 nerdass - Protean
 newyorks - Protean
+oneofmanynames385 - Protean
 ontejbjoav - Diona
 oreganovulgaris - Xenochimera
 owwy - Black-Eyed Shadekin
@@ -67,6 +68,7 @@ ryumi - Xenochimera
 scoutisafolflol - Xenochimera
 seiga - Vox
 sepulchre - Vox
+stobarico - Protean
 sharplight - Protean
 silvertalismen - Diona
 silvertalismen - Vox