borgbugfix

Author: jwhitak

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

@@ -36,7 +36,7 @@
 
 	if(required_modules.len)
 		if(!(R.modtype in required_modules))
-			to_chat(user, "<span class='warning'>\The [src] will not fit into \the [R.module.name]!</span>")
+			to_chat(user, "<span class='warning'>\The [src] is not compatible with \the [R.module.name]!</span>")
 			return FAILED_TO_ADD
 
 	if(required_upgrades.len)

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

@@ -251,19 +251,23 @@
 	if(module)
 		return
 	var/list/modules = getModules()
+	var/selected_module
 	if(forced_module)
-		modtype = forced_module
+		selected_module = forced_module
 	else
-		modtype = input("Please, select a module!", "Robot", null, null) as null|anything in modules
+		selected_module = input("Please, select a module!", "Robot", null, null) as null|anything in modules
 	// END forced modules.
 
+	if(!selected_module)
+		return
 	if(module)
 		return
-	if(!(modtype in all_robot_modules))
+	if(!(selected_module in all_robot_modules))
 		return
 
-	var/module_type = all_robot_modules[modtype]
+	var/module_type = all_robot_modules[selected_module]
 	module = new module_type(src)
+	modtype = selected_module
 
 	feedback_inc("cyborg_[lowertext(modtype)]",1)
 	updatename()