Merge pull request #9336 from Thalpy/beakerpH_tweaks

Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
This commit is contained in:
kevinz000
2019-09-28 00:26:51 -07:00
committed by GitHub
9 changed files with 96 additions and 38 deletions
@@ -16,7 +16,7 @@
//When merging two fermichems, see above
/datum/reagent/fermi/on_merge(data, amount, mob/living/carbon/M, purity)//basically on_mob_add but for merging
. = ..()
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -331,6 +331,8 @@
//Consumes self on addition and shifts pH
/datum/reagent/fermi/acidic_buffer/on_new(datapH)
if(holder.has_reagent("stabilizing_agent"))
return ..()
data = datapH
if(LAZYLEN(holder.reagent_list) == 1)
return
@@ -351,6 +353,8 @@
can_synth = TRUE
/datum/reagent/fermi/basic_buffer/on_new(datapH)
if(holder.has_reagent("stabilizing_agent"))
return ..()
data = datapH
if(LAZYLEN(holder.reagent_list) == 1)
return