Merge remote-tracking branch 'Aurorastation/development' into new-engine

# Conflicts:
#	code/__HELPERS/unsorted.dm
This commit is contained in:
skull132
2016-01-24 23:25:08 +02:00
322 changed files with 4499 additions and 2403 deletions
+1
View File
@@ -91,6 +91,7 @@ var/list/delayed_garbage = list()
return
if(!istype(A))
warning("qdel() passed object of type [A.type]. qdel() can only handle /datum types.")
crash_with("qdel() passed object of type [A.type]. qdel() can only handle /datum types.")
del(A)
if(garbage_collector)
garbage_collector.dels++