Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into customitems

This commit is contained in:
Zuhayr
2015-05-13 17:00:10 +09:30
23 changed files with 386 additions and 118 deletions

View File

@@ -78,7 +78,7 @@ var/list/delayed_garbage = list()
destroyed["\ref[A]"] = world.time
/datum/controller/process/garbage_collector/getStatName()
return ..()+"([garbage_collector.dels]/[garbage_collector.hard_dels])"
return ..()+"([garbage_collector.destroyed.len]/[garbage_collector.dels]/[garbage_collector.hard_dels])"
// Should be treated as a replacement for the 'del' keyword.
// Datums passed to this will be given a chance to clean up references to allow the GC to collect them.
@@ -121,7 +121,7 @@ var/list/delayed_garbage = list()
/icon/finalize_qdel()
del(src)
/imagine/finalize_qdel()
/image/finalize_qdel()
del(src)
/mob/finalize_qdel()