Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

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

@@ -132,6 +132,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/icecream_vat.dm

@@ -131,7 +131,6 @@
 					I.add_ice_cream(flavour_name, beaker.reagents)
 				else
 					I.add_ice_cream(flavour_name)
-				I.add_ice_cream(flavour_name)
 				if(I.reagents.total_volume < 10)
 					I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume)
 				updateDialog()
@@ -229,7 +228,7 @@
 	desc = "Delicious waffle cone, but no ice cream."
 	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "icecream_cone_waffle" //default for admin-spawned cones, href_list["cone"] should overwrite this all the time
-	list_reagents = list(/datum/reagent/consumable/nutriment = 4)
+	list_reagents = list("nutriment" = 4)
 	tastes = list("cream" = 2, "waffle" = 1)
 	var/ice_creamed = 0
 	var/cone_type
@@ -252,7 +251,7 @@
 	desc = "Delicious [cone_name] cone, but no ice cream."
 
 
-/obj/item/reagent_containers/food/snacks/icecream/proc/add_ice_cream(flavour_name, datum/reagents/R = null)
+/obj/item/reagent_containers/food/snacks/icecream/proc/add_ice_cream(flavour_name, datum/reagents/R)
 	name = "[flavour_name] icecream"
 	switch (flavour_name) // adding the actual reagents advertised in the ingredient list
 		if ("vanilla")
@@ -311,9 +310,11 @@
 	qdel(src)
 
 /obj/machinery/icecream_vat/AltClick(mob/living/user)
+	. = ..()
 	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 		return
 	replace_beaker(user)
+	return TRUE
 
 /obj/machinery/icecream_vat/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
 	if(beaker)

code/modules/food_and_drinks/kitchen_machinery/microwave.dm

@@ -186,8 +186,10 @@
 	..()
 
 /obj/machinery/microwave/AltClick(mob/user)
+	. = ..()
 	if(user.canUseTopic(src, !issilicon(usr)))
 		cook()
+		return TRUE
 
 /obj/machinery/microwave/ui_interact(mob/user)
 	. = ..()