diff --git a/code/defines/mob/living/silicon/robot.dm b/code/defines/mob/living/silicon/robot.dm
index 41256bd2de6..ebcf1457b69 100644
--- a/code/defines/mob/living/silicon/robot.dm
+++ b/code/defines/mob/living/silicon/robot.dm
@@ -3,7 +3,6 @@
 	icon = 'robots.dmi'//
 	icon_state = "robot"
 	health = 300
-	canmove = 0
 
 #define BORGMESON 1
 #define BORGTHERM 2
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 783eef7b8dd..2ee69c5746e 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -20,8 +20,7 @@
 		use_power()
 		process_killswitch()
 		process_locks()
-	if(modtype != "robot") //only update canmove if we've selected a module
-		update_canmove()
+	update_canmove()
 
 	update_mind()
 
diff --git a/code/modules/mob/living/silicon/robot/login.dm b/code/modules/mob/living/silicon/robot/login.dm
index 2e46cec1ca5..428e78d6c27 100644
--- a/code/modules/mob/living/silicon/robot/login.dm
+++ b/code/modules/mob/living/silicon/robot/login.dm
@@ -8,6 +8,10 @@
 		src.client.perspective = EYE_PERSPECTIVE
 	if (src.stat == 2)
 		src.verbs += /mob/proc/ghost
+	if(src.real_name == "Cyborg")
+		src.real_name += " "
+		src.real_name += "-[rand(1, 999)]"
+		src.name = src.real_name
 	if(!src.connected_ai)
 		for(var/mob/living/silicon/ai/A in world)
 			src.connected_ai = A
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 61b0324a9d7..a0209ededd8 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -9,6 +9,9 @@
 		modtype = "robot"
 		updateicon()
 //		syndicate = syndie
+		if(real_name == "Cyborg")
+			real_name += " [pick(rand(1, 999))]"
+			name = real_name
 	spawn (4)
 		if (client)
 			connected_ai = activeais()
@@ -64,7 +67,6 @@
 		return
 	switch(mod)
 		if("Standard")
-			updatename("Cy")
 			module = new /obj/item/weapon/robot_module/standard(src)
 			hands.icon_state = "standard"
 			icon_state = "robot"
@@ -72,7 +74,6 @@
 			feedback_inc("cyborg_standard",1)
 
 		if("Service")
-			updatename("Servi")
 			module = new /obj/item/weapon/robot_module/butler(src)
 			hands.icon_state = "service"
 			var/icontype = input("Select an icon!", "Robot", null, null) in list("Waitress", "Bro", "Butler", "Kent", "Rich")
@@ -90,7 +91,6 @@
 			feedback_inc("cyborg_service",1)
 
 		if("Miner")
-			updatename("Digger")
 			module = new /obj/item/weapon/robot_module/miner(src)
 			hands.icon_state = "miner"
 			icon_state = "Miner"
@@ -98,7 +98,6 @@
 			feedback_inc("cyborg_miner",1)
 
 		if("Medical")
-			updatename("Medi")
 			module = new /obj/item/weapon/robot_module/medical(src)
 			hands.icon_state = "medical"
 			icon_state = "surgeon"
@@ -107,7 +106,6 @@
 			feedback_inc("cyborg_medical",1)
 
 		if("Security")
-			updatename("Securi")
 			module = new /obj/item/weapon/robot_module/security(src)
 			hands.icon_state = "security"
 			icon_state = "bloodhound"
@@ -115,7 +113,6 @@
 			feedback_inc("cyborg_security",1)
 
 		if("Engineering")
-			updatename("Engi")
 			module = new /obj/item/weapon/robot_module/engineering(src)
 			hands.icon_state = "engineer"
 			icon_state = "landmate"
@@ -123,7 +120,6 @@
 			feedback_inc("cyborg_engineering",1)
 
 		if("Janitor")
-			updatename("Jani")
 			module = new /obj/item/weapon/robot_module/janitor(src)
 			hands.icon_state = "janitor"
 			icon_state = "mopgearrex"
@@ -133,18 +129,6 @@
 	overlays -= "eyes" //Takes off the eyes that it started with
 	updateicon()
 
-/mob/living/silicon/robot/verb/updatename(var/prefix as text)
-	if(real_name == "Cyborg")
-		var/defaultname = "[prefix]borg -[rand(1,999)]"
-		var/newname = input("Please input a name", "Name selection", defaultname, null)
-		newname = copytext(sanitize(newname), 1, MAX_MESSAGE_LEN) //Sanitize the name
-
-		if(!newname)
-			newname = "[defaultname]"
-
-		real_name = newname
-		name = real_name
-
 /mob/living/silicon/robot/verb/cmd_robot_alerts()
 	set category = "Robot Commands"
 	set name = "Show Alerts"
diff --git a/html/changelog.html b/html/changelog.html
index 4b77c119211..0bba1681868 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -97,7 +97,6 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<h3 class="author">Carn updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="rscadd">Spacevines added to the random events.</li>
-		<li class="rscadd">Borgs can now name themselves. To avoid abuse, borgs cannot move until they select a module, so don't panic. Also, borg names now default to job-specific ones (for everybody's sanity when there are lots of borgs around).</li>
 		<li class="bugfix">The bug where doors kept opening when a borg tried to close them at close range is now fixed.</li>
 	</ul>
 </div>
diff --git a/tgstation.dme b/tgstation.dme
index 2140e602297..2e808efe2e4 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -834,11 +834,11 @@
 #include "code\game\gamemodes\events\black_hole.dm"
 #include "code\game\gamemodes\events\clang.dm"
 #include "code\game\gamemodes\events\dust.dm"
-#include "code\game\gamemodes\events\kudzu.dm"
 #include "code\game\gamemodes\events\miniblob.dm"
 #include "code\game\gamemodes\events\ninja_abilities.dm"
 #include "code\game\gamemodes\events\ninja_equipment.dm"
 #include "code\game\gamemodes\events\space_ninja.dm"
+#include "code\game\gamemodes\events\spacevines.dm"
 #include "code\game\gamemodes\extended\extended.dm"
 #include "code\game\gamemodes\malfunction\Malf_Modules.dm"
 #include "code\game\gamemodes\malfunction\malfunction.dm"