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

code/game/objects/closets/secure/personal.dm

@@ -31,17 +31,17 @@
 			user << "\red It appears to be broken."
 			return
 		var/obj/item/weapon/card/id/I = W
-		if(!I || !I.registered)	return
-		if(src.allowed(user) || !src.registered || (istype(I) && (src.registered == I.registered)))
+		if(!I || !I.registered_name)	return
+		if(src.allowed(user) || !src.registered || (istype(I) && (src.registered == I.registered_name)))
 			//they can open all lockers, or nobody owns this, or they own this locker
 			src.locked = !( src.locked )
 			if(src.locked)	src.icon_state = src.icon_locked
 			else	src.icon_state = src.icon_closed
 
 			if(!src.registered)
-				src.registered = I.registered
-				src.desc = "Owned by [I.registered]."
-				src.name = "Personal Closet - [I.registered]"
+				src.registered = I.registered_name
+				src.desc = "Owned by [I.registered_name]."
+				src.name = "Personal Closet - [I.registered_name]"
 		else
 			user << "\red Access Denied"
 	else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)

code/game/objects/devices/PDA/PDA.dm

@@ -168,7 +168,7 @@
 			if (0)
 				dat += "<h2>PERSONAL DATA ASSISTANT v.1.2</h2>"
 				dat += "Owner: [owner], [ownjob]<br>"
-				dat += text("ID: <A href='?src=\ref[];choice=Authenticate'>[]</A><br>", src, (id ? "[id.registered], [id.assignment]" : "----------"))
+				dat += text("ID: <A href='?src=\ref[];choice=Authenticate'>[]</A><br>", src, (id ? "[id.registered_name], [id.assignment]" : "----------"))
 				dat += "Station Time: [round(world.time / 36000)+12]:[(world.time / 600 % 60) < 10 ? add_zero(world.time / 600 % 60, 1) : world.time / 600 % 60]"//:[world.time / 100 % 6][world.time / 100 % 10]"
 
 				dat += "<br><br>"
@@ -656,7 +656,7 @@
 				id = I
 	else
 		var/obj/item/weapon/card/I = user.equipped()
-		if (istype(I, /obj/item/weapon/card/id) && I:registered)
+		if (istype(I, /obj/item/weapon/card/id) && I:registered_name)
 			if(id)//Get id and replace it.
 				user.drop_item()
 				I.loc = src
@@ -679,9 +679,9 @@
 		if (C:radio)
 			C:radio.hostpda = src
 
-	else if (istype(C, /obj/item/weapon/card/id) && C:registered)
+	else if (istype(C, /obj/item/weapon/card/id) && C:registered_name)
 		if(!owner)
-			owner = C:registered
+			owner = C:registered_name
 			ownjob = C:assignment
 			name = "PDA-[owner] ([ownjob])"
 			user << "\blue Card scanned."
@@ -694,11 +694,11 @@
 					if(input=="Insert")
 						id_check(user, 2)
 					else
-						if(!(owner == C:registered))
+						if(!(owner == C:registered_name))
 							user << "\blue Name on card does not match registered name. Please try again."
-						else if((owner == C:registered) && (ownjob == C:assignment))
+						else if((owner == C:registered_name) && (ownjob == C:assignment))
 							user << "\blue Rank is up to date."
-						else if((owner == C:registered) && (ownjob != C:assignment))
+						else if((owner == C:registered_name) && (ownjob != C:assignment))
 							ownjob = C:assignment
 							name = "PDA-[owner] ([ownjob])"
 							user << "\blue Rank updated."

code/game/objects/devices/taperecorder.dm

@@ -206,7 +206,7 @@
 	for(var/i=1,src.storedinfo.len >= i,i++)
 		t1 += "[src.storedinfo[i]]<BR>"
 	P.info = t1
-	P.name = "paper- 'Transcript'"
+	P.name = "paper - 'Transcript'"
 	P.overlays += "paper_words"
 
 

code/game/objects/items.dm

@@ -233,7 +233,7 @@
 		dat += text("    <B>[]</B> -  []<BR>", M.name, M.get_assignment())
 	var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc )
 	P.info = dat
-	P.name = "paper- 'Crew Manifest'"
+	P.name = "paper - 'Crew Manifest'"
 	//SN src = null
 	del(src)
 	return

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

@@ -4,13 +4,33 @@ 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"
 
 
 // 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 +45,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 +114,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 +128,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 +144,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