Removes src and renames the argument

Removes src and renames the argument
This commit is contained in:
Razharas
2015-09-09 16:36:40 +03:00
parent 54a58ddbf5
commit c40dea1ebd
@@ -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