From 2f03df4b9b001e8ba2e3640340e4a1905799639b Mon Sep 17 00:00:00 2001 From: Datraen Date: Thu, 12 May 2016 11:45:43 -0400 Subject: [PATCH 1/2] Adds Headtail Chains, Bands, Cloth by Wer6. --- .../preference_setup/loadout/loadout_xeno.dm | 80 ++++++++------- code/modules/clothing/ears/skrell.dm | 94 ++++++++++++++---- icons/mob/ears.dmi | Bin 8235 -> 12412 bytes icons/obj/clothing/ears.dmi | Bin 2218 -> 3284 bytes 4 files changed, 115 insertions(+), 59 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 79e6a1ec7f..f3e56cf1dd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -12,55 +12,61 @@ whitelisted = "Unathi" sort_category = "Xenowear" -/datum/gear/ears/skrell - display_name = "headtail-wear, female, chain (Skrell)" +/datum/gear/ears/skrell/chains //Chains + display_name = "headtail chain selection (Skrell)" path = /obj/item/clothing/ears/skrell/chain sort_category = "Xenowear" whitelisted = "Skrell" -/datum/gear/ears/skrell/plate - display_name = "headtail-wear, male, bands (Skrell)" +/datum/gear/ears/skrell/chains/New() + ..() + var/list/chaintypes = list() + for(var/chain_style in typesof(/obj/item/clothing/ears/skrell/chain)) + var/obj/item/clothing/ears/skrell/chain/chain = chain_style + chaintypes[initial(chain.name)] = chain + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(chaintypes)) + +/datum/gear/ears/skrell/bands + display_name = "headtail band selection (Skrell)" path = /obj/item/clothing/ears/skrell/band + sort_category = "Xenowear" + whitelisted = "Skrell" -/datum/gear/ears/skrell/cloth //male/red - display_name = "headtail-wear, male, red, cloth (Skrell)" +/datum/gear/ears/skrell/bands/New() + ..() + var/list/bandtypes = list() + for(var/band_style in typesof(/obj/item/clothing/ears/skrell/band)) + var/obj/item/clothing/ears/skrell/band/band = band_style + bandtypes[initial(band.name)] = band + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(bandtypes)) + +/datum/gear/ears/skrell/cloth/male + display_name = "male headtail cloth selection (Skrell)" path = /obj/item/clothing/ears/skrell/cloth_male + sort_category = "Xenowear" + whitelisted = "Skrell" -/datum/gear/ears/skrell/cloth/male //black - display_name = "headtail-wear, male, black, cloth (Skrell)" - path = /obj/item/clothing/ears/skrell/cloth_male/black - -/datum/gear/ears/skrell/cloth/male/blue - display_name = "headtail-wear, male, blue, cloth (Skrell)" - path = /obj/item/clothing/ears/skrell/cloth_male/blue - -/datum/gear/ears/skrell/cloth/male/green - display_name = "headtail-wear, male, green, cloth (Skrell)" - path = /obj/item/clothing/ears/skrell/cloth_male/green - -/datum/gear/ears/skrell/cloth/male/pink - display_name = "headtail-wear, male, pink, cloth (Skrell)" - path = /obj/item/clothing/ears/skrell/cloth_male/pink +/datum/gear/ears/skrell/cloth/male/New() + ..() + var/list/clothtypes = list() + for(var/cloth_style in typesof(/obj/item/clothing/ears/skrell/cloth_male)) + var/obj/item/clothing/ears/skrell/cloth_male/cloth = cloth_style + clothtypes[initial(cloth.name)] = cloth + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(clothtypes)) /datum/gear/ears/skrell/cloth/female - display_name = "headtail-wear, female, red, cloth (Skrell)" + display_name = "female headtail cloth selection (Skrell)" path = /obj/item/clothing/ears/skrell/cloth_female + sort_category = "Xenowear" + whitelisted = "Skrell" -/datum/gear/ears/skrell/cloth/female/black - display_name = "headtail-wear, female, black, cloth (Skrell)" - path = /obj/item/clothing/ears/skrell/cloth_female/black - -/datum/gear/ears/skrell/cloth/female/blue - display_name = "headtail-wear, female, blue, cloth (Skrell)" - path = /obj/item/clothing/ears/skrell/cloth_female/blue - -/datum/gear/ears/skrell/cloth/female/green - display_name = "headtail-wear, female, green, cloth (Skrell)" - path = /obj/item/clothing/ears/skrell/cloth_female/green - -/datum/gear/ears/skrell/cloth/female/pink - display_name = "headtail-wear, female, pink, cloth (Skrell)" - path = /obj/item/clothing/ears/skrell/cloth_female/pink +/datum/gear/ears/skrell/cloth/female/New() + ..() + var/list/clothtypes = list() + for(var/cloth_style in typesof(/obj/item/clothing/ears/skrell/cloth_female)) + var/obj/item/clothing/ears/skrell/cloth_female/cloth = cloth_style + clothtypes[initial(cloth.name)] = cloth + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(clothtypes)) /datum/gear/uniform/teshari display_name = "smock, grey (Teshari)" diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm index 59428fa5d9..215a0a9ff1 100644 --- a/code/modules/clothing/ears/skrell.dm +++ b/code/modules/clothing/ears/skrell.dm @@ -11,73 +11,123 @@ species_restricted = list("Skrell") /obj/item/clothing/ears/skrell/chain - name = "skrell headtail chains" + name = "Gold headtail chains" desc = "A delicate golden chain worn by female skrell to decorate their head tails." icon_state = "skrell_chain" item_state = "skrell_chain" - + +/obj/item/clothing/ears/skrell/chain/silver + name = "Silver headtail chains" + desc = "A delicate silver chain worn by female skrell to decorate their head tails." + icon_state = "skrell_chain_sil" + item_state = "skrell_chain_sil" + +/obj/item/clothing/ears/skrell/chain/bluejewels + name = "Blue jeweled golden headtail chains" + desc = "A delicate golden chain adorned with blue jewels worn by female skrell to decorate their head tails." + icon_state = "skrell_chain_bjewel" + item_state = "skrell_chain_bjewel" + +/obj/item/clothing/ears/skrell/chain/redjewels + name = "Red jeweled golden headtail chains" + desc = "A delicate golden chain adorned with red jewels worn by female skrell to decorate their head tails." + icon_state = "skrell_chain_rjewel" + item_state = "skrell_chain_rjewel" + +/obj/item/clothing/ears/skrell/chain/ebony + name = "Ebony headtail chains" + desc = "A delicate ebony chain worn by female skrell to decorate their head tails." + icon_state = "skrell_chain_ebony" + item_state = "skrell_chain_ebony" + /obj/item/clothing/ears/skrell/band - name = "skrell headtail bands" + name = "Gold headtail bands" desc = "Golden metallic bands worn by male skrell to adorn their head tails." icon_state = "skrell_band" item_state = "skrell_band" + +/obj/item/clothing/ears/skrell/band/silver + name = "Silver headtail bands" + desc = "Silver metallic bands worn by male skrell to adorn their head tails." + icon_state = "skrell_band_sil" + item_state = "skrell_band_sil" + +/obj/item/clothing/ears/skrell/band/bluejewels + name = "Blue jeweled golden headtail bands" + desc = "Golden metallic bands adorned with blue jewels worn by male skrell to adorn their head tails." + icon_state = "skrell_band_bjewel" + item_state = "skrell_band_bjewel" + +/obj/item/clothing/ears/skrell/band/redjewels + name = "Red jeweled golden headtail bands" + desc = "Golden metallic bands adorned with red jewels worn by male skrell to adorn their head tails." + icon_state = "skrell_band_rjewel" + item_state = "skrell_band_rjewel" + +/obj/item/clothing/ears/skrell/band/ebony + name = "Ebony headtail bands" + desc = "Ebony bands worn by male skrell to adorn their head tails." + icon_state = "skrell_band_ebony" + item_state = "skrell_band_ebony" /obj/item/clothing/ears/skrell/cloth_female - name = "skrell headtail cloth" + name = "red headtail cloth" desc = "A cloth shawl worn by female skrell draped around their head tails." icon_state = "skrell_cloth_female" item_state = "skrell_cloth_female" /obj/item/clothing/ears/skrell/cloth_female/black - name = "skrell headtail cloth" - desc = "A cloth shawl worn by female skrell draped around their head tails." + name = "black headtail cloth" icon_state = "skrell_cloth_black_female" item_state = "skrell_cloth_black_female" /obj/item/clothing/ears/skrell/cloth_female/blue - name = "skrell headtail cloth" - desc = "A cloth shawl worn by female skrell draped around their head tails." + name = "blue headtail cloth" icon_state = "skrell_cloth_blue_female" item_state = "skrell_cloth_blue_female" /obj/item/clothing/ears/skrell/cloth_female/green - name = "skrell headtail cloth" - desc = "A cloth shawl worn by female skrell draped around their head tails." + name = "green headtail cloth" icon_state = "skrell_cloth_green_female" item_state = "skrell_cloth_green_female" /obj/item/clothing/ears/skrell/cloth_female/pink - name = "skrell headtail cloth" - desc = "A cloth shawl worn by female skrell draped around their head tails." + name = "pink headtail cloth" icon_state = "skrell_cloth_pink_female" item_state = "skrell_cloth_pink_female" +/obj/item/clothing/ears/skrell/cloth_female/lightblue + name = "light blue headtail cloth" + icon_state = "skrell_cloth_lblue_female" + item_state = "skrell_cloth_lblue_female" + /obj/item/clothing/ears/skrell/cloth_male - name = "skrell headtail cloth" + name = "red headtail cloth" desc = "A cloth band worn by male skrell around their head tails." icon_state = "skrell_cloth_male" item_state = "skrell_cloth_male" /obj/item/clothing/ears/skrell/cloth_male/black - name = "skrell headtail cloth" - desc = "A cloth band worn by male skrell around their head tails." + name = "black headtail cloth" icon_state = "skrell_cloth_black_male" item_state = "skrell_cloth_black_male" /obj/item/clothing/ears/skrell/cloth_male/blue - name = "skrell headtail cloth" - desc = "A cloth band worn by male skrell around their head tails." + name = "blue headtail cloth" icon_state = "skrell_cloth_blue_male" item_state = "skrell_cloth_blue_male" /obj/item/clothing/ears/skrell/cloth_male/green - name = "skrell headtail cloth" - desc = "A cloth band worn by male skrell around their head tails." + name = "green headtail cloth" icon_state = "skrell_cloth_green_male" item_state = "skrell_cloth_green_male" /obj/item/clothing/ears/skrell/cloth_male/pink - name = "skrell headtail cloth" - desc = "A cloth band worn by male skrell around their head tails." + name = "pink headtail cloth" icon_state = "skrell_cloth_pink_male" - item_state = "skrell_cloth_pink_male" \ No newline at end of file + item_state = "skrell_cloth_pink_male" + +/obj/item/clothing/ears/skrell/cloth_male/lightblue + name = "light blue headtail cloth" + icon_state = "skrell_cloth_lblue_male" + item_state = "skrell_cloth_lblue_male" \ No newline at end of file diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index eeabb79eb4b8d2fde6b41aed1d748ee271b2ddee..7326be690e329935fc7b28e925caae26fa80531e 100644 GIT binary patch literal 12412 zcmch7XIN89+in0A6s6eMh?E@_R1{PMM1hEcN>{4XpfqVlkPb;uKtKdUrASv43?W2; z5PA?)I!Fx=AoP;ZAqgZTIg7o&_dD-*&UKw%?><~)k~K4H%3Al_&-2_fF?Wq_AJ}(n z9|#0GpnFH#1O(!#13ozddw?8`F8mqb!Xen~zOT0PQ%4`SC%$g5#~@H(#^-nK?hO}2 zB0A}&=bDw@&G7rIeZKPU_!~=+VqBRS_SA`HWduvg_Rc=TNxxOy3*-g&%Yg@A`Hb}= zYprT*ZRuAfufLB^D;w^~{rF-(z3Ot;BX`OCo6(oRPG7rEo7a`=9dZs0+b`s15;XWQ zY=4=mq#l`Weq=^qcGJx*ROj(^uGz6;3ECffy9X*JZdfamQf+%b)>|B0OSSs3nD;S< z^Fgyq;YEi|lS9bxf+{0%$U2np_Vtfui&uB1UgT@Xs1)Cd=sFwz@No!l@;O#F?i@V! z<*XunG1+BEoTN_7HOurr8vaDsI>g{mTCnZrsVZ_(%LYoHevc;zG@z+av&O&TKjcHofCJUvzR++CblN_tB2{ z!jNy#Zg(zJ&vAZZ$9>!XBxLj`ChK|}r@!c20D)vcy4qT1ffSmuux;)RvjPo!_T0|VNljNi zfyJdwmO^Aj1mx8utZa)@AL&04Tlw?Qgrwn0P{qPtyyThWLW2-wQx+ZoUOY%bs&oYO(#^-mBuVcS%Ixf= zOP3}pEXaOkjbwkgFMon*&K=73);gsr@q|5k`Y~3z$OdKh$?U9dKh2Bi!X=UU%iM3b zbHDTWVr@`38RlFV9qQ>8oQH%|} zZpRW!l;ECSTM1B{eP}Q-p>+KRJs--lZWSA9YKmq6Khr2P%yG>bI9vkQ6`gU?$+?4jPy>$ z^EJMf<9A~6VHKh@;hg(4N}4nY1AYq=>0E0m&XP0sQ9eZH;GVH{1dp9v!;2} zjkR@*Us^PgC9E#uQ3dXY^+(NHdpq@YcB*>5hHcZJ_>o^590K<`tKkTXjDYAIx&~Sv zuE?b?l2WJv*(fgYnWazf@gYSVD zb=rD6(SE&Sdvv)u^IE_=PRwJ+U@o`7!lTNtpT!N}t|>}PuFj;xtlz_@7q{+Tj!}4C z@pLwRsNCD}F~8bh!v%%W4`%YVvv?r?x-8#!7&La0SLFXs@`>L|^{$i6Y^dK;nH5_! z!LP$|+}XzQb&4kF@FAr-A#LI6uIa}`*qfGICp*Y+)E$kDjf6POu<9#aPoJrV?G4fr z8Cd$@xQ={sU2^V_8r-J2mcWiO2&ff$uHIH(TmTFCC2?Ccc-L#;NX^~B0NREK(F;Qk z^guD8Yc)pFPU#q9mdx-1XJ~{lFLHq$I7$EQo(;NwJTi;tWv}ZqCBYfjFmK_tyn2~n z0>&lBDgv5Jd)X}*HgP5tRC)4PFb0uc1fy_z?nX#Gqor!xhfptuo>{5KFZ!Ds>~i=X zA-sZloL-b3P!^)m_4K<0G<0Zgw^|0%Zc)2)_cC63NP)mutu3ngLyvz{LG=Az_R)(H z&nt`OuTr~o6LvW~(-Gc)d1ldSeL}9##0ZPm=ObdW8Z5J9w`{EaXlz*KdLR8fm@OP@ zHmfsQ)wf;p$dr~#^+F!Vvocm;U2>-9U|(oYRrZD(r;Cc#jA~zLm)bBd&HAIDFJ>j3 z*Xz~Wo(&Wr9CDMa5;i^7;5r1{{*Ic8;c1&*V2XqSV*c)$RL zx4GBgjP)R>5G)LvJE?k`PT1~ zR{!9T=I;o?VHmY_vkUQ&?f>>k`Mk*fW!Rx{F-$%z>gJW>+E!g9%Qd?{a0Y@ETZNn2u`-HqF=a_+SlW!ZuCD;N`vH&5ffiMW2Vd5Wd;oqG5Y+ z!QRfRK@HZ*#rww|)trOC+=$`Ls^In;`6IzSp1ra0c%kowkquaL@JgZ2 zb64Nu-tLM$kh#%ho&ypwEmBz&NyO5ynjd|^N?A?K%{klH$f%&iwX@*qY=>1y zM_gQ-6|#2rL)6fW+w=`BVqIx^INcLMGhMi-E@sCVV)i0Umpz7Iqb0~m4DGF$i>_GQm}hhKkC=VjotWH zad9YaX~;bTsc5y|*mplu1FGtG$%Jipi8*Cl^?Moquo;1z&vu@_0@eO6Z4n)ZKzRPn_V z%oAa&W)cVQC*s5{;o?3nAr%Fl)98-oi;__GWEGetv?r@wQ&v{C*OI#_?3_Y$EldzM zH$`$?k$+~h7hI<+X0u9|fjZj%4!O=RX_wSyybTQuzObv%RBEI0#fu*}tyFC6rGeO47KKpEwd|#bLNTswg3@6@mzeQbSxwia-A~r0baBAI z)q*!3DP(Ok{rinMPlUP4XlzXLMdOL7=C>3QnWMsjG)Rpixo|Z<$~)Ssi0D>&ewGP$ ze3{d6UlF<9Yf6C%OFraA1#fOlw-#qzlmnSw26~u+K>j>rDQkkfu>+t35-LrxinWi} z&DmnX)zgHUq*#&A)t_R0_4Usa`7W`LxNqMs(w4~x8;(C?$u?q)tWJAZaPC}F_V#8Y zim{eLU{z5}vqOuE!r}NXN1z+U4Od_)Dk^!w97^o1dSmUWUX}L8ezyI^L|R6M+0G@9U19>& zb^_*S?M2e~${pk`AOjf40hrx(1v5a5e2-5IYrT9570>%5IM`ZJBe*w&vo%|jm?#R{ zAyj7}SFhpZ4BY2MDl_z782IzEiLU1Y z7r1$OYc`t^FQq{lyed!(beg8mf)t#Tm?}Hha&-RNh~7hckzJ_aE`Yh26lv~D_x}R&GJ#tQFjNaO zFymT)QRY=Yy-_&B&ap?$WdaOtJHQ=m zA#oHx_7?FIIuu}c-x$L7eJq4n z;4VzNamD&7UBiNpzKII|`aglV@0Yp;DvNhFDChJhSRLTcT{|TD|1A+7dYtnGpi6U< z*&DsjV1WIyJZN^VA=_TWfXto1kYE$|cLYH2Tb!>2sZw>+62ye ziOw9aOw!Ws9vgL%c@M{9H7Q@J+J8|9dk*{1q_`cGALF%FpcU-DOFCA3nq$Lv9|>oqOM%5C7O8;Lr3QO zwm(`dv`3avv8S4;kR^{mjiDM2u>k1uu;|wGxMHBJ5t5?SlP~?Nv9WJ#%z=bdx^m_8 zkIlhrQ_X@~L=<9xs0t-LkX{$!2O!&!T=U=yCE5lqbJ zGs>~{$N0(woREVqwQ*5yk*V8AXrj>wf)H-Ka@vTI4VqcToS&lMvs7h*(9%U+3;t$r zh+kt66a9)CIv1?uQ(E2K-3z8;eJ}*E8bo<~^qr%)iKc?TBl7Zi0Ty9|3`d$tUfoFj zv3FIypTWM@M`<@bIyq8=NMi#ILfDZVTSvtb$gAQJAA4sHKWZ^B-deYpeq6%dF0ms> z6f!n~5-Eqm&M0}0*4&|utB^V&BwCf$a3{3tgCu>HrKk4I3(kIkIcB8R69Z;XF-tm=4X$bNz&^s zLdf+Oz>4YCZ{m^oK4BuRLKt8rN))x28(YJ*+&yN^Kib@^+jq{}1|uf=J~j0&mcT)@ z$~2p@R|w*glC+KGleF%y7VL8&F{bipDFb4{`Y$=%noqFWiT(tVem+dohL+gJ!J9)C z+1O>JCCxh_+_)@L@NK`0FWn9 zn47-R5lz2%?V1E*>7Wf7(YvrvcsXRjjq1BiGZv-bLpYJF=qj$TWbipU;*|}gV1#3A zO|X;JZA5CYhAr5o3_@+^?U68!Z=1byjh<;M{uLV8XFtUq0sCN8Vyr$q;H-l$BzBQpZ!Vn>iE^nS4cUe#{ z>eV?Xt{j|^?nL-G$j!{+2s65xHv^8@Mrf|?moML@0s?g-!|L+nMf6ij(-$+d+V_0kq2I#1pqK!B+>1B#XrD z{xTs7OGwbj2WJqI^T^Rfbk`xY&;`IZatDmTz%y42(~5pD-@-y;pa_PxzZOKZ`z;G^ntB z9F!vo#Gz@l--fgX_>V!Zl^c%xtaSf@1DLJjJFNKV(P`RHczC#pLP`>+3uk>^SV$;u z^k&tN3hr1`Ik(mgL>YT@R0d%C0xZ^;$z(c(hE{uhxEUoyJsmOBXWVU^PqXQ>qQ)p+ zxl%rpdKiZ&Pbgu}#LGq(X<>x~PT`rZtaC?Geu}Z09)) z&JS;-yjXeV;_lvJ<1uIkhm(VX+A(;npWW_#CSvh2-Ii~Nl z^&&cS@U9}!Np0ID8R4(XHuEgYzNtXGR@)oCG<)ldv4htxnb%FL<~$|L!w)JcO7F9y zv%E3t1LWvJ)u+cw?ep!aYrUFSdq)=(|I>sT+@wA(mp!NX3?~|PooDWDl{)RolmnJ; z?15sn9TVqjy=~6#-Cv*oFxTY@d+;Y91>HH17r34yQ_t@wsfQ-MFU(waICCT6K4JA| zK17!aVciDtUhESt%(vNAX2mLa5^dBDwGXW=1o#=x`A^0g=dZn2vV6vSU#y3$)uwOg zEB%*lZ1fBehqQMTqW@^}(IaE7Vr+1UhyInD_)cusvqdQosL8faJcs)RyPXo6L@)C` zRYNGH@`a&=-jU4!{QkO{Cp)O33pXV}{$SZdzwqm?U~;D2_Ha)@n+3sZ?h7Gtvl8+* z&u?0c;cSv&pKPJYR8@2)0=H=$7rs~v@_jq$lM`wUV34?0ZX%pD3HG@3^9yIWYSwvW9HYI@FLxLsO~3PPupo}#a=O#^w_dVufo;>3^p}2wcjio zDRSsIfQlM25*6K98ObTw^O2LQpS`f>y|_;bL*k{wyj}g=Iyu@D{=mfGuaWG#6s=FN z+j!N!C=_csLTFo^?h+l3Qan~RqRn!n$#WoLPk@W3WQim1;&`uq3m zcdgFKmoJ|rVxcKM6@>;ba*E{NkiROE9EYv!hDv|{_WftFDwqna8;3dnKojvpYuV>ND6`!Bd?A_hi;4eyHn=8+k6UN*`vo;-O3tYs zwyzZbIW3*j4bT?glI9GTd*6KV;>9s47D`Y6>OSe#k|>gUlP$BKaOQUrl#m5f{k`Xu=vBuZODwj2{n|{|Se~ zyUAqO$z2URfy<*BC<`hq3^1k91A;dsLxDmt7${cUxg**a3QDVIfD-R)Ube}gx%Ksq z%N2*#5jWQCDilf1;feN-TOXd-e%$B%QzG54u^Vo#B^V;g|`QWP0(6T$mx!F}d zgs%KE<2|0<{rTpmQQ1vvJkXxjK6mpy{QPknKFgyuw>AO71qRwpBoeP2@%ZcRn>TOn zT+ZcNV^o;h>bqnPcJXhoRL-5LFKw3`rPjy^#)(^Q0u-Q&RrNczQ8WzeO}kc2Ob0$y zxWg*4(joG|03IvuhL%f@gg-%EULbc_>IY8N89Iy30W;PEj*+3%Te5EGA

