Merge pull request #8536 from Cerebulon/lettucefeast

Lettuce Eat

code/modules/economy/vending_machines.dm

@@ -504,6 +504,7 @@
 					/obj/item/seeds/cocoapodseed = 3,
 					/obj/item/seeds/plumpmycelium = 2,
 					/obj/item/seeds/cabbageseed = 3,
+					/obj/item/seeds/lettuce = 3,
 					/obj/item/seeds/grapeseed = 3,
 					/obj/item/seeds/pumpkinseed = 3,
 					/obj/item/seeds/cherryseed = 3,

code/modules/food/recipes_grill.dm

@@ -281,7 +281,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/carpmeat
 	)
 	reagents = list("spacespice" = 1)
-	fruit = list("cabbage" = 1, "lime" = 1)
+	fruit = list("lettuce" = 1, "lime" = 1)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp
 
 /datum/recipe/grilledcheese

code/modules/food/recipes_microwave.dm

@@ -433,7 +433,7 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/beetsoup
 
 /datum/recipe/tossedsalad
-	fruit = list("cabbage" = 2, "tomato" = 1, "carrot" = 1, "apple" = 1)
+	fruit = list("lettuce" = 2, "tomato" = 1, "carrot" = 1, "apple" = 1)
 	result = /obj/item/weapon/reagent_containers/food/snacks/tossedsalad
 
 /datum/recipe/flowersalad
@@ -1052,7 +1052,7 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/fish_taco
 
 /datum/recipe/blt
-	fruit = list("tomato" = 1, "cabbage" = 1)
+	fruit = list("tomato" = 1, "lettuce" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
 		/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
@@ -1104,7 +1104,7 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/goulash
 
 /datum/recipe/donerkebab
-	fruit = list("tomato" = 1, "cabbage" = 1)
+	fruit = list("tomato" = 1, "lettuce" = 1)
 	reagents = list("sodiumchloride" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/meatsteak,

code/modules/food/recipes_oven.dm

@@ -697,7 +697,7 @@
 
 /datum/recipe/lobster
 	appliance = OVEN
-	fruit = list("lemon" = 1, "cabbage" = 1)
+	fruit = list("lemon" = 1, "lettuce" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/lobster
 	)

code/modules/hydroponics/seedtypes/lettuce.dm

@@ -3,7 +3,7 @@
 	name = "lettuce"
 	seed_name = "lettuce"
 	display_name = "lettuce"
-	kitchen_tag = "cabbage"
+	kitchen_tag = "lettuce"
 	chems = list("nutriment" = list(1,15))
 
 /datum/seed/lettuce/New()

code/modules/reagents/reagents/food_drinks.dm

@@ -1053,12 +1053,22 @@
 	glass_desc = "Vitamins! Yay!"
 	allergen_type = ALLERGEN_FRUIT //Oranges are fruit
 
-/datum/reagent/drink/orangejuice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/juice/orange/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
 	if(alien == IS_DIONA)
 		return
 	M.adjustOxyLoss(-2 * removed)
 
+/datum/reagent/drink/juice/lettuce
+	name = "Lettuce Juice"
+	id = "lettucejuice"
+	description = "It's mostly water, just a bit more lettucy."
+	taste_description = "fresh greens"
+	color = "#29df4b"
+
+	glass_name = "lettuce juice"
+	glass_desc = "This is just lettuce water. Fresh but boring."
+
 /datum/reagent/toxin/poisonberryjuice // It has more in common with toxins than drinks... but it's a juice
 	name = "Poison Berry Juice"
 	id = "poisonberryjuice"