From 6d2d59c742bf89f8bb842755dfc77a4dd4e6b3dc Mon Sep 17 00:00:00 2001
From: AtoriBirb <86748337+AtoriBirb@users.noreply.github.com>
Date: Wed, 9 Mar 2022 20:46:21 -0600
Subject: [PATCH] Adds "Suspected" to available sec record tags (#65339)
add: A new intermediate tag for sec huds called "Suspected"
---
code/game/data_huds.dm | 3 +++
code/game/machinery/computer/security.dm | 10 +++++++++-
code/game/machinery/computer/warrant.dm | 2 ++
code/modules/mob/living/carbon/human/human.dm | 4 +++-
icons/mob/huds/hud.dmi | Bin 9168 -> 9227 bytes
5 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index b2a2d51af76..89dbe87a976 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -288,6 +288,9 @@ Security HUDs! Basic mode shows only the job.
if("Incarcerated")
holder.icon_state = "hudincarcerated"
return
+ if("Suspected")
+ holder.icon_state = "hudsuspected"
+ return
if("Paroled")
holder.icon_state = "hudparolled"
return
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 48e77788fdf..44470aff4bb 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -28,6 +28,7 @@
#define COMP_STATE_ARREST "*Arrest*"
#define COMP_STATE_PRISONER "Incarcerated"
+#define COMP_STATE_SUSPECTED "Suspected"
#define COMP_STATE_PAROL "Paroled"
#define COMP_STATE_DISCHARGED "Discharged"
#define COMP_STATE_NONE "None"
@@ -134,6 +135,7 @@
var/static/list/component_options = list(
COMP_STATE_ARREST,
COMP_STATE_PRISONER,
+ COMP_STATE_SUSPECTED,
COMP_STATE_PAROL,
COMP_STATE_DISCHARGED,
COMP_STATE_NONE,
@@ -181,6 +183,7 @@
#undef COMP_STATE_ARREST
#undef COMP_STATE_PRISONER
+#undef COMP_STATE_SUSPECTED
#undef COMP_STATE_PAROL
#undef COMP_STATE_DISCHARGED
#undef COMP_STATE_NONE
@@ -297,6 +300,8 @@
background = "'background-color:#990000;'"
if("Incarcerated")
background = "'background-color:#CD6500;'"
+ if("Suspected")
+ background = "'background-color:#CD6500;'"
if("Paroled")
background = "'background-color:#CD6500;'"
if("Discharged")
@@ -894,6 +899,7 @@ What a mess.*/
temp += "
None"
temp += "*Arrest*"
temp += "Incarcerated"
+ temp += "Suspected"
temp += "Paroled"
temp += "Discharged"
temp += ""
@@ -945,6 +951,8 @@ What a mess.*/
active2.fields["criminal"] = "*Arrest*"
if("incarcerated")
active2.fields["criminal"] = "Incarcerated"
+ if("suspected")
+ active2.fields["criminal"] = "Suspected"
if("paroled")
active2.fields["criminal"] = "Paroled"
if("released")
@@ -1021,7 +1029,7 @@ What a mess.*/
if(3)
R.fields["age"] = rand(5, 85)
if(4)
- R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Paroled", "Discharged")
+ R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Suspected", "Paroled", "Discharged")
if(5)
R.fields["p_stat"] = pick("*Unconscious*", "Active", "Physically Unfit")
if(6)
diff --git a/code/game/machinery/computer/warrant.dm b/code/game/machinery/computer/warrant.dm
index a8c3e8bd331..f592ebd1a08 100644
--- a/code/game/machinery/computer/warrant.dm
+++ b/code/game/machinery/computer/warrant.dm
@@ -23,6 +23,8 @@
notice = "
**REPORT TO THE BRIG**"
if("Incarcerated")
background = "background-color:#CD6500;"
+ if("Suspected")
+ background = "background-color:#CD6500;"
if("Paroled")
background = "background-color:#CD6500;"
if("Discharged")
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 10e03e5c10f..0bf5ae9fe6f 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -248,7 +248,7 @@
to_chat(usr, span_warning("ERROR: Unable to locate data core entry for target."))
return
if(href_list["status"])
- var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Paroled", "Discharged", "Cancel")
+ var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Suspected", "Paroled", "Discharged", "Cancel")
if(setcriminal != "Cancel")
if(!R)
return
@@ -445,6 +445,8 @@
threatcount += 5
if("Incarcerated")
threatcount += 2
+ if("Suspected")
+ threatcount += 2
if("Paroled")
threatcount += 2
diff --git a/icons/mob/huds/hud.dmi b/icons/mob/huds/hud.dmi
index 6aba2a7bdfc25462bfebf922db8566e608f87206..c945e96055f7e5f48b1309a90119822c04a35590 100644
GIT binary patch
literal 9227
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