From 3b84e4f6a7bf7682e483ab4e8afdd08fd003250e Mon Sep 17 00:00:00 2001 From: nullbear Date: Sun, 28 Aug 2016 19:44:18 -0700 Subject: [PATCH] Fixes chapel exploding infinite loop. Fixes weird bug. Adds unused colorless 'powderpile' icon to reagentfillings.dmi --- code/modules/reagents/chemistry/holder.dm | 8 ++++---- icons/obj/reagentfillings.dmi | Bin 1573 -> 2493 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 651dc767ccc..62f8a1ceec0 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -345,6 +345,7 @@ var/const/INJECT = 5 //injection var/list/multipliers = new/list() var/required_temp = C.required_temp var/is_cold_recipe = C.is_cold_recipe + var/meets_temp_requirement = 0 for(var/B in C.required_reagents) if(!has_reagent(B, C.required_reagents[B])) @@ -374,11 +375,10 @@ var/const/INJECT = 5 //injection if(M.Uses > 0) // added a limit to slime cores -- Muskets requested this matching_other = 1 - if(required_temp == 0) - required_temp = chem_temp + if(required_temp == 0 || (is_cold_recipe && chem_temp <= required_temp) || (!is_cold_recipe && chem_temp >= required_temp)) + meets_temp_requirement = 1 - - if(total_matching_reagents == total_required_reagents && total_matching_catalysts == total_required_catalysts && matching_container && matching_other && (is_cold_recipe ? chem_temp <= required_temp : chem_temp >= required_temp)) + if(total_matching_reagents == total_required_reagents && total_matching_catalysts == total_required_catalysts && matching_container && matching_other && meets_temp_requirement) var/multiplier = min(multipliers) for(var/B in C.required_reagents) remove_reagent(B, (multiplier * C.required_reagents[B]), safety = 1) diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index eaa9285a954b1fd396151d9162a202e62ff085a3..38c47790fc14a0032961c00127c0b8611ac936f9 100644 GIT binary patch literal 2493 zcmbuBXH?V48pi(#MNqmR-~u8xy!2wkAfX7khEIqx}hX5Qz0e)FD5cX9f+?9RPA z0RWIioVIrpt+S%hE+r|NHE)Jf001N#=k6V49}*daxe^g|B|HoOVjkq@y|^l7B4a~a z_eu*6Lwwd)!TkKjCG51&Hr=E2#34xi<;9sBz1Y)b-s9*PDF)YIE`ejB@o+|dHM6oa z>ZV-dpdQ7yf}#kG8E-;Ws=-_RGRl>ro?9q69du@lbR2^@-jo}y<0_vVUg4*jrxcA! zHIAl}M$^MLL!KS15U=+Mylay?ghFO1_3CH4f{Fbmj@k`vu^*xSZHN59BS@1J$w+c= zLUqAiGep9XlV{bPhfioSVR1fPlc|fA0V-4OQ+*fm3SG}}5c$_W9Pxm#i`>WWhPj2D zdxgk9EB&q4H}&(#o!@)inMP*!e&r|5Dn+Mi{SeIJ0sZ>IPNeYxG5|=0BJ6G5V;-zf zTQL*f8mV*EA0Szi)OQkwDUl#$bM;8oc{?Wtv9F0um~Cml1D8-uS}|3=9PK0PH`W3B zZmZbYVP`E(c3w!bmW$?NDi7#mAv5HkfNW>_4geP{E+wU?t!=SEnU7yhTedM!P0jCYDTP`kNd;(2tCemNXOY8W3ipbqxw+BizhbTk@Z>!8Sp~uZ z=374{vP#YA` zeTh%+W=43L+oX!I{yM$Csp8dY-&m3(eTwXGDP+*HrBy(yMcx61_VU2J#Z`iSko(t9 z4Z*v$rs9Pl=c;k4N><*+`06gjl!H)Q)GN zlIV60a%rmy94vVehibptL;E4}fh4Mul!AhejZGQ=+7A~0XF-`~@qMj9ksthoIU?~? z!SK@JqWo!Xtl?%&x^+uyEkFKDaprqc5!p{=AS>JRyRC*^R?07_(|>4Lu9aGb;m8WVD29V#K)GL!tVkB{cJOP?M9*)5Cx1;Kw4 zk^gP86hp7GH7EFEtQQeCo$hWL6P00Qn(G(TYchcAxA9~$HvWxoh8Cjbg?!rQ@2r(( z`9!!#N5PTMGQUhmtY50LmGEeQsA3{N164Kv`8x>Tmpi>FrhLpBeP6=cXF+R{S&5EP zYc}){PA;s?j_$i$ip!YR`Yzt5BXhw)pp*2Z=ZFXd2em(gfs#Cbijjtt?w0xQW9B7Y zu3Q_$J8^Lp;%V>+6+g9asD=-#%qZwM`8|0w{6~7ZltQ*@3Bll`V)tOF^~(HwAR~Hf zlR>5GCQ81pmOzLO;IS;USwBgxBP}=|Kc2noS71o(aU?6EhgXMcpv9mXmV^2mRef<;f1n#+ znqFE`QZi#g?A+Y=(mQ+@<9675KqsUAe8fz3Fx^)pEIJxmj6S>^1wEhU5VYmt$^Lmr zB=q*o#zs*w3Pq#Q#sza(G%wqPTd?-E+xEi9X6ouF50)s@r|O67R?fbCEwIgdBkp?B znp-C+`Im-D)e;MfebnLMb3t;eyS4WoIJps_I7ORD#N)%Bj?mdNMrOe=QaT7F-sZ~W zDEJJXRfXUsqm#9Ijlkxy=`FP#DKzf6S!NtNGqIG+tTof%B^gw-L8f&wAa4liPV}kn zW$Zb|aR1qwt%j%h(AP`REt^|gmyyiX>0_v-wRx4+ysl*~kI!026%`o0&zMjA{rHJ~ ze5r&LHmP<(oXY;l)U-@aSg0B3!a5Xg6V^u=uZYCrku|kFt}oT2S{nUH*NoN1ME9k_ zw~UFMnhnc3M^GfQ!foPoZVzh&4RI{aq%d9)NO>&l%m{}seQ444nxdj15`(ctVPoI= zlYV;L_4x_F`d55w#R^`c_r=!vm{$LyQjn3MpP zx@2qBU)13D$eL}f_xqvD^ADt{xjoloG(MquO&3d$mE7U#8mP^l0GCH-91OC30>8d) z#Ug~t3A--O(QC#xufL06RT&h5UU*rg5O~-CG>TNl%_Uv^ww?hIcs=!iObVro9@#?nIwy}bY+ctfoZyA7aaI&wnyO{hRdOme@ literal 1573 zcmeAS@N?(olHy`uVBq!ia0vp^4}kap2OE%-ZOp$8r2bchM3lIs7AF^F7L;V>=P@u; z%$YiAW8NVHfwt#AH2n;M8CA2U>u9Vv#qd7i#MO;O4_*{yUETiPLBhf5-_4wtmrs8G zIs0tL;C3{o`=x!7i4ALUVsK`u#aF-O=--l*D$GIOhFshxZ-HPKcOQ!OJsS zczt7H?d55eHGeKwaL%be%EI(4FQqPRb*4nbXX~HA_CJE_{f_VMznAjylj<+O2)6dF z*%2z8oUOb3)0$N0pJ91rK9h4wo{{j1TPbP*P0k{fY-cmeSF8j&Sbj1~{ZD}fp_&W~ zEDt?h978JRyuE8!bSpyU_{ZmG%;dJ;^jkMq`H9*?1uKWNOGN_D)npQ57wg^5ib?B^ z-J`>OM99fruEx%n=j4a!k83IwtgFiH_t)t<9Bco=ctBTJfrV3`iG{(^wl8r1Ll zd6l(-Q~N+#-7Co(e_qeDw{XyI`1#D={QtSoiweihA7OP44p(9mUhryN53gqJ?SD7Q zL%+rHpMLuOeXS2;P;WBho0z44?=t$Nz6ssLdSdrq;RDB)W&X4I_PlKkL-5MdPzdqY*q`A zTQS-XSZn@GKDS=$K=GVbsaF^N?3~xApYZSA_lDxN4dNeu`difpG=wpHUfXc_+;)2f zmY<#yXhDt56SyM=qB`X2(w9G@?{8au_xHB-XZE~(`Sa)JoBSFJ@^4>#X7my0=_m7( zfwFIp-`#5~8h&h<*KCDzqQ_!@k*>a%X255|dg@Ac1kenX3*nqOfx-RN?XuMO zm3~kEGxKeczWeN3O!ecxAD^B+fBg9I?YDuEAA5hBy|?DmfB*JP2|CrDfB)Sx3o*a& z(1!g{h38}sZv0t$d)>3Hg1vFm-*TA8#m9SVF10yRDB!bb6~oW#ReSZ8PWhDi`f<>y zdj>mWnwjpr=`PRcURJ!G;rO<;TX)yLlX^Zq=+yG}_y2$YRCK@gO5z328Oi^DJiDR) z?%MO>TDE-uvfSUBubS0o>7AOAT7N)V{eaGWc3efxg8dAuoDEYfb}L;3mir8zu6{1- HoD!M