From f2db6078abddfc9b9fc6b7f57f740f69e37a59ef Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Sun, 5 Feb 2017 20:22:41 +0100
Subject: [PATCH] Implement new botany changes

---
 code/__DEFINES/misc.dm                  |  4 +++-
 code/modules/station_goals/dna_vault.dm | 16 ++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index ec5e1f8e2ef..89e7e276de3 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -17,6 +17,8 @@
 #define CLICK_CD_TKSTRANGLE 10
 #define CLICK_CD_POINT 10
 #define CLICK_CD_RESIST 20
+#define CLICK_CD_CLICK_ABILITY 6
+#define CLICK_CD_RAPID 2
 
 //Sizes of mobs, used by mob/living/var/mob_size
 #define MOB_SIZE_TINY 0
@@ -160,6 +162,7 @@
 #define MAT_PLASMA			"$plasma"
 #define MAT_BANANIUM		"$bananium"
 #define MAT_TRANQUILLITE	"$tranquillite"
+#define MAT_BIOMASS			"$biomass"
 
 #define MAX_STACK_SIZE 50
 
@@ -299,7 +302,6 @@
 // The cooldown on OOC messages such as OOC, LOOC, praying and adminhelps
 #define OOC_COOLDOWN 5
 
-
 // Medal names
 #define BOSS_KILL_MEDAL "Killer"
 #define ALL_KILL_MEDAL "Exterminator"	//Killing all of x type
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 678599856b5..3109e907216 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -24,9 +24,9 @@
 
 /datum/station_goal/dna_vault/proc/non_standard_plants_count()
 	. = 0
-	for(var/T in plant_controller.seeds)
-		var/datum/seed/S = plant_controller.seeds[T]
-		if(S.get_trait(TRAIT_RARITY) > 0)
+	for(var/T in subtypesof(/obj/item/seeds)) //put a cache if it's used anywhere else
+		var/obj/item/seeds/S = T
+		if(initial(S.rarity) > 0)
 			.++
 
 /datum/station_goal/dna_vault/get_report()
@@ -79,17 +79,17 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
 	if(!proximity || !target)
 		return
 	//tray plants
-	if(istype(target,/obj/machinery/portable_atmospherics/hydroponics))
-		var/obj/machinery/portable_atmospherics/hydroponics/H = target
-		if(!H.seed)
+	if(istype(target,/obj/machinery/hydroponics))
+		var/obj/machinery/hydroponics/H = target
+		if(!H.myseed)
 			return
 		if(!H.harvest)// So it's bit harder.
 			to_chat(user, "<span clas='warning'>Plants needs to be ready to harvest to perform full data scan.</span>") //Because space dna is actually magic
 			return
-		if(plants[H.seed.type])
+		if(plants[H.myseed.type])
 			to_chat(user, "<span class='notice'>Plant data already present in local storage.<span>")
 			return
-		plants[H.seed.type] = 1
+		plants[H.myseed.type] = 1
 		to_chat(user, "<span class='notice'>Plant data added to local storage.<span>")
 
 	//animals