The Plate-less update (#30471)

* The Plate-less update

* well that was more complex than anticipated

* proper

* nova

* and it keeps on going

* aaaa

* fix

* inhands

* are we done yet

* sqndjoqssdfqedf

* yeah I'm out of ideas for commit titles

* chips trash item

* polish

* slip crash

* plural

code/game/machinery/vending.dm

@@ -2258,7 +2258,7 @@ var/global/num_vending_terminals = 1
 		/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 8,
 		/obj/item/clothing/suit/chef/classic = 2,
 		/obj/item/trash/bowl = 20,
-		/obj/item/trash/plate/clean = 20,
+		/obj/item/trash/plate/clean/stack = 5,
 		/obj/item/weapon/reagent_containers/food/condiment/peppermill = 5,
 		/obj/item/weapon/reagent_containers/food/condiment/saltshaker	= 5,
 		/obj/item/weapon/reagent_containers/food/condiment/vinegar = 5,

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -49,6 +49,23 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "pepper"
 
+/obj/effect/decal/cleanable/crumbs
+	name = "crumbs"
+	desc = "some food remains"
+	gender = PLURAL
+	density = 0
+	anchored = 1
+	reagent = NUTRIMENT
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "crumbs"
+	plane = OBJ_PLANE
+	layer = TABLE_LAYER+0.1
+
+/obj/effect/decal/cleanable/crumbs/New()
+	..()
+	pixel_x = rand (-4,4) * PIXEL_MULTIPLIER
+	pixel_y = rand (-4,4) * PIXEL_MULTIPLIER
+
 /obj/effect/decal/cleanable/greenglow
 	name = "glowing goo"
 	desc = "Jeez. I hope that's not for lunch."
@@ -253,6 +270,20 @@
 	pixel_x = rand (-3,3) * PIXEL_MULTIPLIER
 	pixel_y = rand (-3,3) * PIXEL_MULTIPLIER
 
+/obj/effect/decal/cleanable/broken_plate
+	name = "broken plate"
+	desc = "Pieces from a broken plate."
+	gender = PLURAL
+	icon = 'icons/obj/trash.dmi'
+	icon_state = "brokenplate"
+	anchored = 0
+	mouse_opacity = 1
+
+/obj/effect/decal/cleanable/broken_plate/New()
+	..()
+	pixel_x = rand (-3,3) * PIXEL_MULTIPLIER
+	pixel_y = rand (-3,3) * PIXEL_MULTIPLIER
+
 /obj/effect/decal/cleanable/soot
 	name = "soot"
 	desc = "One hell of a party..."

code/game/objects/items.dm

@@ -187,6 +187,9 @@
 /obj/item/proc/restock() //used for borg recharging
 	return
 
+/obj/item/proc/SlipDropped(var/mob/living/user, var/slip_dir, var/slipperiness = TURF_WET_WATER)
+	return
+
 /obj/item/projectile_check()
 	return PROJREACT_OBJS
 

code/game/objects/items/trash.dm

@@ -4,6 +4,7 @@
 //Added by Jack Rost
 /obj/item/trash
 	icon = 'icons/obj/trash.dmi'
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/trash.dmi', "right_hand" = 'icons/mob/in-hand/right/trash.dmi')
 	w_class = W_CLASS_TINY
 	desc = "This is rubbish."
 	w_type=NOT_RECYCLABLE

code/modules/food/customizables.dm

@@ -17,6 +17,21 @@
 			to_chat(user, "<span class='warning'>Sorry, no recursive food.</span>")
 			return
 		var/obj/F = new/obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich(get_turf(src),I) //boy ain't this a mouthful
+		F.pixel_x = pixel_x
+		F.pixel_y = pixel_y
+		F.attackby(I, user, params)
+		qdel(src)
+	else
+		return ..()
+
+/obj/item/weapon/reagent_containers/food/snacks/breadslice/nova/attackby(obj/item/I,mob/user,params)
+	if(istype(I,/obj/item/weapon/reagent_containers/food/snacks))
+		if(!recursiveFood && istype(I, /obj/item/weapon/reagent_containers/food/snacks/customizable))
+			to_chat(user, "<span class='warning'>Sorry, no recursive food.</span>")
+			return
+		var/obj/F = new/obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich/nova(get_turf(src),I) //welp nevermind that
+		F.pixel_x = pixel_x
+		F.pixel_y = pixel_y
 		F.attackby(I, user, params)
 		qdel(src)
 	else
@@ -28,6 +43,8 @@
 			to_chat(user, "<span class='warning'>Sorry, no recursive food.</span>")
 			return
 		var/obj/F = new/obj/item/weapon/reagent_containers/food/snacks/customizable/burger(get_turf(src),I)
+		F.pixel_x = pixel_x
+		F.pixel_y = pixel_y
 		F.attackby(I, user, params)
 		qdel(src)
 	else
@@ -39,6 +56,8 @@
 			to_chat(user, "<span class='warning'>Sorry, no recursive food.</span>")
 			return
 		var/obj/F = new/obj/item/weapon/reagent_containers/food/snacks/customizable/pizza(get_turf(src),I)
+		F.pixel_x = pixel_x
+		F.pixel_y = pixel_y
 		F.attackby(I, user, params)
 		qdel(src)
 	else
@@ -50,6 +69,8 @@
 			to_chat(user, "<span class='warning'>Sorry, no recursive food.</span>")
 			return
 		var/obj/F = new/obj/item/weapon/reagent_containers/food/snacks/customizable/pasta(get_turf(src),I)
+		F.pixel_x = pixel_x
+		F.pixel_y = pixel_y
 		F.attackby(I, user, params)
 		qdel(src)
 	else
@@ -60,32 +81,215 @@
 
 /obj/item/trash/plate
 	name = "plate"
+	desc = "Someone ate something on it."
 	icon_state = "plate"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/trash.dmi', "right_hand" = 'icons/mob/in-hand/right/trash.dmi')
+	item_state = "plate1"
+	throwforce = 5
 	var/clean = FALSE
+	var/list/plates = list() // If the plates are stacked, they come here
+	var/new_stack = 0 // allows mappers to create plate stacks
+	var/trash_color = null
 
 /obj/item/trash/plate/clean
 	icon_state = "cleanplate"
 	desc = "Clean enough to eat on, probably."
 	clean = TRUE
 
+/obj/item/trash/plate/clean/stack
+	name = "plates"
+	new_stack = 9 // 10 plates total
+
+/obj/item/trash/plate/New(turf/loc)
+	..()
+	for (var/i = 1 to new_stack)
+		var/obj/item/trash/plate/P = new (src)
+		P.clean = clean
+		P.update_icon()
+		plates += P
+	update_icon()
+
 /obj/item/trash/plate/update_icon()
+	overlays.len = 0
 	if(clean)
+		desc = "Clean enough to eat on, probably."
 		icon_state = "cleanplate"
+	else
+		desc = "Someone ate something on it."
+		if (trash_color)
+			icon_state = "cleanplate"
+			var/image/I = image(icon, src, "plate-remains")
+			I.color = trash_color
+			overlays += I
 		else
 			icon_state = "plate"
+	var/offset_y = 2
+	name = "plate"
+	gender = NEUTER
+	for (var/obj/item/trash/plate/plate in plates)
+		name = "plates"
+		gender = PLURAL
+		var/image/I = image(plate.icon, src, plate.icon_state)
+		I.pixel_y = offset_y
+		overlays += I
+		offset_y += 2
+	switch(plates.len)
+		if (0,1)
+			item_state = "plate1"
+		if (2,3)
+			item_state = "plate2"
+		if (4,5)
+			item_state = "plate3"
+		if (6,7)
+			item_state = "plate4"
+		if (8,9)
+			item_state = "plate5"
+	if (iscarbon(loc))
+		var/mob/living/carbon/M = loc
+		M.update_inv_hands()
+
+/obj/item/trash/plate/SlipDropped(var/mob/living/user, var/slip_dir, var/slipperiness = TURF_WET_WATER)
+	if (!user)
+		return
+	if (!slip_dir)
+		slip_dir = user.dir
+	var/turf/T = get_turf(src)
+	if (user.drop_item(src, T))
+		to_chat(user, "<span class='danger'>You drop \the [src] as you tumble.</span>")
+		var/distance = 1
+		if (slipperiness == TURF_WET_LUBE)
+			distance = 6
+		for (var/i = 1 to distance)
+			T = get_step(T,slip_dir)
+		throw_at(T,throw_range,throw_speed)
+	else
+		to_chat(user, "<span class='notice'>You somehow hold onto \the [src] as you fall.</span>")
+
+/obj/item/trash/plate/proc/pick_a_plate(var/mob/user)
+	if (plates.len > 0)
+		var/obj/item/trash/plate/plate = plates[plates.len]
+		plates -= plate
+
+		user.put_in_hands(plate)
+		to_chat(user, "<span class='warning'>You remove the topmost plate from the stack.</span>")
+		plate.update_icon()
+		update_icon()
+
+
+/obj/item/trash/plate/throw_impact(atom/hit_atom)
+	..()
+	for (var/obj/item/trash/plate/P in plates)
+		plates -= P
+		if(prob(70))
+			playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 75, 1)
+			new/obj/effect/decal/cleanable/broken_plate(loc)
+			visible_message("<span class='warning'>\The [src.name] [(plates.len > 0)?"have":"has"] been smashed.</span>","<span class='warning'>You hear a crashing sound.</span>")
+			qdel(P)
+		else
+			P.forceMove(loc)
+			P.pixel_x = rand (-3,3) * PIXEL_MULTIPLIER
+			P.pixel_y = rand (-3,3) * PIXEL_MULTIPLIER
+
+	if(prob(70))
+		playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 75, 1)
+		new/obj/effect/decal/cleanable/broken_plate(loc)
+		visible_message("<span class='warning'>\The [src.name] has been smashed.</span>","<span class='warning'>You hear a crashing sound.</span>")
+		qdel(src)
+	else
+		update_icon()
+
+
+/obj/item/trash/plate/attack_hand(var/mob/user)
+	if(plates.len > 0)
+		if(user.get_inactive_hand() != src)
+			..()
+			return
+
+		pick_a_plate(user)
+		return
+	..()
+
+/obj/item/trash/plate/MouseDropFrom(over_object, src_location, var/turf/over_location, src_control, over_control, params)
+	if (plates.len > 0)
+		if (over_object != usr)
+			return
+		var/mob/living/carbon/C = usr
+		if (!istype(C))
+			return
+		if(C.incapacitated() || C.lying || !Adjacent(C))
+			return
+
+		pick_a_plate(C)
+
+/obj/item/trash/plate/AltClick()
+	if (plates.len > 0)
+		var/mob/living/carbon/C = usr
+		if (!istype(C))
+			return
+		if(C.incapacitated() || C.lying || !Adjacent(C))
+			return
+
+		pick_a_plate(C)
 
 /obj/item/trash/plate/attackby(obj/item/I,mob/user,params)
