Черри пики 7 (#592)

* Remake gasp popup to emote (#27736)

* fix

* Silence ringtones on admin PDAs (#29801)

* Silence ringtones on invisible PDAs

* Revert "Silence ringtones on invisible PDAs"

This reverts commit afc1041f31eebe82e83630a856a8856b877a9826.

* Literally just this

* Add an admin announcement for news article publishing

* Fix invalid UI hover/click sounds breaking client (#30067)

fixes #29561

* Display the administrator's title in ahelp and ahelp relay (#30075)

* Adding the admin prefix to the ahelp

* Updating the admin prefix

* The second update of the admin prefix

* Configuration correction

* fix

* Fix servers ambience sound (#30091)

* Fix servers ambience

* I'm silly

* Clean up

* Add pen clicking sound (#30531)

* Add pen clicking sound

* switch to OnUse and reduce distance a little

* Fix exploding pen clicking (#30533)

* fix pens

* added a bunch more fox noises (#27578)

* fuck it we ball

* added recommended copyright information

* revised copyright license

* revised copyright license x2

* finalized the fops

# reduced the number of audio clips
# adjusted the volume of all fox sounds to be consistent with each other

* added new sounds to the overall fox parent mob because we forgot oopsie

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: to4no_fix <156101927+chavonadelal@users.noreply.github.com>
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: nao fujiwara <awkwarddryad@gmail.com>

Resources/Audio/Animals/attributions.yml

@@ -7,7 +7,7 @@
   license: "CC-BY-3.0"
   copyright: "Modified from 'Meow 4.wav' by freesound user 'TRNGLE. The original audio was trimmed, split to mono, and converted from WAV to OGG format"
   source: "https://freesound.org/people/TRNGLE/sounds/368006/"
-  
+
 - files: ["cat_meow2.ogg"]
   license: "CC-BY-3.0"
   copyright: "Created by freesound user 'TRNGLE. The original audio split to mono, and converted from WAV to OGG format"
@@ -117,24 +117,42 @@
   license: "CC-BY-4.0"
   copyright: "Audio is recorded/created by Pfranzen 'FreeSound.org'. The original audio was trimmed and renamed"
   source: "https://freesound.org/people/pfranzen/sounds/322744/"
-  
+
 - files: ["dog_bark1.ogg"]
   license: "CC0-1.0"
   copyright: "Audio is recorded/created by KFerentchak 'FreeSound.org'. The original audio was trimmed and renamed"
-  source: "https://freesound.org/people/KFerentchak/sounds/235912/"  
-  
+  source: "https://freesound.org/people/KFerentchak/sounds/235912/"
+
 - files: ["dog_bark2.ogg"]
   license: "CC0-1.0"
   copyright: "Audio is recorded/created by KFerentchak 'FreeSound.org'. The original audio was trimmed and renamed"
-  source: "https://freesound.org/people/KFerentchak/sounds/235912/"  
-  
+  source: "https://freesound.org/people/KFerentchak/sounds/235912/"
+
 - files: ["dog_bark3.ogg"]
   license: "CC0-1.0"
   copyright: "Audio is recorded/created by KFerentchak 'FreeSound.org'. The original audio was trimmed and renamed"
   source: "https://freesound.org/people/KFerentchak/sounds/235912/"
-  
+
 - files: ["nymph_chirp.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from ParadiseSS13"
   source: "https://github.com/ParadiseSS13/Paradise/commit/a34f1054cef5a44a67fdac3b67b811137c6071dd"
-  
+
+- files:
+    - fox1.ogg
+    - fox2.ogg
+    - fox3.ogg
+    - fox4.ogg
+    - fox5.ogg
+    - fox6.ogg
+    - fox7.ogg
+    - fox8.ogg
+    - fox9.ogg
+    - fox10.ogg
+    - fox11.ogg
+    - fox12.ogg
+    - fox13.ogg
+    - fox14.ogg
+  copyright: "Created by fujiwaranao"
+  license: "CC-BY-NC-SA-4.0"
+  source: "https://github.com/space-wizards/space-station-14/pull/27578"

Resources/Audio/Effects/Gasp/attributions.yml

@@ -0,0 +1,26 @@
+- files:
+  - deathgasp_1.ogg
+  - deathgasp_2.ogg
+  - female_deathgasp_1.ogg
+  - female_deathgasp_2.ogg
+  - female_deathgasp_3.ogg
+  - female_deathgasp_4.ogg
+  - female_deathgasp_5.ogg
+  - male_deathgasp_1.ogg
+  - male_deathgasp_2.ogg
+  - male_deathgasp_3.ogg
+  - male_deathgasp_4.ogg
+  - male_deathgasp_5.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/4397f13c72998aa7e6ce192215c9f77b9d62eee2"
+  source: "https://github.com/ParadiseSS13/Paradise/tree/4397f13c72998aa7e6ce192215c9f77b9d62eee2/sound/goonstation/voice"
+
+- files:
+  - gasp_female1.ogg
+  - gasp_female2.ogg
+  - gasp_female3.ogg
+  - gasp_male1.ogg
+  - gasp_male2.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f7a49c4068f1277e6857baf0892d355f1c055974"
+  source: "https://github.com/tgstation/tgstation/tree/f7a49c4068f1277e6857baf0892d355f1c055974/sound/voice/human"

Resources/Audio/Items/attributions.yml

@@ -134,3 +134,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from tgstation."
   source: "https://github.com/tgstation/tgstation/blob/a7f525bce9a359ab5282fc754078cd4b5678a006/sound/items"
+
+- files: ["pen_click.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by dslrguide, converted to ogg and mono by Themias"
+  source: "https://freesound.org/people/dslrguide/sounds/321484"

Resources/ConfigPresets/WizardsDen/wizardsDen.toml

@@ -35,5 +35,9 @@ see_own_notes = true
 deadmin_on_join = true
 new_player_threshold = 600
 
+[ahelp]
+admin_prefix = false
+admin_prefix_webhook = false
+
 [worldgen]
 enabled = true

Resources/Locale/en-US/body/behavior/behavior.ftl

@@ -1 +0,0 @@
-lung-behavior-gasp = Gasp

Resources/Locale/en-US/mass-media/news-ui.ftl

@@ -34,3 +34,4 @@ news-write-ui-richtext-tooltip = News articles support rich text
     {"[bullet/]bullet[/color]"}
 
 news-pda-notification-header = New news article
+news-publish-admin-announcement = {$actor} published news article {$title} by {$author}"

Resources/Locale/ru-RU/_white/mobs/emote.ftl

@@ -0,0 +1 @@
+chat-emote-msg-gasp = задыхается

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -2482,7 +2482,7 @@
     interactFailureString: petting-failure-generic
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
-      path: /Audio/Animals/fox_squeak.ogg
+      collection: Fox
   - type: Grammar
     attributes:
       gender: epicene

Resources/Prototypes/Entities/Mobs/NPCs/pets.yml

@@ -529,7 +529,7 @@
     interactFailureString: petting-failure-generic
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
-      path: /Audio/Animals/fox_squeak.ogg
+      collection: Fox
   - type: Butcherable
     syndieRoleRequired: true
     spawned:

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -680,6 +680,7 @@
     scanDelay: 0
   - type: CartridgeLoader
     uiKey: enum.PdaUiKey.Key
+    notificationsEnabled: false
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge

Resources/Prototypes/Entities/Objects/Misc/paper.yml

@@ -325,6 +325,14 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 25
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Items/pen_click.ogg
+      params:
+        volume: -4
+        maxDistance: 2
+  - type: UseDelay
+    delay: 0.3
 
 - type: entity
   parent: Pen

Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml

@@ -56,6 +56,7 @@
                 SheetSteel1:
                   min: 1
                   max: 2
+    - type: AmbientOnPowered
     - type: AmbientSound
       volume: -9
       range: 5

Resources/Prototypes/Entities/Structures/Machines/research.yml

@@ -48,6 +48,7 @@
             min: 1
             max: 2
   - type: Appearance
+  - type: AmbientOnPowered
   - type: AmbientSound
     volume: -9
     range: 5

Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml

@@ -22,6 +22,12 @@
       snapCardinals: true
       layers:
         - state: server
+    - type: AmbientOnPowered
+    - type: AmbientSound
+      volume: -9
+      range: 5
+      sound:
+        path: /Audio/Ambience/Objects/server_fans.ogg
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -113,6 +119,7 @@
       subnetColor: "#088743"
 
 - type: entity
+  abstract: true
   parent: [ BaseMachinePowered, ConstructibleMachine ]
   id: SurveillanceCameraWirelessRouterBase
   name: wireless camera router
@@ -135,6 +142,12 @@
       sprite: Structures/Machines/server.rsi
       layers:
         - state: server
+    - type: AmbientOnPowered
+    - type: AmbientSound
+      volume: -9
+      range: 5
+      sound:
+        path: /Audio/Ambience/Objects/server_fans.ogg
 
 - type: entity
   parent: SurveillanceCameraWirelessRouterBase

Resources/Prototypes/Entities/Structures/Machines/telecomms.yml

@@ -21,6 +21,12 @@
           True: { visible: true }
           False: { visible: false }
   - type: Appearance
+  - type: AmbientOnPowered
+  - type: AmbientSound
+    volume: -9
+    range: 5
+    sound:
+      path: /Audio/Ambience/Objects/server_fans.ogg
   - type: WiresVisuals
   - type: Physics
     bodyType: Static

Resources/Prototypes/SoundCollections/deathgasp.yml

@@ -0,0 +1,23 @@
+- type: soundCollection
+  id: MaleDeathGasp
+  files:
+  - /Audio/Effects/Gasp/male_deathgasp_1.ogg
+  - /Audio/Effects/Gasp/male_deathgasp_2.ogg
+  - /Audio/Effects/Gasp/male_deathgasp_3.ogg
+  - /Audio/Effects/Gasp/male_deathgasp_4.ogg
+  - /Audio/Effects/Gasp/male_deathgasp_5.ogg
+
+- type: soundCollection
+  id: FemaleDeathGasp
+  files:
+  - /Audio/Effects/Gasp/female_deathgasp_1.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_2.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_3.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_4.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_5.ogg
+
+- type: soundCollection
+  id: DeathGasp
+  files:
+  - /Audio/Effects/Gasp/deathgasp_1.ogg
+  - /Audio/Effects/Gasp/deathgasp_2.ogg

Resources/Prototypes/SoundCollections/fox.yml

@@ -0,0 +1,18 @@
+- type: soundCollection
+  id: Fox
+  files:
+    - /Audio/Animals/fox_squeak.ogg
+    - /Audio/Animals/fox1.ogg
+    - /Audio/Animals/fox2.ogg
+    - /Audio/Animals/fox3.ogg
+    - /Audio/Animals/fox4.ogg
+    - /Audio/Animals/fox5.ogg
+    - /Audio/Animals/fox6.ogg
+    - /Audio/Animals/fox7.ogg
+    - /Audio/Animals/fox8.ogg
+    - /Audio/Animals/fox9.ogg
+    - /Audio/Animals/fox10.ogg
+    - /Audio/Animals/fox11.ogg
+    - /Audio/Animals/fox12.ogg
+    - /Audio/Animals/fox13.ogg
+    - /Audio/Animals/fox14.ogg

Resources/Prototypes/SoundCollections/gasp.yml

@@ -0,0 +1,12 @@
+- type: soundCollection
+  id: MaleGasp
+  files:
+  - /Audio/Effects/Gasp/gasp_male1.ogg
+  - /Audio/Effects/Gasp/gasp_male2.ogg
+
+- type: soundCollection
+  id: FemaleGasp
+  files:
+  - /Audio/Effects/Gasp/gasp_female1.ogg
+  - /Audio/Effects/Gasp/gasp_female2.ogg
+  - /Audio/Effects/Gasp/gasp_female3.ogg

Resources/Prototypes/Voice/speech_emote_sounds.yml

@@ -34,6 +34,10 @@
       collection: Whistles
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
 
 - type: emoteSounds
   id: FemaleHuman
@@ -70,6 +74,10 @@
       collection: Whistles
     Weh:
       collection: Weh
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
 
 - type: emoteSounds
   id: MaleFelinid
@@ -108,6 +116,10 @@
       collection: FelinidGrowls
     Purr:
       collection: FelinidPurrs
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: DeathGasp
 
 - type: emoteSounds
   id: FemaleFelinid
@@ -144,6 +156,10 @@
       collection: FelinidGrowls
     Purr:
       collection: FelinidPurrs
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: DeathGasp
 
 - type: emoteSounds
   id: SoundsHarpy
@@ -200,7 +216,10 @@
       collection: HarpyCaws
     Chirp:
       collection: HarpyChirps
-
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: DeathGasp
 
 - type: emoteSounds
   id: UnisexReptilian
@@ -255,6 +274,10 @@
       collection: Whistles
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
   params:
     variation: 0.125
 
@@ -293,6 +316,10 @@
       collection: Whistles
     Weh:
       collection: Weh
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
   params:
     variation: 0.125
 
@@ -320,6 +347,10 @@
       collection: BikeHorn
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: DeathGasp
   params:
     variation: 0.125
 
@@ -338,6 +369,10 @@
       path: /Audio/Voice/Arachnid/arachnid_click.ogg
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: DeathGasp
 
 - type: emoteSounds
   id: UnisexDwarf
@@ -372,6 +407,10 @@
       collection: Whistles
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
   params:
     variation: 0.125
     pitch: 0.75
@@ -409,6 +448,10 @@
       collection: Whistles
     Weh:
       collection: Weh
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
   params:
     variation: 0.125
     pitch: 0.75
@@ -430,6 +473,10 @@
       path: /Audio/Voice/Moth/moth_squeak.ogg
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: DeathGasp
 
 - type: emoteSounds
   id: UnisexSilicon

Resources/Prototypes/Voice/speech_emotes.yml

@@ -1,4 +1,4 @@
-# vocal emotes
+# vocal emotes
 - type: emote
   id: Scream
   category: Vocal
@@ -216,6 +216,14 @@
   chatMessages: [облизывается]
   allowMenu: true
 
+- type: emote
+  id: Gasp
+  name: chat-emote-name-gasp
+  whitelist:
+    components:
+    - Respirator
+  chatMessages: ["chat-emote-msg-gasp"]
+
 - type: emote
   id: DefaultDeathgasp
   chatMessages: [ "emote-deathgasp" ]