From 41f111ea540d13d5af636e79f494be2ce4135a2a Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Fri, 21 Feb 2020 23:16:34 -0800
Subject: [PATCH] Merge pull request #6697 from Heroman3003/scannerfix1

Fixes missing sprites on forensic scanner
---
 code/modules/detectivework/tools/scanner.dm |  12 ++++++------
 icons/obj/device.dmi                        | Bin 74378 -> 74376 bytes
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/modules/detectivework/tools/scanner.dm b/code/modules/detectivework/tools/scanner.dm
index 92f61728ff..b917ddcf38 100644
--- a/code/modules/detectivework/tools/scanner.dm
+++ b/code/modules/detectivework/tools/scanner.dm
@@ -71,8 +71,8 @@
 		return 0
 
 	if(add_data(A))
-		to_chat(user, "<span class='notice'>Object already in internal memory. Consolidating data...</span>")
-		flick("[icon_state]2",src)
+		to_chat(user,"<span class='notice'>Object already in internal memory. Consolidating data...</span>")
+		flick("[icon_state]1",src)
 		return
 
 	//PRINTS
@@ -104,8 +104,8 @@
 
 	//FIBERS
 	if(A.suit_fibers && A.suit_fibers.len)
-		to_chat(user, "<span class='notice'>Fibers/Materials detected.[reveal_fibers ? " Analysing..." : " Acquisition of fibers for H.R.F.S. analysis advised."]</span>")
-		flick("[icon_state]2",src)
+		to_chat(user,"<span class='notice'>Fibers/Materials detected.[reveal_fibers ? " Analysing..." : " Acquisition of fibers for H.R.F.S. analysis advised."]</span>")
+		flick("[icon_state]1",src)
 		if(reveal_fibers && do_after(user, 5 SECONDS))
 			to_chat(user, "<span class='notice'>Apparel samples scanned:</span>")
 			for(var/sample in A.suit_fibers)
@@ -115,14 +115,14 @@
 	if (A.blood_DNA && A.blood_DNA.len)
 		to_chat(user, "<span class='notice'>Blood detected.[reveal_blood ? " Analysing..." : " Acquisition of swab for H.R.F.S. analysis advised."]</span>")
 		if(reveal_blood && do_after(user, 5 SECONDS))
-			flick("[icon_state]2",src)
+			flick("[icon_state]1",src)
 			for(var/blood in A.blood_DNA)
 				to_chat(user, "Blood type: <span class='warning'>[A.blood_DNA[blood]]</span> DNA: <span class='warning'>[blood]</span>")
 
 	user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
 	"<span class='notice'>You finish scanning \the [A].</span>",\
 	"You hear a faint hum of electrical equipment.")
