Merge branch 'master' into upstream-merge-33537

2017-12-30 13:14:48 -06:00
parent 69930a192d 68c5c6cfe2
commit d3f6cf4dd8
918 changed files with 13347 additions and 23233 deletions
@@ -20,7 +20,7 @@ SUBSYSTEM_DEF(research)
 	var/list/techweb_point_items = list()		//path = value
 	var/list/errored_datums = list()
 	//----------------------------------------------
-	var/single_server_income = 40.7
+	var/single_server_income = 54.3
 	var/multiserver_calculation = FALSE
 	var/last_income = 0
 	//^^^^^^^^ ALL OF THESE ARE PER SECOND! ^^^^^^^^