Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain.

code/game/objects/items/robot/robot_parts.dm

@@ -10,7 +10,7 @@
 	var/list/part = null
 
 /obj/item/robot_parts/l_arm
-	name = "Cyborg Left Arm"
+	name = "robot left arm"
 	desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
 	icon_state = "l_arm"
 	construction_time = 200
@@ -18,7 +18,7 @@
 	part = list("l_arm","l_hand")
 
 /obj/item/robot_parts/r_arm
-	name = "Cyborg Right Arm"
+	name = "robot right arm"
 	desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
 	icon_state = "r_arm"
 	construction_time = 200
@@ -26,7 +26,7 @@
 	part = list("r_arm","r_hand")
 
 /obj/item/robot_parts/l_leg
-	name = "Cyborg Left Leg"
+	name = "robot left leg"
 	desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
 	icon_state = "l_leg"
 	construction_time = 200
@@ -34,7 +34,7 @@
 	part = list("l_leg","l_foot")
 
 /obj/item/robot_parts/r_leg
-	name = "Cyborg Right Leg"
+	name = "robot right leg"
 	desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
 	icon_state = "r_leg"
 	construction_time = 200
@@ -42,7 +42,7 @@
 	part = list("r_leg","r_foot")
 
 /obj/item/robot_parts/chest
-	name = "Cyborg Torso"
+	name = "robot torso"
 	desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell."
 	icon_state = "chest"
 	construction_time = 350
@@ -51,7 +51,7 @@
 	var/obj/item/weapon/cell/cell = null
 
 /obj/item/robot_parts/head
-	name = "Cyborg Head"
+	name = "robot head"
 	desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals."
 	icon_state = "head"
 	construction_time = 350
@@ -60,7 +60,7 @@
 	var/obj/item/device/flash/flash2 = null
 
 /obj/item/robot_parts/robot_suit
-	name = "Cyborg Endoskeleton"
+	name = "robot endoskeleton"
 	desc = "A complex metal backbone with standard limb sockets and pseudomuscle anchors."
 	icon_state = "robo_suit"
 	construction_time = 500
@@ -215,6 +215,7 @@
 			W.loc = O//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame.
 
 			feedback_inc("cyborg_birth",1)
+			O.Namepick()
 
 			del(src)
 		else

code/game/objects/items/robot/robot_upgrades.dm

@@ -14,14 +14,14 @@
 
 /obj/item/borg/upgrade/proc/action(var/mob/living/silicon/robot/R)
 	if(R.stat == DEAD)
-		usr << "/red The [src] will not function on a deceased cyborg."
+		usr << "/red The [src] will not function on a deceased robot."
 		return 1
 	return 0
 
 
 /obj/item/borg/upgrade/reset
-	name = "cyborg module reset board"
-	desc = "Used to reset a cyborg's module. Destroys any other upgrades applied to the cyborg."
+	name = "robotic module reset board"
+	desc = "Used to reset a cyborg's module. Destroys any other upgrades applied to the robot."
 	icon_state = "cyborg_upgrade1"
 	require_module = 1
 
@@ -40,14 +40,14 @@
 	return 1
 
 /obj/item/borg/upgrade/rename
-	name = "cyborg reclassification board"
+	name = "robot reclassification board"
 	desc = "Used to rename a cyborg."
 	icon_state = "cyborg_upgrade1"
 	construction_cost = list("metal"=35000)
 	var/heldname = "default name"
 
 /obj/item/borg/upgrade/rename/attack_self(mob/user as mob)
-	heldname = stripped_input(user, "Enter new robot name", "Cyborg Reclassification", heldname, MAX_NAME_LEN)
+	heldname = stripped_input(user, "Enter new robot name", "Robot Reclassification", heldname, MAX_NAME_LEN)
 
 /obj/item/borg/upgrade/rename/action(var/mob/living/silicon/robot/R)
 	if(..()) return 0
