From 8c47d6103fac3053da73bbab8ee8917a30579338 Mon Sep 17 00:00:00 2001 From: TheDarkElites <73414180+TheDarkElites@users.noreply.github.com> Date: Tue, 8 Feb 2022 04:39:23 -0500 Subject: [PATCH] Add PDA Ringtones (#5842) Co-authored-by: metalgearsloth --- Content.Client/Entry/IgnoredComponents.cs | 1 + Content.Client/PDA/PDABoundUserInterface.cs | 5 + Content.Client/PDA/PDAMenu.xaml | 9 +- .../PDA/Ringer/RingerBoundUserInterface.cs | 111 ++++++++++++++ Content.Client/PDA/Ringer/RingtoneMenu.xaml | 73 ++++++++++ .../PDA/Ringer/RingtoneMenu.xaml.cs | 105 ++++++++++++++ Content.Server/PDA/PDASystem.cs | 15 ++ Content.Server/PDA/Ringer/RingerComponent.cs | 27 ++++ Content.Server/PDA/Ringer/RingerSystem.cs | 136 ++++++++++++++++++ Content.Shared/PDA/PDAMessagesUI.cs | 8 ++ Content.Shared/PDA/Ringer/RingerMessagesUI.cs | 24 ++++ .../PDA/Ringer/RingerUpdateState.cs | 20 +++ Content.Shared/PDA/Ringer/RingerVisuals.cs | 12 ++ Content.Shared/PDA/SharedRingerSystem.cs | 29 ++++ Resources/Audio/Effects/RingtoneNotes/a.ogg | Bin 0 -> 6954 bytes .../Audio/Effects/RingtoneNotes/asharp.ogg | Bin 0 -> 7333 bytes Resources/Audio/Effects/RingtoneNotes/b.ogg | Bin 0 -> 6865 bytes Resources/Audio/Effects/RingtoneNotes/c.ogg | Bin 0 -> 9158 bytes .../Audio/Effects/RingtoneNotes/csharp.ogg | Bin 0 -> 8263 bytes Resources/Audio/Effects/RingtoneNotes/d.ogg | Bin 0 -> 8305 bytes .../Audio/Effects/RingtoneNotes/dsharp.ogg | Bin 0 -> 7944 bytes Resources/Audio/Effects/RingtoneNotes/e.ogg | Bin 0 -> 7902 bytes Resources/Audio/Effects/RingtoneNotes/f.ogg | Bin 0 -> 7655 bytes .../Audio/Effects/RingtoneNotes/fsharp.ogg | Bin 0 -> 7685 bytes Resources/Audio/Effects/RingtoneNotes/g.ogg | Bin 0 -> 7255 bytes .../Audio/Effects/RingtoneNotes/gsharp.ogg | Bin 0 -> 6911 bytes .../en-US/pda/Ringer/ringer-component.ftl | 12 ++ Resources/Locale/en-US/pda/pda-component.ftl | 2 + .../Entities/Objects/Devices/pda.yml | 3 + 29 files changed, 590 insertions(+), 2 deletions(-) create mode 100644 Content.Client/PDA/Ringer/RingerBoundUserInterface.cs create mode 100644 Content.Client/PDA/Ringer/RingtoneMenu.xaml create mode 100644 Content.Client/PDA/Ringer/RingtoneMenu.xaml.cs create mode 100644 Content.Server/PDA/Ringer/RingerComponent.cs create mode 100644 Content.Server/PDA/Ringer/RingerSystem.cs create mode 100644 Content.Shared/PDA/Ringer/RingerMessagesUI.cs create mode 100644 Content.Shared/PDA/Ringer/RingerUpdateState.cs create mode 100644 Content.Shared/PDA/Ringer/RingerVisuals.cs create mode 100644 Content.Shared/PDA/SharedRingerSystem.cs create mode 100644 Resources/Audio/Effects/RingtoneNotes/a.ogg create mode 100644 Resources/Audio/Effects/RingtoneNotes/asharp.ogg create mode 100644 Resources/Audio/Effects/RingtoneNotes/b.ogg create mode 100644 Resources/Audio/Effects/RingtoneNotes/c.ogg create mode 100644 Resources/Audio/Effects/RingtoneNotes/csharp.ogg create mode 100644 Resources/Audio/Effects/RingtoneNotes/d.ogg create mode 100644 Resources/Audio/Effects/RingtoneNotes/dsharp.ogg create mode 100644 Resources/Audio/Effects/RingtoneNotes/e.ogg create mode 100644 Resources/Audio/Effects/RingtoneNotes/f.ogg create mode 100644 Resources/Audio/Effects/RingtoneNotes/fsharp.ogg create mode 100644 Resources/Audio/Effects/RingtoneNotes/g.ogg create mode 100644 Resources/Audio/Effects/RingtoneNotes/gsharp.ogg create mode 100644 Resources/Locale/en-US/pda/Ringer/ringer-component.ftl diff --git a/Content.Client/Entry/IgnoredComponents.cs b/Content.Client/Entry/IgnoredComponents.cs index ec7baa6e5c..1541c4cd57 100644 --- a/Content.Client/Entry/IgnoredComponents.cs +++ b/Content.Client/Entry/IgnoredComponents.cs @@ -134,6 +134,7 @@ namespace Content.Client.Entry "Airtight", "MovedByPressure", "Spray", + "Ringer", "Vapor", "AddAccentClothing", "DamageOnHighSpeedImpact", diff --git a/Content.Client/PDA/PDABoundUserInterface.cs b/Content.Client/PDA/PDABoundUserInterface.cs index 23b4ae1166..9b280b602d 100644 --- a/Content.Client/PDA/PDABoundUserInterface.cs +++ b/Content.Client/PDA/PDABoundUserInterface.cs @@ -48,6 +48,11 @@ namespace Content.Client.PDA SendMessage(new PDAShowUplinkMessage()); }; + _menu.AccessRingtoneButton.OnPressed += _ => + { + SendMessage(new PDAShowRingtoneMessage()); + }; + } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/PDA/PDAMenu.xaml b/Content.Client/PDA/PDAMenu.xaml index 7ed16b08c8..95ae6eba65 100644 --- a/Content.Client/PDA/PDAMenu.xaml +++ b/Content.Client/PDA/PDAMenu.xaml @@ -1,7 +1,7 @@  + MinSize="576 256" + SetSize="576 256"> +