Fixes #5113

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

@@ -43,7 +43,7 @@
 
 	if(!species)
 		if(new_species)
-			set_species(new_species)
+			set_species(new_species,null,1)
 		else
 			set_species()
 
@@ -1227,7 +1227,7 @@
 	else
 		usr << "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]."
 
-/mob/living/carbon/human/proc/set_species(var/new_species, var/force_organs)
+/mob/living/carbon/human/proc/set_species(var/new_species, var/force_organs, var/default_colour)
 
 	if(!dna)
 		if(!new_species)
@@ -1252,11 +1252,17 @@
 	if(species.language)
 		add_language(species.language)
 
-	spawn(0)
-		update_icons()
-
 	if(species)
+		if(species.base_color && default_colour)
+			//Apply colour.
+			r_skin = hex2num(copytext(species.base_color,2,3))
+			g_skin = hex2num(copytext(species.base_color,4,5))
+			b_skin = hex2num(copytext(species.base_color,6,7))
 		species.handle_post_spawn(src)
+
+		spawn(0)
+			update_icons()
+
 		return 1
 	else
 		return 0

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

@@ -48,6 +48,7 @@
 
 	var/blood_color = "#A10808" //Red.
 	var/flesh_color = "#FFC896" //Pink.
+	var/base_color      //Used when setting species.
 
 	//Used in icon caching.
 	var/race_key = 0
@@ -139,6 +140,7 @@
 	flesh_color = "#34AF10"
 
 	reagent_tag = IS_UNATHI
+	base_color = "#066000"
 
 /datum/species/tajaran
 	name = "Tajaran"
@@ -163,6 +165,7 @@
 	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL | HAS_SKIN_COLOR
 
 	flesh_color = "#AFA59E"
+	base_color = "#333333"
 
 /datum/species/skrell
 	name = "Skrell"