From 628e22ba026724b444d8cfc900e0a6ef3cbd9c6f Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 1 Feb 2024 12:41:19 +0100 Subject: [PATCH] Newton cradle (#22914) * comit * comit2 * little more range * review --------- Co-authored-by: metalgearsloth --- Resources/Audio/Items/attributions.yml | 11 +++++-- Resources/Audio/Items/newton_cradle.ogg | Bin 0 -> 10019 bytes .../Prototypes/Entities/Objects/Fun/toys.yml | 31 +++++++++++++++++- .../Fun/newton_cradle.rsi/icon-off.png | Bin 0 -> 4387 bytes .../Objects/Fun/newton_cradle.rsi/icon.png | Bin 0 -> 602 bytes .../Objects/Fun/newton_cradle.rsi/meta.json | 25 ++++++++++++++ 6 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 Resources/Audio/Items/newton_cradle.ogg create mode 100644 Resources/Textures/Objects/Fun/newton_cradle.rsi/icon-off.png create mode 100644 Resources/Textures/Objects/Fun/newton_cradle.rsi/icon.png create mode 100644 Resources/Textures/Objects/Fun/newton_cradle.rsi/meta.json diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml index 13eff6e702..51d8d9cf95 100644 --- a/Resources/Audio/Items/attributions.yml +++ b/Resources/Audio/Items/attributions.yml @@ -67,7 +67,7 @@ license: "CC-BY-3.0" copyright: "User jzdnvdoosj on freesound.org. Converted to ogg by mirrorcult" source: "https://freesound.org/people/jzdnvdoosj/sounds/626262/" - + - files: ["candle_blowing.ogg"] license: "CC-BY-NC-3.0" copyright: "Created by Bee09, converted to OGG, cropped and converted to mono by TheShuEd" @@ -82,13 +82,18 @@ license: "CC-BY-SA-3.0" copyright: "Taken from /tg/station" source: "https://github.com/tgstation/tgstation/commit/c61c452d78425d89920b41ed5f95fd190e733a3c" - + - files: ["scissors.ogg"] license: "CC0-1.0" copyright: "User Hanbaal on freesound.org. Converted to ogg by TheShuEd" source: "https://freesound.org/people/Hanbaal/sounds/178669/" + +- files: ["newton_cradle.ogg"] + license: "CC-BY-4.0" + copyright: "User LoafDV on freesound.org. Converted to ogg end edited by lzk228" + source: "https://freesound.org/people/LoafDV/sounds/131596/" - files: ["shovel_dig.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from tgstation, modified by themias (github) for ss14" - source: "https://github.com/tgstation/tgstation/tree/85a0925051bb00e7a950ee66cb7f87982cd22439/sound/effects/shovel_dig.ogg" \ No newline at end of file + source: "https://github.com/tgstation/tgstation/tree/85a0925051bb00e7a950ee66cb7f87982cd22439/sound/effects/shovel_dig.ogg" diff --git a/Resources/Audio/Items/newton_cradle.ogg b/Resources/Audio/Items/newton_cradle.ogg new file mode 100644 index 0000000000000000000000000000000000000000..6dfe528feb56f22afa59ad09dd953901f266a6e4 GIT binary patch literal 10019 zcmaiXbzD?U)bOQ4kR=7AJ4FzLC6tsFSXfd(8l;4kkP_*ZT)Ko6kflpP5TqofJ4HG~ zqy*%<;PX81`~LOKZ|=QkPR*G!=gd8$VPm5WU;_U%k_d~TEAUN*J3j^khP$(?xgFvP zfgz8+`T&5x7{>MY1BS+xtkqtBAdi^yP4qOR@%6L))MabYY2eC`(#|LssflwF} z#MxcpAhQ3y6ri>sRR*6v=-XW}qQLKBCv-syP<;r9TW1O)k^PVsh=zj9Y$8gUfw<6h zx}Y{bu84s4yC0~6utm6{0#@#Jj|Se54ND7D7CE5}vXSwm`a1`kj8beMu1q&|&?6bp z0$k_^ilAPZLfRl6C_ZBlldvTv5DNe~Z@D7gauGskD+z&a0DwqqQFOV`eTk#{QbBhE zpV$Bg+y?+3N;qUo+E3doIwYU-hXlfBDxKQ9-%UJ>devViK zN2jIP<@{5z>n0S{(EtWZ2HS2si95 z77gz8K7eNUlSbTa_y5<){?sZr-x8ES7c#!(7~D)#sesaFDAl}-PmidFu4NzwzN}^l z4uH_x30diQNTYLOJ_GU}%QfG%lfm^$Lqej>X1Vc) z*KC;{k($#AZO9z2-zA_8%#ht2TDQ$l6vt;za)GIE{&hGeAdSx)OaW8+_hlZ&9765d z!(EUQpu$sB_%=$Ym#?bt`X#=NuDU5fB-jp-<1J~2X*-IH>)Y=_*U|#3bq(!HYG5kd zs6-gywf~qv-^=3CSjK8yX*LhzF34~tuiaT zf0qevDDa#@@jBj=E7??s+4_h1G!BF{$fdL>6h?&MLzKo^qK;bktwuzQweK6lbshDP zjz+a^Gs#vn$G!{ys~h88FOduY#N%1H<5{@lzlp`LDNEaS^8nJgR~Z?x%oX!ZES^m{ zp4~3q<|VQ)HEkm`i|73{3jn!dxoQ#bJR^!cBMLoZ*2Cg$Q;~&5X}mq}wi`;f{(t?( zb%3)0zza4-S2jf$n*t03uD$C|bmd*T&w^|Uu6(`2!hhE|L@ot7RPV*#L*t(f005#d zq(y@PE0SW>CV~-i2Pc{jaIeL} zdZ4Rx<`K|>42uCMS7u@llruAdj2i_Gxz{oh2b5Pc5{8wz!1(xt0Y0)^!j=jEgcDeN zPN$wAtWLqMPOhLqVLU;uFqS0TFD#;^16QX|AJc&wP^rU_?CST_)hXcG^P+ZpQD10)mj-H`RXCv=I*IaT@6918#pwsb(~B7PZfMZ2R?Hjq>5<0FxG-w z8GxGIjSVK?dgH#J<}q#cDM~mT37;CXf+O8bU%=;dji)By2IIanuTyf~)J*IBL5&8j&kZP{PNM3fgX<7GG00tEmb3AvXnh zlGW9eNmj-lR(f@yh$GzHcj1Mxak87SzO~VD@Q9n6agx=7o|VC|m2ua&+rqKhNUi$B znA-^4ZDHK)d#dBi2`J_UM+TdMd=tS-FP-LYWog0P<`RufL9ts-rlQl$PLgGg7Bdej z%UFpNo6Gr(XYMyNtEaflt>2bg5)Ba^sdfbQ&Al)-O?I2J-D=R(fg9^tO&!Daj(kBQ zmX3TEsNoaGpvyzXkeO!3zNp3 z4tB(26|P*AriyBA(6}sjMKH|Jp=2!0Fj6FF*pLfVqp1>EgrYUF7kLyV)18qJ59LH9 zUK9GDJeh&u5ego3hJ4%|`cO{xz!()gW>mb28as+wj;A6i(Hta98amW>q#(FZ9q}p- z>?nOBHE1n0BIasx&g;ohH87Zc5&{OQvbw3l1FBL{5d^IQRo#?T0aaJ$M{GuK1p2h_3ILw0EpOOhbGvsxj17tG}|U9>)N&`!Vn<{s7h5uq?Xz~M&u~XuoxuRKdV?xL+lBzPHNkW)KS}ma~OiER>v*C z;s@&{csy_~j-guxBM;-eX?n{cT}(Dm*Z4*@0L>;OTR^-k*|M!tg0~zAp#zL&9KY(O+Z0 z>~rk>i*a+CyXJwr85ID#}GQ zlji7*KuwrRNe8V37*peh=!)?)2{3M{?9tFkIu$$qPJP6{$KzO-z2LYZV((+}xH(#6 zZ8i|nR!w11T7R_Yy~kZ^Xx}e&!W5)gF=mMPaaBx43Leh}{s0TiCsEKfhM*saM>U?9r$zRVuxMhZpz}bTmFkfB}V<_ zBS0m_|HB8?5khM@pe%@ksa(tAUqKuH;kd6V+iNN}`+pEB2%^Gu#RvKpA`8C$@$$d8 z`2TP)*uOY%tN!6jgeik1D4iG>s?;)^G;k`jJc3&c{@3v<4FDAFy4vBHGJS$JMa=ku zg+;O|+#!N;JxuSowF#MnnGq4pn7JLgsvY2u9fA$ugD$u$t$7y8fG5K#{k$5i zZe=Y)l!W=PL-CRTQb9_9je~0iQ#!aqVY&n71on3K=EF=KZz6=m5eQG5TmD~^E zoL$7ud<(<7x=#S$?vnsO7Y>AUi0)BHC$3^>7oHMW4TG&4_=E?1V#bu07Y>cft!N!u z+Q%RRiR-Ja_o`ct$$9J~cO>Ys>1YKYpmKs%2qh;pe}@pWjWm>T>yn4v+@b{CIJc zI3mE01p(M*e%}6`&KJYMhPmE5JuR7^@$|M>bM1kH$m7}fWe~KIFn#pK3LQXRm{CGUd9S7)s)=T!aoEhWm z2QoG$3QNse3H=LWX>a%~mBWmRKE8R1>G1c|i)(Z!a zc3h!~=kC!@aW=&3};}%}H%Np-zqYe46rV4ImvU_n^1+_jO4>YFu1%C$`~q>SAJC-0O`flk_v%s>f_dG zoW0vAd3|Hs>hs5)_CIlHP@1U_g~tv9n2;waC&jvvvc1bg+2NQM>$GjVgnRcbtox)m zMMdaFq4Pa!R{^Zm+|2^ohuFf5u09Vu^a~3K989ge#t=VR&(7mSW{! z_3PJYcG5~%>gcSYmSp3a0fEa-M;fx(kvAT9HT}B*L1uR-cW;gP$-y@!QAD4e+R1gbo8(q@Q9LR+m~YFdu+ zmo;QAeNw!&QkgrhS~~x@PSB+5C|-TZN}a#*kXT>>BZa@h;DmNk^Sc*xDuY;m`Jscv zLygJg;oAPm2bPvnP7DsLt*23@9SIBFLvfZRgGMny3*DH&pAYALOH2Y>z$FLKWSA3+ zYWde+L{yOgPY~H;{mQf)4sgMc`&;Q3GezUX$yVMuTnDQjz}n>`YRQiPf)EOAh7L>Vxnf^Yyu%vp`&H*b0vDFq zGw&l|D+I2M9VV&mc{z{4{AYK3*8#dm_mZB&KFjYu8aff7BssEvq(h}ONYElV^&}c# z2=g&kf1MnN`(wjKDa2i~Y!{0dsrH7Ng<6)tfxiCLpXPl2G}l|6_KDt|+V4-p*9KmR zjP;2VYun#ur0Gu%z|F9kC`F@v!T2cGj!=uKXM)>q}52{1aUvFJeD^T-y+d&RLhHq5080@)TefVtr?x!+4e@MRvFNGa1$3WJny$EcINB7 zz$6CdLw)AW9rCe&#-7Y>s~D$rsSzFKw`_}^@I8stylqF6Ug8yRQlcM=rnx&7{ajsH zZzoP7#(R!|%uPrw$@wV?(RPg4WN9MpzdrzhiNEW_MBS7bIw=40qH)ano{PuuQs_Hv z-mN*EcJHD_!d3+Nf;g+5<=G;JNobP*D((XmD8IzNFL*CDHPr;7f+=g_Lvy%v$Qkeb zus!55(UjzH^_NBD3kXEWX2Vu{OvJH6fB(-`GRg$ngE;sK!A%_vp3FCPn_?Wi1;3{~ zm{lWL9n(?e^5vxldESueSmPMGpK+eK`;Qt9nMOnR)HOMC)t2gQA#1c#)hAman7~|! z^;5A~I7WA5oU*@1=|)q_v6jop(engH`KG)QL4wj?8E5gpjbmYsl-cwU_tM@r!X9 zDt-7nsw|(3wuGT9^o#8I$AutPNuZb8KL)V=uPd{N|F=_w=}srd$vRS%1`%8yW@4+m3)PbKjV8_ z`cajj(hu;fO!gwrN>1Bc;?!$Z?lGi^@Xh3*D@~ zjOFo)d$;*IkOC+10=FM}e>C)|l#=mFs^nkMyvrk77u?j0Bzvjxt=fteb5V6#wArTM zi|hIDx9VEOPF`oltU0gqJSU&DBn<Dd@Xx~fP`I}=&VA>=xp||pas1a)?cN6{J%*NZoCC1n}%dR{Ca`S-Hd<47ECWm1R&;Bgt@!5w z^-zTzMg!X`nh|MfJv%?Ko%K4Wu-!C^xP5%g2J1hrtpI)38JbQDPgC;X_Dq;8m z<=xZ}DRL+|a&<~V3D=qylyR<+MR8PDW;`plCoU@A-P2;IFP+1joer6<;*evbRx=YZ z+7Re93BO=3K581DD3nQ?{?SvBnn|^0CjC6=MD+HE0pCl-gvXgh4}J=!uARi+1|HNm z`4S;lc7YJP%cVQ5&t4NB6f5s&+fMiMTX6O1+%$0I zdpAsHY3Niz4 ze=K)JrLChBY9ps*3C0xHGo(ov&9j{GqSC4jr%ic zBwZy6E3=q*za+F4%S3NnHVKR-r}NC)?OeRpJy=8IGMsY%b~Pcd!dXArCbj*R+|XG* z@TF7lYutyrNyU4px_-v4Pzyf0gw|34{ym>~f80MGe0*n!rvix8TK;^-q2Z6~R>1z{ zfPs}W8nGDvDT-E#JSI86;#BscXQP7rl27%Z-K=Vl+rKdM_P)4mny$6T&V5#^;RkqU z$hq$_u}NV{($7nWRjrRYqi*f4+qG4gU_`yM|MD0*aA&hxn8Yp3a3qHz#@U(7wFVJ7%luH;Q^j`6a8ROGU_}U#Fx!F=w-J`);1~ zq{nkjbMn5YGK0_AK!q3_quKV{#~|G0t*F1*n)-CPxEK9x>o2x%bFkg}XqwtwFVFbp z_XB4hW*>Gr%&AtrtVwIxVSUG+St<-j7^MGoBuiOI5EJ1hvW>x71gO zYVe{D=UFu5V1-hCPWR(F7Z_4~d}R4mwjMnAD(AeTkL{qo7x?xm;UI*Rat^n~ETzDD znwewKM{AgYrq?@RR)R7*d(0;mnMA=#|CU|C+gM-ZT$Vd-{fxA@f4@sgvvJ43aNiaK z$m%}#BxjC(YW|uMkmif~iu@&HKS*HklmuX!7*76nqmzTNs%G|$%31ISvM%!s+OE$( zJs3+L$1iU5KO>X5x4QjXnC}lQ@@<={N-s<*Y^39Xn8L+s?JC8$8#mENjmru0mZ{h3 z_q{&zb@o0t@0>oS?YcMeo!HZ6@7%oOsM@c==?C+?%At`O5;do|>1k6F#*}X5O|Y^A zR8{Z4Y{JXim&qG+#b+RJ{=M6V2rQjuF^Qs*@BY+$scm^kdv6qbj_fy;uCVg(Vs!J)MX6Gv%3xLXkvgDkS?e4&q|ex(!^{A@TL2E znB6v)d*0r@iFWL+mn6$Os$I|75@yLxtQ)AWRh#89w8+%5PIb%?@#1OzKEqCFaQxc+ zsjr!EnRVH714~oxtRPJM9+S^X)(?lF+@`_2g~~!&dhs^|*s_LH?mR<@NqpVR)T+xi z$XPw2Shu-HlKsduhkc$5*UrJyga428>0#@U+LXY`!)_sk^eQ9bCW(026f%a;Sts>) zE-X2$2R!7~t4}wWNFhReG!a&8Pp9hg)tp#`lkzLSEZoNS{xvCFtKj2<7Xic7di9I` z-AeZlk<|*{G$MObW%ob%CFjHEPl6l{(n>Oxdx$>&p;0tj151uQ_e#jHUly!6K`=-QqzN$p*z+bc%j0*D1_kMa#|E9NsS17tC1@Ww~r3p-%)Ul`G6&k8u*rd|6JaYyng)TFifVz1q>!h}nI4 zm@UxoDqPC`oTKC!qZiugmL9KfKfedP{7z#es(Qvd(_weHlsF-xw>w;Ka1(nRw} zNu(~>5-!@Tr2)gtIBs*hLxVt^AeIEW?Sg>q5h-WVI&Av&jvkXV+?#kcpY<}>SU_w0 z?&s9-epWH#-_*wqM=lg&y5(VJgZ6?8&9LxU>*+PJg@bi+66zYQnAbz=d)m0r+f>x|oz46_L9sm#o9edE(lKos^Y4fh%i zEH0FKmnzPSSw60If03D2*v`>Dsg6B6 z&CyzNJh-p?F8QaX+l-hZwDdEy5fOO(fWy!te?a)>KW2iqiIiO zq*->@StDXUTGWf^*nMStGvB;YmlqDnT-)JQ*XQ=8ZhKyKQ~2f|ngtj(RTNHmVU+oF zL;uM->Jigzpc(ljSE$6@vJc>kol$H^I}BoCiifx=_mbCnwI2W$W~% zO6F^p*UythwMT4jQ&HHZ&mQ2kxHzV}aYr~mMa+lKj5iws49QK=BDMk8<*!ov8CaSe zHv5QJRUQ-doy)tnjSJ8T&=-U)^rP`wOZtb#MLD&0{nZ`I-I6FjJ=GRwo^1}Id1IHu zU-Ld@H(DqaLFyM!H*${hLUiG_5jed;`Rir0c!}^>#PB*t_zaPuaior@rvu{se@~Eh-cmD`B+euC zfMMB~4^VfNFqx*<-9}S7M2eZ!C5m5+`G!%@CCN$i2e8g`-=V3z-B~KxL zAD0Qh#sr9g-6=()bjh?A_kz=Z8@G(uYTnt!s!42mBx)#XwG6o%Agnlfy71*Mf(tumJSDpl)^o_ap7c1nd4uXmnTI00*0$E&@{SO(DgI&Hn*2IMi_x*l;-|u&J*I4p%CPgMhLJ%~`lxwttGb|ku6T!bwS@|P4ovO4IidM=Gdwslv zD`jD^!pp*JfO9}l;7hmVvq{ZZ#C=6pPSb+K^!4qHR?XErVTPTJ-KKdHR{d>8*Sy~8 z>4~;bX3LSIMPI6_7V9@&zg{qH>L zM5MWG@$$9TlW(nA_NHoGQ376LY1`gN_;xLwq(cQ_@XkbqWd>WF4tO|7}oiE_59lB z!lyf5N-7S^=nHST@R{k0tc54hw8N|WPkmd};6HcylY7vPXQ{mx;=^ob32T3S{n>qQ zzV<>y-;T*2)W1{z(Nk@;j|VzB^*60wX9YI-FKs*j`zz*&cZ~l`ZJ$&ds1B63x9NK0 zRu!78tIw@@D*BIbe@Z92`I2^e(zJl%%$df2tueIN4_1E{<9O2WNp{Sm}LBuTP(NzHZkYTfVgD#=Vg3zw@0)cn&)V%C4LPgF*ueW(SSeS^F(fO%l@qdgk#M?? zagbJH_8W>FtP&e zjtI*SQQ_&WRA&f8S;=QaB^;M z&%35o$w45q|13bg{kR2l+N;-Et8 zYK0PE)GAC(5Hv<9wLvI`CbM~;n*!U(xhW@$dOgmdLL!{Zu$c5RLXHhfETxp_01luB zI1j`7g<+MAbF&2^CGm-CFttXj!BuKZf$0?LVWa0+p8#r6Ld7w;LK)OZ8$*J00JW4< zsQ@4-2icGYA4`e6&&KnmdYKdyEO`#8&7h$eN~DaG$O2G|P?8uyVz`YUNCo(*XX7}D zjj-n#&QbBdtflsW(+4&^mlMGH6+zKJPZhAQ4BQRemU6*ng5h9WkQ6 zHK3xGP#z}>=Eq>cK9qC6Pz;2YqScH-gAjmAP)~LRqQ%rKq5@+^Yu9SE8kQQ3F7OV~ zPx;skC*Toq1qw9C6`VS_RcWK`{YzMB9{^lks?U z{om+{9DbQ%J>Ut*4_=kJHbgxFUb80JpUyEt52Ww*Pj+tvl1II{iv$RYX_1bQcW1}U z1j2C9WX=k|`bbC={KT{F)Gi=8XEJ8k3Y&Z0(Z^K7Gu~L77sp=?Nz{c>S7yxFdiqav z{qfkzmv^Ov_e~MoEY&sE_tf3D^Ons=Pu>q*0sow|sf}6t%EfwNR?oIwk3#T=%;w|8 zo#(3-7Bni|b1Q3X=KdZ{tm^Ma_eFhoe_3k2%DeRWe-wRuXwGfZd%LI?^V7m0&sOJ3 z`(oijd_?lC_it7`u*^NZxnV(PS)QwB@7_~bGz7VNUcTMh+SSR-j6kNmcqeb;PmkSg x-P){O|3lBV1N*PdiTleTEH*SFHnjiRS0Q^A+NoK(hDMMYWXj4n?$0cF{Xfm}H){X@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/newton_cradle.rsi/icon.png b/Resources/Textures/Objects/Fun/newton_cradle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..effd80ccccf566578b2b732992201015b7ac0edb GIT binary patch literal 602 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|OI} zr;B4qMcmt2{(VgWJjV)+I=4Sy(6ekwe0ffL$3v4m3pP&a!-_XvPGYX$R99VDY4qV& zyJE|k=U(@+e{Z#yYrCPwX{W%z1VsO*AMgwQ^|q{fW9+olMc%i!?e(4aeASPj16#jN ze*XC&XHLLy9&mnS;y1gpi*d8_URn9u{NN??W zuXhC&GvZrTtT_I7VV8bmY;^o7{@)OK8jf&g(gS+>+hUfG}{r+s@>~OQ#fBv;St&w)_g?{m4@B>+?eXvl0=Lx!&6Tda{15zW`%_(X@YmW}KJd zc#?fl{+#}iEk}26E~$@W+Pq~SM}ttzZu|Y)_LWTDzz>QqG$gJ3fmz0*