From 363effb98f48bbcd85f698f93492fc4670f55524 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 19 Jan 2018 09:51:44 -0500 Subject: [PATCH 1/2] Merge pull request #34639 from DaxDupont/succ-less-power Fixes autolathe power consumption --- code/game/machinery/autolathe.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index d34c800716..7554bb00ae 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -125,14 +125,14 @@ /obj/machinery/autolathe/proc/AfterMaterialInsert(type_inserted, id_inserted, amount_inserted) if(ispath(type_inserted, /obj/item/ore/bluespace_crystal)) - use_power(max(500, amount_inserted / 10)) + use_power(MINERAL_MATERIAL_AMOUNT / 10) else switch(id_inserted) if (MAT_METAL) flick("autolathe_o",src)//plays metal insertion animation if (MAT_GLASS) flick("autolathe_r",src)//plays glass insertion animation - use_power(amount_inserted * 100) + use_power(max(1000, (MINERAL_MATERIAL_AMOUNT * amount_inserted / 100))) updateUsrDialog() /obj/machinery/autolathe/Topic(href, href_list)