even more work

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

@@ -128,7 +128,7 @@
 				/obj/item/stack/tape_roll = 10,
 				////////////////CONTRABAND STUFF//////////////////
 				/obj/item/weapon/grenade/clown_grenade = 3,
-				/obj/item/seeds/ambrosiavulgarisseed/cruciatus = 3,
+				/obj/item/seeds/ambrosia/cruciatus = 3,
 				/obj/item/weapon/gun/projectile/automatic/pistol/empty = 1,
 				/obj/item/ammo_box/magazine/m10mm = 4,
 				/obj/item/weapon/soap/syndie = 7,

code/game/objects/items/stacks/medical.dm

@@ -152,32 +152,6 @@
 	icon_state = "burnkit"
 	heal_burn = 25
 
-
-
-//Medical Herbs//
-
-
-/obj/item/stack/medical/bruise_pack/comfrey
-	name = "\improper Comfrey leaf"
-	singular_name = "Comfrey leaf"
-	desc = "A soft leaf that is rubbed on bruises."
-	icon = 'icons/obj/hydroponics_products.dmi'
-	icon_state = "alien3-product"
-	color = "#378C61"
-	heal_brute = 12
-
-
-/obj/item/stack/medical/ointment/aloe
-	name = "\improper Aloe Vera leaf"
-	singular_name = "Aloe Vera leaf"
-	desc = "A cold leaf that is rubbed on burns."
-	icon = 'icons/obj/hydroponics_products.dmi'
-	icon_state = "ambrosia-product"
-	color = "#4CC5C7"
-	heal_burn = 12
-
-
-
 //Splits//
 
 

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

@@ -46,13 +46,10 @@
 						to_chat(user, "<span class='warning'>The buzzing inside the briefcase swells momentarily, then returns to normal. Guess it was too cramped...</span>")
 				S.reagents.clear_reagents()
 				S.update_icon()
-	else if(istype(I, /obj/item/weapon/plantspray))
-		var/obj/item/weapon/plantspray/PS = I
-		user.drop_item(PS)
-		bees_left = max(0, (bees_left - PS.pest_kill_str))
-		to_chat(user, "You spray [PS] into \the [src].")
+	else if(istype(I, /obj/item/weapon/reagent_containers/spray/pestspray))
+		bees_left = max(0, (bees_left - 6))
+		to_chat(user, "You spray [I] into [src].")
 		playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
-		qdel(PS)
 
 /obj/item/weapon/bee_briefcase/attack_self(mob/user as mob)
 	if(!bees_left)

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

@@ -152,6 +152,17 @@
 	origin_tech = "materials=2;combat=4"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
 
+/obj/item/weapon/kitchen/knife/carrotshiv
+	name = "carrot shiv"
+	icon_state = "carrotshiv"
+	item_state = "carrotshiv"
+	desc = "Unlike other carrots, you should probably keep this far away from your eyes."
+	force = 8
+	throwforce = 12 //fuck git
+	materials = list()
+	origin_tech = "biotech=3;combat=2"
+	attack_verb = list("shanked", "shivved")
+
 /*
  * Rolling Pins
  */