Merge branch 'master' of github.com:Baystation12/Baystation12

Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.

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

@@ -4,13 +4,38 @@ DATA CARD
 ID CARD
 FINGERPRINT CARD HOLDER
 FINGERPRINT CARD
-
 */
 
+/obj/item/weapon/card
+	name = "card"
+	desc = "Does card things."
+	icon = 'card.dmi'
+	w_class = 1.0
 
+	var/list/files = list(  )
 
+/obj/item/weapon/card/emag
+	desc = "An identification card. Seems to have some funny chip on it, though."
+	name = "modified identification card"
+	icon_state = "emag"
+	item_state = "card-id"
+	origin_tech = "magnets=2;syndicate=2"
+	var/uses = 5
+
+	New()
+		..()
+		uses = rand(3,7)
+		return
 
 // DATA CARDS
+/obj/item/weapon/card/data
+	name = "data disk"
+	desc = "A disk with data."
+	icon_state = "data"
+	var/function = "storage"
+	var/data = "null"
+	var/special = null
+	item_state = "card-id"
 
 /obj/item/weapon/card/data/verb/label(t as text)
 	set name = "Label Disk"
@@ -25,9 +50,58 @@ FINGERPRINT CARD
 	return
 
 
-
-
 // ID CARDS
+/obj/item/weapon/card/id
+	name = "identification card"
+	desc = "An identification card."
+	icon_state = "id"
+	item_state = "card-id"
+	var/access = list()
+	var/registered_name = null // The name registered on the card
+	var/assignment = null
+	var/obj/item/weapon/photo/PHOTO = null
+	var/over_jumpsuit = 1 // If set to 0, it won't display on top of the mob's jumpsuit
+	var/dorm = 0    // determines if this ID has claimed a dorm already
+
+/obj/item/weapon/card/id/gold
+	name = "identification card"
+	desc = "A golden identification card."
+	icon_state = "gold"
+	item_state = "gold_id"
+
+/obj/item/weapon/card/id/captains_spare
+	name = "Captain's spare ID"
+	icon_state = "gold"
+	item_state = "gold_id"
+	registered_name = "Captain"
+	assignment = "Captain"
+	New()
+		access = get_access("Captain")
+		..()
+
+/obj/item/weapon/card/id/centcom
+	name = "CentCom ID"
+	desc = "An ID straight from Cent. Com."
+	icon_state = "centcom"
+	registered_name = "Central Command"
+	assignment = "General"
+	New()
+		access = get_all_centcom_access()
+		..()
+
+/obj/item/weapon/card/id/syndicate
+	name = "agent card"
+	desc = "Shhhhh."
+	access = list(access_maint_tunnels)
+	origin_tech = "syndicate=3"
+
+/obj/item/weapon/card/id/syndicate_command
+	name = "Syndicate ID card"
+	desc = "An ID straight from the Syndicate."
+	registered_name = "Syndicate"
+	assignment = "Syndicate Overlord"
+	access = list(access_syndicate)
+
 
 /obj/item/weapon/card/id/attack_self(mob/user as mob)
 	for(var/mob/O in viewers(user, null))
@@ -45,9 +119,9 @@ FINGERPRINT CARD
 	return
 
 /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob)
-	src.registered = input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)
+	src.registered_name = input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)
 	src.assignment = input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")
-	src.name = "[src.registered]'s ID Card ([src.assignment])"
+	src.name = "[src.registered_name]'s ID Card ([src.assignment])"
 	user << "\blue You successfully forge the ID card."
 
 /obj/item/weapon/card/id/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -59,9 +133,9 @@ FINGERPRINT CARD
 			W.loc = src
 			//src.orient2hud(usr)
 			add_fingerprint(usr)
-			usr << "\blue You add the photo to the ID"
+			usr << "\blue You add the photo to the ID."
 		else
-			usr << "\blue There is already a photo on this ID"
+			usr << "\blue There is already a photo on this ID."
 
 			//PHOTO.loc = locate(0,0,0)
 
@@ -75,7 +149,7 @@ FINGERPRINT CARD
 		PHOTO.layer = 3
 		PHOTO = null
 	else
-		usr << "\blue There is no photo to remove"
+		usr << "\blue There is no photo to remove."
 
 
 // FINGERPRINT HOLDER