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
@@ -29,7 +29,7 @@

 		if(S.secured)
 			qdel(S)
-			var/obj/item/secbot_assembly/A = new /obj/item/secbot_assembly
+			var/obj/item/bot_assembly/secbot/A = new
 			user.put_in_hands(A)
 			to_chat(user, "<span class='notice'>You add the signaler to the helmet.</span>")
 			qdel(src)