Merge pull request #34161 from ShizCalev/bot_sssembly

Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
2018-01-13 23:21:58 +13:00
parent ef1c99ba92
commit 8c1c9f5cd7
17 changed files with 276 additions and 283 deletions
@@ -622,7 +622,7 @@ obj/item/storage/box/clown
 			return
 		qdel(I)
 		to_chat(user, "<span class='notice'>You add some wheels to the [src]! You've got an honkbot assembly now! Honk!</span>")
-		var/obj/item/honkbot_assembly/A = new
+		var/obj/item/bot_assembly/honkbot/A = new
 		qdel(src)
 		user.put_in_hands(A)
 	else