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

Merge pull request #6269 from Citadel-Station-13/upstream-merge-36929

Browse Source 
[MIRROR] Fixes chem macros with trailing ;
This commit is contained in:
deathride58
2018-04-04 21:02:22 +00:00
committed by GitHub
parent 5f4509123c 2b7d91481a
commit 3eec79f992
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
View File

@@ -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