From db4b36e00a19e5f27b5cbd4195f192669eb5d512 Mon Sep 17 00:00:00 2001 From: AnturK Date: Sun, 7 Jun 2015 17:09:32 +0200 Subject: [PATCH 1/2] Makes viruses varedit friendly --- code/datums/diseases/_MobProcs.dm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 952c22982ef..3b23d38e811 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -38,7 +38,25 @@ DD.holder = src if(DD.disease_flags & CAN_CARRY && prob(5)) DD.carrier = 1 + + //Copy properties over. This is so edited diseases persist. + DD.visibility_flags = D.visibility_flags + DD.disease_flags = D.disease_flags + DD.spread_flags = D.spread_flags DD.strain_data = D.strain_data.Copy() + DD.form = D.form + DD.name = D.name + DD.desc = D.desc + DD.agent = D.agent + DD.spread_text = D.spread_text + DD.longevity= D.longevity + DD.cure_text = D.cure_text + DD.cures = D.cures + DD.cure_chance = D.cure_chance + DD.infectivity = D.infectivity + DD.permeability_mod = D.permeability_mod + DD.stage_prob = D.stage_prob + DD.affected_mob.med_hud_set_status() From b0191fbb6db1c79b7777a92a6e3aeb9586aea1dc Mon Sep 17 00:00:00 2001 From: AnturK Date: Wed, 17 Jun 2015 18:41:08 +0200 Subject: [PATCH 2/2] White to black --- code/datums/diseases/_MobProcs.dm | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 3b23d38e811..f41cb13c576 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -40,22 +40,15 @@ DD.carrier = 1 //Copy properties over. This is so edited diseases persist. - DD.visibility_flags = D.visibility_flags - DD.disease_flags = D.disease_flags - DD.spread_flags = D.spread_flags - DD.strain_data = D.strain_data.Copy() - DD.form = D.form - DD.name = D.name - DD.desc = D.desc - DD.agent = D.agent - DD.spread_text = D.spread_text - DD.longevity= D.longevity - DD.cure_text = D.cure_text - DD.cures = D.cures - DD.cure_chance = D.cure_chance - DD.infectivity = D.infectivity - DD.permeability_mod = D.permeability_mod - DD.stage_prob = D.stage_prob + var/list/skipped = list("affected_mob","holder","carrier","stage","type","parent_type","vars") + for(var/V in DD.vars) + if(V in skipped) + continue + if(istype(DD.vars[V],/list)) + var/list/L = D.vars[V] + DD.vars[V] = L.Copy() + else + DD.vars[V] = D.vars[V] DD.affected_mob.med_hud_set_status()