diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm index 776c003f6d..8df40c81d4 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm @@ -593,6 +593,7 @@ S.dullahan_overlays[S.dullahan_overlays[6]] = tempcolor else S.dullahan_overlays[6] = extraoff + S.dullahan_overlays[S.dullahan_overlays[6]] = "#FFFFFF" if("Eyes") options = dullahaneyes_styles for(var/option in options) @@ -639,13 +640,21 @@ S.dullahan_overlays[S.dullahan_overlays[7]] = new_color if("Head") options = dullahanhead_styles + var/new_color = "#FFFFFF" for(var/option in options) var/image/I = image('icons/mob/robot/dullahan/v1/Dullahanprotean64x64.dmi', option, dir = 2, pixel_x = -16, pixel_y = -16) LAZYSET(options, option, I) choice = show_radial_menu(protie, protie, options, radius = 90) if(!choice || QDELETED(protie) || protie.incapacitated()) return 0 - S.dullahan_overlays[4] = choice //head overlay is 2 + if (choice == "dullahanhead" || choice == "dullahanhead2") + new_color = "#FFFFFF" + else + new_color = tgui_color_picker(protie, "Pick clothes color:","Clothes Color", S.dullahan_overlays[4]) + if(!new_color) + return 0 + S.dullahan_overlays[4] = choice //head overlay is 4 + S.dullahan_overlays[S.dullahan_overlays[4]] = new_color if("Import") var/dinput_style dinput_style = sanitizeSafe(tgui_input_text(protie,"Paste the style string you exported with Export Style.", "Style loading","", 120, encode = FALSE), 128) diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm index 9474592e24..c426124a10 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm @@ -129,9 +129,9 @@ var/list/dullahan_overlays = list( "dullahanbody" = "#FFFFFF", // body 1 - "dullahanhead" = "#FFFFFF", // head 4 - "dullahanmetal" = "#FFFFFF", // metal 3 "dullahaneyes" = "#FFFFFF", // eyes 2 + "dullahanmetal" = "#FFFFFF", // metal 3 + "dullahanhead" = "#FFFFFF", // head 4 "dullahanlightsempty" = "#FFFFFF", // lights 5 "dullahanextended" = "#FFFFFF", // breastplate part only on 6, do not use for anything else "dullahanclothesempty" = "#FFFFFF" // clothes 7 diff --git a/icons/mob/robot/dullahan/v1/Dullahanprotean64x64.dmi b/icons/mob/robot/dullahan/v1/Dullahanprotean64x64.dmi index 6dce080075..3d75a87ef6 100644 Binary files a/icons/mob/robot/dullahan/v1/Dullahanprotean64x64.dmi and b/icons/mob/robot/dullahan/v1/Dullahanprotean64x64.dmi differ