From d89572afee32fb6dae157a466210fe8aa67f9394 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sat, 8 Aug 2020 07:39:25 +0200 Subject: [PATCH] review changes --- code/modules/hydroponics/grown.dm | 11 +++++------ code/modules/hydroponics/plant_genes.dm | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 282976e1b5e..c95146971bd 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -193,15 +193,14 @@ /obj/item/reagent_containers/food/snacks/grown/proc/log_action(mob/user, atom/target, what_done) var/reagent_str = reagents.log_list() - var/genes_str + var/genes_str = "No genes" if(seed && length(seed.genes)) var/list/plant_gene_names = list() - for(var/datum/plant_gene/trait/T in seed.genes) - if(T.dangerous) - plant_gene_names += T.name + for(var/thing in seed.genes) + var/datum/plant_gene/G = thing + if(G.dangerous) + plant_gene_names += G.name genes_str = english_list(plant_gene_names) - else - genes_str = "No genes" add_attack_logs(user, target, "[what_done] ([reagent_str] | [genes_str])") diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index ef505e2842d..c2f4914351c 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -1,5 +1,7 @@ /datum/plant_gene var/name + /// Used to determine if the trait should be logged when the holder is used + var/dangerous = FALSE /datum/plant_gene/proc/get_name() // Used for manipulator display and gene disk name. return name @@ -139,8 +141,6 @@ var/rate = 0.05 var/examine_line = "" var/list/origin_tech = null - /// Used to determine if the trait should be logged when the holder is used - var/dangerous = FALSE var/trait_id // must be set and equal for any two traits of the same type /datum/plant_gene/trait/Copy()