From 84b44ea41c4429cbb500fc358d07226445ff697d Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Tue, 23 Aug 2016 00:56:58 -0700 Subject: [PATCH] Random seeds now have a base_name --- code/modules/hydroponics/seed.dm | 4 +++- code/modules/hydroponics/seed_controller.dm | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 994f141d373..53db9b0082c 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -406,8 +406,10 @@ /datum/seed/proc/randomize() roundstart = 0 - seed_name = "strange plant" // TODO: name generator. + // TODO: Better name generator + seed_name = "cultivar #[uid]" display_name = "strange plants" // TODO: name generator. + base_name = seed_name mysterious = 1 seed_noun = pick("spores","nodes","cuttings","seeds") modular_icon = 1 diff --git a/code/modules/hydroponics/seed_controller.dm b/code/modules/hydroponics/seed_controller.dm index aaa30c3275f..7e56c57a45f 100644 --- a/code/modules/hydroponics/seed_controller.dm +++ b/code/modules/hydroponics/seed_controller.dm @@ -96,9 +96,9 @@ var/global/datum/controller/plants/plant_controller // Set in New(). // Proc for creating a random seed type. /datum/controller/plants/proc/create_random_seed(var/survive_on_station) var/datum/seed/seed = new() - seed.randomize() seed.uid = plant_controller.seeds.len + 1 seed.name = "[seed.uid]" + seed.randomize() seeds[seed.name] = seed if(survive_on_station) @@ -106,8 +106,7 @@ var/global/datum/controller/plants/plant_controller // Set in New(). seed.consume_gasses["plasma"] = null seed.consume_gasses["carbon_dioxide"] = null if(seed.chems && !isnull(seed.chems["pacid"])) - seed.chems["pacid"] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous. - seed.chems -= null // Setting to null does not actually remove the entry, which is weird. + seed.chems -= "pacid" // Eating through the hull will make these plants completely inviable, albeit very dangerous. seed.set_trait(TRAIT_IDEAL_HEAT,293) seed.set_trait(TRAIT_HEAT_TOLERANCE,20) seed.set_trait(TRAIT_IDEAL_LIGHT,8)