From 1533e1b2b12f320e886d1e8ceab5802a4543470f Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 11 Mar 2023 19:26:01 +1100 Subject: [PATCH] Give BaseItem a landing sound (#14504) --- Content.Shared/Sound/SharedEmitSoundSystem.cs | 4 ++-- Content.Shared/Throwing/ThrowingSystem.cs | 6 +++--- Content.Shared/Throwing/ThrownItemSystem.cs | 10 +++++---- Resources/Audio/Effects/attributions.yml | 16 +++++++++++++++ Resources/Audio/Effects/drop.ogg | Bin 0 -> 12995 bytes Resources/Audio/Effects/licenses.txt | 19 ++++++------------ .../Prototypes/Entities/Objects/base_item.yml | 5 +++++ 7 files changed, 38 insertions(+), 22 deletions(-) create mode 100644 Resources/Audio/Effects/drop.ogg diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs index c50951f73e..c7bf5cf137 100644 --- a/Content.Shared/Sound/SharedEmitSoundSystem.cs +++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs @@ -98,12 +98,12 @@ namespace Content.Shared.Sound if (predict) { - _audioSystem.PlayPredicted(component.Sound, component.Owner, user, component.Sound.Params.AddVolume(-2f)); + _audioSystem.PlayPredicted(component.Sound, component.Owner, user); } else if (_netMan.IsServer) { // don't predict sounds that client couldn't have played already - _audioSystem.PlayPvs(component.Sound, component.Owner, component.Sound.Params.AddVolume(-2f)); + _audioSystem.PlayPvs(component.Sound, component.Owner); } } } diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs index 331c98feeb..1b7cfd7d6f 100644 --- a/Content.Shared/Throwing/ThrowingSystem.cs +++ b/Content.Shared/Throwing/ThrowingSystem.cs @@ -82,7 +82,7 @@ public sealed class ThrowingSystem : EntitySystem if (time < FlyTime) { - _thrownSystem.LandComponent(comp, physics); + _thrownSystem.LandComponent(uid, comp, physics); } else { @@ -93,7 +93,7 @@ public sealed class ThrowingSystem : EntitySystem if (physics.Deleted) return; - _thrownSystem.LandComponent(comp, physics); + _thrownSystem.LandComponent(uid, comp, physics); }); } @@ -104,7 +104,7 @@ public sealed class ThrowingSystem : EntitySystem _gravity.IsWeightless(user.Value, userPhysics)) { var msg = new ThrowPushbackAttemptEvent(); - RaiseLocalEvent(physics.Owner, msg); + RaiseLocalEvent(uid, msg); if (!msg.Cancelled) _physics.ApplyLinearImpulse(user.Value, -impulseVector * pushbackRatio, body: userPhysics); diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs index e497b2ec19..d2b4d2dd46 100644 --- a/Content.Shared/Throwing/ThrownItemSystem.cs +++ b/Content.Shared/Throwing/ThrownItemSystem.cs @@ -8,6 +8,7 @@ using Robust.Shared.GameStates; using Robust.Shared.Physics; using Robust.Shared.Physics.Dynamics; using System.Linq; +using Content.Shared.Sound.Components; using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Events; using Robust.Shared.Physics.Systems; @@ -117,16 +118,17 @@ namespace Content.Shared.Throwing EntityManager.RemoveComponent(uid); } - public void LandComponent(ThrownItemComponent thrownItem, PhysicsComponent physics) + public void LandComponent(EntityUid uid, ThrownItemComponent thrownItem, PhysicsComponent physics) { _physics.SetBodyStatus(physics, BodyStatus.OnGround); - if (thrownItem.Deleted || Deleted(thrownItem.Owner) || _containerSystem.IsEntityInContainer(thrownItem.Owner)) return; + if (thrownItem.Deleted || Deleted(uid) || _containerSystem.IsEntityInContainer(uid)) + return; - var landing = thrownItem.Owner; + var landing = uid; // Unfortunately we can't check for hands containers as they have specific names. - if (thrownItem.Owner.TryGetContainerMan(out var containerManager) && + if (uid.TryGetContainerMan(out var containerManager) && EntityManager.HasComponent(containerManager.Owner)) { EntityManager.RemoveComponent(landing, thrownItem); diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml index 66b0c39ac9..1c78430720 100644 --- a/Resources/Audio/Effects/attributions.yml +++ b/Resources/Audio/Effects/attributions.yml @@ -2,7 +2,23 @@ license: "CC-BY-NC-SA-3.0" copyright: "Amateur foley and audio editing by Bright0." source: "https://github.com/Bright0" + - files: ["teleport_arrival.ogg", "teleport_departure.ogg"] license: "CC-BY-SA-3.0" copyright: "tgstation" source: "https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7" + +- files: ["sadtrombone.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "sadtrombone.ogg taken from Citadel Station." + source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/35a1723e98a60f375df590ca572cc90f1bb80bd5" + +- files: ["box_deploy.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "box_deploy.ogg taken from Citadel Station." + source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/b604390f334343be80045d955705cf48ee056c61" + +- files: ["chime.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "chime.ogg taken from Citadel Station." + source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/b604390f334343be80045d955705cf48ee056c61" diff --git a/Resources/Audio/Effects/drop.ogg b/Resources/Audio/Effects/drop.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3f1d45c8e60664424bf1b23ebf503180e9558868 GIT binary patch literal 12995 zcmaia1z1$i_xD|vF6jmrrIwNo1q39QURb)j8$=LXI;2ZlT0lxtP!XlOTL~$VP#Q(> zz2Ns3&;Na&|9hX=dFI|TbI!~;pL6EixvODkrww2L|6IB}e;Zx``oAGe5MMV>O9!v3 zM-bp4z8hc%IT;;!Nsxyi51$Z^ARh$luQ<5u16>G!3wGdFg>|7v6Hx#_0s!VL zaN-nOWq3(y0mq|^RHds{7hiNnYIGNkRV;t^zbcrJH6;LG0%#7r_@WJE$6;|h8uob4 zd~pYLu@^9$7_DV-ypP9hR<5NDrB1HHa8_I*11td4rL+=rI0f>mvW#MmpaH8$2G3sR z7df8zoMrhT_yWDKP*s7g;uQ6}TV+M@cfWBojLH)5G>juu`KNTPs^4LoJoXwE-^}@^ z!ny zwvHMKynIabd~IfYeP(W+CcJ5cna%zNzQnw&48-7(#ZdQ1z+O@TnKZn zZMq{GS1{4yS}kahElmOL1H!+Ozz$IbYp|@*tivI3;;i-ja*FJU579c=>@DRP+1D0y z9;RIdZ3*ws?8?s^&GH&nCd?}N+j>NnjZ;-V4nCvZ%pvZkwE+7$jA!AL&*_6>4Mwvz z%33JER&;7Mdt-~vUw;3{j9!CcCm!sMMmoRZJq3omAhi&sFDhiW2e*-N}bu2&8NfH0D46#uKbhVow& z7bnMX_H)z^3Jh>xRh1pXceiUhNFEUKgDB<}22mW>xRK{oEw1EL(l~9%Rg#KCz)Svm z6lheKb)pP5?X{CcWO(+&Uw~fm--i3aGD6BY_FrXWpFxX^6)a-{JlcYiC>@lZuZzJm zpM~adlUbjonZTu)I5X;q{|T&rdkz3PP1vi2ouMe_J`3#UPpOQMz4pR(WRLR(T=*|L`39m=_r_ zFQQ^LqvAQD(;cF-Dq0Gi`>VHG|G(wmo}=i=0v6D7#L z&qP^QNqt=Y4Hm2daqNOlny?onf`sBkx4aW&*d<>li+2znE+aW8p7vLG8_N^Ylnb8Sq>p+QlT}A69A<*Q`WPGfl!;-Y6}Uje!ozz}Lp$6s0#E zr~*>8)#fNss3z3hu?s3aaK#&CqGvOAiZY-IGMWirISE{$x#B!CmeU>;J zvK$->%PO)sDk{n=np`TXtBeZ2RuoqB*V$E6SN7M{ysUQK2C3C$6?NPd72GfDD$gsp zx0}i;TC4i&YO||fZZ~}==-}RNb+4$dep$D3MQyFx?)KPj<$GKTA1HnKt+l+h)pfho zW3b7Ep{U|p8|T2s+Wxxl+pTvRe3-RRKA%%fR`tMjxR^c6Gdc~gbGi4v>bxIhFn%UJ z;>OSd4y$*i2cLBxa^1HOi!ZUu0%uxLm0j_2yUvxXqjFnT3l(URX0s$}VnFS>BpPot z6IWRAt(9}24HU%xsoRa=4IhKaf(S^+t*askwCX*@8*y6b_Bg-0dg4=5Lx|Ut0Ad4j zg$?q4=>ldh473;oz-Hd0&?e#Rf_al5zrl)i__3M2)Dc|_shS8!=F~~fZkSHIa&Jxw z8Nwc(I*!CCDA7bX6{JohonDnrTJFM%sSpl4spE!@<=vBpv7}Zc0-MFw!^(Ii4Oaw^ z)nTe-XuWK~j3rGnsZqA+shpJo6@6q6Y#!@DW8 zU3j{)Zg;~#R()5(uVt)fq=Kw6Lz5ARsl z&Otg0gR=rzB_o`9x($s~8+}L&39e^V)u`*_Sk(;*XDy*oLA+|Da&qP0phGxRT?sGm zqB4pHg=;$rmrgrg5sX|Ur?b2eRnwEmIFMlF@@^_C;QPN;Zt2L=J#ATaC7knBS~4hn zW8N@UJaya>WR;AJ1xFY;x0I$kf`lyO)5eW?FK6MCNyEx387klo;g!&GtP4gRG!&3V zeaP zECBdXQ1_6kYL2V*7%@aQULBE)eDQWfCcu+(HEC=OgwxhEm0yDr@;LaN~o z41|WWurCP+t8T*wh^j7qr)uVsY0FCC84$#c8(B^Wkl-}b0sx<|aDZAUy}SrJ4IZbE z_4OjqFi?%L{1FtEG5ni34{+gK8DNf6N^_NZfSc@9{t*ijz}s$+Ail|PRpofa|0gl| zPYdt=v50ao&mz?Yck6B%dfdNRxdPest(EgXNqWZL+yBbh|C7D{Z!IIIDiCu2T>;YX z@o|7ZIP|)TVsJVF?yEJD5QB+cM+P`!Y{sw%_}Ahv&^!eX5aJxHAWGnH5I&$sry3$M zy^u&w){^wA&@pL<-~oB#u$D|C9YHB~aZ4H|uSCttD8Wmn4WIIWE{6bbEn|fvkYJat zS<6cP;&CMCpEOpLpaU5?fm3(lfj3TD#x{cb2P4F^cz+YPYcPh9fvH?7$ocQHR5DP;b$XYIyh0?Xnk&LJRIgij z%vb8V?#%pm>{TuZLKJ!xg>QdlDeAxFEVS|ws%hVg0MLX0;4$mC4WI6Xb>)PmtAr(b zl34PRB4flAU)ds$gEX|GreW2mK{qy;NU`p-9lFk)pM+rKhL6$;fbv`L>%kJ&c9riLaYG105Y5 z!|hva4?Vnnyqr83Zruu?qorr0XJEW}%g@Q#!Oq^!+0DbrrIP}O=o_70FiU-`Hss{7 zZrNV&pSJ=5EP$b&P(KqLAhd=~S!sE(otI<}tV|kyTp2q0U2tl*eDNfy+e^UuSr9#4 zb|7G_o*(hD){WuMu`15oezDI%Dqh3QEd<8m44yZF)Oy7=(D~vI#pG1B=_iY$XSK`e zSg*Y&RUm-wT+T5a9iS7f8ZndC^M3H|n7j37g(!|fk@hrU7eqs<~Jt(aEv%^X#92cHZv zeRJP(qyQevKI>3=G`H=?@+yrMGTY-PTj~0w_+zqe01#%mDQ{p&I>XNrJe5h&?iX97 zNv3gIfne7iM@QjsF)IEov683m23C8X7&AAiyotTeWEDgQ@mb#gqQhq-xmfoLF?ttL zNq&c-TOGbp-?)J!1iUS`Z+&Qft*);uJ3xf)K-a8NFmv2;=u4rCx53dtPIZlTSyZQx zCAar~B50?pQgSFOqip@+l7K5jwOc>lHEp^}n+zGChLkZ5rtdfC7w_k0bu<;-Oj=@v z2+2y`cWHE6_lb)h?9U;}KN<6(=~A72{_gq4XERDuP?N}YlQ2K>nKX*z$t*_ccidmqy8zU$Z=r)~^)Pc(F4D$-ygaBWL%U?$Aj$-Sokg(LI#HBYu3&SC--I zx}_CTN6!CdJ!nuJMH4HjVI%cpV|91-&eCZw{D+$I&1tyBFn8u-2(HMFACkYOI=<$Q z7V$;htM`JAK6X)~$#qdXb4*~Ksqtb2sLG3%Ba}Ai)KSomz>#~a!K%QD`;n}EubkU3 z;i4$}5D|jzb)(xNzcFg&k)qvV)NOWUECQ9U8&5aBh)?u!bPL8j7!|z}@UNfd05vkV_+1zhqE~UkDtMnY^nyfpgOARXKufsT|C#}}W0AtSmj#c3Siu;MQ+1Op- zlh$dkSnfVv&$|BvNL61|wN4i>4Q3G@hC}wv6?k7pu6g|a=vciPcG-*rbzx&74Esrwu(o9xabK#(|S2=?C}SpHG9k z2)&_b0_@%~EbZo5vQ5tfk+gcem~Y#q(f5hWJ3S~S_UZIq><@kVQ&Q=%hx_8Cf>n0% zOW!k(*`<9i*0QSV`-)_NCtv8SG?PRge6pC~`W_*>!bCH;tob!1$Xfv)opV@d1`z_< z@T$H@Cs!}%2=l!?k}RKNi%U7C9~q{P_`ec-!@j&?vn(yUP@=kO;Iq z&W7Oqk4_q$jTh3G7zzN9*3Cr=xOtE#UtWm z0&MDr!NwC;0Os==8Vbk>7zilr9}qeu_NYSe-Sw4eww%&$9_!th7=m!~${b3Noo=>I z=m51(V<=I#wulJ!qc8Go3F#W`pQQ}q5(;8PeU!RU?okrjWe|Rr@R&$QM5gxD={_)B zP6hjD;#l?7M7XduC7MJSkWn(n2C&Q7`H^O{K`L`fC>D%9wqC&Bnje?2Gc(Z`>-;(uFo z>%Zi{%x}S$HmQY}_A?w;&8`8Zqpb>jZ_`~=42UV|pB1Ga=hiSyESk=ljqwv?Q%c=j z<~|T|dsW4kan~f*z`>Bhi~C{qy^TpOb40sizFb2uIRt9PE+glPH#++>Jc9SVS4=`x z;RAXCKYbhXonH&LBLH;0$doMrv}GRIVvmQ%?ND2;yQs2!gxndjI!OpNl%#KzgSejX4%&%#pqoFAo;$(wV8T~pC{vaYXH3VPF?nkGRLWPxX120A# ze#Ce6s86-~+Kac)rKO`km_7>LBpE@k39jF{i6DQmdWrT#DacT#B@xhc9DilV^GkJA zB;4rN{c(>bKF}1Z0<>0y-$;zKutM2*8V^zqAe1x7R&;G2tofY_!BQOBG3e!-^xsymMHSK)9=P(vV?fOb&P=6f-y&%N{ zXaKt`PT;b|_?HN^IJ!s&_cfjAf`BwieRyU40~hsseO@~+1^+LPW<}=}KQdc66(0iZ zbC@!%dEcJ>;Hy-a%`*B$9kb32eP_U0!i7+TVBIoP)R#t?MMq0a+Xwow+Jqv zUMQeM7eOTbj-gh6*t7Ufbc~ZLZQi>5jz`H` zg(qQ;)U+J@33rn9*7_*xRxq^p>1oVI9521%Nq~wWQ6fu0FQ09zu0x4AiWfOMCR!Fk zMZ|+gx596TZKgcSy#IYfmxF3|kTc-fD%HJ*6^Vqg8R;@FVK~$FGSlnS!bC8}PA3OD z-N^6!-*&wTrQ_wx0H=5cmZ@IKP0RGU2FtvXCLAWh*(aA>`+=X`IHxL3gt=R0V46*-N6>Wx4P+e z4+zOV!N<-fQQDZP zoDaSr#R?B>CSs8gsY1H8*9*+P=Y)w3pZQp)IqmRjlej$n7@}@=cS1-Z)Mm5ENDh{} z$p{nUL^t{DR`lu#C48kiFUw*q%}NG-HK*odoM3zn!hxQg1As7Dv=?UnlPwQbKu35W zpA7;;vMcVL6xJUn3^oXSaH8;^G-T%@$;cK`b-1iz5^?jzBbST(T$X*>sr-#QAW8pY zOvSfj!|%e+4}U*erwE_zv>UP>8pM*d`Il1k4++@!H#n*MPsJRiXA^0N*}(B``BEET`^aaUXP z_p35bHw#1AwuOj|y(O=ok7o=P{&Zy~`Y<(pz!H9$4Dn)s7>d>uT50Kj{H15iq;I|U zE*YB9-~%D7dDnqUCY>dgw+ieOw6mXtjs9{AtBA$UT6q)*!GbZK)XWq}3i7(H&Md72 z&J&8O=Oymf<)@{WqFKXya*^qT@LZZInbBX}#LSpX51%ha`(L=@(!?gKEQYlb2iaTi z1WTJfEOV}mn30;m0)GAe!d;lJEadx(Ai$mCyIw;-%Mg?6IgTxc_!rER`KRQoQiBx+ zMM;Jy-fVVDa|9Gr?+9P(bmW!o69pR*6_nOjM97z$=XIywsGak>F*>95Xq62B^7Lc3 z^5U@gX0(JuR_cjIa8P+!s}Qz{8^=G->8F)V=5r+L#YofVTokkbe<3TM7G^t40^9n! zyA3T2TeL^&V}ei(WHB<(3>VpVW}!oW`m2AGs@e6I#SE@srTE+I8a(OU`iVz?sb1Jw zSlnA%O%lS>cWKlBN&3J^3Y4aSi|sQ0y}VcR>q26zGl4V`Ea2=;3X>dtnB@lEQ0FG= zQT^UajFZHO? zE8ufMVem@JNU=PCc5M8{e#74E9iN8$oQ6wbw5^VL7oLo z{^Wsf2BiIQ883RJeqQE|kBgRMQPZ?m;kle$Hg*>wE zmvIl8Dr9{xhbNAU3*5~}E!_KsJ)JP-8e^QIJUO?_?pz2Eryo@>*EX1jSBc&ZlAZ9v}2L8>Mz7q6~`=M7~&Bcx{%Y%|UkA zUMR+R#;N|ON9Di|rf(0-QJ^ZhE#+-m_r7vwkVS0fjQ~_I9v9^-aaxkqq!Y?WDNRM$ z086JtT1n5fHk;)^M98YZjgs2*$p?4EWFq^$OlTOs+#$=m_XMXNqO|8bwur&(Wm8w=s*9s;FEb)f8ba1p%aIev%x)*T;(3p(O?n zbJPPY^nW+p8kB7|^U&3fTb-^@ykl^u$n8+E%2jH3JtFs=;Fv^{5KcRhsa~h&Q<^oO zNc?VdzdiB5M4*_T`R#LWV6O;!vG_%4U$)gDJqMITBpUsRLbX~cx6gn{D$bL|U zGWeg1m9bIrY2e{K&@LG%B-DV|fw2tn5Do0q(!? z6@2Y%|HcXC1Y44!fnWJyec4i2nCwI9pEO?3Qak&;o?2S&#$1LXSvzo`IiKs8jtfrtDvde3~9rYMoUAhmQ)OXuUi=mJju= z3P6YbHb(tQ{%%$5dY+{Bd$n zSO<~jH0Bri%$-}xaCVQDA{dc&qfy#=?m^AX7s?aHaD|D6dhQtBJvV>giT+my(26^c zrS#UK?D$y#MW>e#!jZrrT7WP8+pj(-_psV@S#+M6k7yKmml*oyHh2Wz%=vlz$bt}W z0;TE~@unp7?flZ?vopDmM2`kcElA&AL_PX0^1P}|@*%076r=ghtA&&`e7wYqKylD{ zWj{Oar85f<{uYUB}Sjn9EOqmi=D=Eb~g^xIq=sHV%QEW{^v}vqg?FH+D!>avAPE@=vb^ z+6n@?#+l(EVY>kezcOMZuLe&jzoKqdgRR|7sA{A_?LhSQy)L0=z}fQEe@Xo3#KaOg zXY+Y&AG@7=tuU0(=&HZbfEBF;DeYx9>Z>Z4W?>Ec9y#j*|E?uYLevyM#zUI>+im~{ z8(`8a{(siS z$oD1Cf`-)lYKqaJDXjwabq@VBS@m-}4g^czzortfZWb>bY-v4ojp5QMU6t%e4kEpu(PmqIMcd}M`w_PWh!jlPGw)#l?z8Wv zTnv=@gGMCh8FI>0eY_rYyjwT&yR3vUw^s@8Pc_skG+^2=mZ!g2pSG1TygPIjyp*B1 zwMq@*p$RoOR|A9O^C;$l`{lDI$!Y*9i0V8VV0h~uvh^Y4TT?qtLAnJ*eMAic{4j_M z4WlX0tB{~njvgwEdn4tK`psUq$GgV1A3!S5V$x!lDa+vc>Y49Iu4>;w5#KZQKY3q% z{zm_htkMwz@kA-P#8fQbf^Dr^O4go`$`O%_luMx3a|Ajmk8k=$DS8npk#TABpnHt( zMEu~E*->QM(*kxV37#w@I=w-_;OYA)jI+TRcuC&pQzdSpBg*nfyViTZLztBZOEEco zRkhP(OHO@}7gTU!F!5(s$clSstt3!?rVeyLm*UL14h}4+i3n3EyCzZ?ruUO&ZJQt* z6@X3CBxRx8-y%gYn5x>6~G)-Z~ z#@Gf0VkuP?U9!@55f~&aENdTEt3fGAw^qQteG~;hEt8sg!}D33qlEx^5&# z{KU@Zz?mH=5h^TxV&)uMA|noYOS!)$-Z91J$*g#>~iJ8Z8?jH~J0;+q~ zT1C$?fC~05vU~F=ol2Et2zpwomgsq4n~pdikSLP$Bj^AadsGyx=cQrw2@sv)QwP3u zmEZyH3*o^p$>^)JL-MGMh?Vjcb$5Q`8cwjaN@AhUFNW%|Iqg3y`$#!Hw7oeG;b5ML zqH6qZYB5yVw?WXR=e^VJ(z?f8o|Q(R2Bsxe1az9~V?pEO`Hc4;E5O{A1m^wa<{f~a zPT+^0AiNQs?dKcbP7k~R&T^YC{w0!>r*Xf@I(}`OS6hEdo(bDc{xV$dUi+M*Q?FD) zG8&=ZmmItS#uIDX>}}w6xUCG5lh!m~i9rdHNCmFP6Uegr*7~U8c)-TxT_pm2cLe=L>cQ~Z0+3V0EhS(_mg%xqU(oRAtB53 z_Rr;%V+iQw)|QISuQ!a#$vD*_oJJ0@fpMMm>ia(c^w*?wk@ZtGgQ5*}+(InC-v;zm z%{h~j9%#+lv)+fWL^nptqKv8|rpGzqZ3HHkSh@T7S*~vhjxaO@7(U{!{YJ{Mre+px zqR0(_OI-^8U@otrVq&&hFqk~j0HWl6A{(9`VagqGe&camo1y(;R2&R2NiBe1$fO>Y zJGfyF%$G@RT1Cb4zDE9{=w}+CHn#zA$ zONm1TGL~{$^a(*{dUr#kHl0hF%t#eWde^Qb2|=}+X8L{s_e=zMOc~zwU{|Cocu{}j-KgI)rg`Tn@)+YW<-16`S{7`UM-#CSN2iwIy9P0ZrYHjZAH1OR5!{sRpK;d$ zloy@5@ydj=(RJzt3HR3~3EyLSQ*wRga&8KG9bTlg5W-f<%ngCoNBf#K(_4lim3U=ig!UtsWl z&qav12w$|rYs3fxD7WJX7g;>++YP$AiB6#r)t1-&ShUV8uM{ply==?WaL_Ofd$sJH z$7Oi_lY7legvWTqU$Cbeu`!Yna$>X9e#50*4KPJjDv;ZnoR+RU->1zB_av+oikD$0VtSR~#T`n#wXr|(~+YnS^7DioiUp7h?Uk@MW9;$aEgXE7N^Wff)4 zRCw5VWxJl74NuFBSh577)-XZdNNt1nu1K>YVTl>WyT~Og{PQ~^3D|dVP8;40S}2#3 zpQ#bFXol zg<#%F8*yPrf)-@K#qF3X=-co7Xw?LdxBG87b@BR!d8)#eb?9#@;V$cuvJRWBBEEj)?|k=VP)5 znH$=+TD-#eI^Fy=i$wzdh>lkR09iBKj<{%5eiyg&!`K%;3|frQ<}ayZ?3Rwge+Bkwt z-8j7_=|@YnL-&ucX9>+JD`tK6N#gIFGS|`Wcf#B5D)*fF zJ!!6htK+G`MYS{4bsq^_4jHmNXk;XL(3-RMee*{oQ&CLWLYLo-d&|s_Ae6-I;%?v1 z`jZQ?=R_lF{3I2a(32)TTV)!tw)LCO9-)?M#(IX08-ooOJbfQVN}V_yWRc?E*ZrMH z9QbB9`2OAphWywOtb;m*yOp?wr9R(QdUDmODA^c6&XU$~+jl3QW4(#k^k?MIfG>|v zJgHthKMbgd_u)RA>k%4xKa`RA^u*_J{=i(IFH74vvspmT(Ro91O?-W;JnX;%Z$Tt< zl8s?4>ARoc>FW%h23-n{FWuryC}S3D*Su}b9($tG<9SS(5?Zkfv1HFnOVe}3u9m=b zhYCvG0+sgLQ!zhu@96XlWRd@#l%^DN)1;rAFqOQYlxw=;ux=|m8PBeyP$pLB37aT= zBPV$8QpZ@xe0{{n-j80{?)4qD{NE(do4h7X0ZF`2e>+S2O=JaBIHHJilu$H7&jf=) zJC0Ogc8%hKWlO%}Zr$uY@!*(w*Y9e{2b_0|)(&45ve}hu-m#&6p$IUcBnUqYo^ETp ztk*u0C%;+KoRA|uoWo}=Jzx&o+=^VLu}Eg`eH=NG*`9$^b%w-i@c$IHy3 zlarNiz44*a!8LQTes35nG~e$=5%Zm3F83bv`ZNNQgB#p)!RzWY;_8nQCbFY5I0kyA zNNqKUDQF1Tc+lq*f4b)@Eh1$7GgPn7eT6=?%q2hC6ByAP=k!6VNOTY+PZ}QeyILkN z?fBvJL%;H*T&`{QP*s=qR%p8Yb6!7KjdbOP*_d zQ<0Xp>}-bq8G%s+S{g)Q4N={YqOWcUdx}`~Im{-lcuy z1*hawUckeBq^n3X~uWkiSjGZJBC#_yG!t%yb7Cw-addb;*~{k(E_x~Wjaj8!5jsJ%#Knw*aQIds403$zti0&) zp7^*))18tB6-2#(z{UPj!J_(U z7Im^IWV=?(cQdCs%ZKrynCRv`oW~r{Et$ALmfL-SRs*{w{1gz1__WyAN_vPf2J!y^ DXOPB- literal 0 HcmV?d00001 diff --git a/Resources/Audio/Effects/licenses.txt b/Resources/Audio/Effects/licenses.txt index 93e2815927..95d0d98f70 100644 --- a/Resources/Audio/Effects/licenses.txt +++ b/Resources/Audio/Effects/licenses.txt @@ -32,11 +32,6 @@ bite.ogg take from https://github.com/tgstation/tgstation/commit/d4f678a1772007f bone_rattle.ogg licensed under CC0 1.0 and taken from spookymodem at https://freesound.org/people/spookymodem/sounds/202102/ -- files: ["sadtrombone.ogg"] - license: "CC-BY-NC-SA-3.0" - copyright: "sadtrombone.ogg taken from Citadel Station." - source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/35a1723e98a60f375df590ca572cc90f1bb80bd5" - The following sounds are taken from TGstation github (licensed under CC by 3.0): demon_attack1.ogg: taken at https://github.com/tgstation/tgstation/commit/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0 @@ -49,12 +44,10 @@ pop.ogg licensed under CC0 1.0 by mirrorcult box_deploy.ogg and chime.ogg taken from Citadel Station at commit: https://github.com/Citadel-Station-13/Citadel-Station-13/commit/b604390f334343be80045d955705cf48ee056c61 -- files: ["box_deploy.ogg"] - license: "CC-BY-NC-SA-3.0" - copyright: "box_deploy.ogg taken from Citadel Station." - source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/b604390f334343be80045d955705cf48ee056c61" -- files: ["chime.ogg"] - license: "CC-BY-NC-SA-3.0" - copyright: "chime.ogg taken from Citadel Station." - source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/b604390f334343be80045d955705cf48ee056c61" \ No newline at end of file + - files: + - "drop.ogg" + license: "Royalty free" + copyright: "Sonniss.com - GDC 2016 - Game Audio Bundle - Levan Nadashvili - Soldier Footsteps - FS Concrete Soldier Crouch N02, mixed from stereo to mono" + +# Do not add to this list, I only did the above because yaml scheme validator doesn't like custom licenses. diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml index 00d5171cfb..f9b171a7eb 100644 --- a/Resources/Prototypes/Entities/Objects/base_item.yml +++ b/Resources/Prototypes/Entities/Objects/base_item.yml @@ -10,6 +10,11 @@ - type: Clickable - type: InteractionOutline - type: MovedByPressure + - type: EmitSoundOnLand + sound: + path: /Audio/Effects/drop.ogg + params: + volume: 2 - type: DamageOnHighSpeedImpact damage: types: -- 2.52.0