Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055

[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
This commit is contained in:
deathride58
2018-03-09 19:25:12 +00:00
committed by GitHub
31 changed files with 654 additions and 799 deletions
+1 -1
View File
@@ -131,7 +131,7 @@
flick("autolathe_o",src)//plays metal insertion animation
if (MAT_GLASS)
flick("autolathe_r",src)//plays glass insertion animation
use_power(max(1000, (MINERAL_MATERIAL_AMOUNT * amount_inserted / 100)))
use_power(min(1000, amount_inserted / 100))
updateUsrDialog()
/obj/machinery/autolathe/Topic(href, href_list)