Adds tracking amount of time spent playing departments 2: The fall of the Assistants.

code/controllers/configuration.dm

@@ -103,6 +103,13 @@
 	var/use_account_age_for_jobs = 0	//Uses the time they made the account for the job restriction stuff. New player joining alerts should be unaffected.
 	var/see_own_notes = 0 //Can players see their own admin notes (read-only)? Config option in config.txt
 
+	var/use_exp_tracking = FALSE
+	var/use_exp_restrictions_heads = FALSE
+	var/use_exp_restrictions_heads_hours = 0
+	var/use_exp_restrictions_heads_department = FALSE
+	var/use_exp_restrictions_other = FALSE
+	var/use_exp_restrictions_admin_bypass = FALSE
+
 	//Population cap vars
 	var/soft_popcap				= 0
 	var/hard_popcap				= 0

code/controllers/configuration.dm.rej

@@ -0,0 +1,24 @@
+diff a/code/controllers/configuration.dm b/code/controllers/configuration.dm	(rejected hunks)
+@@ -337,17 +337,17 @@
+ 				if("use_account_age_for_jobs")
+ 					use_account_age_for_jobs = 1
+ 				if("use_exp_tracking")
+-					use_exp_tracking = 1
++					use_exp_tracking = TRUE
+ 				if("use_exp_restrictions_heads")
+-					use_exp_restrictions_heads = 1
++					use_exp_restrictions_heads = TRUE
+ 				if("use_exp_restrictions_heads_hours")
+ 					use_exp_restrictions_heads_hours = text2num(value)
+ 				if("use_exp_restrictions_heads_department")
+-					use_exp_restrictions_heads_department = 1
++					use_exp_restrictions_heads_department = TRUE
+ 				if("use_exp_restrictions_other")
+-					use_exp_restrictions_other = 1
++					use_exp_restrictions_other = TRUE
+ 				if("use_exp_restrictions_admin_bypass")
+-					use_exp_restrictions_admin_bypass = 1
++					use_exp_restrictions_admin_bypass = TRUE
+ 				if("lobby_countdown")
+ 					lobby_countdown = text2num(value)
+ 				if("round_end_countdown")

code/controllers/subsystem/blackbox.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(blackbox)
 	name = "Blackbox"
 	wait = 6000
-	flags = SS_NO_TICK_CHECK | SS_NO_INIT
+	flags = SS_NO_TICK_CHECK
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 	init_order = INIT_ORDER_BLACKBOX
 

code/controllers/subsystem/blackbox.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm	(rejected hunks)
+@@ -40,7 +40,7 @@ SUBSYSTEM_DEF(blackbox)
+ 
+ 	if(config.use_exp_tracking)
+ 		if((triggertime < 0) || (world.time > (triggertime +3000)))	//subsystem fires once at roundstart then once every 10 minutes. a 5 min check skips the first fire. The <0 is midnight rollover check
+-			SSblackbox.update_exp(10,FALSE)
++			update_exp(10,FALSE)
+ 
+ 
+ /datum/controller/subsystem/blackbox/Recover()

code/controllers/subsystem/job.dm

@@ -73,6 +73,8 @@ SUBSYSTEM_DEF(job)
 			return 0
 		if(!job.player_old_enough(player.client))
 			return 0
+		if(job.required_playtime_remaining(player.client))
+			return 0
 		var/position_limit = job.total_positions
 		if(!latejoin)
 			position_limit = job.spawn_positions
@@ -95,6 +97,9 @@ SUBSYSTEM_DEF(job)
 		if(!job.player_old_enough(player.client))
 			Debug("FOC player not old enough, Player: [player]")
 			continue
+		if(job.required_playtime_remaining(player.client))
+			Debug("FOC player not enough xp, Player: [player]")
+			continue
 		if(flag && (!(flag in player.client.prefs.be_special)))
 			Debug("FOC flag failed, Player: [player], Flag: [flag], ")
 			continue
@@ -130,6 +135,10 @@ SUBSYSTEM_DEF(job)
 			Debug("GRJ player not old enough, Player: [player]")
 			continue
 
+		if(job.required_playtime_remaining(player.client))
+			Debug("GRJ player not enough xp, Player: [player]")
+			continue
+
 		if(player.mind && job.title in player.mind.restricted_roles)
 			Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
 			continue
@@ -300,6 +309,10 @@ SUBSYSTEM_DEF(job)
 					Debug("DO player not old enough, Player: [player], Job:[job.title]")
 					continue
 
+				if(job.required_playtime_remaining(player.client))
+					Debug("DO player not enough xp, Player: [player], Job:[job.title]")
+					continue
+
 				if(player.mind && job.title in player.mind.restricted_roles)
 					Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
 					continue
@@ -463,6 +476,9 @@ SUBSYSTEM_DEF(job)
 			if(!job.player_old_enough(player.client))
 				level6++
 				continue
+			if(job.required_playtime_remaining(player.client))
+				level6++
+				continue
 			if(player.client.prefs.GetJobDepartment(job, 1) & job.flag)
 				level1++
 			else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag)

code/controllers/subsystem/server_maint.dm.rej

@@ -0,0 +1,30 @@
+diff a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm	(rejected hunks)
+@@ -6,18 +6,16 @@ SUBSYSTEM_DEF(server_maint)
+ 	flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
+ 	priority = 10
+ 	var/list/currentrun
+-	var/triggertime = null
+ 
+ /datum/controller/subsystem/server_maint/Initialize(timeofday)
+ 	if (config.hub)
+ 		world.visibility = 1
+-	triggertime = REALTIMEOFDAY
+ 	..()
+ 
+ /datum/controller/subsystem/server_maint/fire(resumed = FALSE)
+ 	if(!resumed)
+ 		src.currentrun = GLOB.clients.Copy()
+-	
++
+ 	var/list/currentrun = src.currentrun
+ 	var/round_started = SSticker.HasRoundStarted()
+ 
+@@ -39,8 +37,3 @@ SUBSYSTEM_DEF(server_maint)
+ 			return
+ 
+ #undef PING_BUFFER_TIME
+-	if(config.sql_enabled)
+-		sql_poll_population()
+-		if(config.use_exp_tracking)
+-			if(REALTIMEOFDAY > (triggertime +3000))	//server maint fires once at roundstart then once every 10 minutes. a 5 min check skips the first fire
+-				update_exp(10,0)