From fa75cb9fab42430630adb47b8d09048ad2c35927 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sun, 21 Dec 2014 15:45:36 +0000 Subject: [PATCH] Change beakers, bottles, syringes and vials to use /image and multiplicative blending --- .../reagents/reagent_containers/glass.dm | 2 +- .../reagent_containers/glass/bottle.dm | 2 +- .../reagents/reagent_containers/syringes.dm | 2 +- icons/obj/reagentfillings.dmi | Bin 1876 -> 1865 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 7394c728803..ec060a4fe9c 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -194,7 +194,7 @@ if(80 to 90) filling.icon_state = "[icon_state]80" if(91 to INFINITY) filling.icon_state = "[icon_state]100" - filling.icon += mix_color_from_reagents(reagents.reagent_list) + filling.color = mix_color_from_reagents(reagents.reagent_list) overlays += filling if (!is_open_container()) diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 44afd284075..ea32b152760 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -48,7 +48,7 @@ if(80 to 90) filling.icon_state = "[icon_state]-80" if(91 to INFINITY) filling.icon_state = "[icon_state]-100" - filling.icon += mix_color_from_reagents(reagents.reagent_list) + filling.color = mix_color_from_reagents(reagents.reagent_list) overlays += filling if (!is_open_container()) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 744e212e78e..5ee8ee89e6e 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -221,7 +221,7 @@ filling.icon_state = "syringe[rounded_vol]" - filling.icon += mix_color_from_reagents(reagents.reagent_list) + filling.color = mix_color_from_reagents(reagents.reagent_list) overlays += filling diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index 3e64c9e45aeef6b7c1915002949bf28eb5ae67d0..4799249dfc438f22870fa9d64cd8203709feaa88 100644 GIT binary patch delta 1115 zcmV-h1f=`a4#^I%U;#(eNkl>2R7=~delLMe|&Vkn5>gZ(07Uz%)9wCjH z;n1WaP~a{W-}6)+JL8|8A>IWcMgQC3a2SA0f3dQwU`U4A{! z^MAj8KA(R!c|qSK0CeU00=#xS9;;t~(==VruRVSh0>C1rl+!%V!!%9JPQZKfYid1z zO#;xF>kIH&;t7~Oe+>e#&=x)eUfy`EP9XE!&RwK0 z4`G~u=9~XorIZtoM}Ky6H~P<4|IRl*6&P~)Mj(@M13QyY1Pgz4w;70BrIe3*TcK_p zkH;@B#z-dseA#Cg;Io@)*0P5^eJuz;M}A*`Kc;E=_1S;d;sk8HC$IJVUJ1Yg8$SVm z)Sh`WzvcMm^Lr%#D`|ZKUEdWXp1>{UUp7?_L*3=L_g2(DJHM*{yka}*QjZ=$)jEM5 z-Tv3Q1K7a7zv(;tYc*HWziRHH0BqqY?4$X$PJj)}zxxcJ)*ZkG{{2no@6F;nfYt>z z-yJ~9`FrzrI2>BP2A~n&2?&#c11pnI1R0Z11O#9Xl~O*&aeTNc@2dm=f(ZaTVXYIm zH36VYd$|BxTe=sSG z0Ie^8*7IQv-39>ozPH2S(E2q1jkp7ozy&pvkOB~Y;0dLa)Ah34UI_pMvlxV~JUVr2 zZLV%Te{GA_gF`9hG|%%e48t%@(=ZIf@Ow>owF}_h{F++NUz3jjohhZ9#&JB2<9ND! z4sHEe^l~AX-ye4X3*EceYM+3&Z@Ahgkoj%ruW4}rT7L#=J^!9*nug=?*lN7_A@e`G z(|h&@5b_WZf_Vm$fCDU(Py`u&KrjKIOIuipwg(o2u-NT|S9>c{>-l@)4uD1Oow_wo z;@0!`#&Xb(lu}OjPP@y>?pH4;{cQd?j;FoP-y?Sb3p_e$w(xnh^@{5B`Mv5Y0H0le z<2W|G09&t!HoxB$-7PH&fD_Ps^Y>-(Gk`}IdaVMRZ~hkN*ZNAt+Vg!084!YX^$Y-5 zmy>V;IFpY85n_1C7S_S>eF6Z%tOo1Q?a5nfFWpw=v!2DvLDQ8|PPcFPd%tHsJ?Jg~ z-hia~zh^GbTmw(72X_IIsFZS==Xsc>>F%G`xCTC(|BR>Z09rr&H9vR$quDhszT@%u zb8quKlima%4!ZlFfmql3`+Mt`Ktt}6j{_Z(Py`HrK&PzdW(@-HBo`oiU^CD{EmuRm zV!odTkgcl#T;BZiJP*S#{IMkQ)feF&=L&kLK5qKA(MA z{3F3yzwyj>;j^B_4*@SHP%GxQozK23eg?3&hhXXRJp;(r)k8qmCji-e9{>as00<@k h5KI7*x&aXu`xhK**U;VoKYIWG002ovPDHLkV1in~9l-zq delta 1147 zcmV->1cdv^4%7~?U;$9yNkl40h#vR1z0VVhr_mCp?tV(=l5q1qc zvIO+tqz2~_W;7Bh8x(|}i|=_(9@*9p&v4%bAzAxyJRTd6>9^_&0O|;ne*-6fun*N2 z03+$WpU%IYrs@BWKR!NwD!HIH5&(wsbOAnfI2<-#fb%?WJ#uvdz#_f((=<(Op69Y1 z@Y4J(RnK3O01W2o0(>fQ2TY&81_4;;9^M0` zro{oU1DbDs&HUc`_iMlRY%Tr_@vEQn!A}K-T)q(qlko&AlaB)$e_+F%3`DNp`}a$y zLOpjl9Dey=jC2CPFMDkP-g+|4TJ~^GUj+de$bSp)<2=uQzxL-UcEIX$@~Y>LN&ptP z^BwTx)-#{YuN+@Ke^dgnlIk7kXLkh~%�@GXH#1b!*!mj(h2V-dpDn6@d3R9d)T| zFSM<8plb_#t2=-@Klt~T&VOplBkA93?xFzP!&BI6^S9ao?qL4KX8>E>0o=jAzjXfI zEWQJ%F0lFT04nG2&BO6{tiA@Ii0=f1laK=$laK=$laK=yf53ox@5kQz*SCHi0f1lv z05@1`2d*Xn45|12bq@=$+S1d3Uz|&Rw&nTg&|3Swwf0Z-MT~Ay0IJSI=l=BGf3()V z9S(=TiZ0>L*4nqC*}IwVEdT@)fI;=%e|QhfTMZk4>IG0eAJ#Bz0D!l9I3ADH*8mi8 z2LQnY0D=hslgI@klYjyof4~iT@297S<&H`KAee(e7|OL>cdL`DtLLw6(edEWdp}Ln z)LLt8p6AwDYtuBf$H&Lb7Qm(XTdJPFCIJ}Cr3Khp?GE(xI?Nx704#Lr7I5nw@c9dF z>mA7a+WBi*9DwTgK-Kdvsonw1&zS$(R~>HMgggX6lRyLxlYjyr ze_%*^Ii9HYH?*uKAj{_QOU;@BR?%_B%-cA4@n4`f4 z^nB;t>Rh^ena_F_9}b$X_kMc*g1_`J^BKW#0q_DO)z6-}+_DC4Iv(5tBvJ4EG)+^R z=lSCAZ?Ohmn}3U&?f|Nv{+gdV|Jv*=7T@7;__VkA9s)uzUj~GekOLVHV8i`qAlCKy z^XKYIppZM0u>~oAFet}!vjzdUkp;*eI2mZ6%A=v)W4@mUkZq^{oL~IYG_}^+i$fCM zdlBw&z5rxf^b>*3r=zy^^2OKMcBi9Wo40d!ZY8(XFZD_0-krED(2VD zXI~aS1K8U`u=M$!0c0EMAt37$fNZ`G0D=hs1QP%VCIAqV`vedc{R_$PuA(|aUP=G} N002ovPDHLkV1fYMJ~99R