From ea876b37cf92a1159206a62929cbd744f1eb59a0 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Tue, 8 Oct 2019 00:20:55 -0800 Subject: [PATCH] Merge pull request #6476 from Hawk-v3/master Printers print Fields correctly now. --- .../modular_computers/hardware/nano_printer.dm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/code/modules/modular_computers/hardware/nano_printer.dm b/code/modules/modular_computers/hardware/nano_printer.dm index 2496a6930d..665b855f4f 100644 --- a/code/modules/modular_computers/hardware/nano_printer.dm +++ b/code/modules/modular_computers/hardware/nano_printer.dm @@ -31,10 +31,25 @@ if(paper_title) P.name = paper_title P.update_icon() + P.fields = count_fields(P.info) + P.updateinfolinks() stored_paper-- return 1 +/obj/item/weapon/computer_hardware/nano_printer/proc/count_fields(var/info) +//Count the fields. This is taken directly from paper.dm, /obj/item/weapon/paper/proc/parsepencode(). -Hawk_v3 + var/fields = 0 + var/t = info + var/laststart = 1 + while(1) + var/i = findtext(t, "", laststart) // + if(i==0) + break + laststart = i+1 + fields++ + return fields + /obj/item/weapon/computer_hardware/nano_printer/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/paper)) if(stored_paper >= max_paper)