From d59887af1b342b5383402b7605303bc2a8efd7c1 Mon Sep 17 00:00:00 2001 From: ArcaneMusic Date: Mon, 31 Aug 2020 13:57:54 -0400 Subject: [PATCH 1/7] oh god the reactions are too powerful jimmy --- code/game/objects/structures/shower.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index e80853e34b1..f66e0bb6e74 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -131,7 +131,7 @@ wash_atom(loc) for(var/am in loc) var/atom/movable/movable_content = am - reagents.expose(movable_content, TOUCH, reaction_volume) + reagents.expose(movable_content, TOUCH, 5) //There's not many reagents leaving the sink at once! if(!ismopable(movable_content)) // Mopables will be cleaned anyways by the turf wash above wash_atom(movable_content) else From fad17a865a9c35ec1ee0633505203f4c8e1c07e4 Mon Sep 17 00:00:00 2001 From: ArcaneMusic Date: Tue, 1 Sep 2020 03:10:04 -0400 Subject: [PATCH 2/7] I'm happy with this ratio. --- .../chemistry/reagents/other_reagents.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index e4331d4cdbd..02c4e36b76e 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -728,12 +728,12 @@ if((!O) || (!reac_volume)) return 0 var/temp = holder ? holder.chem_temp : T20C - O.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]") + O.atmos_spawn_air("o2=[reac_volume/20];TEMP=[temp]") /datum/reagent/oxygen/expose_turf(turf/open/T, reac_volume) if(istype(T)) var/temp = holder ? holder.chem_temp : T20C - T.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]") + T.atmos_spawn_air("o2=[reac_volume/20];TEMP=[temp]") return /datum/reagent/copper @@ -761,12 +761,12 @@ if((!O) || (!reac_volume)) return 0 var/temp = holder ? holder.chem_temp : T20C - O.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]") + O.atmos_spawn_air("n2=[reac_volume/20];TEMP=[temp]") /datum/reagent/nitrogen/expose_turf(turf/open/T, reac_volume) if(istype(T)) var/temp = holder ? holder.chem_temp : T20C - T.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]") + T.atmos_spawn_air("n2=[reac_volume/20];TEMP=[temp]") return /datum/reagent/hydrogen @@ -1242,12 +1242,12 @@ if((!O) || (!reac_volume)) return 0 var/temp = holder ? holder.chem_temp : T20C - O.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]") + O.atmos_spawn_air("co2=[reac_volume/20];TEMP=[temp]") /datum/reagent/carbondioxide/expose_turf(turf/open/T, reac_volume) if(istype(T)) var/temp = holder ? holder.chem_temp : T20C - T.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]") + T.atmos_spawn_air("co2=[reac_volume/20];TEMP=[temp]") return /datum/reagent/nitrous_oxide @@ -1262,12 +1262,12 @@ if((!O) || (!reac_volume)) return 0 var/temp = holder ? holder.chem_temp : T20C - O.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]") + O.atmos_spawn_air("n2o=[reac_volume/30];TEMP=[temp]") /datum/reagent/nitrous_oxide/expose_turf(turf/open/T, reac_volume) if(istype(T)) var/temp = holder ? holder.chem_temp : T20C - T.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]") + T.atmos_spawn_air("n2o=[reac_volume/30];TEMP=[temp]") /datum/reagent/nitrous_oxide/expose_mob(mob/living/M, methods=TOUCH, reac_volume) if(methods & VAPOR) From ebea3bb93633a2726f0a54a975615c959382b4d2 Mon Sep 17 00:00:00 2001 From: ArcaneMusic Date: Tue, 1 Sep 2020 03:10:35 -0400 Subject: [PATCH 3/7] Missed one. --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 02c4e36b76e..c5efdc5c3a1 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1262,12 +1262,12 @@ if((!O) || (!reac_volume)) return 0 var/temp = holder ? holder.chem_temp : T20C - O.atmos_spawn_air("n2o=[reac_volume/30];TEMP=[temp]") + O.atmos_spawn_air("n2o=[reac_volume/20];TEMP=[temp]") /datum/reagent/nitrous_oxide/expose_turf(turf/open/T, reac_volume) if(istype(T)) var/temp = holder ? holder.chem_temp : T20C - T.atmos_spawn_air("n2o=[reac_volume/30];TEMP=[temp]") + T.atmos_spawn_air("n2o=[reac_volume/20];TEMP=[temp]") /datum/reagent/nitrous_oxide/expose_mob(mob/living/M, methods=TOUCH, reac_volume) if(methods & VAPOR) From 992264ba43e0c256ad0349efb204e1c8c881df97 Mon Sep 17 00:00:00 2001 From: ArcaneMusic Date: Tue, 1 Sep 2020 04:22:26 -0400 Subject: [PATCH 4/7] My legal atmos avisor has told me that these expose_obj are mondo fuckin lame --- .../chemistry/reagents/other_reagents.dm | 22 ------------------- .../chemistry/reagents/toxin_reagents.dm | 7 ------ 2 files changed, 29 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index c5efdc5c3a1..3d91a69a036 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -724,11 +724,6 @@ color = "#808080" // rgb: 128, 128, 128 taste_mult = 0 // oderless and tasteless -/datum/reagent/oxygen/expose_obj(obj/O, reac_volume) - if((!O) || (!reac_volume)) - return 0 - var/temp = holder ? holder.chem_temp : T20C - O.atmos_spawn_air("o2=[reac_volume/20];TEMP=[temp]") /datum/reagent/oxygen/expose_turf(turf/open/T, reac_volume) if(istype(T)) @@ -757,12 +752,6 @@ color = "#808080" // rgb: 128, 128, 128 taste_mult = 0 -/datum/reagent/nitrogen/expose_obj(obj/O, reac_volume) - if((!O) || (!reac_volume)) - return 0 - var/temp = holder ? holder.chem_temp : T20C - O.atmos_spawn_air("n2=[reac_volume/20];TEMP=[temp]") - /datum/reagent/nitrogen/expose_turf(turf/open/T, reac_volume) if(istype(T)) var/temp = holder ? holder.chem_temp : T20C @@ -1238,12 +1227,6 @@ color = "#B0B0B0" // rgb : 192, 192, 192 taste_description = "something unknowable" -/datum/reagent/carbondioxide/expose_obj(obj/O, reac_volume) - if((!O) || (!reac_volume)) - return 0 - var/temp = holder ? holder.chem_temp : T20C - O.atmos_spawn_air("co2=[reac_volume/20];TEMP=[temp]") - /datum/reagent/carbondioxide/expose_turf(turf/open/T, reac_volume) if(istype(T)) var/temp = holder ? holder.chem_temp : T20C @@ -1258,11 +1241,6 @@ color = "#808080" taste_description = "sweetness" -/datum/reagent/nitrous_oxide/expose_obj(obj/O, reac_volume) - if((!O) || (!reac_volume)) - return 0 - var/temp = holder ? holder.chem_temp : T20C - O.atmos_spawn_air("n2o=[reac_volume/20];TEMP=[temp]") /datum/reagent/nitrous_oxide/expose_turf(turf/open/T, reac_volume) if(istype(T)) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 4da66edc3c0..e1c129a6c24 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -88,13 +88,6 @@ A.atmos_spawn_air("plasma=[volume];TEMP=[holder.chem_temp]") holder.del_reagent(type) -/datum/reagent/toxin/plasma/expose_obj(obj/O, reac_volume) - if((!O) || (!reac_volume)) - return 0 - var/temp = holder ? holder.chem_temp : T20C - if(temp >= LIQUID_PLASMA_BP) - O.atmos_spawn_air("plasma=[reac_volume];TEMP=[temp]") - /datum/reagent/toxin/plasma/expose_turf(turf/open/T, reac_volume) if(!istype(T)) return From aaaf3b6379f2f918ecf7960ba8b8f8b27bc5a9f2 Mon Sep 17 00:00:00 2001 From: ArcaneMusic Date: Sun, 6 Sep 2020 12:10:03 -0400 Subject: [PATCH 5/7] Merge conflict but god you just changed like the whle proc I'm weaping --- .../chemistry/reagents/other_reagents.dm | 66 ++----------------- .../chemistry/reagents/toxin_reagents.dm | 14 ---- 2 files changed, 5 insertions(+), 75 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 3f0b8e2c00f..3ce52ab6781 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -723,26 +723,13 @@ color = "#808080" // rgb: 128, 128, 128 taste_mult = 0 // oderless and tasteless -<<<<<<< HEAD -======= -/datum/reagent/oxygen/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return 0 - var/temp = holder ? holder.chem_temp : T20C - exposed_obj.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]") ->>>>>>> upstream/master /datum/reagent/oxygen/expose_turf(turf/open/exposed_turf, reac_volume) . = ..() if(istype(exposed_turf)) var/temp = holder ? holder.chem_temp : T20C -<<<<<<< HEAD - T.atmos_spawn_air("o2=[reac_volume/20];TEMP=[temp]") + exposed_turf.atmos_spawn_air("o2=[reac_volume/20];TEMP=[temp]") return -======= - exposed_turf.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]") ->>>>>>> upstream/master /datum/reagent/copper name = "Copper" @@ -768,25 +755,10 @@ color = "#808080" // rgb: 128, 128, 128 taste_mult = 0 -<<<<<<< HEAD -/datum/reagent/nitrogen/expose_turf(turf/open/T, reac_volume) - if(istype(T)) - var/temp = holder ? holder.chem_temp : T20C - T.atmos_spawn_air("n2=[reac_volume/20];TEMP=[temp]") -======= -/datum/reagent/nitrogen/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return 0 - var/temp = holder ? holder.chem_temp : T20C - exposed_obj.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]") - /datum/reagent/nitrogen/expose_turf(turf/open/exposed_turf, reac_volume) - . = ..() if(istype(exposed_turf)) var/temp = holder ? holder.chem_temp : T20C - exposed_turf.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]") ->>>>>>> upstream/master + exposed_turf.atmos_spawn_air("n2=[reac_volume/20];TEMP=[temp]") return /datum/reagent/hydrogen @@ -1283,26 +1255,11 @@ color = "#B0B0B0" // rgb : 192, 192, 192 taste_description = "something unknowable" -<<<<<<< HEAD -/datum/reagent/carbondioxide/expose_turf(turf/open/T, reac_volume) - if(istype(T)) - var/temp = holder ? holder.chem_temp : T20C - T.atmos_spawn_air("co2=[reac_volume/20];TEMP=[temp]") - return -======= -/datum/reagent/carbondioxide/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return 0 - var/temp = holder ? holder.chem_temp : T20C - exposed_obj.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]") - /datum/reagent/carbondioxide/expose_turf(turf/open/exposed_turf, reac_volume) - . = ..() if(istype(exposed_turf)) var/temp = holder ? holder.chem_temp : T20C - exposed_turf.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]") ->>>>>>> upstream/master + exposed_turf.atmos_spawn_air("co2=[reac_volume/20];TEMP=[temp]") + return /datum/reagent/nitrous_oxide name = "Nitrous Oxide" @@ -1312,25 +1269,12 @@ color = "#808080" taste_description = "sweetness" -<<<<<<< HEAD -======= -/datum/reagent/nitrous_oxide/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return 0 - var/temp = holder ? holder.chem_temp : T20C - exposed_obj.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]") ->>>>>>> upstream/master /datum/reagent/nitrous_oxide/expose_turf(turf/open/exposed_turf, reac_volume) . = ..() if(istype(exposed_turf)) var/temp = holder ? holder.chem_temp : T20C -<<<<<<< HEAD - T.atmos_spawn_air("n2o=[reac_volume/20];TEMP=[temp]") -======= - exposed_turf.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]") ->>>>>>> upstream/master + exposed_turf.atmos_spawn_air("n2o=[reac_volume/20];TEMP=[temp]") /datum/reagent/nitrous_oxide/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) . = ..() diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 5a25d068e89..9a1b017642f 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -87,22 +87,8 @@ A.atmos_spawn_air("plasma=[volume];TEMP=[holder.chem_temp]") holder.del_reagent(type) -<<<<<<< HEAD -/datum/reagent/toxin/plasma/expose_turf(turf/open/T, reac_volume) - if(!istype(T)) -======= -/datum/reagent/toxin/plasma/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return 0 - var/temp = holder ? holder.chem_temp : T20C - if(temp >= LIQUID_PLASMA_BP) - exposed_obj.atmos_spawn_air("plasma=[reac_volume];TEMP=[temp]") - /datum/reagent/toxin/plasma/expose_turf(turf/open/exposed_turf, reac_volume) - . = ..() if(!istype(exposed_turf)) ->>>>>>> upstream/master return var/temp = holder ? holder.chem_temp : T20C if(temp >= LIQUID_PLASMA_BP) From 87815708cf853af061bc289c6617e34d128c2742 Mon Sep 17 00:00:00 2001 From: ArcaneMusic Date: Sun, 6 Sep 2020 23:52:39 -0400 Subject: [PATCH 6/7] Fixes linting error. --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 4 ++-- code/modules/reagents/chemistry/reagents/toxin_reagents.dm | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 3ce52ab6781..a97c0b0b2df 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -759,7 +759,7 @@ if(istype(exposed_turf)) var/temp = holder ? holder.chem_temp : T20C exposed_turf.atmos_spawn_air("n2=[reac_volume/20];TEMP=[temp]") - return + return ..() /datum/reagent/hydrogen name = "Hydrogen" @@ -1259,7 +1259,7 @@ if(istype(exposed_turf)) var/temp = holder ? holder.chem_temp : T20C exposed_turf.atmos_spawn_air("co2=[reac_volume/20];TEMP=[temp]") - return + return ..() /datum/reagent/nitrous_oxide name = "Nitrous Oxide" diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 9a1b017642f..34aae23aa07 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -93,6 +93,7 @@ var/temp = holder ? holder.chem_temp : T20C if(temp >= LIQUID_PLASMA_BP) exposed_turf.atmos_spawn_air("plasma=[reac_volume];TEMP=[temp]") + return ..() /datum/reagent/toxin/plasma/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)//Splashing people with plasma is stronger than fuel! . = ..() From 2d8fee9bd05b1ca2b5ff0abfd543387e779b26f7 Mon Sep 17 00:00:00 2001 From: ArcaneMusic Date: Mon, 7 Sep 2020 16:58:21 -0400 Subject: [PATCH 7/7] Updates conflicts. --- .../chemistry/reagents/other_reagents.dm | 39 ------------------- .../chemistry/reagents/toxin_reagents.dm | 11 ------ 2 files changed, 50 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 05b353e3027..f344a91f929 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -723,15 +723,6 @@ color = "#808080" // rgb: 128, 128, 128 taste_mult = 0 // oderless and tasteless -<<<<<<< HEAD -======= -/datum/reagent/oxygen/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return - var/temp = holder ? holder.chem_temp : T20C - exposed_obj.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]") ->>>>>>> upstream/master /datum/reagent/oxygen/expose_turf(turf/open/exposed_turf, reac_volume) . = ..() @@ -764,16 +755,6 @@ color = "#808080" // rgb: 128, 128, 128 taste_mult = 0 -<<<<<<< HEAD -======= -/datum/reagent/nitrogen/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return - var/temp = holder ? holder.chem_temp : T20C - exposed_obj.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]") - ->>>>>>> upstream/master /datum/reagent/nitrogen/expose_turf(turf/open/exposed_turf, reac_volume) if(istype(exposed_turf)) var/temp = holder ? holder.chem_temp : T20C @@ -1274,16 +1255,6 @@ color = "#B0B0B0" // rgb : 192, 192, 192 taste_description = "something unknowable" -<<<<<<< HEAD -======= -/datum/reagent/carbondioxide/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return - var/temp = holder ? holder.chem_temp : T20C - exposed_obj.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]") - ->>>>>>> upstream/master /datum/reagent/carbondioxide/expose_turf(turf/open/exposed_turf, reac_volume) if(istype(exposed_turf)) var/temp = holder ? holder.chem_temp : T20C @@ -1298,16 +1269,6 @@ color = "#808080" taste_description = "sweetness" -<<<<<<< HEAD -======= -/datum/reagent/nitrous_oxide/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return - var/temp = holder ? holder.chem_temp : T20C - exposed_obj.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]") ->>>>>>> upstream/master - /datum/reagent/nitrous_oxide/expose_turf(turf/open/exposed_turf, reac_volume) . = ..() if(istype(exposed_turf)) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 03116997e43..34aae23aa07 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -87,17 +87,6 @@ A.atmos_spawn_air("plasma=[volume];TEMP=[holder.chem_temp]") holder.del_reagent(type) -<<<<<<< HEAD -======= -/datum/reagent/toxin/plasma/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return - var/temp = holder ? holder.chem_temp : T20C - if(temp >= LIQUID_PLASMA_BP) - exposed_obj.atmos_spawn_air("plasma=[reac_volume];TEMP=[temp]") - ->>>>>>> upstream/master /datum/reagent/toxin/plasma/expose_turf(turf/open/exposed_turf, reac_volume) if(!istype(exposed_turf)) return