From 7d91e7793613dcdf31970d3c8b93d5336a0070fc Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Mon, 20 Jan 2025 11:14:52 +0200 Subject: [PATCH] adds more elf and half elf skin tones --- code/__DEFINES/mobs.dm | 13 +++++++++++++ .../human/species_types/roguetown/elf/elfs.dm | 8 +++++++- .../human/species_types/roguetown/other/halfelf.dm | 11 ++++++++++- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 531666cd1f4..98eba5f6be6 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -410,12 +410,17 @@ #define SKIN_COLOR_YUETHINDRYNN "2f2f38" //WOOD ELF SKIN TONES +#define SKIN_COLOR_GRENZEL_WOODS "fff0e9" #define SKIN_COLOR_DANDELION_CREEK "ffe0d1" #define SKIN_COLOR_ROSEVEIL "fcccb3" #define SKIN_COLOR_AZUREGROVE "edc6b3" #define SKIN_COLOR_ARBORSHOME "e2b9a3" +#define SKIN_COLOR_ETRUSCAN_SWAMPS "d9a284" #define SKIN_COLOR_ALMONDVALLE "c9a893" #define SKIN_COLOR_WALNUT_WOODS "ba9882" +#define SKIN_COLOR_SHALVINE_FORESTS "ac8369" +#define SKIN_COLOR_LALVE_STEPPES "9c6f52" +#define SKIN_COLOR_NALEDI_COAST "4e3729" #define SKIN_COLOR_TIMBERBORN "5d4c41" #define SKIN_COLOR_LOTUS_COAST "eae1C8" @@ -447,12 +452,20 @@ #define SKIN_COLOR_ABYSSAL "22577a" //HALF ELF SKIN TONES +#define SKIN_COLOR_GRENZEL_AVAR "fff0e9" #define SKIN_COLOR_TIMBER_GRONN "ffe0d1" #define SKIN_COLOR_GIZA_AZURE "fcccb3" #define SKIN_COLOR_WALNUT_STINE "edc6b3" #define SKIN_COLOR_ETRUSTCAN_DANDELION "e2b9a3" #define SKIN_COLOR_NALEDI_BORN "5a4a41" #define SKIN_COLOR_KAZE_LOTUS "E0D5B8" +#define SKIN_COLOR_ETRUSCA_LIRVAS "d9a284" +#define SKIN_COLOR_FREE_FOLK "c9a893" +#define SKIN_COLOR_AVAR_BORNE "ba9882" +#define SKIN_COLOR_SHALVINE_AZURE "ac8369" +#define SKIN_COLOR_LALVE_NALEDI "9c6f52" +#define SKIN_COLOR_NALEDI_OTAVA "4e3729" +#define SKIN_COLOR_HAMMER_GRONN "5d4c41" //HALF ORK SKIN TONES #define SKIN_COLOR_BLOOD_AXE "A84C4F" diff --git a/code/modules/mob/living/carbon/human/species_types/roguetown/elf/elfs.dm b/code/modules/mob/living/carbon/human/species_types/roguetown/elf/elfs.dm index 3eb5e322ac3..82cd05df723 100644 --- a/code/modules/mob/living/carbon/human/species_types/roguetown/elf/elfs.dm +++ b/code/modules/mob/living/carbon/human/species_types/roguetown/elf/elfs.dm @@ -103,6 +103,7 @@ /datum/species/elf/wood/get_skin_list() return list( + "Grenzel Woods" = SKIN_COLOR_GRENZEL_WOODS, "Dandelion Creek" = SKIN_COLOR_DANDELION_CREEK, "Roseveil" = SKIN_COLOR_ROSEVEIL, "Azuregrove" = SKIN_COLOR_AZUREGROVE, @@ -110,7 +111,12 @@ "Almondvalle" = SKIN_COLOR_ALMONDVALLE, "Walnut Woods" = SKIN_COLOR_WALNUT_WOODS, "Timberborn" = SKIN_COLOR_TIMBERBORN, - "Lotus Coast" = SKIN_COLOR_LOTUS_COAST + "Lotus Coast" = SKIN_COLOR_LOTUS_COAST, + "Grenzel Woods" = SKIN_COLOR_GRENZEL_WOODS, + "Etruscan Swamps" = SKIN_COLOR_ETRUSCAN_SWAMPS, + "Shalvine Forests" = SKIN_COLOR_SHALVINE_FORESTS, + "Lalvestine Thickets" = SKIN_COLOR_LALVE_STEPPES, + "Naledi Coverts" = SKIN_COLOR_NALEDI_COAST ) /datum/species/elf/wood/get_hairc_list() diff --git a/code/modules/mob/living/carbon/human/species_types/roguetown/other/halfelf.dm b/code/modules/mob/living/carbon/human/species_types/roguetown/other/halfelf.dm index 619563ab625..5af363500be 100644 --- a/code/modules/mob/living/carbon/human/species_types/roguetown/other/halfelf.dm +++ b/code/modules/mob/living/carbon/human/species_types/roguetown/other/halfelf.dm @@ -100,7 +100,16 @@ "Walnut-Stine" = SKIN_COLOR_WALNUT_STINE, "Etrustcan-Dandelion" = SKIN_COLOR_ETRUSTCAN_DANDELION, "Naledi-Born" = SKIN_COLOR_NALEDI_BORN, - "Kaze-Lotus" = SKIN_COLOR_KAZE_LOTUS + "Kaze-Lotus" = SKIN_COLOR_KAZE_LOTUS, + "Grenzel-Azuria" = SKIN_COLOR_GRENZEL_WOODS, + "Etrusca-Lirvas" = SKIN_COLOR_ETRUSCA_LIRVAS, + "Free Roamers" = SKIN_COLOR_FREE_FOLK, + "Avar Borne" = SKIN_COLOR_AVAR_BORNE, + "Shalvine Roamer" = SKIN_COLOR_SHALVINE_AZURE, + "Lalve-Steppes" = SKIN_COLOR_LALVE_NALEDI, + "Naledi-Otava" = SKIN_COLOR_NALEDI_OTAVA, + "Grezel-Avar" = SKIN_COLOR_GRENZEL_AVAR, + "Hammer-Gronn" = SKIN_COLOR_HAMMER_GRONN ) /datum/species/human/halfelf/proc/languages(mob/living/carbon/human/literally_him)