From c36f144d9e15c17edd417f5e7a0631a1c0b9382d Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 19 Feb 2018 12:19:38 -0500 Subject: [PATCH] Merge pull request #35792 from DaedalusGame/bitconnect Fixes multiserver mining formula --- code/controllers/subsystem/research.dm | 2 -- code/modules/research/server.dm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index b1468a65c4..43e014061c 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -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() diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index b0fc0d8c9f..833bcfaeae 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -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()