From 2abbd8cc8916eeb4b4d89914e78cf600c441583c Mon Sep 17 00:00:00 2001 From: BordListian Date: Sun, 21 Jan 2018 09:04:31 +0100 Subject: [PATCH] - Changes gas reagents (liquid plasma, oxygen, etc) to emit gas based on chem temperature instead of at room temperature when dumped. (#34515) --- .../chemistry/reagents/other_reagents.dm | 24 ++++++++++++------- .../chemistry/reagents/toxin_reagents.dm | 6 +++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index dd740b0c68..b5f14ea9c3 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -614,11 +614,13 @@ /datum/reagent/oxygen/reaction_obj(obj/O, reac_volume) if((!O) || (!reac_volume)) return 0 - O.atmos_spawn_air("o2=[reac_volume/2];TEMP=[T20C]") + var/temp = holder ? holder.chem_temp : T20C + O.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]") /datum/reagent/oxygen/reaction_turf(turf/open/T, reac_volume) if(istype(T)) - T.atmos_spawn_air("o2=[reac_volume/2];TEMP=[T20C]") + var/temp = holder ? holder.chem_temp : T20C + T.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]") return /datum/reagent/copper @@ -640,11 +642,13 @@ /datum/reagent/nitrogen/reaction_obj(obj/O, reac_volume) if((!O) || (!reac_volume)) return 0 - O.atmos_spawn_air("n2=[reac_volume/2];TEMP=[T20C]") + var/temp = holder ? holder.chem_temp : T20C + O.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]") /datum/reagent/nitrogen/reaction_turf(turf/open/T, reac_volume) if(istype(T)) - T.atmos_spawn_air("n2=[reac_volume/2];TEMP=[T20C]") + var/temp = holder ? holder.chem_temp : T20C + T.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]") return /datum/reagent/hydrogen @@ -1119,11 +1123,13 @@ /datum/reagent/carbondioxide/reaction_obj(obj/O, reac_volume) if((!O) || (!reac_volume)) return 0 - O.atmos_spawn_air("co2=[reac_volume/5];TEMP=[T20C]") + var/temp = holder ? holder.chem_temp : T20C + O.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]") /datum/reagent/carbondioxide/reaction_turf(turf/open/T, reac_volume) if(istype(T)) - T.atmos_spawn_air("co2=[reac_volume/5];TEMP=[T20C]") + var/temp = holder ? holder.chem_temp : T20C + T.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]") return /datum/reagent/nitrous_oxide @@ -1138,11 +1144,13 @@ /datum/reagent/nitrous_oxide/reaction_obj(obj/O, reac_volume) if((!O) || (!reac_volume)) return 0 - O.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[T20C]") + var/temp = holder ? holder.chem_temp : T20C + O.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]") /datum/reagent/nitrous_oxide/reaction_turf(turf/open/T, reac_volume) if(istype(T)) - T.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[T20C]") + var/temp = holder ? holder.chem_temp : T20C + T.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]") /datum/reagent/nitrous_oxide/reaction_mob(mob/M, method=TOUCH, reac_volume) if(method == VAPOR) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 6e1e8046fe..fa996b0bc0 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -73,11 +73,13 @@ /datum/reagent/toxin/plasma/reaction_obj(obj/O, reac_volume) if((!O) || (!reac_volume)) return 0 - O.atmos_spawn_air("plasma=[reac_volume];TEMP=[T20C]") + var/temp = holder ? holder.chem_temp : T20C + O.atmos_spawn_air("plasma=[reac_volume];TEMP=[temp]") /datum/reagent/toxin/plasma/reaction_turf(turf/open/T, reac_volume) if(istype(T)) - T.atmos_spawn_air("plasma=[reac_volume];TEMP=[T20C]") + var/temp = holder ? holder.chem_temp : T20C + T.atmos_spawn_air("plasma=[reac_volume];TEMP=[temp]") return /datum/reagent/toxin/plasma/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with plasma is stronger than fuel!