Merge pull request #7055 from VOREStation/vplk-debug-master

Debug Master Controller

code/modules/error_handler/error_handler.dm

@@ -51,12 +51,12 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 	// First, try to make better src/usr info lines
 	if(istype(e_src))
 		srcinfo = list("  src: [log_info_line(e_src)]")
-		locinfo = log_info_line(e_src)
-		if(locinfo)
-			srcinfo += "  src.loc: [locinfo]"
+		var/atom/atom_e_src = e_src
+		if(istype(atom_e_src))
+			srcinfo += "  src.loc: [log_info_line(atom_e_src.loc)]"
 	if(istype(usr))
 		usrinfo = list("  usr: [log_info_line(usr)]")
-		locinfo = log_info_line(usr)
+		locinfo = log_info_line(usr.loc)
 		if(locinfo)
 			usrinfo += "  usr.loc: [locinfo]"
 	// The proceeding mess will almost definitely break if error messages are ever changed

code/modules/vore/trycatch_vr.dm

@@ -25,6 +25,7 @@ The proc you're attemping should return nonzero values on success.
 	catch(var/exception/e)
 		error("attempt_vr runtimed when calling [procname] on [callon].")
 		error("attempt_vr catch: [e] on [e.file]:[e.line]")
+		log_runtime(e)
 		return 0
 
 /*