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

[MIRROR] Fixes science scaling to decrease materials rather than increase.... (#5882)

Browse Source 
* Fixes scaling displays (#36253)

* Fixes science scaling to decrease materials rather than increase....
This commit is contained in:
CitadelStationBot
2018-03-10 06:55:12 -06:00
committed by Poojawa
parent bfaf737aaf
commit b7e666ff23
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/machinery/_production.dm
+7 -2
View File
@@ -73,6 +73,11 @@
materials.max_amount = 0
for(var/obj/item/stock_parts/matter_bin/M in component_parts)
materials.max_amount += M.rating * 75000
var/total_rating = 0
for(var/obj/item/stock_parts/manipulator/M in component_parts)
total_rating += M.rating
total_rating = max(1, total_rating)
efficiency_coeff /= total_rating
//we eject the materials upon deconstruction.
/obj/machinery/rnd/production/on_deconstruction()
@@ -234,9 +239,9 @@
t = check_mat(D, M)
temp_material += " | "
if (t < 1)
temp_material += "<span class='bad'>[all_materials[M]*coeff] [CallMaterialName(M)]</span>"
temp_material += "<span class='bad'>[all_materials[M]/coeff] [CallMaterialName(M)]</span>"
else
temp_material += " [all_materials[M]*coeff] [CallMaterialName(M)]"
temp_material += " [all_materials[M]/coeff] [CallMaterialName(M)]"
c = min(c,t)
if (c >= 1)
code/modules/research/machinery/circuit_imprinter.dm
-7
View File
@@ -20,13 +20,6 @@
production_animation = "circuit_imprinter_ani"
allowed_buildtypes = IMPRINTER
/obj/machinery/rnd/production/circuit_imprinter/calculate_efficiency()
. = ..()
var/T = 0
for(var/obj/item/stock_parts/manipulator/M in component_parts)
T += M.rating
efficiency_coeff = 2 ** (T - 1) //Only 1 manipulator here, you're making runtimes Razharas
/obj/machinery/rnd/production/circuit_imprinter/disconnect_console()
linked_console.linked_imprinter = null
..()
code/modules/research/machinery/protolathe.dm
-7
View File
@@ -20,13 +20,6 @@
production_animation = "protolathe_n"
allowed_buildtypes = PROTOLATHE
/obj/machinery/rnd/production/protolathe/calculate_efficiency()
. = ..()
efficiency_coeff = 0
for(var/obj/item/stock_parts/manipulator/M in component_parts)
efficiency_coeff += M.rating
efficiency_coeff = max(1, efficiency_coeff)
/obj/machinery/rnd/production/protolathe/disconnect_console()
linked_console.linked_lathe = null
..()