cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Chem Grenades (#13386)

Browse Source
This commit is contained in:
Fox McCloud
2020-05-06 07:43:18 -06:00
committed by GitHub
parent 02c93c8b18
commit 1495b5b63a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/holder.dm
+8 -8
View File
@@ -15,12 +15,12 @@
var/flags
var/list/reagents_generated_per_cycle = new/list()
/datum/reagents/New(maximum = 100, min_temp, max_temp)
/datum/reagents/New(maximum = 100, temperature_minimum, temperature_maxixmum)
maximum_volume = maximum
if(min_temp)
temperature_min = min_temp
if(max_temp)
temperature_max = max_temp
if(temperature_minimum)
temperature_min = temperature_minimum
if(temperature_maxixmum)
temperature_max = temperature_maxixmum
if(!(flags & REAGENT_NOREACT))
START_PROCESSING(SSobj, src)
//I dislike having these here but map-objects are initialised before world/New() is called. >_>
@@ -185,7 +185,7 @@
return amount
/datum/reagents/proc/set_reagent_temp(new_temp = T0C, react = TRUE)
chem_temp = Clamp(new_temp, temperature_max, temperature_min)
chem_temp = Clamp(new_temp, temperature_min, temperature_max)
if(react)
temperature_react()
handle_reactions()
@@ -876,8 +876,8 @@
// Convenience proc to create a reagents holder for an atom
// Max vol is maximum volume of holder
/atom/proc/create_reagents(max_vol, min_temp, max_temp)
reagents = new /datum/reagents(max_vol, min_temp, max_temp)
/atom/proc/create_reagents(max_vol, temperature_minimum, temperature_maximum)
reagents = new /datum/reagents(max_vol, temperature_minimum, temperature_maximum)
reagents.my_atom = src
/proc/get_random_reagent_id() // Returns a random reagent ID minus blacklisted reagents