From 3452f936928f8a0704427ebdbf1db7e67b27f2d4 Mon Sep 17 00:00:00 2001
From: carnie <elly1989@rocketmail.com>
Date: Thu, 22 Aug 2013 13:05:14 +0100
Subject: [PATCH] Finalizing fixes

---
 .../mob/living/carbon/human/examine.dm        | 19 ++++++++-----------
 code/modules/mob/living/carbon/human/human.dm |  5 +++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 4118ec7dc7d..593222a8357 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -273,19 +273,16 @@
 	if(istype(usr, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = usr
 		if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud))
-			if(usr.stat || usr == src) //|| !usr.canmove || usr.restrained()) Fluff: Sechuds have eye-tracking technology and sets 'arrest' to people that the wearer looks and blinks at.
-				return													  //Non-fluff: This allows sec to set people to arrest as they get disarmed or beaten
+			if(!usr.stat && usr != src) //|| !usr.canmove || usr.restrained()) Fluff: Sechuds have eye-tracking technology and sets 'arrest' to people that the wearer looks and blinks at.
+				var/criminal = "None"
 
-			var/criminal = "None"
+				var/perpname = get_face_name(get_id_name(""))
+				if(perpname)
+					var/datum/data/record/R = find_record("name", perpname, data_core.security)
+					if(R)
+						criminal = R.fields["criminal"]
 
-			var/perpname = get_face_name(get_id_name(""))
-			if(perpname)
-				var/datum/data/record/R = find_record("name", perpname, data_core.security)
-				if(R)
-					criminal = R.fields["criminal"]
-
-				msg += "<span class = 'deptradio'>Criminal status:</span> <a href='?src=\ref[src];criminal=1'>\[[criminal]\]</a>\n"
-				//msg += "\[Set Hostile Identification\]\n"
+					msg += "<span class = 'deptradio'>Criminal status:</span> <a href='?src=\ref[src];criminal=1'>\[[criminal]\]</a>\n"
 
 	msg += "*---------*</span>"
 
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 87125a22448..b9030037c81 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -510,7 +510,8 @@
 		if(istype(usr, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = usr
 			if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud))
-
+				if(usr.stat || usr == src) //|| !usr.canmove || usr.restrained()) Fluff: Sechuds have eye-tracking technology and sets 'arrest' to people that the wearer looks and blinks at.
+					return													  //Non-fluff: This allows sec to set people to arrest as they get disarmed or beaten
 				// Checks the user has security clearence before allowing them to change arrest status via hud, comment out to enable all access
 				var/allowed_access = 0
 				var/obj/item/clothing/glasses/G = H.glasses
@@ -529,7 +530,7 @@
 
 
 				var/modified = 0
-				var/perpname = H.get_face_name(H.get_id_name(""))
+				var/perpname = get_face_name(get_id_name(""))
 				if(perpname)
 					var/datum/data/record/R = find_record("name", perpname, data_core.security)
 					if(R)