From d9047e458c5f8cc031055dceefd73eb701e0dc2d Mon Sep 17 00:00:00 2001 From: Fermi <33956696+Thalpy@users.noreply.github.com> Date: Mon, 4 Jan 2021 15:47:35 +0000 Subject: [PATCH] Testing and bugfixes --- .../chemistry/machinery/chem_dispenser.dm | 6 + .../chemistry/reagents/fermi_reagents.dm | 8 +- .../packages/tgui/interfaces/ChemDispenser.js | 138 +++++++++--------- tgui/public/tgui.bundle.js | 2 +- 4 files changed, 82 insertions(+), 72 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 01a41671ea..a97a4c1f01 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -28,6 +28,7 @@ var/amount = 30 var/recharge_amount = 10 var/recharge_counter = 0 + var/canStore = TRUE//If this can hold reagents or not var/mutable_appearance/beaker_overlay var/working_state = "dispenser_working" var/nopower_state = "dispenser_nopower" @@ -198,6 +199,7 @@ data["maxVol"] = reagents.maximum_volume data["isBeakerLoaded"] = beaker ? 1 : 0 data["stepAmount"] = dispenceUnit + data["canStore"] = canStore var/beakerContents[0] var/beakerCurrentVolume = 0 @@ -563,6 +565,7 @@ working_state = null nopower_state = null pass_flags = PASSTABLE + canStore = FALSE dispensable_reagents = list( /datum/reagent/water, /datum/reagent/consumable/ice, @@ -695,12 +698,14 @@ dispensable_reagents = list(/datum/reagent/toxin/mutagen) upgrade_reagents = null emagged_reagents = list(/datum/reagent/toxin/plasma) + canStore = FALSE /obj/machinery/chem_dispenser/mutagensaltpeter name = "botanical chemical dispenser" desc = "Creates and dispenses chemicals useful for botany." flags_1 = NODECONSTRUCT_1 + canStore = FALSE dispensable_reagents = list( /datum/reagent/toxin/mutagen, @@ -823,6 +828,7 @@ working_state = "minidispenser_working" nopower_state = "minidispenser_nopower" circuit = /obj/item/circuitboard/machine/chem_dispenser/apothecary + canStore = FALSE powerefficiency = 0.0833333 dispensable_reagents = list( //radium and stable plasma moved to upgrade tier 1 and 2, they've little to do with most medicines anyway. /datum/reagent/hydrogen, diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index 1855bae486..f214df6cd0 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -341,7 +341,7 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume) pH = 0 chemical_flags = REAGENT_FORCEONNEW can_synth = TRUE - var/strength = 1 + var/strength = 1.5 //Consumes self on addition and shifts pH /datum/reagent/fermi/acidic_buffer/on_new(datapH) @@ -370,7 +370,7 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume) color = "#fbf344" pH = 4 can_synth = TRUE - strength = 0.2 + strength = 0.25 /datum/reagent/fermi/basic_buffer name = "Strong basic buffer" @@ -379,7 +379,7 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume) pH = 14 chemical_flags = REAGENT_FORCEONNEW can_synth = TRUE - var/strength = 1 + var/strength = 1.5 /datum/reagent/fermi/basic_buffer/weak name = "Basic buffer" @@ -387,7 +387,7 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume) color = "#5873c4" pH = 10 can_synth = TRUE - strength = 0.2 + strength = 0.25 /datum/reagent/fermi/basic_buffer/on_new(datapH) if(!holder) diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.js b/tgui/packages/tgui/interfaces/ChemDispenser.js index f1b32d7415..4d9a3d3037 100644 --- a/tgui/packages/tgui/interfaces/ChemDispenser.js +++ b/tgui/packages/tgui/interfaces/ChemDispenser.js @@ -35,26 +35,28 @@ export const ChemDispenser = (props, context) => { return (
Recording - ), -
-
- Transfer amount: - - u - - } - > - - {toFixed(data.storedVol) + ' units / ' + data.maxVol + ' units'} - - - {storedContents.map(chemical => ( - - ))} - -
+ {!!data.canStore && ( +
+ Transfer amount: + + u + + }> + + {toFixed(data.storedVol) + ' units / ' + data.maxVol + ' units'} + + + {storedContents.map(chemical => ( + + ))} + +
+ )}
{ {recording && 'Virtual beaker' || data.isBeakerLoaded - && ( - - - /{data.beakerMaxVolume} units - - ) + && ( + + + /{data.beakerMaxVolume} units + + ) || 'No beaker'} { value={chemical.volume} initial={0} /> {` units of ${chemical.name}`} - - -