Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "Subpoenaed" status for SecHud and Criminal Records Computer #1405

Merged
merged 15 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ private void OnChangeStatus(Entity<CriminalRecordsConsoleComponent> 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
Expand All @@ -138,6 +140,8 @@ private void OnChangeStatus(Entity<CriminalRecordsConsoleComponent> 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
BellwetherLogic marked this conversation as resolved.
Show resolved Hide resolved
(SecurityStatus.Subpoenaed, SecurityStatus.None) => "not-subpoenaed",
// this is impossible
_ => "not-wanted"
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
};

Expand Down
6 changes: 4 additions & 2 deletions Content.Shared/Security/SecurityStatus.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Content.Shared.Security;
namespace Content.Shared.Security;

BellwetherLogic marked this conversation as resolved.
Show resolved Hide resolved
/// <summary>
/// Status used in Criminal Records.
Expand All @@ -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
/// </summary>
public enum SecurityStatus : byte
{
Expand All @@ -17,5 +18,6 @@ public enum SecurityStatus : byte
Wanted,
Detained,
Paroled,
Discharged
Discharged,
Subpoenaed,
}
BellwetherLogic marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/criminal-records/criminal-records.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
BellwetherLogic marked this conversation as resolved.
Show resolved Hide resolved

criminal-records-console-wanted-reason = [color=gray]Wanted Reason[/color]
criminal-records-console-suspected-reason = [color=gray]Suspected Reason[/color]
Expand All @@ -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.
BellwetherLogic marked this conversation as resolved.
Show resolved Hide resolved
criminal-records-console-not-subpoenaed = {$name} is no longer under subpoena by the Justice Department.
BellwetherLogic marked this conversation as resolved.
Show resolved Hide resolved
criminal-records-console-unknown-officer = <unknown officer>

## Filters
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/StatusIcon/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
BellwetherLogic marked this conversation as resolved.
Show resolved Hide resolved
parent: SecurityIcon
id: SecurityIconSubpoenaed
icon:
sprite: /Textures/Interface/Misc/security_icons.rsi
state: hud_subpoenaed
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
NullWanderer marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
},
{
"name": "hud_wanted"
},
{
"name": "hud_subpoenaed"
}
]
}
Loading