@@ -57,15 +57,15 @@
 	return 1
 
 /obj/item/borg/upgrade/restart
-	name = "cyborg emergency restart module"
-	desc = "Used to force a restart of a disabled-but-repaired cyborg, bringing it back online."
+	name = "robot emergency restart module"
+	desc = "Used to force a restart of a disabled-but-repaired robot, bringing it back online."
 	construction_cost = list("metal"=60000 , "glass"=5000)
 	icon_state = "cyborg_upgrade1"
 
 
 /obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R)
 	if(R.health < 0)
-		usr << "You have to repair the cyborg before using this module!"
+		usr << "You have to repair the robot before using this module!"
 		return 0
 
 	if(!R.key)
@@ -78,8 +78,8 @@
 
 
 /obj/item/borg/upgrade/vtec
-	name = "cyborg VTEC Module"
-	desc = "Used to kick in a cyborg's VTEC systems, increasing their speed."
+	name = "robotic VTEC Module"
+	desc = "Used to kick in a robot's VTEC systems, increasing their speed."
 	construction_cost = list("metal"=80000 , "glass"=6000 , "gold"= 5000)
 	icon_state = "cyborg_upgrade2"
 	require_module = 1
@@ -95,7 +95,7 @@
 
 
 /obj/item/borg/upgrade/tasercooler
-	name = "cyborg Rapid Taser Cooling Module"
+	name = "robotic Rapid Taser Cooling Module"
 	desc = "Used to cool a mounted taser, increasing the potential current in it and thus its recharge rate."
 	construction_cost = list("metal"=80000 , "glass"=6000 , "gold"= 2000, "diamond" = 500)
 	icon_state = "cyborg_upgrade3"
@@ -116,7 +116,7 @@
 	if(!T)
 		T = locate() in R.module.modules
 	if(!T)
-		usr << "This cyborg has had its taser removed!"
+		usr << "This robot has had its taser removed!"
 		return 0
 
 	if(T.recharge_time <= 2)
@@ -130,7 +130,7 @@
 	return 1
 
 /obj/item/borg/upgrade/jetpack
-	name = "mining cyborg jetpack"
+	name = "mining robot jetpack"
 	desc = "A carbon dioxide jetpack suitable for low-gravity mining operations."
 	construction_cost = list("metal"=10000,"plasma"=15000,"uranium" = 20000)
 	icon_state = "cyborg_upgrade3"
@@ -153,7 +153,7 @@
 
 /obj/item/borg/upgrade/syndicate/
 	name = "Illegal Equipment Module"
-	desc = "Unlocks the hidden, deadlier functions of a cyborg"
+	desc = "Unlocks the hidden, deadlier functions of a robot"
 	construction_cost = list("metal"=10000,"glass"=15000,"diamond" = 10000)
 	icon_state = "cyborg_upgrade3"
 	require_module = 1

code/game/objects/items/weapons/AI_modules.dm

@@ -62,18 +62,18 @@ AI MODULES
 			usr << "The upload computer is broken!"
 			return
 		if (!comp.current)
-			usr << "You haven't selected a cyborg to transmit laws to!"
+			usr << "You haven't selected a robot to transmit laws to!"
 			return
 
 		if (comp.current.stat == 2 || comp.current.emagged)
-			usr << "Upload failed. No signal is being detected from the cyborg."
+			usr << "Upload failed. No signal is being detected from the robot."
 		else if (comp.current.connected_ai)
-			usr << "Upload failed. The cyborg is slaved to an AI."
+			usr << "Upload failed. The robot is slaved to an AI."
 		else
 			src.transmitInstructions(comp.current, usr)
 			comp.current << "These are your laws now:"
 			comp.current.show_laws()
-			usr << "Upload complete. The cyborg's laws have been modified."
+			usr << "Upload complete. The robot's laws have been modified."
 
 
 /obj/item/weapon/aiModule/proc/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)