Merge branch 'master' into donut

code/modules/food_and_drinks/drinks/drinks.dm

@@ -132,14 +132,10 @@
 	transfer_fingerprints_to(B)
 	qdel(src)
 
-
-
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Drinks. END
 ////////////////////////////////////////////////////////////////////////////////
 
-
 /obj/item/reagent_containers/food/drinks/trophy
 	name = "pewter cup"
 	desc = "Everyone gets a trophy."
@@ -178,7 +174,6 @@
 	materials = list(MAT_SILVER=800)
 	volume = 100
 
-
 /obj/item/reagent_containers/food/drinks/trophy/bronze_cup
 	name = "bronze cup"
 	desc = "At least you ranked!"
@@ -190,7 +185,7 @@
 	materials = list(MAT_METAL=400)
 	volume = 25
 
-///////////////////////////////////////////////Drinks
+///////////////////////////////////////////////Drinks/////////////////////////////////////////
 //Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly
 //	rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50.
 //	Formatting is the same as food.
@@ -355,8 +350,7 @@
 		desc = "A small carton, intended for holding drinks."
 
 
-
-//////////////////////////drinkingglass and shaker//
+//////////////////////////drinkingglass and shaker/////////////////////////////////////////////////////////////////////////////////////
 //Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink
 //	itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass
 //	icon states.
@@ -397,8 +391,8 @@
 	volume = 30
 	spillable = TRUE
 
-//////////////////////////soda_cans//
-//These are in their own group to be used as IED's in /obj/item/grenade/ghettobomb.dm
+//////////////////////////soda_cans////////////////////////////////////////////////////
+//These are in their own group to be used as IED's in /obj/item/grenade/ghettobomb.dm//
 
 /obj/item/reagent_containers/food/drinks/soda_cans
 	name = "soda can"
@@ -424,7 +418,6 @@
 		qdel(src)
 	..()
 
-
 /obj/item/reagent_containers/food/drinks/soda_cans/attack_self(mob/user)
 	if(!is_drainable())
 		to_chat(user, "You pull back the tab of \the [src] with a satisfying pop.") //Ahhhhhhhh
@@ -513,6 +506,13 @@
 	list_reagents = list("shamblers" = 30)
 	foodtype = SUGAR | JUNKFOOD
 
+/obj/item/reagent_containers/food/drinks/soda_cans/buzz_fuzz
+	name = "Buzz Fuzz"
+	desc = "The sister drink of Shambler's Juice! Uses real honey, making it a sweet tooth's dream drink. The slogan reads ''A Hive of Flavour'', there's also a label about how it is adddicting."
+	icon_state = "honeysoda_can"
+	list_reagents = list("buzz_fuzz" = 25, "honey" = 5)
+	foodtype = SUGAR | JUNKFOOD
+
 /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull
 	name = "Grey Bull"
 	desc = "Grey Bull, it gives you gloves!"

code/modules/food_and_drinks/food/snacks/meat.dm

@@ -159,6 +159,28 @@
 	tastes = list("brains" = 1, "meat" = 1)
 	foodtype = RAW | MEAT | TOXIC
 
+/obj/item/reagent_containers/food/snacks/carpmeat/aquatic
+	name = "fillet"
+	desc = "A fillet of one of the local water dwelling species."
+
+/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
+	icon_state = "ipcmeat"
+	desc = "Gross robot meat."
+	filling_color = "#000000"
+	tastes = list("metal" = 1)
+
+/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian
+	desc = "Tastes like chicken, that's because it is!"
+	icon_state = "birdmeat"
+	filling_color = "#BF896B"
+	tastes = list("chicken" = 1)
+
+/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
+	desc = "Tastes sweet... reminds you vaguely of chicken."
+	filling_color = "#6B8E23"
+	tastes = list("brains" = 1, "meat" = 1)
+
+
 
 ////////////////////////////////////// OTHER MEATS ////////////////////////////////////////////////////////
 

code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

@@ -80,6 +80,9 @@ God bless America.
 		I.reagents.trans_to(src, I.reagents.total_volume)
 		qdel(I)
 		return
+	if(istype(I,/obj/item/clothing/head/mob_holder))
+		to_chat(user, "<span class='warning'>This does not fit in the fryer.</span>") // TODO: Deepfrying instakills mobs, spawns a whole deep-fried mob. 
+		return
 	if(!reagents.has_reagent("cooking_oil"))
 		to_chat(user, "<span class='warning'>[src] has no cooking oil to fry with!</span>")
 		return