-	flick("[icon_state]2",src)
+	flick("[icon_state]1",src)
 	return 0
 
 /obj/item/device/detective_scanner/proc/add_data(atom/A as mob|obj|turf|area)
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 6fd1a8d0d321ee6ecf09035cc4d98197741d4897..7c443b1be2247150b5c3b0970d8ef36fed26e3c9 100644
GIT binary patch
delta 1324
zcmV+{1=IS9#RQ1O1dt?u2YOUkbVOxyV{&P5bZKvH004NLty#&A+c*$C+g~9hSM|Va
z(wDvrIvDgJ`30g(mL$g9KvMR2zJ3l~B)LVi)E)R@1MgK8i>%dOi@$&T^Y*KF{rNUO
zpbyfT;-%R9wV2P2QpBcsDb}m`tU*~f@%$r1h*-Q7Um$85zRYKTLi$j=6wCRn@}Tkj
z{e}t-dGuCeL_Z1460+CxnLq`n;-%P>n{qRsc|1xZhLS)W*d*2W1hV>@1Z6oy+tc(s
zuBlQGnyfvQg3zq8HZ03!x$ZfTCOmvb`mXgR((I=}LnBd%1rfI#$8CpJFUw`wqc&g!
zi>Pp%ym?3NsM<z<X-(d`GcIA>YM|hrl(>iiX?ssvPt#Ock0waIc(O|5Z|{O$lF;$V
z!zu5f_~hY4a?qk9p>|ops2wCCJmn5&kLZIm`@GpVXu|YwBQI~DN*Y^Lc{S2lQ$Zqs
z^v<y=S9dIpLbmz?M6PVW5AcNa$P<D6kZ4+^K0pJ7K2EcLGn|arA#iK*k=v>$qqPak
z#*oZd#zCWp2^^0V3mg&#-KE`82`5y_9w({HM{kFY9{66GdfE-W=d%jr#A`lS$&rvk
ztU=GgM=wR4Nap>cNh2Oq#BT#*uAlLS;wFkxHCN>}BjsUb9Hs6cM)ZVE<_e@0U#Xpf
z6t15=7v+0@7Q+MKqQ|KkRV2JltfC{dnY-2mBvk1$Zeo=VR<%)D!=i^1xpwA_xgzQ1
zIRE0Y2G>}VkBwSVk=lyA%)caoA+iW{O?acVm(HOlbr%;bS*AuIIpmZ16(6`HW4ZMC
z+qxMdO){B|`9d4IA)!H}TnV?@Nk#Bp2W8<1Ugsl!NgB&r1)eYiwx&|{NU)+kFiNk~
z9vGpn2hdKTCkz&6U_QE<lkhf+`WKDe$vn>6osD2Xo&F=ZCW1qc+<JkYNs$_5QjGJL
z<a>NH0S)9h1*gwTLG5BblSXjJj*X18v$CCPiAYLc6u}|2<BH&rxz;<vwQ$g9FVK<6
z*WRmtSkL_tF?ujT4c8GVC06U!NDk5Zr-Kxjc(}a*dsALMos{3LcIeq&#(cPS*nGs*
zC~Nejq|oJmp5K6U4odWM-|wIDdQq;+Rr&nhHp2+#xENO{B<yEAMv&?*$~VM7>&!|V
zZ4`?d5<&eu?BvSPA-D5qzPH-;UutJTVxf_Lda4|hN=0#A*=CwD;87kDp`DxmJEdE~
zOf)FTmE5ttjD%IsqJPZapmnmGJzkWZse~8?t<f`kK(FA$mW#=h?+I_D8QaM^Ruqq~
zlJtbW6#I5x`E+oD=2w5itwt*&x0ck^+;k8cpqtpd=^ZwoUJ$&K$O*&9wXMZ`d)<|P
zkBQE^TJ!OY->IG&l9!AQ&Ut%CB=zUfL^6!ei=5#aX{wN`BPOQm;7+xIkni{VsWbnc
zWNkF;Q|-{BN_V5O<h!BK(bS32>k*$@t&b2>-A3;w*4Mgu{W2otVL>CAL9J5#UDt?|
z2R-0usay57_0CE|`M2$YV;%)l5GF8xcB;jRl-eVjiJWsUPb7gjFb)xvt=q|P_UP8q
zOW_InKCMgOuC1q>@SgBNy`zp|b#fp}OKPmLNANzm=^V$hN~UA7PeD*I-`1aDPwD>v
zmaDM<>wmWMnX=Z6$tA2W&bUt+a3?O`1zd1{R&9P-xZpmec4P<33|jhXml?Dg`HShJ
ilm7f#{P^`+y#9Qf{||oa!hdsjn$CkZ1-CW@0aP94*r%8P

delta 1326
zcmV+}1=0G5#RQ7Q1dt?u33^mmbVOxyV{&P5bZKvH004NLtyxQt+c*q9C%?jIubxGo
z?Of)vXtC&_{R;vk(~dflC`fX$*<ZhhJZxvIh@L5Yae(h5X^Jl~pNqf0|MTNl@$Ki2
z`2l@UWQ&(#^VecNJE|(~i<e@(n$PyAnteR~2oWL{FU2Q_hQg<R`K(et6febcKC3+#
zJip&i!J&+v3`X>mz#<`gJ)c#m;Z(d7n{rcb<};5+Wvihis19P1>U#oP{Y`=<36Xl5
zp2s!S8p1wnPpu*BS6LgD<+5D&9LN(MJ|cbBdK-E6^Ppj`P*)2kZaI$I4y|66%d$t^
zgRMkFjpO9a8*)c~H53)uyme<>!n)N!!96K)5ChWop0u8(sV0v$D7kndUFA>jf?l%F
z@yWv}@1gkQ;ly&#q9dVkS;1%=Br-hZ4o64yLD|>5**9py^e-ckH&CT4)pcHtvSe#W
z)Q{eGtjg6L%V4Ei^A4ia6!0CqN_mut#C}M$t=8|Lfkq#Hr`Z`!w%Q>`viZzybySfk
zVc8f`SP~KpdYHiRSc@PbVbERK9hGoGt?4*PWj=d5bo3x!m2IY-&|AK!K}|g711X7&
z5<(We1RuSsnnW@0f10w@gO2!RV9fOyA1H33I9+p9ZZlFIcE(Za4q`;lm}IU%Uh`GP
zX-MJv)pJpQzGVqKFb;a0YEVZ;bYdMHW6a#OHXx%*pK%krbRgYEMOH))CwA}58*}Tj
zY-A$%`Voc=xINi?ax{vIG*rE+d?-~IqKMEmj38~iat=LfytrW5G7VNrLcW?`@j)s!
zRw^&~hA5k?renS^mTySdBXW*Jl5t8iyw^cRID$8S`BYMtWUIk5E`hDBH60mNv<JZ%
zmfC}0H1+_-Y4nVn#Tl5-!~Lo9ltulEmUb$S^R%M~7WC;qhHD}?^eD+!=!L3McbOF9
z{F02vM^~VM9H-&*aVcnA%$L##4#jb=BJW$pPPa@XXE2K3kUMfka41~s9phLen6nr7
z$YivC_gdC-|Be_v*r12|h?EjCrnO2!B>!|!6($0=cf;P4m#35RyEP8IcvUf<ZXGtC
zaSf^lJ*y~m^<U;!Af1B}J@xB-D6bdgx?GjdZ*8-J@f{cAYK@EqjmHQ|-(~rRnP{C^
z`EjAcqJczGKMzN_a`cwl`7=LUZTpehS&-O&Xrw|_g4U@l&MVtYQwB1sLn5_v3xH1P
zmT@T>wB%at#H)&oUC*NbnZLo9WIKDjDLYdcISj_27j!_c;Ut!e$&{}NZ=@O9$vRdX
zkFS#SguWE}c3$~%aD(P|f5Wv#tD+=gO*J<ii~;B-Hg9@|&6gJh?-WYLW#l^6Vt%}T
z?%Kyh=UuINf5q=qPff{7MF;0R9TG+Td9;uW^YbESxJQ~Q<m!ltr8>A%qaozy{eJ1p
z$CGNTf!EYH^r+L_s3I9RJUZGYarJt{mt@QlVrtsxoy7XuH?J=vLLN3WmKoeG)n9gv
zNO>>=j<&j0Z(Z+5S<c^W7o6}|2@PR?0%NCJoJeUrqMgV&&+<$XR0km;f~KaO3>S}1
zExi?<pzp)FD%`crlrOv|yi@O}qePRukfkN<Nz)O$Pp&%0v7%P#oa|E&bj*+SXV_Ev
zPk`lWEW!HEc0SWYZcHv?eR0Np(11H}`6=Ln`?G5Ew}lJtLuyBMu)-qoce}zIBJuaT
k!XhR8`MLQ1>s#^d=a2dSC!)f!xx<kBgER%VGz9@v9X4o^!2kdN