diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index a780bd5c41e..c5ebde6ba05 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -237,6 +237,7 @@ Auto Patrol: []"},
if(user) src.oldtarget_name = user.name
src.last_found = world.time
src.anchored = 0
+ src.declare_arrests = 0
src.emagged = 2
src.on = 1
src.icon_state = "[lasercolor]ed209[src.on]"
@@ -1006,4 +1007,4 @@ Auto Patrol: []"},
var/area/location = get_area(src)
for(var/mob/living/carbon/human/human in world)
if((human.z == src.z) && istype(human.glasses, /obj/item/clothing/glasses/hud/security) && !human.blinded)
- human << "\icon[human.glasses] [src.name] requesting assistance [arrest_type ? "detaining" : "arresting"] scumbag [target] in [location]"
+ human << "\icon[human.glasses] [src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] [target] in [location]"
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index 428bf0aece4..0d633fe1b45 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -222,6 +222,7 @@ Auto Patrol: []"},
if(user) src.oldtarget_name = user.name
src.last_found = world.time
src.anchored = 0
+ src.declare_arrests = 0
src.emagged = 2
src.on = 1
src.icon_state = "secbot[src.on]"
@@ -788,4 +789,4 @@ Auto Patrol: []"},
var/area/location = get_area(src)
for(var/mob/living/carbon/human/human in world)
if((human.z == src.z) && istype(human.glasses, /obj/item/clothing/glasses/hud/security) && !human.blinded)
- human << "\icon[human.glasses] [src.name] requesting assistance [arrest_type ? "detaining" : "arresting"] scumbag [target] in [location]"
+ human << "\icon[human.glasses] [src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] [target] in [location]"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 144325adf7c..2593f80bb60 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1620,18 +1620,8 @@
//Check for ID
var/obj/item/weapon/card/id/idcard = get_idcard()
- if(!idcard)
- threatcount += 1
- if(judgebot.idcheck)
- threatcount += 3
-
- //Loyalty implants imply trustworthyness
- if(isloyal(src))
- threatcount -= 1
-
- //Agent cards lower threatlevel.
- if(istype(idcard, /obj/item/weapon/card/id/syndicate))
- threatcount -= 2
+ if(judgebot.idcheck && !idcard)
+ threatcount += 4
//Check for weapons
if(judgebot.weaponscheck)
@@ -1647,8 +1637,14 @@
if(judgebot.check_records)
var/perpname = get_face_name(get_id_name())
var/datum/data/record/R = find_record("name", perpname, data_core.security)
- if(R && (R.fields["criminal"] == "*Arrest*"))
- threatcount += 5
+ if(R && R.fields["criminal"])
+ switch(R.fields["criminal"])
+ if("*Arrest*")
+ threatcount += 5
+ if("Incarcerated")
+ threatcount += 2
+ if("Parolled")
+ threatcount += 2
//Check for dresscode violations
if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/rig/wizard))
@@ -1656,9 +1652,17 @@
//Check for nonhuman scum
if(dna && dna.mutantrace && dna.mutantrace != "none")
- threatcount += 2
+ threatcount += 1
+
+ //Loyalty implants imply trustworthyness
+ if(isloyal(src))
+ threatcount -= 1
+
+ //Agent cards lower threatlevel.
+ if(istype(idcard, /obj/item/weapon/card/id/syndicate))
+ threatcount -= 2
return threatcount
/mob/living/carbon/human/canBeHandcuffed()
- return 1
\ No newline at end of file
+ return 1