From d98dff6b04a84320c32157f83f3c704aee247da7 Mon Sep 17 00:00:00 2001 From: dffdff2423 Date: Tue, 17 Dec 2024 12:00:13 -0600 Subject: [PATCH 1/5] Initial Import --- .../UI/AgentIDCardBoundUserInterface.cs | 8 + .../Access/UI/AgentIDCardWindow.xaml | 4 + .../Access/UI/AgentIDCardWindow.xaml.cs | 35 + .../CartridgeLoader/Cartridges/LogProbeUi.cs | 2 +- .../Cartridges/LogProbeUiFragment.xaml | 28 +- .../Cartridges/LogProbeUiFragment.xaml.cs | 109 ++- .../Cartridges/NanoChatEntry.xaml | 48 ++ .../Cartridges/NanoChatEntry.xaml.cs | 39 + .../Cartridges/NanoChatLogEntry.xaml | 21 + .../Cartridges/NanoChatLogEntry.xaml.cs | 17 + .../Cartridges/NanoChatMessageBubble.xaml | 55 ++ .../Cartridges/NanoChatMessageBubble.xaml.cs | 62 ++ .../CartridgeLoader/Cartridges/NanoChatUi.cs | 43 + .../Cartridges/NanoChatUiFragment.xaml | 167 ++++ .../Cartridges/NanoChatUiFragment.xaml.cs | 254 ++++++ .../Cartridges/NewChatPopup.xaml | 52 ++ .../Cartridges/NewChatPopup.xaml.cs | 87 ++ Content.Client/_CD/NanoChat/NanoChatSystem.cs | 5 + .../Access/Systems/AgentIDCardSystem.cs | 53 +- .../Cartridges/LogProbeCartridgeComponent.cs | 7 + .../Cartridges/LogProbeCartridgeSystem.cs | 16 +- .../LogProbeCartridgeSystem.NanoChat.cs | 82 ++ .../Cartridges/NanoChatCartridgeComponent.cs | 26 + .../Cartridges/NanoChatCartridgeSystem.cs | 514 +++++++++++ Content.Server/_CD/NanoChat/NanoChatSystem.cs | 130 +++ .../Access/SharedAgentIDCardSystem.cs | 16 +- .../Cartridges/LogProbeUiState.cs | 11 +- .../Cartridges/NanoChatUiMessageEvent.cs | 166 ++++ .../Cartridges/NanoChatUiState.cs | 30 + .../_CD/NanoChat/NanoChatCardComponent.cs | 52 ++ .../_CD/NanoChat/SharedNanoChatSystem.cs | 273 ++++++ .../components/agent-id-card-component.ftl | 1 + .../components/nanochat-card-component.ftl | 7 + .../Entities/Objects/Devices/pda.yml | 12 + .../Objects/Misc/identification_cards.yml | 3 + .../Misc/identification_cards.yml.orig | 811 ++++++++++++++++++ .../Objects/Misc/identification_cards.yml.rej | 8 + .../Prototypes/_CD/name_identifier_groups.yml | 4 + .../_CD/Interface/VerbIcons/ATTRIBUTION.txt | 2 + .../Textures/_CD/Interface/VerbIcons/bell.svg | 5 + .../_CD/Interface/VerbIcons/bell.svg.png | Bin 0 -> 720 bytes .../_CD/Interface/VerbIcons/bell_muted.png | Bin 0 -> 355 bytes .../_CD/Misc/program_icons.rsi/meta.json | 14 + .../_CD/Misc/program_icons.rsi/nanochat.png | Bin 0 -> 725 bytes .../Devices/cartridge.rsi/cart-chat.png | Bin 0 -> 419 bytes .../Objects/Devices/cartridge.rsi/meta.json | 14 + 46 files changed, 3280 insertions(+), 13 deletions(-) create mode 100644 Content.Client/_CD/CartridgeLoader/Cartridges/NanoChatEntry.xaml create mode 100644 Content.Client/_CD/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs create mode 100644 Content.Client/_CD/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml create mode 100644 Content.Client/_CD/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml.cs create mode 100644 Content.Client/_CD/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml create mode 100644 Content.Client/_CD/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml.cs create mode 100644 Content.Client/_CD/CartridgeLoader/Cartridges/NanoChatUi.cs create mode 100644 Content.Client/_CD/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml create mode 100644 Content.Client/_CD/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs create mode 100644 Content.Client/_CD/CartridgeLoader/Cartridges/NewChatPopup.xaml create mode 100644 Content.Client/_CD/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs create mode 100644 Content.Client/_CD/NanoChat/NanoChatSystem.cs create mode 100644 Content.Server/_CD/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.NanoChat.cs create mode 100644 Content.Server/_CD/CartridgeLoader/Cartridges/NanoChatCartridgeComponent.cs create mode 100644 Content.Server/_CD/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs create mode 100644 Content.Server/_CD/NanoChat/NanoChatSystem.cs create mode 100644 Content.Shared/_CD/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs create mode 100644 Content.Shared/_CD/CartridgeLoader/Cartridges/NanoChatUiState.cs create mode 100644 Content.Shared/_CD/NanoChat/NanoChatCardComponent.cs create mode 100644 Content.Shared/_CD/NanoChat/SharedNanoChatSystem.cs create mode 100644 Resources/Locale/en-US/_CD/access/components/agent-id-card-component.ftl create mode 100644 Resources/Locale/en-US/_CD/nanochat/components/nanochat-card-component.ftl create mode 100644 Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml.orig create mode 100644 Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml.rej create mode 100644 Resources/Prototypes/_CD/name_identifier_groups.yml create mode 100644 Resources/Textures/_CD/Interface/VerbIcons/ATTRIBUTION.txt create mode 100644 Resources/Textures/_CD/Interface/VerbIcons/bell.svg create mode 100644 Resources/Textures/_CD/Interface/VerbIcons/bell.svg.png create mode 100644 Resources/Textures/_CD/Interface/VerbIcons/bell_muted.png create mode 100644 Resources/Textures/_CD/Misc/program_icons.rsi/meta.json create mode 100644 Resources/Textures/_CD/Misc/program_icons.rsi/nanochat.png create mode 100644 Resources/Textures/_CD/Objects/Devices/cartridge.rsi/cart-chat.png create mode 100644 Resources/Textures/_CD/Objects/Devices/cartridge.rsi/meta.json diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs index 050756fcd14..24934a44046 100644 --- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs +++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs @@ -26,6 +26,13 @@ protected override void Open() _window.OnNameChanged += OnNameChanged; _window.OnJobChanged += OnJobChanged; _window.OnJobIconChanged += OnJobIconChanged; + _window.OnNumberChanged += OnNumberChanged; // CD + } + + // CD - Add number change handler + private void OnNumberChanged(uint newNumber) + { + SendMessage(new AgentIDCardNumberChangedMessage(newNumber)); } private void OnNameChanged(string newName) @@ -56,6 +63,7 @@ protected override void UpdateState(BoundUserInterfaceState state) _window.SetCurrentName(cast.CurrentName); _window.SetCurrentJob(cast.CurrentJob); _window.SetAllowedIcons(cast.CurrentJobIconId); + _window.SetCurrentNumber(cast.CurrentNumber); // CD } } } diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml b/Content.Client/Access/UI/AgentIDCardWindow.xaml index 7d091e4e165..55abc04ae00 100644 --- a/Content.Client/Access/UI/AgentIDCardWindow.xaml +++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml @@ -6,6 +6,10 @@