Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power

code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm

@@ -1,81 +0,0 @@
-/obj/item/weapon/reagent_containers/food/snacks/grown/telriis_clump
-	name = "telriis grass"
-	desc = "A clump of telriis grass, not recommended for consumption by sentients."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "telriisclump"
-	New(var/loc, var/potency)
-		..()
-		reagents.add_reagent("pwine", potency * 5)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/thaadrabloom
-	name = "thaa'dra bloom"
-	desc = "Looks chewy, might be good to eat."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "thaadrabloom"
-	New(var/loc, var/potency)
-		..()
-		reagents.add_reagent("frostoil", potency * 1.5 + 5)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/jurlmah
-	name = "jurl'mah pod"
-	desc = "Bulbous and veiny, it appears to pulse slightly as you look at it."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "jurlmahpod"
-	New(var/loc, var/potency)
-		..()
-		reagents.add_reagent("serotrotium", potency)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/amauri
-	name = "amauri fruit"
-	desc = "It is small, round and hard. Its skin is a thick dark purple."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "amaurifruit"
-	New(var/loc, var/potency)
-		..()
-		reagents.add_reagent("zombiepowder", potency * 10)
-		reagents.add_reagent("condensedcapsaicin", potency * 5)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/gelthi
-	name = "gelthi berries"
-	desc = "They feel fluffy and slightly warm to the touch."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "gelthiberries"
-	New(var/loc, var/potency)
-		..()
-		//this may prove a little strong
-		reagents.add_reagent("stoxin", (potency * potency) / 5)
-		reagents.add_reagent("capsaicin", (potency * potency) / 5)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/vale
-	name = "vale leaves"
-	desc = "Small, curly leaves covered in a soft pale fur."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "valeleaves"
-	New(var/loc, var/potency)
-		..()
-		reagents.add_reagent("paracetamol", potency * 5)
-		reagents.add_reagent("dexalin", potency * 2)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/surik
-	name = "surik fruit"
-	desc = "Multiple layers of blue skin peeling away to reveal a spongey core, vaguely resembling an ear."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "surikfruit"
-	New(var/loc, var/potency)
-		..()
-		reagents.add_reagent("impedrezene", potency * 3)
-		reagents.add_reagent("synaptizine", potency * 2)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)

code/modules/research/xenoarchaeology/genetics/prehistoric_seeds.dm

@@ -1,139 +0,0 @@
-/datum/seed/telriis
-
-	name = "telriis"
-	seed_name = "telriis"
-	display_name = "telriis grass"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/telriis_clump)
-	packet_icon = "seed-alien1"
-	plant_icon = "telriis"
-
-	lifespan = 50
-	endurance = 50
-	maturation = 5
-	production = 5
-	yield = 4
-	potency = 5
-	growth_stages = 4
-
-/datum/seed/thaadra
-
-	name = "thaadra"
-	seed_name = "thaa'dra"
-	display_name = "thaa'dra lichen"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/thaadrabloom)
-	packet_icon = "seed-alien3"
-	plant_icon = "thaadra"
-
-	lifespan = 20
-	endurance = 10
-	maturation = 5
-	production = 9
-	yield = 2
-	potency = 5
-	growth_stages = 4
-
-/datum/seed/jurlmah
-
-	name = "jurlmah"
-	seed_name = "jurl'mah"
-	display_name = "jurl'mah reeds"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/jurlmah)
-	packet_icon = "seed-alien3"
-	plant_icon = "jurlmah"
-
-	lifespan = 20
-	endurance = 12
-	maturation = 8
-	production = 9
-	yield = 3
-	potency = 10
-	growth_stages = 5
-
-/datum/seed/amauri
-
-	name = "amauri"
-	seed_name = "amauri"
-	display_name = "amauri plant"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/amauri)
-	packet_icon = "seed-alien3"
-	plant_icon = "amauri"
-
-	lifespan = 30
-	endurance = 10
-	maturation = 8
-	production = 9
-	yield = 4
-	potency = 10
-	growth_stages = 3
-
-/datum/seed/gelthi
-
-	name = "gelthi"
-	seed_name = "gelthi"
-	display_name = "gelthi plant"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/gelthi)
-	packet_icon = "seed-alien2"
-	plant_icon = "gelthi"
-
-	lifespan = 20
-	endurance = 15
-	maturation = 6
-	production = 6
-	yield = 2
-	potency = 1
-	growth_stages = 3
-
-/datum/seed/vale
-
-	name = "vale"
-	seed_name = "vale"
-	display_name = "vale bush"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/vale)
-	packet_icon = "seed-alien2"
-	plant_icon = "vale"
-
-	lifespan = 25
-	endurance = 15
-	maturation = 8
-	production = 10
-	yield = 3
-	potency = 3
-	growth_stages = 4
-
-/datum/seed/surik
-
-	name = "surik"
-	seed_name = "surik"
-	display_name = "surik vine"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/surik)
-	packet_icon = "seed-alien3"
-	plant_icon = "surik"
-
-	lifespan = 30
-	endurance = 18
-	maturation = 7
-	production = 7
-	yield = 3
-	potency = 3
-	growth_stages = 4
-
-/obj/item/seeds/jurlmah
-	seed_type = "jurlmah"
-
-/obj/item/seeds/amauri
-	seed_type = "amauri"
-
-/obj/item/seeds/gelthi
-	seed_type = "gelthi"
-
-/obj/item/seeds/vale
-	seed_type = "vale"
-
-/obj/item/seeds/surik
-	seed_type = "surik"
-
-/obj/item/seeds/telriis
-	seed_type = "telriis"
-
-/obj/item/seeds/thaadra
-	seed_type = "thaadra"

code/modules/research/xenoarchaeology/geosample.dm

@@ -29,6 +29,8 @@
 	icon_state = "sliver[rand(1,3)]"
 	pixel_x = rand(0,16)-8
 	pixel_y = rand(0,8)-8
+	create_reagents(50)
+	reagents.add_reagent("ground_rock",50)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Geosample datum