cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] drink dispensers dispense reagents at 274K instead of 300K so ice won't immediately melt from them (#3862)

Browse Source 
* drink dispensers dispense reagents at 274K instead of 300K so ice won't immediately melt from them (#57144)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Aki Ito <11748095+ExcessiveUseOfCobblestone@ users.noreply.github.com>

* drink dispensers dispense reagents at 274K instead of 300K so ice won't immediately melt from them

Co-authored-by: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Aki Ito <11748095+ExcessiveUseOfCobblestone@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-03-04 21:31:43 +00:00
committed by GitHub
co-authored by Mothblocks Aki Ito Timothy Teakettle
parent cce39410e4
commit ffdfd95ca8
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/reagents.dm
+3
View File
@@ -45,6 +45,9 @@
#define ALLERGIC_REMOVAL_SKIP "Allergy"
/// the default temperature at which chemicals are added to reagent holders at
#define DEFAULT_REAGENT_TEMPERATURE 300
//Used in holder.dm/equlibrium.dm to set values and volume limits
///stops floating point errors causing issues with checking reagent amounts
#define CHEMICAL_QUANTISATION_LEVEL 0.0001
code/modules/reagents/chemistry/holder.dm
+1 -1
View File
@@ -156,7 +156,7 @@
* * added_ph - override to force a pH when added
* * override_base_ph - ingore the present pH of the reagent, and instead use the default (i.e. if buffers/reactions alter it)
*/
/datum/reagents/proc/add_reagent(reagent, amount, list/data=null, reagtemp = 300, added_purity = null, added_ph, no_react = 0, override_base_ph = FALSE)
/datum/reagents/proc/add_reagent(reagent, amount, list/data=null, reagtemp = DEFAULT_REAGENT_TEMPERATURE, added_purity = null, added_ph, no_react = 0, override_base_ph = FALSE)
if(!isnum(amount) || !amount)
return FALSE
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+5 -3
View File
@@ -30,6 +30,7 @@
var/amount = 30
var/recharge_amount = 10
var/recharge_counter = 0
var/dispensed_temperature = DEFAULT_REAGENT_TEMPERATURE
///If the UI has the pH meter shown
var/show_ph = TRUE
var/mutable_appearance/beaker_overlay
@@ -309,7 +310,7 @@
if(!cell.use(actual / powerefficiency))
say("Not enough energy to complete operation!")
return
R.add_reagent(reagent, actual)
R.add_reagent(reagent, actual, reagtemp = dispensed_temperature)
work_animation()
else
@@ -347,7 +348,7 @@
if(!cell.use(actual / powerefficiency))
say("Not enough energy to complete operation!")
return
R.add_reagent(reagent, actual)
R.add_reagent(reagent, actual, reagtemp = dispensed_temperature)
work_animation()
else
recording_recipe[key] += dispense_amount
@@ -442,7 +443,7 @@
if(beaker?.reagents)
R += beaker.reagents
for(var/i in 1 to total)
Q.add_reagent(pick(dispensable_reagents), 10)
Q.add_reagent(pick(dispensable_reagents), 10, reagtemp = dispensed_temperature)
R += Q
chem_splash(get_turf(src), 3, R)
if(beaker?.reagents)
@@ -528,6 +529,7 @@
icon_state = "soda_dispenser"
base_icon_state = "soda_dispenser"
has_panel_overlay = FALSE
dispensed_temperature = (T0C + 0.85) // cold enough that ice won't melt
amount = 10
pixel_y = 6
layer = WALL_OBJ_LAYER