Merge branch 'master' into upstream-merge-37486

2018-05-21 08:59:32 -05:00
parent 50f8779fc0 6060df5b92
commit 931a950adb
403 changed files with 10034 additions and 7488 deletions
@@ -1,6 +1,6 @@
 GLOBAL_REAL(config, /datum/controller/configuration)

-GLOBAL_DATUM_INIT(revdata, /datum/getrev, new)
+GLOBAL_DATUM(revdata, /datum/getrev)

 GLOBAL_VAR(host)
 GLOBAL_VAR(station_name)
@@ -20,6 +20,8 @@ GLOBAL_VAR(world_pda_log)
 GLOBAL_PROTECT(world_pda_log)
 GLOBAL_VAR(world_manifest_log)
 GLOBAL_PROTECT(world_manifest_log)
+GLOBAL_VAR(query_debug_log)
+GLOBAL_PROTECT(query_debug_log)

 GLOBAL_LIST_EMPTY(bombers)
 GLOBAL_PROTECT(bombers)