cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/_helpers/unsorted.dm
This commit is contained in:
PsiOmega
2015-09-26 08:43:06 +02:00
parent 61a4d3b7af c987fedc24
commit 145d8d91ef
8 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/controllers/Processes/garbage.dm
View File

@@ -146,6 +146,7 @@ world/loop_checks = 0
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++