From d879c24d4697d52feba8a77b3a33595667ed8d21 Mon Sep 17 00:00:00 2001 From: "joe.heinemeyer@gmail.com" Date: Thu, 15 Mar 2012 18:30:41 +0000 Subject: [PATCH] Fixed the runtime involving the scanners, uncommented his tools. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3300 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/jobs/job/security.dm | 6 +++--- code/game/objects/closets/secure/security.dm | 8 ++++---- code/game/objects/devices/scanners.dm | 2 +- code/modules/detectivework/detective_work.dm | 14 ++++++++------ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 8b02e336fb1..a5e769d8a85 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -88,10 +88,10 @@ CIG.light("") H.equip_if_possible(CIG, H.slot_wear_mask) H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves) - //H.equip_if_possible(new /obj/item/weapon/storage/box/evidence(H.back), H.slot_in_backpack) - //H.equip_if_possible(new /obj/item/weapon/fcardholder(H), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/weapon/storage/box/evidence(H.back), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/weapon/fcardholder(H), H.slot_in_backpack) H.equip_if_possible(new /obj/item/clothing/suit/det_suit(H), H.slot_wear_suit) - //H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_in_backpack) H.equip_if_possible(new /obj/item/weapon/lighter/zippo(H), H.slot_l_store) H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/snacks/candy_corn(H), H.slot_h_store) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 3532720d6d5..41f3e1f0dd5 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -159,11 +159,11 @@ new /obj/item/clothing/shoes/brown(src) new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/weapon/cartridge/detective(src) - //new /obj/item/weapon/storage/fcard_kit(src) - //new /obj/item/weapon/fcardholder(src) + new /obj/item/weapon/storage/fcard_kit(src) + new /obj/item/weapon/fcardholder(src) new /obj/item/weapon/clipboard(src) - //new /obj/item/device/detective_scanner(src) - //new /obj/item/weapon/storage/box/evidence(src) + new /obj/item/device/detective_scanner(src) + new /obj/item/weapon/storage/box/evidence(src) return diff --git a/code/game/objects/devices/scanners.dm b/code/game/objects/devices/scanners.dm index d41b75c5749..68365ee4646 100644 --- a/code/game/objects/devices/scanners.dm +++ b/code/game/objects/devices/scanners.dm @@ -245,7 +245,7 @@ MASS SPECTROMETER var/list/blood = temp[4] if(!blood) blood = list() - if(A.blood_DNA.len && A.blood_DNA) + if(A.blood_DNA && A.blood_DNA.len) for(var/j = 1, j <= A.blood_DNA.len, j++) //Blood~~~ if(!blood.Find(A.blood_DNA[j])) //It isn't! Add! blood += A.blood_DNA[j] diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm index 7416173479c..b93feee1a00 100644 --- a/code/modules/detectivework/detective_work.dm +++ b/code/modules/detectivework/detective_work.dm @@ -7,11 +7,9 @@ atom/proc/add_fibers(mob/living/carbon/human/M) if(M.gloves.transfer_blood) //bloodied gloves transfer blood to touched objects if(add_blood(M.gloves.bloody_hands_mob)) //only reduces the bloodiness of our gloves if the item wasn't already bloody M.gloves.transfer_blood-- - //world.log << "[M.gloves] added blood to [src] from [M.gloves.bloody_hands_mob]" else if(M.bloody_hands) if(add_blood(M.bloody_hands_mob)) M.bloody_hands-- - //world.log << "[M] added blood to [src] from [M.bloody_hands_mob]" if(!suit_fibers) suit_fibers = list() var/fibertext var/item_multiplier = istype(src,/obj/item)?1.2:1 @@ -263,7 +261,8 @@ obj/machinery/computer/forensic_scanning if(blood && blood.len) temp += " Blood:
" for(var/j = 1, j <= blood.len, j++) - temp += "      [blood[j]]
" + var/list/templist2 = blood[j] + temp += "      Type: [templist2[2]], DNA: [templist2[1]]
" else temp = "ERROR. Database not found!
" temp += "
{Delete this Dossier}" @@ -299,7 +298,8 @@ obj/machinery/computer/forensic_scanning if(blood && blood.len) P.info += " Blood:
" for(var/j = 1, j <= blood.len, j++) - P.info += "      [blood[j]]
" + var/list/templist2 = blood[j] + P.info += "      Type: [templist2[2]], DNA: [templist2[1]]
" else usr << "ERROR. Database not found!
" if("auxiliary") @@ -319,7 +319,8 @@ obj/machinery/computer/forensic_scanning if(blood && blood.len) temp += " Blood:
" for(var/j = 1, j <= blood.len, j++) - temp += "      [blood[j]]
" + var/list/templist2 = blood[j] + temp += "      Type: [templist2[2]], DNA: [templist2[1]]
" else temp = "ERROR. Database not found!
" temp += "
{Delete This Record}" @@ -344,7 +345,8 @@ obj/machinery/computer/forensic_scanning if(blood && blood.len) P.info += " Blood:
" for(var/j = 1, j <= blood.len, j++) - P.info += "      [blood[j]]
" + var/list/templist2 = blood[j] + P.info += "      Type: [templist2[2]], DNA: [templist2[1]]
" else usr << "ERROR. Database not found!
" if("scan")