-	if(istype(I,/obj/item/weapon/soap))
-		visible_message("<span class='notice'>[user] cleans \the [src] with \the [I]. </span>")
+	if( istype(I, /obj/item/trash/plate) )
+		var/obj/item/trash/plate/plate = I
+		// Make a list of all plates to be added
+		var/list/platestoadd = list()
+		platestoadd += plate
+		for(var/obj/item/trash/plate/i in plate.plates)
+			platestoadd += i
+
+		if( (plates.len+1) + platestoadd.len <= 10 )
+			if(user.drop_item(I, src))
+				plate.plates = list()
+				plates.Add(platestoadd)
+				plate.update_icon()
+				update_icon()
+				to_chat(user, "<span class='notice'>You stack another plate on top.</span>")
+		else
+			to_chat(user, "<span class='warning'>The stack is too high!</span>")
+		return TRUE
+
+	if(istype(I,/obj/item/weapon/soap)) // We can clean them all at once for convenience
+		if (plates.len > 0)
+			for (var/obj/item/trash/plate/plate in plates)
+				plate.clean = TRUE
+				plate.update_icon()
+			visible_message("<span class='notice'>[user] cleans the stack of plates with \the [I]. </span>","<span class='notice'>You clean the stack of plates with \the [I]. </span>")
+		else
+			visible_message("<span class='notice'>[user] cleans the plate with \the [I]. </span>","<span class='notice'>You clean the plate with \the [I]. </span>")
 		clean = TRUE
