From 6e3aef823ae05faae3eca8c2da8c3837f1cb593d Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Tue, 31 Jan 2012 15:48:06 -0700 Subject: [PATCH] Fix for wardrobes and lockers. Fix for Fingerprints. --- code/game/atom_procs.dm | 6 +++--- code/game/objects/items/item.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm index 9c77038c17d..4535b2af207 100644 --- a/code/game/atom_procs.dm +++ b/code/game/atom_procs.dm @@ -107,16 +107,16 @@ prints = L[2] break else - src.fingerprints[i] = L[1] + "&" + stars(L[2], rand(80,90)) + src.fingerprints[i] = "1=" + L[1] + "&2=" + stars(L[2], rand(80,90)) else var/turf/T = get_turf(src) for (var/mob/N in world) if (N.client && N.client.holder) N << "ERROR:Fingerprint application failed! Important data: [src.name] at [T.x], [T.y], [T.z] with the print string [L[1]]" if(new_prints) - src.fingerprints[new_prints] = text("[]&[]", md5(H.dna.uni_identity), stringmerge(prints,stars(md5(H.dna.uni_identity), rand(15,30)))) + src.fingerprints[new_prints] = text("1=[]&2=[]", md5(H.dna.uni_identity), stringmerge(prints,stars(md5(H.dna.uni_identity), rand(15,30)))) else if(new_prints == 0) - src.fingerprints += text("[]&[]", md5(H.dna.uni_identity), stars(md5(H.dna.uni_identity), rand(15,30))) + src.fingerprints += text("1=[]&2=[]", md5(H.dna.uni_identity), stars(md5(H.dna.uni_identity), rand(15,30))) return 1 else if(src.fingerprintslast != M.key) diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm index a2167decfb4..25d4fabd2ca 100644 --- a/code/game/objects/items/item.dm +++ b/code/game/objects/items/item.dm @@ -221,7 +221,7 @@ if (I.contents.len < 20) if(istype(O,/obj/item/wardrobe)) continue - if(O.anchored || O.density) + if(O.anchored || O.density || istype(O,/obj/structure)) continue I.contents += O; else