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

Merge pull request #4935 from Citadel-Station-13/upstream-merge-34639

Browse Source 
[MIRROR] Fixes autolathe power consumption
This commit is contained in:
deathride58
2018-01-19 19:35:12 +00:00
committed by GitHub
parent c1f843edc4 2442520b0d
commit 8f358b6313
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/autolathe.dm
+2 -2
View File
@@ -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)