diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm index 23921a43608..7565b5b30a7 100644 --- a/code/modules/food_and_drinks/food/foods/bread.dm +++ b/code/modules/food_and_drinks/food/foods/bread.dm @@ -17,7 +17,6 @@ name = "meatbread slice" desc = "A slice of delicious meatbread." icon_state = "meatbreadslice" - trash = /obj/item/trash/plate filling_color = "#FF7575" /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread @@ -34,7 +33,6 @@ name = "xenomeatbread slice" desc = "A slice of delicious meatbread. Extra Heretical." icon_state = "xenobreadslice" - trash = /obj/item/trash/plate filling_color = "#8AFF75" /obj/item/reagent_containers/food/snacks/sliceable/spidermeatbread @@ -49,8 +47,7 @@ /obj/item/reagent_containers/food/snacks/spidermeatbreadslice 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 + icon_state = "spidermeatslice" list_reagents = list("toxin" = 2) /obj/item/reagent_containers/food/snacks/sliceable/bananabread @@ -67,7 +64,6 @@ name = "banana-nut bread slice" desc = "A slice of delicious banana bread." icon_state = "bananabreadslice" - trash = /obj/item/trash/plate filling_color = "#EDE5AD" tastes = list("bread" = 10) @@ -85,7 +81,6 @@ name = "tofubread slice" desc = "A slice of delicious tofubread." icon_state = "tofubreadslice" - trash = /obj/item/trash/plate filling_color = "#F7FFE0" /obj/item/reagent_containers/food/snacks/sliceable/bread @@ -102,7 +97,6 @@ name = "bread slice" desc = "A slice of home." icon_state = "breadslice" - trash = /obj/item/trash/plate filling_color = "#D27332" list_reagents = list("nutriment" = 2, "bread" = 5) tastes = list("bread" = 10) @@ -121,7 +115,6 @@ name = "cream cheese bread slice" desc = "A slice of yum!" icon_state = "creamcheesebreadslice" - trash = /obj/item/trash/plate filling_color = "#FFF896" list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("bread" = 10, "cheese" = 10) @@ -140,7 +133,6 @@ name = "banarnarbread slice" desc = "A slice of delicious mah'weyh pleggh at e'ntrath!" icon_state = "banarnarbreadslice" - trash = /obj/item/trash/plate filling_color = "#6F0000" list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("heresy" = 10, "banana" = 10) @@ -200,7 +192,6 @@ name = "jellied toast" desc = "A slice of bread covered with delicious jam." icon_state = "jellytoast" - trash = /obj/item/trash/plate filling_color = "#B572AB" bitesize = 3 tastes = list("toast" = 1, "jelly" = 1) diff --git a/code/modules/food_and_drinks/food/foods/sandwiches.dm b/code/modules/food_and_drinks/food/foods/sandwiches.dm index 216e56af9f9..f0e49305175 100644 --- a/code/modules/food_and_drinks/food/foods/sandwiches.dm +++ b/code/modules/food_and_drinks/food/foods/sandwiches.dm @@ -165,7 +165,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 filling_color = "#D9BE29" list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1) @@ -174,7 +173,6 @@ name = "toasted sandwich" desc = "Now if you only had a pepper bar." icon_state = "toastedsandwich" - trash = /obj/item/trash/plate filling_color = "#D9BE29" list_reagents = list("nutriment" = 6, "carbon" = 2) tastes = list("toast" = 1) @@ -183,7 +181,6 @@ name = "grilled cheese sandwich" desc = "Goes great with tomato soup!" icon_state = "toastedsandwich" - trash = /obj/item/trash/plate filling_color = "#D9BE29" list_reagents = list("nutriment" = 7, "vitamin" = 1) //why make a regualr sandwhich when you can make grilled cheese, with this nutriment value? tastes = list("toast" = 1, "grilled cheese" = 1) @@ -192,7 +189,6 @@ name = "jelly sandwich" desc = "You wish you had some peanut butter to go with this..." icon_state = "jellysandwich" - trash = /obj/item/trash/plate filling_color = "#9E3A78" bitesize = 3 tastes = list("toast" = 1, "jelly" = 1) diff --git a/icons/obj/food/custom.dmi b/icons/obj/food/custom.dmi index 42d28790790..fba3b4e6e68 100644 Binary files a/icons/obj/food/custom.dmi and b/icons/obj/food/custom.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index dbbfeeb5db0..6159735faf8 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