From ccac59acc9e82d3a96fb46f487a11f0478a95f63 Mon Sep 17 00:00:00 2001 From: quotefox <49098813+quotefox@users.noreply.github.com> Date: Tue, 19 Nov 2019 06:48:37 +0000 Subject: [PATCH] hairfix --- code/modules/client/preferences.dm | 8 ++++++-- icons/mob/human_face.dmi | Bin 173346 -> 173351 bytes 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 8799984b..53115d96 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1539,15 +1539,19 @@ GLOBAL_LIST_EMPTY(preferences_datums) new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in GLOB.hair_styles_list if(new_hair_style) hair_style = new_hair_style - if(new_hair_style == "tail hair" && clientckey <> "quotefox") - hair_style = "bald" + if(new_hair_style == "Tail Hair" && clientckey <> "duote3ox") + hair_style = "Bald" if("next_hair_style") hair_style = next_list_item(hair_style, GLOB.hair_styles_list) + if(hair_style == "Tail Hair" && clientckey <> "duote3ox") + hair_style = "Bald" if("previous_hair_style") hair_style = previous_list_item(hair_style, GLOB.hair_styles_list) + if(hair_style == "Tail Hair" && clientckey <> "duote3ox") + hair_style = "Bald" if("facial") var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference","#"+facial_hair_color) as color|null diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index ed547265648c1f7205ac039d9c46028a3b377292..9ccd2c8c7cca47d6e736821980946f3c3f64a874 100644 GIT binary patch delta 2329 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 delta 2331 zcmcIldpy(KAD>Gl)T19BR1ZD1kaEc*VOZt%xIFGuVlHV?Mii6HzCuNY-)}_1T<1<{ zpiyTczC>>!UzjI1<`AhI(}$S#`Mozy5m+m_@pD#bs;(cK03WP6I7<- zSeIc&2rQL}Kc}rGTG~};>uIiKuy@GHAE(A<2v<*b!!p1pmgO2=@T z6(RN0bXGT;(ZE%P>g)HfScXux*~nR%%F!HfDAM52Xi_mIqfibcDB(>KavH};yC*y4 zwZ%f1S?eVm9n9{3TJ3kiB|Zq=25Op39)tXP|w8I3Q5@yV&DDE!QKtKMgNgA@Toq0sq7I|8U*H z!T8|uUwpPUqHVsAKaJO$*XFN`({0>OPv4G7vk>TW*GDB~2_Hr9`O!oH#Nv zvcM~{4r55s;-Tx;$gr!%IgG8C@16mRu?8B(hymDos$88z3S0$3!LJgKw#cE|5aBTo z+?h4A+;Kl2YaXxe7sBIPZ;tR&(89hG5f9%NjDAVdnIdmLMP~nI1nK-}SH=v$fam{2 ze~a`ib+&5amS@z=DSpk;x+`X85&3@(4o;#ffezvEX1Hn;Z1S$lqAPt0tFN z`^VIppXRwwqsEJiyk~>L{&~akrnNJ*yNwk~l)q0K3-N(Xu%Pca%+_Y{O;2B=2wq$( z_SDH78idR(@hs@GuO8MHaXI&E@}lUQN@hS9<3#DPN6{yGS>1pcn|5<$CSQ)0P;j*| zEgYd65LsQ(l71J5Z&SJ33cCcvs-a0mm6~bUT}iDsf?{!t`(Mw`&-*nj@z1^z9be-0%_hzl zd00VTZ=ziw5RR)C>Tp3nYdcbgJao~RG|7|-UO#B3P(* z?mfw;QkOurT9nV~V=$j}X#wFMY#T)uCR;hu3HDWfbp^GS#dKU@_O~SFhIgwo-Wdy4 zxH*tC5`REHU2%6Rk9mgkg1lqoRO!-f`|#t|Ea3Uj@qA50cK|0KGf_#mD;c^o$IDP5 zZI?2*J|*hGt0eByZ}-{s8+guknQOT%qqp3xlDZx_wzZmuoE?P}Arp1gH8k9ER^;Dx3YEE^$+RL>FiHB)&)%BS-fx87AfLHPg@*;&J`Z6sHA;X7 zYD<>cQlWthSr<_chajk#iaIh8k*~UdL8lI|Lu*D6Wc|$|B!B!nZErDyIPQz-muT(X z95ZoLxd&Fri4gg;yj(?RHgS-eMik^8{$TW_44d}(<>Fyhx0z;2r>dCnSOY-&kd7PW zt!qJ{MOM>@%8H6>nJaIM_soHDD)pJ#^STRA=nQ&SY0oXpSitK0dlAzh7gZT>Xub{a zuH5gccn4LP`eqe8C;GfO{~@BbQDfOq6bf~x#;s>aOSK9{S}=1c)RJtVwXSsu2rg&X z$e3xj&sB1R^b?hoFkdIDx$b7Adaq3#9(<{k*!egP_V@8=0hl}tnTSdj8F^Db(odyQ z-!H9RuP1-uXLvhwaEFl#o)V~h)Fe*7Qwg7)nKBS>KV90Bq?#S6&W@BmvQ&Hc@L?TY-6CgdclKJlJYUWfrq))+xGZ`C zh6fZLO?<+yMMXtPjZn$fOt^a3e&=Ji_~U4`>5y4G*xI6R#9=gG zF2^FwkYv0zbX&(4+xOu^tYc{^-WZ5fyNRV|tHyj;cwRnEqwoUw&+=GMh!X z(RyvFONMTR=i(m%pc~uUFV7&-x=#Gv zcR_7G!a`oaTJ!1%j8x?0PiqS-WRggx9JhMI`^>vFZU%aK_EMt!!vh2u;ghV6CNYWV zOI1m~n>!S?wwm}gRPMLj^RV`oS0u$5?#@4`m2^WJ^k`KGG!A6mcQ;Zt$ChA}8Qifp zv6s)vwi~?T(k|ZyRS0r!TfanlCj*f*`Atz#Ek(a?zArCyD&-hVIi-((QTZxA1D|c& z*wLLmOi#-9_H{ceh=>)p>jC0+_MY;;2GPs8)z#-c@Fc@;n&BRbsIBF3V#rRLtAw6)x7$_>`<^dUym(I$P2*3AUAuL@f iTR0-!D_dCn*R5Zyo>+_qE`rPjGcC<*O{=bWMgIfVlXgM?