[MIRROR] Deletes unused hydroponics code [MDB IGNORE] (#1015)

* Deletes unused hydroponics code (#80156) --------- Co-authored-by: SkyratBot <[email protected]> Co-authored-by: MrMelbert <[email protected]>
Fluffy-Frontier · Dec 7, 2023 · 4f576bf · 4f576bf
1 parent a4300b4
commit 4f576bf
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 28 deletions.
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
@@ -900,7 +900,7 @@
 			reagent_source.update_appearance()
 		return 1
 
-	else if(istype(O, /obj/item/seeds) && !istype(O, /obj/item/seeds/sample))
+	else if(istype(O, /obj/item/seeds))
 		if(!myseed)
 			if(istype(O, /obj/item/seeds/kudzu))
 				investigate_log("had Kudzu planted in it by [key_name(user)] at [AREACOORD(src)].", INVESTIGATE_BOTANY)

diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
@@ -23,7 +23,8 @@
  * Returns TRUE if the seed can take the gene, and FALSE otherwise.
  */
 /datum/plant_gene/proc/can_add(obj/item/seeds/our_seed)
-	return !istype(our_seed, /obj/item/seeds/sample) // Samples can't accept new genes.
+	SHOULD_CALL_PARENT(TRUE)
+	return TRUE
 
 /// Copies over vars and information about our current gene to a new gene and returns the new instance of gene.
 /datum/plant_gene/proc/Copy()
@@ -151,9 +152,8 @@
 	if(!.)
 		return FALSE
 
-	for(var/obj/item/seeds/found_seed as anything in seed_blacklist)
-		if(istype(source_seed, found_seed))
-			return FALSE
+	if(is_type_in_list(source_seed, seed_blacklist))
+		return FALSE
 
 	for(var/datum/plant_gene/trait/trait in source_seed.genes)
 		if(trait_ids & trait.trait_ids)

diff --git a/code/modules/hydroponics/sample.dm b/code/modules/hydroponics/sample.dm
diff --git a/code/modules/unit_tests/plantgrowth_tests.dm b/code/modules/unit_tests/plantgrowth_tests.dm
@@ -3,7 +3,7 @@
 // Maybe some day it would be used as unit test.
 // -------- IT IS NOW!
 /datum/unit_test/plantgrowth/Run()
-	var/list/paths = subtypesof(/obj/item/seeds) - /obj/item/seeds - typesof(/obj/item/seeds/sample) - /obj/item/seeds/lavaland
+	var/list/paths = subtypesof(/obj/item/seeds) - /obj/item/seeds - /obj/item/seeds/lavaland
 
 	for(var/seedpath in paths)
 		var/obj/item/seeds/seed = new seedpath

diff --git a/icons/obj/service/hydroponics/seeds.dmi b/icons/obj/service/hydroponics/seeds.dmi
diff --git a/tgstation.dme b/tgstation.dme
@@ -4120,7 +4120,6 @@
 #include "code\modules\hydroponics\hydroponics.dm"
 #include "code\modules\hydroponics\hydroponics_chemreact.dm"
 #include "code\modules\hydroponics\plant_genes.dm"
-#include "code\modules\hydroponics\sample.dm"
 #include "code\modules\hydroponics\seed_extractor.dm"
 #include "code\modules\hydroponics\seeds.dm"
 #include "code\modules\hydroponics\unique_plant_genes.dm"