From b81d6bccba7616d3b1803528fcb0de6da8ddebc3 Mon Sep 17 00:00:00 2001 From: QuoteFox <49098813+quotefox@users.noreply.github.com> Date: Sat, 27 Mar 2021 10:56:23 +0000 Subject: [PATCH] Revert "Revert "Revert "Hair_gradients part one.""" This reverts commit c5d8bb5fb30d676b419514930cb981766c2ffeac. --- code/__HELPERS/global_lists.dm | 20 ------------------ code/modules/client/preferences.dm | 19 ----------------- code/modules/client/preferences_savefile.dm | 6 ------ .../mob/living/carbon/human/human_defines.dm | 3 --- .../mob/living/carbon/human/species.dm | 11 ---------- icons/mob/hair_gradients.dmi | Bin 2078 -> 0 bytes 6 files changed, 59 deletions(-) delete mode 100644 icons/mob/hair_gradients.dmi diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index cab2c536..c4e53366 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -88,22 +88,6 @@ init_subtypes(/datum/crafting_recipe, GLOB.crafting_recipes) - //gradients -GLOBAL_LIST_INIT(hair_gradients, list( - "None" = "none", - "Fade (Up)" = "fadeup", - "Fade (Down)" = "fadedown", - "Fade Low (Up)" = "fadeup_low", - "Bottom Flat" = "bottomflat", - "Fade Low (Down)" = "fadedown_low", - "Vertical Split" = "vsplit", - "Reflected" = "reflected", - "Reflected (Inverted)" = "reflected_inverse", - "Reflected High" = "reflected_high", - "Reflected High (Inverted)" = "reflected_inverse_high", - "Wavy" = "wavy" - )) - //creates every subtype of prototype (excluding prototype) and adds it to list L. //if no list/L is provided, one is created. /proc/init_subtypes(prototype, list/L) @@ -121,7 +105,3 @@ GLOBAL_LIST_INIT(hair_gradients, list( for(var/path in subtypesof(prototype)) L+= path return L - - -//hair gradient list. Since it shouldn't need to have a seperate datum list.sanitize_inlist - diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 9ec0d7ef..1e447659 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -92,8 +92,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/hair_color = "000" //Hair color var/facial_hair_style = "Shaved" //Face hair type var/facial_hair_color = "000" //Facial hair color - var/grad_style = "None" //Hair Gradient style - var/grad_color = "#000000" //Hair Gradient color var/skin_tone = "caucasian1" //Skin color var/eye_color = "000" //Eye color var/wing_color = "fff" //Wing color @@ -474,9 +472,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "[hair_style]" dat += "< >
" dat += "    Change
" - dat += "

Hair Gradiant

" - dat += "[grad_style]" - dat += "    Change
" dat += "

Facial Hair Style

