From a1e855229d74067d1fdc7be0e29643876642779c Mon Sep 17 00:00:00 2001 From: klaasjared <86997650+GhostActual@users.noreply.github.com> Date: Mon, 25 Oct 2021 20:55:48 -0400 Subject: [PATCH] Small Fixes --- code/defines/obj.dm | 16 ++++++++++++++++ code/modules/holodeck/HolodeckObjects.dm | 16 ---------------- icons/mob/items/lefthand_balls_vr.dmi | Bin 876 -> 4363 bytes icons/mob/items/righthand_balls_vr.dmi | Bin 867 -> 4148 bytes icons/obj/balls_vr.dmi | Bin 1258 -> 1204 bytes 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index f6a8ebfbe07..db64bd85465 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -100,5 +100,21 @@ user.drop_item() src.throw_at(target, throw_range, throw_speed, user) +/obj/item/weapon/beach_ball/dodgeball + icon = 'icons/obj/balls_vr.dmi' + icon_state = "dodgeball" + item_state = "dodgeball" + item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_balls_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_balls_vr.dmi') + name = "dodgeball" + desc = "Think fast, chucklenuts!" + w_class = ITEMSIZE_LARGE //Stops people from hiding it in their bags/pockets + force = 0.1 + throwforce = 0.1 + throw_speed = 5 + throw_range = 15 + drop_sound = 'sound/items/drop/rubber.ogg' + pickup_sound = 'sound/items/pickup/rubber.ogg' + hitsound = 'sound/weapons/dodgeball.ogg' + /obj/effect/spawner name = "object spawner" diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 8e474fe4083..ee7060dfd89 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -406,22 +406,6 @@ return FALSE return ..() -//DODGEBALL OBJECTS - -/obj/item/weapon/beach_ball/holododgeball - icon = 'icons/obj/balls_vr.dmi' - icon_state = "dodgeball" - name = "dodgeball" - desc = "Think fast, chucklenuts!" - w_class = ITEMSIZE_LARGE //Stops people from hiding it in their bags/pockets - unacidable = TRUE - drop_sound = 'sound/items/drop/basketball.ogg' - pickup_sound = 'sound/items/pickup/basketball.ogg' - hitsound = 'sound/weapons/dodgeball.ogg' - -/obj/item/weapon/beach_ball/holododgeball/apply_hit_effect(var/mob/living/carbon/M, var/alien) - M.Weaken(10) - /obj/machinery/readybutton name = "Ready Declaration Device" desc = "This device is used to declare ready. If all devices in an area are ready, the event will begin!" diff --git a/icons/mob/items/lefthand_balls_vr.dmi b/icons/mob/items/lefthand_balls_vr.dmi index 2f65e0969a54d807df5657179d5ff94d7fb9bc4f..70455d01c20f46d34f20e39cf0d30b76e2b6db58 100644 GIT binary patch literal 4363 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 B2xtHR literal 876 zcmXYt3rtc`7{@;!H8U-G&1_A34QFLK(^xM>!_*>kKt7u}O`SHyS5hioSF5xlYd(@! z*lL(9u?v-NAjL|9Ow{sbM30%%M)X*wl-@4Ovz_zpeCO=<|Nj5-$cRv9$2E=s;2a)C zV-QtM>^cWK;>?_?WE16NB%KwaR;#a|fcirw0{z|HS{x8(!0FJ2!OyWVz5=iyP%H=Z z3Lvq7$pEVb1s6`B0BG@c1o$`rk_x!|EC!(p0IU%d6%dO8@rK|KW$jue0F4Di3wSMH zTu{VC(E^D9Z1NcqOrU-qNhL1ALRL&ZEhR5GH$6K)ot*`6O2m7qbL{dV*}u>GvGQi; zB_!HgzhUo4^wrvXx-LPDVMyQHJbcTcRi~z0_tdp2{Tdr&yb_zmQv)Jxj$$|?SklE< zQq*Xh=%Q~9lP{`?*;KY{?DMmWbz2_%cqW%UEWFR{5^w@VkH__{Wfsq9juR;l6=pu_ z9CTXr*kOA(dw2`qK{U2*D>aQ#`L;Grsryd#Z63= z(OvI1d3|!F6;CV~*{F%%ZTVH0S>Ib~@n+u^PLs3h+uNs?iTN4nDXvM*VU+K>z7aDg zaI`4LhEE<(t4=BNUuV!zP{G%)9}|?N2Od6m=|E}lJpk{obKScA<2Jv19Yp^nQ60}*KZ0rN|naN?M&#Hog2TLb8SBDfVuYK lPj_CtZZIC(X%FysX##9@ciZ3dO2V}w!$Tryvf#us{{ZeenehMs diff --git a/icons/mob/items/righthand_balls_vr.dmi b/icons/mob/items/righthand_balls_vr.dmi index ba2bccac3894b920e79792320700872e7fac68e8..286540595d5fb3f16324c4dc4a1b3d2ffe8cf9a5 100644 GIT binary patch literal 4148 zcmc&&XH=70+I>S8rAiM5yov>B3K9s_OA(|hRYDa7=_M3_0HK2v;R4b@M7lIX4V@^c zk={iJ0VGK1q1O-YeE(+F%$=DZ^XHUjJ!h@6_St(s=bR{A?fVS$JoEqnFsQ33KLP;I z=@6Kvqd9Gt?$zs_b{JoMV-MwL2y1scR}VWEX8?GS8H;OX3>ISxCo~WRwJq`TYhO|LqA!&2|9c$WnGzT;ud=FqXNorlc)5G)f>(% zmsZZyI~zhD%9^M+!V~EH*vI8NRj6c7-bcB}Xg%o0joSy)aUMcukv^%`p2SE;A!kl@ zCvf(Sk+?+gUaNCb>!asvWN%*}H)=ST6+P^*YQluc!@JSkJ95=_7>p(^X7<(7nH!)Q?&M&97eal3MC)<4Hw4w7IzhxXx~D$7u$HmsIIGOHSaUBVe|)MDq>aL zo<6Y1$&eUE^t9t$N488fVymIE+j z_jE>H@Po9*fRqL_p=n{T_?MTQndg8sPvddR3PYOTar56|b&F5UK%0E_RipTe?VOSn zq}8Z5C-J#tg509s{pKO-!LriUPg6$R?J3x{malY}{chP4^R41M^Tn#-*Ml6E?<%-G zEn?r!d7w{`-*~HIwv}m3?ikeTUf_y-Ti5v~(wFic%F6u=kRy)i<8A^xUMga)l@PQy zmptE8h`i@8BCh*<@9X<()4FosJGM0}&tc zXAn`UJ;JW2al+zPzah`x#DGoS$<05BOgKfDq^I;J!uh3m$niaaKDN#^Cc*xJVVC*6 zoe~{}tw*o4YBFm9c;Qs%=7LdWjg6@frJzqg@oeI`=rl@_>Y5KL>(#W{uX^Zsq!oL8 z3-MDWXYf_*6Oy=I`KVjm>2eCo`a|a=hUQR$8(IM{-+U~&$r_GZ^=ghoIGS@E+ev?g zTTUtO=(iouQ#uVbkUTT3^@I!8r;BkDK_iTa9aQ=mjd6&0Ow*+W=es+H4l8=L za&`7U*#PBg*m@W0-!zB6W9whGms_8IiZaxg<}?P3q8iAA|0l7T=Yr~F)-p8acm;+u zCHc7e>Y71G^wYW;t&=>(A4geK9p1462w$?cq$+nL z0Y(3!8%{Us$CdnxJ}38mu{*yOF@MwXW!y}e4Z17Dub)`3aO1dd=@|KfIHs1f(&Kfo zJ_1|%ZW=V&+bJfUp=@mcFgX?9d(&1SK!uT+SXK<;V{&pMif8EovdlNT$XiOg_8*t_ z)=tTdJYt4K)+_K$NlOmcPSy75vb4n&@COGdFm9{33Bp3Mp`E&LlcKU$-v@r*Y`Q)F z)q(h@1{wp~e(bHCIf|%7PrLnw{{4xL@&bC&Yh9MwGK=V^Paq-0g7p-{?WKl1`aq<2 z$CfSV6qW52EdwbpUkbeA1uM8Uce&gK{MlUuJ@8vp!0}||QB5bme0CbvbRfLf_Oe@d zX9LddsuOtF;e0h!+s{&UHe(K+Qpy`5)oW`(DM`cMeiZ^&GtTL>Bl0)weAIKp7C-#9 zgnt+@s;%?HbyF}r&!`fi#Jp-AXU*uFO*xXx_C(JUsK{&$UIqtq?QO|75~3gis|tZk zs5|c2ij-|Z&2?u-P;_(nfDI|2zdh=?Tfa3Ls5RZta-QqZm51}%Oyu=Hq@?eJNaIFW zgUupd!4a=x6R(J$M(f2`x~3xrznbTO6mbvyDJG5C+vXfuD{^A3M(62er%Y_0(iN># zkk;HthjT(xuLR;lV`GOu(a|8K#5qI_`&~qOVm?KOfcPX0Ij@`puXeG1HP3(pUqAa$ z9Q7wt73`N2%Hg9=?&~pMT&MmvF~3X^9MHOP+%&banYnO4g}Nmt2HeOKu5oZ%+N4@> zDfw92d54YdV0~k)tDY+ZyX!bm&)&9O;GTCN&OnK}v&hY(6!eU+nliiVEff?+4OXG% z5PT5LEV#j4N3|gB)4y=6iM0ii9-66NPInQ;rma7Ie{*eiD)zFhKVDTog+2FOUlWOx zz!_(9ZO4}97y>*SIwi41l&Iy#BCm4=R=&W|TY4UDHZo$Eci_PuA~CUqzBXOA4!dIekxwL;5)^o*mYpa?0G`mafW%4|rRt6seg2~H_Z#F1(A3e{-yr(3ajb*tzZNP7 zP7u;@Uu#sp8=|zCjAqWKHo+qBO^3GmchL%zpV2Zv!h?b`z+kq5;^Mi^KnAscejWZx zDjF-vU{F(T!0jhn?nz#HttO!79N?^V*~AkKiqgMrCGuu4LL97H^S&3@aDpu<1gvL$ zN+ch)OkTJ_t(h8^Q9AVH3v{sXTw-pPd}hWPPA3p&PVTy%G-8&F2GIs?`NItY3xq(; zAAWG?c3FNqx!!I%2~gFvN?aEW81S-F&1iw~*MdW~bBeh!dZi*mUh}X_R+?hXgwg-Q5 zEY6vmaa5ZnWmQJrtLz~vr9I0xyUmg&L=p#xD>~z8kT_+HXBSXI(F#^%gjV%;AuzD# zyWU#kxAO#DQPU`coh;5L9sOd6Sk_~bPgS@c5|grC2<&+fWLRsL7sK#i#t9N~6rs1{ z_feR;ILV8;&ub=hYw8YP^}?Yn%-4@RZ&wFDy5=~6MwyCC?;Zvj+K&q>-gl{B&&uf< zP^j3S*JrrqsgfR$tUb7PhgW=+XXsMv9f=gxAa76-z|gx4@O#>6#xJL literal 867 zcmeAS@N?(olHy`uVBq!ia0vp^2Y`412Q!e&{WdutNRIXy^(=oV~ue= z!_5B-4E1RY|2MgBW@x_2z_7WW;pSR~$c+p@x%&SMK+&+9AS)O)Ml#f&VfbImuz3c< zP0_%l)j$U@mIV0)GdMiEkp|?WP2lg!i+U%56zl(_sXU1+pjL>*m?GV`E<>*JNKEaUAeBej*gnPbQZeW4?TdN0 z90Xb)HZ13p7N6DhIzZg3)%)Im!Oi>+EbSccxcu6G+j8?}?fbn?ma7AO$MEA**y^jw zlPYr`{`p#!dv3nJ*+*Te)$!_=qjH0nZ~G{-*3{n9Z1$%ly9Y~iKBYvhW`44D*QdKR z2WmET_WorJFUFK+Vy=C4>-9c?DmtbNn7>< zJ@bAq$Y5O_3AXqD=6fmx2Ov+rl&2oA7-QS0z{?&YYw|?@X zXZ#S;85nMVt*Uh~T7UET{q(N?hPDboci*=CzR7p{r#w3cwbQ!Q2hQGpe?PlxHYA|8 mRlj>WTMZn@|A0n(2(4i_QX(f2ShIOK$V5+9KbLh*2~7Yqcb+H! diff --git a/icons/obj/balls_vr.dmi b/icons/obj/balls_vr.dmi index 0e8a9b20dd7bbee60b44ea9a61afb95bde0f9cd3..e85f4cab05d0a055e578c92acded1dec24f2ebf8 100644 GIT binary patch delta 853 zcmV-b1FHP$3A722BmwG?C9Fn{0I{wB*;xR8%mDv=0JE3?*?a)8XCe$+9t)Ec6pRuQ z%vc3<4i1+9*uGE!Nfrf(5Dy&x%xxJgZK zEc}zDsN3p$;0InXhx0Ep<>CMU0>w#0K~!jg?U!43(m)i2r!BW}Y7HRbWh%5>tTlj$ zmx95B1`}xF|NlGglT}81D04E16zIqY`MeXa5x-}2SOLv@-tw|&w(W_b$g)8zyF{0!5N>Q55PH_ z4`uHi=*g}*zmWa+pf8yrF6H0@7)Wl2p|41wdYoXSNTB+hV5~@>28>|n`x6*&CLhiH zqbUqH(@*C9@qY{koZ08cEAZ6>f-kIKq^1yjWd&n3gWww@fI<3`$wZp_$skA5=~SBg z$sotG*-Uc%VyOKB%?b3VKyv~;F3_AnbZATdkbnQDEsZYtoVGN+wEaIA0!u6|fGxiS zw%p-xI2;bg1K|qXV}0pr4zAeu`@6D`^Y36T?`w!fpnpi9=JzC61i=ypoaK*yCJ4hQ zvURLhtLr-m!Z41bm{+U{uGhREP)i7YGJ-HpV)~|xVYS*6pY086kil}flw3dVkNz}G zGNXZRUl=xP#<0*qfo22=9zc{PNs^~V!REGqv*ni5p)Caq^ZPySpF~MapFA@dcK4?p zaU);|z z%dls^2=fFxqTkRjqhP)LbN~GWBFyqU%Ja5Vb}C zn>zrm0NF_v1z7-p%mDv=0JE3?*?a)8h%^9~0NAMn1#puW0i=IzdSgLJ#7(Iry&(Og zrKsELd*BCF=7;l&XTc!=00RC=L_t(&f$f)TbJ9Q*hPN%Zb!!bE;w2SYF4oFL#7hxE zS|AwI|Nnb@&q6E8Ioq**>2&rDMRo=6ckMbf|sJ8WU3In5(F^lpjNV$eJtfQ+EVebCg!xI z(vg^h0&v9Y5V-Oq;L1H7kH_Qj+!N}+m7f4tehM6MrrrQ``TPH*2~Onvv;|JZysaB= zKttF0{7g6Bf~FRRIM=OrprxfD+8sjz(~tyRLju#31U*9n(-H*jPNxq8?*4nezdL{d z_uvEH-y46zfP47y;R-sY55Xr<&@}@HK8u2$8A9+y5Wt{2{eEBb{bbPH!C;{IelqCZ za5&UbziNjaODGA#t|gQNVb2mu0#&0eb=vaxKW(XdCg-%J-nr}lgEnx)>I}H@bKuH7 z9*@W4xffgzj(kM?PyJUyRE$RB@pv-6vtnIOL{opZe{B2dM=X|H0(buvU7TUlKcj0d z7&4a&aLIn(-<*GK*zKQe20(w3By9guFTR0==7zYq?xu?wVMM2&%*Jt?B(vF^H7rv@ z0<&NQ7u)B@_4f$&`A*_EUhink36^QPf&usHJ16*k{;S;)MzotvJHd@`n_zoK5hJhz z#PNUnDgV3RkMlEv$z(GDNs{>wUXYp<1V4odwj9xPcLH?JHanX0@6j^V>1wsoOutgm z*7S9myCeGqxB(ytQ%lGSws*8M00gtmj%Y!GK-FkV>5~7xkFIWD1|S1=ldRt$ z;TMgD075j4uHVpz89*ufgz0w-=NAUJg=shx*>=>kf9&E3x)WP}r~b7OkAI>70000