Merge resolution.

This commit is contained in:
Zuhayr
2015-05-10 18:33:06 +09:30
777 changed files with 22019 additions and 21336 deletions

View File

@@ -29,7 +29,7 @@
var/obj/item/robot_parts/robot_component/comp = wrapped
brokenstate = comp.icon_state_broken
if(wrapped)
del wrapped
qdel(wrapped)
wrapped = new/obj/item/broken_device