diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 459796e8e9d..b593b5041b8 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -2766,7 +2766,7 @@ Follow by example and make good judgement based on length which list to include */ /datum/sprite_accessory/marking icon = 'icons/mob/human_races/markings.dmi' - do_colouration = 1 //Almost all of them have it, COLOR_ADD + do_colouration = TRUE //Almost all of them have it, COLOR_ADD species_allowed = list() @@ -2917,7 +2917,7 @@ Follow by example and make good judgement based on length which list to include icon_state = "skr_tears" body_parts = list(BP_HEAD) species_allowed = list("Skrell") - do_colouration = 0 + do_colouration = FALSE skr_arms name = "Skrell Arms" @@ -2932,6 +2932,55 @@ Follow by example and make good judgement based on length which list to include body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_CHEST,BP_GROIN,BP_HEAD) species_allowed = list("Diona") + diona_thorns_head + name = "Diona Thorns (Head)" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_thorns" + body_parts = list(BP_HEAD) + species_allowed = list("Diona") + + diona_thorns_torso + name = "Diona Thorns (Torso)" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_thorns" + body_parts = list(BP_CHEST) + species_allowed = list("Diona") + + diona_flowers_head + name = "Diona Flowers (Head)" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_flowers" + body_parts = list(BP_HEAD) + species_allowed = list("Diona") + + diona_flowers_torso + name = "Diona Flowers (Torso)" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_flowers" + body_parts = list(BP_CHEST) + species_allowed = list("Diona") + + diona_moss + name = "Diona Moss" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_moss" + body_parts = list(BP_CHEST) + species_allowed = list("Diona") + + diona_mushroom + name = "Diona Mushroom" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_mushroom" + body_parts = list(BP_HEAD) + species_allowed = list("Diona") + + diona_antennae + name = "Diona Antennae" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_antennae" + body_parts = list(BP_HEAD) + species_allowed = list("Diona") + bishop_lights name = "Lights Colour" icon = 'icons/mob/human_races/markings_bishop.dmi' diff --git a/html/changelogs/wezzy_diona_markings.yml b/html/changelogs/wezzy_diona_markings.yml new file mode 100644 index 00000000000..ad0bc7a796a --- /dev/null +++ b/html/changelogs/wezzy_diona_markings.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy), TheDilShawn + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds more Diona marking customization options. Sprites courtesy of TheDilShawn." diff --git a/icons/mob/human_races/markings_diona.dmi b/icons/mob/human_races/markings_diona.dmi index ee1fcd6bbcc..5782e6e0ab9 100644 Binary files a/icons/mob/human_races/markings_diona.dmi and b/icons/mob/human_races/markings_diona.dmi differ