Merge pull request #125 from SkyMarshal/456c623630bec313bf18bb9df117c98807d0c692

Revised Security Records computer, added red gloves for Security

code/defines/obj/clothing/gloves.dm

@@ -140,11 +140,13 @@
 	color="orange"
 
 /obj/item/clothing/gloves/red
-	name = "Red Gloves"
-	desc = "A pair of gloves, they don't look special in any way."
+	desc = "Heavily padded heavy-duty red gloves."
+	name = "red gloves"
 	icon_state = "red"
 	item_state = "redgloves"
-	color = "red"
+	siemens_coefficient = 0.30
+
+	protective_temperature = 1100
 
 /obj/item/clothing/gloves/rainbow
 	name = "Rainbow Gloves"

code/defines/obj/computer.dm

@@ -191,6 +191,8 @@
 	var/temp = null
 	var/printing = null
 	var/can_change_id = 0
+	var/list/Perp
+	var/tempname = null
 
 
 /obj/machinery/computer/secure_data/detective_computer

code/game/jobs/job/security.dm

@@ -17,7 +17,7 @@
 		H.equip_if_possible(new /obj/item/device/pda/heads/hos(H), H.slot_belt)
 //		H.equip_if_possible(new /obj/item/clothing/suit/armor/hos(H), H.slot_wear_suit)
 //We're Bay12, not Goon.  We don't need armor 24/7
-		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
+		H.equip_if_possible(new /obj/item/clothing/gloves/red(H), H.slot_gloves)
 		H.equip_if_possible(new /obj/item/clothing/head/helmet/HoS(H), H.slot_head)
 		H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses/sechud(H), H.slot_glasses)
 		H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_in_backpack)
@@ -47,7 +47,7 @@
 		H.equip_if_possible(new /obj/item/device/pda/security(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/head/helmet/warden(H), H.slot_head)
-		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
+		H.equip_if_possible(new /obj/item/clothing/gloves/red(H), H.slot_gloves)
 		H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses/sechud(H), H.slot_glasses)
 		H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/device/flash(H), H.slot_l_store)
@@ -114,6 +114,7 @@
 		H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/head/helmet(H), H.slot_head)
 		H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_in_backpack)
+		H.equip_if_possible(new /obj/item/clothing/gloves/red(H), H.slot_gloves)
 		H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_s_store)
 		H.equip_if_possible(new /obj/item/device/flash(H), H.slot_l_store)
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)

code/game/machinery/computer/security.dm

@@ -9,6 +9,7 @@
 	if(..())
 		return
 	var/dat
+
 	if (temp)
 		dat = text("<TT>[]</TT><BR><BR><A href='?src=\ref[];choice=Clear Screen'>Clear Screen</A>", temp, src)
 	else
@@ -16,20 +17,29 @@
 		if (authenticated)
 			switch(screen)
 				if(1.0)