+		clean_blood()// removes diseases and stuff as well
 		update_icon()
 		return TRUE
+
 	if(istype(I,/obj/item/weapon/reagent_containers/food/snacks))
 		if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/customizable/fullycustom)) //no platestacking even with recursive food, for now
 			to_chat(user, "<span class='warning'>That's already got a plate!</span>")
 			return
-		var/obj/F = new/obj/item/weapon/reagent_containers/food/snacks/customizable/fullycustom(get_turf(src),I)
+
+		var/obj/item/F = new/obj/item/weapon/reagent_containers/food/snacks/customizable/fullycustom(get_turf(src),I)
+
+		if (virus2?.len)
+			for (var/ID in virus2)
+				var/datum/disease2/disease/D = virus2[ID]
+				F.infect_disease2(D,1, "added to a sandwhich",0)
 		F.attackby(I, user, params)
+		if (istype(F))
+			if (I.item_state)
+				F.item_state = I.item_state
+			else
+				F.item_state = I.icon_state
+		if (plates.len > 0)
+			user.put_in_hands(F)
+			var/obj/item/trash/plate/plate = plates[plates.len]
+			plates -= plate
+			qdel(plate)
+			update_icon()
+		else
+			F.pixel_x = pixel_x
+			F.pixel_y = pixel_y
 			qdel(src)
 	else
 		return ..()
@@ -138,13 +342,18 @@
 	var/image/topping
 	var/image/filling
 
-/obj/item/weapon/reagent_containers/food/snacks/customizable/New(loc,ingredient)
+/obj/item/weapon/reagent_containers/food/snacks/customizable/New(loc,var/obj/item/ingredient)
 	. = ..()
 	topping = image(icon,,"[initial(icon_state)]_top")
 	filling = image(icon,,"[initial(icon_state)]_filling")
-	src.reagents.add_reagent(NUTRIMENT,3)
-	src.updateName()
-	return
+	reagents.add_reagent(NUTRIMENT,3)
+	if (ingredient)
+		if (ingredient.virus2?.len)
+			for (var/ID in ingredient.virus2)
+				var/datum/disease2/disease/D = ingredient.virus2[ID]
+				infect_disease2(D,1, "added to a custom food item",0)
+		virus2 = virus_copylist(ingredient.virus2)
+	updateName()
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params)
 	if(istype(I,/obj/item/weapon/reagent_containers/food/snacks))
@@ -177,6 +386,8 @@
 			src.overlays += src.filling
 		else
 			src.overlays += generateFilling(S, params)
+			if(fullyCustom)
+				icon_state = S.plate_icon
 		if(src.addTop)
 			src.drawTopping()
 
@@ -188,10 +399,10 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable/proc/generateFilling(var/obj/item/weapon/reagent_containers/food/snacks/S, params)
 	var/image/I
-	if(src.fullyCustom)
-		var/icon/C = getFlatIcon(S, S.dir, 0)
-		I = image(C)
-		I.pixel_y = 12 * PIXEL_MULTIPLIER-empty_Y_space(C)
+	if(fullyCustom)
+		I = image(S.icon,src,S.icon_state)
+		I.appearance = S.appearance
+		I.pixel_y = 12 * PIXEL_MULTIPLIER - empty_Y_space(icon(S.icon,S.icon_state)) + S.plate_offset_y
 	else
 		I = src.filling
 		if(istype(S) && S.filling_color != "#FFFFFF")
@@ -202,7 +413,7 @@
 			I.pixel_y = src.ingredients.len * 2 * PIXEL_MULTIPLIER
 		else
 			src.overlays.len = 0
-	if(src.fullyCustom || src.stackIngredients)
+	if(fullyCustom || stackIngredients)
 		var/clicked_x = text2num(params2list(params)["icon-x"])
 		if (isnull(clicked_x))
 			I.pixel_x = 0
@@ -216,6 +427,7 @@
 			I.pixel_x = 1 * PIXEL_MULTIPLIER
 		else
 			I.pixel_x = 2 * PIXEL_MULTIPLIER
+
 	return I
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable/proc/updateName()
@@ -224,16 +436,19 @@
 	for(var/obj/item/S in src.ingredients)
 		if(i == 1)
 			new_name += "[S.name]"
+			if (fullyCustom)
+				desc = S.desc
 		else if(i == src.ingredients.len)
 			new_name += " and [S.name]"
 		else
 			new_name += ", [S.name]"
 		i++
+	if (!fullyCustom)
 		new_name = "[new_name] [initial(src.name)]"
 	if(length(new_name) >= 150)
-		src.name = "something yummy"
+		name = "something yummy"
 	else
-		src.name = new_name
+		name = new_name
 	return new_name
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable/Destroy()
@@ -249,12 +464,26 @@
 	stackIngredients = 1
 	addTop = 0
 
+/obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich/nova
+	icon_state = "c_sandwich_nova"
+	plate_icon = "novacustom"
+
+
+/obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich/nova/New(loc,ingredient)
+	. = ..()
+	reagents.add_reagent(HELL_RAMEN, 0.6)
+	reagents.add_reagent(NOVAFLOUR, 0.2)
+
 /obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich/attackby(obj/item/I,mob/user)
 	if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/breadslice) && !addTop)
 		I.reagents.trans_to(src,I.reagents.total_volume)
 		qdel(I)
 		addTop = 1
 		src.drawTopping()
+		if (I.virus2?.len)
+			for (var/ID in I.virus2)
+				var/datum/disease2/disease/D = I.virus2[ID]
+				infect_disease2(D,1, "added to a sandwhich",0)
 	else
 		..()
 
