From 501fd35cba2a2a278f37e993dcee5a1b544d1554 Mon Sep 17 00:00:00 2001
From: CitrusGender <31262308+CitrusGender@users.noreply.github.com>
Date: Sun, 24 Jun 2018 14:55:13 -0400
Subject: [PATCH] Fixed cyborgs not getting their names at round start 
 (#38675)

* fixed cyborgs not getting their names at round start
fixed cyborgs and A.Is being able to get around appearance bans

* Update job.dm

* Update silicon.dm

* goodbye unneeded config otpion

* Update game_options.txt
---
 code/__HELPERS/unsorted.dm                             | 2 +-
 code/controllers/configuration/entries/game_options.dm | 2 --
 code/controllers/subsystem/job.dm                      | 2 +-
 code/modules/jobs/job_types/silicon.dm                 | 3 +--
 code/modules/mob/living/silicon/robot/robot.dm         | 3 ++-
 code/modules/mob/transform_procs.dm                    | 3 +--
 config/game_options.txt                                | 3 ---
 7 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 5b9bb8c1849..d10619f3691 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -195,7 +195,7 @@ Turf and target are separate in case you want to teleport some distance from a t
 	var/safety = 0
 
 	while(loop && safety < 5)
-		if(C && C.prefs.custom_names[role] && !safety)
+		if(C && C.prefs.custom_names[role] && !safety && (!jobban_isbanned(src, "appearance")))
 			newname = C.prefs.custom_names[role]
 		else
 			switch(role)
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 9f38aa762b7..f179d86f188 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -170,8 +170,6 @@
 	config_entry_value = -1
 	min_val = -1
 
-/datum/config_entry/flag/rename_cyborg
-
 /datum/config_entry/flag/ooc_during_round
 
 /datum/config_entry/flag/emojis
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index 837a7813382..840bd0e6705 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -442,7 +442,7 @@ SUBSYSTEM_DEF(job)
 			to_chat(M, "<FONT color='blue'><B>As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.</B></font>")
 
 	if(job && H)
-		job.after_spawn(H, M, joined_late)
+		job.after_spawn(H, M, joined_late) // note: this happens before the mob has a key! M will always have a client, H might not.
 
 	return H
 
diff --git a/code/modules/jobs/job_types/silicon.dm b/code/modules/jobs/job_types/silicon.dm
index c53e034ddfb..86246952f31 100644
--- a/code/modules/jobs/job_types/silicon.dm
+++ b/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)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index db3b9f3bdff..4f23b6252c8 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -232,7 +232,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()
 
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 55b9ee3c6c9..0b8cb8d155a 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -379,8 +379,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]"
diff --git a/config/game_options.txt b/config/game_options.txt
index 3eafb02ec5f..2387c0dfef4 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -16,9 +16,6 @@ REVIVAL_BRAIN_LIFE -1
 
 ## RENAMING ###
 
-## Uncomment to allow cyborgs to rename themselves at roundstart.  Has no effect on roboticists renaming cyborgs the normal way.
-#RENAME_CYBORG
-
 ## OOC DURING ROUND ###
 ## Comment this out if you want OOC to be automatically disabled during the round, it will be enabled during the lobby and after the round end results.
 OOC_DURING_ROUND