From 90f3ae6ea0b4234caed9456757e8f4de93cc610b Mon Sep 17 00:00:00 2001 From: tomixcomics Date: Thu, 21 Dec 2023 14:21:27 +0200 Subject: [PATCH] fixes some broken drink and food sprites (#18000) * fixed broken sprites * added changelog * updated changelog --- .../Chemistry-Reagents-Food-Drinks.dm | 2 +- code/modules/reagents/Chemistry-Recipes.dm | 4 +- html/changelogs/tomixcomics-PR-18000.yml | 43 ++++++++++++++++++ icons/obj/drinks.dmi | Bin 108764 -> 108765 bytes .../item/reagent_containers/food/pastries.dmi | Bin 32226 -> 32228 bytes 5 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/tomixcomics-PR-18000.yml diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 01f57f48e37..272bee384fb 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -2426,7 +2426,7 @@ glass_icon_state = "NTellahotchocolate" glass_name = "glass of NTella hot chocolate" - glass_desc = "A very chocolatey drink for the days so rough, so cold, or so celebratory that a regular hot hcocolate just won't cut it. It has marshmallows!" + glass_desc = "A very chocolatey drink for the days so rough, so cold, or so celebratory that a regular hot chocolate just won't cut it. It has marshmallows!" glass_center_of_mass = list("x"=16, "y"=7) /singleton/reagent/drink/toothpaste diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 0d548e047b5..0c0a049fdaf 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3031,8 +3031,8 @@ name = "NTella hot chocolate" id = "NTellahotchocolate" result = /singleton/reagent/drink/NTellahotchocolate - required_reagents = list(/singleton/reagent/drink/milk = 2, /singleton/reagent/nutriment/choconutspread = 2, /singleton/reagent/drink/milk/cream = 2) - result_amount = 6 + required_reagents = list(/singleton/reagent/drink/milk = 1, /singleton/reagent/nutriment/choconutspread = 1, /singleton/reagent/drink/milk/cream = 1) + result_amount = 3 /datum/chemical_reaction/drink/drink/mimosa name = "Mimosa" diff --git a/html/changelogs/tomixcomics-PR-18000.yml b/html/changelogs/tomixcomics-PR-18000.yml new file mode 100644 index 00000000000..6198e6481b4 --- /dev/null +++ b/html/changelogs/tomixcomics-PR-18000.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Tomixcomics + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Made missing sprites for some food and drinks display correctly." + - tweak: "Repharsed the recipe for NTella chocolate milk to be 1u+1u+1u = 3u instead of 2u+2u+2u=6u." + - spellcheck: "Changed the word 'hcocolate' to 'chocolate'" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 96370abf0a5b42c1a37e94baa884e44c3f0a7e80..55d5f0f5c0968d1c6bab8c46ea45e89806cbaa94 100644 GIT binary patch delta 2747 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 BSfKy_ delta 2792 zcmV;ni?6$VrkgJ}AMdWO64H?B=?|-aQ1Rx=%}+B_)GoB? zr|YXoYByhQZm+NQ3I$KU{~g)kCbq~URoR4P1l|PoG*kqSg-)0vS)z)tjf8^R1}YTf z4$D-Jo7f=xJ>ny%6WJY*BgTugKg)R0IsHK1uOf9DX>#l`)ao{3P(-c>Zle>B7du&Y ztA+g@PnJ8d3I(%&6MX=toWY4M5|S5dD#a4QAH+(WF=LfQuA zh8YHNFx@0t?LawWA+DZ`*Ai*QW5sfo(ib7-!|q}CuzOgDw*gd}oms`lAEKXjpLU;? zt2fJkXH%JnMO1sYTl`xn5E*bgjL7r^8mE+TC@yCDers)lA0@E`$(h*W!iXFaXjN?H zlh!JJZIrzn*vdr)2k~lt7VzKCZw0o4CQ`B#6v4lSiqD+jj9gHQ zw7QlWzABhJHYXBBr=yf+Nkz&94p3kmP;w@JC%rG2(kC&Jf=w6*&Lr4tnQNbkqnDV2 z=s3wVIoRO&fN$U8q}W5w&hvrMfCr^*x-FD52?Hsbv~7d?+^{Fzj`(NdirUG3k8E_< zz9}WgJy;@PPd-5<<92E;`BlR~3}Dryl@ zGYx6A81VN}&wD>VG(+~9jNYJ#0>;h{w81T24cm6xW8&~pIZCTK}`^u{T@ z3Hz3tg@;oG^rD=t5ZA|+(UAnmH)4CfrdE_cymQ`vXu*OCd96zOiuV)(h|@V{;#KCj zU0k9MA9f#Ke%>+DqCW~M6q$xpM{;b*%Tt%m2W5g`)%XR2ygBZBMGoon!=-YHu`3A9 zH_@xiY}J2Ji!5jcT|w}s=R+fAG;)|rvKM=PGQ7D%jfFOgLV!?>V16Fr0Rgoe3V+_!mnh~(U6Dn*Ia{z6&-SUYzLDtN&kq`=Pi^MiHaTyfV&s zm89Av_2$dX?fvfVe#xPsw=>80^ACS}?%%K41{y%IR$SYKPj5VJ_r~9XcRga#Id`Ljfxnv2_T>wwu8iId+QR@Tm z_a0o|6d@>hun`T_HNB8vOvR;BG0utVsj}_RoAXyxtYraz2v`O2Bg>Z!rB`q=333 z>It;~BUidinzPKCGWC3Xa>BV-0^m$vn|L2_z={fNAqfTVQmP{MpyQqtFIi6nEf5oF zuQ+?Rt<{>y`-A|KQXpXO7eJ>W@lj}7_Y)i>+9=dHyFz>_y+y~}G(o^1`3%w%!w%H< z`z%l$4onee;^-xiJ~w|${iCxD1nc6_ zF|T@pI)}W!qg`KCJcGR-tv#!56uUf(ApXg;O!V21jXoAT|vQ`cb*Zl zj3fEAH>LxsK_*)p8d(idLF;k5%Dqr=zq{Yv@9q~ggdbkxe7tF$)$+=tT^Skm(4KJS!J$DqHSFws= zSBWb=Pom(e$G8J!tl4(fQI*fx?B7q*zYF9+q8*30V6yZ)ZBv9|X z4ceqoiOGqdh({-MMx2O;&MLTH(*ZRCd%pr=shBhPzrcMKNK!YyO#J!g_rHF-`R&g? uuKy1&h{di(;wugS03ZNKL_t(|oa~)>d=q8<$3K&!O?rb43%3pn0neQV)L|9? diff --git a/icons/obj/item/reagent_containers/food/pastries.dmi b/icons/obj/item/reagent_containers/food/pastries.dmi index eef90e535bbcf845948b02d45a6cff07f4f9e542..7c6028f1a756db27dc03e4f9d677e8ca1a4a8afa 100644 GIT binary patch delta 536 zcmV+z0_XkW`vK(p0gxnr{d!bbbVOxyV{&P5bZKvH004NLmDjOu+b|FY;MsZ#I@yaR zal3g*Z4^ckXX!4S<)caHM6xHUs@}ds;MlFv^4BH--~Bx41WLL$&)cuNz1h6%s-LXA zkHM_X>chusG5TY6W^JAxtA%5Ka{29~&y?A$&0P}mp`n)Vs>RWNYj4)(p;}m_j^B=N zW!;N!%D!>TJwwqKie{5)%vkn21+&F>Sl4F==0>G(!jdl(?U}oXP4QjAQ;ba%%IF}k zG`Iq#Bv|^p#DWiAvpdoRWnW_~J`G)JeMo)|#iCoD#CMEDUnmy+WAKeb8F(W+*Wxa0 z^>3zS);Lz3kW2r6#UXY~8L_BC45cK{Y?2IJs-eh^g3kom1FKGrkc~t3eUYCiCE-k( zi}cIu>$lx@xm*^djhctRbrWNYw5)Lqp3BWPvG05X^D_juvOmJHnvtv(pp!mM!Xeia zi^Q?WHCih?H~gf`q5P;1*7`C#u<8WbM4_P;83?ORHO#Yr4%SL}3MX$Zv?ZM3%y*l{ zLFhQY09$5~Zq`Samv(0vq5pFY5hw7NHrxAAcA8|HJj( aZ1)?pdD&G8zX9lr45yHTSX8qp0=j#BVh~FJ delta 534 zcmV+x0_pwa`vKzn0gxnr`+8JZbVOxyV{&P5bZKvH004NLmDf#f+b|FX;I(xMI@uRZ z;&$gvY9la;Bu5a&^3WtSBAF3YRk!aV@K0g1eA-FCH;*HYKuP!JdHb?^Gn?04^^3Ll zF_^Vkefe4~Mt{i8tj*J7wQ%f@E`Of%nKGNTxl2MmG}Q84wK#Zx?akUeR12%r@#pca ztb6fI**A{4XDIqY(QHzU8OuIXFk5_wb$xp;+|C;2VcB@J4v9#a-Cy z-%QJ_ajZHam;Rf7L+qF`Vo`?}N=cyEBpJF?Ly;W?p9!*iR-GCl8;9)sB0o|}!kIJ| z>5upKpS$gHxhzT>H4lO7CdL+NS>qTymz!;3-}wgSCkSq3e}!W;BUvjzCw-iRL#`(l ziDQv#v{ra-_)(cd`B5LN^<}na)d{qTLPISw5LTUPm}eb-td;T3Et z&|!W7w#+2S5xT@RM!$txPBHa%5P@-@2W$BNdq-kn90T4pcPUS(en8a-^XHo$9M)FEaTp&9=lHx>W?biFs* Yw~g7n?y5fsK?@EA@>ylMvnm3*d+|s8)c^nh