Merge remote-tracking branch 'upstream/master'

code/modules/admin/admin.dm

@@ -1014,7 +1014,7 @@
 	log_admin("[key_name(usr)] stuffed [frommob.key] into [tomob.name].")
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Ghost Drag Control")
 
-	tomob.ckey = frommob.ckey
+	tomob.key = frommob.key
 	qdel(frommob)
 
 	return TRUE

code/modules/mob/dead/observer/respawn.dm

@@ -190,5 +190,5 @@
 	client.view_size.resetToDefault()
 
 	var/mob/dead/new_player/M = new /mob/dead/new_player
-	M.ckey = ckey
+	M.key = key
 	return M

code/modules/mob/living/silicon/ai/ai.dm

@@ -1032,7 +1032,7 @@
 			if(GLOB.announcement_systems.len)
 				// Sends an announcement the AI has cryoed.
 				var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
-				announcer.announce("CRYOSTORAGE", src.real_name, announce_rank, announce_rank, list())
+				announcer.announce("CRYOSTORAGE", real_name, announce_rank, announce_rank, list())
 			new /obj/structure/ai_core/latejoin_inactive(loc)
 			if(src.mind)
 				//Handle job slot/tater cleanup.

code/modules/mob/mob.dm

@@ -538,7 +538,7 @@
 				client.prefs.chat_toggles ^= CHAT_OOC
 			if (!(client.prefs.chat_toggles & CHAT_OOC) && isdead(new_mob))
 				client.prefs.chat_toggles ^= CHAT_OOC
-	new_mob.ckey = ckey
+	new_mob.key = key
 	if(send_signal)
 		SEND_SIGNAL(src, COMSIG_MOB_KEY_CHANGE, new_mob, src)
 	//splurt changeh