!A%maUa6}v(v{GaWzd(AmbSKWKKh5uryRuLj z>qbCD&~HmPcnydcYgZu_Q60jBCA1<$#^g{UW{-wcO6igTj?1}eLg@Xje5U`1eUeq`ygzR50n;5SsI*3VnL16cEj z)oYvL0o>VOmQ{PxfIs>_}vUK3u6pE5% zJ@l-vod?)dy3YGIzghgnZ(8=?R#;4v>VDc<*14$c+8VoK`40^>IbUwoh&gQ;UN6PJ z)9`WI3UR^I@|XK{w7J!%^U->O$B$LcEOXbtu@Y?eRYM50mTl8M4P1h7p0vf{5{#OG zE#8*;NMHRgZWZ{MJaJEe%?S)Zzi%lyI$hBX= z)Oke2eQzA?7VH+NIs&**2fl8JX9(4}KnVhh=>lUb#QpUT@~KgLYJyDfTZC;X#9I-3 z_KiJb0NX__NX$R+=2GtpX2l&}@B^t=Z3OU*6Tc7*u7s5w);vO*g5?>tmhG!JXCzu= z-rywM&Z}ap*lPL-L%Bsh`Qu&_U-RZfPxeYS+$ROif`r~BekgSZ7;R7ZsRKH5-o zsO2Os^YDK0px0bWA;iuSrsUabwiXHGTZX=Jydrg#sT`q)_U<29f9-@ESyQ?W0`nV~a8qR>PIYW0=5({So^z7kN2xV=cQ{ri|x@; zX*6CLO`!fy224ItSX(=-qdb&5)XlSbZ}0PVROj`NO6e9##yv_oh14UT#d4wrt{?to zoewqS4}(-fcOSC!k-PwOc|T!(o++L+n^iRt2@CLn-ZFaTzxKe%B!lT~jDFpEa(mk& zQXtu3;w4^P0v}F<7<4_uKPX3pG_17HbWf%6yuhmKui)_=P zYkTR@4m0*#Fe&A`Dz(`KYW45yF6{mf(^%Qy8CoZmoHswursPA81g$j(gWLs6z`^kD z_YMorESTdRB{~^>a=KOkzew)9EW6@CTfIG zTBU1nYm6)nnux*B%>_`knn)m_Tw(3A^kpt91tGH*OPv|@^Q<`>2xWc;>LH%uIaA#B zk!e3DQwv^I>OltPA&pe-)t}o7&4h9C>P|}1`?h8@*qiA2YU9_ zBYRE1bKRgx8`!R%g;oEi)1X03=}X2Q+)o>9b^pxyY_846{>x{S}kLAY=!z9UJ3OgM)*=iZK^g z;Lv$eLqmhlOq;j|i}&Y`{UUcxhmLubc@8Ocs^<=!PxoCIxabFz0_V|&(Y0d5^7KUF#SC+X}dmsLAdx~GF?vK1Y zIvRyye;c*?D-L{1%GHom84vd;A&)P17m__)a$Pmsh3I)MH-OQAO^~6?+luL5h(_i9 zZH&rODRzyk1VdWU)2RPmr~Zt zYb6(y`MUC@a{WHiK9WA4x9*&IC2w4llbXtN^g0a2X4Df<+_@aPO;s?2Wd*n5p09>m z?+kR*KGD!P+Q3+mIJ6NlGC0%Qi@?ptOnbl2DpF+7^T?LNd}tKk%6lbOi?$27`A{13 zT!ZnC(cKr?-J=?LqfgMybAp12+n8JD0L6@Fx@+W+4&0fKh zRvZFYywK?Pjp;w8x%OQ4)LR-^umpoYUpe;*_TB9O}D}a ze!13-obEq!S7Y+`hL)lt5KJi!IodPzZ&sORS!E=@%Cf%fSMbe-*>YpUclN(Mi#iWx zX~ACE;QkLi=bj9)&toc?95~q$5UhMAe;w!|xvmW^oWTl_JsZFCD#$)4oSDNK4 zJ1%)jde-x^M@N~3+SD>ogq^qW7g?cdj3)PxXprOj0-s!fbQN+8$?j^XQeAkRUl8K% z#<&jZZwv*H@_3}OPatE33`9=Ot;y#vUAyL?z6&=#{$MXs+El-)77+?AKI_@Qli|`{ zt}z0{p4t|*7X=s<{p=r{{XqACr|H_+veJ{S<-BF}x=2iDx+)-r)sx>4R+^#q^j8lV z??Kb3bIl6+b?0sbVe%+@czJ5ckr6JlqJW%F3OY2NPsKAy-y9p?VU~Hy(CPF)c4>_% z3#MN%1xl!7CLLpgKUvwK&6W|UK5tWYIXSnJJ3c;cfZf#(yY-Q}u?S@Tkc!e4`#u*d z-!d(qm1Va$ShCjZXtB|k+=b|_1?~D>%VjUCvO{(G-!ya2#?}hRhUSFKymz%YmtH9_ zGw{vPkg%3Rja2;Id;?uME>*RvzdAl^C$h`lH`&qWsQ=EwQYUreHm*uo)80-gi^zjo zr{(Rd1m!(#1-go6MyfJ65#ku3OI8`Y*60__QfYR!Z~DIDtrUUdY}KGVtGQAeSXx|g z`!D-W?UKV;>@tdC{D9JR$>%{rKo}OikqIa@Qyih}0+!6ir#*;8R^s8+8$2ML-mWvhO;Dcz7IG;;0JVrk zcIz9Rz!6J}-S>|AFAbxXhAU2t+ZT@tgYG&31Qf&h-jR7NNpryBY|<}S&8R_oJL@;T zq`<@D*L!WzU~R;ceTNnFFY~>6ksTc^^d0Ca2p}9Fezx-?jK4R|SnM%7oAi#;)hbKH zQ9f8Hg2DoUh|BLw=*oBgZqFC@&L;KdCTN}ogDtW4hVVTHGauY?&B2uE+mvRti(6&| zYhAp^7twk!n-_=bb0b17-CwO2#2tnM zhGa(*Z!5ZYDHqvQ&HQ!15O}Ql}I>u8I2{jx3@cw2;IH& zjqh%@%V8_Y3&DfEZcS)Qtcnpe60%IHc$&{lsDV~MftjK(jkDPWOQ^-+3e(SUQKKr> zPH{1?s{Q?Xq{8(+Pr!j^?}c~sduDdb_X{8pVXZO2S+mVR?vR`=}L zbF6i|t_nDVR^XR6Z(ZqM%BiaZl|W=(XlL_SoIL^qbQ?7945be}3dquNh+F*&RIx5H zllq4nQ7Fpr$~I$ZgtTc=J&(1Iz!jijqK9LpGBr!Su`-vkvH z95neWE>Ew>4fyf_j$zz_fV=OP^&h?~6Ir?M@>z7}jBh45^ys5XqD4ulC04U9U$SI> z)@2W$Bd2XG%3~coe`n`UYiw&Lhg_yrI9J8Kes#F5;&WrB+a~GDUfq|MV_DS9;nhuxMm*Tpa}b>FOA17u|4p{=WdpbC|mT literal 8235 zcmb_>XH-+&y7dMTuuv2grTe1T0i{H0zyc~Fim3F^1BBiKfuM+B2|*E&8Uzug1nHev zDAGY7p@oQ)0HKEjNJ#QU-}8Rwo_p>YzQ+|`ON+J<_$xkof10% z01&!*<&r4?@I?MP1o^pV-nNwExIfN?nwbY&a`t!hbMpys^Y#LOkhC1LcCW8;qS_-6 z`=j?xwPl;$s5g6@C6xlvgOwh1+I=A2lFj^CVQTpSdtWC0fU3&rQh9t+`=($0{#*i# z{iu0o;S=&tx6;m1{hKYU>5ttiaarSw{*Kb;*QTDx-+bzo2sJyX)w}xa(2P%Bu!z)y z*~Mo=qIR(|0`{-_x20Tu?!&XAg(=WkSCe}Wy zY7X?-z7IOIR33)iZ1g0JThqo$nXLY>1sm`Z&@K9 z*;|rmiGpdZp6<4fYAhHS1@FB{zxVLsRaaQdfW)(B)n$(!tE2ep<<-v2i0D5!aXY#{ zI_p90&kHB|)sIMT>OaoyVf8-ax4d`2=}>^mizJT{!qv_~wdZL>@|^DX>1axy05k1a-iQL~q;-?riT4_*MRg9W z(o%MMB|Dkd?(pfDD1C3QqRMJ1$Qb!cS*0#(*2j*3Z6tgvYA5Kdt+wmu4xlAt7A)Zs zA{0_G1#CWPIKuE5LHVD@{mPWj(j*uKgh@y4A&tUbI-00#o!nu2<* ztvovvn+d}H_7}5-I_O>G+6IayTvCJr!F9#A0|0!$e=z8{XeBMo$@kVhZW(TI4>=DLUOgu)3LN*D2qwmc zmUj8XFGKh+E+@fh_~H za+%{Hz&C|}1la6=I4rkB0iqy=7?vc3^;KsHeoz`??o1XPN~2oG*{xDh6r zkt7WT4HF}f#82f=TN+JFM2GZCM`AH7a|zvS~pbut`v{&5KURBdkoMACcC= z2h7h43dfyK{V;wmGK*%dKJxZ#BP$|uR^cEs;bum};U1`t&b~AOy|!@Q<;T-t|*V;!0b+g|D+$EZBf#K6x_~q4%e~tx}1n4oaFE)KT%H&<^?`{Gxm6+@0f_HWN3aZN4tK``f_x3Wl#Iz zgN5laK5=oKQ&rfG`a>QvsJ28|2dG;%+`Ao!9XX`&lVUw(d3z~e=av3jnIiYk^6uy< z3fLheYy?uRW1fFzX&pbO6rw$H6Jr(bLffzrf$HCzUfkiz*1eEf4)?AFZVEx9pXbTn z7?DI|#4!-hd_ON!O3XiOjX+?2HNh~HIgtQCVxoNu44M-J@-~YuH46q<1E=wETUc1q z(X6B$9;#55;BD#q(o<!z&Kzeq~%~0F9{cxtN?*dxY7Lx=#RL{7xaPDgE<1XLq7A%DvXbWUR0h&ZX1fNUo zrlARLT}zNh$MtSmjet(to*BcfC4=T|0G?NFF<0M%wPrZ_VKJhZD&b)fR_CyC{7Q89 zwaI|md!3IbqHmM7p2o$90(NHrM8;eje=uZn? zwMdW^JiBJWHgn!HozB9k&^hmTe|(AFHU2qDAU^?DQ*-j&yLVqqKTLZ3kwu$qo^g~P ztPL(oLg^Rfpg)TbJ;bt7MUf1^xLS~^xQ+}*Qj0kxB!`t%RAll^^u>fmI75|*%Lig_ zR9FMm$Cc{W1b(7G871mF(7KGT%ag5~eZ8no!k$ly#M=DI($dl!Xg;Si7XBU{r$aWU zzy%%EB!e|7Ct0NJ)YtJM(g&%>GC6018Fhy1$ZBvKi?dP`adkI;J)RyF{ZXocUbqyy zO+YyI`SU$X&=mL}2TYw;iBROZ3=)LzQygP>P4(WU>%ym4MmY#;hxlEYUQ-vUuu8DD zVRXb~2~or3!}<(DkE*m-*DiXzUPtPNbb968i6(MxblvKY30H6tlY`WbuqZo6Zf@97 z2j9nzx^_`Qn6#0;sc?n_GSSLFUq;ug(b@+_Dv{w4-AdQ`z5C|@lo<4kw;iVRmDq)h;x}EW*IObuY!I6v3rM<-oCy?|+!$$EqPr(#0 zB7upl47rr1kAP)jRX#Da=k)bKPHf(%H%>3CmvE3Z8f{1Qo;Fl(i^0d> zC0ixQC|e`hs8a=C3MQA9^czl;rISEb!WnUhVp}$N^KnQ>#MtnWEr*cvh>6A>zCS+k zoIQ8$ry4wmSQ~uL8w!P{%k21OSu#C1Xudpnsz`99yhwvJO2c!!Pf=totvQ(`Y-9^# z$(&P~NE7idVWW{WBM0S~a&?hi_8N!Dw;=*t&4?S)-2Y;!7DiC?CNO^<__Tg- z@+YThAiuimzz1zkqu4kB5IspRe$ zNl8hE@Nk=FXtV%UKvzXYjJ~!OySV7(JKd4|sbw<#PZ6{J;m;F}x=&N0Gbrqt97yyw zhoq{L_{O=`nEJS!E7v>1Zu9tze~DiH@i}TB-8(Sw&UIts=p575p)ZD%R+q`_9rMIm zLVMhM!uOURJ1LNP8v2Ft%&S3B<|XH_Or^?!I?#R~*90S+C8WRj@-IwOh@E~owOsBU zZg?pbRV4rE?+}Y_{TsxRp%`CwwFSqa2-y$DXiI#{?oCZ}c}P!LSG+BxFB8q$jKb_& zs-wo0i<~AQd&Zx;?5*CGXH_j<^IL~VYPDB{knT8T3k0#=<@4aDvV%PqpiB=2`K zP;q()8Tic8MZePxWYRjF?AMhrH)6{XJ0|?t^uxYi7|@+21+%i|IX0*R`XoU^L&LAt z)zyO+{D7+v?;!c*JK$NtOL(_H0k52h{+~Y`=0{&+F@fxn>WEQ#QXtFNn`1%1C3->z zUR5&4LB*U+Ea}QC7I;B-^vPQm?iLGc@HCVC_3`7!A8|OauiPqSH83F|p;?_5LZe9E z|F*ugut2QAn4MY>PRoff`yO%~@9pwy_5dc#g=Or;=`28&nsu7GLDLJUr1?=M*4w?I zZ}DqIbHclbd)b$7;_-M1VTDdui5H*l96^isG5$(kQjkEGC3seavTjW1*5oW$gJ)w; zEHF~X*riyUTjxBokk4mq4phs@9g6XMcFdF2PvXnS$PkuDXT1E~Ja#yZQK0FZAS|f^!Tjm2Z9&Ej0CXFit&bCt(>MRsVh&2=NDg$b-PS{?E01VB zTw-7;lb+hYWSUM<=N)ury)6|Gr>0NM=OnHij*jc+m6hdQB_%a&Y*bOfBh&vg7EOcqOv(nSZ&vEq^e1spHIOA-V&D}2aZux1 zMyIP8$;GpeN^+x7OZd4DPjX+t7N86jyj6XtfS(!nZls-mS+j$QE#iQ3Oi#Q{N!iK8 zz@YZ3s~H3mFyiRO#np$1lpo#a$QG5gWwbslvQz*wy;54bb5o%Qg^>cfaT8c@On!16uY0ad9zn^Gg>pxRXCUiGg|m zqA;L38&__F+ZiDL<=fs;+%hJrAR#p4A|zf-xt@)h3(oP>784V*MDoxhUzkntL@3VXz9G1p6%9#$>i-k_sY99J zcoVTY3p|)o2i?I|op1{xPBcFcWTy(rV*dYsb(_m&D=e?A1@z4H=UOZ7vPwFPAfP1; zO$+Y^0b&zpZ$U)RF4MSVAx#sSl?C#iHR>2;D|Ku!oUqhS`wi5cgBhYET4{eVaYGW- za)~u_=pkiu-G&sLUWbZd;iz~FgfEJq^12Q$@FWt5TvvImjTaD%JPAYrHTG!IJeMS8_--BK1=xWnf~C0P1poaj~gMb`hakS zc);8+)z}U=ew@2;{=1I;pW_sSz^DHX+2}tZ`z^I~(dcty^N0B4k5YiRlI?C<`VC!~ zLx+4T#2DBjLZZ+W^*;!-aDof#X)POmnF*xskWz*fp_Xi3|t<($4!{d3i0z&fR@3PE}f3T8KP7?Eq4( z=D{;-5Zz_QgTbt_i7O+GrTiu-j9X8iJ}vg|yT&@-*@evQ@2+8E`>l|2w}Eeu-lXKz z5q(3|&hDYFuODkj-l{P&{E)+t3U&ofD zR{gp)E}0hWHzW_8@EzZnNgV(h&VlyLthy+i>wMYW#mM1>XjEd{>0U^n8JScLOB z%BN0=b3;S@1MzQSvUHnOC))oel9HK!i6pX^fa|?g(V4xxFwL=DNQNaMG4F{_hN<)m zcBuuRs_YfU&Ib$4;DgBt3Q9aYdMbxAArT)*TLSV$2LnWTLwioU2BNjV@`Lb3_K zNCEGVYafYo+dl5+U7erEXlu}UtEN@Yv-4CEvI05ms(kpMb?vL0VV}1^_xsLmX2&d; z%SP6VR;h>v=|aJgtIUaaozHq*f!FNbuR-}D0qk2F9_j77OS^D~=4vz8VSPOHkWXPzK6+lVe*`xH#Xpk1OZ@jQ4+&DROvj!ei$! zVfO7h*K+K9H0^x?FfcUC7t;cP#9t#kEmw6)>mYc7{LnHeCLgBBnMc^ImUH(nIIf_G z%WnQSDUI(Ri`%&Atqm@MI3veoGAkckjyC%4xEb2FX7?0Nua2Zmf8MCd@ESGG@5HTY zt~?kQ*_;ge_}=Gg=xKHj)WoFwZr^P*fk3EyVEBTY zy%>Xr#>Q-mksNj*GmJj}0lyBfc%xg%=$Kn+Yr6(b-(G(QHWyR=E>}j$?X$eP>^%sw z-zPz*VEgkrPLE4C1}bTVsih}Z%HRfvp!(rTtSkw?{A04hYs@nLr#$iW_hW0lI5Wkh z$_IMKB-1?_=OWfTp7 zcQ#I3)=ZYPSMsN0R&D61RgBwecjvYiBAdrqtXdFwr9 zW3#i>WYIM!j|aOmEGaW@$)b=TExEf=yCcSfeez|Nmy4i2Z>CUdItCI3Wj(E6hu*$z zyctLKz*lUsw#zym0fsAg^lVum$wJfa=`hyn-dM`?Ozjvw`F_~k_j~iN&v84gvi^Xl zTSn%(UAwR2j{ra>s_W99Uo!s}omhM<_@ywgU5J}g0{c_}yOxz+Q2ysoXRqVRo5QDR ze-g)nWQ2Q9M5ydqoIGgO z)2Q>RNc?9o{(`clmdLo2bn2|H^e=qzqwc7W%~2Xtdb>l+=l2?w+ua)fp0sS<5Yg)( zXaFN0PRn*Q(!y5kj_mF2or_6JP2IJ|RGqy+vn~99%)+m^d|hZExQ{E}4O=K5rYxNu zbrP7WxAcVLaF)1R$A`Vyj#d~rb0slOa~Gq2BXhVPtWcAWb{756QrT#rCgrqzWwjVl zKdVq%WD3hPrMfS$y?leq*>})T$&)^ny8a6*B~>={7#C|#aUgG8R>SXYC}hkQ7f~Nd zauIxA0~eO8bxc#^^5_7UM>ZeS90DOoR(!Ot_0wm^M9hAixzy}>cQ`w=&ye%I^IFu% zy=t2{)u5pnC;7YUG{T5aKE1(RyVCC?BX2Xm8*yp^>YWe73t@3MNZtCFi+p@1X)tdb5oQ^}(~c&%83q3waD1WqJHewP^^ z*4&G2@SZenp&xyN8Y~+5fGcK=^|r{&P&1p0ov3?nX1{Zw9=BHGl$UqPKcmqCd;9us z*C$R=)i3Hjr-g=v`S0P&Ymh*vB;45N>57u6#bOBX*?ql_@H52}20UGS;?K}^^K%gO zo{-5cG?#-is#AXO{6#j4nJ(~)UL_?ZYBIn_31Duxc5HqPwxT{mnol&o=N*!FIG;QP zmPDCHquFe~>*o%7M9|*`#+PSL*eCG+%3p6CR@Tv}&mOugnTeV%ayRVOUbFKtR_BD4 zdq&Hx+W$R$HRpWci*#@7{m1yVno7m#*t3iakneyVrKU@*Msiq5^it?ms(otB+J2Bi z(DMtbJSkwx5_`8C_Vd2#*^Tpa(^q68lYmH$%AUA2o`3FF{}ylj%YjI4i!2I!s~jJ< zSK#@5v0my=5$A1s`r9I>MSijB_sg-FM&KZO+J|P^y;VxRAAyEKSqi6 zM7dneXTD|14f-~6veda%I`j`!BKr0hfw*qr1=lU4!{4tL#kqaJ$3lGS{7gujaL-4| z0PiQs{k&9@%PBT*d4^rtRy+acxfa3d+WY!O(0!hOo4|VmgrVG}j8Yjr4X=U)Wdp!d z0?<-yx>Wyz{k|`_zH#&8Lg9vdI9F<5P{3E{-8bWwmRlfh{9VTfY+)YzycLP$uGs&$ j-2Zammv4|;XUk5@%xpi$cgm1E0dV#5jZ4@Ib`Sm^Z(GLA diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi index 318c17d9bedc64a6acf8a685ba30ac2583a0f6db..a2c81adfbebd0e26f707983c3eaf1bf9ccc64e53 100644 GIT binary patch delta 3148 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 Date: Thu, 12 May 2016 12:41:26 -0400 Subject: [PATCH 2/2] Adds colorable headtail. This required ear slots to inherit color for mob sprites, and this was also given to glasses. --- .../preference_setup/loadout/loadout_xeno.dm | 20 +++++++++++ code/modules/clothing/ears/skrell.dm | 12 +++++++ .../mob/living/carbon/human/update_icons.dm | 36 ++++++++++++------- 3 files changed, 55 insertions(+), 13 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index f3e56cf1dd..9f814743ae 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -68,6 +68,26 @@ clothtypes[initial(cloth.name)] = cloth gear_tweaks += new/datum/gear_tweak/path(sortAssoc(clothtypes)) +/datum/gear/ears/skrell/colored/band + display_name = "Colored bands (Skrell)" + path = /obj/item/clothing/ears/skrell/colored/band + sort_category = "Xenowear" + whitelisted = "Skrell" + +/datum/gear/ears/skrell/colored/band/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + +/datum/gear/ears/skrell/colored/chain + display_name = "Colored chain (Skrell)" + path = /obj/item/clothing/ears/skrell/colored/chain + sort_category = "Xenowear" + whitelisted = "Skrell" + +/datum/gear/ears/skrell/colored/chain/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + /datum/gear/uniform/teshari display_name = "smock, grey (Teshari)" path = /obj/item/clothing/under/seromi diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm index 215a0a9ff1..e8bc3e8534 100644 --- a/code/modules/clothing/ears/skrell.dm +++ b/code/modules/clothing/ears/skrell.dm @@ -70,6 +70,18 @@ icon_state = "skrell_band_ebony" item_state = "skrell_band_ebony" +/obj/item/clothing/ears/skrell/colored/band + name = "Colored headtail bands" + desc = "Metallic bands worn by male skrell to adorn their head tails." + icon_state = "skrell_band_sil" + item_state = "skrell_band_sil" + +/obj/item/clothing/ears/skrell/colored/chain + name = "Colored headtail chains" + desc = "A delicate chain worn by female skrell to decorate their head tails." + icon_state = "skrell_chain_sil" + item_state = "skrell_chain_sil" + /obj/item/clothing/ears/skrell/cloth_female name = "red headtail cloth" desc = "A cloth shawl worn by female skrell draped around their head tails." diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 7f0489b90f..b15db41f51 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -556,13 +556,15 @@ var/global/list/damage_icon_parts = list() /mob/living/carbon/human/update_inv_glasses(var/update_icons=1) if(glasses) - + var/image/standing if(glasses.icon_override) - overlays_standing[GLASSES_LAYER] = image("icon" = glasses.icon_override, "icon_state" = "[glasses.icon_state]") + standing = image("icon" = glasses.icon_override, "icon_state" = "[glasses.icon_state]") else if(glasses.sprite_sheets && glasses.sprite_sheets[species.get_bodytype(src)]) - overlays_standing[GLASSES_LAYER]= image("icon" = glasses.sprite_sheets[species.get_bodytype(src)], "icon_state" = "[glasses.icon_state]") + standing = image("icon" = glasses.sprite_sheets[species.get_bodytype(src)], "icon_state" = "[glasses.icon_state]") else - overlays_standing[GLASSES_LAYER]= image("icon" = 'icons/mob/eyes.dmi', "icon_state" = "[glasses.icon_state]") + standing = image("icon" = 'icons/mob/eyes.dmi', "icon_state" = "[glasses.icon_state]") + standing.color = glasses.color + overlays_standing[GLASSES_LAYER] = standing else overlays_standing[GLASSES_LAYER] = null @@ -575,29 +577,37 @@ var/global/list/damage_icon_parts = list() return if(l_ear || r_ear) + var/image/both = image("icon" = null) + if(l_ear) - + var/image/standing var/t_type = l_ear.icon_state if(l_ear.icon_override) t_type = "[t_type]_l" - overlays_standing[EARS_LAYER] = image("icon" = l_ear.icon_override, "icon_state" = "[t_type]") + standing = image("icon" = l_ear.icon_override, "icon_state" = "[t_type]") else if(l_ear.sprite_sheets && l_ear.sprite_sheets[species.get_bodytype(src)]) t_type = "[t_type]_l" - overlays_standing[EARS_LAYER] = image("icon" = l_ear.sprite_sheets[species.get_bodytype(src)], "icon_state" = "[t_type]") + standing = image("icon" = l_ear.sprite_sheets[species.get_bodytype(src)], "icon_state" = "[t_type]") else - overlays_standing[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[t_type]") - + standing = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[t_type]") + standing.color = l_ear.color + both.overlays += standing + if(r_ear) - + var/image/standing var/t_type = r_ear.icon_state if(r_ear.icon_override) t_type = "[t_type]_r" - overlays_standing[EARS_LAYER] = image("icon" = r_ear.icon_override, "icon_state" = "[t_type]") + standing = image("icon" = r_ear.icon_override, "icon_state" = "[t_type]") else if(r_ear.sprite_sheets && r_ear.sprite_sheets[species.get_bodytype(src)]) t_type = "[t_type]_r" - overlays_standing[EARS_LAYER] = image("icon" = r_ear.sprite_sheets[species.get_bodytype(src)], "icon_state" = "[t_type]") + standing = image("icon" = r_ear.sprite_sheets[species.get_bodytype(src)], "icon_state" = "[t_type]") else - overlays_standing[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[t_type]") + standing = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[t_type]") + standing.color = r_ear.color + both.overlays += standing + + overlays_standing[EARS_LAYER] = both else overlays_standing[EARS_LAYER] = null