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

Conflicts:
	code/_helpers/unsorted.dm
This commit is contained in:
PsiOmega
2015-09-26 08:43:06 +02:00
8 changed files with 39 additions and 24 deletions
+4
View File
@@ -1309,3 +1309,7 @@ var/mob/dview/dview_mob = new
dead_mob_list -= src
else
living_mob_list -= src
// call to generate a stack trace and print to runtime logs
/proc/crash_with(msg)
CRASH(msg)