Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion code/modules/client/customizer/customizers/organ/ears.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions code/modules/client/customizer/customizers/organ/horns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions code/modules/client/customizer/customizers/organ/tail.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions code/modules/mob/dead/new_player/sprite_accessories/accessory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 14 additions & 0 deletions code/modules/mob/dead/new_player/sprite_accessories/ears.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
21 changes: 21 additions & 0 deletions code/modules/mob/dead/new_player/sprite_accessories/tails.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Binary file modified icons/roguetown/mob/accessories.dmi
Binary file not shown.
Binary file modified icons/roguetown/mob/bodies/attachments.dmi
Binary file not shown.
Binary file modified icons/roguetown/mob/detail.dmi
Binary file not shown.
Loading