Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme

code/__DEFINES/_tick.dm

@@ -6,5 +6,8 @@
 #define TICK_USAGE world.tick_usage //for general usage
 #define TICK_USAGE_REAL world.tick_usage    //to be used where the result isn't checked
 
-#define TICK_CHECK ( world.tick_usage > TICK_LIMIT_RUNNING ? stoplag() : 0 )
-#define CHECK_TICK if(world.tick_usage > TICK_LIMIT_RUNNING)  stoplag()
+#define TICK_CHECK ( TICK_USAGE > Master.current_ticklimit )
+#define CHECK_TICK ( TICK_CHECK ? stoplag() : 0 )
+
+#define TICK_CHECK_HIGH_PRIORITY ( TICK_USAGE > 95 )
+#define CHECK_TICK_HIGH_PRIORITY ( TICK_CHECK_HIGH_PRIORITY? stoplag() : 0 )

code/__DEFINES/callbacks.dm

@@ -1,2 +1,4 @@
+#define GLOBAL_PROC	"some_magic_bullshit"
+
 #define CALLBACK new /datum/callback
 #define INVOKE_ASYNC ImmediateInvokeAsync

code/__DEFINES/process_scheduler.dm

@@ -1,34 +0,0 @@
-// Process status defines
-#define PROCESS_STATUS_IDLE 1
-#define PROCESS_STATUS_QUEUED 2
-#define PROCESS_STATUS_RUNNING 3
-#define PROCESS_STATUS_MAYBE_HUNG 4
-#define PROCESS_STATUS_PROBABLY_HUNG 5
-#define PROCESS_STATUS_HUNG 6
-
-// Process time thresholds
-#define PROCESS_DEFAULT_HANG_WARNING_TIME 300 // 30 seconds
-#define PROCESS_DEFAULT_HANG_ALERT_TIME   600 // 60 seconds
-#define PROCESS_DEFAULT_HANG_RESTART_TIME 900 // 90 seconds
-#define PROCESS_DEFAULT_SCHEDULE_INTERVAL 50  // 50 ticks
-#define PROCESS_DEFAULT_SLEEP_INTERVAL    20  // 20% of a tick
-#define PROCESS_DEFAULT_DEFER_USAGE       90  // 90% of a tick
-
-// Sleep check macro
-#define SCHECK if(world.tick_usage >= next_sleep_usage) defer()
-
-//Timing Controller
-#define GLOBAL_PROC	"some_magic_bullshit"
-
-#define DECLARE_GLOBAL_CONTROLLER(PROCESS,VARNAME) \
-/datum/controller/process/##PROCESS/assertGlobality(){\
-	if(##VARNAME){\
-		message_admins("Controller '[name]' tried to become global but found another controller there already. Deleting the old controller.");\
-		qdel(##VARNAME);}\
-	##VARNAME = src;}\
-\
-/datum/controller/process/##PROCESS/releaseGlobality(){\
-	if(##VARNAME == src)\
-		##VARNAME = null;\
-	else\
-		message_admins("Controller '[name]' asked to release global control in spite of not having it!");}