From 8610c7f6643e6868c7c4cc10dd415978ce6e083f Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 19 Feb 2020 19:10:19 -0700
Subject: [PATCH] better inhands

---
 code/game/objects/items/twohanded.dm          |   2 +-
 icons/mob/inhands/weapons/estaff_lefthand.dmi | Bin 9301 -> 9294 bytes
 .../mob/inhands/weapons/estaff_righthand.dmi  | Bin 9435 -> 9428 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 5a0dbf7981..788a72f4b6 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1123,7 +1123,7 @@
 
 /obj/item/twohanded/electrostaff/update_icon()
 	. = ..()
-	var/final = on? "electrostaff_1" : "electrostaff_3"
+	var/final = wielded? (on? "electrostaff_1" : "electrostaff_3") : "electrostaff"
 	icon_state = final
 	item_state = final
 	set_light(7, on? 1 : 0, LIGHT_COLOR_CYAN)
diff --git a/icons/mob/inhands/weapons/estaff_lefthand.dmi b/icons/mob/inhands/weapons/estaff_lefthand.dmi
index 8b9ef642a40d3e1506089c8864f9ecac4327df53..47b8dc112fb27ec8ef4731d4c1d47dc4af3e7465 100644
GIT binary patch
delta 187
zcmV;s07U=QNX|%*B!8xQR9JLGWpiV4X>fFDZ*Bkpc$}?}y$XXc6ou#9r#R?Z#J`SN
zN~AdGD@bT=Y9OtUgi7DOLzfP^6o)e$`1m-S9GC9ek5EHTFAmWyPe`;yNn&*-&5&qn
z5;ME|oW3O{ofr}sd%mTx#H6jwNEjC)Bw7+S=m$qgRNL@WZZP953Bz8$AyF0Q(@%Ch
p)j^*6f6waJ8#a??n+{sj?46mT8x_>h(+9Ulc|ZMuO>eQ<dm|KLR%QSI

delta 194
zcmV;z06qWCNYzM?B!8`XR9JLGWpiV4X>fFDZ*Bkpc$}?}Jqv>{7=-8KR~)()@vCE&
zqSy>Nl<pFmH#Lw}NJ6FmzC)J|x)g^S4(=X~OL1yDIiTq!e~}M%enOzma?Td3;{<`K
z<ZL2)pW@eqs3JiiAxF39=Ma@K`FN4t`I>O1tq%~WIWt~8C^tZ$SnrJadc5XLlT&X9
w6xs3cqYX~66Q}&2vsiMP^ytXMoz_%aXQpU}22C&d2Sc8FOvmCb0kPA2BjwdxB>(^b

diff --git a/icons/mob/inhands/weapons/estaff_righthand.dmi b/icons/mob/inhands/weapons/estaff_righthand.dmi
index ea20dd22463046b6890d9726069a13137c20489d..d6096c57c7afac7c9fa8ac05540f41ffdc3a6397 100644
GIT binary patch
delta 187
zcmV;s07U=WNz_S@B!8!RR9JLGWpiV4X>fFDZ*Bkpc$}?}y9$Fq6h!O2UomJK#8=8~
zf)Xs^FUXR;x(g=4?j@4HPmv~tHo;<wfx}^#6qoke^=NJ#y*Na_JfTr%IjPlKanPtr
zQjY!P<XfT`VQ3^g^IgIc#f)P@%K8wYQIi^jd2obAu?-LTHZfk4vOJqNG>Yte`pJ%`
pILK4}?^!+1mhBMy<m8|^)!v&a+P*<^>*xbT7J0JfO$^kb+a!75T$%s?

delta 194
zcmV;z06qWIN!v+~B!8}YR9JLGWpiV4X>fFDZ*Bkpc$}?}Jqv>{7=-8KR~)()@vCE&
zqSy>Nl<pFmR};_*NvQPScj(eVm*Q~4!QI1gF)no@J5;UYFLK^4PY9Gr%GqjlFc2tm
z&J5Yngs<^I1%g0C6Fq`kd{D!X_BYvF?-6I(IuC)8v%#sEJU9fh?M|O=$4kyMP3jGS
wEIFTkw8O~`;^hBxR!fs6-8(y)aL}A$@68x>SD|Vp{{Yi#d%vTde%YbaB+b}fN&o-=