diff --git a/code/modules/client/customizer/customizers/bodypart_feature/accessory.dm b/code/modules/client/customizer/customizers/bodypart_feature/accessory.dm index 29aa3ea820c..c772a2ad3bd 100644 --- a/code/modules/client/customizer/customizers/bodypart_feature/accessory.dm +++ b/code/modules/client/customizer/customizers/bodypart_feature/accessory.dm @@ -35,6 +35,12 @@ /datum/sprite_accessory/detail/tattoo_lips, /datum/sprite_accessory/detail/tattoo_eye_r, /datum/sprite_accessory/detail/tattoo_eye_l, + /datum/sprite_accessory/detail/warpaint_blue_stripes, + /datum/sprite_accessory/detail/warpaint_red_stripes, + /datum/sprite_accessory/detail/warpaint_green_stripes, + /datum/sprite_accessory/detail/warpaint_purple_stripes, + /datum/sprite_accessory/detail/warpaint_black_stripes, + /datum/sprite_accessory/detail/eyebags ) /datum/customizer/bodypart_feature/accessory @@ -66,6 +72,8 @@ /datum/sprite_accessory/accessories/chokere, /datum/sprite_accessory/accessories/eyepierce, /datum/sprite_accessory/accessories/eyepierce/alt, + /datum/sprite_accessory/accessories/earrings/hoop, + /datum/sprite_accessory/accessories/earrings/hoop/sil, ) /datum/customizer/bodypart_feature/accessory/rakshari diff --git a/code/modules/client/customizer/customizers/organ/ears.dm b/code/modules/client/customizer/customizers/organ/ears.dm index 35e4e7c142f..8de911301a0 100644 --- a/code/modules/client/customizer/customizers/organ/ears.dm +++ b/code/modules/client/customizer/customizers/organ/ears.dm @@ -14,7 +14,9 @@ organ_type = /obj/item/organ/ears/elf sprite_accessories = list( /datum/sprite_accessory/ears/elf, - /datum/sprite_accessory/ears/elfw) + /datum/sprite_accessory/ears/elfw, + /datum/sprite_accessory/ears/elftw, + /datum/sprite_accessory/ears/elfww) /datum/customizer/organ/ears/elf customizer_choices = list(/datum/customizer_choice/organ/ears/elf) @@ -30,6 +32,8 @@ sprite_accessories = list( /datum/sprite_accessory/ears/elf, /datum/sprite_accessory/ears/elfw, + /datum/sprite_accessory/ears/elftw, + /datum/sprite_accessory/ears/elfww ) /datum/customizer/organ/ears/tiefling @@ -42,6 +46,8 @@ sprite_accessories = list( /datum/sprite_accessory/ears/elf, /datum/sprite_accessory/ears/elfw, + /datum/sprite_accessory/ears/elftw, + /datum/sprite_accessory/ears/elfww ) /datum/customizer/organ/ears/anthro diff --git a/code/modules/client/customizer/customizers/organ/horns.dm b/code/modules/client/customizer/customizers/organ/horns.dm index 0c9e86b0297..335010ce4f9 100644 --- a/code/modules/client/customizer/customizers/organ/horns.dm +++ b/code/modules/client/customizer/customizers/organ/horns.dm @@ -163,6 +163,8 @@ /datum/customizer_choice/organ/horns/tiefling name = "Horns" + allows_accessory_color_customization = TRUE + var/hair_color = "#FFFFFF" organ_type = /obj/item/organ/horns sprite_accessories = list( /datum/sprite_accessory/horns/tiefling, diff --git a/code/modules/client/customizer/customizers/organ/tail.dm b/code/modules/client/customizer/customizers/organ/tail.dm index 7236fc479c9..e4c0a13c5ba 100644 --- a/code/modules/client/customizer/customizers/organ/tail.dm +++ b/code/modules/client/customizer/customizers/organ/tail.dm @@ -21,6 +21,9 @@ allows_accessory_color_customization = FALSE sprite_accessories = list( /datum/sprite_accessory/tail/tiefling, + /datum/sprite_accessory/tail/tiefling/heart, + /datum/sprite_accessory/tail/tiefling/spear, + /datum/sprite_accessory/tail/tiefling/drake ) /datum/customizer/organ/tail/demihuman diff --git a/code/modules/mob/dead/new_player/sprite_accessories/accessory.dm b/code/modules/mob/dead/new_player/sprite_accessories/accessory.dm index 8ecbbdcd67b..e8d1e054273 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/accessory.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/accessory.dm @@ -39,6 +39,20 @@ relevant_layers = list(BODY_FRONT_LAYER) specuse = list(SPEC_ID_HUMEN, SPEC_ID_DWARF, SPEC_ID_ELF) +/datum/sprite_accessory/accessories/earrings/hoop + name = "Hoop Earrings (G)" + icon_state = "earringhoop" + gender = FEMALE + relevant_layers = list(BODY_FRONT_LAYER) + specuse = list(SPEC_ID_HUMEN, SPEC_ID_DWARF, SPEC_ID_ELF) + +/datum/sprite_accessory/accessories/earrings/hoop/sil + name = "Hoop Earrings (S)" + icon_state = "earringsilhoop" + gender = FEMALE + relevant_layers = list(BODY_FRONT_LAYER) + specuse = list(SPEC_ID_HUMEN, SPEC_ID_DWARF, SPEC_ID_ELF) + /datum/sprite_accessory/accessories/earrings/em name = "Earrings (E)" icon_state = "earrings_em" diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm index 8d5ae27d550..cfb0f8065a7 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -344,6 +344,20 @@ specuse = list(SPEC_ID_ELF, SPEC_ID_TIEFLING) //tiebs use these color_key_defaults = list(KEY_SKIN_COLOR) +/datum/sprite_accessory/ears/elftw + icon = 'icons/roguetown/mob/bodies/attachments.dmi' + name = "ElfTW" + icon_state = "elftw" + specuse = list(SPEC_ID_ELF, SPEC_ID_TIEFLING) //tiebs use these + color_key_defaults = list(KEY_SKIN_COLOR) + +/datum/sprite_accessory/ears/elfww + icon = 'icons/roguetown/mob/bodies/attachments.dmi' + name = "ElfWW" + icon_state = "elfww" + specuse = list(SPEC_ID_ELF, SPEC_ID_TIEFLING) //tiebs use these + color_key_defaults = list(KEY_SKIN_COLOR) + /datum/sprite_accessory/ears/elfh //halfelfs are humens techincally icon = 'icons/roguetown/mob/bodies/attachments.dmi' name = "ElfH" diff --git a/code/modules/mob/dead/new_player/sprite_accessories/facial_details.dm b/code/modules/mob/dead/new_player/sprite_accessories/facial_details.dm index 16c71f984cd..8a9d8c1acf4 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/facial_details.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/facial_details.dm @@ -124,3 +124,27 @@ /datum/sprite_accessory/detail/tattoo_eye_l name = "Tattoo (l Eye)" icon_state = "tattoo_eye_l" + +/datum/sprite_accessory/detail/warpaint_blue_stripes + name = "Striped Warpaint (Blue)" + icon_state = "warpaint_blue_stripes" + +/datum/sprite_accessory/detail/warpaint_red_stripes + name = "Striped Warpaint (Red)" + icon_state = "warpaint_red_stripes" + +/datum/sprite_accessory/detail/warpaint_green_stripes + name = "Striped Warpaint (Green)" + icon_state = "warpaint_green_stripes" + +/datum/sprite_accessory/detail/warpaint_purple_stripes + name = "Striped Warpaint (Purple)" + icon_state = "warpaint_purple_stripes" + +/datum/sprite_accessory/detail/warpaint_black_stripes + name = "Striped Warpaint (Black)" + icon_state = "warpaint_black_stripes" + +/datum/sprite_accessory/detail/eyebags + name = "Baggy Eyes" + icon_state = "eyebags" diff --git a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm index 27a21bbeed6..3a0c366e7f5 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm @@ -346,6 +346,27 @@ specuse = list(SPEC_ID_TIEFLING) color_key_defaults = list(KEY_SKIN_COLOR) +/datum/sprite_accessory/tail/tiefling/heart + icon = 'icons/roguetown/mob/bodies/attachments.dmi' + name = "TieftailHeart" + icon_state = "tieftailheart" + specuse = list(SPEC_ID_TIEFLING) + color_key_defaults = list(KEY_SKIN_COLOR) + +/datum/sprite_accessory/tail/tiefling/drake + icon = 'icons/roguetown/mob/bodies/attachments.dmi' + name = "TieftailDrake" + icon_state = "tieftaildrake" + specuse = list(SPEC_ID_TIEFLING) + color_key_defaults = list(KEY_SKIN_COLOR) + +/datum/sprite_accessory/tail/tiefling/spear + icon = 'icons/roguetown/mob/bodies/attachments.dmi' + name = "TieftailSpear" + icon_state = "tieftailspear" + specuse = list(SPEC_ID_TIEFLING) + color_key_defaults = list(KEY_SKIN_COLOR) + /datum/sprite_accessory/tail/triton name = "Triton Bell" icon = 'icons/mob/sprite_accessory/tails/triton.dmi' diff --git a/icons/roguetown/mob/accessories.dmi b/icons/roguetown/mob/accessories.dmi index d0c42d09ba1..bf606b8c59c 100644 Binary files a/icons/roguetown/mob/accessories.dmi and b/icons/roguetown/mob/accessories.dmi differ diff --git a/icons/roguetown/mob/bodies/attachments.dmi b/icons/roguetown/mob/bodies/attachments.dmi index 719a0ece834..1ee4c22d9f3 100644 Binary files a/icons/roguetown/mob/bodies/attachments.dmi and b/icons/roguetown/mob/bodies/attachments.dmi differ diff --git a/icons/roguetown/mob/detail.dmi b/icons/roguetown/mob/detail.dmi index a2c750314f8..0ac585593e3 100644 Binary files a/icons/roguetown/mob/detail.dmi and b/icons/roguetown/mob/detail.dmi differ