Reverting registered_name change. Reverting area name changes. Reverts Plasma Steel and object changes.

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

@@ -188,7 +188,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 += text("<A href='?src=\ref[];choice=UpdateInfo'>[]</A><br>", src, (id ? "Update PDA Info" : ""))
 
 				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]"
@@ -711,7 +711,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
@@ -734,9 +734,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."

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

@@ -53,10 +53,10 @@ FINGERPRINT CARD
 	return
 
 /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob)
-	if(!src.registered)
-		src.registered = input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)
+	if(!src.registered_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."
 	else
 		..()

code/game/objects/radio/headset.dm

@@ -8,7 +8,6 @@
 	subspace_transmission = 1
 	canhear_range = 1 // can't hear headsets from very far away
 
-	var/protective_temperature = 0
 	var/translate_binary = 0
 	var/translate_hive = 0
 	var/obj/item/device/encryptionkey/keyslot1 = null