diff --git a/code/defines/obj/clothing/gloves.dm b/code/defines/obj/clothing/gloves.dm index 294d56063ce..55315576777 100644 --- a/code/defines/obj/clothing/gloves.dm +++ b/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" diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm index 7826070c1a8..a92bf91a02e 100644 --- a/code/defines/obj/computer.dm +++ b/code/defines/obj/computer.dm @@ -191,8 +191,8 @@ var/temp = null var/printing = null var/can_change_id = 0 - var/PerpGen = list(1) - var/PerpSec = list(1) + var/Perp[50][2] //If you have more than 50 results, you're not on Bay12. + var/tempname = null /obj/machinery/computer/secure_data/detective_computer diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 80a20725b2f..f9463337cc6 100644 --- a/code/game/jobs/job/security.dm +++ b/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) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 8155b11009c..62b04203d2d 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -20,8 +20,7 @@ dat += {"

"} dat += text("Search Records
", src) - dat += text("Search Fingerprints
", src) - dat += text("New Record
", src) + dat += text("New Record
", src) dat += {"

@@ -40,7 +39,7 @@ 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) @@ -86,13 +85,14 @@ dat += text("New Security Record

", src) dat += text("\nDelete Record (ALL)

\nPrint Record
\nBack
", src, src, src) if(4.0) - if(!(istype(PerpSec[1],/datum/data/record/))) + if(!(istype(Perp[1][1],/datum/data/record/))) dat += text("ERROR. String could not be located.

Back", src) else dat += {"
- - + "} + dat += text("", tempname) + dat += {"
Search Results:
Search Results for '[]':
@@ -103,11 +103,14 @@ "} - for(var/i=1, i<=PerpGen.len, i++) + for(var/i=1, i<=Perp.len, i++) + if(!(istype(Perp[i][1],/datum/data/record/))) + continue var/crimstat = "" - var/datum/data/record/R = PerpGen[i] - var/datum/data/record/E = PerpSec[i] - crimstat = E.fields["criminal"] + var/datum/data/record/R = Perp[i][1] + if(istype(Perp[i][2],/datum/data/record/)) + var/datum/data/record/E = Perp[i][2] + crimstat = E.fields["criminal"] var/background switch(crimstat) if("*Arrest*") @@ -195,18 +198,22 @@ What a mess.*/ 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 - PerpGen.len = 1 - PerpSec.len = 1 + Perp = new/list(50,2) t1 = lowertext(t1) + var/perp_num = 1 for(var/datum/data/record/R in data_core.general) + var/temptext = R.fields["name"] + " " + R.fields["id"] + " " + R.fields["fingerprint"] + if(findtext(temptext,t1)) + Perp[perp_num][1] = R + perp_num++ + for(var/i = 1, i<=perp_num, i++) + if(!(istype(Perp[i][1],/datum/data/record/))) + continue for(var/datum/data/record/E in data_core.security) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - var/temptext = E.fields["name"] + " " + E.fields["id"] + " " + R.fields["fingerprint"] - if(findtext(temptext,t1)) - PerpGen[PerpGen.len] = E - PerpSec[PerpSec.len] = R - PerpGen.len += 1 - PerpSec.len += 1 + var/datum/data/record/R = Perp[i][1] + if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"])) + Perp[i][2] = E + tempname = t1 screen = 4 if("Record Maintenance") @@ -227,7 +234,7 @@ What a mess.*/ active2 = S 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 @@ -243,7 +250,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 = 3 + screen = 3 */ if ("Print Record") if (!( printing )) @@ -336,31 +343,6 @@ What a mess.*/ active1 = G active2 = null - if("New Record (Complete)") - var/datum/data/record/G = new /datum/data/record() - G.fields["name"] = "New Record" - G.fields["id"] = text("[]", add_zero(num2hex(rand(1, 1.6777215E7)), 6)) - G.fields["rank"] = "Unassigned" - G.fields["sex"] = "Male" - G.fields["age"] = "Unknown" - G.fields["fingerprint"] = "Unknown" - G.fields["p_stat"] = "Active" - G.fields["m_stat"] = "Stable" - data_core.general += G - active1 = G - var/datum/data/record/R = new /datum/data/record() - R.fields["name"] = active1.fields["name"] - R.fields["id"] = active1.fields["id"] - R.name = text("Security Record #[]", R.fields["id"]) - R.fields["criminal"] = "None" - R.fields["mi_crim"] = "None" - R.fields["mi_crim_d"] = "No minor crime convictions." - R.fields["ma_crim"] = "None" - R.fields["ma_crim_d"] = "No major crime convictions." - R.fields["notes"] = "No notes." - data_core.security += R - active2 = R - //FIELD FUNCTIONS if ("Edit Field") var/a1 = active1 diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 0d209639f82..0f88397d045 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/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) diff --git a/config/admins.txt b/config/admins.txt index d1915b81575..2bc78a67b3c 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -5,7 +5,7 @@ cajoes - Game Admin cib - Game Master compactninja - Game Master hawk_v3 - Game Admin -skymarshal - Game Master +headswe - Game Master iaryni - Game Master masterofapples - Game Admin megacaesar - Game Admin diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index abead579d61..9ae49fadf1f 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
Fingerprints Criminal Status