Merge pull request #5613 from Citadel-Station-13/upstream-merge-35792

[MIRROR] Fixes multiserver mining formula
This commit is contained in:
deathride58
2018-02-20 15:26:49 +00:00
committed by GitHub
2 changed files with 1 additions and 3 deletions
-2
View File
@@ -29,8 +29,6 @@ SUBSYSTEM_DEF(research)
//[88nodes * 5000points/node] / [1.5hr * 90min/hr * 60s/min]
//Around 450000 points max???
var/bomb_research_point_scaling = 1800
/datum/controller/subsystem/research/Initialize()
initialize_all_techweb_designs()
initialize_all_techweb_nodes()
+1 -1
View File
@@ -52,7 +52,7 @@
/obj/machinery/rnd/server/proc/mine()
. = base_mining_income
var/penalty = max((get_env_temp() - temp_tolerance_low), 0) / temp_penalty_coefficient
var/penalty = max((get_env_temp() - temp_tolerance_high), 0) * temp_penalty_coefficient
. = max(. - penalty, 0)
/obj/machinery/rnd/server/proc/get_env_temp()