Merge resolution.

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

@@ -134,7 +134,7 @@
 			if (user.get_inactive_hand()==src)
 				user.remove_from_mob(src)
 				user.put_in_inactive_hand(B)
-			del(src)
+			qdel(src)
 		else
 			user << "<span class='warning'>You need one sheet of metal to arm the robot frame.</span>"
 	if(istype(W, /obj/item/robot_parts/l_leg))
@@ -250,7 +250,7 @@
 			callHook("borgify", list(O))
 			O.Namepick()
 
-			del(src)
+			qdel(src)
 		else
 			user << "\blue The MMI must go in after everything else!"
 
@@ -303,8 +303,8 @@
 		user << "\blue You install some manipulators and modify the head, creating a functional spider-bot!"
 		new /mob/living/simple_animal/spiderbot(get_turf(loc))
 		user.drop_item()
-		del(W)
-		del(src)
+		qdel(W)
+		qdel(src)
 		return
 	return
 

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

@@ -28,20 +28,14 @@
 /obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R)
 	if(..()) return 0
 	R.uneq_all()
-	R.hands.icon_state = "nomod"
-	R.icon_state = "robot"
-	//world << R.custom_sprite
-	if(R.custom_sprite == 1)
-		//world << R.icon_state
-		icon = 'icons/mob/custom-synthetic.dmi'
-		R.icon_state = "[R.ckey]-Standard"
-	del(R.module)
+	R.modtype = initial(R.modtype)
+	R.hands.icon_state = initial(R.hands.icon_state)
+
+	R.choose_icon(1, R.set_module_sprites(list("Default" = "robot")))
+
 	R.notify_ai(ROBOT_NOTIFICATION_MODULE_RESET, R.module.name)
-	R.module = null
-	R.camera.remove_networks(list("Engineering","Medical","MINE"))
+	R.module.Reset(R)
 	R.updatename("Default")
-	R.status_flags |= CANPUSH
-	R.updateicon()
 
 	return 1
 
@@ -116,7 +110,7 @@
 /obj/item/borg/upgrade/tasercooler/action(var/mob/living/silicon/robot/R)
 	if(..()) return 0
 
-	if(!istype(R.module, /obj/item/weapon/robot_module/security))
+	if(!R.module || !(src in R.module.supported_upgrades))
 		R << "Upgrade mounting error!  No suitable hardpoint detected!"
 		usr << "There's no mounting point for the module!"
 		return 0
@@ -150,7 +144,7 @@
 /obj/item/borg/upgrade/jetpack/action(var/mob/living/silicon/robot/R)
 	if(..()) return 0
 
-	if(!istype(R.module, /obj/item/weapon/robot_module/miner))
+	if(!R.module || !(src in R.module.supported_upgrades))
 		R << "Upgrade mounting error!  No suitable hardpoint detected!"
 		usr << "There's no mounting point for the module!"
 		return 0