From e69253bf87365c09813fc67e510982942d6f745d Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 17 Jan 2020 14:12:51 -0700 Subject: [PATCH 1/3] Update others.dm --- code/modules/reagents/chemistry/recipes/others.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index d4c71ebb44..df4636ba0f 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -222,7 +222,7 @@ /datum/chemical_reaction/mix_virus name = "Mix Virus" id = "mixvirus" - results = list(/datum/reagent/blood = 1) + results = list() required_reagents = list(/datum/reagent/consumable/virus_food = 1) required_catalysts = list(/datum/reagent/blood = 1) var/level_min = 1 @@ -234,8 +234,8 @@ if(B && B.data) var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"] if(D) - D.Evolve(level_min, level_max) - + for(var/i in 1 to min(created_volume, 5)) + D.Evolve(level_min, level_max) /datum/chemical_reaction/mix_virus/mix_virus_2 From edccfa35238af8a556db178b7a7ef502df9fdc78 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 17 Jan 2020 14:15:08 -0700 Subject: [PATCH 2/3] Update others.dm --- code/modules/reagents/chemistry/recipes/others.dm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index df4636ba0f..f1f0b4bbf5 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -222,7 +222,6 @@ /datum/chemical_reaction/mix_virus name = "Mix Virus" id = "mixvirus" - results = list() required_reagents = list(/datum/reagent/consumable/virus_food = 1) required_catalysts = list(/datum/reagent/blood = 1) var/level_min = 1 @@ -326,19 +325,18 @@ level_max = 8 /datum/chemical_reaction/mix_virus/rem_virus - name = "Devolve Virus" id = "remvirus" required_reagents = list(/datum/reagent/medicine/synaptizine = 1) required_catalysts = list(/datum/reagent/blood = 1) /datum/chemical_reaction/mix_virus/rem_virus/on_reaction(datum/reagents/holder, created_volume) - var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list if(B && B.data) var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"] if(D) - D.Devolve() + for(var/i in 1 to min(createdvolume, 5)) + D.Devolve() /datum/chemical_reaction/mix_virus/neuter_virus name = "Neuter Virus" @@ -347,14 +345,12 @@ required_catalysts = list(/datum/reagent/blood = 1) /datum/chemical_reaction/mix_virus/neuter_virus/on_reaction(datum/reagents/holder, created_volume) - var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list if(B && B.data) var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"] if(D) - D.Neuter() - - + for(var/i in 1 to min(created_volume, 5)) + D.Neuter() ////////////////////////////////// foam and foam precursor /////////////////////////////////////////////////// From eddb6fda688b83ea13e5449fc30b2c2f9d475323 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 17 Jan 2020 14:32:51 -0700 Subject: [PATCH 3/3] Update others.dm --- code/modules/reagents/chemistry/recipes/others.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index f1f0b4bbf5..26b39fb3b0 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -335,7 +335,7 @@ if(B && B.data) var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"] if(D) - for(var/i in 1 to min(createdvolume, 5)) + for(var/i in 1 to min(created_volume, 5)) D.Devolve() /datum/chemical_reaction/mix_virus/neuter_virus