@@ -273,7 +502,7 @@
 // Misc Subtypes ///////////////////////////////////////////////
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable/fullycustom
-	name = "on a plate"
+	name = "something on a plate"
 	desc = "A unique dish."
 	icon_state = "fullycustom"
 	fullyCustom = 1 //how the fuck do you forget to add this?
@@ -309,6 +538,7 @@
 	trash = /obj/item/trash/plate
 	bitesize = 2
 	ingMax = 0
+	plate_offset_y = -5
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable/cook/pie
 	name = "pie"

code/modules/mob/living/carbon/carbon.dm

@@ -547,6 +547,9 @@
 	if ((CheckSlip(slip_on_walking, overlay_type, slip_on_magbooties)) != TRUE)
 		return 0
 
+	for(var/obj/item/I in held_items)
+		I.SlipDropped(src,dir,overlay_type) // can be set to trigger specific behaviours when items are dropped by slipping
+
 	if(..())
 		playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
 		return 1

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

@@ -30,6 +30,9 @@
 	var/deepfried = 0 //Is the food deep-fried ?
 	var/filling_color = "#FFFFFF" //What color would a filling of this item be ?
 	var/edible_by_utensil = TRUE //Can this snack be put on a fork?
+	var/plate_offset_y = 0
+	var/plate_icon = "fullycustom"
+	var/visible_condiments = list()
 	volume = 100 //Double amount snacks can carry, so that food prepared from excellent items can contain all the nutriments it deserves
 
 /obj/item/weapon/reagent_containers/food/snacks/Destroy()
@@ -72,6 +75,15 @@
 			//Otherwise, put the trash item in the same place where the food item was
 			if(ispath(trash, /obj/item))
 				var/obj/item/TrashItem = new trash(old_loc)
+				if (virus2?.len)
+					for (var/ID in virus2)
+						var/datum/disease2/disease/D = virus2[ID]
+						TrashItem.infect_disease2(D, 1, "(leftovers on a plate)",1)
+
+				if (istype(TrashItem, /obj/item/trash/plate))
+					var/obj/item/trash/plate/P = TrashItem
+					P.trash_color = filling_color != "#FFFFFF" ? filling_color : AverageColor(getFlatIcon(src, dir, 0), 1, 1)
+					P.update_icon()
 
 				if(ismob(old_loc))
 					var/mob/M = old_loc
@@ -197,6 +209,9 @@
 	if(reagentreference)	//Handle ingestion of any reagents (Note : Foods always have reagents)
 		if(sounds)
 			playsound(eater, 'sound/items/eatfood.ogg', rand(10,50), 1)
+		if (prob(35))
+			var/obj/effect/decal/cleanable/crumbs/C = new (get_turf(eater))
+			C.color = filling_color != "#FFFFFF" ? filling_color : AverageColor(getFlatIcon(src, dir, 0), 1, 1)
 		if (virus2?.len)
 			for (var/ID in virus2)
 				var/datum/disease2/disease/D = virus2[ID]
@@ -489,6 +504,8 @@
 	desc = "Probably too incredible for mortal men to fully enjoy."
 	icon_state = "aesirsalad"
 	trash = /obj/item/trash/snack_bowl
+	filling_color = "#005369"
+
 /obj/item/weapon/reagent_containers/food/snacks/aesirsalad/New()
 	..()
 	eatverb = pick("crunch", "devour", "nibble", "gnaw", "gobble", "chomp")
@@ -502,6 +519,7 @@
 	icon_state = "candy"
 	trash = /obj/item/trash/candy
 	food_flags = FOOD_SWEET
+	filling_color = "#603000"
 
 /obj/item/weapon/reagent_containers/food/snacks/candy/New()
 	..()
@@ -1197,7 +1215,6 @@
 	desc = "That's all you can say!"
 	icon_state = "omelette"
 	food_flags = FOOD_ANIMAL //made from eggs
-	trash = /obj/item/trash/plate
 
 /obj/item/weapon/reagent_containers/food/snacks/omelette/New()
 	..()
@@ -1288,7 +1305,6 @@
 	name = "berry clafoutis"
 	desc = "No black birds, this is a good sign."
 	icon_state = "berryclafoutis"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_SWEET
 
 /obj/item/weapon/reagent_containers/food/snacks/berryclafoutis/New()
@@ -1312,7 +1328,6 @@
 	name = "Eggplant Parmigiana"
 	desc = "The only good recipe for eggplant."
 	icon_state = "eggplantparm"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_ANIMAL | FOOD_LACTOSE
 
 /obj/item/weapon/reagent_containers/food/snacks/eggplantparm/New()
@@ -1488,7 +1503,6 @@
 	name = "Cuban Carp"
 	desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
 	icon_state = "cubancarp"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_MEAT
 
 /obj/item/weapon/reagent_containers/food/snacks/cubancarp/New()
@@ -1504,6 +1518,7 @@
 	icon_state = "popcorn"
 	trash = /obj/item/trash/popcorn
 	var/unpopped = 0
+	filling_color = "#EFE5D4"
 
 /obj/item/weapon/reagent_containers/food/snacks/popcorn/New()
 		..()
@@ -1525,6 +1540,7 @@
 	desc = "Beef jerky made from the finest space cows."
 	trash = /obj/item/trash/sosjerky
 	food_flags = FOOD_MEAT
+	filling_color = "#733000"
 
 /obj/item/weapon/reagent_containers/food/snacks/sosjerky/New()
 	..()
@@ -1593,6 +1609,7 @@
 	desc = "Bite sized cheesie snacks that will honk all over your mouth."
 	trash = /obj/item/trash/cheesie
 	food_flags = FOOD_ANIMAL | FOOD_LACTOSE //cheese
+	filling_color = "#FFCC33"
 
 /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers/New()
 	..()
@@ -1617,6 +1634,7 @@
 	icon_state = "danbar"
 	trash = /obj/item/trash/discountchocolate
 	food_flags = FOOD_SWEET
