Merge pull request #4799 from Citadel-Station-13/upstream-merge-34161

[MIRROR] Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
2018-01-13 20:24:13 +00:00
parent 8c03304151 c4c93b6c4b
commit 0cad3946c3
17 changed files with 276 additions and 283 deletions
@@ -254,7 +254,7 @@
 		to_chat(user, "<span class='notice'>You add [O] to [src].</span>")
 		qdel(O)
 		qdel(src)
-		user.put_in_hands(new /obj/item/bucket_sensor)
+		user.put_in_hands(new /obj/item/bot_assembly/cleanbot)
 	else
 		..()