From c82ab6411ca1acd2ea6d0f3c79e56950b409d1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Ueti?= <52474532+Mirino97@users.noreply.github.com> Date: Wed, 22 Jun 2022 23:31:01 -0300 Subject: [PATCH] Removed duplicated audio file (#9048) --- Resources/Audio/Effects/hug.ogg | Bin 9123 -> 0 bytes Resources/Audio/Effects/licenses.txt | 2 -- .../Prototypes/Entities/Mobs/Player/dwarf.yml | 2 +- .../Prototypes/Entities/Mobs/Player/human.yml | 2 +- .../Entities/Mobs/Player/reptilian.yml | 2 +- .../Prototypes/Entities/Mobs/Player/skeleton.yml | 2 +- .../Prototypes/Entities/Mobs/Player/slime.yml | 2 +- .../Prototypes/Entities/Mobs/Player/vox.yml | 2 +- 8 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 Resources/Audio/Effects/hug.ogg diff --git a/Resources/Audio/Effects/hug.ogg b/Resources/Audio/Effects/hug.ogg deleted file mode 100644 index 934ec6350f56a82051419c443e7ef17d1b43d8f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9123 zcmaiY2Ut_h^7n=wnvog=F(54nN{|**q>2O(2pvSabfk-~fNNFxrEmXjL^67+`>UFgmCX z!f>K700;nVgwU)hSGCZ@)I6~p>8Teftq!TE^wg*hqwoEAWKQNAb;&Vi>?c6S9L zkWdxL=hH1vl;y)HUYvV}QMwxysw2Htka9_Jt@u&A;<{Mvuqu;e?Fdc>Gj3vE`JB$` zmhT{TCF}1BzOM%gnu{tOj{`!Lfx`YSx-i`bVs)Sv3J@SQfo2ki))S7tCwv31g!Hy0 z4A^B~oz^fk(lv%2e=E}f$H@Ty$$%j9^l;0DAoGTB%c*dy-EdoE#NXvx(EKi??5mD~ zf!yQRv_*8j;F0{d*nH}+h;l06Krsmlo-Bw?exy}+)wR+kv);L^-lMNtqOY2H{};%o zG?dwZT$hZ(|EF9vPjmd=i?VaKI8cUc+2zgGGC}b6-__&o>ZNIFFJ?*zE5L;v(gBtUJB6!Z;bRXndgnWtaebABnU^v5fP>VT(c+k4RmPubxG6MDStYoov^4LQExr}7cmrR>M zW6g&%mWvxXpjK3Brf6NG(E-1|VNr4=Yp@l&0F8*6$#iRkTS2Yw4p|=t;FP}qhL1Aj zH`^&>XZ9UbP&}O-hd`k~3cp_hYf3Jr8(qL37k>d)5~`2q5heQF+1DHeKp0{l#s8}I zp?rYig5+rNUa^{f={^ZcRo*_RxKY)PP-DhGD3*|gP#jmcoa0-Gz34`)o3J=ROvU5S z#Dj=}oQiTtRH5V950Z#F`!wTs1cWrbc+g&#QhUy`t|6z@D^CAWE=NN-t5I3UQDevP0LSTiN6V){=JkIE z%t6@9Px}8Oaws7ph>c&om`wAZ$jKFpf2$CGTq{|~JXz#Mnp0Fp$%CA=l6=PhiX7+Y zqV(vZyU{Cms_{*YfYk(ex353KTgSK0^P991@044T`2}3Ej^J zI-Yw48PrdM`=1T~fRxCry}yna;3dcLvg3G3W21BbbHqT@aT(oF8OX5r0N?@OIOOCo zM6^$$s^>W~2F$V$Z61~`?d93f#K5ytyRo9glo2hoWE%1`TDXwSelhFOh*nQQ zDpET-yMWC;ssb7W=%JS>Z#aFz8hklX1`h2vI=x5*kX8(dH1=X4e?vaGYe< zoxCSAAR}vFWZcJYJZ@w>%cW~vFRaV1tNX>sm|eq|(|9yZ*SOAONXBv6$as#+c)Z?m zmMhpa&42#1t~vBM0a5)Y(}JugJgn0HW~Ixq&q~gCvR>A}&)C4&(cH+`JiyU>*VuF- zNE@OW>P~YS8`m38fAug<3tI3qwlZ~`-ZeJo3bvdKU)Tv+KvFnQj{8GY+X+Y8r~dO| zE*UPa`NgFfVx^@erS%@Al@*rxtEKs+z12>omF2zFkIO3EHy~Z;7jvW@zWOzjdIO`U@Bs`_H9XEt*1lcvxT0vD^)>_Bhj0@v|3VF!BvM zbd9eO8dl@U3-xt=K5^bwA)e@z0nN0uBD1t?quTRCd-;Z{fpL)4J;!-@D|2qodHHzD z$+-N|^(OJY7my&#>&|O@&!qUQX5}D4c69|)kbUTcJEOITsRlW)Da8UlFl)U*u(Y+>6HS9K`l73mO_A7 zt>hN4s^W+R9NIWZlYR)uk4983mK3lVYL(PMtcV3%+Bi%-hovWGf)5%|z-Fn1?&L7^ zknGGj-id-(^-zTG%UDWJg;+fZO~&CW?j_^QW(BcI#<@#&T3G7T`6Dct_GeX5XX55s(Fq9`CL*?$b2#h=_uhJ-KA zSj1veN9-V0$@o}kgr$39VVWyM$iTlv8AALpy|TLgQBxXw@N517!l- zF_*H0P{LN_E`CtU1>w_=6^E<#V?|4RbX3u3<9-ze;krRA8r?C0We_HEX^TsCn7EEJ|5LLiG) z_(M=2cJy1gR@6=@GgO36NNWp2P`Fz0GTj2oU^k%&ZSJol!XS|zC?g+1amMsxojw(}4D>ek@cWR3QSC@8yL;6)|;$LcrtJP*5M5=tm)>;u!%D z_kuE_Dgy`KJ4w0Fnn?w2P}WQwmOd}_0=g5Gnv93UK`NE_FhjQMFrg4qEjCdQG~8ta z5D=_7E!1!o9cFHo0>lZsa@k1;#C6LVZa9eGHqZ#bYg&3xMa`=rCyIoN%Q);SK|n!f zjKxH7*hOPjveX#R9qCYxQ;4Lb9?&LB$vwpI77 zO*t6gAz$QD&?2CYgHT1mh(H+RhJ(Ja#DDi86ju(Q1p#X1;J;LT)qQ9&82+z$HmpgFs(|H zXsurRqry-$0(U!L9EpTbcF(}KEP4&Ca77Iw>%jpS2KWI;WPZhThvw6?6w4<6J**sxD4{W>p7>p%dWa@R{Q zil#IM-mE-Cw;t0ULw<&uI!X1bW+P7V(RY(K|c#&qQY{-HNuhWBPbDJmjT>H|UyA{$B&uy$S#mw{}!-sFXldP0q_&BBi zU_D{A+lv!iKu{Rqd8`y1-0dTEDYL|I!?FH-qZ#}6S9?fOJnqM+;6)b2$R;OK z7y)lu5vDM~qV39QdGq)O#lu3;8QU}Q_e9pNqxCW?>V3S>y@fmNB_uo9OLi@Zk!RxTXs>Cj5e{E6 zTYlNCKRh*I{pngcMLt9&{gSaU&aMqJ^05%p(Oz~CF9#;|Oa+N+6h+?jac ze%s{b1k_By(1IuGj@bp<0F{Je;QRPR^3vrbaHXlB;Q|lO7PvIYU2h;qopQx^@`jca zi41MygVV>ptmnQ~yML_qN^|zpGi9RIGuzK?MGlRnyfgx78v4b%RLVh)ha|YjYxEl- z?1_g=p0r0#Zy_!hRbCxj%6uT$-LTYqIX8TLVk(+9w)NBAQBPKRxDtH(dRrft?awo! zKsB_yH}9y^j(68)#~-Tq_d^Ur4MW0E#V1wxlqD86Lhc3!^0!$SalxNoSLIht@ILdg z+=g%2(>8be9dFZE=k|321l8qI9P@eSZ5`MatAVa7hm$GQiyvbO8sA^p&<>icIFMJZZck^*Szv45uyEAJtFsU<8j< z**iBQ%R#f= zY+*??YIMZ!8|XV8))}X=l-FeuwvLY&ES7v74R6&;`55!-KUtnjKGWOmnd2#675+zrO4PcCYf}j zb$O3uX6Vdy6cA4HoT-}=>99zDlxgwaYNvnhhuV^3A!c>-IS0u)N+n_kcnw9oQ7Jn1 zhK6+c3|ZvQS)e1BE0;DP_M2K|aiOjzJn5+Mr>aq`2dxiQE|J>O)2ue;Lm0R$)YYD} zL%WsNTPjV$WYiWAt*+hNuDb6X7P2AO@Lcob4u^58lwej~LV##b*I5JQp6o+Jq&|Pj zYm;DpH9;9eneNHR@2J?_R$JY`H`jsPux*RRVWsu3@`!*|XU?g}_ulGNh{g1s?-j?8 zU~p6OXfzG5x&Ah*RZ3C2?)U7^+CNb+(zDyV2C$u#U*COd-haL)=%Nk_CLP-K#DJ4? zXL30^)R$k~uFE9lPcO1!S#`%?)-A(ZoJk2H^&N8Q+HCXb_DoZWmMy~P|NQ(MZ6&tS zn8qLTX(2{mDIz<(Z<$6J^>A?_mJ1$ikgV|l^+WO`D?bq-`zbuZp!6-Aymcb{IU<@# z_*dDDT{eq>vKMn&YZ%~B6s=n}EyPdbwY;E^+X)8>Qtb8%z0mN#pOCN56AhH;$o;c0N0odVgAdPybmo@V+Zn()j7=UmM?Myfu`H zsKMo$MelmxSEj{d2N$1#tsGg53`lR1eCFomeT}8~eXQFCUDZ+vc=fi7vpMk09a`tJ zt4IZ#H=mpawtOz_x*BZIhlAWAvksq=MV7EC#gE;&H0rhvY!B|_Vx521!OqQ0Ma)zq z30KD-Cp*DBI$~x8=l!3U*nhrwhcnOs^&|#NncfNmKuIesH>{q(Y1UL>))4h%W}D5v z-v!zhx9V>%kb8BW-M_lq)%1qt?Iu&q-0xEEMV%_@xWOc#QD7=xWW@p3svWYbpf&k0xA3(QZOEw8Dr63$oMM%&^$dI<5{{rA3^oMoQ6 zXOWg{S#x(=FPALhaMl#o;t1X-yhMdNBSOB$-n+wLGg7ydEGGr{goXi_nn%iiY$>FU zG+iv2f7{O8NvyE;7CzJ8<7gs~P)z!0J zTcS{z*T@98t8zg}^v{k0teF=CIHHxrgc{h|c+|^aXPdia3J7mPw1n@auF!{0e@M3k z?ac8V2tsU!V_yZbC#hnw#dd4V?v+OJ&yD$;5KK}a%V_V z9vw^yDO})!Z|(GXrz1uLjK#JHX&!*VX2OzVNgE+u&6mcX_mxs+kR25va} z+2gmuZg;<7UyW_E*T7#F_MGl34LW&R#CjhCKxqEg_b1mGrK)akHBl512c%CQtBU=5 z%vNft6?M$cjrH2JZHhcnk@gFJpuRSrEjWgg3PNY!@<0*1HeIy_Spsy>p)G|9<%=LQ ztTrc;baT>0@hlBYndfDJ?+Y&(M7BV}l`^F=^EjQLS<|hIaMBxkk_N*qIGGOE;O$H=A`GHpzL0Q@3gLOE{96jeoogiZ`gPV;BJ?fv?m)@5Jvn?&BpZjlRWYOyujyrq2M z+0l9vw{;iJ`TN|?(8-OE4oi3l9R+2tZ*dSRMjM5g)oq+8 zbjbJju$Dp^F88yVHw22C1aua$mFY=l?k4y8nD$)UiAHjmLpYDS{?XFWt=VICT8lrd zNzQAQd8;qp(rE5bDVy?&1F|CR6^@U8XrwHBNi^h&d@i5`gYS2) z1|=zEC4Zlpe>bq8_Wh}Z(|Lzv9yxxG9eFuD7-{#og296MEshpP(NXr)(TjUzrswNx zxYxABZGovvPiw`#MlLr0_#L)fsp$DhC_?Bjg}Z_i4-F1meGvL>w8AfmeD`YC=C&1e z9ZN*eN#lWC-VVrGHk_4nCzSc-CyoE;Yl09S!Zt5ZmJQ6O+Irl;I=Fg~4*Ys$@aG9^ zm}ZhT*g3T@Y=@eW?0$%rDt1X21E-;Ohj?7#xh^6rf4gw*UMug%^EpqsHR<${1EkNT zoYXoGD>~nU{DhpN0(^XdR}}#1Po=O{n$#5&E}Oo2q_G120cVx)!`0UOjxF{c;_|dS z<|*x|yE)Rq#VVoMwO1WYPteH|qsVq=$)BhcPwSkpc_<>%eoRPOh$ORjA{iH}m-F3g z?3QsAkg>9)<|n+(rISe!;3P>lx4^)QyO5W!IMGz8e>pF4k^I*L=Hx~t?8i(&a{(`5 zOb?nlx6+G%FRMG7Y1&^``uB?c@y{j=k3}xF4qQQ_P1qHtsYov`tup$ZfxvQDXuChK z*}}CzJ+D4|o%Ix{Cq5_t)hzOAztvfBo}>52bry%etaW^G$ht6gwCZ$&WniyVa5z z8eyDZgn>e}p!JMx;{w6QZde%XF5zJ<;-(qP!4hM&O8LwXwrUup7z)aWh9@lb2BRLXVXklOkUax(9Yko}UM0asu0qiJ_I1~2Y_KN`-JM9> zr2SFZe8-$Uo>{zuGgP64`Sz+`ewXA+#|M`jd&?BK+GD=`5VpS9801o?b7`xHnk#Tl@9 zoRu(M!@4!W0!W`7sjEJNJtv75^!&g}t`?)fNkTrafAezv_5Sx$q)Qt#HbwH zt}QDx4|~~?PUutSXLc~6A;o|{9^!932sDHf(tvQD<%N^Zlkg)j&e$`V0oA#gRlxa# zESD-&wxc}kYwHJ#7Ct@J11>&%yqxg6Q)G!Ll^;sxd+fwGgs#6jbb zU9_@kkC0Fg(f)(bu2Jdv;}P_<=PDZBR<-ox8Z7A4_v7)V0xS8KfLiN&Y7@pYM=hN- zNZeG>-#D~pyx75CQ5@joA6Qi;`KJs3PnAg(p93yNMKTQtg3UN+UC=1A38^{)r+RT! zCOG;5eTbLCw}kT7YV)0NIe>J;ezn4p!l*&w%fWf;HO6B8KLhc<=?xz?bA4$m^e$X> ztP=qmX>Lu{-tPnhM}0o!DA^?Xe#bucZ9EAgo?f^yd`{-_uklCUd7q%hcfbr^Z=2Vs^Q18tATA`dHb@?}cN JE;zA({{x#GoVox2 diff --git a/Resources/Audio/Effects/licenses.txt b/Resources/Audio/Effects/licenses.txt index 9a49b6d509..ee7381179e 100644 --- a/Resources/Audio/Effects/licenses.txt +++ b/Resources/Audio/Effects/licenses.txt @@ -11,8 +11,6 @@ fire.ogg taken and edited from https://freesound.org/people/raremess/sounds/2225 holy.ogg taken from https://freesound.org/people/random_intruder/sounds/392172/ and edited -hug.ogg taken from /tg/station at https://github.com/tgstation/tgstation/blob/e6624ac8aed150668bb4e61c3a48372cc757bfd4/sound/weapons/thudswoosh.ogg - Under license: CC BY-SA 3.0 - internals.ogg taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/blob/f02a6e2c29b41c28b1cf4d8f897cb8f090f43552/sound/effects/internals.ogg - Under license: CC BY-SA 3.0. Edited by metalgearsloth to amplify the volume poster_broken.ogg taken from https://github.com/tgstation/tgstation/blob/2834383245d2129a106acef3afd17b81e1e64777/sound/items/poster_ripped.ogg diff --git a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml index da76761181..bee4dd5706 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml @@ -10,7 +10,7 @@ - type: InteractionPopup successChance: 1 interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/hug.ogg + interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: hugging-success-generic-others - type: Mind showExamineInfo: true diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 0f0b3d0693..56a3f81286 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -10,7 +10,7 @@ - type: InteractionPopup successChance: 1 interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/hug.ogg + interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: hugging-success-generic-others - type: Mind showExamineInfo: true diff --git a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml index c56ef5ba83..e34bec9573 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml @@ -10,7 +10,7 @@ - type: InteractionPopup successChance: 1 interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/hug.ogg + interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: hugging-success-generic-others - type: Mind showExamineInfo: true diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml index f6d140151c..d42b58035c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml @@ -6,7 +6,7 @@ - type: InteractionPopup successChance: 1 interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/hug.ogg + interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: hugging-success-generic-others - type: Mind showExamineInfo: true diff --git a/Resources/Prototypes/Entities/Mobs/Player/slime.yml b/Resources/Prototypes/Entities/Mobs/Player/slime.yml index f72f9b7b37..569d307048 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/slime.yml @@ -8,7 +8,7 @@ - type: InteractionPopup successChance: 1 interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/hug.ogg + interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: hugging-success-generic-others - type: Mind showExamineInfo: true diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml index ab9fbefd91..1206ba8e16 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/vox.yml @@ -9,7 +9,7 @@ - type: InteractionPopup successChance: 1 interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/hug.ogg + interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: hugging-success-generic-others - type: Mind showExamineInfo: true