Merge pull request #7996 from VOREStation/Arokha/issue7930

Alleviate shapeshifter color issues

code/modules/mob/living/carbon/human/species/species_shapeshift.dm

@@ -173,7 +173,8 @@ var/list/wrapped_species_by_ref = list()
 
 	last_special = world.time + 50
 
-	var/new_skin = input("Please select a new body color.", "Shapeshifter Colour") as color
+	var/current = RGBdec2hex(list(r_skin, g_skin, b_skin))
+	var/new_skin = input("Please select a new body color.", "Shapeshifter Colour", current) as null|color
 	if(!new_skin)
 		return
 	shapeshifter_set_colour(new_skin)

code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm

@@ -46,6 +46,7 @@
 			var/obj/item/organ/external/new_eo = new limbpath(src)
 			organs_by_name[choice] = new_eo
 			new_eo.robotize(synthetic ? synthetic.company : null) //Use the base we started with
+			new_eo.sync_colour_to_human(src)
 			regenerate_icons()
 		active_regen = FALSE
 		nano_outofblob(blob)