From dc4a5ca135df4d6f92262146200c0a779d1fe4c2 Mon Sep 17 00:00:00 2001 From: PacifistDalek <32213277+PacifistDalek@users.noreply.github.com> Date: Tue, 19 Jul 2022 15:42:14 -0400 Subject: [PATCH] Adds a dodgeball in-hand sprite (#18322) * inhand * fix conflict --- code/modules/admin/verbs/onlyoneteam.dm | 2 +- icons/mob/inhands/items_lefthand.dmi | Bin 186114 -> 202733 bytes icons/mob/inhands/items_righthand.dmi | Bin 184372 -> 201037 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm index 62087f91513..393e5998c08 100644 --- a/code/modules/admin/verbs/onlyoneteam.dm +++ b/code/modules/admin/verbs/onlyoneteam.dm @@ -65,7 +65,7 @@ name = "dodgeball" icon = 'icons/obj/basketball.dmi' icon_state = "dodgeball" - item_state = "basketball" + item_state = "dodgeball" desc = "Used for playing the most violent and degrading of childhood games." /obj/item/beach_ball/dodgeball/throw_impact(atom/hit_atom) diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index a3facd099f3f62ccc6fb2b62fd3fd709fc636ad5..4b8f6b518225abe7372efc9396b2ec29624e2ee6 100644 GIT binary patch literal 202733 zcmcG#1yCGa+cr1}2}F
J-M63XI(-Owtt5@{i1-l*1j3M&kx&7FP}_h{<^xpV%!p#@
z3lIqNm8Y7PvxJ$GiKFE^XG?oK5Xe0>H%-x=lt22*&}2DXzg{uAyoSlya(n;xDGS5K
z{EBpbTFRd8{@3h8&XL-=qvcTXN$FmVpz5^H^Gd+xgTPgr02ZyrFwBdCx_cW#Y%1oOkZV#UFWiY@dPsz`aQj9@1^Y5$T}P
zcpQI&{I56^(|Gq$uevFoY@V5I?kBmkGM}kU>pXhNZMQ9Mu&n+)S0*aCgA~MLUtj&S
zEVI=+zjJ2}_SJ<&)us?+A`qjf2AN7fGe&Wgbalb5QLy`tpd9L9&dg)J5@O4|pdFrW
zFCp$E_b4P1efOXt;Ak=NjxhhIZQ@~6P7e+nWY8yNAIgE_sH?a5qQd8+nx1=~mK4#^
z6zNO|l>{tY9Kzih_NeOP+a~b!9;%{yUF@TWEN>wdd}Kx<6kiFvH|-u>+*|C!?e}dD
zxXvi|L(?*qjK)v$tXzBh8l~k2Oz}dnYH6kj`XwkvmdU@;^4X`}&kbcQL*zdgz4map
zqTSI9Ka}v&%=7p9Zz|T2lI)r!Q(D; kzleWw|>F8#j~PkbPYDk@LmVE=xl
zk@faQd}kL9`}t$Bso&+Ibkj<~6n~Z`5{0X*cD!rf5}$uCN3%2K%UnqQo{*$is%ukO
zCno>kYWV24ya2{xsp(F)_f}QYEHJln%&AOkVr}g|BaICQxIt@II4v(PFF-fOz*^2-
ze}k5qnhJ0dr4$E%sQso=$jO$~ja+IDE5nxSvg%(X#~1rx>mY7lcPodc%s)1b0W0lw
z&1c~uq}E-V(@{B`@hR8+z}U{M7rKX>e27j+$Y+l4`Qx}=yA;|T5hz1DYWlvrw2DoM
z-$-mWiSwVr>$69E*G4-2I7L*Tl~&!EDdyl#p3~q kBp)i@n?JrlnDwePIX4HZ|rYa(ZGZ6)PKcP5#OXK%-!E?
z8FylCW)pq!LD|Zxr~Yi1`7C-@;uPp _I2o=!rukfK6Rk=60^|nxE;$>eHUlPd*{d*5
ztG%Pd#)^rTmmgLV_A#AoH^kJf16f!-hC%W-gM$@2q=wjoO*qiO6=Rr45pH6I;yX$8`&@i4q8a@iT2ftUjkgb#yf-R<$^}uvU
z(lzgmw1dCW$M-+GuTmd8oRnZjsmzh~@q83oC@U0Nn6CV>`GZ8I
qx;DcKKSeVLRx5C8OR@7
fxJ1^bR6ps_0Zl0V=IjhHOH
zK^>lYEfQVEWINDBo3%G7W_AqtjGe#R(f)hYezMy*F6^?@qbwsIK%-|M{lQpX^!TP+
zYjn!rn_QUp(2A|wuG9ef!v3`680blnhTr@H^t>dG8DCtEWarMf7NZj3VF{FwhfKC^
zUgfIQ@P%1qNifT9K$b^x%)$&u6`%f+!k^VkKOCwe~h7C-y`KC|dNxUMJn%C-039y#ovyRTpg1bx=587@pF3(V4Rw=cIx@ejb!03&1O
z#(3;oMK{jhr`rVkHHne{f@7NZ=qn+K&8?Zk0J(`|8r7b`Ek;T84JW9^@nkaT$Io~E
zr60%>-30mq>-@?VX5A!r7z6hh
z>`?1fm&x6X6}24nhnrUlbeV=+WZ$JwSKV)9Z(*o|_1?`C8g5YovA9)p_$`d_UZCHi
zxVJC(Dza@)?7nYXx!M)pj$MW;qZ~!wJd)I&+x}ybt5MOKC&aNB8P6ggXWK;NOmWkg
zJ_O3fH?AV!@Z(D|jX%+_19q(o+o1UNa#@I!7FU{S)CzK|1hWCY%U
z
BKK+m;PhUz=B+=Q1aPtY~5iF}Jc3lR%*N
z$gDNQV3