Remove among us noise from game (#16589)

* Delete emergency_meeting.ogg

* Update reinforcement_teleporter.yml

* Update attributions.yml

* Update troll.yml

* Update mecha_equipment.yml

diff --git a/Resources/Audio/Misc/attributions.yml b/Resources/Audio/Misc/attributions.yml
index 8db3d9ea8def0c32e735fceeffc7606bde0ee647..773d1e6e4e6e41f9f0aeac7651f7b743281fbce8 100644 (file)
--- a/Resources/Audio/Misc/attributions.yml
+++ b/Resources/Audio/Misc/attributions.yml
@@ -1,8 +1,3 @@
-- files: ["emergency_meeting.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Taken from TG station."
-  source: "https://github.com/tgstation/tgstation/commit/97945e7d08d1457ffc27e46526a48c0453cc95e4"
-
 - files: ["tension_session.ogg"]
   license: "CC-BY-3.0"
   copyright: "Created by qwertyquerty"

diff --git a/Resources/Audio/Misc/emergency_meeting.ogg b/Resources/Audio/Misc/emergency_meeting.ogg
deleted file mode 100644 (file)
index 79bccd5..0000000
Binary files a/Resources/Audio/Misc/emergency_meeting.ogg and /dev/null differ

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
index 5d3084d353cb4bee20a1cd3ca9512bb944f2bbeb..50d6f66866a1f87677297a8f81eff480f42f1d8c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -16,7 +16,7 @@
   - type: GhostRoleMobSpawner
     prototype: MobHumanSyndicateAgent
   - type: EmitSoundOnUse
-    sound: /Audio/Misc/emergency_meeting.ogg
+    sound: /Audio/Effects/RingtoneNotes/a.ogg
   - type: ItemCooldown
   - type: UseDelay
     delay: 300

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
index 42e55816cad8508b1688ae36d6e514e9e896126b..8ba1f93bf35607a03f40536bd665494f5adf112b 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
@@ -44,7 +44,6 @@
     - collection: TrollAnimals
     - collection: TrollBeeping
     - collection: TrollEsword
-    - collection: TrollMeeting
   - type: UIFragment
     ui: !type:MechSoundboardUi
   - type: UseDelay

diff --git a/Resources/Prototypes/SoundCollections/troll.yml b/Resources/Prototypes/SoundCollections/troll.yml
index 9983f11078255c74749b4666b513d1758befa2b7..e74e4be53eae8514da1b98c2d2a84f7be3659a0b 100644 (file)
--- a/Resources/Prototypes/SoundCollections/troll.yml
+++ b/Resources/Prototypes/SoundCollections/troll.yml
@@ -36,8 +36,3 @@
   - /Audio/Weapons/ebladeoff.ogg
   - /Audio/Weapons/ebladeon.ogg
   - /Audio/Weapons/eblade1.ogg
-
-- type: soundCollection
-  id: TrollMeeting
-  files:
-  - /Audio/Misc/emergency_meeting.ogg