Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675

[MIRROR] Fixed cyborgs not getting their names at round start

code/modules/jobs/job_types/silicon.dm

@@ -85,5 +85,4 @@ Cyborg
 	return H.Robotize(FALSE, latejoin)
 
 /datum/job/cyborg/after_spawn(mob/living/silicon/robot/R, mob/M)
-	if(CONFIG_GET(flag/rename_cyborg))	//name can't be set in robot/New without the client
-		R.rename_self("cyborg", M.client)
+	R.rename_self("cyborg", M.client)

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

@@ -236,7 +236,8 @@
 	if(custom_name)
 		changed_name = custom_name
 	if(changed_name == "" && client)
-		changed_name = client.prefs.custom_names["cyborg"]
+		rename_self(src, client)
+		return //built in camera handled in proc
 	if(!changed_name)
 		changed_name = get_standard_name()
 

code/modules/mob/transform_procs.dm

@@ -381,8 +381,7 @@
 	else if(transfer_after)
 		R.key = key
 
-	if (CONFIG_GET(flag/rename_cyborg))
-		R.rename_self("cyborg")
+	R.rename_self("cyborg")
 
 	if(R.mmi)
 		R.mmi.name = "Man-Machine Interface: [real_name]"