Merge pull request #361 from Shadowfire117/master

Tocino and bug fixes for bubble tea!

code/modules/economy/price_list.dm

@@ -89,19 +89,19 @@
 /obj/item/weapon/reagent_containers/food/drinks/h_chocolate
 	price_tag = 3
 
-/datum/reagent/drink/bubbletea/watermelon
+/datum/reagent/drink/bubbleteawatermelon
 	price_tag = 5
 
-/datum/reagent/drink/bubbletea/strawberry
+/datum/reagent/drink/bubbleteastrawberry
 	price_tag = 5
 	
-/datum/reagent/drink/bubbletea/cherry
+/datum/reagent/drink/bubbleteacherry
 	price_tag = 5
 	
-/datum/reagent/drink/bubbletea/coffee
+/datum/reagent/drink/bubbleteacoffee
 	price_tag = 5
 	
-/datum/reagent/drink/bubbletea/banana
+/datum/reagent/drink/bubbleteabanana
 	price_tag = 5
 
 // Spirituous liquors //

code/modules/food/recipes_microwave_vr.dm

@@ -185,4 +185,11 @@
 		/obj/item/weapon/reagent_containers/food/snacks/doughslice,
 		/obj/item/weapon/reagent_containers/food/snacks/doughslice
 	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/pandenata
+	result = /obj/item/weapon/reagent_containers/food/snacks/pandenata
+	
+/datum/recipe/tocino
+	reagents = list("sodiumchloride" = 5, "wine" = 5, "sugar" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/tocino

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -1532,7 +1532,7 @@
 	glass_name = "Gelatin"
 	glass_desc = "It's like flavourless slime."
 
-/datum/reagent/drink/bubbletea/watermelon
+/datum/reagent/drink/bubbleteawatermelon
 	name = "Watermelon bubble tea"
 	id = "bubbleteawatermelon"
 	description = "A tea with milk and watermelon in it and gelatin balls as well."
@@ -1542,7 +1542,7 @@
 	glass_name = "watermelon bubble tea"
 	glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with watermelon."
 
-/datum/reagent/drink/bubbletea/strawberry
+/datum/reagent/drink/bubbleteastrawberry
 	name = "Strawberry bubble tea"
 	id = "bubbleteastrawberry"
 	description = "A tea with milk and strawberry in it and gelatin balls as well."
@@ -1552,7 +1552,7 @@
 	glass_name = "strawberry bubble tea"
 	glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with strawberry."
 
-/datum/reagent/drink/bubbletea/cherry
+/datum/reagent/drink/bubbleteacherry
 	name = "Cherry bubble tea"
 	id = "bubbleteacherry"
 	description = "A tea with milk and cherry in it and gelatin balls as well."
@@ -1562,7 +1562,7 @@
 	glass_name = "cherry bubble tea"
 	glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with cherry."
 
-/datum/reagent/drink/bubbletea/coffee
+/datum/reagent/drink/bubbleteacoffee
 	name = "Coffee bubble tea"
 	id = "bubbleteacoffee"
 	description = "A tea with milk and coffee in it and gelatin balls as well."
@@ -1572,7 +1572,7 @@
 	glass_name = "coffee bubble tea"
 	glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with coffee."
 
-/datum/reagent/drink/bubbletea/banana
+/datum/reagent/drink/bubbleteabanana
 	name = "Banana bubble tea"
 	id = "bubbleteabanana"
 	description = "A tea with milk and banana in it and gelatin balls as well."

code/modules/reagents/Chemistry-Recipes.dm

@@ -2237,35 +2237,35 @@
 	required_reagents = list("spidertoxin" = 1, "clonexadone" = 5, "absinthe" = 4)
 	result_amount = 10
 
-/datum/chemical_reaction/drinks/bubbletea/watermelon
+/datum/chemical_reaction/drinks/bubbleteawatermelon
 	name = "Watermelon bubble tea"
 	id = "bubbleteawatermelon"
 	result = "watermelon bubble tea"
 	required_reagents = list("gelatin" = 2, "watermelontea" = 6, "milk" = 2)
 	result_amount = 10
 	
-/datum/chemical_reaction/drinks/bubbletea/strawberry
+/datum/chemical_reaction/drinks/bubbleteastrawberry
 	name = "Strawberry bubble tea"
 	id = "bubbleteastrawberry"
 	result = "strawberry bubble tea"
 	required_reagents = list("gelatin" = 2, "berrytea" = 6, "milk" = 2)
 	result_amount = 10
 	
-/datum/chemical_reaction/drinks/bubbletea/cherry
+/datum/chemical_reaction/drinks/bubbleteacherry
 	name = "Cherry bubble tea"
 	id = "bubbleteacherry"
 	result = "cherry bubble tea"
 	required_reagents = list("gelatin" = 2, "cherrytea" = 6, "milk" = 2)
 	result_amount = 10
 	
-/datum/chemical_reaction/drinks/bubbletea/coffee
+/datum/chemical_reaction/drinks/bubbleteacoffee
 	name = "Coffee bubble tea"
 	id = "bubbleteacoffee"
 	result = "coffee bubble tea"
 	required_reagents = list("gelatin" = 2, "tea" = 5, "cafe_latte" = 3)
 	result_amount = 10
 	
-/datum/chemical_reaction/drinks/bubbletea/banana
+/datum/chemical_reaction/drinks/bubbleteabanana
 	name = "Banana bubble tea"
 	id = "bubbleteabanana"
 	result = "banana bubble tea"

code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm

@@ -515,23 +515,23 @@ Drinks Data
 /datum/reagent/ethanol/spiderdrink
 	glass_icon_state = "glassofspiders"
 	
-/datum/reagent/drink/bubbletea/watermelon
+/datum/reagent/drink/bubbleteawatermelon
 	glass_icon_state = "bubbleteawatermelonglass"
 	glass_center_of_mass = list("x"=16, "y"=9)
 
-/datum/reagent/drink/bubbletea/watermelon
+/datum/reagent/drink/bubbleteawatermelon
 	glass_icon_state = "bubbleteastrawberryglass"
 	glass_center_of_mass = list("x"=16, "y"=9)
 
-/datum/reagent/drink/bubbletea/watermelon
+/datum/reagent/drink/bubbleteawatermelon
 	glass_icon_state = "bubbleteacherryglass"
 	glass_center_of_mass = list("x"=16, "y"=9)
 
-/datum/reagent/drink/bubbletea/watermelon
+/datum/reagent/drink/bubbleteawatermelon
 	glass_icon_state = "bubbleteacoffeeglass"
 	glass_center_of_mass = list("x"=16, "y"=9)
 
-/datum/reagent/drink/bubbletea/watermelon
+/datum/reagent/drink/bubbleteawatermelon
 	glass_icon_state = "bubbleteabananaglass"
 	glass_center_of_mass = list("x"=16, "y"=9)
 	

code/modules/reagents/reagent_containers/food/snacks_vr.dm

@@ -342,6 +342,19 @@
 /obj/item/weapon/reagent_containers/food/snacks/pandenata/New()
 	..()
 	bitesize = 3
+	
+/obj/item/weapon/reagent_containers/food/snacks/tocino
+	name = "Tocino"
+	desc = "A form of bacon made from cuts of pork that has cured in wine, sugar and salt for a while, best served on a hot skillet so remains warm and tasty til the last bite."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "tocino"
+	trash = /obj/item/trash/plate
+	nutriment_amt = 2
+	nutriment_desc = list("crispy sweet meat" = 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/tocino/New()
+	..()
+	bitesize = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube
 	name = "sobaka cube"