Botany Rework

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -89,15 +89,20 @@
 /obj/effect/decal/cleanable/cobweb/fire_act()
 	qdel(src)
 
-/obj/effect/decal/cleanable/molten_item
+/obj/effect/decal/cleanable/molten_object
 	name = "gooey grey mass"
 	desc = "It looks like a melted... something."
 	density = 0
 	anchored = 1
 	layer = 3
-	icon = 'icons/obj/chemical.dmi'
+	gender = NEUTER
+	icon = 'icons/effects/effects.dmi'
 	icon_state = "molten"
 
+/obj/effect/decal/cleanable/molten_object/large
+	name = "big gooey grey mass"
+	icon_state = "big_molten"
+
 /obj/effect/decal/cleanable/cobweb2
 	name = "cobweb"
 	desc = "Somebody should remove that."
@@ -145,6 +150,15 @@
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
 
+/obj/effect/decal/cleanable/plant_smudge
+	name = "plant smudge"
+	density = 0
+	anchored = 1
+	layer = 2
+	gender = NEUTER
+	icon = 'icons/effects/tomatodecal.dmi'
+	random_icon_states = list("smashed_plant")
+
 /obj/effect/decal/cleanable/egg_smudge
 	name = "smashed egg"
 	desc = "Seems like this one won't hatch."
@@ -163,16 +177,6 @@
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_pie")
 
-/obj/effect/decal/cleanable/fruit_smudge
-	name = "smudge"
-	desc = "Some kind of fruit smear."
-	density = 0
-	anchored = 1
-	layer = 2
-	icon = 'icons/effects/blood.dmi'
-	icon_state = "mfloor1"
-	random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7")
-
 /obj/effect/decal/cleanable/fungus
 	name = "space fungus"
 	desc = "A fungal growth. Looks pretty nasty."

code/game/objects/effects/effect_system.dm

@@ -425,21 +425,6 @@ steam.start() -- spawns the effect
 /obj/effect/effect/chem_smoke/Move()
 	..()
 
-	return
-
-// Spores
-/datum/effect/system/chem_smoke_spread/spores
-	var/datum/seed/seed
-
-/datum/effect/system/chem_smoke_spread/spores/New(seed_name)
-	if(seed_name && plant_controller)
-		seed = plant_controller.seeds[seed_name]
-	if(!seed)
-		qdel(src)
-	..()
-
-
-
 /datum/effect/system/chem_smoke_spread/New()
 	..()
 	chemholder = new/obj()
@@ -517,13 +502,6 @@ steam.start() -- spawns the effect
 				var/mob/living/carbon/C = A
 				if(C.can_breathe_gas())
 					chemholder.reagents.copy_to(C, chemholder.reagents.total_volume)
-			if(istype(A, /obj/machinery/portable_atmospherics/hydroponics))
-				var/obj/machinery/portable_atmospherics/hydroponics/tray = A
-				chemholder.reagents.copy_to(tray, chemholder.reagents.total_volume)
-			if(istype(A, /obj/effect/plant))
-				var/obj/effect/plant/plant = A
-				if(chemholder.reagents.has_reagent("atrazine"))
-					plant.die_off()
 		qdel(smokeholder)
 		for(i=0, i<src.number, i++)
 			if(src.total_smoke > 20)

code/game/objects/effects/spawners/lootdrop.dm

@@ -103,8 +103,8 @@
 				/obj/item/weapon/hand_labeler = 10,
 				/obj/item/weapon/paper/crumpled = 10,
 				/obj/item/weapon/pen = 10,
-				 /obj/item/weapon/minihoe = 10,
-				/obj/item/weapon/plantspray/pests = 10,
+				 /obj/item/weapon/cultivator = 10,
+				/obj/item/weapon/reagent_containers/spray/pestspray = 10,
 				/obj/item/weapon/stock_parts/cell = 30,
 				/obj/item/weapon/storage/belt/utility = 20,
 				/obj/item/weapon/storage/box = 20,
@@ -122,8 +122,8 @@
 				/obj/item/weapon/wrench = 40,
 				/obj/item/weapon/relic = 35,
 				/obj/item/clothing/shoes/brown = 30,
-				/obj/item/seeds/ambrosiadeusseed = 10,
-				/obj/item/seeds/ambrosiavulgarisseed = 20,
+				/obj/item/seeds/ambrosia/deus = 10,
+				/obj/item/seeds/ambrosia = 20,
 				/obj/item/clothing/under/color/black = 30,
 				/obj/item/stack/tape_roll = 10,
 				////////////////CONTRABAND STUFF//////////////////

code/game/objects/items/stacks/sheets/mineral.dm

@@ -18,7 +18,7 @@ Mineral Sheets
 */
 
 var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
-	new/datum/stack_recipe("pile of dirt", /obj/machinery/portable_atmospherics/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
 	)
 

code/game/objects/items/weapons/gift_wrappaper.dm

@@ -71,7 +71,7 @@
 		/obj/item/weapon/pen/invisible,
 		/obj/item/weapon/lipstick/random,
 		/obj/item/weapon/grenade/smokebomb,
-		/obj/item/weapon/corncob,
+		/obj/item/weapon/grown/corncob,
 		/obj/item/weapon/contraband/poster,
 		/obj/item/weapon/bikehorn,
 		/obj/item/weapon/beach_ball,
@@ -85,8 +85,8 @@
 		/obj/random/mech,
 		/obj/item/toy/spinningtoy,
 		/obj/item/toy/sword,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
 		/obj/item/device/paicard,
 		/obj/item/device/violin,
 		/obj/item/device/guitar,

