From c40dea1ebd84c17e40bafc613dde0cacd3cfa07a Mon Sep 17 00:00:00 2001 From: Razharas Date: Wed, 9 Sep 2015 16:36:40 +0300 Subject: [PATCH] Removes src and renames the argument Removes src and renames the argument --- .../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 7fe2b3465d1..72b835cfb3d 100644 --- a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm @@ -21,13 +21,13 @@ if(istype(data)) SetViruses(src, data) -/datum/reagent/blood/on_merge(list/data) - if(src.data && data) - src.data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc - if(src.data["viruses"] || data["viruses"]) +/datum/reagent/blood/on_merge(list/mix_data) + if(data && mix_data) + data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc + if(data["viruses"] || mix_data["viruses"]) - var/list/mix1 = src.data["viruses"] - var/list/mix2 = data["viruses"] + var/list/mix1 = data["viruses"] + var/list/mix2 = mix_data["viruses"] // Stop issues with the list changing during mixing. var/list/to_mix = list() @@ -40,10 +40,10 @@ var/datum/disease/advance/AD = Advance_Mix(to_mix) if(AD) var/list/preserve = list(AD) - for(var/D in src.data["viruses"]) + for(var/D in data["viruses"]) if(!istype(D, /datum/disease/advance)) preserve += D - src.data["viruses"] = preserve + data["viruses"] = preserve return 1 /datum/reagent/blood/reaction_turf(turf/simulated/T, reac_volume)//splash the blood all over the place