Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

Conflicts:
	code/modules/customitems/item_spawning.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/defines/obj/weapon.dm

@@ -725,6 +725,10 @@
 	var/access = list()
 	var/registered_name = null // The name registered_name on the card
 	slot_flags = SLOT_ID
+	var/obj/item/weapon/credit_card/card
+	var/blood_type = "\[UNSET\]"
+	var/dna_hash = "\[UNSET\]"
+	var/fingerprint_hash = "\[UNSET\]"
 
 	var/assignment = null
 	var/assignment_real_title = null