-					dat += text("<A href='?src=\ref[];choice=Search Records'>Search Records</A><BR>\n<A href='?src=\ref[];choice=List Records'>List Records</A><BR>\n<A href='?src=\ref[];choice=Search Fingerprints'>Search Fingerprints</A><BR>\n<A href='?src=\ref[];choice=New Record (General)'>New General Record</A><BR>\n<BR>\n<A href='?src=\ref[];choice=Record Maintenance'>Record Maintenance</A><BR>\n<A href='?src=\ref[];choice=Log Out'>{Log Out}</A><BR>\n", src, src, src, src, src, src)
-				if(2.0)
-					dat += {"<B>Record List</B>:<HR>
-					<table style="text-align:center;" border="1" cellspacing="0">
-					<tr>
-					<th>Name (ID#)</th>
-					<th>Rank</th>
-					<th>Fingerprints</th>
-					<th>Criminal Status</th>
-					</tr>"}
+					dat += {"
+<p style='text-align:center;'>"}
+					dat += text("<A href='?src=\ref[];choice=Search Records'>Search Records</A><BR>", src)
+					dat += text("<A href='?src=\ref[];choice=New Record (General)'>New Record</A><BR>", src)
+					dat += {"
+</p>
+<table style="text-align:center;" cellspacing="0" width="100%">
+<tr>
+<th>Records:</th>
+</tr>
+</table>
+<table style="text-align:center;" border="1" cellspacing="0" width="100%">
+<tr>
+<th>Name</th>
+<th>ID</th>
+<th>Rank</th>
+<th>Fingerprints</th>
+<th>Criminal Status</th>
+</tr>"}
 					for(var/datum/data/record/R in data_core.general)
 						var/crimstat = ""
 						for(var/datum/data/record/E in data_core.security)
-							if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
+							if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
 								crimstat = E.fields["criminal"]
 						var/background
 						switch(crimstat)
@@ -46,14 +56,17 @@
 							if("")
 								background = "'background-color:#FFFFFF;'"
 								crimstat = "No Record."
-						dat += text("<tr style=[]><td><A href='?src=\ref[];choice=Browse Record;d_rec=\ref[]'>[] (ID:[])</a></td>", background, src, R, R.fields["name"], R.fields["id"])
+						dat += text("<tr style=[]><td><A href='?src=\ref[];choice=Browse Record;d_rec=\ref[]'>[]</a></td>", background, src, R, R.fields["name"])
+						dat += text("<td>[]</td>", R.fields["id"])
 						dat += text("<td>[]</td>", R.fields["rank"])
 						dat += text("<td>[]</td>", R.fields["fingerprint"])
 						dat += text("<td>[]</td></tr>", crimstat)
-					dat += text("</table><br><HR><A href='?src=\ref[];choice=Return'>Back</A>", src)
-				if(3.0)
+					dat += "</table><hr width='75%' />"
+					dat += text("<A href='?src=\ref[];choice=Record Maintenance'>Record Maintenance</A><br><br>", src)
+					dat += text("<A href='?src=\ref[];choice=Log Out'>{Log Out}</A>",src)
+				if(2.0)
 					dat += text("<B>Records Maintenance</B><HR>\n<A href='?src=\ref[];choice=Delete All Records'>Delete All Records</A><BR>\n<BR>\n<A href='?src=\ref[];choice=Return'>Back</A>", src, src)
-				if(4.0)
+				if(3.0)
 					dat += "<CENTER><B>Security Record</B></CENTER><BR>"
 					if ((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
 						dat += text("Name: <A href='?src=\ref[];choice=Edit Field;field=name'>[]</A> ID: <A href='?src=\ref[];choice=Edit Field;field=id'>[]</A><BR>\nSex: <A href='?src=\ref[];choice=Edit Field;field=sex'>[]</A><BR>\nAge: <A href='?src=\ref[];choice=Edit Field;field=age'>[]</A><BR>\nRank: <A href='?src=\ref[];choice=Edit Field;field=rank'>[]</A><BR>\nFingerprint: <A href='?src=\ref[];choice=Edit Field;field=fingerprint'>[]</A><BR>\nPhysical Status: []<BR>\nMental Status: []<BR>", src, active1.fields["name"], src, active1.fields["id"], src, active1.fields["sex"], src, active1.fields["age"], src, active1.fields["rank"], src, active1.fields["fingerprint"], active1.fields["p_stat"], active1.fields["m_stat"])
@@ -71,10 +84,57 @@
 						dat += "<B>Security Record Lost!</B><BR>"
 						dat += text("<A href='?src=\ref[];choice=New Record (Security)'>New Security Record</A><BR><BR>", src)
 					dat += text("\n<A href='?src=\ref[];choice=Delete Record (ALL)'>Delete Record (ALL)</A><BR><BR>\n<A href='?src=\ref[];choice=Print Record'>Print Record</A><BR>\n<A href='?src=\ref[];choice=Return'>Back</A><BR>", src, src, src)
+				if(4.0)
+					if(!Perp.len)
+						dat += text("ERROR.  String could not be located.<br><br><A href='?src=\ref[];choice=Return'>Back</A>", src)
+					else
+						dat += {"
+<table style="text-align:center;" cellspacing="0" width="100%">
+<tr>					"}
+						dat += text("<th>Search Results for '[]':</th>", tempname)
+						dat += {"
+</tr>
+</table>
+<table style="text-align:center;" border="1" cellspacing="0" width="100%">
+<tr>
+<th>Name</th>
+<th>ID</th>
+<th>Rank</th>
+<th>Fingerprints</th>
+<th>Criminal Status</th>
+</tr>					"}
+						for(var/i=1, i<=Perp.len, i += 2)
+							var/crimstat = ""
+							var/datum/data/record/R = Perp[i]
+							if(istype(Perp[i+1],/datum/data/record/))
+								var/datum/data/record/E = Perp[i+1]
+								crimstat = E.fields["criminal"]
+							var/background
+							switch(crimstat)
+								if("*Arrest*")
+									background = "'background-color:#DC143C;'"
+								if("Incarcerated")
+									background = "'background-color:#CD853F;'"
+								if("Parolled")
+									background = "'background-color:#CD853F;'"
+								if("Released")
+									background = "'background-color:#3BB9FF;'"
+								if("None")
+									background = "'background-color:#00FF7F;'"
+								if("")
+									background = "'background-color:#FFFFFF;'"
+									crimstat = "No Record."
+							dat += text("<tr style=[]><td><A href='?src=\ref[];choice=Browse Record;d_rec=\ref[]'>[]</a></td>", background, src, R, R.fields["name"])
+							dat += text("<td>[]</td>", R.fields["id"])
+							dat += text("<td>[]</td>", R.fields["rank"])
+							dat += text("<td>[]</td>", R.fields["fingerprint"])
+							dat += text("<td>[]</td></tr>", crimstat)
+						dat += "</table><hr width='75%' />"
+						dat += text("<br><A href='?src=\ref[];choice=Return'>Return to index.</A>", src)
 				else
 		else
 			dat += text("<A href='?src=\ref[];choice=Log In'>{Log In}</A>", src)
-	user << browse(text("<HEAD><TITLE>Security Records</TITLE></HEAD><TT>[]</TT>", dat), "window=secure_rec")
+	user << browse(text("<HEAD><TITLE>Security Records</TITLE></HEAD><TT>[]</TT>", dat), "window=secure_rec;size=550x400")
 	onclose(user, "secure_rec")
 	return
 
@@ -132,31 +192,28 @@ What a mess.*/
 						rank = scan.assignment
 						screen = 1
 //RECORD FUNCTIONS
-			if("List Records")
-				screen = 2
-				active1 = null
-				active2 = null
-
 			if("Search Records")
-				var/t1 = input("Search String: (Name or ID)", "Secure. records", null, null)  as text
+				var/t1 = input("Search String: (Partial Name or ID or Fingerprints)", "Secure. records", null, null)  as text
 				if ((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || !in_range(src, usr)))
 					return
-				active1 = null
-				active2 = null
+				Perp = new/list()
 				t1 = lowertext(t1)
 				for(var/datum/data/record/R in data_core.general)
-					if ((lowertext(R.fields["name"]) == t1 || t1 == lowertext(R.fields["id"])))
-						active1 = R
-				if (!( active1 ))
-					temp = text("Could not locate record [].", t1)
-				else
+					var/temptext = R.fields["name"] + " " + R.fields["id"] + " " + R.fields["fingerprint"]
+					if(findtext(temptext,t1))
+						var/prelist = new/list(2)
+						prelist[1] = R
+						Perp += prelist
+				for(var/i = 1, i<=Perp.len, i+=2)
 					for(var/datum/data/record/E in data_core.security)
-						if ((E.fields["name"] == active1.fields["name"] || E.fields["id"] == active1.fields["id"]))
-							active2 = E
-					screen = 4
+						var/datum/data/record/R = Perp[i]
+						if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
+							Perp[i+1] = E
+				tempname = t1
+				screen = 4
 
 			if("Record Maintenance")
-				screen = 3
+				screen = 2
 				active1 = null
 				active2 = null
 
@@ -171,9 +228,9 @@ What a mess.*/
 							S = E
 					active1 = R
 					active2 = S
-					screen = 4
+					screen = 3
 
-			if ("Search Fingerprints")
+/*			if ("Search Fingerprints")
 				var/t1 = input("Search String: (Fingerprint)", "Secure. records", null, null)  as text
 				if ((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || (!in_range(src, usr)) && (!istype(usr, /mob/living/silicon))))
 					return
@@ -189,7 +246,7 @@ What a mess.*/
 					for(var/datum/data/record/E in data_core.security)
 						if ((E.fields["name"] == active1.fields["name"] || E.fields["id"] == active1.fields["id"]))
 							active2 = E
-					screen = 4
+					screen = 3	*/
 
 			if ("Print Record")
 				if (!( printing ))
@@ -266,7 +323,7 @@ What a mess.*/
 					R.fields["notes"] = "No notes."
 					data_core.security += R
 					active2 = R
-					screen = 4
+					screen = 3
 
 			if ("New Record (General)")
 				var/datum/data/record/G = new /datum/data/record()
@@ -281,6 +338,7 @@ What a mess.*/
 				data_core.general += G
 				active1 = G
 				active2 = null
+
 //FIELD FUNCTIONS
 			if ("Edit Field")
 				var/a1 = active1

code/game/objects/closets/secure/security.dm

@@ -78,6 +78,7 @@
 		new /obj/item/clothing/suit/armor/vest(src)
 		new /obj/item/clothing/suit/storage/gearharness(src)
 		new /obj/item/clothing/head/helmet/warden(src)
+		new /obj/item/clothing/gloves/red(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/weapon/storage/flashbang_kit(src)
 		new /obj/item/weapon/storage/belt/security(src)
@@ -99,6 +100,7 @@
 		new /obj/item/clothing/suit/armor/vest(src)
 		new /obj/item/clothing/suit/storage/gearharness(src)
 		new /obj/item/clothing/head/helmet(src)
+		new /obj/item/clothing/gloves/red(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/weapon/storage/belt/security(src)
 		new /obj/item/weapon/flashbang(src)