From 057d10f6540225ae17c3d8a114aef8648fca7c60 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 2 Apr 2018 18:32:51 -0400 Subject: [PATCH 1/2] Fixes chem macros with trailing ; --- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index f6f5f97607..ca88930881 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -364,9 +364,9 @@ obj/machinery/chem_dispenser/proc/work_animation() if (macrotier > 1) . -= macrotier // 5 for tier1, 3 for 2, 2 for 3, 1 for 4. -/obj/machinery/chem_dispenser/proc/check_macro(var/macro) +/obj/machinery/chem_dispenser/proc/check_macro(macro) var/res = get_macro_resolution() - for (var/reagent in splittext(macro, ";")) + for (var/reagent in splittext(trim(macro), ";")) if (!check_macro_part(reagent, res)) return FALSE return TRUE