cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Goonchem] Reagent Temperature

Browse Source
This commit is contained in:
Fox McCloud
2019-03-18 20:06:15 -04:00
parent 8ef3483119
commit 277722508a
69 changed files with 182 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chem_splash.dm
+1 -2
View File
@@ -25,8 +25,7 @@
for(var/datum/reagents/R in reactants)
R.trans_to(splash_holder, R.total_volume, threatscale, 1, 1)
total_temp += R.chem_temp
splash_holder.chem_temp = (total_temp/reactants.len) + extra_heat // Average temperature of reagents + extra heat.
splash_holder.handle_reactions() // React them now.
splash_holder.set_reagent_temp((total_temp / reactants.len) + extra_heat) // Average temperature of reagents + extra heat.
if(splash_holder.total_volume && affected_range >= 0) //The possible reactions didnt use up all reagents, so we spread it around.
var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
code/modules/reagents/chemistry/holder.dm
+30 -5
View File
@@ -9,7 +9,7 @@ var/const/INGEST = 2
var/total_volume = 0
var/maximum_volume = 100
var/atom/my_atom = null
var/chem_temp = 300
var/chem_temp = T20C
var/list/datum/reagent/addiction_list = new/list()
var/flags
@@ -166,6 +166,30 @@ var/const/INGEST = 2
handle_reactions()
return amount
/datum/reagents/proc/set_reagent_temp(new_temp = T0C, react = TRUE)
chem_temp = new_temp
if(react)
temperature_react()
handle_reactions()
/datum/reagents/proc/temperature_react() //Calls the temperature reaction procs without changing the temp.
for(var/datum/reagent/current_reagent in reagent_list)
current_reagent.reaction_temperature(chem_temp, 100)
/datum/reagents/proc/temperature_reagents(exposed_temperature, divisor = 35, change_cap = 15) //This is what you use to change the temp of a reagent holder.
//Do not manually change the reagent unless you know what youre doing.
var/difference = abs(chem_temp - exposed_temperature)
var/change = min(max((difference / divisor), 1), change_cap)
if(exposed_temperature > chem_temp)
chem_temp += change
else if(exposed_temperature < chem_temp)
chem_temp -= change
chem_temp = max(min(chem_temp, 10000), 0) //Cap for the moment.
temperature_react()
handle_reactions()
/datum/reagents/proc/trans_id_to(obj/target, reagent, amount=1, preserve_data=1)//Not sure why this proc didn't exist before. It does now! /N
if(!target)
return
@@ -194,8 +218,7 @@ var/const/INGEST = 2
/datum/reagents/proc/metabolize(mob/living/M)
if(M)
chem_temp = M.bodytemperature
handle_reactions()
temperature_reagents(M.bodytemperature - 30)
// a bitfield filled in by each reagent's `on_mob_life` to find out which states to update
var/update_flags = STATUS_UPDATE_NONE
@@ -548,14 +571,14 @@ var/const/INGEST = 2
var/amt = list_reagents[r_id]
add_reagent(r_id, amt, data)
/datum/reagents/proc/add_reagent(reagent, amount, list/data=null, reagtemp = 300, no_react = 0)
/datum/reagents/proc/add_reagent(reagent, amount, list/data=null, reagtemp = T20C, no_react = 0)
if(!isnum(amount))
return 1
update_total()
if(total_volume + amount > maximum_volume) amount = (maximum_volume - total_volume) //Doesnt fit in. Make it disappear. Shouldnt happen. Will happen.
if(amount <= 0)
return 0
chem_temp = round(((amount * reagtemp) + (total_volume * chem_temp)) / (total_volume + amount)) //equalize with new chems
chem_temp = (chem_temp * total_volume + reagtemp * amount) / (total_volume + amount) //equalize with new chems
for(var/A in reagent_list)
@@ -567,6 +590,7 @@ var/const/INGEST = 2
my_atom.on_reagent_change()
R.on_merge(data)
if(!no_react)
temperature_react()
handle_reactions()
return 0
@@ -585,6 +609,7 @@ var/const/INGEST = 2
if(my_atom)
my_atom.on_reagent_change()
if(!no_react)
temperature_react()
handle_reactions()
return 0
else
code/modules/reagents/chemistry/machinery/chem_heater.dm
+13 -25
View File
@@ -7,8 +7,7 @@
use_power = IDLE_POWER_USE
idle_power_usage = 40
var/obj/item/reagent_containers/beaker = null
var/desired_temp = 300
var/heater_coefficient = 0.03
var/desired_temp = T0C
var/on = FALSE
/obj/machinery/chem_heater/New()
@@ -19,34 +18,22 @@
component_parts += new /obj/item/stock_parts/console_screen(null)
RefreshParts()
/obj/machinery/chem_heater/upgraded/New()
..()
component_parts = list()
component_parts += new /obj/item/circuitboard/chem_heater(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
RefreshParts()
/obj/machinery/chem_heater/RefreshParts()
heater_coefficient = 0.03
for(var/obj/item/stock_parts/micro_laser/M in component_parts)
heater_coefficient *= M.rating
/obj/machinery/chem_heater/process()
..()
if(stat & NOPOWER)
return
var/state_change = 0
var/state_change = FALSE
if(on)
if(beaker)
if(beaker.reagents.chem_temp > desired_temp)
beaker.reagents.chem_temp += min(-1, max((desired_temp - beaker.reagents.chem_temp) * heater_coefficient, -15))
if(beaker.reagents.chem_temp < desired_temp)
beaker.reagents.chem_temp += max(1, min((desired_temp - beaker.reagents.chem_temp) * heater_coefficient, 15))
beaker.reagents.chem_temp = round(beaker.reagents.chem_temp) //stops stuff like 456.12312312302
beaker.reagents.handle_reactions()
state_change = 1
if(!beaker.reagents.total_volume)
on = FALSE
SSnanoui.update_uis(src)
return
beaker.reagents.temperature_reagents(desired_temp)
beaker.reagents.temperature_reagents(desired_temp)
if(abs(beaker.reagents.chem_temp - desired_temp) <= 3)
on = FALSE
state_change = TRUE
if(state_change)
SSnanoui.update_uis(src)
@@ -54,7 +41,6 @@
/obj/machinery/chem_heater/proc/eject_beaker()
if(beaker)
beaker.forceMove(get_turf(src))
beaker.reagents.handle_reactions()
beaker = null
icon_state = "mixer0b"
on = FALSE
@@ -111,6 +97,8 @@
return 0
if(href_list["toggle_on"])
if(!beaker.reagents.total_volume)
return
on = !on
. = 1
code/modules/reagents/chemistry/reagents.dm
+3
View File
@@ -33,6 +33,9 @@
. = ..()
holder = null
/datum/reagent/proc/reaction_temperature(exposed_temperature, exposed_volume) //By default we do nothing.
return
/datum/reagent/proc/reaction_mob(mob/living/M, method = TOUCH, volume) //Some reagents transfer on touch, others don't; dependent on if they penetrate the skin or not.
if(holder) //for catching rare runtimes
if(method == TOUCH && penetrates_skin)
code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+6 -4
View File
@@ -224,8 +224,9 @@
/datum/reagent/cryostylane/on_tick()
if(holder.has_reagent("oxygen"))
holder.remove_reagent("oxygen", 1)
holder.chem_temp -= 10
holder.handle_reactions()
holder.remove_reagent("cryostylane", 1)
holder.temperature_reagents(holder.chem_temp - 200)
holder.temperature_reagents(holder.chem_temp - 200)
..()
/datum/reagent/cryostylane/reaction_turf(turf/T, volume)
@@ -249,8 +250,9 @@
/datum/reagent/pyrosium/on_tick()
if(holder.has_reagent("oxygen"))
holder.remove_reagent("oxygen", 1)
holder.chem_temp += 10
holder.handle_reactions()
holder.remove_reagent("pyrosium", 1)
holder.temperature_reagents(holder.chem_temp + 200)
holder.temperature_reagents(holder.chem_temp + 200)
..()
/datum/reagent/firefighting_foam
code/modules/reagents/chemistry/recipes/drinks.dm
+2 -2
View File
@@ -229,7 +229,7 @@
id = "flamingmoe"
result = "flamingmoe"
required_reagents = list("vodka" = 1, "gin" = 1, "cognac" = 1, "tequila" = 1, "salglu_solution" = 1) //Close enough
min_temp = 374 //Fire makes it good!
min_temp = T0C + 100 //Fire makes it good!
result_amount = 5
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
mix_message = "The concoction bursts into flame!"
@@ -701,7 +701,7 @@
id = "applejack"
result = "applejack"
required_reagents = list("cider" = 2)
max_temp = 270
max_temp = T0C
result_amount = 1
mix_message = "The drink darkens as the water freezes, leaving the concentrated cider behind."
mix_sound = null
code/modules/reagents/chemistry/recipes/drugs.dm
+4 -4
View File
@@ -15,7 +15,7 @@
result_amount = 5
mix_message = "The mixture violently reacts, leaving behind a few crystalline shards."
mix_sound = 'sound/goonstation/effects/crystalshatter.ogg'
min_temp = 390
min_temp = T0C + 100
/datum/chemical_reaction/crank/on_reaction(datum/reagents/holder, created_volume)
var/turf/T = get_turf(holder.my_atom)
@@ -30,7 +30,7 @@
required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, "fuel" = 1)
result_amount = 6
mix_message = "The mixture dries into a pale blue powder."
min_temp = 380
min_temp = T0C + 100
mix_sound = 'sound/goonstation/misc/fuse.ogg'
/datum/chemical_reaction/methamphetamine
@@ -39,7 +39,7 @@
result = "methamphetamine"
required_reagents = list("ephedrine" = 1, "iodine" = 1, "phosphorus" = 1, "hydrogen" = 1)
result_amount = 4
min_temp = 374
min_temp = T0C + 100
/datum/chemical_reaction/methamphetamine/on_reaction(datum/reagents/holder)
var/turf/T = get_turf(holder.my_atom)
@@ -57,7 +57,7 @@
result = "bath_salts"
required_reagents = list("????" = 1, "saltpetre" = 1, "msg" = 1, "cleaner" = 1, "enzyme" = 1, "mugwort" = 1, "mercury" = 1)
result_amount = 6
min_temp = 374
min_temp = T0C + 100
mix_message = "Tiny cubic crystals precipitate out of the mixture. Huh."
mix_sound = 'sound/goonstation/misc/fuse.ogg'
code/modules/reagents/chemistry/recipes/food.dm
+5 -5
View File
@@ -124,7 +124,7 @@
result = "corn_syrup"
required_reagents = list("corn_starch" = 1, "sacid" = 1)
result_amount = 2
min_temp = 374
min_temp = T0C + 100
mix_message = "The mixture forms a viscous, clear fluid!"
/datum/chemical_reaction/vhfcs
@@ -176,7 +176,7 @@
result = "hydrogenated_soybeanoil"
required_reagents = list("soybeanoil" = 1, "hydrogen" = 1)
result_amount = 2
min_temp = 520
min_temp = T0C + 250
mix_message = "The mixture emits a burnt, oily smell."
/datum/chemical_reaction/meatslurry
@@ -194,7 +194,7 @@
result = "gravy"
required_reagents = list("porktonium" = 1, "corn_starch" = 1, "milk" = 1)
result_amount = 3
min_temp = 374
min_temp = T0C + 100
mix_message = "The substance thickens and takes on a meaty odor."
/datum/chemical_reaction/beff
@@ -221,7 +221,7 @@
result = "enzyme"
required_reagents = list("vomit" = 1, "sugar" = 1)
result_amount = 2
min_temp = 750
min_temp = T0C + 480
mix_message = "The mixture emits a horrible smell as you heat up the contents. Luckily, enzymes don't stink."
mix_sound = 'sound/goonstation/misc/fuse.ogg'
@@ -231,6 +231,6 @@
result = "enzyme"
required_reagents = list("green_vomit" = 1, "sugar" = 1)
result_amount = 2
min_temp = 750
min_temp = T0C + 480
mix_message = "The mixture emits a horrible smell as you heat up the contents. Luckily, enzymes don't stink."
mix_sound = 'sound/goonstation/misc/fuse.ogg'
code/modules/reagents/chemistry/recipes/medicine.dm
+5 -5
View File
@@ -50,7 +50,7 @@
required_reagents = list("ash" = 1, "sodiumchloride" = 1)
result_amount = 2
mix_message = "The mixture yields a fine black powder."
min_temp = 380
min_temp = T0C + 100
mix_sound = 'sound/goonstation/misc/fuse.ogg'
/datum/chemical_reaction/silver_sulfadiazine
@@ -92,7 +92,7 @@
result = "calomel"
required_reagents = list("mercury" = 1, "chlorine" = 1)
result_amount = 2
min_temp = 374
min_temp = T0C + 100
mix_message = "Stinging vapors rise from the solution."
/datum/chemical_reaction/potass_iodide
@@ -135,7 +135,7 @@
result = "perfluorodecalin"
required_reagents = list("hydrogen" = 1, "fluorine" = 1, "oil" = 1)
result_amount = 3
min_temp = 370
min_temp = T0C + 100
mix_message = "The mixture rapidly turns into a dense pink liquid."
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
@@ -195,7 +195,7 @@
result = null
required_reagents = list("strange_reagent" = 1, "synthflesh" = 1, "blood" = 1)
result_amount = 3
min_temp = 374
min_temp = T0C + 100
/datum/chemical_reaction/life/on_reaction(datum/reagents/holder, created_volume)
chemical_mob_spawn(holder, 1, "Life")
@@ -263,7 +263,7 @@
result = "liquid_solder"
required_reagents = list("ethanol" = 1, "copper" = 1, "silver" = 1)
result_amount = 3
min_temp = 370
min_temp = T0C + 100
mix_message = "The solution gently swirls with a metallic sheen."
/datum/chemical_reaction/corazone
code/modules/reagents/chemistry/recipes/others.dm
+10 -10
View File
@@ -74,7 +74,7 @@
result = "diethylamine"
required_reagents = list ("ammonia" = 1, "ethanol" = 1)
result_amount = 2
min_temp = 374
min_temp = T0C + 100
mix_message = "A horrible smell pours forth from the mixture."
/datum/chemical_reaction/space_cleaner
@@ -98,7 +98,7 @@
id = "plastic_polymers"
result = null
required_reagents = list("oil" = 5, "sacid" = 2, "ash" = 3)
min_temp = 374
min_temp = T0C + 100
result_amount = 1
/datum/chemical_reaction/plastic_polymers/on_reaction(datum/reagents/holder, created_volume)
@@ -177,7 +177,7 @@
result = "ash"
required_reagents = list("oil" = 1)
result_amount = 0.5
min_temp = 480
min_temp = T0C + 600
mix_sound = null
no_message = 1
@@ -195,7 +195,7 @@
result = null
required_reagents = list("nutriment" = 1, "colorful_reagent" = 1, "strange_reagent" = 1, "blood" = 1)
result_amount = 3
min_temp = 374
min_temp = T0C + 100
/datum/chemical_reaction/corgium/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
@@ -208,7 +208,7 @@
result = null
required_reagents = list("egg" = 1, "colorful_reagent" = 1, "chicken_soup" = 1, "strange_reagent" = 1, "blood" = 1)
result_amount = 5
min_temp = 374
min_temp = T0C + 100
mix_message = "The substance turns an airy sky-blue and foams up into a new shape."
/datum/chemical_reaction/flaptonium/on_reaction(datum/reagents/holder, created_volume)
@@ -244,7 +244,7 @@
id = "soapification"
result = null
required_reagents = list("liquidgibs" = 10, "lye" = 10) // requires two scooped gib tiles
min_temp = 374
min_temp = T0C + 100
result_amount = 1
@@ -257,7 +257,7 @@
id = "candlefication"
result = null
required_reagents = list("liquidgibs" = 5, "oxygen" = 5) //
min_temp = 374
min_temp = T0C + 100
result_amount = 1
/datum/chemical_reaction/candlefication/on_reaction(datum/reagents/holder, created_volume)
@@ -295,7 +295,7 @@
id = "jestosterone"
result = "jestosterone"
required_reagents = list("blood" = 1, "sodiumchloride" = 1, "banana" = 1, "lube" = 1, "space_drugs" = 1) //Or one freshly-squeezed clown
min_temp = 374
min_temp = T0C + 100
result_amount = 5
mix_message = "The substance quickly shifts colour, cycling from red, to yellow, to green, to blue, and finally settles at a vibrant fuchsia."
@@ -338,7 +338,7 @@
result = "ice"
required_reagents = list("water" = 1)
result_amount = 1
max_temp = 273
max_temp = T0C
mix_message = "Ice forms as the water freezes."
mix_sound = null
@@ -348,7 +348,7 @@
result = "water"
required_reagents = list("ice" = 1)
result_amount = 1
min_temp = 301 // In Space.....ice melts at 82F...don't ask
min_temp = T0C + 29 // In Space.....ice melts at 82F...don't ask
mix_message = "Water pools as the ice melts."
mix_sound = null
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+7 -7
View File
@@ -80,7 +80,7 @@
result = "clf3"
required_reagents = list("chlorine" = 1, "fluorine" = 3)
result_amount = 2
min_temp = 424
min_temp = T0C + 150
/datum/chemical_reaction/clf3/on_reaction(datum/reagents/holder, created_volume)
var/turf/T = get_turf(holder.my_atom)
@@ -107,7 +107,7 @@
result = "sorium_vortex"
required_reagents = list("sorium" = 1)
result_amount = 1
min_temp = 474
min_temp = T0C + 200
/datum/chemical_reaction/sorium_vortex/on_reaction(datum/reagents/holder, created_volume)
var/turf/simulated/T = get_turf(holder.my_atom)
@@ -134,7 +134,7 @@
result = "ldm_vortex"
required_reagents = list("liquid_dark_matter" = 1)
result_amount = 1
min_temp = 474
min_temp = T0C + 200
/datum/chemical_reaction/ldm_vortex/on_reaction(datum/reagents/holder, created_volume)
var/turf/simulated/T = get_turf(holder.my_atom)
@@ -155,7 +155,7 @@
result = null
required_reagents = list("blackpowder" = 1)
result_amount = 1
min_temp = 474
min_temp = T0C + 200
no_message = 1
mix_sound = null
@@ -202,7 +202,7 @@ datum/chemical_reaction/flash_powder
id = "flash_powder_flash"
result = null
required_reagents = list("flash_powder" = 1)
min_temp = 374
min_temp = T0C + 100
/datum/chemical_reaction/flash_powder_flash/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
@@ -256,7 +256,7 @@ datum/chemical_reaction/flash_powder
name = "smoke_powder_smoke"
id = "smoke_powder_smoke"
required_reagents = list("smoke_powder" = 1)
min_temp = 374
min_temp = T0C + 100
secondary = 1
result_amount = 1
forbidden_reagents = list("stimulants")
@@ -307,7 +307,7 @@ datum/chemical_reaction/flash_powder
id = "sonic_powder_deafen"
result = null
required_reagents = list("sonic_powder" = 1)
min_temp = 374
min_temp = T0C + 100
/datum/chemical_reaction/sonic_powder_deafen/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
code/modules/reagents/chemistry/recipes/toxins.dm
+6 -6
View File
@@ -4,7 +4,7 @@
result = "formaldehyde"
required_reagents = list("ethanol" = 1, "oxygen" = 1, "silver" = 1)
result_amount = 3
min_temp = 420
min_temp = T0C + 150
mix_message = "Ugh, it smells like the morgue in here."
/datum/chemical_reaction/neurotoxin2
@@ -13,7 +13,7 @@
result = "neurotoxin2"
required_reagents = list("space_drugs" = 1)
result_amount = 1
min_temp = 674
min_temp = T0C + 400
mix_sound = null
no_message = 1
@@ -23,7 +23,7 @@
result = "cyanide"
required_reagents = list("oil" = 1, "ammonia" = 1, "oxygen" = 1)
result_amount = 3
min_temp = 380
min_temp = T0C + 100
mix_message = "The mixture gives off a faint scent of almonds."
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
@@ -49,7 +49,7 @@
result = "facid"
required_reagents = list("sacid" = 1, "fluorine" = 1, "hydrogen" = 1, "potassium" = 1)
result_amount = 4
min_temp = 380
min_temp = T0C + 100
mix_message = "The mixture deepens to a dark blue, and slowly begins to corrode its container."
/datum/chemical_reaction/initropidril
@@ -83,7 +83,7 @@
required_reagents = list("chlorine" = 1, "fuel" = 1, "oxygen" = 1, "phosphorus" = 1, "fluorine" = 1, "hydrogen" = 1, "acetone" = 1, "atrazine" = 1)
result_amount = 3
mix_message = "The mixture yields a colorless, odorless liquid."
min_temp = 374
min_temp = T0C + 100
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/sarin/on_reaction(datum/reagents/holder)
@@ -139,7 +139,7 @@
required_reagents = list("plasma" = 1, "silver" = 1, "blackpowder" = 1)
result_amount = 3
mix_message = "<span class='danger'>A jet of sparks flies from the mixture as it merges into a flickering slurry.</span>"
min_temp = 400
min_temp = T0C + 130
mix_sound = null
/datum/chemical_reaction/teslium/on_reaction(datum/reagents/holder, created_volume)
code/modules/reagents/reagent_containers.dm
-5
View File
@@ -44,11 +44,6 @@
R.on_ex_act()
..()
/obj/item/reagent_containers/fire_act()
reagents.chem_temp += 30
reagents.handle_reactions()
..()
/obj/item/reagent_containers/attack_self(mob/user)
if(has_lid)
if(is_open_container())
code/modules/reagents/reagent_containers/glass_containers.dm
+1 -9
View File
@@ -124,13 +124,6 @@
/obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird
return
if(is_hot(I))
if(reagents)
reagents.chem_temp += 15
to_chat(user, "<span class='notice'>You heat [src] with [I].</span>")
reagents.handle_reactions()
if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen))
var/tmp_label = sanitize(input(user, "Enter a label for [name]","Label",label_text))
if(length(tmp_label) > MAX_NAME_LEN)
@@ -210,8 +203,7 @@
/obj/item/reagent_containers/glass/beaker/proc/heat_beaker()
if(reagents)
reagents.chem_temp += 30
reagents.handle_reactions()
reagents.temperature_reagents(4000)
/obj/item/reagent_containers/glass/beaker/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/assembly_holder) && can_assembly)
code/modules/reagents/reagent_dispenser.dm
+2 -1
View File
@@ -99,7 +99,8 @@
/obj/structure/reagent_dispensers/fueltank/ex_act()
boom()
/obj/structure/reagent_dispensers/fueltank/fire_act()
/obj/structure/reagent_dispensers/fueltank/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
..()
boom()
/obj/structure/reagent_dispensers/fueltank/tesla_act()