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 6aba2a7bdfc..c945e96055f 100644 Binary files a/icons/mob/huds/hud.dmi and b/icons/mob/huds/hud.dmi differ