From a25ea88e999b66c57808eb5ead241e958b0745aa Mon Sep 17 00:00:00 2001 From: Milon Date: Thu, 5 Dec 2024 18:49:46 +0100 Subject: [PATCH] real?? --- .../DeltaV/NanoChat/NanoChatSystem.cs | 6 ++--- .../DeltaV/Entities/Objects/Devices/pda.yml | 3 +++ .../DeltaV/name_identifier_groups.yml | 4 +++ .../Entities/Objects/Devices/pda.yml | 26 ++++++++++++++++--- .../Objects/Misc/identification_cards.yml | 2 ++ .../Entities/Objects/Devices/pda.yml | 2 ++ 6 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/name_identifier_groups.yml diff --git a/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs b/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs index 52ce242f6db..fb0ca32aa66 100644 --- a/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs +++ b/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs @@ -21,12 +21,12 @@ public sealed class NanoChatSystem : SharedNanoChatSystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly NameIdentifierSystem _name = default!; - private readonly ProtoId _nameIdentifierGroup = "GenericNumber"; // recycling + private readonly ProtoId _nameIdentifierGroup = "NanoChat"; public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnCardInit); + SubscribeLocalEvent(OnCardInit); SubscribeLocalEvent(OnMicrowaved, after: [typeof(IdCardSystem)]); } @@ -117,7 +117,7 @@ private string ScrambleText(string text) return new string(chars); } - private void OnCardInit(Entity ent, ref ComponentInit args) + private void OnCardInit(Entity ent, ref MapInitEvent args) { if (ent.Comp.Number != null) return; diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index c2f1b90f741..99b9fd5ed8c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -24,6 +24,7 @@ - NewsReaderCartridge - CrimeAssistCartridge - SecWatchCartridge + - NanoChatCartridge - type: Pda id: BrigmedicIDCard state: pda-corpsman @@ -58,6 +59,7 @@ - NewsReaderCartridge - CrimeAssistCartridge - SecWatchCartridge + - NanoChatCartridge - type: entity parent: BaseJusticePDA @@ -186,6 +188,7 @@ - NotekeeperCartridge - NewsReaderCartridge - MailMetricsCartridge + - NanoChatCartridge ## Alternate Job Titles diff --git a/Resources/Prototypes/DeltaV/name_identifier_groups.yml b/Resources/Prototypes/DeltaV/name_identifier_groups.yml new file mode 100644 index 00000000000..aeb5cf152ad --- /dev/null +++ b/Resources/Prototypes/DeltaV/name_identifier_groups.yml @@ -0,0 +1,4 @@ +# used by the nanochatcard numbers +- type: nameIdentifierGroup + id: NanoChat + maxValue: 9999 diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 9eb8b32929d..4dd33780939 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -80,6 +80,7 @@ - CrewManifestCartridge - NotekeeperCartridge - NewsReaderCartridge + - NanoChatCartridge # DeltaV cartridgeSlot: priority: -1 name: device-pda-slot-component-slot-name-cartridge @@ -124,13 +125,13 @@ abstract: true components: - type: CartridgeLoader - diskSpace: 7 # DeltaV: increase cartridge space by 2 to fit our extra cartridges preinstalled: - CrewManifestCartridge - NotekeeperCartridge - NewsReaderCartridge - CrimeAssistCartridge # DeltaV - SecWatchCartridge # DeltaV: SecWatch replaces WantedList + - NanoChatCartridge # DeltaV - type: entity parent: BasePDA @@ -144,6 +145,7 @@ - NotekeeperCartridge - NewsReaderCartridge - MedTekCartridge + - NanoChatCartridge # DeltaV - type: entity parent: BasePDA @@ -399,6 +401,7 @@ - NewsReaderCartridge - MailMetricsCartridge # DeltaV - MailMetrics courier tracker - StockTradingCartridge # DeltaV - StockTrading + - NanoChatCartridge # DeltaV - type: entity parent: BasePDA @@ -419,6 +422,7 @@ - NotekeeperCartridge - NewsReaderCartridge - StockTradingCartridge # DeltaV - StockTrading + - NanoChatCartridge # DeltaV - type: entity parent: BasePDA @@ -441,6 +445,7 @@ - NotekeeperCartridge - NewsReaderCartridge - AstroNavCartridge + - NanoChatCartridge # DeltaV - type: entity parent: BasePDA @@ -694,6 +699,7 @@ - NotekeeperCartridge - NewsReaderCartridge - GlimmerMonitorCartridge + - NanoChatCartridge # DeltaV - type: entity parent: BasePDA @@ -715,6 +721,7 @@ - NotekeeperCartridge - NewsReaderCartridge - GlimmerMonitorCartridge + - NanoChatCartridge # DeltaV - type: entity parent: BaseSecurityPDA @@ -738,6 +745,7 @@ - CrimeAssistCartridge # DeltaV - SecWatchCartridge # DeltaV: SecWatch replaces WantedList - LogProbeCartridge + - NanoChatCartridge # DeltaV - type: entity parent: BaseSecurityPDA @@ -796,6 +804,7 @@ - SecWatchCartridge # DeltaV: SecWatch replaces WantedList - LogProbeCartridge - AstroNavCartridge + - NanoChatCartridge # DeltaV - type: entity parent: CentcomPDA @@ -811,14 +820,17 @@ silent: true - type: CartridgeLoader uiKey: enum.PdaUiKey.Key -# notificationsEnabled: false + notificationsEnabled: false preinstalled: - CrewManifestCartridge - - NotekeeperCartridge + # - NotekeeperCartridge # DeltaV - we're out of disk space, they dont need notes - NewsReaderCartridge - LogProbeCartridge + - SecWatchCartridge # DeltaV: SecWatch replaces WantedList + - MedTekCartridge + - AstroNavCartridge - StockTradingCartridge # Delta-V - - NanoChatCartridge + - NanoChatCartridge # DeltaV - type: entity parent: CentcomPDA @@ -912,6 +924,7 @@ uiKey: enum.PdaUiKey.Key preinstalled: - NotekeeperCartridge + - NanoChatCartridge # DeltaV - type: entity parent: BaseSecurityPDA @@ -939,6 +952,7 @@ - SecWatchCartridge # DeltaV: SecWatch replaces WantedList - LogProbeCartridge - AstroNavCartridge + - NanoChatCartridge # DeltaV - type: entity parent: ERTLeaderPDA @@ -1043,6 +1057,7 @@ - NotekeeperCartridge - NewsReaderCartridge - StockTradingCartridge # DeltaV - StockTrading + - NanoChatCartridge # DeltaV - type: entity parent: BasePDA @@ -1094,6 +1109,7 @@ - CrimeAssistCartridge # DeltaV - SecWatchCartridge # DeltaV: SecWatch replaces WantedList - LogProbeCartridge + - NanoChatCartridge # DeltaV - type: entity parent: BaseMedicalPDA @@ -1118,6 +1134,7 @@ - CrimeAssistCartridge # DeltaV - SecWatchCartridge # DeltaV: SecWatch replaces WantedList - MedTekCartridge + - NanoChatCartridge # DeltaV - type: entity parent: ClownPDA @@ -1234,3 +1251,4 @@ preinstalled: - NotekeeperCartridge - MedTekCartridge + - NanoChatCartridge # DeltaV diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 0c6d195135f..bc829765fef 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -828,3 +828,5 @@ - NuclearOperative - SyndicateAgent - DV-SpareSafe # DeltaV + - type: NanoChatCard # DeltaV + notificationsMuted: true diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml index bbc83269c72..08a3aa82ca3 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml @@ -40,6 +40,7 @@ - NewsReaderCartridge - CrimeAssistCartridge - SecWatchCartridge + - NanoChatCartridge - type: entity parent: CourierPDA # DeltaV - Gives them the MailMetrics cartbridge @@ -114,3 +115,4 @@ - NotekeeperCartridge - NewsReaderCartridge - GlimmerMonitorCartridge + - NanoChatCartridge