cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the runtime involving the scanners, uncommented his tools.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3300 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
joe.heinemeyer@gmail.com
2012-03-15 18:30:41 +00:00
parent a3c9a4cf21
commit d879c24d46
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/security.dm
+3 -3
View File
@@ -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)
code/game/objects/closets/secure/security.dm
+4 -4
View File
@@ -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
code/game/objects/devices/scanners.dm
+1 -1
View File
@@ -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]