From a5e750e20fec6c3a67a05bda6ac029299c30b761 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 23 Apr 2019 19:06:00 -0700
Subject: [PATCH] skintone

---
 code/__DEFINES/citadel_defines.dm                               | 1 +
 code/modules/mob/living/carbon/human/species.dm                 | 2 ++
 .../code/modules/mob/dead/new_player/sprite_accessories.dm      | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm
index ef14dbcaa3..b150067717 100644
--- a/code/__DEFINES/citadel_defines.dm
+++ b/code/__DEFINES/citadel_defines.dm
@@ -95,6 +95,7 @@
 #define NOAROUSAL		37 //Stops all arousal effects
 #define NOGENITALS		38 //Cannot create, use, or otherwise have genitals
 #define MATRIXED		39	//if icon is color matrix'd
+#define SKINTONE		40	//uses skin tones
 
 //Citadel istypes
 #define isborer(A) (istype(A, /mob/living/simple_animal/borer))
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index ba1ad9e0da..e2e9e5149f 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -755,6 +755,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			if(!(H.has_trait(TRAIT_HUSK)))
 				if(!forced_colour)
 					switch(S.color_src)
+						if(SKINTONE)
+							accessory_overlay.color = skintone2hex(H.skin_tone)
 						if(MUTCOLORS)
 							if(fixed_mut_color)
 								accessory_overlay.color = "#[fixed_mut_color]"
diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
index 739f787d44..b6cfce0b24 100644
--- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -201,7 +201,7 @@
 	name = "Elf"
 	icon_state = "elf"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
-	color_src = MATRIXED
+	color_src = SKINTONE
 
 /datum/sprite_accessory/ears/fennec
 	name = "Fennec"