From b21701d0330747514c345329e4ad8579d063f7d1 Mon Sep 17 00:00:00 2001 From: Bellwether Date: Mon, 17 Jun 2024 10:53:33 -0700 Subject: [PATCH 1/8] Add "Subpoenaed" to the SecHud and Criminal Records Computer --- .../Systems/CriminalRecordsConsoleSystem.cs | 4 ++++ .../Systems/SharedCriminalRecordsSystem.cs | 1 + Content.Shared/Security/SecurityStatus.cs | 6 ++++-- .../en-US/criminal-records/criminal-records.ftl | 3 +++ Resources/Prototypes/StatusIcon/security.yml | 7 +++++++ .../Misc/security_icons.rsi/hud_subpoenaed.png | Bin 0 -> 152 bytes .../Interface/Misc/security_icons.rsi/meta.json | 3 +++ 7 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Interface/Misc/security_icons.rsi/hud_subpoenaed.png diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs index bbd402b9fad..2308445b6da 100644 --- a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs +++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs @@ -128,6 +128,8 @@ private void OnChangeStatus(Entity ent, ref Cri (_, SecurityStatus.Paroled) => "paroled", // prisoner did their time (_, SecurityStatus.Discharged) => "released", + // $ DeltaV - person is subpoenaed by Justice Department + (_, SecurityStatus.Subpoenaed) => "subpoenaed", // going from any other state to wanted, AOS or prisonbreak / lazy secoff never set them to released and they reoffended (_, SecurityStatus.Wanted) => "wanted", // person is no longer sus @@ -138,6 +140,8 @@ private void OnChangeStatus(Entity ent, ref Cri (SecurityStatus.Detained, SecurityStatus.None) => "released", // criminal is no longer on parole (SecurityStatus.Paroled, SecurityStatus.None) => "not-parole", + // # DeltaV - Person is no longer under subpoena + (SecurityStatus.Subpoenaed, SecurityStatus.None) => "not-subpoenaed", // this is impossible _ => "not-wanted" }; diff --git a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsSystem.cs b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsSystem.cs index 96b33ab91bd..bab3ace8a5c 100644 --- a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsSystem.cs +++ b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsSystem.cs @@ -43,6 +43,7 @@ public void SetCriminalIcon(string name, SecurityStatus status, EntityUid charac SecurityStatus.Detained => "SecurityIconIncarcerated", SecurityStatus.Discharged => "SecurityIconDischarged", SecurityStatus.Suspected => "SecurityIconSuspected", + SecurityStatus.Subpoenaed => "SecurityIconSubpoenaed", _ => record.StatusIcon }; diff --git a/Content.Shared/Security/SecurityStatus.cs b/Content.Shared/Security/SecurityStatus.cs index c7fe3766f1f..8f404035823 100644 --- a/Content.Shared/Security/SecurityStatus.cs +++ b/Content.Shared/Security/SecurityStatus.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Security; +namespace Content.Shared.Security; /// /// Status used in Criminal Records. @@ -9,6 +9,7 @@ /// Detained - the person is detained by security /// Paroled - the person is on parole /// Discharged - the person has been released from prison +/// # DeltaV - Subpoenaed - the person has been subpoenaed by the Justice Department /// public enum SecurityStatus : byte { @@ -17,5 +18,6 @@ public enum SecurityStatus : byte Wanted, Detained, Paroled, - Discharged + Discharged, + Subpoenaed, } diff --git a/Resources/Locale/en-US/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/criminal-records/criminal-records.ftl index 6d6a97300c2..1238362f0b8 100644 --- a/Resources/Locale/en-US/criminal-records/criminal-records.ftl +++ b/Resources/Locale/en-US/criminal-records/criminal-records.ftl @@ -13,6 +13,7 @@ criminal-records-status-detained = Detained criminal-records-status-suspected = Suspect criminal-records-status-discharged = Discharged criminal-records-status-paroled = Paroled +criminal-records-status-subpoenaed = Subpoenaed criminal-records-console-wanted-reason = [color=gray]Wanted Reason[/color] criminal-records-console-suspected-reason = [color=gray]Suspected Reason[/color] @@ -39,6 +40,8 @@ criminal-records-console-released = {$name} has been released by {$officer}. criminal-records-console-not-wanted = {$officer} cleared the wanted status of {$name}. criminal-records-console-paroled = {$name} has been released on parole by {$officer}. criminal-records-console-not-parole = {$officer} cleared the parole status of {$name}. +criminal-records-console-subpoenaed = {$name} has been issued a subpoena by the Justice Department and must report to Court immediately. +criminal-records-console-not-subpoenaed = {$name} is no longer under subpoena by the Justice Department. criminal-records-console-unknown-officer = ## Filters diff --git a/Resources/Prototypes/StatusIcon/security.yml b/Resources/Prototypes/StatusIcon/security.yml index 00119fb44d2..e926ffb4b28 100644 --- a/Resources/Prototypes/StatusIcon/security.yml +++ b/Resources/Prototypes/StatusIcon/security.yml @@ -40,3 +40,10 @@ icon: sprite: /Textures/Interface/Misc/security_icons.rsi state: hud_wanted + +- type: statusIcon # DeltaV - HUD state for crew subpeonaed by Justice Dept. + parent: SecurityIcon + id: SecurityIconSubpoenaed + icon: + sprite: /Textures/Interface/Misc/security_icons.rsi + state: hud_subpoenaed diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_subpoenaed.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_subpoenaed.png new file mode 100644 index 0000000000000000000000000000000000000000..434a49122f6cb13540bbf01c44409362c34bb184 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|f;?RuLnNjq ze|R|g@A(GiA0JNsOaB67>mNMT8hWt%{(XsvggH0!^A>n4>&h?y0tFETZY5?B))UJT wW;Cpkj#TtBKfs{O%zVW9hRXJusxur6yf)&MLiNHWK+_pKUHx3vIVCg!08-5}D*ylh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json index 042eda20c6c..487d4c873a1 100644 --- a/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json @@ -21,6 +21,9 @@ }, { "name": "hud_wanted" + }, + { + "name": "hud_subpoenaed" } ] } From 09bb74c33da4d32e6045d33c0b8fb081d0aea9d4 Mon Sep 17 00:00:00 2001 From: Bellwether <157836624+BellwetherLogic@users.noreply.github.com> Date: Mon, 17 Jun 2024 12:09:42 -0700 Subject: [PATCH 2/8] Update Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Signed-off-by: Bellwether <157836624+BellwetherLogic@users.noreply.github.com> --- .../CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs index 2308445b6da..b423a59e8ab 100644 --- a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs +++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs @@ -140,7 +140,7 @@ private void OnChangeStatus(Entity ent, ref Cri (SecurityStatus.Detained, SecurityStatus.None) => "released", // criminal is no longer on parole (SecurityStatus.Paroled, SecurityStatus.None) => "not-parole", - // # DeltaV - Person is no longer under subpoena + // # DeltaV - Person is no longer subpoenaed (SecurityStatus.Subpoenaed, SecurityStatus.None) => "not-subpoenaed", // this is impossible _ => "not-wanted" From 5261e6a8b5872fd08d3f3715e6126eb10620245a Mon Sep 17 00:00:00 2001 From: Bellwether <157836624+BellwetherLogic@users.noreply.github.com> Date: Mon, 17 Jun 2024 12:17:35 -0700 Subject: [PATCH 3/8] Update Resources/Locale/en-US/criminal-records/criminal-records.ftl Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Signed-off-by: Bellwether <157836624+BellwetherLogic@users.noreply.github.com> --- Resources/Locale/en-US/criminal-records/criminal-records.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/criminal-records/criminal-records.ftl index 1238362f0b8..3eba34548cb 100644 --- a/Resources/Locale/en-US/criminal-records/criminal-records.ftl +++ b/Resources/Locale/en-US/criminal-records/criminal-records.ftl @@ -41,7 +41,7 @@ criminal-records-console-not-wanted = {$officer} cleared the wanted status of {$ criminal-records-console-paroled = {$name} has been released on parole by {$officer}. criminal-records-console-not-parole = {$officer} cleared the parole status of {$name}. criminal-records-console-subpoenaed = {$name} has been issued a subpoena by the Justice Department and must report to Court immediately. -criminal-records-console-not-subpoenaed = {$name} is no longer under subpoena by the Justice Department. +criminal-records-console-not-subpoenaed = {$name} is no longer subpoenaed by the Justice Department. criminal-records-console-unknown-officer = ## Filters From aff151b25ff7f4d7c30b9449131c53d3f0da18c8 Mon Sep 17 00:00:00 2001 From: Bellwether Date: Mon, 17 Jun 2024 12:36:39 -0700 Subject: [PATCH 4/8] Moved and commented files as requested, redesigned icon due to avoid Syndicate lookalike --- .../Systems/CriminalRecordsConsoleSystem.cs | 2 +- .../Systems/SharedCriminalRecordsSystem.cs | 2 +- Content.Shared/Security/SecurityStatus.cs | 2 +- .../en-US/criminal-records/criminal-records.ftl | 5 ++++- Resources/Prototypes/StatusIcon/security.yml | 2 +- .../Misc/security_icons.rsi/hud_subpoenaed.png | Bin 0 -> 155 bytes .../Interface/Misc/security_icons.rsi/meta.json | 14 ++++++++++++++ .../Misc/security_icons.rsi/hud_subpoenaed.png | Bin 152 -> 0 bytes .../Interface/Misc/security_icons.rsi/meta.json | 3 --- 9 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/DeltaV/Interface/Misc/security_icons.rsi/hud_subpoenaed.png create mode 100644 Resources/Textures/DeltaV/Interface/Misc/security_icons.rsi/meta.json delete mode 100644 Resources/Textures/Interface/Misc/security_icons.rsi/hud_subpoenaed.png diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs index 2308445b6da..fa64e16eb46 100644 --- a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs +++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs @@ -128,7 +128,7 @@ private void OnChangeStatus(Entity ent, ref Cri (_, SecurityStatus.Paroled) => "paroled", // prisoner did their time (_, SecurityStatus.Discharged) => "released", - // $ DeltaV - person is subpoenaed by Justice Department + // # DeltaV - person is subpoenaed by Justice Department (_, SecurityStatus.Subpoenaed) => "subpoenaed", // going from any other state to wanted, AOS or prisonbreak / lazy secoff never set them to released and they reoffended (_, SecurityStatus.Wanted) => "wanted", diff --git a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsSystem.cs b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsSystem.cs index bab3ace8a5c..195ff0f7465 100644 --- a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsSystem.cs +++ b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsSystem.cs @@ -43,7 +43,7 @@ public void SetCriminalIcon(string name, SecurityStatus status, EntityUid charac SecurityStatus.Detained => "SecurityIconIncarcerated", SecurityStatus.Discharged => "SecurityIconDischarged", SecurityStatus.Suspected => "SecurityIconSuspected", - SecurityStatus.Subpoenaed => "SecurityIconSubpoenaed", + SecurityStatus.Subpoenaed => "SecurityIconSubpoenaed", /// # DeltaV Justice Department Subpoena _ => record.StatusIcon }; diff --git a/Content.Shared/Security/SecurityStatus.cs b/Content.Shared/Security/SecurityStatus.cs index 8f404035823..0dcf81ff3b9 100644 --- a/Content.Shared/Security/SecurityStatus.cs +++ b/Content.Shared/Security/SecurityStatus.cs @@ -19,5 +19,5 @@ public enum SecurityStatus : byte Detained, Paroled, Discharged, - Subpoenaed, + Subpoenaed, /// # DeltaV - Justice Department Subpoena } diff --git a/Resources/Locale/en-US/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/criminal-records/criminal-records.ftl index 1238362f0b8..0b43b2ad813 100644 --- a/Resources/Locale/en-US/criminal-records/criminal-records.ftl +++ b/Resources/Locale/en-US/criminal-records/criminal-records.ftl @@ -41,7 +41,10 @@ criminal-records-console-not-wanted = {$officer} cleared the wanted status of {$ criminal-records-console-paroled = {$name} has been released on parole by {$officer}. criminal-records-console-not-parole = {$officer} cleared the parole status of {$name}. criminal-records-console-subpoenaed = {$name} has been issued a subpoena by the Justice Department and must report to Court immediately. -criminal-records-console-not-subpoenaed = {$name} is no longer under subpoena by the Justice Department. + +## Delta-V Security Channel Notifications - Justice Dept. Subpoena + +criminal-records-console-not-subpoenaed = {$name} is no longer subpoenaed by the Justice Department. criminal-records-console-unknown-officer = ## Filters diff --git a/Resources/Prototypes/StatusIcon/security.yml b/Resources/Prototypes/StatusIcon/security.yml index e926ffb4b28..88d30cbd817 100644 --- a/Resources/Prototypes/StatusIcon/security.yml +++ b/Resources/Prototypes/StatusIcon/security.yml @@ -45,5 +45,5 @@ parent: SecurityIcon id: SecurityIconSubpoenaed icon: - sprite: /Textures/Interface/Misc/security_icons.rsi + sprite: /Textures/DeltaV/Interface/Misc/security_icons.rsi state: hud_subpoenaed diff --git a/Resources/Textures/DeltaV/Interface/Misc/security_icons.rsi/hud_subpoenaed.png b/Resources/Textures/DeltaV/Interface/Misc/security_icons.rsi/hud_subpoenaed.png new file mode 100644 index 0000000000000000000000000000000000000000..de132822195b61875315750bcf3b504f6f1864bf GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|LOop^LnNjq ze|R|g@A(GiA0JNsOaB67>mNMT8hWt%{(XsvggH0!^A>n4>&h?y0tFETZY5^5m~V#} yx;RfmNMT8hWt%{(XsvggH0!^A>n4>&h?y0tFETZY5?B))UJT wW;Cpkj#TtBKfs{O%zVW9hRXJusxur6yf)&MLiNHWK+_pKUHx3vIVCg!08-5}D*ylh diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json index 487d4c873a1..042eda20c6c 100644 --- a/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json @@ -21,9 +21,6 @@ }, { "name": "hud_wanted" - }, - { - "name": "hud_subpoenaed" } ] } From aafc4a11b78efe32aaaa67a1ad3f8c414752c181 Mon Sep 17 00:00:00 2001 From: Bellwether Date: Mon, 17 Jun 2024 15:08:12 -0700 Subject: [PATCH 5/8] moved some .ftl business so it's properly commented --- Resources/Locale/en-US/criminal-records/criminal-records.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/criminal-records/criminal-records.ftl index 30ab8a3e015..b3d698bc76d 100644 --- a/Resources/Locale/en-US/criminal-records/criminal-records.ftl +++ b/Resources/Locale/en-US/criminal-records/criminal-records.ftl @@ -13,7 +13,6 @@ criminal-records-status-detained = Detained criminal-records-status-suspected = Suspect criminal-records-status-discharged = Discharged criminal-records-status-paroled = Paroled -criminal-records-status-subpoenaed = Subpoenaed criminal-records-console-wanted-reason = [color=gray]Wanted Reason[/color] criminal-records-console-suspected-reason = [color=gray]Suspected Reason[/color] @@ -44,6 +43,7 @@ criminal-records-console-unknown-officer = ## DeltaV - Justice Department Subpoena +criminal-records-status-subpoenaed = Subpoenaed criminal-records-console-subpoenaed = {$name} has been issued a subpoena by the Justice Department and must report to Court immediately. criminal-records-console-not-subpoenaed = {$name} is no longer subpoenaed by the Justice Department. From 3dfe86be427fd99ded937be081396f807ce08c55 Mon Sep 17 00:00:00 2001 From: Bellwether Date: Tue, 18 Jun 2024 11:00:15 -0700 Subject: [PATCH 6/8] Attempting to slay a rogue byte order mark --- Content.Shared/Security/SecurityStatus.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Security/SecurityStatus.cs b/Content.Shared/Security/SecurityStatus.cs index 0dcf81ff3b9..8487362fd0f 100644 --- a/Content.Shared/Security/SecurityStatus.cs +++ b/Content.Shared/Security/SecurityStatus.cs @@ -9,7 +9,7 @@ namespace Content.Shared.Security; /// Detained - the person is detained by security /// Paroled - the person is on parole /// Discharged - the person has been released from prison -/// # DeltaV - Subpoenaed - the person has been subpoenaed by the Justice Department +/// # DeltaV - Subpoenaed - the person has been subpoenaed by the Justice Dept. /// public enum SecurityStatus : byte { From 9abb855107124e2932107b92b8f3922212bb5a12 Mon Sep 17 00:00:00 2001 From: Bellwether Date: Tue, 18 Jun 2024 11:38:55 -0700 Subject: [PATCH 7/8] necromancy upon falsely slain byte order mark --- Content.Shared/Security/SecurityStatus.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Security/SecurityStatus.cs b/Content.Shared/Security/SecurityStatus.cs index 8487362fd0f..f98ce1399e6 100644 --- a/Content.Shared/Security/SecurityStatus.cs +++ b/Content.Shared/Security/SecurityStatus.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Security; +namespace Content.Shared.Security; /// /// Status used in Criminal Records. From 8e64d2be05f0c061d299b8d561ab78429d94418f Mon Sep 17 00:00:00 2001 From: Bellwether Date: Fri, 21 Jun 2024 11:54:25 -0700 Subject: [PATCH 8/8] Moving things into DeltaV namespace --- .../Locale/en-US/criminal-records/criminal-records.ftl | 6 ------ .../en-US/deltav/criminal-records/criminal-records.ftl | 5 +++++ Resources/Prototypes/DeltaV/StatusIcon/security.yml | 6 ++++++ Resources/Prototypes/StatusIcon/security.yml | 7 ------- 4 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/criminal-records/criminal-records.ftl create mode 100644 Resources/Prototypes/DeltaV/StatusIcon/security.yml diff --git a/Resources/Locale/en-US/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/criminal-records/criminal-records.ftl index b3d698bc76d..6d6a97300c2 100644 --- a/Resources/Locale/en-US/criminal-records/criminal-records.ftl +++ b/Resources/Locale/en-US/criminal-records/criminal-records.ftl @@ -41,12 +41,6 @@ criminal-records-console-paroled = {$name} has been released on parole by {$offi criminal-records-console-not-parole = {$officer} cleared the parole status of {$name}. criminal-records-console-unknown-officer = -## DeltaV - Justice Department Subpoena - -criminal-records-status-subpoenaed = Subpoenaed -criminal-records-console-subpoenaed = {$name} has been issued a subpoena by the Justice Department and must report to Court immediately. -criminal-records-console-not-subpoenaed = {$name} is no longer subpoenaed by the Justice Department. - ## Filters criminal-records-filter-placeholder = Input text and press "Enter" diff --git a/Resources/Locale/en-US/deltav/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/deltav/criminal-records/criminal-records.ftl new file mode 100644 index 00000000000..2659f8651a7 --- /dev/null +++ b/Resources/Locale/en-US/deltav/criminal-records/criminal-records.ftl @@ -0,0 +1,5 @@ +## DeltaV - Justice Department Subpoena + +criminal-records-status-subpoenaed = Subpoenaed +criminal-records-console-subpoenaed = {$name} has been issued a subpoena by the Justice Department and must report to Court immediately. +criminal-records-console-not-subpoenaed = {$name} is no longer subpoenaed by the Justice Department. diff --git a/Resources/Prototypes/DeltaV/StatusIcon/security.yml b/Resources/Prototypes/DeltaV/StatusIcon/security.yml new file mode 100644 index 00000000000..71d4edd9f13 --- /dev/null +++ b/Resources/Prototypes/DeltaV/StatusIcon/security.yml @@ -0,0 +1,6 @@ +- type: statusIcon # DeltaV - HUD state for crew subpeonaed by Justice Dept. + parent: SecurityIcon + id: SecurityIconSubpoenaed + icon: + sprite: /Textures/DeltaV/Interface/Misc/security_icons.rsi + state: hud_subpoenaed diff --git a/Resources/Prototypes/StatusIcon/security.yml b/Resources/Prototypes/StatusIcon/security.yml index 88d30cbd817..00119fb44d2 100644 --- a/Resources/Prototypes/StatusIcon/security.yml +++ b/Resources/Prototypes/StatusIcon/security.yml @@ -40,10 +40,3 @@ icon: sprite: /Textures/Interface/Misc/security_icons.rsi state: hud_wanted - -- type: statusIcon # DeltaV - HUD state for crew subpeonaed by Justice Dept. - parent: SecurityIcon - id: SecurityIconSubpoenaed - icon: - sprite: /Textures/DeltaV/Interface/Misc/security_icons.rsi - state: hud_subpoenaed