Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation

This commit is contained in:
Crazylemon64
2016-08-03 13:31:42 -07:00
65 changed files with 174 additions and 2702 deletions
@@ -669,9 +669,6 @@ var/list/robot_verbs_default = list(
C.r_arm = new/obj/item/robot_parts/r_arm(C)
C.updateicon()
new/obj/item/robot_parts/chest(loc)
// This doesn't work. Don't use it.
//src.Destroy()
// del() because it's infrequent and mobs act weird in qdel.
qdel(src)
else
// Okay we're not removing the cell or an MMI, but maybe something else?