Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix

Conflicts:
	code/game/gamemodes/wizard/artefact.dm
This commit is contained in:
Cheridan
2015-02-15 10:27:50 -06:00
38 changed files with 47 additions and 48 deletions
@@ -46,7 +46,7 @@
qdel(src)
return
SSobj.processing.Add(src)
SSobj.processing |= src
..()
/obj/structure/closet/statue/process()