+	filling_color = "#7D390D"
 
 /obj/item/weapon/reagent_containers/food/snacks/discountchocolate/New()
 	..()
@@ -1650,6 +1668,7 @@
 	desc = "Ranch or cool ranch?"
 	icon_state = "donitos"
 	trash = /obj/item/trash/donitos
+	filling_color = "#C06800"
 
 /obj/item/weapon/reagent_containers/food/snacks/donitos/New()
 	..()
@@ -1671,6 +1690,7 @@
 	desc = "For only the most MLG hardcore robust spessmen."
 	icon_state = "danitos"
 	trash = /obj/item/trash/danitos
+	filling_color = "#FF9933"
 
 /obj/item/weapon/reagent_containers/food/snacks/danitos/New()
 	..()
@@ -1707,6 +1727,7 @@
 	desc = "Totally baked."
 	icon_state = "loadedbakedpotato"
 	food_flags = FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -5
 
 /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato/New()
 	..()
@@ -1717,7 +1738,7 @@
 	name = "Space Fries"
 	desc = "AKA: French Fries, Freedom Fries, etc."
 	icon_state = "fries"
-	trash = /obj/item/trash/plate
+	plate_offset_y = -2
 
 /obj/item/weapon/reagent_containers/food/snacks/fries/New()
 	..()
@@ -1732,7 +1753,6 @@
 	name = "Soy Dope"
 	desc = "Dope from a soy."
 	icon_state = "soydope"
-	trash = /obj/item/trash/plate
 
 /obj/item/weapon/reagent_containers/food/snacks/soydope/New()
 	..()
@@ -1818,8 +1838,8 @@
 	name = "Cheesy Fries"
 	desc = "Fries. Covered in cheese. Duh."
 	icon_state = "cheesyfries"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_ANIMAL | FOOD_LACTOSE //cheese
+	plate_offset_y = -3
 
 /obj/item/weapon/reagent_containers/food/snacks/cheesyfries/New()
 	..()
@@ -1850,8 +1870,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/meatsteak
 	name = "Meat steak"
 	desc = "A piece of hot spicy meat."
-	icon_state = "meatstake"
-	trash = /obj/item/trash/plate
+	icon_state = "meatsteak"
 	food_flags = FOOD_MEAT
 
 /obj/item/weapon/reagent_containers/food/snacks/meatsteak/New()
@@ -1864,8 +1883,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/meatsteak/synth
 	name = "Synthmeat steak"
 	desc = "It's still a delicious steak, but it has no soul."
-	icon_state = "meatstake"
-	trash = /obj/item/trash/plate
+	icon_state = "meatsteak"
 	food_flags = FOOD_MEAT
 
 /obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff
@@ -2226,7 +2244,6 @@
 	name = "Sandwich"
 	desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud."
 	icon_state = "sandwich"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_MEAT | FOOD_LACTOSE | FOOD_ANIMAL
 
 /obj/item/weapon/reagent_containers/food/snacks/sandwich/New()
@@ -2238,7 +2255,6 @@
 	name = "Toasted Sandwich"
 	desc = "Now if you only had a pepper bar."
 	icon_state = "toastedsandwich"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_MEAT | FOOD_LACTOSE | FOOD_ANIMAL //This is made from a sandwich, which contains meat!
 
 /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich/New()
@@ -2251,7 +2267,6 @@
 	name = "Grilled Cheese Sandwich"
 	desc = "Goes great with Tomato soup!"
 	icon_state = "toastedsandwich"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_MEAT | FOOD_LACTOSE | FOOD_ANIMAL
 
 /obj/item/weapon/reagent_containers/food/snacks/grilledcheese/New()
@@ -2290,6 +2305,7 @@
 	desc = "A nice and warm stew. Healthy and strong."
 	icon_state = "stew"
 	food_flags = FOOD_LIQUID | FOOD_MEAT
+	filling_color = "#EB7C28"
 
 /obj/item/weapon/reagent_containers/food/snacks/stew/New()
 	..()
@@ -2304,7 +2320,6 @@
 	name = "Jellied Toast"
 	desc = "A slice of bread covered with delicious jam."
 	icon_state = "jellytoast"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_SWEET
 
 /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/New()
@@ -2328,7 +2343,6 @@
 	name = "avocado toast"
 	desc = "Salted avocado on a slice of toast. For the authentic experience, make sure you pay an exorbitant price for it."
 	icon_state = "avocadotoast"
-	trash = /obj/item/trash/plate
 
 /obj/item/weapon/reagent_containers/food/snacks/avocadotoast/New()
 	..()
@@ -2383,7 +2397,6 @@
 	name = "Stewed Soy Meat"
 	desc = "Even non-vegetarians will LOVE this!"
 	icon_state = "stewedsoymeat"
-	trash = /obj/item/trash/plate
 
 /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat/New()
 	..()
@@ -2404,7 +2417,6 @@
 	name = "Boiled Spaghetti"
 	desc = "A plain dish of noodles, this sucks."
 	icon_state = "spaghettiboiled"
-	trash = /obj/item/trash/plate
 	restraint_resist_time = 1 SECONDS
 	toolsounds = list('sound/weapons/cablecuff.ogg')
 
@@ -2461,7 +2473,6 @@
 	name = "Spaghetti"
 	desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!"
 	icon_state = "pastatomato"
-	trash = /obj/item/trash/plate
 
 /obj/item/weapon/reagent_containers/food/snacks/pastatomato/New()
 	..()
@@ -2473,7 +2484,6 @@
 	name = "copypasta"
 	desc = "You probably shouldn't try this, you always hear people talking about how bad it is..."
 	icon_state = "copypasta"
-	trash = /obj/item/trash/plate
 
 /obj/item/weapon/reagent_containers/food/snacks/copypasta/New()
 	..()
@@ -2485,7 +2495,6 @@
 	name = "Spaghetti & Meatballs"
 	desc = "Now thats a nic'e meatball!"
 	icon_state = "meatballspaghetti"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_MEAT
 
 /obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti/New()
