include renaming

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

@@ -407,15 +407,12 @@
 		to_chat(usr, "You can't pick another custom name. [isshell(src) ? "" : "Go ask for a name change."]")
 		return 0
 
-	spawn(0)
-		var/newname
-		newname = sanitizeSafe(tgui_input_text(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","", MAX_NAME_LEN), MAX_NAME_LEN)
-		if (newname)
-			custom_name = newname
-			sprite_name = newname
+	var/newname = sanitizeSafe(tgui_input_text(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","", MAX_NAME_LEN), MAX_NAME_LEN)
+	if (newname)
+		custom_name = newname
+		sprite_name = newname
 
-		updatename()
-		update_icon()
+	updatename()
 
 /mob/living/silicon/robot/verb/extra_customization()
 	set name = "Customize Appearance"

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

@@ -3,6 +3,7 @@
 	name = "Robot Module Configurator"
 	tgui_id = "RobotChoose"
 	var/selected_module
+	var/newName
 	var/datum/robot_sprite/sprite_datum
 
 /datum/tgui_module/robot_ui_module/tgui_state(mob/user)
@@ -50,6 +51,8 @@
 	var/mob/living/silicon/robot/R = host
 	var/datum/asset/spritesheet/robot_icons/spritesheet = get_asset_datum(/datum/asset/spritesheet/robot_icons)
 
+	data["currentName"] = newName ? newName : R.name
+
 	if(selected_module)
 		data["selected_module"]  = selected_module
 		if(!SSrobot_sprites)
@@ -112,7 +115,15 @@
 					sprite_datum = S
 					break
 			. = TRUE
+		if("rename")
+			var/name = params["value"]
+			if(name)
+				newName = sanitizeSafe(name, MAX_NAME_LEN)
 		if("confirm")
+			if(!R.custom_name)
+				if (newName)
+					R.custom_name = newName
+					R.sprite_name = newName
 			R.icon_selected = 1
 			var/module_type = robot_modules[selected_module]
 			R.modtype = selected_module

code/modules/mob/transform_procs.dm

@@ -190,7 +190,6 @@
 		O.custom_speech_bubble = B.custom_speech_bubble
 
 	callHook("borgify", list(O))
-	O.namepick()
 
 	spawn(0)	// Mobs still instantly del themselves, thus we need to spawn or O will never be returned
 		qdel(src)