From 8d58fc2e97cc90db8051008174c50fe3e97b7eeb Mon Sep 17 00:00:00 2001 From: Atlantiscze Date: Tue, 30 Sep 2014 08:56:28 +0200 Subject: [PATCH] Android Roundstart NameFix - Positronic Brains in Androids now have proper posibrain-like name, instead of using MMI-like name. - Example: (Tes Ter -> SINA-123) --- code/modules/mob/living/carbon/brain/posibrain.dm | 15 ++++++++------- code/modules/mob/transform_procs.dm | 7 ++++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 6877ed4b85..18244527bc 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -46,13 +46,14 @@ C.prefs.be_special ^= BE_PAI -/obj/item/device/mmi/posibrain/transfer_identity(var/mob/living/carbon/H) - name = "positronic brain ([H])" - brainmob.name = H.real_name - brainmob.real_name = H.real_name - brainmob.dna = H.dna - brainmob.timeofhostdeath = H.timeofdeath - brainmob.stat = 0 +/obj/item/device/mmi/posibrain/transfer_identity(var/mob/living/carbon/H, var/autoname = 1) + if(autoname) + name = "positronic brain ([H])" + brainmob.name = H.real_name + brainmob.real_name = H.real_name + brainmob.dna = H.dna + brainmob.timeofhostdeath = H.timeofdeath + brainmob.stat = 0 if(brainmob.mind) brainmob.mind.assigned_role = "Positronic Brain" if(H.mind) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 2307d00bcb..d939289d35 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -164,15 +164,20 @@ O.loc = loc O.job = "Cyborg" + var/transferred = 0 if(O.mind.assigned_role == "Cyborg") if(O.mind.role_alt_title == "Android") O.mmi = new /obj/item/device/mmi/posibrain(O) + O.mmi.brainmob.name = "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]" + O.mmi.name = "positronic brain ([O.mmi.brainmob.name])" // Give posibrain random posibrain-y name. + if(O.mmi) O.mmi.transfer_identity(src,0) // Disabling autoname as we don't want posibrain with human names. + transferred = 1 else if(O.mind.role_alt_title == "Robot") O.mmi = null //Robots do not have removable brains. else O.mmi = new /obj/item/device/mmi(O) - if(O.mmi) O.mmi.transfer_identity(src) //Does not transfer key/client. + if((O.mmi) && (!transferred)) O.mmi.transfer_identity(src) callHook("borgify", list(O))