From 42edb7ba753b52061f2298aa992f7ce6bd0459dc Mon Sep 17 00:00:00 2001 From: Certhic Date: Wed, 2 Sep 2020 14:31:54 +0200 Subject: [PATCH 1/4] fixed runtime in experimentor --- code/modules/research/experimentor.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index caa273594de..a49f521485b 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -290,9 +290,9 @@ visible_message("[src] malfunctions, spewing toxic waste!") for(var/turf/T in oview(1, src)) if(!T.density) - if(prob(EFFECT_PROB_VERYHIGH)) - var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T) - reagentdecal.reagents.add_reagent("radium", 7) + var/datum/reagents/R = new/datum/reagents(20) + R.add_reagent("radium", 20) + chem_splash(T, 3, list(R)) if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) var/savedName = "[exp_on]" ejectItem(TRUE) From 147cd00729c85731b2360e0f871a40567d44e72f Mon Sep 17 00:00:00 2001 From: Certhic Date: Thu, 3 Sep 2020 16:18:09 +0200 Subject: [PATCH 2/4] tweaks to experimentor bugfix --- code/modules/research/experimentor.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index a49f521485b..0cca077c861 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -290,9 +290,10 @@ visible_message("[src] malfunctions, spewing toxic waste!") for(var/turf/T in oview(1, src)) if(!T.density) - var/datum/reagents/R = new/datum/reagents(20) - R.add_reagent("radium", 20) - chem_splash(T, 3, list(R)) + if(prob(EFFECT_PROB_VERYHIGH)) + var/datum/reagents/R = new/datum/reagents(7) + R.add_reagent("radium", 7) + R.reaction(T, REAGENT_TOUCH) if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) var/savedName = "[exp_on]" ejectItem(TRUE) @@ -570,7 +571,7 @@ dotype = SCANTYPE_DISCOVER else dotype = matchReaction(process,scantype) - experiment(dotype,process) + experiment(SCANTYPE_IRRADIATE,process) use_power(750) if(dotype != FAIL) if(process && process.origin_tech) From e0c6612e30554353b7bc3a01ae1f09c7191f8f7b Mon Sep 17 00:00:00 2001 From: Certhic Date: Thu, 3 Sep 2020 16:23:08 +0200 Subject: [PATCH 3/4] reverted an accidental change --- code/modules/research/experimentor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 0cca077c861..fb204fcb4ba 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -571,7 +571,7 @@ dotype = SCANTYPE_DISCOVER else dotype = matchReaction(process,scantype) - experiment(SCANTYPE_IRRADIATE,process) + experiment(dotype,process) use_power(750) if(dotype != FAIL) if(process && process.origin_tech) From 4926876119db583ab210cd71ddd2ea171d2c72a6 Mon Sep 17 00:00:00 2001 From: Certhic Date: Fri, 4 Sep 2020 10:48:32 +0200 Subject: [PATCH 4/4] scrapped reagants --- code/modules/research/experimentor.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index fb204fcb4ba..43cc010ac1c 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -291,9 +291,7 @@ for(var/turf/T in oview(1, src)) if(!T.density) if(prob(EFFECT_PROB_VERYHIGH)) - var/datum/reagents/R = new/datum/reagents(7) - R.add_reagent("radium", 7) - R.reaction(T, REAGENT_TOUCH) + new /obj/effect/decal/cleanable/greenglow(T) if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) var/savedName = "[exp_on]" ejectItem(TRUE)