From ab090bd2c1bbacfa02fe0c3f27b6ae175b40a85c Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 4 Dec 2018 18:13:22 -0800
Subject: [PATCH 1/2] Start

---
 .../mob/dead/new_player/sprite_accessories.dm |  44 ++++++++++--------
 modular_citadel/icons/mob/mam_ears.dmi        | Bin 9690 -> 10025 bytes
 2 files changed, 25 insertions(+), 19 deletions(-)

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 1a82040dbc..739f787d44 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
@@ -197,6 +197,12 @@
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
 
+/datum/sprite_accessory/ears/human/elf
+	name = "Elf"
+	icon_state = "elf"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
 /datum/sprite_accessory/ears/fennec
 	name = "Fennec"
 	icon_state = "fennec"
@@ -291,7 +297,7 @@
 	icon_state = "wah"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
-	
+
 /datum/sprite_accessory/tails/human/axolotl
 	name = "Axolotl"
 	icon_state = "axolotl"
@@ -315,7 +321,7 @@
 	icon_state = "bee"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
-	
+
 /datum/sprite_accessory/tails/human/cat
 	name = "Cat"
 	icon_state = "cat"
@@ -327,7 +333,7 @@
 	icon_state = "cat"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = HAIR
-	
+
 /datum/sprite_accessory/tails/human/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
@@ -339,7 +345,7 @@
 	icon_state = "catbig"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
-	
+
 /datum/sprite_accessory/tails/human/cow
 	name = "Cow"
 	icon_state = "cow"
@@ -359,7 +365,7 @@
 /datum/sprite_accessory/tails_animated/human/corvid
 	name = "Corvid"
 	icon_state = "crow"
-	
+
 /datum/sprite_accessory/tails/human/eevee
 	name = "Eevee"
 	icon_state = "eevee"
@@ -371,7 +377,7 @@
 	icon_state = "eevee"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
-	
+
 /datum/sprite_accessory/tails/human/fennec
 	name = "Fennec"
 	icon_state = "fennec"
@@ -383,7 +389,7 @@
 	icon_state = "fennec"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
-	
+
 /datum/sprite_accessory/tails/human/fish
 	name = "Fish"
 	icon_state = "fish"
@@ -395,7 +401,7 @@
 	icon_state = "fish"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
-	
+
 /datum/sprite_accessory/tails/human/fox
 	name = "Fox"
 	icon_state = "fox"
@@ -443,7 +449,7 @@
 	icon_state = "insect"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
-	
+
 /datum/sprite_accessory/tails/human/kitsune
 	name = "Kitsune"
 	icon_state = "kitsune"
@@ -455,7 +461,7 @@
 	icon_state = "kitsune"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	
+
 /datum/sprite_accessory/tails/human/murid
 	name = "Murid"
 	icon_state = "murid"
@@ -467,7 +473,7 @@
 	icon_state = "murid"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	
+
 /datum/sprite_accessory/tails/human/otie
 	name = "Otusian"
 	icon_state = "otie"
@@ -491,7 +497,7 @@
 	icon_state = "orca"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	
+
 /datum/sprite_accessory/tails/human/pede
 	name = "Scolipede"
 	icon_state = "pede"
@@ -503,7 +509,7 @@
 	icon_state = "pede"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	
+
 /datum/sprite_accessory/tails/human/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
@@ -515,7 +521,7 @@
 	icon_state = "rabbit"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	
+
 /datum/sprite_accessory/tails/human/sergal
 	name = "Sergal"
 	icon_state = "sergal"
@@ -527,7 +533,7 @@
 	icon_state = "sergal"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	
+
 /datum/sprite_accessory/tails/human/skunk
 	name = "skunk"
 	icon_state = "skunk"
@@ -571,7 +577,7 @@
 /datum/sprite_accessory/tails_animated/human/straighttail
 	name = "Straight Tail"
 	icon_state = "straighttail"
-	
+
 /datum/sprite_accessory/tails/human/squirrel
 	name = "Squirrel"
 	icon_state = "squirrel"
@@ -595,7 +601,7 @@
 	icon_state = "tentacle"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	
+
 /datum/sprite_accessory/tails/human/tiger
 	name = "Tiger"
 	icon_state = "tiger"
@@ -607,7 +613,7 @@
 	icon_state = "tiger"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	
+
 /datum/sprite_accessory/tails/human/wolf
 	name = "Wolf"
 	icon_state = "wolf"
@@ -619,7 +625,7 @@
 	icon_state = "wolf"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	
+
 /******************************************
 *********** Mammal Body Parts *************
 *******************************************/
diff --git a/modular_citadel/icons/mob/mam_ears.dmi b/modular_citadel/icons/mob/mam_ears.dmi
index b3946b546cc5d675a4b1bfb9075024f7746b880f..f2a788d9004e0f2a9374b4087e7f6d6d5ae0c79c 100644
GIT binary patch
literal 10025
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

literal 9690
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


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 2/2] 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"