From 79ecd42fce467bb6112a18e3a9f939ddc5263fb7 Mon Sep 17 00:00:00 2001 From: n3ophyt3 Date: Sun, 3 Apr 2011 01:26:54 +0000 Subject: [PATCH] The damage zone selector bit should properly highlight the groin when you have it targeted. Apparently the cat ears gimmick item were supposed to match the hair color of the owner. So they do now. Included some commented-out code for when the sprites for the pink ear bits get located so they can be overlayed over the recolored icons as intended. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1351 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/clothing/gimmick.dm | 15 +++++++++++++++ code/modules/mob/living/carbon/human/human.dm | 9 ++++----- icons/mob/zone_sel.dmi | Bin 1469 -> 9067 bytes 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/code/defines/obj/clothing/gimmick.dm b/code/defines/obj/clothing/gimmick.dm index d9e208704db..f65cb7ecdcf 100644 --- a/code/defines/obj/clothing/gimmick.dm +++ b/code/defines/obj/clothing/gimmick.dm @@ -9,6 +9,21 @@ desc = "Meow?" icon_state = "kitty" flags = FPRINT | TABLEPASS | HEADSPACE + var/icon/mob + var/icon/mob2 + + update_icon(var/mob/living/carbon/human/user) + if(!istype(user)) return + mob = new/icon("icon" = 'head.dmi', "icon_state" = "kitty") + mob2 = new/icon("icon" = 'head.dmi', "icon_state" = "kitty2") + mob.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD) + mob2.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD) + +// var/icon/earbit = new/icon("icon" = 'head.dmi', "icon_state" = "kitty") +// var/icon/earbit2 = new/icon("icon" = 'head.dmi', "icon_state" = "kitty2") +// mob.Blend(earbit, ICON_OVERLAY) +// mob2.Blend(earbit2, ICON_OVERLAY) +// Once you've dug up the sprites, update the first two lines then uncomment them. --NEO /obj/item/clothing/under/blackskirt name = "Black skirt" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 93b4cbd2519..06840de055e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -827,6 +827,8 @@ return src.u_equip(W) src.head = W + if(istype(W,/obj/item/clothing/head/kitty)) + W.update_icon(src) W.equipped(src, text) if("ears") if (src.ears) @@ -1253,6 +1255,8 @@ if (src.head) var/t1 = src.head.icon_state var/icon/head_icon = icon('head.dmi', text("[][]", t1, (!( src.lying ) ? null : "2"))) + if(istype(src.head,/obj/item/clothing/head/kitty)) + head_icon = (( src.lying ) ? src.head:mob2 : src.head:mob) src.overlays += image("icon" = head_icon, "layer" = MOB_LAYER) if (src.head.blood_DNA) var/icon/stain_icon = icon('blood.dmi', "helmetblood[!src.lying ? "" : "2"]") @@ -1347,11 +1351,6 @@ shielded = 2 break - for (var/obj/item/clothing/suit/space/space_ninja/S in src) - if (S.active) - shielded = 2 - break - if (shielded == 2) src.invisibility = 2 else diff --git a/icons/mob/zone_sel.dmi b/icons/mob/zone_sel.dmi index eea6dad08b40743f8b2132bb09b39a1b86242b7c..c80eddb82b8552041c67bdffd16194d928c13bdf 100644 GIT binary patch literal 9067 zcmb_?RZv|`5az)N?hrIUu;8x2g1fs1E)K!{agO>lR2mkWeI@SwQ~7Tn!+?_c|} zTU)jJvJZV`PF2^}eR|Gx&(}3yG}Pp=F~~6h0KisMkkNvVkpBc775*F)w;Y2HRsK2# zo-#HbAKmRgdD^?W0Dy0H+_Wmj;2S)YwU%5fh3k@FW5FSfMuplpGb)r)^s%iaZ6|co zroWcOZhcQnBmaJ)v7Me}HXnhNVH26)%CoG1S&%U}Y+2BIiW(zLoTN0S-=ll%6&r}z zYJ5tzvY~M63m$blH`Z;S?PAv@`9nrA)=*F_+hC|&IfdmMt17vuu~2v#))8&xPg40# z+W2K(VtSCv5pJTd0-0NwzKGEzFe*+)5kCOTU;!&5y-9-Qcn8$c*)XnR2; zR{5vbTE7}i@W<1d?L3%lm28jG%_-WP8bbMa$9R-x>x`_Uaq}C?6*4jCT-c`Sv7!%2 z+ow)&p>wN(+7DlEbNu?ux>3z;KAl)j+U8zlUo7oN(}qLC&!i<>&{V|CR1mq`|8Fu* z{X-~q1LI|!5ry_f-e>r`#KebJ`PfH6@%Gg7_=E{)+8F;Q0JSU-%r`5j3#h-r)kQ6R zvkC4qgT5Hyu1P%AP~Eu(5(U$g-~y*)5=RMA5TEP!x#60}1&={?2x61!lE$Ym_4vf2 zZV|yn!Rped2u4rc=1s>OV^3k{10g2!5``oaVx@=}8W6LMa*h%5;Dkxt)qh2^yio-4kt5kV~N z36Yz8amU~~1O8v`itVRJ$Hm9r+jaKse^Uf-p)_nUKE?dWU4a4VOr@E~r)!?Ykkv8z z2apjKkGo2WB>nJP;C~T_d~we+c;-Y*;ME$w-3jK>#l4KxJ0zNFfh6-VvG-ibRQ#c_ z{I;eX1gGu!DO_UmxZ%8ZlK<&{ z*$1&Vp&MTlhuuuW1vDrlrCEd$*F_RT-7;eNR_IjGi|~u1DJkX9#ROzn>p1%lZxy5Z z_LlN8vyD+0I6Q{N{Snckjnbpk?4`-5q-VbCjG7CC1|A11@;?xPI0X^SL8qlap>#Y# z9swdSyf3e?MFQ8vPGm&HIws|UO&8U-J$a4q$2{H94JLzk*U!Xg>b^{H$O8^Y`U)_C z;29Yl99rbMngl(OH{&Ec|1!rui*qcuQL)lAjP!OSqcStQSh~abXk)3RX1?={PT2_I zN0OB9nsWy z>0Y(j`ptc={jzyVJx-gyHDIMDie4rw9aJKW@ED-6#DD2yq>(`{txM3uxqsCZd(@P< zjM~-;cskcsGjSDFe*R)L6V7$d;;telgW`?D6!c-TYLaTOT9m31W}j{i3;Ih^0P^11 z<}g*Dmfr$%UO$QYpK@Z=d5huEeILBy zb{01Ad`+2zwo?&rYqg+HS#b9|zxkL9v7Pr;?^W;#ilf>6(}Q*yutr2Im+&UTikv_H zpk9P@b&ORRJm{oz6*V98V4V3uDREV6|I_^sIfxNpQSu+QbS6XTEBal$il^U?Lzm$3 zQ7Vv~8EYOCt;G28twv_29*gfSB|v!|Q8OwBG%CaKGfJMWk$l2@FF}SPC-jI$G&tqTq7M!DMEB1HU-G72 zNeP#PgaEF3?8d-E?DC+ z;b*E}RH~5=26lt-)BdqLps+EyOkHZ2E+w>hP?6XLj>~s=uj=WhlN=xyQGk+(TlC2~ zkTESUts9HC0~}&Ah!vwgX-?cR$YxFR7}4{d*q=O@){WYa)xoIh)#(`x!m4C;E;PcwedKk6euaGjH3(jR{MHyZvPtJh)+|HZ0M{mO)=iz#>W*2}E zUgLUGy^MCrW$;e%p~e^EIItTyMtx&DAFs%8mCG`g&e>ufNYhXm2Uj<-t@9Op-Utfo z3|wsVG`Gw)Utu+(7)H>kwss%{pblyx5(sH z2X)~e8ty+m7mxp@y<~0EBR(q=GB5g5cInyKu!wUeH%tRr;@5W3f_=2K1YvG2`b z6wa=cMW0Mj`Qa|Hur(WXBj8kuXQX!^I465|y|`-ELuppvJ)@mPErPOSdv%ob+%R`U zbovIdo&NSlE2rnEUp|!Zx~2$vLpwSf<-c!+&y<{ncAt6egI>ZcWu8lN8VONHqli<)yhN~jufc!yZ}%C5Ns zA~lF-@~lFVBZZ)C4N@B~#No&Z;sw;;ZW@w!X5mnq`h2zCoTze@O64 znMwCfVB1_UFwB`rU`vWmFzbG`hyREjQA&P>nX@3Z+;l(F^XVLfw0xC%`quyeZRQk}R|%fI(SfhM#=dOuGCf>?**g#c zC_X+En^u9m;;W16Kqnna=ms4cI_=p^vR&T_g&uBOp4j?)2z$W=g4Vw%yVlW~11?qH z-0yme;V39nfqp5z*|=;fBZ)sumQ&UsFr*=O+!J%E9Yo-5jBEG)g2bBKjKbATCu6lX z^J4}a865WL*el4IY`zS2yGy~JY7G}aDwaN{dT##Hc2B4hk@%kau5u@uE1$?rGuC>Gw2Gl;3gj z5d01$JwOg(ppE)$=_ z5L!YeB>ROXxFyiO&j2a!V3T;Y@qR%>OGTHr<{JO)2bDrZ zHhKJ>8^bgYanO}h`?gg_?1UYg(>`CU%UO?-g*CQiGPxEC%KL2VDESJ6<9^))9n@#R zysU?ML;&)a&Thy16oJ|Z=(QwCW(C*>Ig?Rul)k72236+ghw<F3VZ?vTI~>yyy2iQc{sADra0Lpmk{G z3(^cMlwn|qoQA1zd-SUJL0};&1#CqqO-RaCe8ywTe-6tC1@Q`?g;8+JGCV`3I^{6m znP7|3cROsLfIso`-@oBHH_<3ARlg$Q!yKnCfefGP#EL5QUE}9dc}zw99j2~)iww!t zMRE1)jcTzZ`IlL8bP5{x<^j6sI19a!zLo6V30TS}PZwf|!i2PKPiX$WMbZtH)U(=UWko)Q@&W1~!H97pEuCM^;sm2~c2S`18S7pH(6ZxZjp0#5i1}ZDg63znZVVs`KsD-^jWN zJ*fER>>OH_*8^e{)eJ*HVSo82>c-ka{w(W{>!z7A_N;WUcUk)R>fhVMLiDGCS=Fd& zaGXw~ZF&pLKx5itB>sG=g2h4^gzcv3EdCU8?dM(i`Kp7(GfM9?@0SiPSb*AkX3;CNqmsLo>%V;JTxQC(&9q12ehg08V4KY#VD z+g4S@-J0|YnPJHcl==weFBx{%%p2%fph2rIf{1p?&nz9otfyJ)5MKyJll91WVpC-U z(X+l3QrRAL&OCBfNRc&Y<3I`g_F7Mbkp~{Xd(m^3JEHxp)T6gf3ZeTCPSsCKdmrMe za7k!U+66PrxH`=~REpAA=KlN<8fqqK#vGg%t(YM%@@zFtlM1eGIlNxX5p&`{6=8dm zYeiZf)=?a3L)^qgaUhvq`EL|gOI;aE#EGkjeqJeMU|on!#&;*pRGW|0pRC4b0x1d*92qMUS^z^zTNkS zG}jW1)%j_UPtt4Dmo;DA{o|s`^^hD1>2#TfHNDWKI{lD7=EZq!&qvYd#4}$$CKSI| zklsbtB{*~mAEX=LzbVv?x|EH<%@E1Lt61>Hq#ygyN#!}R-@8?(-O-+nLv~0f_+a0$ zFe@CZ)VZa$mz7;igPS2aPmAo;>X)#9em~sKbQ>%%>nicgMfaOqNRv2D{8zkNuG)}3 z`)Mq{uX3(WKnDD@fa+Om?GI`baL8x-B0ZAjNp)B#)_oCm-Ek(&`thcg2v0g+4Ygbr z{gQA_>*R2uQI&ZExXL{L8xv-lithFpr2zQp+VKK3{xZn*a_H8Cb2DRQ#z&5$@M5YG zwV%;P2HD6f$Vy}%HFMu^{^)hhKrkO9l+%j3@ zLK|tpRO?pRT?Xe7^*#oZL00MnU;J=L;d?;YaqC5nM6XE-_WGY5^lqk#lD}96K0Qy5 z=u%sSb{$W0xn1O6d`~C}oIP+9++=I6X(;N|q{eQJNQBYrQ(VuVJQd8`ZO6f{Ur)19 zShsM4TM5Vg@8Y;vryv8L759}7unoS|oJN|<;yj|=EqZ4Ul`70s;425xOS`DAJTX^SorQOMY>85*^hGxTrhTBFV}_61=2}4b z+IgX!%~V`^OPoyi$-e}&+euDgeW2<)9yYX{#lham&(Y9JPE6^_n__|Q@7;N{GyIh1 zj1K-;=Cq0j!R?uG0x#@k=ljd1-OZk#!}C3wix54CWA7i~={`s4w7(WFsE_4pb*YQ3 z6>BZRa^we1%>lxi+2hO8ULUj3-Cw!!>sXm?`HTqw(jU)}oVdw@20>zn%8(g73A0j{ z_n<3JX3^f*0Q-`6tHQx75Ah z`jmHiB+lOtzgI-nu^pWt*8gOkXM7sT1mS}W_<1x-YHU_q*DXh91!7ZurgVi#tgagk z%jL{F{}My{StmfZ_&LP(4)$LS7}84Nm27vw)yjYMxF-zE*3_A~zXUOSii3VWDB-Nj zSoT3OH5s~A@MdJ#)@RG2sDu~mBeb3GDW~kxr=tUQB?l+NT>3a_zjqe|<9eEd{5!Z_RKMXnLgG7g7M|BXDA;nR z?MwWL-4r1$?`Gv@wZ}3myokR;P$DkaZY+kOWCxToYNb6oLP zC?3HU>zPl*Qcck0FBG~@_O1ZL`WLFjN4owv!E|s;s9Eyzjre!6S^izaMf>%}0GVv@m|z6m*z6|8&9g zs_ur57j5l>)Hag8fnv9ylhwLMeQm8x#`ez4N%(OTTi)XB``G{RfInQcW1 z`K-1PC#gQ}q>)4N3?@31rHqZL;iHiCb*t0M%ka)lk^1K5@W;o%PaYmf2SFRIQ}}<5 zUf56q*Nh95e)d;aDi{Aa!NUqi5WilqEYlb{BOzNe8QjHy?}H~I7Cc-{(<33CGUMER z-dGqiS?z0seLAGw#T&#eFKZV2kk`j~Jem>kAMiPxD2h`%X3dmfuS@O94+q5LC0uyM z@r3eKl91B08j`Zg6k28g-6Sc2AB7n^*j&m!Lv_w;T`TwJo6?`A-Lgw<_fnr5KF@bZ zQBzNFr=o9PBhG$$ud6X#u-TX{-7)exrKb^5R}BXg)Oonz$zGFB|Aul>n37N#OLgt! z3?;?wKV6ESHg5R*qL)GC+TG*wsS76W+m1Yn&MqpV}Feq#Nrwb z?fOgogCFexXEut)m|TvQFZvI~ZJNVG)5m7ha6=uJr0*s^zYWie_&&drK`&nBnthLU zu>WdZ{_AlO-no!Zpp&ji8xmT}vEEq4=K}{|P1x9&eJcXb#M1tUFxr79-}(n-CN1;ehep5+ep%7CCnTQMm6+)oF_>j@l7V>%u2jt);ZV zGet+ZV*B_U(NXs7IMJ!aW`GA!W;@7Rb@mrD6x5RXrLKWN>?}NJ&G5Qh$+I zLwfV4w=8r?2qv=V>$Vjo9nRM> zQwWF-~SeoW$au$uo z>aCK(ki#v;8tt~0_|tV|5ICQu%=hU}(OiWP2*UHN4V!1Yut6S0cr;b!uYkUYV5~2Z z=JJ53nTB!^#sLKhY{ z^-l5AwA<_0N&}?rTzsg}81-Xq{!1GrsxA12SU1vc8o<3Q6=GlCulZ-fs%a2dSPa zGGI7O{Ge{dJ)}-nER;Q9c55Te4)W1K4xE#h_>-@WSAO&b#?DH9n0@ng&$aar69Jo? z7O4PZ@@NjG&NV2##|UzJe4q1#U>*OSPH3|TnanLx!aoV=pmxyVrqdMsARG&$312g; zy*GSsd$TO_P0y>xbNc)Tj7mnNLl-ZkN@-|(E9V|1*1vEJ`jbX2)cBX<^NeseYc~V; za;|;umSGa5aRE&e7w!R(r(~I-l~v6ugf-D_udut9F{vdU9HGCC!3nHbPBTlAC?R)n zR+KdO)dpS z`IZou;#>0C6iKsi4muq1JHXIgh_UUv^*=ID z)yY#-)kwr}g>m{F47IJ*n6BP?uIZgh$iRMAwyO&8wtQ5I?0KCaakd_u?$LYW`SZ+> zLn_T}V!J2+WR)Y0UtbtG5@PrQL3PS_BVjb|as2B!(22&;V`L*t5|w2~nJJNq2Wcbc z3;eT^+P`#FNX;}9N4kdYFZorsxcI3NW-b22g!rWM@2ASH|NL~mT$V+4f(iGQ_PdHo zNoOb9o0VgfO4S{%gL%qskf=8n>e_<~oy5?0KeT;%Gfhrcp#(2h;%9FGc%KL9Q4u1W zB<9XO6-4}=7-uv7I+j0m3+E;(!Z6-@)7(?IXnY`aeRI~j#}~41X{pAD(q2ALMBh?Z zO;vVQTjRLjo&pVy8fB|)noF3o2viXn0R79z_EB0Fx10?&(082N<7igT9M`R-?!Q+I z@6k(*@LJf}Tv!PZ%Kz00vL~wQlJPP=^!nei_ud-j_ zD71;cX;M@?>7`?gF0t0oXUme_&Ih9UDf)*Q=0$i#GbCja`qEr^I`70c@E^LRususF z0v5UQyo7lXC@9$V+A3RvZ1PF3pKz?0cq(WO(P z?2_C>c!c%*LY|H?;CSIw>fpa)C@8L~4kVHMYlh7hFO+0j{)a1{lrR)VFYQy&lIe1P06UI&4#aJ*Yzb1N}8 zup~WL;DAxEsQmN@r_MEt zf7;dZ-KPRq`n4px(2t)GearQ@fXAJSCBi@e5@KlJ^Hr|f^`|_Mv_x*pm3m^GF1RAC zy;o)r%g(HPmVs76vjVz~8y7FR6W;_HepFr?@IklAQ zT44dHpCB4EJgX8?&s!YvKAEV~rzru27Q+3Rveb7Vylb*08?+s^4VMQzp2 z>A@Cpr4D?-Y;(pzAsa@K`NX281l%w<*gsY*G*-%PO2*(h#l`6Ts2+5h4$&ikv{ii5T z3+?Ci9eB6GrsReDBpG+6hjn|-R;{h{P&wZZ?IUem=g#BuMq!%%qUFLz^3(Uq#qSYT zJk4FE%Cc*bg(&gpoJW-4y={OU-d08rTrW)9S+s1u;rs5x-f)akKlL;gm6s-psgM)E zWUmvb2Cx1|i%Q?e1zoN&(}TY^PV-bFG@)TVn+ty%XT6npdrz(^b literal 1469 zcmV;u1w#6XP)V=-0C=2@&^-#nFboCY**=9x_R_!AOK~U}k}DWfE0H0NgY35S_8kJ+W-2N|TmI@l z&_XwA&_gf3X^W&7p6`f zQw@RET$e(+Wa|<-+}I)8g^U?G-4qUv-sI_~EFoY}rvn@NxWFx^t)(~(B^b>ckrxla&8v|ROiox` zBBHrvw}9L&p?Tm9Kg(e#uY*tc0YE1AYS1FAE=%u{0Z2q7!43h>^xpG?-+^a3+tPeyS(f$d$Y|Ei%8j5b~0s!z|`G=9Iy<8Rpkcdc< z9ePoOpG&CWV+X!#(a7VOz80HT$d)STnWyNsE^ytx1pYa}b^8+C)&+Xzsa$6m3p>FO z5vl25{3g@&-Y_0|TAc^>@-WKJmMUoO=CP<3(M_)+2@Jz;0#X4e(%g>t6A=;7y%*(i zHj=VkLmw9P;-Cd+S=5WpI@wm>BrU+(n%$v)BB5|hrK@uYRH-Ks3G(Uv*>$a6%B*3@ zS|>Fm0=x!D0#xherdoZ8C_uo_ho#J#^W!Gl8Sq+1N|8~jdS!HbpSx8aXxGXj==yV5s?h`orKR=B_dK-zfm6<=HR{V z=bq1&DozlJm?Qv$4lX?CP@M4nNJO`i8V2Dr2=d1IyH_bb{C?Ls|Bf@NuW~^W=f4pV z$yr#>37yUa2B%FI)^o!9p7c&IksTBx2w?X$FcrdJYV~E15K+{U=~ZAohkm1ue;@yZ zzdwC~uIuP@I!L8bFijKM;}^)ByuiYG4$1VYbKP(p=>UxKpg68m#*7C+s}O#`pq{FB zTp=QIbXyl#%B-Pfp5km}A6o!4O@nEg&~<$fewqdVI9u7r)5Z~!dJ)O=D*6KZSL$A% zu2Zmn2l%OX)Nr5jRiQOx*HNW9lRD!3zKV0*Xad&FubaDh^f0^!=-D6p*xufDLQvB* zq*5uA%Vj+Ma^!3Wh}{-VsQ?6muS3r2jj!TAl!|pGWgN!sc5|)|#j2d8ArV#xy6rsr zjNi*;Y;A2h%gW_4b{>63>&sx?d5*yC(3A^6fCqS@h{YxZ6(6fg?5x{YPL`0;Vmp|{^c^?cwA|jeg3_v0xnoA5oA|jegN_K)F zqR7Otr)3=LL^9g1f$Fh;2NuEa_8Zwgs3S~uc~F*x0Z1euuD8XT_aQ-XtP@Sh4nZF> zw?fO7D#4-Y3O|4WNHkVJSNk}%I!5Ximmvy7LTWW&V`K2x6Hoxq-23y!H^TdEYj4v; z9@$^MA73UIfJCC=6nI{7t{YJx!+4u06yAKb1IgE3^5z%a0)r6SOQL6