From afa96b9f0bc1701d5968fdd62e3d0817984591d4 Mon Sep 17 00:00:00 2001
From: Twaticus <46540570+Twaticus@users.noreply.github.com>
Date: Tue, 10 Sep 2019 16:42:08 -0400
Subject: [PATCH] mega (#46417)

---
 code/game/objects/items/devices/megaphone.dm   |  10 +++++++---
 icons/mob/inhands/misc/megaphone_lefthand.dmi  | Bin 0 -> 1183 bytes
 icons/mob/inhands/misc/megaphone_righthand.dmi | Bin 0 -> 1205 bytes
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 icons/mob/inhands/misc/megaphone_lefthand.dmi
 create mode 100644 icons/mob/inhands/misc/megaphone_righthand.dmi

diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index a3364131e88..e4aa22ddcd6 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -3,9 +3,9 @@
 	desc = "A device used to project your voice. Loudly."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "megaphone"
-	item_state = "radio"
-	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+	item_state = "megaphone"
+	lefthand_file = 'icons/mob/inhands/misc/megaphone_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/megaphone_righthand.dmi'
 	w_class = WEIGHT_CLASS_SMALL
 	siemens_coefficient = 1
 	var/spamcheck = 0
@@ -47,17 +47,21 @@
 /obj/item/megaphone/sec
 	name = "security megaphone"
 	icon_state = "megaphone-sec"
+	item_state = "megaphone-sec"
 
 /obj/item/megaphone/command
 	name = "command megaphone"
 	icon_state = "megaphone-command"
+	item_state = "megaphone-command"
 
 /obj/item/megaphone/cargo
 	name = "supply megaphone"
 	icon_state = "megaphone-cargo"
+	item_state = "megaphone-cargo"
 
 /obj/item/megaphone/clown
 	name = "clown's megaphone"
 	desc = "Something that should not exist."
 	icon_state = "megaphone-clown"
+	item_state = "megaphone-clown"
 	voicespan = list(SPAN_CLOWN)
diff --git a/icons/mob/inhands/misc/megaphone_lefthand.dmi b/icons/mob/inhands/misc/megaphone_lefthand.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..6c8b158821531eb066959cf0c318ab3fb69e4b0b
GIT binary patch
literal 1183
zcmV;Q1YrA#P)<h;3K|Lk000e1NJLTq005u>004jp0{{R3yS<Vr0001TP)t-sz`(#Z
zI5=8bTC%dTYHDgUG&D?1Om6@Hr~m-0tgM*;0KdP#MMXt<d3lP8ikX?2+S=LxK!5;d
z%m7cFXG#Z{Z48573Yh?AYb;8XMOy!pZ%!dH|NsC0%>Vy0%>QQ0;-cvPW;6fHGuVmI
zs9<^j%$e$#)hGY}00DGTPE!Ct=GbNc004}7R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`
z^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+H#I%6
zAR|97Rf&r;C9|j)q>+m=ttc@!6~s2gqEfdwHJJp}$@#gtiFqlc=twL|&nHEFPJVeF
zF7?U^u6{1ypaB4+;#Lzoj#(uD00TowL_t(|ob8%hSL!ejg-H;KTF{o(6e8mF|Nq4^
z)7FxdTqXyQrE9(i7mc00_fX|wFD4U)VHk#C80NPjr2ltPT-t%a^v0V)+)N1xWB$VF
zKwtf4CWP~DIG*{#NBqqj#t!WTJ>X2t=khqB5OO{jGZ}w_z&~3AZjiPE3gam`pcF8D
zJ9-!4@)m?JTo&0?V!pdjMAM-Y#xr_CA;o>ZT;=9jzFOw@LXw_^#C+ooeGa{Fd~a+1
zA(xL+JK*$D<_|;-$al1%&tVWw`Fs#!Im*`xEd%d~O?JGY*C9!Gm|q>M=hGEgX5rY-
z>yRQmjOPyZJg4ipHuO5A2%ih*h77|n48t%C!!XPlxP1S2A{X!fJX7R5z3tc{JE8vz
z%`LLX4K|*3Y?0kzLR$Y<l*U0>1pQHXlGOjX+A*x@Fd?n~E6Vi{u`JeQz`qkt>;GKs
zSX<L|tH%33%xCnE#X8{M3#avej&`i8=`z|p<g@xmOz86;gi}5rT<us}(}kL4lVa3A
z76Jbx;crgu|H@JSScY!CcK;Xmzjpt34S$AV7=~dOhGCe$%eDKzXbE$r{*U6{F>c2O
z%Hl%(-;sY+hi<UjF(cj@6Vm!W%b~840^;;jD5BYp9bDU*tSo5#pXpFnPxvySf5hqF
zxATm4Y@n~n@O_Q<e})4tRz0Qlk1!qic3$D@|B7UXb}>wt(mz(QZ|9Z1{x4XQIUTyi
zs<i&GPWg78k&s@~)ua9|_)kgnw{Q5-{*UN?R=EFT7=~dOhG7_nxduPc|EUIlHjRDS
zT{kK`OY8qEhp|zd%~r$M^G+L+jov-OrQU8r3G0f~|0%<v7sgX^z^&3+H#?<w`uhl8
zs$B!eYU|g*nyjMqf68#^g_8m*-Ms7-tfmeD6>O{aFO7z$b2v8XYO=Z_^nZ=v&<o=!
zIbfq<`W2!WK|n>nf)GA-_fzg`GHiLG57}_&h1=BRgnAEqy=|-ky?KL$_x@)w)MSYc
zy|8a@H?ZCN$EO|e^Wz;>4GbmKWCw>qI3XYWm3@u!wL)JyD3Vf>84ht_*ZgLj4~1e6
xA*CiW9OA;qXzlombsqjNrr2498HV{|`~wGLI>-tg<O~1+002ovPDHLkV1f>aLEQiV

literal 0
HcmV?d00001

diff --git a/icons/mob/inhands/misc/megaphone_righthand.dmi b/icons/mob/inhands/misc/megaphone_righthand.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..41c66a0f59ad4d055abb44b72b6f34ff93865bde
GIT binary patch
literal 1205
zcmV;m1WNmfP)<h;3K|Lk000e1NJLTq005u>004jp0{{R3yS<Vr0001TP)t-sz`(#Z
zI5=8bTC%dTYHDgUG&D?1OsD_=ZvX(StgM*;0KdP#MMXt<d3lP8ikX?2+S=LxX3PLU
zfB;XOXG#Z{Z48573Yh?AYb;8XMOy!pZ%!dH|NsC0%>Vy0%>QQ0;-cvPW;6fHGuVmI
zs9<^j%$cdNeQ^K)00DGTPE!Ct=GbNc004}7R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`
z^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+H#I%6
zAR|97Rf&r;C9|j)q>+m=ttc@!6~s2gqEfdwHJJp}$@#gtiFqlc=twL|&nHEFPJVeF
zF7?U^u6{1ypaB4+;#Lzoj#(uD00UV`L_t(|ob8%zQ|d4fMoD?ATF{na3lTxZ|Nj^7
zCg~O0>~5MOGTysqMn^W?>}gv4@QkC8AP9mW2!il?Pzk-3sEf9~u-&1?6LK3h8DBCV
z+WQ+a5>utnRVYs<!{^)fI6>b7&LEkp*(~vwluBkZH6=Hkr|kTuoq2t_D)8ldnD;MH
zP`~S(B7D4q5#;+hPw$N(wH#_k{G3YH!yRm*9<s$UJFjQUMfRYmm(0vJhU9#{9o^FU
zc^=K;W0pLP+k)e#BzvR=*!f^cj^o>LL)4>LQwy&SBNq7Y&e!~u8OOGhj)+IIvh?fO
zcu5bi^XUT&wUdU3hg-;ydX_O0!t>d70@Pz5L*@&DAP9mW2!bF8@mw+g`xdU4|HXOG
z5>u6;A%G3gxGldWe>}gy_i*`NI=}aqngEU5FfXF>$0BDgFfW?#p;A~eepvp;1!#G(
zGKO*aW4@vlZT{zb*c$^sJpUsDG^1|}BlE{q;mtp7nHoPL|4XU-j|$MNJ{b1)v-4L4
zG2dN*dN}4({znC9PQU2yXXh8xe9oik9+dw@9H1p9=W`xz;R^X*%zV~kAh*sR1wjx5
zK@bE%5dIf#o&SaYLF?A}A2+{|m?}I}vH=>~`Cb2iSgxs6m;V)5?$rcn<ivFuo&WhB
zZhpCbrW9@dXZ*1Ij|<S&<+Cx2%l~{2JKy+`xtpoxNbbc4Xhz={M&^HrhjQLr?lwYm
zFFruC`e4}G&mI-&QHF9iEcapqG^bzo_p?VudaMWKZsGhd;s664!*aJD%>S;DyGi~h
z2!bF8f*=TjaC?3t|Ep^Ay{_9;_qne4UNZmd*G@LJ{5D$+^_QJKTdMW$1wQKShTF^r
zXy}x$_Wp+M%8rL!*j8HWdROV4{#%0|t6dG{YRl=_01aC@wZ{o|J)ly-W6<^MzJi;s
zPJ$KON40;gH93F{&`#~%10yk4c0J7VHO~X;2iWUe9JCKGqI=vY*Z?iu?zfnG@jRM?
z-NPNfZCZ7`d4pTow`y%cHb4uudzhm_JetLWe*ZYO1&<%^a0twfY=9PS_a#t|W=(&3
zbr|tUzk$w>3DCmrm?PrRtZe+cK8F5AumM`Qy{CuUO(S)**q<To7mgGJ;h*6T+2K0O
TW!IbL00000NkvXXu0mjf4n0c(

literal 0
HcmV?d00001