From 457961f3ca03790ef3532f847e5bb3706b1ad054 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 26 Jun 2023 20:37:33 +1000 Subject: [PATCH] Merge pull request #15079 from Tenryumi/nikki-outfit-fix Fixes Nikki's fluff outfit uniform not rendering onmob sprites --- .../vore/fluffstuff/custom_clothes_vr.dm | 2 +- .../vore/fluffstuff/custom_items_vr.dm | 2 +- icons/vore/custom_clothes_vr.dmi | Bin 216336 -> 216334 bytes icons/vore/custom_onmob_vr.dmi | Bin 31849 -> 31851 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index bf2f860bee..887f892ad1 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2061,7 +2061,7 @@ Departamental Swimsuits, for general use cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS // It will keep you toasty tho, it's more than big enough to help with that! Just wrap the thing around you when on the surface, idk icon = 'icons/vore/custom_clothes_vr.dmi' icon_override = 'icons/vore/custom_onmob_vr.dmi' - icon_state = "nikki" + icon_state = "nikkicape" /obj/item/clothing/head/fluff/nikki // I have never tryharded so much just to accomplish something so stupid as "Vore By Hat" in my entire life, and I apologize to each and every one of you. diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index a4fb81648d..974b4aa01e 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1184,7 +1184,7 @@ icon = 'icons/vore/custom_clothes_vr.dmi' icon_override = 'icons/vore/custom_onmob_vr.dmi' suit_type = "probably not magical" - icon_state = "nikki" + icon_state = "nikkicape" w_class = ITEMSIZE_SMALL // It is after all only a necklace armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0) // this isn't armor, it's a dorky frickin cape siemens_coefficient = 0.9 diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index c7f14b8128f50582d81e84ed0d4dd328a0022423..d7bcc60f87173b84efe6df6ec9df36481bfa26e0 100644 GIT binary patch delta 2102 zcmV-62+8-5nhlPc4Ui-OIguqHf8{OPNor>gzHB8mmBY+s4|`-a!6pF-L~{U8vhwTq zK#3w{OL(Egsm)Z%7rW}|4}3M6K*PT-{{89q&wnmH{_**C!#)^si>Jl=f85{RY)uvQ z;%V{j@%BcuX>=U^2$3Q$o)*7+YP+~w{3lZ6Uv6(IS?hXhtajzaG!>B>k#dRz0C00S~$ zu&2&6IySO(khdcZ=`X#B(X&%p3B@Gdc&0cf&$u#@kQ+5um+aqYiJ_CYcv{>qA0L&(FM-&T0o~vp%Z{!)xr8s98LX|d(AhMQc%z7)9e;u9es>$+y_^^EV z*Yfd&D7OB+Y3}c|q&IDEng+PiWOW)E z#5Ww$dqXGbHP=ade<$f3sS|8X4(cFu)7#ECE=soP6+DHp;2@Sf71$?JUQwE)7M@JqPv3kTDj4+TN2XylINSWI5gDmy$n?{ofcnGczt3 zgGK(n#=fh6Z`iWZ_I%A;JeA89_-W|d83M=l>nFnxZ|J*ufA(fAx?;lR%(b8DuT-BN zuCE%}A4>fjyYd#^H)5-6g88Xjw!lwA-_8&?wqHLPet1LQ&9gUa(N>#yRr>WpFkj-Q zsc&rx9prB?E&dj!zN2$**Q%9}yL1+I;e6{LdgbxhO2|RyV+RmBGGt%vG~2ci3uGr# z`n>)Rw>K4Af7&gc77xqe=kfmb#`D&=YOYaKq)o#vT81ytCNj{mk)a**n6!jG%kYE4RCbAXRC@X=h zM_fQUc4>UYtu=)PX2M8-*b%7O5!u2uK1!YjZ%4F!B z6{}p-%dW}LD|KxYu;^wqc%x&DVkH|u`-DY(Z>3^?_HO)gY0V&eeVNf9e|7!PAU>Oc zusFA&lU}9c#sS23u&rrBZ(_l&F^<_AV7k2~lxHm{!wx71Iu*#Y!m9Ts?lR2mCGzaF zTp2|ce>bxi$g|S1V=G-oryV4)I!$WLwC3_$s5Nf2s>o5_T@341q&p+|HF7}x(VVwA zElPIn$Rz%2^W2x+(h09qdJkZshmldlh{!Z!|r(Y)@XL;`| zZC;zOHXgjjAMs=dkr(g+U-uOuJ1s}sIRhtZN^M7|a%Mlh?`qfq&zHP%F}*|wa9$=2e66dMzOkC1vr zYRy0$;=q#+1s#8Rt!8@Au;R{fKp^$g;RE$&xlh^tPlgDxFdtIPM#ySI$Zo@$qbE}` z`EFKob}o**0M7+Iq3FeYNoqWRMcVj?LM5mZ7|>0&_vH9)V;t~AXhvi4WG0c$+2(vY zQQ2}?l*U!YHEH*!Fcw`pQ`fsjrn-~pG}}CvBY1IZV3&Wg{6-D2y;c#9lL9@s#xA`1kAJ>R?Z@!o`my6=R~Xz4*B{qfR@?_C9?%dPle znUN=;t@wYaO`{>QcNLh0A3Z?v!3!)`v(lx*bK|0<<8tGI79Z2iuvv78O>iv3PtHL-E-gpC{tu#kaK_L?6LhZGc;=|pnY^Cu?%%eBN^(9 z2S(m-dp?7lo{ilvKfDwJvdPktTKCad6L&=mRjSSfu%nb$gn;J1DhBLsY{?le!kR5d z;8oJ80C+9|W}q%7{|u3Qp+zcSR$GevTqrA1b9&pE(b$!p>68^(CtG*`^U5RA+2L3k zap`|<;I$Hn(i&FSEFYNHAmj^f<&)CuFkzf)9^A_Wx6@~TqNT;W&S+C6Rnqjf=}07e$l#~SG40mi;#HtY=-S|si55jAOtH|)Vz<-RFjXa0HnqP*u}IlJ)i zO?k%cv@CDf?i{rL9Z}%>cYvV|ZCPoO4SRpG!1q1QOk2}O`{|F{}7He z`e=DB0i*^mWq?X^&%8c;%9~~Z&9 Zz%vb@A!XkBg6g ge7^l3xgJ`Z^7cbxgJ=kcXb1s^Xb1wgXb1zSM5|XB$^ZZW delta 2104 zcmV-82*>x1nhlVe4Ui-OJCP+Jf9);X$<)pseA!BBD~FlO9`?v;f=vPj1Q~l)#L3=?WyDOfA@(Ex@b)& zPH?j5q&(8^U#DAR$w}oogrw$?ZLDkS^hXmF_j>6z5>B>YxdOP!90S08m zU{9TCbZlhnAa5rc(qDQLqi3hI5{gN@@l0_^o^fR&AvbESF4@1)5<@R>^}KqxdwRNi z_d>Feo*iPQv;$vfrnCdYe`eS<*I8lLz(y4H*LE58V3#%0?ATh_rbqlh4n4vy2jVgZ zXw>Ap(348*oJeS9YVsZVPCP^^>LZ!-LY=X&7c;)7k`kdamV3k%CLa+nQXpG}!KA~) z5rtZ}#EW!Sj{;B}I-*!0@?2HBWh2jMF2y;+5UR9M1d+9T#;kW@f7#L5u9_|X$KUQA z|8e*9LKIv7-ZT&QTGE@gH_amoLR?Uu`9AbWdNE_6VIFzSwgXjbwjHh+8o`OooR|a_8|v;gyC8~?=(}DUVxsf3PY7PiXd|A-#n!mvjWDCeq?nT z8pJmo(tATM={46&e|InG9jO;=O^)gybTioAI4(-I=@mSOvEU$aE?99x# zWDFMh>l*v6{=H$#N;~j1bMaIzTi~amZ)XS`+pnJtKfIyuf9BbnwdjfomowLXs=rcw zdbqx7Xn!d6Z|urjc;ASvt_kL+a@hhu4ShR9;MjisWcc9?eK*hEtVLUG;#KL_3&DJe zpQgUGDRhv(!L;~GnEH;+yotf8Mo(r|ct=APf8v2W2-HP;QB)>)us6Sfr zHm60&uASHx>7wy7#hX6~*66UE}oYf(!u}7iuNo%Z$TC?pq4U?_K1t~Tr03RXs znpDd`9pcE74h0>5Wvym<(6HjpX+R+L^Wg*aXSq+={?CR8valRd%tpv+L&$DJ%h8i5 znS8&fIXf3eUV!I25+z9cmsz#?sYLZK4W84TzqJ9u(@zcCJYBDA2fc(Ra4=WI(p zov3WNEK1`lTpFX9? zj7MJ3dEybx(7Y^Oy{LJ^AxE2fDN zSZ3r2XeT~@YSUA2jupvA|ux?YHUu3TPjlNGwC0(@2K8 z;DM1h+?~%L=VxONcfY+91G34|l4^%&tckm#gDO>*0@zW?D?&i?Uljv(H@4&q7ola# z5qOn!Dgd5KfElRE$v;CRUucmEnAMgde=d}js5!muENJY?&h*L(waFG9z`XK^baptE zMqIjo8+fe*qO`_UK~n{`^b0%u>E!`V$1`?xdL)=c!Mw$|XhmT?KGEr^YTDM^BN?+Z zZEMh)AZOY(ohXkgWr#J>?zkN~G^LV$o z=#_hB$Z`ke}wC^2J;JbH(p$_d>X_5_pd$PcHRmVybRU%HpLRB&KwQv^|MddH~cb8StdBl>?3 zjx_pMc_{&;1TSTP3Uklgo<8ACvw-H>^Uik^fGv`}HxA3JN7hRTuwU3yVW}MVU+DNk zdLe?*TLvl_C$a$U%;#_+4%>GRA{gIza#hg}zPDUt^v_GVYfNd1*ZX-Pxcs{M_~(b! ihd(~u{tpYES82Px4&{Sp2#00}0f%M?0=H%e1E@p}p(B6* diff --git a/icons/vore/custom_onmob_vr.dmi b/icons/vore/custom_onmob_vr.dmi index b401831f62d2c94dfd9fe1602bb2a4a2e41e063b..461b44baff1feab50f15bfbfdc2fc4fc498a2676 100644 GIT binary patch delta 438 zcmV;n0ZIPp_yOzq0gxmCyOAX$e>KBSz6>db9NJe9Xo&1dcH@y{ z9C#Qa-pf}c$Sxlu3^RImnadGE>^Ujhg|v#schVyyU)Rq|zFhyvu^&icfLzTgBoDEi zec-4W#cH0DX6XB(A`2%a!DKZsR?LBbL$U9WJc`vEKm(MAn4`y}Stt$VKtE;y$1y@V z%tYfz4i0D)A)>!7*fuMVe-TcmHQ%1roAqXWt;GLoEzh~9ax>3x$DGSCFDQgIFncO* z&}Z0|eJm)1I#agy_$YrRLwB9|{x`wR`qR0P-l$*J;)3y%97DDf-*E5`9+>?d_@C+( z;ZEoR@PY!dVqYh80jj-U(6wHwp9&I7t}J^3!Y>GBOR+e98iQ(-A{C8 gg*(*SgZyY--gaj9x^I31225PtHJpYHv*rPVdQZ6382|tP delta 436 zcmV;l0Zabt_yOto0gxmCxsfF!e=WmKz6>db9NJe9Xo<5wr$wMq> zA2@18v6|