From a135a9d10edb78a58a30e2532377399ba8ce7cf8 Mon Sep 17 00:00:00 2001 From: Adrer Date: Thu, 19 Sep 2024 12:32:11 +0200 Subject: [PATCH] [FIX] Bottles created in the chemmaster now use the right chemical overlay. (#26800) * Move everything a pixel over * configure item before reagent transfer --------- Co-authored-by: Adrer --- .../chemistry/machinery/chem_master.dm | 2 +- icons/obj/reagentfillings.dmi | Bin 2600 -> 5698 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index cb935663a69..0672fa1f7c7 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -570,8 +570,8 @@ P.name = "[medicine_name][name_suffix]" P.pixel_x = rand(-7, 7) // Random position P.pixel_y = rand(-7, 7) - reagents.trans_to(P, amount_per_item) configure_item(data, reagents, P) + reagents.trans_to(P, amount_per_item) // Load the items into the bottle if there's one loaded if(istype(S) && S.can_be_inserted(P, TRUE)) diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index 7d804b0c23ee21b7014c6d815821e02f1f7a20f0..2b783a75ad62ef2c0b924cd692ee32f2048ccfd9 100644 GIT binary patch literal 5698 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 xII%ZlU*i6&q7KnD3G;N6DD6d<{{sU`_Q?PM literal 2600 zcmb_eX*?8a7oSKnbETWz)Nn(@WfU1A#*!r(%h>MN@8~kNS+X{wp(y*7im~2eQij~C z2s0xTa!txklwD|K8BNp7yi@nR_v`!R{r`T?^E=Nu&w0-IpL0GuH=Gf+l0YRO005A* zx3hKy0QSJYt^J}x%@>6GZQ)_?lABkQ^@WRQ0tOd_!A1fAapaq~EFz!j9XvbQd;I6I z$FdSCV?jugmK;vZzyOKW{YU_>zrc!1|1kG)>qjn+53>H1{s$~L~VAo z&4G{U_HgAgxpIzQM;gIaEypbt(7rWDl4`$k8 zTpRCYXt}ZXwkHZuX$3Y2brQ1`mR=Fu-dNM#NOb)4{w~SN{ne`^wPUVVLiU0ofyQb3_ls;a6;<${uu zl96B93AzU&tL`M^y+ERi1@8yg)REtU0EGf^O#$0HC3 zcsw49#RmILMnptF;soL0;bCE6At52EVS=EbpuoUDCA7fT*H<*0Yma#AgecbYinz1X$i?{ zYHAAUtE;Q4si~=|swyihLm&_^7_6kEq^PK@OtvGXizReurK5O!{32D+V1-<;);k|FA;6;1o4EHIxLZ27 z#%LjpZ@6;eF67MGgb32<vK5c{wGT;8(vWPZlF7Zjb%;y)_f>cbqO?M^fCGvO!0*&KJor<^3x(pI zzn-MI73-7YMR$2~(+Kj@sai?F4YxvZe#8T_(eB}rH z+hZ=rA9o|MdGOeI<}(;|q{fr#! zn#praUrBDYaMBeCPiD;bn%!E*ev0hvvbe|Sodq_MRq1_@p~!&cWXnZp;k<~HauJA3 z{=rveHBe^%KM|kJg;|boxHpBn(sb`UGFOthrz+E21DcYjSvf$a2W?hefXxv-vFSXj z%YzZJ)0}JAz*0wbf+s!o-nCh)H^yQgUx^e9ng40JeUVWn4q^H^hk+cwb{0>9=JzQb z+YmGvIN6X-Eagmn4;V0dTYs_r`4VXDp>!!Zx^cW8lRmwbS?{GspL^NSdjYsui+==uz6NEZta`pe%Ob8z4Jd3>LTO_`$)4xr0 zoi6|7AavRC30YGFQ5@B%T_P(NJen_q<10E%WLh1E(8qCaD%<_8kq)1$(9>qLqkQwVz3MFU2GSUjA zGSYrhE`vfQ;)S&+1~BqX#ZXt@=AdC$!4ynPQnpAF__^e8gSq&3$_@J4=>NTHl)71?})obNOXu z^5(RdX;XSU-T8ldbh1XT%}8x8jZ5wQr@;WgP|5EiSz4Uqzr`;4_~%_~zW*#faZoGvnX%F@oakp*FFrJd;%}YenpF z%R2y#m9-(aJ$pvh;lDnGQzO zHG1(^_r6_t%K70@Hb{3^S^&){;i-o%eaI*3<}^*Y=KUn4#hkJ$!qVlO7w$|_86Vna z&Wv@|S1kxy*MT20hu*>k;DnAP^ha8AegpVq@lbalxVAk|_P&Y}^Tk1MjI9#1=Y_1s z+Xe*QPd6mfMUWSyORF3McwfL`&C$ z&{AQ(l@oxjXAyBpe&O*?_-RHy$0oCe|Cx<~7IN?KTEo d0RRG+pT&<>