From fb86cf68782ce385fae3a16496d90b5849f7467d Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Mon, 22 Jan 2018 09:06:07 -0500 Subject: [PATCH 1/2] Fixes syringe icons (#34704) --- .../reagents/reagent_containers/syringes.dm | 22 +++++++++++------- .../inhands/equipment/medical_lefthand.dmi | Bin 2851 -> 2869 bytes .../inhands/equipment/medical_righthand.dmi | Bin 2791 -> 2811 bytes icons/obj/reagentfillings.dmi | Bin 3125 -> 3095 bytes icons/obj/syringe.dmi | Bin 4441 -> 4379 bytes 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 3f38be95c9..f4a4919919 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -101,7 +101,7 @@ var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares? - to_chat(user, "You fill [src] with [trans] units of the solution.") + to_chat(user, "You fill [src] with [trans] units of the solution. It now contains [reagents.total_volume] units.") if (reagents.total_volume >= reagents.maximum_volume) mode=!mode update_icon() @@ -154,9 +154,19 @@ /obj/item/reagent_containers/syringe/update_icon() - var/rounded_vol = CLAMP(round((reagents.total_volume / volume * 15),5), 0, 15) cut_overlays() + var/rounded_vol + if(reagents.total_volume) + rounded_vol = CLAMP(round((reagents.total_volume / volume * 15),5), 1, 15) + var/image/filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "syringe[rounded_vol]") + filling_overlay.color = mix_color_from_reagents(reagents.reagent_list) + add_overlay(filling_overlay) + else + rounded_vol = 0 + icon_state = "[rounded_vol]" + item_state = "syringe_[rounded_vol]" if(ismob(loc)) + var/mob/M = loc var/injoverlay switch(mode) if (SYRINGE_DRAW) @@ -164,13 +174,7 @@ if (SYRINGE_INJECT) injoverlay = "inject" add_overlay(injoverlay) - icon_state = "[rounded_vol]" - item_state = "syringe_[rounded_vol]" - - if(reagents.total_volume) - var/image/filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "syringe[rounded_vol]") - filling_overlay.color = mix_color_from_reagents(reagents.reagent_list) - add_overlay(filling_overlay) + M.update_inv_hands() /obj/item/reagent_containers/syringe/epinephrine name = "syringe (epinephrine)" diff --git a/icons/mob/inhands/equipment/medical_lefthand.dmi b/icons/mob/inhands/equipment/medical_lefthand.dmi index 24c79727d0a039e23cc7fe4f053bd8337092f58f..ad3dede2018af56f7f14893b92924ca367699c6d 100644 GIT binary patch delta 2179 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 diff --git a/icons/mob/inhands/equipment/medical_righthand.dmi b/icons/mob/inhands/equipment/medical_righthand.dmi index 427e29c49c51ac95d3397873d8117106bacab54c..de57235f29c78ee5317cebcad4a916510155aacd 100644 GIT binary patch delta 2123 zcmYk6dpy(oAIC{ysi;+|6ObBkQgl-pwQRY)k;u(T9~v}Weo z1gq6!x0(VI4aW-=2n>jc#3148oF{N2ny=-q_?FJpk ztfF6neIS?6_t5r^qSeN-RsMJI?x`)7oFO{rd-@$N7*jYKZ5qHCdJr4cAz!vhQsSQx ze<4%AqrRHA3Z6bjexO?0D?%aKPLBmbw8&qHFhk+ zlCx?ZRcfH)+RtLM2ia6Q<@#NcdrI+{c95=OdUaF)rh_FRjqi#Sx2a@lD|2aECxq$d zi--Yi$S7XJqr8{FhW8D!$NP@GV-oRC6=3EHZ?|nRTg+dJ(IHO*lQWVizOCyuO6=}-4U$a7yQEf2C!v31Cl*B zT&wgfo7LVydhS(oEWE~^XuHO|A7+5Nz3KloG{m0bNUrxZK6Z4uQUPX+b>(;@W|Ca` zSvlSQI09lKF{CjyWitgl4s7Sho2|KpO)YnJ-co>@6KG#&mgxx4HnqHUGi6Bv8or9rHM+Ql2UfmZy33hu|>D9~DuCucX zUy4w!%v|^B*p`Clx*doLd-c063J!GcT8H;T#K`#{U!UT1rJrEhqG7skUXf3K2do4X zuOounu}HPaZH2+yM49`7&78*zR-9dZ+-t}jGfmy=?IFqKVB=ykgC`ckuI#mxtAq)E*ewA!}LhcdITw#J=BNsn&`pGI_w! zc{m|kt~WA2BhCZbs!zUJ!O=1l4hkhPSH%7fy+i!Hr55Z6kQs@GD|tEj^SS1~>gjuiVdAEXx%EP*fdCk?XrE}4T11>5 zfyM!z23MzxBSUs8lF0294dD)+WQI7qAsR~X{&bNgxCw0{RN4^Rl=O+w-r2pp|Nk`- z#{w8k{Q!SDZ?YufmuPM;E}@#HtNY@M)^We4)cMaoFJCHEoL{hQifKpmMmP+v*4k`J zV^tU!#{rOcLXWOsL-z`Mo%k^I4=`Q5j@zpG*z)=7f~AC1(g(&;Z_f*89bq9#C2rW& zI^o^OH@UDNsWK?xJdr9kDd5>(Y^Q|dUxv2;I=NrF@0$=++z`*sZBCN^pgFW6|C0I4 z4HLa}nYk!Q-smB{KZIPfA2hh|Jb3T=Wnp44mM3_R+~dbBH1y68ez~)0 z%>0Yst)uDpjrodo7UreY%i9MMgO?g7Jzitc1(gc3!Oorvg^!HcQ(amVJoG%vu#_6H z<`vmeD}xp`)(4|46%Of2UpsfrRUf#RF;$P!*tc}Ron;7=Qu~mpmV_lj=#frAvgP%S zdgdLi-8LDG#GKUgMK|C+pc3fep52*cyU;G$8gNvJ{u4RJbyVUrsPZlYq_) zPenEV{J3oD3pWD+NUvyhHXKfynYeNTy0c6C*=S4!=yE9PCHttCK#0*>9s9s;l3ywx zbRyufam76G9n*)SM^b01*x)1#wTv~(8x;ZYVU^c^<1q^yeap>1g?ltyi5Lvw10WYK zSVHsfC{9}|YfGVuY!!XpI89pa)5sBQSeFkBAsnMiqbz^Ru36vOokX3eu=cv~AH_E+ Ak^lez delta 2107 zcmYk7doAHw23d|pvirdEZD*HG=6AzENWLO#$!1ln@;VV; z+*tqsqX6(ns?xJy#tHQdW8FAWd%pof563sVGV7I(U*UuoPuyiTITUMY2QwIBN^ z21ER3y-uFFqobQ_O=5M(b7L|v?kV^0%T=f~Cmy}T5xRw1U&cRLEcxvxNhv8i^(yAg zRHU|2Yc3=h!T%%~sR52u9J00diO5@6q`&d@Wg_@6)wpczC|RTOx*ERd#E!ge``nX! z!Fg+n+}e(MPtbjLW2bvXg26I1d)RV3$oze12C2;2!b8^(ksDs3dxflH9n`@tb@V8n zsMYGzgRM{4v;m$Qfs>7$+I);t($Z3GMjGBK(#I0GJJrjw?02>HxgEHbYZAks`#C9^VamByNm` z+EAyaZ#Z!a!i~FKu~YtW?=xSzPf`6CqI}I))hXyHH&ml6%M#%=?VQj-x7+jfdsE<^ z!NDJ8v^eTO_g6FJ$RBWmsD#9&nF+0n@#L%nXta>phUf*HwoZE?S_)F-Z8lx7nX zze*XCQe_G|Fno*O&7&5Ef+2RC-Z8BCdA&%Vns~H5=Fk0BbNH2eM zhT0iw#85CsI7)la1Z z>_qO)KIK4@X<?!eaJDBflFOwnlr|-Gle<>yh`Xj}}ZE(Z*U=sDE8vuCYmz z?{nEy#-Ek$tFC1-Svi6~r%!jHX5PH2iR9J_r(Ee@X5i5+(;tk$5Zwh*>^0P#j89ri z@tJ1l+5*BmM6WrIP@yfet4l1QI@QH<-`BF)*k*ZFPPsF3LOFA&seWwrmyiyaLAEI- zz>Ggdi8RE|4G?Zsb?rB;n=<;tpP4)};7McXlzA^7XU4R^2XI|bpxRl+^$UabR%Bv0 z8>T_+AbHmsQ=~f69m2}%w_C*5@TT6&ep*+#Mn9TX_^@bo?4DjZaV}yPs9u)5UJ58= z26eF;Yo^&qBr;xKTk~dkVMBxXR1%KHZfCT;63A6V*t%&g|FMnip-}{_20)QPuM! z!(Z#cb#H7h5%gW|_4e0P)5c-ri4+3cAW&s*VE>W%P~rLldS%monTM}_eK2XUgmr+p z`Zf%0IzZHoU1j)vS{;L3WgPc}?-lOoa*jJ`Fvw^(Rf&r@DR#-FA}2A_9M!6QEK<9k zcWI_rfO_}AFnit!w`kocpR7(=%wFhYX%wBBiZXvVkT6uQ3FZS6$b&6HV7GfW6yCpa znQ{@>-xJ>w=J#H&2DtJx5Czw^2W9+c3$u;`h;qo8T%s7J5L{zcJ~i uljh^<$&tIa@B;Rz47Nv_{rG4cz<>;2rceQR6k+i_nv0XWW7*M*@&5<)dKg^* diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index aa4a6fc29953f29bdf3de64e3bf18608a96f4d6d..e4a2ea7a34e028a80e502f30a1f65a73f2daafef 100644 GIT binary patch literal 3095 zcmb7GdpOi-8-8b;1`X{dY8=~C%Zfrq!YFi3B1JVuD!d4{Imud$i z3S%&I@)d;~Mo!a^1~X<@W`;SKZ|wflckT72}b81Lbl6s_+TYMU7oEY3JLmm<}%R{mva3OE3 z`nSIzlSe+s`{>qnonl`QRa;)oO6GHytr6>KgIhfgJ8`_9p2~CAkBxmwelzAh^-RP@ znXam=GpTo9gXw;OOjw_%rD;s8DyQ4EPtR7$KxedjO z{APJ3A($Ms&Ue1OhiW`Ij2R1k|Kkx|=DWLFf^F=Nzg4>$%TC&(XIh{hhrD~s#XUP1 zddaas{Ww2lv**cllk4eY6+wnqu+53dT?0{tYF4IK+7Hjh+kQlqCb{kp`DnU1hW$LX z*Ct|9E4!PNpQ2iBY8wz_Eh@);j4b+AUhLl>i(<#6mq{VW&~w^t_1%R4Xk;I7+kO1< z?U|9L=s{oOwmEuS?b%_TmSxGcBFz$P?oWKErCY^$$J}2uTXC$zh_z=x+`(_VxINaf zEVJv$+SQkHEMiTG%+8LiWbSO6-#dQe{zcOHBi}cR%>$faw*>bSNGVMgp@ZU7cYy$^^t#bo>CNT$d-e2(c|Y%^BbLb9|}hW>5Zf0@%4 zV8zgSSi^}ZDQ2|N)9>W?+-v>7hZ_O5+7({KeP`=KO(BT)n1EBCjw(qXFgP-PS7+)Z z#Fd|`*FZe|6;QElRFj@RP3Mj2Hmhl&=@l?iMhY(}D^ugbL*wd%F0s|UV_xjf^&bX< zCy?xLA8Y|pNZ!^j%&B-P$dw9>;c z zvX^%CEbigy<2=ar9>aEMMX@L7TMD<1HjG9&4$ z(n=!@UD1h?MTXIsX-|FoEqfJGdk6hLI{V`Le@X7Y!29K6_VMd8uQw9DCgYb~|KOw$ zcfJj`yx31c?&E%RHFyZo7`eD1GMDIC*xU8+ZnzW+B z8b@EkKuN0ZRrgJu&k>5dJN~LU{yFKY6FkjXYs5rE9XdEr*~RZWrIrqh$n!ej<&$WQ zpTnh+EQo!1J_MxHW{jU(+eY>7wlmwIG9bEIbJWoiEo|Z&F$AN<@bp3=olZ#DVYH8I zKYH`lB?m(r8wqEqZnBphHiG~Q2ArtQ5tw!#=4F)ENmvIvX5O{MkHQEJj`R6QT}kls zJoVNsf^hj_FtruC{}J%D(4~@R>w@l-rwV+igsBmFqL4%Vp@nd1epLI0FSCO?-_t{5 z5k?<-=Nmy%oM&_!h%kjJw3^gA35G99k%@+oa(}tO-M8a`lZ-C&QmZ|8o8x4^uGmba z(%-k66%_^YVV@GY)fL81l?y5_8LJ7C&(?gnn7yxi=*TfCtpn^}tX#jk!un>W%FAZjz4siYC4?Se^7*(lZfL<^z_zNX*b9%4 z=2-afh(Rw#8{38=h@TLo9M*;<&Jgknn64fit9@CkDLv5ac8J~&%giLi3w~GmvyzQu@Q0m%b-U&Pl zk|snCESt4*nNgAlI}dAi+4-ot1onewXB5A2Q9*W5GcjJAxV+)FTG!u@TCeTI#i&GU zC@9|z38?*Hn!-1XVbYtMYbTMNqal_gwLBHHuZ1k~ zXzS-Z9T^@TxM)9YAV0n2zxSSL#y1?1MAtpX{n(Qt2_~}*r*PqsScj3#Tzpe)Yd}@_ z0*{m6T(^`EL7`BDVzF4FC+(R{baFIp6W&ns$f?^NUR2n3!jInTNBV%RkIH<^eJf|=9%u6-`J!lOJn_KpX zKpNk`yzZ_bBCA~7y3)Hg+bSBdd z&zP5FG9&+`5De1YHNehb^M{zl_KEk+u@1kKJ-Q#-5aY-XyVDxrIYsrpq_CUoG!1mm zv#@;f$7w;fs*C?PPH%KUBEw}SIv1ZVDC?hz3%4_f$T+O-jB*+Ya&4)YW}{arIs&J7 znMb}glkzgwfq*N5ydg)gEfAmO@Zo@Q8LcEtZsArWEoF`x^5bZq%OF8}O!$i;iR1-Z zttw_~OLXXzjPQMEgY1G(sNQ;r%PQPfK+W4wg_q^(LS(P_qS@s@#=wZk8Gova8~$+W z0a~ahLTUbtmfGxMLIdJjt9cx)heu`R)5dT>R}--XA9{$(`&sin-mE+Fn~gTg?Gw?v z2JO?#z^s3u^Qt_7HDXg;?(30@_J^zC!;u}9>sI=LtCmrX(hOjvLrbRpN26kf14ZE9 zv?IQK6qWjOik3W=9YsKSR=iSac}#|=LrNSnH9_%dHJHqSbf|9<0IWY34*MUo%8Gg1 z6RH4@9GT}$+D`7KQR&3+I!KAnZ@jcm2vi-xDhsr@m(1O8{e9|r^2$uV?REoo6>%fz zLab2z{_y|}exm4yHD@&5K}&qJ!jtmraxAnIutU5i@e;572Cng)ca9IQ;{|*-wz?7N z-@h}RH7zJIN2&$E!4^#?wUZP+M}XfY&wr@{Qd90ElNm^Ie2k~bcb^Pyi~Az9-XL7A zD#Bj$onaup%}=QwTgoo!jeLc0@s|-OQ|rpW)-`yogR7Y+(el~&$P|ZVwzneMcN40kgV)->GD(G@fi3G4w=2eF zI*dW_VgY+w?Oy|7dAPNCABF_oL6vEDodrW)^b7afcAhW$jWq>j~3oA!=prKj7}+R=FqO%6|X^@`jZF literal 3125 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 E0N|^dsQ>@~ diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index 2ea8825b2672d48d448fc1e54f57c3fb3b655582..f77735fc3ee6b3efda50efd9ec5b005fb0f63f44 100644 GIT binary patch literal 4379 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 df^?`MoE!l=CP$^P`ONibg_$fmeogsR( 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