Cleans up .rej spam and the empty file from #2792 (#2818)

* Cleans up .rej spam and the empty file from #2792 * Update tgstation.dme
2017-09-17 11:56:55 -05:00
parent 9e0f4c402b
commit dd4f68dfee
19 changed files with 0 additions and 393 deletions
@@ -1,24 +0,0 @@
-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")
@@ -1,10 +0,0 @@
-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()
@@ -1,30 +0,0 @@
-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)