cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stuff from SkyMarshal

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3395 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
2012-04-02 23:46:06 +00:00
parent f292079363
commit 80a063ef41
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/items/weapons/cards_ids.dm
View File

@@ -195,6 +195,7 @@ FINGERPRINT CARD
return "<B>There are no fingerprints on this card.</B>" return "<B>There are no fingerprints on this card.</B>"
return return
/*
/obj/item/weapon/f_card/attack_hand(mob/user as mob) /obj/item/weapon/f_card/attack_hand(mob/user as mob)
if ((user.r_hand == src || user.l_hand == src)) if ((user.r_hand == src || user.l_hand == src))
@@ -215,6 +216,7 @@ FINGERPRINT CARD
else else
..() ..()
return return
*/
/obj/item/weapon/f_card/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/weapon/f_card/attackby(obj/item/weapon/W as obj, mob/user as mob)
..() ..()
@@ -253,10 +255,10 @@ FINGERPRINT CARD
..() ..()
if (!istype(usr, /mob/living/silicon)) if (!istype(usr, /mob/living/silicon))
if (src.fingerprints) if (fingerprints)
if (src.amount > 1) if (src.amount > 1)
var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card(get_turf(src)) var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card(get_turf(src))
F.amount = --src.amount F.amount = --src.amount
src.amount = 1 amount = 1
src.icon_state = "fingerprint1" icon_state = "fingerprint1"
return return

9
code/modules/detectivework/detective_work.dm
View File

@@ -199,7 +199,6 @@ obj/machinery/computer/forensic_scanning
M.drop_item() M.drop_item()
I.loc = src I.loc = src
process_card() process_card()
usr << "You insert the card, and it is destroyed by the machinery in the process of comparing prints."
else else
usr << "\red Invalid Object Rejected." usr << "\red Invalid Object Rejected."
if("database") if("database")
@@ -647,7 +646,9 @@ obj/machinery/computer/forensic_scanning
return return
proc/process_card() //Same as above, but for fingerprint cards proc/process_card() //Same as above, but for fingerprint cards
if(card.fingerprints && !(card.amount > 1)) if(card.fingerprints && !(card.amount > 1) && islist(card.fingerprints) && files && files.len)
usr << "You insert the card, and it is destroyed by the machinery in the process of comparing prints."
var/found = 0
for(var/k = 1, k <= card.fingerprints.len, k++) for(var/k = 1, k <= card.fingerprints.len, k++)
var/list/test_prints = params2list(card.fingerprints[k]) var/list/test_prints = params2list(card.fingerprints[k])
var/print = test_prints[num2text(1)] var/print = test_prints[num2text(1)]
@@ -659,6 +660,10 @@ obj/machinery/computer/forensic_scanning
test_list[1] = "1=" + print + "&2=" + print test_list[1] = "1=" + print + "&2=" + print
files[i] = test_list files[i] = test_list
break break
if(found)
usr << "The machinery finds can completes a match."
else
usr << "No match found."
del(card) del(card)
else else
usr << "\red ERROR: No prints/too many cards." usr << "\red ERROR: No prints/too many cards."