Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

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

@@ -735,6 +735,12 @@
 	ckeywhitelist = list("pimientopyro")
 	character_name = list("Scylla Casmus")
 
+/datum/gear/fluff/kiyoshi_cloak
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing
+	display_name = "glowing cloak"
+	ckeywhitelist = list("pastelprincedan")
+	character_name = list("Kiyoshi Maki", "Masumi Maki")
+
 //  Q CKEYS
 
 //  R CKEYS

code/modules/client/preference_setup/vore/07_traits.dm

@@ -114,12 +114,7 @@
 		pref.dirty_synth = 0
 
 	var/datum/species/S = character.species
-	var/SB
-	if(S.selects_bodytype)
-		SB = pref.custom_base ? pref.custom_base : "Human"
-	else
-		SB = S.name
-	var/datum/species/new_S = S.produceCopy(SB, pref.pos_traits + pref.neu_traits + pref.neg_traits, character)
+	var/datum/species/new_S = S.produceCopy(pref.pos_traits + pref.neu_traits + pref.neg_traits, character, pref.custom_base)
 
 	//Any additional non-trait settings can be applied here
 	new_S.blood_color = pref.blood_color