@@ -2497,7 +2506,6 @@
 	name = "Crab Spaghetti"
 	desc = "Goes well with Coffee."
 	icon_state = "crabspaghetti"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_MEAT
 
 /obj/item/weapon/reagent_containers/food/snacks/crabspaghetti/New()
@@ -2529,7 +2537,7 @@
 	name = "Carrot Fries"
 	desc = "Tasty fries from fresh carrots."
 	icon_state = "carrotfries"
-	trash = /obj/item/trash/plate
+	plate_offset_y = -2
 
 /obj/item/weapon/reagent_containers/food/snacks/carrotfries/New()
 	..()
@@ -2627,7 +2635,6 @@
 	name = "Jelly Sandwich"
 	desc = "You wish you had some peanut butter to go with this..."
 	icon_state = "jellysandwich"
-	trash = /obj/item/trash/plate
 
 /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/New()
 	..()
@@ -2714,6 +2721,7 @@
 	icon_state = "beetsoup"
 	trash = /obj/item/trash/snack_bowl
 	food_flags = FOOD_LIQUID
+	filling_color = "#E00000"
 
 /obj/item/weapon/reagent_containers/food/snacks/beetsoup/New()
 	..()
@@ -2727,6 +2735,7 @@
 	desc = "A tasty salad with apples on top."
 	icon_state = "herbsalad"
 	trash = /obj/item/trash/snack_bowl
+	filling_color = "#306900"
 
 /obj/item/weapon/reagent_containers/food/snacks/herbsalad/New()
 	..()
@@ -2739,6 +2748,7 @@
 	icon_state = "validsalad"
 	trash = /obj/item/trash/snack_bowl
 	food_flags = FOOD_MEAT
+	filling_color = "#306900"
 
 /obj/item/weapon/reagent_containers/food/snacks/validsalad/New()
 	..()
@@ -2750,7 +2760,6 @@
 	name = "golden apple streusel tart"
 	desc = "A tasty dessert that won't make it through a metal detector."
 	icon_state = "gappletart"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
 
 /obj/item/weapon/reagent_containers/food/snacks/appletart/New()
@@ -2783,9 +2792,9 @@
 	name = "meatbread slice"
 	desc = "A slice of delicious meatbread."
 	icon_state = "meatbreadslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_MEAT | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -4
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread
 	name = "xenomeatbread loaf"
@@ -2806,9 +2815,9 @@
 	name = "xenomeatbread slice"
 	desc = "A slice of delicious meatbread. Extra Heretical."
 	icon_state = "xenobreadslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_MEAT | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -4
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/spidermeatbread
 	name = "spider meat loaf"
@@ -2829,9 +2838,9 @@
 	name = "spider meat bread slice"
 	desc = "A slice of meatloaf made from an animal that most likely still wants you dead."
 	icon_state = "xenobreadslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_MEAT | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -5
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread/synth
 	name = "synthmeatbread loaf"
@@ -2852,7 +2861,6 @@
 	name = "synthmeatbread slice"
 	desc = "A slice of synthetic meatbread."
 	icon_state = "meatbreadslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_MEAT
 
@@ -2876,7 +2884,6 @@
 	name = "banana-nut bread slice"
 	desc = "A slice of delicious banana bread."
 	icon_state = "bananabreadslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_ANIMAL | FOOD_LACTOSE
 
@@ -2899,8 +2906,8 @@
 	name = "tofubread slice"
 	desc = "A slice of delicious tofubread."
 	icon_state = "tofubreadslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
+	plate_offset_y = -5
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake
 	name = "carrot cake"
@@ -2922,9 +2929,9 @@
 	name = "carrot cake slice"
 	desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
 	icon_state = "carrotcake_slice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -1
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake
 	name = "brain cake"
@@ -2946,7 +2953,6 @@
 	name = "brain cake slice"
 	desc = "Lemme tell you something about prions. THEY'RE DELICIOUS."
 	icon_state = "braincakeslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_MEAT | FOOD_ANIMAL | FOOD_LACTOSE //meat, milk, eggs
 
@@ -2969,7 +2975,6 @@
 	name = "cheese cake slice"
 	desc = "A slice of pure cheestisfaction."
 	icon_state = "cheesecake_slice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
 
@@ -2991,9 +2996,9 @@
 	name = "vanilla cake slice"
 	desc = "Just a slice of cake, it is enough for everyone."
 	icon_state = "plaincake_slice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -1
 
 /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice/full/New()
 	..()
@@ -3018,9 +3023,9 @@
 	name = "orange cake slice"
 	desc = "Just a slice of cake, it is enough for everyone."
 	icon_state = "orangecake_slice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -1
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake
 	name = "lime cake"
@@ -3040,9 +3045,9 @@
 	name = "lime cake slice"
 	desc = "Just a slice of cake, it is enough for everyone."
 	icon_state = "limecake_slice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -1
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake
 	name = "lemon cake"
@@ -3062,9 +3067,9 @@
 	name = "lemon cake slice"
 	desc = "Just a slice of cake, enough for everyone."
 	icon_state = "lemoncake_slice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -1
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake
 	name = "chocolate cake"
@@ -3084,9 +3089,9 @@
 	name = "chocolate cake slice"
 	desc = "Just a slice of cake, enough for everyone."
 	icon_state = "chocolatecake_slice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -1
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/caramelcake
 	name = "caramel cake"
@@ -3107,9 +3112,9 @@
 	name = "caramel cake slice"
 	desc = "Just a slice of cake, enough for everyone."
 	icon_state = "caramelcake_slice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -1
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel
 	name = "cheese wheel"
@@ -3155,9 +3160,9 @@
 	name = "Birthday Cake slice"
 	desc = "A slice of your birthday!"
 	icon_state = "birthdaycakeslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_icon = "bluecustom"
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread
 	name = "Bread"
@@ -3189,13 +3194,13 @@
 	name = "Bread slice"
 	desc = "A slice of home."
 	icon_state = "breadslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/breadslice/nova
 	name = "Nova bread slice"
 	desc = "A slice of Sol."
 	icon_state = "novabreadslice"
