From 68e0f2fd2303e7960eeb8a9937bcff012c903abf Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Sat, 4 Jul 2020 17:51:39 +0100 Subject: [PATCH] BALL! --- code/game/objects/items/balls.dm | 51 ++++++++++++++++++ .../loadout/loadout_general_vr.dm | 12 +++++ icons/mob/items/lefthand_balls.dmi | Bin 0 -> 876 bytes icons/mob/items/righthand_balls.dmi | Bin 0 -> 867 bytes icons/mob/mouthball.dmi | Bin 0 -> 882 bytes icons/obj/balls.dmi | Bin 0 -> 947 bytes vorestation.dme | 2 + 7 files changed, 65 insertions(+) create mode 100644 code/game/objects/items/balls.dm create mode 100644 code/modules/client/preference_setup/loadout/loadout_general_vr.dm create mode 100644 icons/mob/items/lefthand_balls.dmi create mode 100644 icons/mob/items/righthand_balls.dmi create mode 100644 icons/mob/mouthball.dmi create mode 100644 icons/obj/balls.dmi diff --git a/code/game/objects/items/balls.dm b/code/game/objects/items/balls.dm new file mode 100644 index 0000000000..ae6206f6c5 --- /dev/null +++ b/code/game/objects/items/balls.dm @@ -0,0 +1,51 @@ +/obj/item/toy/tennis + name = "tennis ball" + desc = "A classic tennis ball. It looks a bit worn... are those teeth marks?" + icon = 'icons/obj/balls.dmi' + icon_state = "tennis_classic" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/righthand_balls.dmi', + slot_r_hand_str = 'icons/mob/items/lefthand_balls.dmi', + slot_wear_mask_str = 'icons/mob/mouthball.dmi', + ) + item_state = "tennis_classic" + slot_flags = SLOT_MASK + throw_range = 14 + w_class = ITEMSIZE_SMALL + +/obj/item/toy/tennis/red + name = "red tennis ball" + desc = "A red tennis ball. It goes twice as fast!" + icon_state = "tennis_red" + item_state = "tennis_red" + throw_speed = 8 //base throw_speed is 4, and that's already super fast + +/obj/item/toy/tennis/yellow + name = "yellow tennis ball" + desc = "A yellow tennis ball. Or is it orange? Orangey-yellow?" + icon_state = "tennis_yellow" + item_state = "tennis_yellow" + +/obj/item/toy/tennis/green + name = "green tennis ball" + desc = "A bright green tennis ball. Tastes faintly of lime... or maybe soap." + icon_state = "tennis_green" + item_state = "tennis_green" + +/obj/item/toy/tennis/cyan + name = "cyan tennis ball" + desc = "A cyan tennis ball. What a curious color choice." + icon_state = "tennis_cyan" + item_state = "tennis_cyan" + +/obj/item/toy/tennis/blue + name = "blue tennis ball" + desc = "A blue tennis ball. Who makes blue tennis balls anyway?" + icon_state = "tennis_blue" + item_state = "tennis_blue" + +/obj/item/toy/tennis/purple + name = "purple tennis ball" + desc = "A purple tennis ball. Now you've seen everything. Purple, seriously?" + icon_state = "tennis_purple" + item_state = "tennis_purple" \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm new file mode 100644 index 0000000000..09093b6567 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm @@ -0,0 +1,12 @@ +/datum/gear/ball + display_name = "tennis ball selection" + description = "Choose from a num- BALL!" + path = /obj/item/toy/tennis + +/datum/gear/ball/New() + ..() + var/list/balls = list() + for(var/ball in typesof(/obj/item/toy/tennis/)) + var/obj/item/toy/tennis/ball_type = ball + balls[initial(ball_type.name)] = ball_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(balls)) \ No newline at end of file diff --git a/icons/mob/items/lefthand_balls.dmi b/icons/mob/items/lefthand_balls.dmi new file mode 100644 index 0000000000000000000000000000000000000000..2f65e0969a54d807df5657179d5ff94d7fb9bc4f GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/icons/mob/items/righthand_balls.dmi b/icons/mob/items/righthand_balls.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ba2bccac3894b920e79792320700872e7fac68e8 GIT binary patch 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! literal 0 HcmV?d00001 diff --git a/icons/mob/mouthball.dmi b/icons/mob/mouthball.dmi new file mode 100644 index 0000000000000000000000000000000000000000..f3c605ab56efef273265050dbf8f2c0c745a2d26 GIT binary patch literal 882 zcmeAS@N?(olHy`uVBq!ia0vp^2Y`412Q!e&{WdutNRm>a%ubatBW~yo;_ebUGwbDeI{#HuIsI1u9vg?0= zg-PxFlO9ID4LA8{F4Frq>2yTV<#X@zlJXTMmvc7B{5X2<($6brb9hgvI5OQl(tC)_ zO>pzc)HH7et>^EQ>Ug}E3^$)FzWr0U@)sX4$Uxx7>}Q`V@4IKL+#iwrZ@1W{35WL8 z2Wq%pagEgr=9KelGpyg&y)^o!v_^`i`tn+M<%Q7nEW^ATDQb-1lAo(>5E{#-9rF`fYeB z2;_&LlYUy4&&lWI=P#JT&)F378|a6t%dKxnO{i^RIkoq88*h$sTJXt((;Pz1-36PR zlolMi?X&u)FR~DW89tcH_8;HZe<7%TKv!giu3P8%nG_7o)Gx_?SsR)@~$6-8k{x; zvzNbjP`YLfwdlc7z3JZf-3>CIX!$l7^#-}b`mFs~X8zl(x5iuG$x;1(|M{eLs@_<- zb7%IA1ExoFc76AoSZvLv+9^;$ Bjq3ma literal 0 HcmV?d00001 diff --git a/icons/obj/balls.dmi b/icons/obj/balls.dmi new file mode 100644 index 0000000000000000000000000000000000000000..994be4ab974f19ceeaff5c80299bbfbf7ef7b970 GIT binary patch literal 947 zcmV;k15EshP)i3(0I`k$sh^+B{{Y!R0NJhpZGQmI!^5uG0Q2SLe+>ZtOaOmb0RPMYnX>@15&*M( z0J_-#m$3lZ767pl0NI!Tv3vlz*Z|lT0N9rRtD&KJa&lOIGJ11!Yq0Qnz`($c0I{wB*;xR8%mDv=0JE3?*?a)8mjKvgqt90W0004WQchCV=-0C=2@(9H^iFc1XbbMh2H@1=j&UWy_f>MN9(Y|TO% zWj9uQ`-XZG3c1ZN-)Ty9ubZ}0)uWXkAjUDMo4Ov3QY>hrOXYHw!T}C0ZiSe#4gcoWSPN6}%spTs;s#$i-&W*|zsH!3)MLJ!JP}f)|Wglo%WS|Esv| zXIH=)1OXcXF9gBT^FlWLv+!+yzaPPXiQe`1 z2Qdto`2GC~JPslFAPRhrAowT>0*)d0BnV(2FAPKSdi#xm{3wd3zuy=rh~t=~eznwI zhn57|@6eJ!2OU}xs0VW;@AHF{Z_Jha)ke(Cm4daHgC(%UY6Wch8rX7&!{Kl^94~|| zu;n{o%lE(%PqzoKmEZrnBiPCL{si`7p3vbD9BA90pXvAnjwCE`q0<*|B58>vWh3B& zB*@qZ_$Uc-HUd5gf+S4~7%;`x{{F0l0aJeK@6Rh3FxB__6{K81@Iw@2Tte_u6y#h% z@JkTDKxt7F)ZcFml$B*k{r$#3c~w;;^{Ygu9a<9TtV2rzop)$Spf=`8X(GS>&6TpV zoSQ4<7u)|J0hU;ufi1rPTkdc;91e%$g>VG})=#fDa24P8&!wi@Z*ZfbmZ%#x0=^9- zsGFvR0n`3*0!h$t3&G!k1Taw3wk-|SuWH?N=%EB^W3JTHw)g#WslkBt4u|7E