Merge pull request #10163 from PsiOmegaDelta/150713-Fixes

Fixes

code/game/objects/items.dm

@@ -65,9 +65,10 @@
 /obj/item/Destroy()
 	if(ismob(loc))
 		var/mob/m = loc
-		m.unEquip(src, 1)
+		m.drop_from_inventory(src)
 		m.update_inv_r_hand()
 		m.update_inv_l_hand()
+		src.loc = null
 	return ..()
 
 /obj/item/device
@@ -604,4 +605,4 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 
 
 /obj/item/proc/pwr_drain()
-	return 0 // Process Kill
+	return 0 // Process Kill

code/game/objects/items/weapons/cards_ids.dm

@@ -145,9 +145,10 @@
 	..()
 	spawn(30)
 	if(istype(loc, /mob/living/carbon/human))
-		blood_type = loc:dna:b_type
-		dna_hash = loc:dna:unique_enzymes
-		fingerprint_hash = md5(loc:dna:uni_identity)
+		var/mob/living/carbon/human/H = loc
+		blood_type = H.dna.b_type
+		dna_hash = H.dna.unique_enzymes
+		fingerprint_hash = md5(H.dna.uni_identity)
 
 /obj/item/weapon/card/id/attack_self(mob/user as mob)
 	for(var/mob/O in viewers(user, null))