diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index d017b28664e..098fb6f3f66 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -343,7 +343,7 @@ var/global/list/valid_bloodtypes = list( out += "
Body Markings +
" for(var/M in pref.body_markings) - out += "[M] [pref.body_markings.len > 1 ? "˄ ˅ " : ""]- Color" + out += "[M] [pref.body_markings.len > 1 ? "˄ ˅ " : ""]- Color[length(mob_species.character_color_presets) ? "Preset" : ""]" out += HTML_RECT(pref.body_markings[M]) out += "
" @@ -731,6 +731,14 @@ var/global/list/valid_bloodtypes = list( pref.body_markings[M] = "[mark_color]" return TOPIC_REFRESH_UPDATE_PREVIEW + else if(href_list["marking_preset"]) + var/M = href_list["marking_preset"] + var/mark_preset = tgui_input_list(user, "Choose the [M] preset: ", "Character Preference", mob_species.character_color_presets, rgb(pref.r_skin, pref.g_skin, pref.b_skin)) + mark_preset = mob_species.character_color_presets[mark_preset] + if(mark_preset && CanUseTopic(user)) + pref.body_markings[M] = "[mark_preset]" + return TOPIC_REFRESH_UPDATE_PREVIEW + else if(href_list["limbs"]) var/list/acceptable_organ_input = list("Head", "Left Leg","Right Leg","Left Arm","Right Arm","Left Foot","Right Foot","Left Hand","Right Hand") var/limb_name = tgui_input_list(user, "Which limb do you want to change?", "Limbs", acceptable_organ_input) diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 2056eacf513..2e51ee7f636 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -1574,99 +1574,6 @@ Follow by example and make good judgement based on length which list to include icon_state = "hair_mullet" chatname = "mullet" -/datum/sprite_accessory/hair/bug_eyes - icon = 'icons/mob/human_face/dionae_hair.dmi' - name = "Bug Eyes" - icon_state = "bugeyes" - species_allowed = list(/datum/species/diona, /datum/species/diona/coeu) - gender = NEUTER - do_colouration = FALSE - -/datum/sprite_accessory/hair/bug_eyes/human_eyes - name = "Human Eyes" - icon_state = "humaneyes" - -/datum/sprite_accessory/hair/bug_eyes/skrell_eyes - name = "Skrell Eyes" - icon_state = "skrelleyes" - -/datum/sprite_accessory/hair/bug_eyes/skrell_eyes_2 - name = "Skrell Eyes 2" - icon_state = "skrelleyes2" - -/datum/sprite_accessory/hair/bug_eyes/small_horns - name = "Small Horns" - icon_state = "smallhorns" - -/datum/sprite_accessory/hair/bug_eyes/horny - name = "Horny" - icon_state = "horny" - -/datum/sprite_accessory/hair/bug_eyes/headtails - name = "Head tails" - icon_state = "headtails" - -/datum/sprite_accessory/hair/bug_eyes/headtails_2 - name = "Head tails 2" - icon_state = "headtails2" - -/datum/sprite_accessory/hair/bug_eyes/tiny_eye - name = "Tiny Eye" - icon_state = "tinyeye" - -/datum/sprite_accessory/hair/bug_eyes/eyebrow - name = "Eyebrow" - icon_state = "eyebrow" - -/datum/sprite_accessory/hair/bug_eyes/bullhorn - name = "Bullhorn" - icon_state = "bullhorn" - -/datum/sprite_accessory/hair/bug_eyes/blinkinghelmethead - name = "Blinking Helmethead" - icon_state = "blinkinghelmethead" - -/datum/sprite_accessory/hair/bug_eyes/periscope - name = "Periscope" - icon_state = "periscope" - -/datum/sprite_accessory/hair/bug_eyes/glorp - name = "Glorp" - icon_state = "glorp" - -/datum/sprite_accessory/hair/bug_eyes/mellow_cap - name = "Mellow Cap" - icon_state = "mellowcap" - -/datum/sprite_accessory/hair/bug_eyes/red_cap - name = "Red Cap" - icon_state = "redcap" - -/datum/sprite_accessory/hair/bug_eyes/fun_guy - name = "Fun Guy" - icon_state = "funguy" - -/datum/sprite_accessory/hair/bug_eyes/spanish_moss - name = "Spanish Moss" - icon_state = "spanishmoss" - -/datum/sprite_accessory/hair/bug_eyes/shelflife - name = "Shelflife" - icon_state = "shelflife" - do_colouration = TRUE - -/datum/sprite_accessory/hair/bug_eyes/oak - name = "Oak" - icon_state = "oak" - -/datum/sprite_accessory/hair/bug_eyes/thorns - name = "Thorns" - icon_state = "thorns" - -/datum/sprite_accessory/hair/bug_eyes/stump - name = "Stump" - icon_state = "stump" - // TG-format hair - uses ICON_MULTIPLY instead of ICON_ADD /datum/sprite_accessory/hair/balding icon = 'icons/mob/human_face/hair_multiply.dmi' @@ -4491,74 +4398,6 @@ Follow by example and make good judgement based on length which list to include name = "golden deep IPC screen" icon_state = "ipc_gd" -/datum/sprite_accessory/facial_hair/diona_eye - icon = 'icons/mob/human_face/dionae_hair.dmi' - name = "Mono Eye" - icon_state = "monoeye" - species_allowed = list(/datum/species/diona, /datum/species/diona/coeu) - gender = NEUTER - do_colouration = FALSE - -/datum/sprite_accessory/facial_hair/diona_eye/trioptics - name = "Trioptics" - icon_state = "trioptics" - -/datum/sprite_accessory/facial_hair/diona_eye/lopsided - name = "Lopsided Eyes" - icon_state = "lopsided" - -/datum/sprite_accessory/facial_hair/diona_eye/helmethead - name = "Helmethead" - icon_state = "helmethead" - -/datum/sprite_accessory/facial_hair/diona_eye/eyestalk - name = "Eyestalk" - icon_state = "eyestalk" - -/datum/sprite_accessory/facial_hair/diona_eye/treebeard - name = "Treebeard" - icon_state = "treebeard" - -/datum/sprite_accessory/facial_hair/diona_eye/bug_eyes - name = "Bug Eyes" - icon_state = "bugeyes" - -/datum/sprite_accessory/facial_hair/diona_eye/human_eyes - name = "Human Eyes" - icon_state = "humaneyes" - -/datum/sprite_accessory/facial_hair/diona_eye/skrell_eyes - name = "Skrell Eyes" - icon_state = "skrelleyes" - -/datum/sprite_accessory/facial_hair/diona_eye/skrell_eyes_2 - name = "Skrell Eyes 2" - icon_state = "skrelleyes2" - -/datum/sprite_accessory/facial_hair/diona_eye/tiny_eye - name = "Tiny Eye" - icon_state = "tinyeye" - -/datum/sprite_accessory/facial_hair/diona_eye/eyebrow - name = "Eyebrow" - icon_state = "eyebrow" - -/datum/sprite_accessory/facial_hair/diona_eye/blinkinghelmethead - name = "Blinking Helmethead" - icon_state = "blinkinghelmethead" - -/datum/sprite_accessory/facial_hair/diona_eye/periscope - name = "Periscope" - icon_state = "periscope" - -/datum/sprite_accessory/facial_hair/diona_eye/glorp - name = "Glorp" - icon_state = "glorp" - -/datum/sprite_accessory/facial_hair/diona_eye/snout - name = "Snout" - icon_state = "snout" - /datum/sprite_accessory/facial_hair/tuux_whiskers icon = 'icons/mob/human_face/skrell_beards.dmi' name = "Tuux Tentacle Whiskers" @@ -6376,12 +6215,6 @@ Follow by example and make good judgement based on length which list to include body_parts = list(BP_R_HAND, BP_L_HAND) do_colouration = FALSE -/datum/sprite_accessory/marking/diona_leaves/tail - name = "Tail" - icon_state = "dionatail" - body_parts = list(BP_GROIN) - do_colouration = FALSE - // Baseline markings. /datum/sprite_accessory/marking/baseline_head name = "Baseline - Raxus Primary Colors" diff --git a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm index 0f902877663..f75270a71c3 100644 --- a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm +++ b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm @@ -97,7 +97,7 @@ body_temperature = T0C + 15 //make the plant people have a bit lower body temperature, why not - appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_TONE | HAS_SKIN_PRESET + appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_PRESET flags = NO_BREATHE | NO_SCAN | IS_PLANT | NO_BLOOD | NO_SLIP | NO_CHUBBY | NO_ARTERIES spawn_flags = CAN_JOIN | IS_WHITELISTED | NO_AGE_MINIMUM @@ -135,6 +135,10 @@ snore_key = "chirp" indefinite_sleep = TRUE + tail = "No Tail" + tail_animation = 'icons/mob/species/diona/tail.dmi' + selectable_tails = list("No Tail", "Unathi Tail") + /datum/species/diona/can_understand(var/mob/other) var/mob/living/carbon/alien/diona/D = other if(istype(D)) diff --git a/html/changelogs/SimpleMaroon-dionacoloration.yml b/html/changelogs/SimpleMaroon-dionacoloration.yml new file mode 100644 index 00000000000..d28aa49ced4 --- /dev/null +++ b/html/changelogs/SimpleMaroon-dionacoloration.yml @@ -0,0 +1,61 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a 'preset' button to body markings that lets you choose the same color presets that your species has; it only shows up if your species actually has color presets." + - rscdel: "Removed skin tone selectability from Dionae." + - qol: "Changed the tail body marking for Dionae into an actual tail option." + - rscdel: "Dionae no longer have hair styles or facial hair styles, as all of them are selectable under body markings anyway." diff --git a/icons/mob/human_races/markings_diona.dmi b/icons/mob/human_races/markings_diona.dmi index 388b21f38b0..188a8b0017b 100644 Binary files a/icons/mob/human_races/markings_diona.dmi and b/icons/mob/human_races/markings_diona.dmi differ diff --git a/icons/mob/species/diona/tail.dmi b/icons/mob/species/diona/tail.dmi new file mode 100644 index 00000000000..94cfc687fec Binary files /dev/null and b/icons/mob/species/diona/tail.dmi differ