From 5613768c25a9f29664176a8c0a01efa0fd3ea04d Mon Sep 17 00:00:00 2001 From: Archie Date: Sat, 9 Jan 2021 16:01:21 -0300 Subject: [PATCH] haha chem master go brrrr --- code/modules/reagents/chemistry/machinery/chem_master.dm | 6 +++--- tgui-next/packages/tgui/interfaces/ChemMaster.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index d001d7f5..187ed3e2 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -32,7 +32,7 @@ for (var/x in 1 to PILL_STYLE_COUNT) var/list/SL = list() SL["id"] = x - SL["htmltag"] = assets.icon_tag("pill[x]") + SL["htmltag"] = assets.icon_class_name("pill[x]") pillStyles += list(SL) . = ..() @@ -129,7 +129,7 @@ if(beaker) var/obj/item/reagent_containers/B = beaker B.forceMove(drop_location()) - if(user && Adjacent(user) && !issiliconoradminghost(user)) + if(user && Adjacent(user) && user.can_hold_items()) user.put_in_hands(B) if(new_beaker) beaker = new_beaker @@ -139,7 +139,7 @@ if(bottle) var/obj/item/storage/pill_bottle/B = bottle B.forceMove(drop_location()) - if(user && Adjacent(user) && !issiliconoradminghost(user)) + if(user && Adjacent(user) && user.can_hold_items()) user.put_in_hands(B) else adjust_item_drop_location(B) diff --git a/tgui-next/packages/tgui/interfaces/ChemMaster.js b/tgui-next/packages/tgui/interfaces/ChemMaster.js index 00c61ddf..1997b3b9 100644 --- a/tgui-next/packages/tgui/interfaces/ChemMaster.js +++ b/tgui-next/packages/tgui/interfaces/ChemMaster.js @@ -396,7 +396,7 @@ const AnalysisResults = props => { )} - {!! data.fermianalyze && ( + {!!fermianalyze && ( {analyzeVars.name}