diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index 12ffe91cef5..b69c1114bd6 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -1,7 +1,7 @@ /obj/item/pizza_bomb name = "pizza box" desc = "A box suited for pizzas." - icon = 'icons/obj/food/food.dmi' + icon = 'icons/obj/food/pizza.dmi' icon_state = "pizzabox1" var/timer = 10 //Adjustable timer var/timer_set = 0 diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 02f743d7478..33987737fa2 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -57,7 +57,7 @@ name = "sandwich" desc = "A sandwich! A timeless classic." icon_state = "breadslice" - baseicon = "sandwich" + baseicon = "sandwichcustom" basename = "sandwich" toptype = new /obj/item/reagent_containers/food/snacks/breadslice() @@ -66,9 +66,10 @@ /obj/item/reagent_containers/food/snacks/customizable name = "sandwich" desc = "A sandwich! A timeless classic." - icon_state = "breadslice" - var/baseicon = "sandwich" - var/basename = "sandwich" + icon = 'icons/obj/food/custom.dmi' + icon_state = "sandwichcustom" + var/baseicon = "sandwichcustom" + var/basename = "sandwichcustom" bitesize = 4 var/top = 1 //Do we have a top? var/obj/item/toptype @@ -94,7 +95,7 @@ desc = "Noodles. With stuff. Delicious." icon_state = "pasta_bot" baseicon = "pasta_bot" - basename = "spaghetti" + basename = "pasta" add_overlays = 0 top = 0 @@ -312,7 +313,7 @@ name = "burger bun" desc = "A bun for a burger. Delicious." icon_state = "burger" - baseicon = "burger" + baseicon = "burgercustom" basename = "burger" toptype = new /obj/item/reagent_containers/food/snacks/bun() diff --git a/code/modules/food_and_drinks/food/foods/pasta.dm b/code/modules/food_and_drinks/food/foods/pasta.dm index f0bde14fd5b..1b9c253ab53 100644 --- a/code/modules/food_and_drinks/food/foods/pasta.dm +++ b/code/modules/food_and_drinks/food/foods/pasta.dm @@ -6,6 +6,7 @@ /obj/item/reagent_containers/food/snacks/spaghetti name = "Spaghetti" desc = "A bundle of raw spaghetti." + icon = 'icons/obj/food/pasta.dmi' icon_state = "spaghetti" filling_color = "#EDDD00" list_reagents = list("nutriment" = 1, "vitamin" = 1) @@ -13,6 +14,7 @@ /obj/item/reagent_containers/food/snacks/macaroni name = "Macaroni twists" desc = "These are little twists of raw macaroni." + icon = 'icons/obj/food/pasta.dmi' icon_state = "macaroni" filling_color = "#EDDD00" list_reagents = list("nutriment" = 1, "vitamin" = 1) @@ -25,6 +27,7 @@ /obj/item/reagent_containers/food/snacks/boiledspaghetti name = "Boiled Spaghetti" desc = "A plain dish of noodles, this sucks." + icon = 'icons/obj/food/pasta.dmi' icon_state = "spaghettiboiled" trash = /obj/item/trash/plate filling_color = "#FCEE81" @@ -33,6 +36,7 @@ /obj/item/reagent_containers/food/snacks/pastatomato name = "spaghetti" desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!" + icon = 'icons/obj/food/pasta.dmi' icon_state = "pastatomato" trash = /obj/item/trash/plate filling_color = "#DE4545" @@ -42,6 +46,7 @@ /obj/item/reagent_containers/food/snacks/meatballspaghetti name = "spaghetti & Meatballs" desc = "Now thats a nic'e meatball!" + icon = 'icons/obj/food/pasta.dmi' icon_state = "meatballspaghetti" trash = /obj/item/trash/plate filling_color = "#DE4545" @@ -50,6 +55,7 @@ /obj/item/reagent_containers/food/snacks/spesslaw name = "Spesslaw" desc = "A lawyer's favourite." + icon = 'icons/obj/food/pasta.dmi' icon_state = "spesslaw" filling_color = "#DE4545" list_reagents = list("nutriment" = 8, "synaptizine" = 10, "vitamin" = 6) @@ -58,6 +64,7 @@ name = "Macaroni cheese" desc = "One of the most comforting foods in the world. Apparently." trash = /obj/item/trash/snack_bowl + icon = 'icons/obj/food/pasta.dmi' icon_state = "macncheese" filling_color = "#ffe45d" list_reagents = list("nutriment" = 5, "vitamin" = 2, "cheese" = 4) diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm index 7dd3845e551..c34d8943da7 100644 --- a/code/modules/food_and_drinks/food/foods/pizza.dm +++ b/code/modules/food_and_drinks/food/foods/pizza.dm @@ -4,6 +4,7 @@ ////////////////////// /obj/item/reagent_containers/food/snacks/sliceable/pizza + icon = 'icons/obj/food/pizza.dmi' slices_num = 6 filling_color = "#BAA14C" @@ -12,12 +13,12 @@ desc = "The golden standard of pizzas." icon_state = "pizzamargherita" slice_path = /obj/item/reagent_containers/food/snacks/margheritaslice - slices_num = 6 list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5) /obj/item/reagent_containers/food/snacks/margheritaslice name = "Margherita slice" desc = "A slice of the classic pizza." + icon = 'icons/obj/food/pizza.dmi' icon_state = "pizzamargheritaslice" filling_color = "#BAA14C" list_reagents = list("nutriment" = 5) @@ -27,12 +28,12 @@ desc = "A pizza with meat topping." icon_state = "meatpizza" slice_path = /obj/item/reagent_containers/food/snacks/meatpizzaslice - slices_num = 6 list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8) /obj/item/reagent_containers/food/snacks/meatpizzaslice name = "Meatpizza slice" desc = "A slice of a meaty pizza." + icon = 'icons/obj/food/pizza.dmi' icon_state = "meatpizzaslice" filling_color = "#BAA14C" @@ -41,12 +42,12 @@ desc = "Very special pizza." icon_state = "mushroompizza" slice_path = /obj/item/reagent_containers/food/snacks/mushroompizzaslice - slices_num = 6 list_reagents = list("plantmatter" = 30, "vitamin" = 5) /obj/item/reagent_containers/food/snacks/mushroompizzaslice name = "Mushroompizza slice" desc = "Maybe it is the last slice of pizza in your life." + icon = 'icons/obj/food/pizza.dmi' icon_state = "mushroompizzaslice" filling_color = "#BAA14C" @@ -55,12 +56,12 @@ desc = "No one of Tomato Sapiens were harmed during making this pizza." icon_state = "vegetablepizza" slice_path = /obj/item/reagent_containers/food/snacks/vegetablepizzaslice - slices_num = 6 list_reagents = list("plantmatter" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5) /obj/item/reagent_containers/food/snacks/vegetablepizzaslice name = "Vegetable pizza slice" desc = "A slice of the most green pizza of all pizzas not containing green ingredients." + icon = 'icons/obj/food/pizza.dmi' icon_state = "vegetablepizzaslice" filling_color = "#BAA14C" @@ -69,12 +70,12 @@ desc = "Love it or hate it, this pizza divides opinions. Complete with juicy pineapple." icon_state = "hawaiianpizza" //NEEDED slice_path = /obj/item/reagent_containers/food/snacks/hawaiianpizzaslice - slices_num = 6 list_reagents = list("protein" = 15, "tomatojuice" = 6, "plantmatter" = 20, "pineapplejuice" = 6, "vitamin" = 5) /obj/item/reagent_containers/food/snacks/hawaiianpizzaslice name = "Hawaiian pizza slice" desc = "A slice of polarising pizza." + icon = 'icons/obj/food/pizza.dmi' icon_state = "hawaiianpizzaslice" filling_color = "#e5b437" @@ -89,6 +90,7 @@ /obj/item/reagent_containers/food/snacks/macpizzaslice name = "Macaroni cheese pizza slice" desc = "A delicious slice of pizza topped with macaroni cheese... wait, what the hell? Who would do this?!" + icon = 'icons/obj/food/pizza.dmi' icon_state = "macpizzaslice" filling_color = "#ffe45d" @@ -100,7 +102,7 @@ /obj/item/pizzabox name = "pizza box" desc = "A box suited for pizzas." - icon = 'icons/obj/food/food.dmi' + icon = 'icons/obj/food/pizza.dmi' icon_state = "pizzabox1" var/open = 0 // Is the box open? @@ -133,7 +135,7 @@ else icon_state = "pizzabox_open" if(pizza) - var/image/pizzaimg = image("food/food.dmi", icon_state = pizza.icon_state) + var/image/pizzaimg = image("food/pizza.dmi", icon_state = pizza.icon_state) pizzaimg.pixel_y = -3 overlays += pizzaimg @@ -149,7 +151,7 @@ if(boxtag != "") doimgtag = 1 if(doimgtag) - var/image/tagimg = image("food/food.dmi", icon_state = "pizzabox_tag") + var/image/tagimg = image("food/pizza.dmi", icon_state = "pizzabox_tag") tagimg.pixel_y = boxes.len * 3 overlays += tagimg icon_state = "pizzabox[boxes.len+1]" diff --git a/icons/obj/food/custom.dmi b/icons/obj/food/custom.dmi new file mode 100644 index 00000000000..42d28790790 Binary files /dev/null and b/icons/obj/food/custom.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 3a0ec216714..487b36d3e97 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/pasta.dmi b/icons/obj/food/pasta.dmi new file mode 100644 index 00000000000..0179c3f5cc7 Binary files /dev/null and b/icons/obj/food/pasta.dmi differ diff --git a/icons/obj/food/pizza.dmi b/icons/obj/food/pizza.dmi new file mode 100644 index 00000000000..c26e792f2a0 Binary files /dev/null and b/icons/obj/food/pizza.dmi differ