From 77a7c500c8bb47f016dcc813666de1a070152e57 Mon Sep 17 00:00:00 2001 From: AnturK Date: Thu, 28 Jun 2018 20:29:24 +0200 Subject: [PATCH] Fixes borg default name scheme --- code/modules/jobs/job_types/silicon.dm | 2 +- code/modules/mob/living/silicon/robot/robot.dm | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/jobs/job_types/silicon.dm b/code/modules/jobs/job_types/silicon.dm index 66239771b3e..0738f20b244 100644 --- a/code/modules/jobs/job_types/silicon.dm +++ b/code/modules/jobs/job_types/silicon.dm @@ -85,4 +85,4 @@ Cyborg return H.Robotize(FALSE, latejoin) /datum/job/cyborg/after_spawn(mob/living/silicon/robot/R, mob/M) - R.apply_pref_name("cyborg", M.client) + R.updatename(M.client) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 0105aed35ea..5bffd451a9d 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -234,14 +234,16 @@ module.transform_to(modulelist[input_module]) -/mob/living/silicon/robot/proc/updatename() +/mob/living/silicon/robot/proc/updatename(client/C) if(shell) return + if(!C) + C = client var/changed_name = "" if(custom_name) changed_name = custom_name - if(changed_name == "" && client && client.prefs.custom_names["cyborg"] != DEFAULT_CYBORG_NAME) - if(apply_pref_name("cyborg", client)) + if(changed_name == "" && C && C.prefs.custom_names["cyborg"] != DEFAULT_CYBORG_NAME) + if(apply_pref_name("cyborg", C)) return //built in camera handled in proc if(!changed_name) changed_name = get_standard_name()