+	plate_icon = "novacustom"
 
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread
@@ -3217,9 +3222,9 @@
 	name = "Cream Cheese Bread slice"
 	desc = "A slice of yum!"
 	icon_state = "creamcheesebreadslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_LACTOSE
+	plate_offset_y = -5
 
 /obj/item/weapon/reagent_containers/food/snacks/watermelonslice
 	name = "Watermelon Slice"
@@ -3246,9 +3251,9 @@
 	name = "Apple Cake slice"
 	desc = "A slice of heavenly cake."
 	icon_state = "applecakeslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -1
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie //You can't throw this pie
 	name = "Pumpkin Pie"
@@ -3269,7 +3274,6 @@
 	name = "Pumpkin Pie slice"
 	desc = "A slice of pumpkin pie, with whipped cream on top. Perfection."
 	icon_state = "pumpkinpieslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
 
@@ -3666,6 +3670,7 @@
 	name = "tin of beans"
 	desc = "Musical fruit in a slightly less musical container."
 	icon_state = "beans"
+	filling_color = "#982424"
 
 /obj/item/weapon/reagent_containers/food/snacks/beans/New()
 	..()
@@ -3756,8 +3761,8 @@
 	name = "boiled spider leg"
 	desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
 	icon_state = "spiderlegcooked"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_MEAT
+	plate_offset_y = -5
 
 /obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg/New()
 	..()
@@ -3780,7 +3785,6 @@
 	name = "green eggs and ham"
 	desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?"
 	icon_state = "spidereggsham"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_MEAT | FOOD_ANIMAL
 
 /obj/item/weapon/reagent_containers/food/snacks/spidereggsham/New()
@@ -3989,9 +3993,9 @@
 	name = "\improper Buche de Noel slice"
 	desc = "A slice of winter magic."
 	icon_state = "buche_slice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -2
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey
 	name = "turkey"
@@ -4016,9 +4020,9 @@
 	name = "turkey drumstick"
 	desc = "Guaranteed vox-free!"
 	icon_state = "turkey_drumstick"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_MEAT
+	plate_offset_y = -1
 
 //////////////////CHICKEN//////////////////
 
@@ -4029,6 +4033,7 @@
 	item_state = "kfc_bucket"
 	trash = /obj/item/trash/chicken_bucket
 	food_flags = FOOD_MEAT
+	filling_color = "#D8753E"
 
 /obj/item/weapon/reagent_containers/food/snacks/chicken_nuggets/New()
 	..()
@@ -4040,6 +4045,7 @@
 	desc = "We can fry further..."
 	icon_state = "chicken_drumstick"
 	food_flags = FOOD_MEAT
+	filling_color = "#D8753E"
 
 /obj/item/weapon/reagent_containers/food/snacks/chicken_drumstick/New()
 	..()
@@ -4113,6 +4119,7 @@
 	desc = "Commander Riker's What-The-Crisps."
 	icon_state = "chips"
 	trash = /obj/item/trash/chips
+	filling_color = "#FFB700"
 
 /obj/item/weapon/reagent_containers/food/snacks/chips/New()
 	..()
@@ -4206,7 +4213,6 @@
 	name = "Giga Puddi"
 	desc = "A large crème caramel."
 	icon_state = "gigapuddi"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_ANIMAL | FOOD_LACTOSE | FOOD_SWEET
 
 /obj/item/weapon/reagent_containers/food/snacks/gigapuddi/New()
@@ -4226,8 +4232,8 @@
 	name = "Flan"
 	desc = "A small crème caramel."
 	icon_state = "flan"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = 1
 
 /obj/item/weapon/reagent_containers/food/snacks/flan/New()
 	..()
@@ -4239,8 +4245,8 @@
 	name = "Honey Flan"
 	desc = "The systematic slavery of an entire society of insects, elegantly sized to fit in your mouth."
 	icon_state = "honeyflan"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = 1
 
 /obj/item/weapon/reagent_containers/food/snacks/honeyflan/New()
 	..()
@@ -4254,8 +4260,8 @@
 	name = "omelette rice"
 	desc = "Just like your Japanese animes!"
 	icon_state = "omurice"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_ANIMAL //egg
+	plate_offset_y = 1
 
 /obj/item/weapon/reagent_containers/food/snacks/omurice/New()
 	..()
@@ -4264,6 +4270,7 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/omurice/heart
 	icon_state = "omuriceheart"
+	plate_offset_y = -1
 
 /obj/item/weapon/reagent_containers/food/snacks/omurice/face
 	icon_state = "omuriceface"
@@ -4330,9 +4337,9 @@
 	name = "chocolate-cherry cake slice"
 	desc = "Just a slice of cake, enough for everyone."
 	icon_state = "chococherrycake_slice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -1
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/fruitcake
 	name = "fruitcake"
@@ -4354,9 +4361,9 @@
 	desc = "Delicious and fruity."
 	icon = 'icons/obj/food_seasonal.dmi'
 	icon_state = "fruitcakeslice"
-	trash = /obj/item/trash/plate
 	bitesize = 2
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = -1
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/fruitcake/christmascake
 	name = "\improper Christmas cake"
@@ -4576,6 +4583,7 @@
 	name = "Coleslaw"
 	desc = "You fought the 'slaw, and the 'slaw won."
 	icon_state = "coleslaw"
+	plate_offset_y = 1
 
 /obj/item/weapon/reagent_containers/food/snacks/coleslaw/New()
 	..()
@@ -4598,8 +4606,8 @@
 	name = "cinnamon roll"
 	desc = "Sweet and spicy!"
 	icon_state = "cinnamon_roll"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_SWEET | FOOD_ANIMAL | FOOD_LACTOSE
+	plate_offset_y = 1
 
 /obj/item/weapon/reagent_containers/food/snacks/cinnamonroll/New()
 	..()
@@ -5135,6 +5143,7 @@
 	desc = "The culinary culmination of all Vox culture: throwing all their plants into the same pot."
 	icon_state = "voxstew"
 	bitesize = 4
