Merge pull request #34161 from ShizCalev/bot_sssembly

Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
This commit is contained in:
oranges
2018-01-13 23:21:58 +13:00
committed by CitadelStationBot
parent ef1c99ba92
commit 8c1c9f5cd7
17 changed files with 276 additions and 283 deletions
+1 -1
View File
@@ -68,7 +68,7 @@
var/obj/item/stack/sheet/metal/M = W
if(!l_arm && !r_arm && !l_leg && !r_leg && !chest && !head)
if (M.use(1))
var/obj/item/ed209_assembly/B = new /obj/item/ed209_assembly
var/obj/item/bot_assembly/ed209/B = new
B.forceMove(drop_location())
to_chat(user, "<span class='notice'>You arm the robot frame.</span>")
var/holding_this = user.get_inactive_held_item()==src
+1 -1
View File
@@ -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