From bd5bc07064bd4a7bdb2d1a0f487c25ab6f8302e3 Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Tue, 1 Jul 2014 00:58:40 +0930
Subject: [PATCH] Fixes #5090

---
 code/modules/mob/living/carbon/human/human.dm | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 7bdac4e11f2..c7efac82ef6 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1252,17 +1252,22 @@
 	if(species.language)
 		add_language(species.language)
 
+	if(species.base_color && default_colour)
+		//Apply colour.
+		r_skin = hex2num(copytext(species.base_color,2,4))
+		g_skin = hex2num(copytext(species.base_color,4,6))
+		b_skin = hex2num(copytext(species.base_color,6,8))
+	else
+		r_skin = 0
+		g_skin = 0
+		b_skin = 0
+
+	species.handle_post_spawn(src)
+
+	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