Merge branch 'master' into upstream-merge-33783

2017-12-29 06:49:47 -06:00
parent c7db4e8310 6d52395643
commit a64a1e4a5c
55 changed files with 2371 additions and 17035 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! ^^^^^^^^