From 45030b22a35f6b61ab5e755f8e34fab08d842515 Mon Sep 17 00:00:00 2001 From: Swept Date: Thu, 19 Aug 2021 21:22:23 -0700 Subject: [PATCH] Adds the ability to assign equip sounds in ClothingComponent (#4485) * Initial * Works (Kinda) * Polish * Reviews --- .../Clothing/Components/ClothingComponent.cs | 13 ++++++++++++- .../Inventory/Components/InventoryComponent.cs | 8 ++------ Resources/Audio/Items/belt_equip.ogg | Bin 0 -> 15225 bytes Resources/Audio/Items/jumpsuit_equip.ogg | Bin 0 -> 7783 bytes .../Prototypes/Entities/Clothing/Belt/base.yml | 2 ++ .../Entities/Clothing/Uniforms/base.yml | 4 ++++ 6 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 Resources/Audio/Items/belt_equip.ogg create mode 100644 Resources/Audio/Items/jumpsuit_equip.ogg diff --git a/Content.Server/Clothing/Components/ClothingComponent.cs b/Content.Server/Clothing/Components/ClothingComponent.cs index 7e29bfd9bf..9785d3177d 100644 --- a/Content.Server/Clothing/Components/ClothingComponent.cs +++ b/Content.Server/Clothing/Components/ClothingComponent.cs @@ -5,8 +5,11 @@ using Content.Shared.Clothing; using Content.Shared.Interaction; using Content.Shared.Item; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; +using Robust.Shared.Player; using Robust.Shared.Players; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; @@ -32,6 +35,9 @@ namespace Content.Server.Clothing.Components [DataField("HeatResistance")] private int _heatResistance = 323; + [DataField("EquipSound")] + public SoundSpecifier? EquipSound { get; set; } = default!; + [ViewVariables(VVAccess.ReadWrite)] public int HeatResistance => _heatResistance; @@ -91,7 +97,7 @@ namespace Content.Server.Clothing.Components return false; } - private bool TryEquip(InventoryComponent inv, Slots slot, IEntity user) + public bool TryEquip(InventoryComponent inv, Slots slot, IEntity user) { if (!inv.Equip(slot, this, true, out var reason)) { @@ -101,6 +107,11 @@ namespace Content.Server.Clothing.Components return false; } + if (EquipSound != null) + { + SoundSystem.Play(Filter.Pvs(Owner), EquipSound.GetSound(), Owner, AudioParams.Default.WithVolume(-2f)); + } + return true; } } diff --git a/Content.Server/Inventory/Components/InventoryComponent.cs b/Content.Server/Inventory/Components/InventoryComponent.cs index 8f1d0d7ad1..d70ba8be4e 100644 --- a/Content.Server/Inventory/Components/InventoryComponent.cs +++ b/Content.Server/Inventory/Components/InventoryComponent.cs @@ -520,14 +520,10 @@ namespace Content.Server.Inventory.Components var hands = Owner.GetComponent(); var activeHand = hands.ActiveHand; var activeItem = hands.GetActiveHand; - if (activeHand != null && activeItem != null && activeItem.Owner.TryGetComponent(out ItemComponent? clothing)) + if (activeHand != null && activeItem != null && activeItem.Owner.TryGetComponent(out ClothingComponent? clothing)) { hands.TryDropNoInteraction(); - if (!Equip(msg.Inventoryslot, clothing, true, out var reason)) - { - hands.PutInHand(clothing); - Owner.PopupMessageCursor(reason); - } + clothing.TryEquip(this, msg.Inventoryslot, Owner); } break; diff --git a/Resources/Audio/Items/belt_equip.ogg b/Resources/Audio/Items/belt_equip.ogg new file mode 100644 index 0000000000000000000000000000000000000000..0ef67a3fd6c67f3d8dacd25906afd067dd640171 GIT binary patch literal 15225 zcmb8VbzD}#*DpE`Jal&mNK1D}Bhn$=-Q6GvA`b`%NOyO)A|)xUbR((KAgFY6AN2RW z=RNn2d(PdT+4EU@&CHrTGwZu%O{m)1Y61lCpXb4|e?&o%*Eoa<^4!(K!rt?q1(B}$ zm-1T`@|S3asNR?S@8`bceM+KxgCLH`-T!>z5&y|yg(vITyV-H5de~As*<0xRl}@cd z&BMjb!^OkJOU|*ccVeM({;>CO~8iMq%D5KO<9SA@L07k1!+6xo78Um85P+k zo;o?pz&#Zj!IeZ7Dwe!put$@)B(*EHMTLr`j|AY|B8f^9LZ~566Z&5fb8(tQBy&lc z#TVvM3eREg0qWP-!rMiOYEo#-MQVyH8BNiFMA0z<{;?^(5dsx;K9#Bei=asu^jBZt4WY@lNpXOo^2V9}?G_kZ zENMRKQ_O!g!83&CuTy7?XB>?PVP|aQl@n%8eTvY^eAH5&mgzYvw3X#FO175eIm-Mc zy)Q3)Ji~KT0W+icAN2x16Q#O*63!#r%EIm^Gl%E1pUglh|EdQst3RHxS=K@bry`Ov zA2qaS{gd}ssOM<8N!I8mq3`e#5eu1)EojDY>cT4PUn5}Lh_Eq4YLNU z#c%~@F8+ro_@Gi-#XUhL`-_jTG!Hl`@`BO-=fM4@AH$=Z_#a{H4+UJA|LOBzW!Bbx z?yR5cz1S3LJny|a7qB`PZAubmt)KG0g?~+lw*=h7=`S3UETXsvvR*%vLi;zs|3QwN zJK;b)#pif>rT6qIlWZf0e5yx$69h7FbOq}WGfRJ0U0eW}^|_9?2W8RIt+MLX#J6PGvq1x7L*^hI>Kbhtab(_{cH+;)<_rg%C`vz1l!Ok+K( za8lhN%QHz>k+PW3@k>LYmW5J-z^D-XGfLx2!-oZR#fB1c47f3HgTHmS=vexAKpFyY zQE7_fG~}5#vplewi?b|8X-bkjzX)w)y`EGk&+?oUVvg6i|MVDD*vZlw6=Kc~fzMRQ_B{LWvsv=>j6r&3hrW}MZvy$u_k&3&C0&%~xaz(1Xry^IZgoWGt~8_q?` z{S~DP7v-&@JL9bB?QBdSGe@MYn<6ulY^|H(ZJKPoJSRQjEi;p3tnO`Xm~6cI+*I`aKcQtjrR@!`cX9S! zlx~AHobxr=c~#f=>nXpwm+^$QwZ50OzK-?RGh_WzZ*}be!({9G)HCN*lCZC{0pGoh zjqfGv=${5G&LwZmdVfDxo@#_Q(0j@|VD;47Hr?C!TxRYhKszPCvccN)Jao1Es{c<^ zMa5plK6)q1P(NpNXOj2gx%0B^Qb+8cwd?+P$Hi{$y++TajvBVkBi>imdVVGL zizR!PA9p@>aPEENUh1eN)Sj8sHWUb(Ne*2jezi6q@cpsue^+EaAF%5C%G@_+t}*)i zX}}k!J=upZa}S3|C|A#rb0gDuK2zMxf?GFu!Yt2LnHRRkE;W2QcX(GsXt|MFqq-E*&ZiCozG(U-0iRB$U!I^u5)N)wpzVfVpmCwTeMF*~+ za8W``<#18V%zeW`3UE=v+f48h%Itl_iV@XtQOxCia8c}idQTPDQ<5y$nfvA~hFkhl z3{mnM;uNFcziSvJ)HLgWRotuhukxsdQ_}m&NtIam;U%2;PZunzgc?#D9o}scTaGns z%sP&?m(DtyEIC8@&rs85!%PQ_!gQp7R4WyP){Bs5x@GS7ww45bqyyfmU zay)2BowcZH*o1p0VhzNW)%;sap1k_A^L{4IMQ<%ir$ zxu@>y{Y$YF69VA&4L&8BL9?y2^h2Ttit4_*^nd9W+c_QDFGV?*E*tPSikH-ACec@w_uI~VO%NPVBFpx0A0T86Plpt zpRh+u-=NtA8Yq9)XmEpx1Hb?>F5U!%+?xRu`S3wh1qHYV1$XB`7YgVyN06508<_b1 z2ZB$_Bc*}=H|aitLjQUF_v=C^^xr~HQubf+{X*}ak0H%PDn?C5%gV;d$vypuiSZEw z4F?D3XL<%kMn*a|Hg2A-nv(ox8hUzq7Is!{UIAt%dR7je{`&fl^o$HF9Gp#BG+()% zb+~eOKBGnj(keO53)=5WTF_MAPD(T~ESBQ45oN-T(Yz3G5rAS>J?-nu=j#vpiMxZ8 zUWHM#8I$lz5}>o;rCw}%v=Rj_veQ6;mzd+ZmDBI4tnEs^8wN`azvc!A1?5>(L}iyV zAO?9QNCi#2Xn&&0E>Edb`Mk=O-=$tGztq4JBo*v@bNEV&IncsH8ftactc#6{)FtL& zYH5hkR}Y;D;FE&ij3j2c9mMna`a?D?e#jA|UfSb)(pN9Bv{`jd`f zO%>nf?mwuo)j zBoq2$Sjk&4wHS(y>|sN(IsRyhZ#H$WVs<9^TG#z~X-r{Mt(Z5@`UzYcB5?_r)OIqnq9F z31-=hXf#!I+K+a(piksg&aWwL#syruqq0JRwgLVk@&Jr+2-g^H#n``5@($^;GZWlA zk0SiqNF!mwTeH~p3`bW9k^VxQpFZ0ViC1uj0)qwtIJaYzyC0xmIEKD2uuo~ZrG)(G zvqT1>kX7>c*+-eGh;aZ+L(dH?-;o<}<+>NlJf8dBZ-O_=i7J2GeF|RUommx}=m}pO z)LI0=4K~49?x;zJM8A@@b966$V^-q4SdlZL^o@(~q~>+>0+u8-$b)VlwAIG3y+yZv z<&tKVox0w#)W~9*CY2w;zvi+Isju^i`?D`4D>|$B8Jd-EZ6_RLhA~# z2+LK^Nt^F_j!@9Tw|t>;|wkqpuan?t?qY4;tlR> z^3JW-FDZjwEV7HyOTVn?n4pa8Wp~vN7f%LTu1@r2L7C&AOZT?>uB`#mI+{4gIm3yS zvBWx2vlkwyC@r0~05oit;=YJsvAhV^F~q;QN^D&s7pizT8W^}--(rn{wM{p`f%f!0 z4{xA4li z&D7pp9DFP3=TN!iexRQbJ-uZXy6a{L9?ZZ%6`Bb1jZ=}$Di5riNFGQk+tQX4Xu=W| zWZukHhUWI*HOCj+QWjmD29$}PZeYPa0WgEqM)81G?=)Uh@IWWH*g&5C+l$5v2U(IL zq%-==>Piw-L~3!6Hwo*{DWWk?njPK6Yf%%pgSwL-^qZci{k-|e)}7JavYJIs3IS78 zrmen-J&9+Rxmp_|+z27l*y`XXk(t8n;6`oAL6sa!wk1bn!Di;VXHu7T58q>U9xFlzU|@?W zN+ICS=&P^!i8CEp3S73_=B)i)%p#~TM?k8#!qDO6?M9_G5$&nk4FYV1I`gOAuepw;GJDw!7N3go`@;2*1N6lIus;nTvnI@!m#(=XaITxVYxky-1bb!naJo8A8>Fff^v!H7a=G{akbBCaQM?NnzPAegk32R3Uc*eKH)F+e)PzGFQuNrsY zmH4c^#ZiBT!cNWkB-0p4#Yq|mS4omAwS^7Gd1;i4HC8}&cKW%Z%3g*RsnUBFA$^2y z13FK`r4)P>h*dY64Q+W`^u{BkiS9;iY6q=qC)p3w)uElL^jsAm#V=RI<_J(b{V3a$ z6MnPtJ`{feVI+MMc?+JW45xfBzs-E0fSDDtcXNH?{?nxW$TQ^WoF%W!kczs3OQK#* zD0kgbz^oE0n}5~TU6r`$$3Gg*R5ty++6PpJP46^ZRWYB%ldp>WC|t%}$<^r#aXV=w z%J(ebo&S|qTWi|yVDC?my71V2YD!2`GkKQ%;#Gtpdf$hMriaDa%Dz&hCf7vo$?@9lT?lW@jB1S!s{kg!S9kbnL)sQdN__4u2sh@NKFibR^f?-94`7w zY{*MO0b7n-rA~=`NmEAx87dV@LuG%zUKEy!C&Ggu7r+SeKyUvci$&u%dkJj)e)8F7 z=!paC(|LbHC$xbqbCssqTT}TE01L<}#MzLtB&*`56WUEi03aJ%=t>ghn z12Fu!)yEs*)I{I+JvzScn-C7k{if3(pl3shB6?tFl#6gkb@mCL47iP)yjwTex2bO( zAW}YF*K;fQ{^syZpL~0t48;rS%*uYHQ2lf!R%H+stb2wnSX|5U$rjID)0E9rf8~4T zgwNg7H9K7B5eccf5T;A-n=YxYGeZRIBRMx!qH`^&B8zlXAJ2Q3P|r z35JbbeK0NfG1LP0o=Rc)WoD|d!SEAknnI~%0$C0qc+Xc%)t4X3=B!b-IjiP={{mgo zcYW|LxOJuSj!8ltP0R-I=r0FuO|iK0Z77= zBZ?wDO~0Hg4C=*eh9Du-y$h5lp?*S3oR{&i)ZawQ5zlICPz@Aa2vg!#<6*%b%)=nR zp?MS4NzS<=REJsODZc3@E7HE$6}%K5)6s@++K`k7UVmM89GP?jniERG7&5W3=$8+v zaKbO@7RO&NJY}Sil0&%J#&WH8odGFSOd9Y#)rZGc7Zq~Z0aZ!Hy|32idwNV8@l)E9 z5ea2SLM=LE6pjKGIP`cRZL>8Utg2(Dr~9`v8h(L=>S-eFzaF}xRZYJ_(PL%zPWWmG^SA7QfX&mLrI9-1v0lbxHFADDmWA_0+sXs`TIr|xlkhjA zLW8~{&uqE4CtlJM?P>dXv0U!I?L!*k508_5{-Q9lyJU=Mw<84Qq!=?i=1INW48HZ$ zQo|ouS23-+mhfRh4$rH8X{|-7x3!U~vv~11l7hu*<=J)^z{D;jA^iKBqT2My^_^!3 z1MwgC>IU5DgYC+UthMO~$jTTLv-b{kh1oANhe zh8l@bWf0G;lZm4WNw7@_=AgITGtreFc)cCU^QRb7V67%%T&%&NHx=O{WVePkcpzGw z`gXI$b%H=UU`XtlITr#Ct#q=8bW5~Y?Hm$QX7p|1N8{G7(Th13oBEBrLS~;JR8a`9 z+xM1)F(2|J5vkJX)0wnx1qIQGSkByM(}#mHKXc=PYG@DQDUubjDj_TX))hEKbFrLVtShv0L!T9>^r#x-TOOM^~N-tx(cG(G;7^2=Xc) zvLQRgYA)9hlKztHU%x5gf~A&*`}L|q&G}7(>`K&kw%I3dQFw7_l2Cluhl+N&YrnNW zN>3JYO%n6#a4grUCl!;aR-Clf} z;@ayQ9^cztp!>_gQ%fPJH{tqZg||>{C#g;Mgmc8yMEQcT;TaZ7ssm*m6QKkn@m_DE zK4EZVw`Aldf1zo@potf0i85PEz)u>&)S?MLrl+n9-%iA)yBC2oJ~ND{fB zu1|F#j-GIJuT>oJUNPj$oq(a`3q}8#QVfvLeK?TL6sqfH~|%6;EeUAQB#5uH&^OAJ>^j9daK09&*Q z(cVS>?&4`Xuq`9GsN+!V{<;!~Qs&0(^E3wMil#zG0POng<0l(2hk}e>a@Fe^7k}Ju z&w36U*L8`W08!@7oenaB$GO`=c1v};P(<*2q2pH|hP9Ba=331zD>cFYQBfa=9fRI2tK=9WYK#@{_GDWBuspX6uFupJ2Kf~GB;co&XZW$ zQ^gcC?WULcjG$Si%81@Rs9nlM<;i@a*uf7r9OB~6aDxv&$CBc({clO&^_Cds+e=S}S_%Ght{wZowmabaH6Vuit%PuSX#qV0Ee#zT zI}Zof$Y@VxWh*@!D=RD8BPJ$BCI&7}9$ucI#%g+cI(T4U$F0f|53u`RKI_6RuO5LCm>I%o?BMiVYc_7 zh1`_IZS%LHd})A5l~lfB%2vf6TwCto^e`!RSjb_j;ge5IiJAw-6H%$*S zuqksos_ebEV;9994TbbRYjJb3>2$Uq^3;QSYn|1@<-sCWyGs26U0E84%|`sOS&!2F zQ;DZ1#yCs1S-!AVR0x`6{0ihshPE+uKG`HveoRSC2SYMjp6*Fr@MR=PG3ar{5saz`pI{9NuNqKbp=a2BkZVxv{!LS^X4~c;sC061BCVC)%za5_sfj0 zaorInVB{&>omUbWK2!2#4rI`ryjaQ4H5LtXa6H4sVHlV&XxOB7AKj9{sBZVcGC#v0sFRF z?JC~%Oh-vSd}S!{xcB8|^PU-wq|Xum2&Fd_kM@-A(Exs|-Ay_p_$b?g3A;qXMprw( z=7DdROmO|V{V6Q`SP4+sViswbE&h(vme#+`9xs0){s4g-O}o%XGuptMu(&*vue8uw z>_`0OuREv1gMl}(y%iYyY%!iTR0ox);+a>&q(_Y{L3g}S1GK?U6)ZnBGj5kWG}(&Y zA8&~HJsw+1nDfxdfp^8>Vn1&t11}g_fJ3PIr$Ks!lmD3)<`zX;y6l#|?d;Wrfeq!z zwh^_w)9%LST8VS63XXy<_V=IP`p%*QI~hbXT#oPAY4|KoS{j2DM#-1tSjrDBE;|(Y zeZF(g>8-un2xn~{2f)N;n7m-?)u-Ty0FnMWh=|;QQxODCQi?$DKNOe%&>qjuqZD$k)9K=`$dsQOE zF~w&2JFhNp*mnebg17>$<%(Rv zs}yNG&h)#1-}oDcs5PSyzal>kDM{G^rx;HdH#RkrXgu?`)yM18@~xYEs~QTaPO*q2 z*Kd(Dcw*02xCOy#(iNTFAksHAqrv0i@ty0`oFgRu53--?L)E2Cm6}oM^D&jGH76Ws z+$-|u{@_t1A*!zN*spEj!ziPQQT3+jC zF>)4)sj&@t){8P>ORg^5+hk}mhvgkJD(UOxRJrL+_nWMdWAC)?&*Lv^b1lbnV+X=diPxK6_+1R+Nut--hwjy$J=+m% zVn~&FDtOV%@7-G@UislMmE~sz%&ENTbITj?_Obko1YdKaImjS3k;^wOx_?LwCx-8Iz*6geF&GR@?7F+#gUNl0d)5uh_)iP^!gbe3m#YZqC zRiFS@(##IxrjB!s>!V-Puyo1NXgi-v5h2g4ao{=RWE$71cMSQv0hyydbVnEz?xOBmZ1#WMHO}KyqaMXt;;2 zYU~)L#AWU|GVdu~eJjZ&w6@ zi0j{^h_K5TV8oq!nMzqbmFvetTxk=84oKH(P8^=C?D<7f^}LeGiR5XIPk!#E2&RQ0 zMnr*;-)vdzu6F6VY0<%W%CECf^s0!i$NWo~d>9`~BENyMWk*D5v|Rb_+idKg+H3RB z5j2n%Pck#4#Q5HyP8*eVE!X#;G%^Z7y$tSuo>_hB__Xgv4#NhLXy^66YgW3cv(fZC zEtq$?F5(osL<9&mXrUoUt!$GXv@(KJqDyH%x~$ z93v?YUt^Ob>w4o_o|-#w%`t;Et~FhdkHMI4Ub%|G=ZdK?2HIOzv$SJCF zvQ}qFH$hgl)xzqs`gB)5!l*gsx7xhJ_f1C9lP@YBQdNeUhzDz zgyablE2j~nl8xiTfSYXy9j=RZFneq~!)5l|H2#2bmCzkWew9MdIhWI$JnA zlb^=c>S;qUTx85aOEl4y8Lyy6ms@Oj<8-;hC|0y&vgN<0jRmJDuUK6_8w7v&D6A&l zFzbN2>JOvN>^2v6n2h;z-poM>T$AfQ#}J3guEo*q?dw#>)n0Na14-fU5JEDszzI?4 z`48Sy>56ms9R){uuCRdy!qlOcCZ8D37p~w3%a~;8yN|8x3`l;Hp&?)bGpA>-r715N zOB@ehIevJ{msx@0_X3khq<@0|*=-PNZgvumC{a%WVN&N7%34xOd2a_oA z*p3JKGqj#tSP}^eSeEF}ZBYe_C+o-B5{=5;baqq_Fo{?Lbt!2p@af*#p;1Tzvl>R| zj$WX+QvI%w%oNpEKd7@JA(lu#dLItb<5vbQQV0-W9{VBk!bx4va(&DIrg;8{FAawf z&F8cH2t&QQ5AQqbU;uLqE3Pcu-f5dSHyG)99AsMiB&eI159_RpG+OD)MQtW1hrpKa za=h7PYLee{WWT=d$xs#``VcL&~KNze=I6N7TXv{%#1M0brf%H?T6q zgjqIPUqsKpr^q$6M4NRGun*6xWp}`U7@-aDthaybyIAH=C`KNw=YXleClQ)$j4w_# zMG?#ZDL%xWc_@0t;U$i|fItPr3F$%Z;+)eAn5M_R#)A7mh-rvg4DP_(WNvVg>3Czk z#XgWa!4#!TQySuh)~bd%qh#yK4=Y0ex0yxDRs`-$ra5Gk0zvk{D^Y>CK&@2mCDJ=p ziMgDqO2o3DUViwMLueNk&_D;N0u_A4J4&3i<@F)jmcj0nS~Qs(nC8u$n1DhKJ}066 zzT0(FGFtTR6;~GUv)gnWa^B7zZ63X4NkT=Rgjgx$M#)AI-`pbNJ6J%b;ZpFna8g-y{tB2njTg6z6k$#H5 z{(h(a#GfG8#zc|8N>rE@uZZI%R&Ivb=WW$zIBeAr*zdmMHc#z3_T86@A{{k)ioAWA zk9YHrmd{Ue4fv3uCawNlzrH|BN%$#dVLvas>+i@z$8K(J+8sT~5h*Q?Am}k zd{HY_0HKfcVL2B|SeUN#a54K{DfNh$7BjDHt-tuBX+$ctwHJZlsyf`Sc&aesTy;hc zo&MjJ1JrTqe{DJ3-@j;{#QRC}{qta3X>oi3106jb9W^sEM<*=}105X;8%ue5tdABa zy+x_)bAI`XLYnLrfZhp?PJcjSnPrbmL*)1$l~{DD-I z;`b4*&1RwVN2_8^7B_}5V>vg|We4uH7mrtrn{4+kXMfVMs8#dlPmUiSEw-a{eV}bT zYaB2kWrvzsAX?05zwrCjes=3zh_J+fhEwve{1J^2PDj91=fn1!Z<*(<4uog=(COjf z;W4>^MV2QsrmMScAz0vT?PH`8jI=V?E9HGem=n|q}?df3cV|ysE_f{a9p0!bS%hO~N`pkFh1`A*;gg!NS3ile zCXG~nF5Qs1`=BF}n4muHZIo>1R~BnCp(NEn?8y_T_r9%|`F&LLL511+Td&cb_H-phxrm^dEM$hC%Y&W@>;(HX0x( zd(nk(n;fG1`!mPw>z}{g*#)si;=rt0U0taKVB#LUh~t7-Qqy7p#`V<Sq4VV)=~xy-&5!0Z|X)daX;qaA$sC> zTB%Qt_~E>&|kBng#q77*a4W>(pB0=rQ`Cz*4?+{!IGr`H*&K9bjs?g=cFVXUUQPSCbNDk{v2C{2E@GN&DrckDKgltq#EK0I>f1FgF;~5M*5$Q) z^Kqp~>j?rKZ0+l17#;$no!ZYlRqk41`!0~@ixjvz&uRylR%P27XM^Y-r&}WVQa^CL zzX5h@og~*LvBuP0NN?LjAvgwcn%!>i=9LWp41q>q2c7#7y1GH+g*)(j0+x;G3t1#lvMX=Al_PxQ+8AzENBYf%`PM3z^+(^1U7W zl+(MNJqQgq@a+c|38*5o*?<~Bu?74J+s<{03HnzyB!K)%4M5u9x7T!1ruUi~u3^XT z5Z}D>xxEv*a%aopZ#VX)hlXn>k5EW*a#=+(Bh7lh$)?!3lfd~Ea1zLkH})2$=oYzM z{Jxh-gNC56FD@AQg<#KzA6aXlt|ksWL&Q7fmBkb%06_*!pmRGtH})N&Sc#fQrH`OK%8NssIVc4K z>+_J#Q|yBlO6o2M>_j;h*Or^ve;<}6pWxgw(pA-n%txs|mDVvj-x)ywK|lmWJGs^Z zy$zQry!oo}j*Ok8JwKU6$wa`R?Lmwp{8VDxYJC{BU{8gxkdQGlwtrujq8?wAhQKYN zf92&156LiK=DW938t_F-cQf;2Gr6vzqtjmM6IT0Jq_buqjTT7ziR$}{7rc+`xPV%K zxwXBcSikPXC;RnJm-Yh>iJ4+w3LW5JnTetWM&=(NqBUWt^q%qr-a|3(t4LgAZqu-sLpa+xdM2O@c{Z;kIGbX zGsrddSrzjv`OqWekSyo-ls1rV?X|FIaT^M8o+g? z5|(;9tYnaTrBp_MFsKNDGLyI|)|+=B=a~Z-f?HR+IrSkkr+8zuAz4L7!G4%ZjoUmQ zlwshwp25)3y%80o9|a6I4*Y13c~Hr=JNCL&O{@U)z>dh08tx7BUEbtdk{HaY+m@N2@;hebDC2Zp{q@PgNT?qh;WC-t^d_JWk*{u@ z!{d^|Ex8GA2bb+FMRL*<|4%h=;>UC68g4o4Qk$Cgr>Qwiz>{!Fbo(i`4y&_hCEFRP zpivfo$9n^f9hvX#s8Y;0s>!7diYx2uZ5x)ah$0I0`)j)2kZEaVI9G*rPst2TCA-i! zv@m)Sl>ZnDOypE7UvMP&%2erVO2Q*!`e`MopIMoF>;uY|aeJ#Hdov($eoO2dr3&(> z>;P2?wDyl!ueFy3$@C9FG&1_<>I@t%Jg9cPodT{BO`HvNVthjwL49YzW#v! zWMfI{8fL_MX^7H6@S;T2PKGFW-j0@+AW3~}&hkMA7teZ=z)Z#qWk)A{z7Q77IUz(+ z2QokG!u(YGc1PNur3p?$9?#$7*oP4c{yd6E!{wu_+p+^M8K_d)jCapyk+$;pI#>3V zqNrZixseX!gD&`W*GKD_juK(7F0S%s3`u=6mZwAzwvDF>uvZQ0sfCr~Pz&=I!*r;tWEeu%j{%B~ z40B{mFg=GcwQkV;O%?&4@5>zUQvhZU02N;s3J_1Z-qP=cA`T%-Mg(yw!skafozSUI e7~?i1=yme>FU`wrD!Jpx|_xHzdxvx9-bw20Zd(J)gp7*`yj)jMZHNXJ;T{b!QiNh+A zMi4Pbz*T>@%Xm5qVpzE^S+jub5zinN^pXEA^pSLl!%p(*!Bcp2dJ?Jr;R zRJ8E-fcac@v)$7UL&B7m5Xwr*N-8i}3*Rf3uleKfxGMxWT{VPxf2g#+fh`1J1Aqt# zQ{ncAp=1mI@BlzT<;jfD?&j@xp^;_h1VUr!)O_W+p^(@{kXmgn6%FkJd3czr`yl{e z0wUmSIsUWypPIMDM3#81MCH2ZRCJtDnn<)x`lREEcfzZ!UPmRmf$B+IQAUJAwcBf4O>xV1hMrCREgj4h%yFzCj0hrL6d*hLshl zXfsQ2cUGl1FgL zUYk>TIj7|RT6I0UY^pP{N>N#RlD%o=Lm*f1k;{0 zn;!D{1OM6taNEJ6%P((at=*NXJ;<*%NL3x+H?vYTqy8VNwLs)vynv2~-@laM6~U&G z?7Fus5ujS(LN)`=eM?}6*un)^&QQ+!fF^g&VnMk;F7;KMO|DF1c~&l-qPa}+p@__r z@DzA&c1J<>P!67gu6HB5Gf4gAPFfvcr}IF&e>d!V;iC)go9i3l z&iglE;YloR0^%j&sbYk?+^GeKZg`Q{ousp<@>`Z@5t(Ab%{|Xy01(CV&nOm;5q66e zFD3bN$dwhP#LM-{KJ8cTlczV8Z4|AQnl>H-PDI@ZN?wg-i@if$%EMP{8haO$#~hCr zg8>dN-bWO;sWA6sJr`{I`|C=2J?PA?*%i)F2L6z zllZnF+W8G}W;}dm{LV$87@R}Kf7E@~K~DfWoc7?D=9Y-)BHc3AXW!r8zmap!PoV1_ zwCA3r$rDMl5&41dsut_2!~8~IxL6-@9zH~*3gWEQovCU#Dh5Xjz)jTSoEpL%>ceNY z|53+@|3nT58wt&%dE@^?PSSggq+`ewNrx2aJ>-;U=Y1@H@ZXSA;2B?<6<-<~zZ{z+ z8<%l8E~ldLflqJs%JcuV{u?fp?_`w z0JJ7^n$V9DNh`Dh4Xs8)D`0GNF#lVj(V+z{Z2I0w%cZp=8rqZ9o)YSrsLvU)l7&wS z8Az1q_WR7E5*vIV{TNg5oovHcKXB2E03Pt{6ut#D=oeom6`7+KNDoJ>yh!*oE!2@> z0qHcW?!I>Q8KB-PZK-v~o9w8EI#k$s14a84tt)KTzL&B_L2rRF;HU32!PzO$cVZjoG=AsYo+>*~717L&=4(y#b>=r3 zKZLQ%Frua7>@tWK({a<|hQmZ7TAH&J5$BZdJQIL(*ftyABw{k6LFrrr(OLM)%*i~^ z&_z&chno<(GOd37?RK=s-mHc(YQr|pR16Wc`*w`3%8rZ!ITPu=Gj`4sTWVGW=V1)a zfq-$a#Z7EGJ8TiHFyT(=IJ$J(cSa~?Vk~@);OtD-Z0oQU{&qZlaf~>(V@j9}+&+mNM?eyQ(S`JL2 ztZ}k~0Y#4ur9w^t(I*l>EI;7F*}p=8X`hMl$Xm0+~`j*@H+RZEfT;klF~S}t8q2v(hX>Oe5?Y8K6a*++zyLM3!ODRkf zG?A+X1-^(yVQjx9-8gCA_!u}BTQERDRhqKppei`LqhAvVs?z!(3yv^V=nzE3Re`GD ztWZe&2W^c}tjXT-ZcT z4IJUCwl(QisY%Z8_NrYH#14`d$Gj=crDI-ZwTqK({W?p+?gNdi2lYV*1r6Yc`Y|tG z#1iyxsg=Qt&U zQ0LSDFQhC>77(`Vd$5g??GTP)5$`0W4#C>9@MyVC(ye4vM;4w3)l0f%i9%(A6cV16 zf1=|L^7y@WE~l znEm6@_K8i#2pbt4Q^^Fp2J>(%7^7MrC5uLt7KNkGXk>BvS;R6dEd`CL!cdUL#l>Te z3AO&_;4Y8_of5%dbo5f_6vloAqtwwG0aCKX#lqN1#F(Q2vYaf8O;j6qM1x&GZyL8# z&hBTYFn001vGk@eimruD z(e3V0a>W7waBUX65?z??yW2QK-H|>Y1ndPqm@304jy~|S^o5S;hPA_DIN%*5GAH~N zw8Ru1m6lFH#KfiwIvqH~2xhZ9^wfzVl0jA}83M4fv7-T9*T_PHC^nvlt*y_V)q$@a zefJn+LwS}scABmg;s_wGsIAD~(H-e}-~c@O})Sa^7cq33RQu^PvAvmudS1_h?`Kr1WI>dIhfsM<9=_YJ}) zp{$SQ+Y`|nCZ_$YpZ+dnV%mG?F>O2Vi|G$NI-f&N`pe;CjmPDiUv#{9JvB-hrVb2u zkn2lxQiA->9X-e?6?l>1cxQb>;>0jy2V9*V<-uzI_mweeQ(15C@~0DwM8Bu^M+hw3 zXtmTq+FyKGbuHxdjT@I%ay{-QIu7xEi2aPIO<vbKe#>LRx8VZfY2g9I!&m1E zx=%nJC_nv@EO7Q6yn*cBFB9LFc?!FxF0s^~|LU_FiW%U$anf6F+vsN3sj$lxrs8?O zA2A25#xvvv2Nq_d(P9A5^m~qZ)>;I{$S`%}xK8y%i@+ZRlLP4-fPM9(?DY9B13BJ@ zwq|b(E0mmhI$Ab#-R4Qx8c-*4{HxU#){go}houlB2eg)EOa^V)4h?-Z(^(07R9)C; zuRjnQa`IuQ7oZi`|3>2ZUo{+pqaOn#{@|{jX>7#!O&WeKGM~*`xC13; zelME2VsCKo3-pqDPh#7%ex9T<;}UGn?iJRt`Ka6JSs#z*nEXV3IJ;2WzI01U`(Ats zS6;+g!Jwaz=T#++-KkLI29`ti4Iycm>vorep;|f<QUIvBhaOw0i>J#@zCQ?qcl3tc7zyN@ zSWElKU>qblTAx3fSnnrcs0ru68^Q38fp@G&t~~8rWF)*YUO!SL7XRnmA>+`e5A%eE zY%r;H3}aEqvqu$52CrW=Ns&aH=l@dMoTwPk@@Szq6eBXhKb>pI8`P&5c?y1NO#ma& zYe}-uIKld&B+x)<;>VoEB})FPOll3VvRlK4Q=FpqEX7-5Yx&DK(M=Ao?EM#waEkdc z&n*Xy7Hm3HrwPj*z5$W_&ec!9e{HF00uMc&(~%uK6mu8y?>H) z)mDGV8>(+pL%pwdk|RK~-%5>DlYLiGscWV4?F<+>XRC-jYc^dJ1hZ7IFon!7G`eRZ&?0A)#hf?`0rS%mz z{oYl-(Hr3m(gY zK++OZZ?h!^=()CwEpipI{ZgSc`m*yZPyYDEQTZyx;TkRH<#(jM>J=fE(cdy_$r#?G zt?b^jM=oh}Wou=oCt*#R8&vX#QAzBP_F4u)46Ac#IUQ2K@5^L)DatV&U7*Ex`3=`n z*78c-D$S@kpblz08dlnO;^ObS&ac|)*VhZaeb@dy$1x^vKl62ofGcWcMn)cYEppR+nVQ7rbUZS-KXjP)@~;`6$sq~37$ zb7bb4jN7B_Pse`J>WYqapWd$0=hpkJdI6==^8+cZ89z8}tmwCOTc|GFW$@WE+J(VE zcG9nS|4@54`6&8Z%FW(KE=r>3j|3-6yTp8UQO8bZ9YAQE7TFcM0sAHRKCm&>N#6iC z?L~$QsX&!FafyHQoxN{Q^S<6ePp}n zHiQpBBi#&(Px);_yR8HBvoGcHymMC6O2mnGU7*Y#pzvK)zQ^KCSY^#SsKtb-(h{*a z5inet=a!tG!+P!@SKs+;%`6QHyAw0&uNw4?kdNJmw-(nb%tL}co_ad8Futmu_fgEC zgUj>&mYJK+XkM~63GUN$(lDGJ}c-OR)#^Mlaa5$|5wBv>(jUXBYM=!<=B zr{VpY8F&{w;E(DS`aG=1wMh|!k5dq;Z)*=f=TAIOW2`E>_nw@odQmd2A-pgj`RAQ^ zH7R`4%UCBSUhGDQt*33ES!(JE@<)~w3e`fMsJ2h7ow)6YKDFE5@aSv)-HFXQdvf0y zxA*5M=!-=mG}vwz``Z>r*D1Gb_Qczn7fh<7Zf@%MOLirGk`g?$d`Hi`dDdiSRHv#G z;UweDQ!>prlZ+eeMc7zrJ-L8^Ugs+oNC?s8FhkyC2#W^7xc{<4wTbgPi!vk_78WSo zOtpsa{f?cEWmznCeXWiTcm~~Wd(24?v;V^5|2+w?9c)I{*dj{FHvxEJ37tT9{HeV|~@08KBuGCKJ9C9I#D98+LdwSD4 zV=BjZJ=(9<&J{2ZW!{edWlTKDrgN2n_DkxxSGzUp>*0XvGY#5USoMp0((3O~PFM)! zuJl85K_4Z*CpUg*%RYM`l<^g-ylah49*!G59DSspLSQrX zl!TO9nVmjFtY@0(=u=))$fQ`F;ON?FrI)IimVMHtg|Cc5q1=YJW~)OC;Z>i1E;r$S zl`OQ)95whnzs_7__vtj0cj4aHaaYQhr-nYJ)hS&+vIi7!t&RoJiklIaFd;)GU|9BG>zq&#EFx5A9Y1dXO$ zZ_z6rRbg%_Q@0TT-WgBF@{91Qo`2V#AgcB9F^8nxRldmOT?t6YrW`q^JH_5OS5Z0} z+ob#K+&0;iWN|G$-f!YX7Nw9_FN17|D)OYRgLW zZV0gbfuJ6{vVP4&sWbJ6wPQVnI6f5Naib2RxiDdlyf}9JiC5o%jzr3}l8l@3 zDPPoU->e%kPtGxvJm#A{ua48?Y}uu)-KsaIl)|#a8#YKsZ^|f9BVRTbj&~Gx9UV9v z`QlCAAA#>h+@+o+BFmBdtC=u}jF*QR)|9MzqZ%A#CO8bI%x4MY?R*1s#a3Ak*6_d>PdD@g!5Fh*X`xl-Ld<~HP z6=c#kKBxxOXjhMW|5FXf8=uk;V|^HL=tq--VcXL1dY7_1VaQ|<<2Y?Hg4Qmak*-qB zZ0LPBKq`?MmpdDB!@v1T8ob!!(8G!cw(~lv5Qe}+LjDWcLhF%*>L#vS#xLrRWdTCyxJyLqZW6HY ztvE=;Sn>?-3qGAKpOMj;mh8W@iG1HAoOn zb8OXxmq&^&O-O7I@v{BCaM2LLc(S=37i>uP>a4dZkar1+#?3+m?Y|!UklP=XH2|pU z$j}@QJ1BSjo_A}zF@EhGFGU%u@X3i9+pePK{cxFp%f06v{kZhaj^&xevfVy-b*18y zknaQ5;>pc7ma&-;@+eCw+Y^9D}&j=DM?0USsMp4%BY^}4uZy;S>|X`34O)+s~h zmd=@!Y4hRLX2K-jA&!^F9W;FY#NEq(ZBbM4>J7$*>QOy4A7Sw=-Q%$4GbGR5PYG47 z^&F55Uh~vSCI9Rr(U*|HU9$&%<%M9#q8Y6DY!}QLcYuQB=wkFCDj^&$ith34fjiYb ziG4Q_cIA4)ZLJ^Tx=u~0?TqS>>lsD*EsJXwejnLP)VFl_La^#t3HMxUTgyf`np}Zr z#~7w=S+?EHTFv0AD1BsOFiG%QEVfE`s>Ocxn86c21kq*qgO`D-C=v<(Q*V?euUfLQ zq|26rA}T4YFsPNa-;cVsq$ugdXAA(RSmQX_jgHytB6?W5i?L ztlPmOW`dI974W40k&SX%Z zjW>eoi$3;B7MxMjo$oI%)~{;I|JF|AN&nu?4urAjC551ia z+!-zUFvcUZfs6p@{+~lkJV0{H%VwGjX!j@4Gh8ad`uSRL*m={;ADvP608ePG2_YH+ zM7T5Xfd4DZ{8Ry_AkFz{CJSBx3A!;vf8R%BN;7H~OF?)Oa@SBb7K~SB*DpaL@=mk9 z16=y`SUv>WF~z^ZC+4~cK8p{3qka%*y?U2<=K=6L{by*&N!hG99;ANv>+=%g{0_pP zy7e!w@@ISi7a1;~f1}GTVg^|#CkS|8`axOiE+fRU=VNQ83R}b}$cNbmO?lvS#?NJk omNbA{7q|`nJqtw4BY;*lc*H4&qn3;{bn(~9i_ZaWPz09$0$Huh@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base.yml b/Resources/Prototypes/Entities/Clothing/Belt/base.yml index e79a0eb8f9..199a801e1a 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/base.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/base.yml @@ -9,3 +9,5 @@ Slots: [belt] size: 50 QuickEquip: false + EquipSound: + path: /Audio/Items/belt_equip.ogg diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base.yml index 795627181c..d6ad4e65e1 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base.yml @@ -7,6 +7,8 @@ state: icon - type: Clothing Slots: [innerclothing] + EquipSound: + path: /Audio/Items/jumpsuit_equip.ogg - type: entity abstract: true @@ -18,3 +20,5 @@ - type: Clothing Slots: [innerclothing] femaleMask: UniformTop + EquipSound: + path: /Audio/Items/jumpsuit_equip.ogg