diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 9b2c4aeefa3..5ec11b3261e 100644 --- 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 index 003ff873aeb..98eef6b816e 100644 --- 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 deleted file mode 100644 index 4bb43027cdb..00000000000 --- a/code/modules/hydroponics/sample.dm +++ /dev/null @@ -1,21 +0,0 @@ -/obj/item/seeds/sample - name = "plant sample" - icon_state = "sample-empty" - potency = -1 - yield = -1 - var/sample_color = "#FFFFFF" - -/obj/item/seeds/sample/Initialize(mapload) - . = ..() - if(sample_color) - var/mutable_appearance/filling = mutable_appearance(icon, "sample-filling") - filling.color = sample_color - add_overlay(filling) - -/obj/item/seeds/sample/get_unique_analyzer_text() - return "The DNA of this sample is damaged beyond recovery, it can't support life on its own." - -/obj/item/seeds/sample/alienweed - name = "alien weed sample" - icon_state = "alienweed" - sample_color = null diff --git a/code/modules/unit_tests/plantgrowth_tests.dm b/code/modules/unit_tests/plantgrowth_tests.dm index e3654e744d0..595c71d05a4 100644 --- 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 index 83008668654..4de1a757e1f 100644 Binary files a/icons/obj/service/hydroponics/seeds.dmi and b/icons/obj/service/hydroponics/seeds.dmi differ diff --git a/tgstation.dme b/tgstation.dme index e7c81ef08fb..5a93a06c2da 100644 --- 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"