From 8b2da0aa909c937746a2250d70698b8900dbeb81 Mon Sep 17 00:00:00 2001 From: oranges Date: Thu, 25 Jan 2018 09:14:14 +1300 Subject: [PATCH 1/2] Merge pull request #34746 from DaxDupont/autolathe Makes the autolathe repeat it's animation while it's still printing. --- code/game/machinery/autolathe.dm | 5 ++--- icons/obj/stationobjs.dmi | Bin 60472 -> 60479 bytes 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 7554bb00ae..c425bbf8f4 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -170,8 +170,7 @@ if((materials.amount(MAT_METAL) >= metal_cost*multiplier*coeff) && (materials.amount(MAT_GLASS) >= glass_cost*multiplier*coeff)) busy = TRUE use_power(power) - icon_state = "autolathe" - flick("autolathe_n",src) + icon_state = "autolathe_n" var/time = is_stack ? 32 : 32*coeff*multiplier addtimer(CALLBACK(src, .proc/make_item, power, metal_cost, glass_cost, multiplier, coeff, is_stack), time) @@ -207,7 +206,7 @@ for(var/mat in materials_used) new_item.materials[mat] = materials_used[mat] / multiplier new_item.autolathe_crafted(src) - + icon_state = "autolathe" busy = FALSE updateDialog() diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index e4c1de0282414a94ba0101b1b827920abaaf3a95..d657bd841bf5319de35d47ad899f5598b96e5836 100644 GIT binary patch delta 1037 zcmV+o1oHd1*aN@V1CS(t;(AnAbVOxyV{&P5bZKvH004NLrI^ib+d2@1*Va=I?efZj zEm>*q!kdc}MHcPmK7c@xV~H@u5lAXd-@Xg~NVY`})gTCv0N)u7hlfK_U)g`(f4u!- zuRq_Ccd$;OVOzF&S|y8vlD=VEmS@SL0aZ8t_>c441KYAMsy51hgI#|~7E)Qqwrrg& zc9yr`*p}tVLW1VM*_N%-b-KROt)_J&u;tE`(yDi`1G^#F^)y`EBy^pW15s)edon50 z3k}>>*j6R(cJp{M3+KYCcbJxB!)%JQnAXEbr%@_XlOe83ArYddVh6O3PHctT z22#6+CA=#U@Y{&49Ta}{Q`Ld+k;Nt7I2l$s@UR^lhL*ZsmBR1k82<16QAWFpCBA zSa1^y79=Qt!R>|ay^rXoo#xIfvD3Vx%h{r>d!Su# z`^t9>9t3w#(tYoO(yN#i#pED?RuiENHlKU6pixzu4jtWfTV+(mW15#y6}P2^U3AdW zs=A?nX=%Z^i2ix9Tp9K3Ja6-vv}m|-3bVOxyV{&P5bZKvH004NLrI^o-+aM6e&&gAu_E@q? z?0CC9|HtdtCjPhWASD)syQd!3~Y&D;4 zt!Tip4NK><614csHf+ULe08T=j_U?sBb>`itM*`fc1^OYaX7n4=sGC}GS?_~WKyP+ z8iXydDRSIyr}1VIE~Hm`7?&h{H5t#w_3++mES0Iq5LZ)CB3kLKCUZT5v;z{JjE%4; z!6+!n^b(%TXBx48WgC`_glWlCwdjnjhdv^}Kusg$2aC9bp^GRw@6jx<1=>d^wm@M6 zsoldR?3E1oZ9rEJjKhc-I)U^?-zx3F<`Rv!81UWAOa`=pq(ZypS{z6;PP{PK;vvFe zH!@77D$HbsoIZ%h_lc6#)OB7?6)ZZVQSL%}ZGGKu9=K$GaZnay=gBxJPkGAIK8^!>i_9!E}m8E{){YA#PTqcP)ChVXGIOT-_m?(=&n|;{?WZxHC%k zsta1gqplS;@W5ElZyzTEi=*`-bQ`}Hj{V#Q3wd#WYP3oV=L&qM-FPMo8Z8m6S53?d z@qz{{IXE!ad_AIzFvW$X59PoZv_)#v*ou-a_yh)0c?m9GAK_1}K$rQ?h(ohS*%vYO zmG5diNZ}x-``!hmS24-5(Ln;OCPEo(KKE!wqpC73I=bsN%BVubG%uqHVRH@J=%Be( zRZY`>r3L3A`sc}VdDOG>yv--lvKG!M`T%z*TIbO~-hgwWqE9RfvKF=qHj}Hz-I(qJ zTkR4f!q=m^2v?8lV!liDaLh_IAnUCtBCbwHFi`Qg(5xj_Pm*JdQ1!#_R@qgQP`w`)SU nJQ_1srKbHg6g=3vpV^P!uk7{L+x#EQ0>?oxIjH@!4+Jpij}-TD