shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

Browse Source
This commit is contained in:
LetterN
2021-12-21 07:59:33 +08:00
parent fe6556f7b7 d2f3070522
commit fab4b07be5
164 changed files with 128258 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/research.dm
+7 -1
View File
@@ -343,10 +343,16 @@ SUBSYSTEM_DEF(research)
break //Just need one to work.
if (!isnull(last_income))
var/income_time_difference = world.time - last_income
science_tech.last_bitcoins = bitcoins // Doesn't take tick drift into account
for(var/i in bitcoins)
bitcoins[i] *= income_time_difference / 10
science_tech.add_point_list(bitcoins)
var/list/income = science_tech.commit_income()
for(var/i in income)
var/old_weighted = science_tech.last_bitcoins[i] * (1 MINUTES - income_time_difference)
var/new_weighted = income[i] * income_time_difference
science_tech.last_bitcoins[i] = (old_weighted + new_weighted) / (1 MINUTES)
else
science_tech.last_bitcoins = bitcoins.Copy()
last_income = world.time
/datum/controller/subsystem/research/proc/calculate_server_coefficient() //Diminishing returns.