-Plant-b-gone is now poisonous to ingest.

-Plant-b-gone now kills space vines.
-Plant-b-gone no longer causes a runtime error when sprayed at a human.

-New kitchen recipe, designed with those filthy traitor chefs in mind~
-Adjusted chaos donuts to require 5 of each chemical instead of 3 (Condiment bottles dispense 5 units at a time, forcing you to empty out a salt shaker if you wanted to make them previously).
-Added some trash items to cake slices where appropriate. Consistency.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4021 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/gamemodes/events/spacevines.dm

@@ -45,7 +45,7 @@
 			else
 				manual_unbuckle(user)
 				return
-		//TODO: add plant-b-gone
+		//Plant-b-gone damage is handled in its entry in chemistry-reagents.dm
 	..()
 
 

code/modules/chemical/Chemistry-Reagents.dm

@@ -1030,23 +1030,22 @@ datum
 			description = "A harmful toxic mixture to kill plantlife. Do not ingest!"
 			reagent_state = LIQUID
 			color = "#49002E" // rgb: 73, 0, 46
-			/* Don't know if this is necessary.
+
 			on_mob_life(var/mob/living/carbon/M)
 				if(!M) M = holder.my_atom
-				M.adjustToxLoss(3.0)
+				M.adjustToxLoss(1.0)
 				..()
 				return
-			*/
+
 			reaction_obj(var/obj/O, var/volume)
-		//		if(istype(O,/obj/plant/vine/))
-		//			var/obj/plant/vine/V = O
-		//			V.life -= rand(15,35) // Kills vines nicely // Not tested as vines don't work in R41
 				if(istype(O,/obj/effect/alien/weeds/))
 					var/obj/effect/alien/weeds/alien_weeds = O
 					alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
 					alien_weeds.healthcheck()
 				else if(istype(O,/obj/effect/glowshroom)) //even a small amount is enough to kill it
 					del(O)
+				else if(istype(O,/obj/effect/spacevine))
+					if(prob(50)) del(O) //Kills kudzu too.
 				// Damage that is done to growing plants is separately
 				// at code/game/machinery/hydroponics at obj/item/hydroponics
 
@@ -1057,7 +1056,7 @@ datum
 					if(!C.wear_mask) // If not wearing a mask
 						C.adjustToxLoss(2) // 4 toxic damage per application, doubled for some reason
 					if(ishuman(M))
-						var/mob/living/carbon/human/H
+						var/mob/living/carbon/human/H = M
 						if(H.mutantrace == "plant") //plantmen take a LOT of damage
 							H.adjustToxLoss(10)
 

code/modules/food/food.dm

@@ -1453,6 +1453,17 @@
 		reagents.add_reagent("tricordrazine", 8)
 		bitesize = 3
 
+/obj/item/weapon/reagent_containers/food/snacks/validsalad
+	name = "valid salad"
+	desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it."
+	icon_state = "validsalad"
+	trash = "snack_bowl"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 8)
+		reagents.add_reagent("syndicream", 5)
+		bitesize = 3
+
 /obj/item/weapon/reagent_containers/food/snacks/appletart
 	name = "golden apple streusel tart"
 	desc = "A tasty dessert that won't make it through a metal detector."
@@ -1576,6 +1587,7 @@
 	name = "Brain Cake slice"
 	desc = "Lemme tell you something about prions. THEY'RE DELICIOUS."
 	icon_state = "braincakeslice"
+	trash = "plate"
 	bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake
@@ -1627,6 +1639,7 @@
 	name = "Orange Cake slice"
 	desc = "Just a slice of cake, it is enough for everyone."
 	icon_state = "orangecake_slice"
+	trash = "plate"
 	bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake
@@ -1643,6 +1656,7 @@
 	name = "Lime Cake slice"
 	desc = "Just a slice of cake, it is enough for everyone."
 	icon_state = "limecake_slice"
+	trash = "plate"
 	bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake
@@ -1659,6 +1673,7 @@
 	name = "Lemon Cake slice"
 	desc = "Just a slice of cake, it is enough for everyone."
 	icon_state = "lemoncake_slice"
+	trash = "plate"
 	bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake
@@ -1675,6 +1690,7 @@
 	name = "Chocolate Cake slice"
 	desc = "Just a slice of cake, it is enough for everyone."
 	icon_state = "chocolatecake_slice"
+	trash = "plate"
 	bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel
@@ -1783,6 +1799,7 @@
 	name = "Apple Cake slice"
 	desc = "A slice of heavenly cake."
 	icon_state = "applecakeslice"
+	trash = "plate"
 	bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie
@@ -1799,6 +1816,7 @@
 	name = "Pumpkin Pie slice"
 	desc = "A slice of pumpkin pie, with whipped cream on top. Perfection."
 	icon_state = "pumpkinpieslice"
+	trash = "plate"
 	bitesize = 2
 
 

code/modules/food/recipes_microwave.dm

@@ -409,7 +409,7 @@
 	result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu
 
 /datum/recipe/chaosdonut
-	reagents = list("frostoil" = 2, "capsaicin" = 2, )
+	reagents = list("frostoil" = 5, "capsaicin" = 5, )
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/flour,
 		/obj/item/weapon/reagent_containers/food/snacks/egg
@@ -1154,4 +1154,14 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
 		/obj/item/weapon/reagent_containers/food/snacks/grown/goldapple,
 	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/aesirsalad
+	result = /obj/item/weapon/reagent_containers/food/snacks/aesirsalad
+
+/datum/recipe/validsalad
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
+		/obj/item/weapon/reagent_containers/food/snacks/faggot,
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/validsalad