From fc558e41eac1d6e6c57b02de92eed7590895a848 Mon Sep 17 00:00:00 2001 From: Evaisa Date: Mon, 3 Nov 2025 23:55:28 +0100 Subject: [PATCH] compiles properly now (cherry picked from commit a000c7b35937bbfc94909cf2da092e90a27161f1) --- .../CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Content.Server/_DV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/_DV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs index 65a657f1ff..a6d3829d07 100644 --- a/Content.Server/_DV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs +++ b/Content.Server/_DV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs @@ -788,8 +788,8 @@ public sealed class NanoChatCartridgeSystem : EntitySystem jobTitle = idCard.LocalizedJobTitle; name = idCard.FullName ?? name; // Funky Station Start - Department Sorting: Get primary department - if (idCard.JobDepartments.Count > 0) - department = idCard.JobDepartments[0]; + if (idCard.JobDepartments is { } depts && depts.Count > 0) + department = depts[0].ToString(); // Funky Station End - Department Sorting } @@ -821,7 +821,9 @@ public sealed class NanoChatCartridgeSystem : EntitySystem { // Funky Station Start - Department Sorting: Include department and job title in contacts var jobTitle = idCardComponent.LocalizedJobTitle; - var department = idCardComponent.JobDepartments.Count > 0 ? idCardComponent.JobDepartments[0].ToString() : null; + string? department = null; + if (idCardComponent.JobDepartments is { } depts && depts.Count > 0) + department = depts[0].ToString(); contacts.Add(new NanoChatRecipient(nanoChatNumber, fullName, jobTitle, department)); // Funky Station End - Department Sorting }