From 3c4998649bb45e565a48cc10ddfe899fd90311a9 Mon Sep 17 00:00:00 2001
From: ninruB <38016303+asperger-sind@users.noreply.github.com>
Date: Tue, 5 Jul 2022 20:40:19 +0200
Subject: [PATCH] Make the extra bright lantern actually flash you. (#9387)

* lantern goes STUN STUN

* fix an awkward extra spacebar

* fixing the lantern as emogarbage suggested

* buffs the usage amount

ngl, 15 might be a bit over the top, but it is several times larger than a normal flash so it somewhat makes sense.

* fixed encoding
---
 .../Entities/Objects/Tools/lantern.yml           |   2 ++
 .../Textures/Objects/Tools/lantern.rsi/burnt.png | Bin 0 -> 793 bytes
 .../Objects/Tools/lantern.rsi/flashing.png       | Bin 0 -> 1014 bytes
 .../Textures/Objects/Tools/lantern.rsi/meta.json |   8 +++++++-
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Tools/lantern.rsi/burnt.png
 create mode 100644 Resources/Textures/Objects/Tools/lantern.rsi/flashing.png

diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
index 0912343c70b0..a0b089713492 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -42,3 +42,5 @@
       radius: 5
       energy: 10
       color: "#FFC458"
+    - type: Flash
+      uses: 15
diff --git a/Resources/Textures/Objects/Tools/lantern.rsi/burnt.png b/Resources/Textures/Objects/Tools/lantern.rsi/burnt.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9f5bd0bbb6f8c11fa0bda7a14dd852d8c299619
GIT binary patch
literal 793
zcmV+!1LpjRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80008uNkl<Zc%1E)
z-Hy{n6o5bf|0LNZ3Y*Oagc5<YNL6n742V14h3DZ7cmi(v09;nus;Us%&9bmr$a<YP
zaqM`;9xf=MsHpO!je1ee&DcKDH=jo{a}Ioue;5yk_tbwj`QWIl{yc6I#<mkT!;mPB
z>9pIMQC1bdoxRawY6~0>`l{dUu`UEvB}rE~RaMdH+#<^hvQ@?}r{mgOQ&#}MbzSb<
zIRewfaV!ke;3l498X(F-i=`!SJm{<aW(z;?iQ^d8wkd=J1(o`=4H`kn@t|LOPiP4g
z64GqVb#z0k)glN3g21DY64NwDvy3!bQONpCTSvfiY|_;VSr$ks5JCXZ41EAh(?rS&
zsBfSp05I5trQKwf%>R-rB;0Qb-V*FiAaoQz4)>VF6;c+I<)^>(ypSMhaB+E|#nTp8
z34_aNO#h%wo@EFrF_fa^Sxja(BvKElEs&@Nmy?{A=WlRbXY;)%1g`7Q^cp}}o2Pvb
ztVGGH^LNJR@spFM&t9B>!P93iPDYQPoV+@JXRJj1$+r^NZ#6d0QIc}Yvx$=QoB5px
z9CSKgy+0aSf1Cf;1*TE7d0ym#pUz4ax%g&&Cjzi3zoXeQ=h4t&w#)%WpUZNd=e1ed
zr{MiG!uNfm@hR|p^z&KC;mhZvXnczA`@Ek<bXy_gNj;ucIsV-JG((?Ww@VbqMDdp!
zu_(S&!tvxoEw=Uw-1RajGp;^BvP?JUzbFI`_7zeYTorz8o|eE`NNykQ(LZQ2i)XAu
z1=v`YMOi9r+he*|vQBqYj6BEY*Q+G}{ew2k#6%eej&0)y0hiO5)4ATh)?R_`QIFS)
zjMs~VQYt_J1!+EGui4<R*W+R`-Hm|f*z7f11YUsnqY5TTf@N8F{ywhju$(7&PJOI)
zQ~GdtPpyUIhvNraUtgn?V!lWTT#s3r;yJcfXS`Kg4lum?b>C-T@%!70t$E+${~I3x
XdhSI9Y-ez300000NkvXXu0mjfRCj&=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/lantern.rsi/flashing.png b/Resources/Textures/Objects/Tools/lantern.rsi/flashing.png
new file mode 100644
index 0000000000000000000000000000000000000000..7573695619f2c7beb154e61e7a2550cb86036f04
GIT binary patch
literal 1014
zcmV<S0}1?zP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000BMNkl<Zc%1E)
zO>PuN6vuyE)m{BDpN_GOO+dClF;Zl4fSka0V3k!Cxk}c_CD<Wxf*int2oN%0V+hQ6
zJUyQ2kLm8J%3>Ns7MLD`ltp+_sTS4suitz1>h*(f_JwwP=Z5{y4&UBfw;#`!G3T-e
zx1)&Bc+Bd`%7?i!h9@tMm(pAsV0U}VZmnNsUX&P9k)%1s7*<#NWO+fBW;{B4*;rRB
z3jm;$;@Y)M5CYGWIKts<JV7{6>S8Iar2uxfw`{N7AqWG;<1xy0Dar~g7`sS=Rv59n
zz127;mI5d$NU}L+<1_mG4&7czuN#2SDCLmNGm<Q&sG4gw1{fUdJCW~FRT)Wo#w316
zmW&CMWn(p>-%<2C0lx1c#p3&~22hJhr362$Nj9!@5i%u=st?2WOA4KFvs=(<DFE37
z!fgToNFWFU!FOH3-fovXm-vCf7z03AxCr5M`202RDgh7xIdI{Hd={Yg!UKXJa8Qv)
zNyd$x9)6$~02Zpu@_LXUS^+`sya&*OgMGbz=fNkFvPlFapn#~~bqQ8{G6jjuag<9C
zNb=k;Gn&+Q306Av%Q-*<l=b*z6fOj)y%%)^+DbV@Er(x!-uh!Ui+_sx*Lit3+}pmn
z_ArfK(QdE(`P=Vreo@K+XagxA1_%4jr=rj#31toH_d1fzjS!&iN)ML_SJxJ^D?Nbr
z=0-@bBLVz+pS(zX=}H)d5kSik4qAJJfk0~yM>qhjdcCnN4UlFjKw^zW%91QMNLgZy
z1xV`kuL_`9B++~_)x;CSz5Bzvl`i*$?2w&T2-%_1<=(yf!@KdsFdSt7^Ln4YG(ep=
zhD9dNio$Yq67zPbd3NkF8XWCCJ(@Eb9PK?jc6mG09G%3pTpwUo?=xTe3^h;yX?$J*
zF7X5&K5}{T)FsU_9v{M4JmGYdGaQwSCmAeWK=HW<d=_B+&I3C**e`)R&n<yUn4ix1
zYpQYGlB&|Uu4FWxv#ty+tvRzEEUI96k@rm_K<z~yPYc4;kgL5F@_dFV7XN;sq2pV0
z<zb6C@zlNtxX^oO_zG$-v||Ma$5URu9wTLos!)`rkEwjZ@CuU*9uF-=VE`^H!S8LU
zmTc$yEqi@)jXci~4%m<6r)f$%iU@*`SAP$Aaq^~-cGD{W!1r9b?GB+IQtCx{KR-W5
zN=difMJbQj<Q(5?F1vJ7dVA-FotG6q?%v|`^b~6?lW9VzeBva*_uQpA<4d*Wu(*zY
k3rU`zyt=gBH~atEKa(r4@VkE{Qvd(}07*qoM6N<$f?~YWk^lez

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/lantern.rsi/meta.json b/Resources/Textures/Objects/Tools/lantern.rsi/meta.json
index e040d0598a97..4f60017e73c5 100644
--- a/Resources/Textures/Objects/Tools/lantern.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/lantern.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9bebd81ae0b0a7f952b59886a765c681205de31f",
@@ -25,6 +25,12 @@
       "name": "on-inhand-left",
       "directions": 4
     },
+    {
+      "name": "burnt"
+    },
+    {
+      "name": "flashing"
+    },
     {
       "name": "on-inhand-right",
       "directions": 4