code/game/objects/items/weapons/storage/bags.dm

@@ -159,52 +159,32 @@
 // -----------------------------
 
 /obj/item/weapon/storage/bag/plants
-	icon = 'icons/obj/hydroponics.dmi'
+	name = "plant bag"
+	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "plantbag"
-	name = "Plant Bag"
-	storage_slots = 50; //the number of plant pieces it can carry.
-	max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
+	storage_slots = 100; //the number of plant pieces it can carry.
+	max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
 	max_w_class = 3
 	w_class = 1
-	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown", "/obj/item/stack/tile/grass","/obj/item/stack/medical/ointment/aloe","/obj/item/stack/medical/bruise_pack/comfrey", "/obj/item/weapon/reagent_containers/honeycomb")
+	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown","/obj/item/weapon/reagent_containers/food/snacks/ash_flora")
 	burn_state = FLAMMABLE
 
 /obj/item/weapon/storage/bag/plants/portaseeder
 	name = "portable seed extractor"
 	desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
 	icon_state = "portaseeder"
+	origin_tech = "biotech=3;engineering=2"
 
 /obj/item/weapon/storage/bag/plants/portaseeder/verb/dissolve_contents()
 	set name = "Activate Seed Extraction"
 	set category = "Object"
 	set desc = "Activate to convert your plants into plantable seeds."
-	if(usr.stat || !usr.canmove || usr.restrained())
+
+	if(usr.incapacitated())
 		return
-	for(var/obj/item/O in contents)
-		if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) || istype(O, /obj/item/weapon/grown))
-
-			var/datum/seed/new_seed_type
-			if(istype(O, /obj/item/weapon/grown))
-				var/obj/item/weapon/grown/F = O
-				new_seed_type = plant_controller.seeds[F.plantname]
-			else
-				var/obj/item/weapon/reagent_containers/food/snacks/grown/F = O
-				new_seed_type = plant_controller.seeds[F.plantname]
-
-			if(new_seed_type)
-				var/obj/item/seeds/seeds = new(O.loc, O)
-				seeds.seed_type = new_seed_type.name
-				seeds.update_seed()
-			qdel(O)
-
-		if(istype(O, /obj/item/stack/tile/grass))
-			var/obj/item/stack/tile/grass/S = O
-			S.use(1)
-			new /obj/item/seeds/grassseed(O.loc, O)
-
 	for(var/mob/M in range(1))
 		if(M.s_active == src)
-			src.close(M)
+			close(M)
 
 
 // -----------------------------

code/game/objects/items/weapons/storage/belt.dm

@@ -139,8 +139,8 @@
 	item_state = "botany"
 	use_item_overlays = 1
 	can_hold = list(
-		"/obj/item/device/analyzer/plant_analyzer",
-		"/obj/item/weapon/minihoe",
+		"/obj/item/device/plant_analyzer",
+		"/obj/item/weapon/cultivator",
 		"/obj/item/weapon/hatchet",
 		"/obj/item/weapon/reagent_containers/glass/bottle",
 		"/obj/item/weapon/plantspray",

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -9,18 +9,18 @@
 	icon_off = "hydrosecureoff"
 
 
-	New()
-		..()
-		switch(rand(1,2))
-			if(1)
-				new /obj/item/clothing/suit/apron(src)
-			if(2)
-				new /obj/item/clothing/suit/apron/overalls(src)
-		new /obj/item/weapon/storage/bag/plants/portaseeder(src)
-		new /obj/item/clothing/under/rank/hydroponics(src)
-		new /obj/item/device/analyzer/plant_analyzer(src)
-		new /obj/item/device/radio/headset/headset_service(src)
-		new /obj/item/device/radio/headset/headset_service(src)
-		new /obj/item/clothing/mask/bandana/botany(src)
-		new /obj/item/weapon/minihoe(src)
-		new /obj/item/weapon/hatchet(src)
+/obj/structure/closet/secure_closet/hydroponics/New()
+	..()
+	switch(rand(1,2))
+		if(1)
+			new /obj/item/clothing/suit/apron(src)
+		if(2)
+			new /obj/item/clothing/suit/apron/overalls(src)
+	new /obj/item/weapon/storage/bag/plants/portaseeder(src)
+	new /obj/item/clothing/under/rank/hydroponics(src)
+	new /obj/item/device/plant_analyzer(src)
+	new /obj/item/device/radio/headset/headset_service(src)
+	new /obj/item/clothing/mask/bandana/botany(src)
+	new /obj/item/weapon/cultivator(src)
+	new /obj/item/weapon/hatchet(src)
+	new /obj/item/weapon/storage/box/disks_plantgene(src)

code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm

@@ -18,7 +18,7 @@
 	new /obj/item/weapon/bikehorn(src)
 	new /obj/item/weapon/reagent_containers/spray/waterflower(src)
 	new /obj/item/toy/crayon/rainbow(src)
-	new /obj/item/seeds/bananaseed(src)
+	new /obj/item/seeds/banana(src)
 
 
 

code/game/objects/structures/crates_lockers/crates.dm

@@ -568,8 +568,6 @@
 		new /obj/item/weapon/wirecutters(src)
 		new /obj/item/weapon/shovel/spade(src)
 		new /obj/item/weapon/shovel/spade(src)
-		new /obj/item/weapon/storage/box/botanydisk(src)
-		new /obj/item/weapon/storage/box/botanydisk(src)
 		new /obj/item/weapon/storage/box/beakers(src)
 		new /obj/item/weapon/storage/box/beakers(src)
 		new /obj/item/weapon/hand_labeler(src)