From 8639df7a74ee7c0a408e3acd9922272fe900c195 Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Sat, 14 Oct 2023 02:53:02 -0700 Subject: [PATCH] Add pop sound effect when using the erase admin verb (#20988) --- .../Administration/Systems/AdminSystem.cs | 5 +++++ Resources/Audio/Effects/attributions.yml | 9 +++++++-- Resources/Audio/Effects/pop_high.ogg | Bin 0 -> 8524 bytes Resources/Changelog/Admin.yml | 5 +++++ 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 Resources/Audio/Effects/pop_high.ogg diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs index 8a2b6d5119..66f7a8999b 100644 --- a/Content.Server/Administration/Systems/AdminSystem.cs +++ b/Content.Server/Administration/Systems/AdminSystem.cs @@ -25,6 +25,7 @@ using Content.Shared.StationRecords; using Content.Shared.Throwing; using Robust.Server.GameObjects; using Robust.Server.Player; +using Robust.Shared.Audio; using Robust.Shared.Configuration; using Robust.Shared.Enums; using Robust.Shared.Network; @@ -38,6 +39,7 @@ namespace Content.Server.Administration.Systems [Dependency] private readonly IChatManager _chat = default!; [Dependency] private readonly IConfigurationManager _config = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private readonly AudioSystem _audio = default!; [Dependency] private readonly HandsSystem _hands = default!; [Dependency] private readonly SharedJobSystem _jobs = default!; [Dependency] private readonly InventorySystem _inventory = default!; @@ -336,6 +338,9 @@ namespace Content.Server.Administration.Systems var coordinates = _transform.GetMoverCoordinates(entity.Value, transform); var name = Identity.Entity(entity.Value, EntityManager); _popup.PopupCoordinates(Loc.GetString("admin-erase-popup", ("user", name)), coordinates, PopupType.LargeCaution); + var filter = Filter.Pvs(coordinates, 1, EntityManager, _playerManager); + var audioParams = new AudioParams().WithVolume(3); + _audio.Play("/Audio/Effects/pop_high.ogg", filter, coordinates, true, audioParams); } foreach (var item in _inventory.GetHandOrInventoryEntities(entity.Value)) diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml index 71a2ae2b53..556c4603a5 100644 --- a/Resources/Audio/Effects/attributions.yml +++ b/Resources/Audio/Effects/attributions.yml @@ -57,8 +57,13 @@ license: "CC-BY-SA-3.0" copyright: "Taken from tgstation" source: "https://github.com/tgstation/tgstation/blob/e3a835b96043fad1269ee7b0c3a6cb340a466f3a/sound/effects/break_stone.ogg" - + - files: ["waterswirl.ogg"] - license: "CC0-1.0" + license: "CC-BY-4.0" copyright: "Taken from InspectorJ via freesound.org and mixed from stereo to mono." source: "https://freesound.org/people/InspectorJ/sounds/398703/" + +- files: ["pop_high.ogg"] + license: "CC-BY-4.0" + copyright: "Taken from InspectorJ via freesound.org and mixed from stereo to mono." + source: "https://freesound.org/people/InspectorJ/sounds/411642/" diff --git a/Resources/Audio/Effects/pop_high.ogg b/Resources/Audio/Effects/pop_high.ogg new file mode 100644 index 0000000000000000000000000000000000000000..679da25078ff9935e90c5ac81115062c016df958 GIT binary patch literal 8524 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 ZmNkrhqywb|%Bx2Y|7 z_vj^4`h#~b{*rXcSBnsLp=OzHJQ`=x=9TWO)zZ&7@Xj!pp}mJ}?%hz*;^Q@_ID@3@ zKns*l86?fq40k%*pp|&FDayizw3T>3hRU{1EO?XCPg4ZF4hw6Ghv%ND z+9X1Qo7Jo#$K_`04ia;E@4p1l|zGBn@@S6<6CF+4|k z^#hNOhmeO&uD5W$#Gqps9-}rgvp84MGR>oz1822kg;T7GkiJ#XDf0$nXvnnI6gC~b8 ztU}hn-M-Y}yUfq|TTY+9j7BE-r-@w5eV+RK2k&RKyE6QwgEE z5tQWZYVTH_>qX{45v20oEYR4axMP0M``WF$WJ;R3&j+P(KY*s8>spyy47JV0qMYVh zCX(-rt@K7#x6?rSzh*B#g@HD*__2AWcwTQtTyBOJ`8BVYy)5J?JQ^i(-iI$*3KCg z1t+uqr5sp%v%l+TeJG_YUc3``%Sh?3HSbzR`4)zv690m~Fi&~*`_cHCxpWB~(j=c} z--Ld42Pw5H^DYRhCCx8N+L9q{{WM})3G;dm*bG6(q=gZsj#$O3ChO_iDc(C~T@}4% z`F+~boj2~KwDY5{N&JXbFnikUnolnmSn`uOH9w0tljtJ2M+(oh5zd83lY1Uq zK+B5!lDsb-u~~CJ)Gp1SbYf&x4)ZB#CQENv%y70k190 zL7{KplcEnEyRP$x>Hbz@Yd+ZREBT%bq8avewJYBauNKY71m77mPEGN#o~q-_tJT-R zLJ78K^G2W1c@MCK3D+saKb284D_IaW>WKVvQ%>_w ztU_aA!&Ws;@s+YE+Wp46R0jYKo8T4K%DDgG{+GsA-;T0vALrMpj0FE2 zkeI#Me50kZKUa!cPBtvnu;+{ydwC8)H;%DzroAPOf`(z;p!CkR1HUgsAxtxOmCXub z7dFMItd+cwfDQ}B7B`i@dhsI9%Qf&vdUWK<$In^&4%+@97{@i8^(%W>D|YywChu`F z^2rM>{YAdz#{o1-Dcr+}jPsShV({`T0q@z}g?H^NmAL4G%!aJqop;blFRHno^gQU_YyRD?A-gM+u(t_xuM?AXP?QSlSq{|6^#;G9MC~|mxKi5;^ z9<3PVcw05=%nzwWyntJt&^@PHUTx^V^d4Upjj zA|O6q^YI+SQDB_x0Bd9n4GwI;huLmZBsMo59~pdodB;mlP)Xr?w;F8f3Qy**;yaAK z{+*c@ANVWWSyks=%VtZysO}HVYepwq&KZVfJ(2$a@%+6T_C3PdK0pOy@jc`^!(#L; z%KXO`_o5HQY;JF(w+wDq=_cR{D+31l`Xsn(=pNP(R0w&4LQ4$qxtNr8x~@g|s9${} zChy-{hdOVx@Y=@niAy61(vZ_cLO+syP%Piex1uHzJIfYK(qp?4ucDx#sg$boa4#@ib01~99iPFGxW#Ilskze?%~ z3Ol#Td3K@T}#={0Fxz2q&v2UR^V}>ofSg^J$(6MrKCq{BHWk8*7j+~M<{IeK- z7H?W9KkFG*mD#`5{mzB#X5@FFa%a@%mt58@z?Y_*!ToD*_o{;3ygc46>_#eIJnz2Ww*FV&fV0!SYMLO^X05Y zVEIw~5qHH(M{`)crBv)LBb?Mx*3&6Fp^XYS`SXDcW%8dtA4tKW6MaS#X|oUH17_|* zZ;}K9nXi)X-q__8k%4878o;h&)7S%sY|m>V_;$=yG+cxE_S+ny}_;1Tat!*KWKr+)@QsI l-je-=f3+9r@u;eGa!V4b224{l89K@4Q}w<>e}@2c{|7ET9pC@} literal 0 HcmV?d00001 diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 728859e3f4..9aa77155cc 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -31,3 +31,8 @@ Entries: - {message: 'Added message tooltip to the erase verb.', type: Tweak} id: 5 time: '2023-10-14T09:21:00.0000000+00:00' +- author: DrSmugleaf + changes: + - {message: 'Add pop sound effect when using the erase admin verb.', type: Tweak} + id: 5 + time: '2023-10-14T09:47:00.0000000+00:00'