diff --git a/Resources/Audio/Misc/attributions.yml b/Resources/Audio/Misc/attributions.yml index 8db3d9ea8d..773d1e6e4e 100644 --- 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 index 79bccd53a9..0000000000 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 5d3084d353..50d6f66866 100644 --- 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 42e55816ca..8ba1f93bf3 100644 --- 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 9983f11078..e74e4be53e 100644 --- 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