Merge pull request #52148 from Fikou/patch-38

makes techweb income a define
This commit is contained in:
skoglol
2020-07-12 11:34:37 +02:00
committed by GitHub
2 changed files with 4 additions and 1 deletions
+3
View File
@@ -85,3 +85,6 @@
#define SLIME_RESEARCH_TIER_4 2000
#define SLIME_RESEARCH_TIER_5 2500
#define SLIME_RESEARCH_TIER_RAINBOW 5000
///Amount of points gained per second by a single R&D server, see: [/controllers/subsystem/research.dm][research]
#define TECHWEB_SINGLE_SERVER_INCOME 52.3
+1 -1
View File
@@ -32,7 +32,7 @@ SUBSYSTEM_DEF(research)
var/list/point_types = list() //typecache style type = TRUE list
var/list/slime_already_researched = list() //Slime cores that have already been researched
//----------------------------------------------
var/list/single_server_income = list(TECHWEB_POINT_TYPE_GENERIC = 52.3)
var/list/single_server_income = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_SINGLE_SERVER_INCOME)
var/multiserver_calculation = FALSE
var/last_income
//^^^^^^^^ ALL OF THESE ARE PER SECOND! ^^^^^^^^