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 all commits
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 subpoenaed
(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", /// # DeltaV Justice Department Subpoena
_ => record.StatusIcon
};

Expand Down
4 changes: 3 additions & 1 deletion Content.Shared/Security/SecurityStatus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 Dept.
/// </summary>
public enum SecurityStatus : byte
{
Expand All @@ -17,5 +18,6 @@ public enum SecurityStatus : byte
Wanted,
Detained,
Paroled,
Discharged
Discharged,
Subpoenaed, /// # DeltaV - Justice Department Subpoena
}
Original file line number Diff line number Diff line change
@@ -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.
6 changes: 6 additions & 0 deletions Resources/Prototypes/DeltaV/StatusIcon/security.yml
Original file line number Diff line number Diff line change
@@ -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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "sprite by Bellwether (Discord)",
"size": {
"x": 8,
"y": 8
},
"states": [
{
"name": "hud_subpoenaed"
}
]
}
Loading