From f0bfa69416e97c326728d9c9077505ffbb3a952e Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 27 Aug 2020 16:58:28 -0700 Subject: [PATCH 1/2] Merge pull request #7558 from Cyantime/lanternlight Returns the jackolantern overlay --- code/modules/clothing/head/misc_special.dm | 2 +- icons/mob/light_overlays.dmi | Bin 4018 -> 4666 bytes icons/obj/light_overlays.dmi | Bin 1048 -> 1827 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index b23f70b185..4d8852fc54 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -167,7 +167,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR body_parts_covered = HEAD|FACE|EYES brightness_on = 2 - light_overlay = "helmet_light" + light_overlay = "jackolantern" w_class = ITEMSIZE_NORMAL drop_sound = 'sound/items/drop/herb.ogg' diff --git a/icons/mob/light_overlays.dmi b/icons/mob/light_overlays.dmi index 9a93faef3444e9f215b735b9ac618cdbef3f1928..4260d9f16c4ed0e406041e0c8e4045a3c8113a4b 100644 GIT binary patch literal 4666 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 literal 4018 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 diff --git a/icons/obj/light_overlays.dmi b/icons/obj/light_overlays.dmi index d5d6499305b97b7888b8e8f6cc0540975932b9eb..cfcbba67a27c0efd907257a3e66f8e0926165713 100644 GIT binary patch literal 1827 zcmb7FX*8P&7k)#NMk+)rwF^cSHA<@@6e)TLV^>UCLa3@Owi&xbbfz=5YD+QHQcEjp ztK~BliKUiWQmUGw3k{9>l!hWfbkZ|FzyA5|dG5VGo^zjb@44sP`=^VOEgYr@0{{Sy zv$Js%WxsC@g^1$&!Z;IADoyn8jZv|RSJ&qf|@htOROQe#ltlRV64tA*)_lEbn2ul z%(*AQ*U3Ln44gk0X1Vmvc5P%;1kn}v*#(xt4AXuEuIgj{~PbEIV7ca{Xe!cIrQXV#9 zv8-G?Tl-P|VT|r@Yx}L7G&yQN47u__Pa{@Ri`e*U%b_T*d+31o*|A3y{_xB7fokYa z5dEP!7&QA#=%eYB{#Oxi@Wnc7Yio`iteX6WwA@ z2RA>g^FCGxmz&7TZXAX+;ZnQ3@mb6ZRfqMEOSL*m(jFBcsi$7q)kLjVqkR|LjV)}a z6oB1@ZN*Gjro>_)rO#=u&|^CO^i(jQqmK-Bqy;?*rSjUfJU-zH5%*zd7uOXg`1ISS zya2-~ZxF7Sxwus$Ptm5h0&E})LWr~{s1TXSr#?r; zkoJspMs9mpat}nFm=>+YJgPkm)Wq{GDDuYt2MVdPZoNI9sZNb7JMOLJ*+yCL1bl?pQREczytdP*+m%5=+R&X~uW%MTo?f4)sq;8_U;_q0qj zPm}3ELIJ?JpqV;x7UeRrpBy5j)lu-)HDZA~Tj5FbnJ=0{3UxXx%kYE_v8>RL3Wku_ z!1RfIsF)#h@phbtlaQf-q-Ey;_vR^< zaQ|iC@Idj+REzGQ0PgOVLxNmbC5NW2v{qYI=D`+mTkVzo^AJjjG~;d0@TH4*wUdhqvrIswbRMltH>AT0x3YvjCT;2E30tM zr6(Zw>l^33*v2(|6`~B;9odeE?n%nlW*^=(K>`@()D5~HM9;r2I=Pu&hp*tr`S}b2 zFC*f`n5jG^)psorb4DUxb(WQ{MsWcf>5;A(=VRG^mUv&1)ech+P|LSJ=PDcQE&)); zH&C5Yq;n$j(VruB)ftKQwOR;MiDzTgfVOD1s)=kab*FiM<>|ZT=#l8xOiZR6A@m80 zOE|ytn4v$}0TRi)RD;_HkZ9;LKQqn)pUTJRbyD=6DXg0q8&AMv?hf)$AI^tCW0({bi zgc=y{nZ;X<4MVP_+zEy*UrH1p-=cB9=WPu1BvC zi|#Y|G9k_+2bIb3COkRj3N*e|d^kf3=q~!KN=f8O;SNX6$vOCYfVDD1>Q-ygJ+56PW7#NrxJY5_^D(1YM zZJT%7L7-KB@)pLV9sFSv^d|@hgnPX9`hL>((lf3nwmBWr;hHki1?tWLTzZqQ7X5Eq zVo_ou@4zu>{nq5zpvq2IA&E&shJzHcq@cdd)x@$IRM z&Ms!3kLww03~z6hJ`tV1Q8q#Jzj1@~^Zd=FO|lhz>Y@8j@O==e&)p{d`IgSy2PFxY zCa+=_lWH$~Ld*%Omm2c| z``zl#T&Z@Bc++p7ypZpYT&4fIecu=B$R0Q&Wc}dc=cw!`iQLnxzaMxE?fo3;x&A!)&#<{=)24+a*OD!fP1rGuWIF zIh21U;7>>WmD#J_Yqa^fMkxMS@%mTY1*J;6yP1jx!5^9bMcxbf`+%Y6=C3(N_p`XM zD)hLoW1caQfdnLJGc9Q9)ssuEFT3|Ay!dyq;R;|#`#<}3*P+Gc1TdKQn{SVwdiBZN z1oqjR%|hqL$&}P?8@e z_ugB#*Zu%7R*v77U$Ett`Kr!yZ~Y5D3V-0N3i#^zKYefhx+SYWLpK~(f8}^p{qJwrUa`rm-b;K@epBP?6ZfaV|5EcR|6lX#WL3L8uQD6WJJ&a- h%}ANi026&?cMC0;oWgfx5-_VXc)I$ztaD0e0s!vd@`wNc