" @@ -1752,18 +1747,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(hair_style == "Tail Hair" && clientckey <> "quotefox") hair_style = "Bald" - if("grad_style") - var/new_grad_style - new_grad_style = input(user, "Choose your character's hair gradiant:", "Character Preference") as null|anything in GLOB.hair_gradients - if(new_grad_style) - grad_style = new_grad_style - - if("grad") - var/new_grad - new_grad = input(user, "Choose your character's gradiant color:", "Character Preference", new_grad) as color|null - if(new_grad) - grad_color = sanitize_hexcolor(new_grad) - if("facial") var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference","#"+facial_hair_color) as color|null if(new_facial) @@ -2720,13 +2703,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) organ_eyes.old_eye_color = eye_color character.hair_color = hair_color character.facial_hair_color = facial_hair_color - character.grad_color = grad_color character.wing_color = wing_color character.skin_tone = skin_tone character.hair_style = hair_style character.facial_hair_style = facial_hair_style - character.grad_style = grad_style character.underwear = underwear character.saved_underwear = underwear diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 776951b4..1507f830 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -311,12 +311,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["body_size"] >> body_size S["hair_color"] >> hair_color S["facial_hair_color"] >> facial_hair_color - S["grad_color"] >> grad_color S["eye_color"] >> eye_color S["skin_tone"] >> skin_tone S["hair_style_name"] >> hair_style S["facial_style_name"] >> facial_hair_style - S["grad_style_name"] >> grad_style S["underwear"] >> underwear S["undie_color"] >> undie_color S["undershirt"] >> undershirt @@ -482,7 +480,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car else hair_style = sanitize_inlist(hair_style, GLOB.hair_styles_female_list) facial_hair_style = sanitize_inlist(facial_hair_style, GLOB.facial_hair_styles_female_list) - grad_style = sanitize_inlist(grad_style, GLOB.hair_gradients) underwear = sanitize_inlist(underwear, GLOB.underwear_list) undie_color = sanitize_hexcolor(undie_color, 3, 0, initial(undie_color)) undershirt = sanitize_inlist(undershirt, GLOB.undershirt_list) @@ -492,7 +489,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age)) hair_color = sanitize_hexcolor(hair_color, 3, 0) facial_hair_color = sanitize_hexcolor(facial_hair_color, 3, 0) - grad_color = sanitize_hexcolor(grad_color, 6, 1) eye_color = sanitize_hexcolor(eye_color, 3, 0) skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones) wing_color = sanitize_hexcolor(wing_color, 3, FALSE, "#FFFFFF") @@ -562,12 +558,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["age"] , age) WRITE_FILE(S["hair_color"] , hair_color) WRITE_FILE(S["facial_hair_color"] , facial_hair_color) - WRITE_FILE(S["grad_color"] , grad_color) WRITE_FILE(S["eye_color"] , eye_color) WRITE_FILE(S["skin_tone"] , skin_tone) WRITE_FILE(S["hair_style_name"] , hair_style) WRITE_FILE(S["facial_style_name"] , facial_hair_style) - WRITE_FILE(S["grad_style_name"] , grad_style) WRITE_FILE(S["underwear"] , underwear) WRITE_FILE(S["body_size"] , body_size) WRITE_FILE(S["undie_color"] , undie_color) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index bc429365..fd9fdcb5 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -14,9 +14,6 @@ var/facial_hair_color = "000" var/facial_hair_style = "Shaved" - var/grad_style = "none" - var/grad_color = "#000000" - //Eye colour var/eye_color = "000" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index b5949de3..9b457213 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -15,7 +15,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/hair_color // this allows races to have specific hair colors... if null, it uses the H's hair/facial hair colors. if "mutcolor", it uses the H's mutant_color var/hair_alpha = 255 // the alpha used by the hair. 255 is completely solid, 0 is transparent. var/wing_color - var/grad_color var/use_skintones = 0 // does it use skintones or not? (spoiler alert this is only used by humans) var/exotic_blood = "" // If your race wants to bleed something other than bog standard blood, change this to reagent id. @@ -468,16 +467,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(OFFSET_FACE in H.dna.species.offset_features) hair_overlay.pixel_x += H.dna.species.offset_features[OFFSET_FACE][1] hair_overlay.pixel_y += H.dna.species.offset_features[OFFSET_FACE][2] - if(H.grad_style) - var/icon/grad_s = new/icon("icon" = 'icons/mob/hair_gradients.dmi', "icon_state" = GLOB.hair_gradients[H.grad_style]) - var/grad_f_color = null - if(grad_color) - grad_f_color = "#" + grad_color - else - grad_f_color = "#" + H.grad_color - grad_s.Blend(grad_f_color, ICON_ADD) - hair_overlay.filters = filter(type="layer", icon = grad_s, blend_mode = BLEND_INSET_OVERLAY) - if(hair_overlay.icon) standing += hair_overlay diff --git a/icons/mob/hair_gradients.dmi b/icons/mob/hair_gradients.dmi deleted file mode 100644 index 1a3c330355e440666270dbd378f7e459fbdc091a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2078 zcma)7dpOgJ8~@H0LrkM)ZV`z@N0&m}9-ig->w`9eL7Lou6~w{O^=p?m{5sVgKu;4a8-kE zl~f-xIIJH?{@(N}zT~6B!t>-*yd!g&yc@%f=GcM5cwjY{yg=8)SJfy6|*FfCHB@6a^a19Lgbz8 zvKrH|D7`nt>28dsGmcw220wEEyh-o*NUDy0wl{X9XyU% z&K%WL^unY5*;Y+9q@cg&WMxFKuiO+%44x17(F@q}Sbr*dW02(JHTQwtlT4x2M6~8v zBCl)4VO2hjSH_I6x}!zLpVAm>SY+17TYo5hYh!31Vg?)(UA%rR9KVzPP)AC1!7Z+| zQ-an-B}g-5%jQ#0j`4`~`kuDhy<7{Cf4?pq%CTx|57rn-A0jMA#zpZKuYK`7yWcW- z%jQrMidx!fP&;nSrYlU6(Eqpo8`NnX+T?2+!gCdj{02Zyznj6p>S}n=LtM4fGAvJSJHgh-!0t3cAao4CcbFS!F<$D zlX@PnZ|5nA>0*95NqE2u^XKSoY92R=-NMy-N&T}U zx*%~{#p&)qUR}!8D(H>>TcDU;5pRA1!d)`o1>zXCu;ROfd=CXX5u@lKJ7@6`QHAt< zHTMJ4`bWdVB`w;)l44-o^n>a+`L(N0v`!-{Q(IZm!28iAQGCa0g#ZJZX0D9uj4jRY zC@*rqFr$;$#RNXb--gjbh~tXXS`(>?_!-cu@!z4I9a;CaP67Q$HrK$g%+W_-n2qpD zQ3S53jmpvTuD>fxtbzmOn?@DDmFl+grXUVM&Siqbg7l+?m8&Fc?^~YP?uRMZ<3H29 z+!H|M=>qAMp~t_4H;(W+(KIp)koD+I>{I!m-v?y6of(`#jL|%dfd2HzPbIW6gc69p=~C=6#W`V{a2H_} zzcz>wXOFM9>>yx{)Z(#a{<(q@d26xW(xD8ADpsI#O;%Q<4TmbJp#NF~1k>6jJeHK= zW3WQS(l46t8W_(tCy9TW@rjahEH}u(gmvUfVc;F%LUL1!NgS0IL&SgHP&7RyJ3GER zLtwl#Ggzrc~6XRYpGo3p$7aNtUagRG1tD$I3!4$i!YqIGN^3oQ{i zKV9-$O2L`!ah#$6@g&gS_Kc01;%yoTpBx1E_@5*;l1)+M{E(tNO;7y3^2#HcH ze{187$(R9pf5}b&RhV8k3IN!WDQ*+v6Du9xH zi!u?L$sMWY4D_ry9Igj^jBrSB(rV1HxDQF{e#_aDW&{(^&&-F`O>+o{WYIIvD(7JM!}l*8zWqg6i-3c-Y% ztY`#|@A;^vm~#TD!Q4w9$LzB@2dP_UPWp9MHLVJ?T=0%o<%9dHpLk_pn{s7$U)3~5 zj5wJK&QA*2xLI){4jJn_t7&w`D1R9f6>D-J*~oISPqV;9uF*Pk(+|?nki#oavW`9* zs5zetp~Fx$y>p;p<+RC595|4q6_BE+Un-WVmsW@`ab~aQK|*(|6CAu{NZXz^DO2~o f#KG4X(qwYoPpw279+Y~lKYYLq?d8;j!l(ZacJ$Xb