+	filling_color = "#89441E"
 
 /obj/item/weapon/reagent_containers/food/snacks/voxstew/New()
 	..()
@@ -5309,6 +5318,7 @@
 	icon_state = "starrynight"
 	bitesize = 2
 	trash = /obj/item/trash/snack_bowl
+	filling_color = "#245900"
 
 /obj/item/weapon/reagent_containers/food/snacks/starrynightsalad/New()
 	..()
@@ -5321,6 +5331,7 @@
 	icon_state = "fruitsalad"
 	bitesize = 2
 	trash = /obj/item/trash/snack_bowl
+	filling_color = "#FF3366"
 
 /obj/item/weapon/reagent_containers/food/snacks/fruitsalad/New()
 	..()
@@ -5429,6 +5440,7 @@
 	icon_state = "quiche"
 	food_flags = FOOD_ANIMAL | FOOD_LACTOSE
 	bitesize = 4
+	plate_offset_y = -1
 
 /obj/item/weapon/reagent_containers/food/snacks/quiche/New()
 	..()
@@ -5451,6 +5463,7 @@
 	desc = "The national dish of Tonga, a country that you had previously never heard about."
 	icon_state = "poissoncru"
 	bitesize = 2
+	plate_offset_y = 1
 
 /obj/item/weapon/reagent_containers/food/snacks/poissoncru/New()
 	..()
@@ -5589,8 +5602,8 @@
 	name = "poutine"
 	desc = "Fries, cheese & gravy. Your arteries will hate you for this."
 	icon_state = "poutine"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_ANIMAL | FOOD_LACTOSE //cheese
+	plate_offset_y = -3
 
 /obj/item/weapon/reagent_containers/food/snacks/poutine/New()
 	..()
@@ -5633,8 +5646,8 @@
 	name = "maple syrup poutine"
 	desc = "French fries lathered with Canadian maple syrup and cheese curds. Delightful, eh?"
 	icon_state = "poutinesyrup"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_ANIMAL | FOOD_LACTOSE //cheese
+	plate_offset_y = -3
 
 /obj/item/weapon/reagent_containers/food/snacks/poutinesyrup/New()
 	..()
@@ -5646,7 +5659,6 @@
 	name = "bleach kipper"
 	desc = "Baby blue and very fishy."
 	icon_state = "bleachkipper"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_MEAT
 	volume = 1
 	bitesize = 2
@@ -5729,7 +5741,6 @@ var/global/list/bomb_like_items = list(/obj/item/device/transfer_valve, /obj/ite
 	desc = "A piece of freshly-grilled salmon meat."
 	icon = 'icons/obj/seafood.dmi'
 	icon_state = "salmonsteak"
-	trash = /obj/item/trash/plate
 	filling_color = "#7A3D11"
 	food_flags = FOOD_MEAT
 
@@ -6207,8 +6218,8 @@ obj/item/weapon/reagent_containers/food/snacks/butterfingers_r
 	name = "butter fingers"
 	desc = "It's a microwaved hand slathered in butter!"
 	icon_state = "butterfingers_r"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_ANIMAL | FOOD_MEAT
+	plate_offset_y = -3
 
 /obj/item/weapon/reagent_containers/food/snacks/butterfingers_r/New()
 	..()
@@ -6218,8 +6229,8 @@ obj/item/weapon/reagent_containers/food/snacks/butterfingers_l
 	name = "butter fingers"
 	desc = "It's a microwaved hand slathered in butter!"
 	icon_state = "butterfingers_l"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_ANIMAL | FOOD_MEAT
+	plate_offset_y = -3
 
 /obj/item/weapon/reagent_containers/food/snacks/butterfingers_l/New()
 	..()
@@ -6400,7 +6411,6 @@ obj/item/weapon/reagent_containers/food/snacks/butterfingers_l
 	desc = "A classic treat of childhood."
 	icon = 'icons/obj/food2.dmi'
 	icon_state = "pbj"
-	trash = /obj/item/trash/plate
 
 /obj/item/weapon/reagent_containers/food/snacks/pbj/New()
 	..()
@@ -6514,8 +6524,8 @@ obj/item/weapon/reagent_containers/food/snacks/butterfingers_l
 	desc = "A steamed lobster, served with a side of melted butter and a slice of lemon. You can still feel its hatred"
 	icon = 'icons/obj/food.dmi'
 	icon_state = "lobster_steamed_deluxe"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_MEAT
+	trash = /obj/item/trash/plate
 
 /obj/item/weapon/reagent_containers/food/snacks/steamed_lobster_deluxe/New()
 	..()
@@ -6529,8 +6539,8 @@ obj/item/weapon/reagent_containers/food/snacks/butterfingers_l
 	desc = "A steamed lobster, served with no sides. Eat up, you barbarian."
 	icon = 'icons/obj/food.dmi'
 	icon_state = "lobster_steamed_simple"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_MEAT
+	trash = /obj/item/trash/plate
 
 
 /obj/item/weapon/reagent_containers/food/snacks/steamed_lobster_simple/New()
@@ -6570,8 +6580,8 @@ obj/item/weapon/reagent_containers/food/snacks/butterfingers_l
 	desc = "A Lobster tail, drenched in butter and a bit of lemon, you monster."
 	icon = 'icons/obj/food.dmi'
 	icon_state = "lobster_tail_baked"
-	trash = /obj/item/trash/plate
 	food_flags = FOOD_MEAT
+	trash = /obj/item/trash/plate
 
 /obj/item/weapon/reagent_containers/food/snacks/lobster_tail_baked/New()
 	..()
@@ -6858,7 +6868,6 @@ obj/item/weapon/reagent_containers/food/snacks/butterfingers_l
 /obj/item/weapon/reagent_containers/food/snacks/dionaroast
 	name = "Diona Roast"
 	desc = "A slow cooked diona nymph. Very nutritious, and surprisingly tasty!"
-	trash = /obj/item/trash/plate
 	icon_state = "dionaroast"
 	food_flags = FOOD_MEAT