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

code/modules/admin/verbs/debug.dm

@@ -448,9 +448,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			log_admin("[key_name(src)] has granted [M.key] full access.")
 			id.icon_state = "gold"
 			id:access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access()
-			id.registered = H.real_name
+			id.registered_name = H.real_name
 			id.assignment = "Captain"
-			id.name = "[id.registered]'s ID Card ([id.assignment])"
+			id.name = "[id.registered_name]'s ID Card ([id.assignment])"
 			H.equip_if_possible(id, H.slot_wear_id)
 			H.update_clothing()
 	else
@@ -610,7 +610,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.name = "[M.real_name]'s ID Card"
 			W.access = get_all_accesses()
 			W.assignment = "Tunnel Clown!"
-			W.registered = M.real_name
+			W.registered_name = M.real_name
 			M.equip_if_possible(W, M.slot_wear_id)
 
 			var/obj/item/weapon/fireaxe/fire_axe = new(M)
@@ -669,7 +669,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.name = "[M.real_name]'s ID Card"
 			W.access = get_all_accesses()
 			W.assignment = "Reaper"
-			W.registered = M.real_name
+			W.registered_name = M.real_name
 			M.equip_if_possible(W, M.slot_wear_id)
 
 		if("death commando")//Was looking to add this for a while.
@@ -707,7 +707,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.access = get_all_accesses()
 			W.access += list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer")
 			W.assignment = "CentCom Review Official"
-			W.registered = M.real_name
+			W.registered_name = M.real_name
 			W.over_jumpsuit = 0
 			M.equip_if_possible(W, M.slot_wear_id)
 
@@ -732,7 +732,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.access = get_all_accesses()
 			W.access += get_all_centcom_access()
 			W.assignment = "CentCom Commanding Officer"
-			W.registered = M.real_name
+			W.registered_name = M.real_name
 			W.over_jumpsuit = 0
 			M.equip_if_possible(W, M.slot_wear_id)
 
@@ -755,7 +755,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.access = get_all_accesses()
 			W.access += get_all_centcom_access()
 			W.assignment = "Special Operations Officer"
-			W.registered = M.real_name
+			W.registered_name = M.real_name
 			M.equip_if_possible(W, M.slot_wear_id)
 
 		if("blue wizard")
@@ -809,7 +809,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.access = get_all_accesses()
 			W.access += get_all_centcom_access()
 			W.assignment = "Admiral"
-			W.registered = M.real_name
+			W.registered_name = M.real_name
 			M.equip_if_possible(W, M.slot_wear_id)
 
 	M.update_clothing()

code/modules/admin/verbs/onlyone.dm

@@ -48,7 +48,7 @@
 		W.access = get_all_accesses()
 		W.access += get_all_centcom_access()
 		W.assignment = "Highlander"
-		W.registered = H.real_name
+		W.registered_name = H.real_name
 		H.equip_if_possible(W, H.slot_wear_id)
 
 	message_admins("\blue [key_name_admin(usr)] used THERE CAN BE ONLY ONE!", 1)

code/modules/admin/verbs/randomverbs.dm

@@ -536,7 +536,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	for (var/obj/machinery/computer/communications/C in machines)
 		if(! (C.stat & (BROKEN|NOPOWER) ) )
 			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
-			P.name = "paper- '[command_name()] Update.'"
+			P.name = "paper - '[command_name()] Update.'"
 			P.info = input
 			C.messagetitle.Add("[command_name()] Update")
 			C.messagetext.Add(P.info)

code/modules/admin/verbs/striketeam.dm

@@ -183,7 +183,7 @@ var/global/sent_strike_team = 0
 	W.access = get_all_accesses()//They get full station access.
 	W.access += list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)//Let's add their alloted CentCom access.
 	W.assignment = "Death Commando"
-	W.registered = real_name
+	W.registered_name = real_name
 	equip_if_possible(W, slot_wear_id)
 
 	resistances += "alien_embryo"

code/modules/admin/verbs/striketeam_syndicate.dm

@@ -186,7 +186,7 @@ var/global/sent_syndicate_strike_team = 0
 	W.access = get_all_accesses()//They get full station access because obviously the syndicate has HAAAX, and can make special IDs for their most elite members.
 	W.access += list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage, access_syndicate)//Let's add their forged CentCom access and syndicate access.
 	W.assignment = "Syndicate Commando"
-	W.registered = real_name
+	W.registered_name = real_name
 	equip_if_possible(W, slot_wear_id)
 
 	resistances += "alien_embryo"