diff --git a/code/modules/mob/living/carbon/human/species/human_species.dm b/code/modules/mob/living/carbon/human/species/human_species.dm
index 5fc2b07677f..4ba039c96cb 100644
--- a/code/modules/mob/living/carbon/human/species/human_species.dm
+++ b/code/modules/mob/living/carbon/human/species/human_species.dm
@@ -7,7 +7,7 @@
 	species_traits = list(LIPS)
 	skinned_type = /obj/item/stack/sheet/animalhide/human
 	clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
-	bodyflags = HAS_SKIN_TONE | HAS_BODY_MARKINGS
+	bodyflags = HAS_ICON_SKIN_TONE | HAS_BODY_MARKINGS
 	dietflags = DIET_OMNI
 	blurb = "Humanity originated in the Sol system, and over the last five centuries has spread \
 	colonies across a wide swathe of space. They hold a wide range of forms and creeds.<br/><br/> \
@@ -15,6 +15,39 @@
 	interests, rampant cyber and bio-augmentation and secretive factions make life on most human \
 	worlds tumultous at best."
 
+	icon_skin_tones = list(
+		1 = "Default White",
+		2 = "Chestnut",
+		3 = "Coffee",
+		4 = "Olive",
+		5 = "Pale",
+		6 = "Beige",
+		7 = "Classic",
+		8 = "Oliver"
+		)
 	reagent_tag = PROCESS_ORG
-	//Has standard darksight of 2.
+
+
+/datum/species/human/updatespeciescolor(mob/living/carbon/human/H, owner_sensitive = 1) //Handling species-specific skin-tones for humans We can't have everyone be white.
+	if(H.dna.species.bodyflags & HAS_ICON_SKIN_TONE)
+		var/new_icobase = 'icons/mob/human_races/r_human.dmi' //Default White, counts as 1.
+		switch(H.s_tone)
+			if(8)
+				new_icobase = 'icons/mob/human_races/human_skintones/r_human_Oliverandcompany.dmi'
+			if(7)
+				new_icobase = 'icons/mob/human_races/human_skintones/r_human_classic.dmi'
+			if(6)
+				new_icobase = 'icons/mob/human_races/human_skintones/r_human_beige.dmi'
+			if(5)
+				new_icobase = 'icons/mob/human_races/human_skintones/r_human_pale.dmi'
+			if(4)
+				new_icobase = 'icons/mob/human_races/human_skintones/r_human_Olive.dmi'
+			if(3)
+				new_icobase = 'icons/mob/human_races/human_skintones/r_human_Coffee.dmi'
+			if(2)
+				new_icobase = 'icons/mob/human_races/human_skintones/r_human_chestnut.dmi'
+
+		H.change_icobase(new_icobase, owner_sensitive) //Update the icobase of all our organs, but make sure we don't mess with frankenstein limbs in doing so.
+
+
 
diff --git a/icons/mob/human_races/human_skintones/r_human_Coffee.dmi b/icons/mob/human_races/human_skintones/r_human_Coffee.dmi
new file mode 100644
index 00000000000..333714cc67b
Binary files /dev/null and b/icons/mob/human_races/human_skintones/r_human_Coffee.dmi differ
diff --git a/icons/mob/human_races/human_skintones/r_human_Olive.dmi b/icons/mob/human_races/human_skintones/r_human_Olive.dmi
new file mode 100644
index 00000000000..bca6d407546
Binary files /dev/null and b/icons/mob/human_races/human_skintones/r_human_Olive.dmi differ
diff --git a/icons/mob/human_races/human_skintones/r_human_Oliverandcompany.dmi b/icons/mob/human_races/human_skintones/r_human_Oliverandcompany.dmi
new file mode 100644
index 00000000000..3890dc51ff1
Binary files /dev/null and b/icons/mob/human_races/human_skintones/r_human_Oliverandcompany.dmi differ
diff --git a/icons/mob/human_races/human_skintones/r_human_beige.dmi b/icons/mob/human_races/human_skintones/r_human_beige.dmi
new file mode 100644
index 00000000000..9a04adad654
Binary files /dev/null and b/icons/mob/human_races/human_skintones/r_human_beige.dmi differ
diff --git a/icons/mob/human_races/human_skintones/r_human_chestnut.dmi b/icons/mob/human_races/human_skintones/r_human_chestnut.dmi
new file mode 100644
index 00000000000..051e21db799
Binary files /dev/null and b/icons/mob/human_races/human_skintones/r_human_chestnut.dmi differ
diff --git a/icons/mob/human_races/human_skintones/r_human_classic.dmi b/icons/mob/human_races/human_skintones/r_human_classic.dmi
new file mode 100644
index 00000000000..ecbe53373a0
Binary files /dev/null and b/icons/mob/human_races/human_skintones/r_human_classic.dmi differ
diff --git a/icons/mob/human_races/human_skintones/r_human_pale.dmi b/icons/mob/human_races/human_skintones/r_human_pale.dmi
new file mode 100644
index 00000000000..eb3af43586e
Binary files /dev/null and b/icons/mob/human_races/human_skintones/r_human_pale.dmi differ
diff --git a/icons/mob/human_races/r_human.dmi b/icons/mob/human_races/r_human.dmi
index 21968b21073..8a10625176c 100644
Binary files a/icons/mob/human_races/r_human.dmi and b/icons/mob/human_races/r_human.dmi differ
diff --git a/icons/mob/simple_human.dmi b/icons/mob/simple_human.dmi
index 827265a216f..e2bb19cff36 100644
Binary files a/icons/mob/simple_human.dmi and b/icons/mob/simple_human.dmi differ
diff --git a/icons/obj/cardboard_cutout.dmi b/icons/obj/cardboard_cutout.dmi
index 63f65c7d07f..582a7e9b882 100644
Binary files a/icons/obj/cardboard_cutout.dmi and b/icons/obj/cardboard_cutout.dmi differ