diff --git a/aurorastation.dme b/aurorastation.dme index 1f9d7c32321..1d1f4fbf93a 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2153,6 +2153,7 @@ #include "code\modules\cooking\recipes\recipes_ingredients.dm" #include "code\modules\cooking\recipes\recipes_meat.dm" #include "code\modules\cooking\recipes\recipes_mexican.dm" +#include "code\modules\cooking\recipes\recipes_microwave.dm" #include "code\modules\cooking\recipes\recipes_mix.dm" #include "code\modules\cooking\recipes\recipes_noodles.dm" #include "code\modules\cooking\recipes\recipes_pastries.dm" @@ -3522,6 +3523,7 @@ #include "code\modules\reagents\reagent_containers\food\snacks\ingredients.dm" #include "code\modules\reagents\reagent_containers\food\snacks\meat.dm" #include "code\modules\reagents\reagent_containers\food\snacks\mexican.dm" +#include "code\modules\reagents\reagent_containers\food\snacks\microwave.dm" #include "code\modules\reagents\reagent_containers\food\snacks\mix.dm" #include "code\modules\reagents\reagent_containers\food\snacks\noodles.dm" #include "code\modules\reagents\reagent_containers\food\snacks\pastries.dm" diff --git a/code/game/machinery/vending/booze.dm b/code/game/machinery/vending/booze.dm index b0e9bef4c6c..7f77caace60 100644 --- a/code/game/machinery/vending/booze.dm +++ b/code/game/machinery/vending/booze.dm @@ -29,6 +29,7 @@ /obj/item/reagent_containers/food/drinks/bottle/skrellwineylpha = 2, /obj/item/reagent_containers/food/drinks/bottle/drambuie = 4, /obj/item/reagent_containers/food/drinks/bottle/melonliquor = 2, + /obj/item/reagent_containers/food/drinks/bottle/limoncello = 2, /obj/item/reagent_containers/food/drinks/bottle/gin = 5, /obj/item/reagent_containers/food/drinks/bottle/vermouth = 5, /obj/item/reagent_containers/food/drinks/bottle/chartreusegreen = 5, @@ -165,6 +166,7 @@ /obj/item/reagent_containers/food/drinks/bottle/fernet = 1, /obj/item/reagent_containers/food/drinks/bottle/drambuie = 2, /obj/item/reagent_containers/food/drinks/bottle/melonliquor = 1, + /obj/item/reagent_containers/food/drinks/bottle/limoncello = 1, /obj/item/reagent_containers/food/drinks/bottle/chartreusegreen = 2, /obj/item/reagent_containers/food/drinks/bottle/absinthe = 1, /obj/item/reagent_containers/food/drinks/bottle/kahlua = 1, diff --git a/code/game/machinery/vending/food.dm b/code/game/machinery/vending/food.dm index a47c1e37018..bbe0d33eda2 100644 --- a/code/game/machinery/vending/food.dm +++ b/code/game/machinery/vending/food.dm @@ -71,3 +71,49 @@ /obj/item/reagent_containers/food/snacks/aoyama_ramen = 8.25 ) light_color = COLOR_GUNMETAL + +/obj/machinery/vending/quick_e_meals + name = "\improper quick-e-meals vendor" + desc = "Shelves of affordable microwave-ready meals by Orion and Getmore just waiting to be deployed into the battle against hunger!" + icon_state = "quick_e" + icon_screen = "quick_e-screen" + icon_vend = "quick_e-vend" + icon_deny = "quick_e-deny" + light_mask = "quick_e-lightmask" + + product_slogans = ";Good eats at low prices!;Quick meals in a variety of flavors!" + idle_power_usage = 211 + light_color = COLOR_BABY_BLUE + products = list( + /obj/item/storage/box/fancy/quick_microwave_pizza = 3, + /obj/item/storage/box/fancy/quick_microwave_pizza/olive = 3, + /obj/item/storage/box/fancy/quick_microwave_pizza/pepperoni = 3, + /obj/item/storage/box/fancy/quick_microwave_pizza/district6 = 3, + /obj/item/reagent_containers/food/snacks/packaged_microwave_mac_and_cheeze = 3, + /obj/item/reagent_containers/food/snacks/packaged_microwave_fiery_mac_and_cheeze = 3, + /obj/item/storage/box/fancy/packaged_burger = 3, + /obj/item/reagent_containers/food/snacks/quick_curry = 3, + /obj/item/reagent_containers/food/snacks/hv_dinner = 3, + /obj/item/storage/box/fancy/toptarts_strawberry = 3, + /obj/item/storage/box/fancy/toptarts_chocolate_peanutbutter = 3, + /obj/item/storage/box/fancy/toptarts_blueberry = 3, + /obj/item/storage/box/donkpockets = 3 + ) + premium = list( + /obj/item/storage/box/fancy/packaged_mossburger = 2 + ) + prices = list( + /obj/item/storage/box/fancy/quick_microwave_pizza = 9.00, + /obj/item/storage/box/fancy/quick_microwave_pizza/olive = 10.00, + /obj/item/storage/box/fancy/quick_microwave_pizza/pepperoni = 10.00, + /obj/item/storage/box/fancy/quick_microwave_pizza/district6 = 10.00, + /obj/item/reagent_containers/food/snacks/packaged_microwave_mac_and_cheeze = 3.00, + /obj/item/reagent_containers/food/snacks/packaged_microwave_fiery_mac_and_cheeze = 3.25, + /obj/item/storage/box/fancy/packaged_burger = 9.00, + /obj/item/reagent_containers/food/snacks/quick_curry = 9.00, + /obj/item/reagent_containers/food/snacks/hv_dinner = 9.00, + /obj/item/storage/box/fancy/toptarts_strawberry = 5.00, + /obj/item/storage/box/fancy/toptarts_chocolate_peanutbutter = 5.00, + /obj/item/storage/box/fancy/toptarts_blueberry = 5.00, + /obj/item/storage/box/donkpockets = 11.00 + ) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index a8e6c153cfd..e7dd99220ff 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -308,9 +308,9 @@ pickup_sound = 'sound/items/pickup/glass.ogg' /obj/item/trash/shakshouka - name = "empty shakshouka pan" + name = "large messy pan" icon_state = "shakshouka" - desc = "It looks like the murder scene... Of a delicious Shakshouka. Trash or recycle." + desc = "It looks like the murder scene... of a delicious, saucy dish. Trash or recycle." drop_sound = 'sound/items/drop/bottle.ogg' pickup_sound = 'sound/items/pickup/bottle.ogg' @@ -413,3 +413,16 @@ icon_state = "bowl_brown" drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' + +/obj/item/trash/microwave_package + name = "empty microwave food package" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "microwave_trash" + +/obj/item/trash/mac_cheeze + name = "empty mac and cheeze container" + icon_state = "mac_trash" + +/obj/item/trash/mac_fiery + name = "empty fiery hot mac and cheeze container" + icon_state = "mac_trash_fiery" diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 2f8b05d42c4..60981d61511 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -22,6 +22,7 @@ var/icon_overlays = TRUE // whether the icon uses the update_icon() or a unique one. var/open_sound = null // if you want to play a special sound if you open it for the first time var/open_message = null // same as above, but a message + var/opened_icon_state = null //for items that have unique base icons but look the same opened, such as all the various microwave pizzas. foldable = null // most of this stuff isn't foldable by default, e.g. cig packets and vial boxes contained_sprite = TRUE @@ -72,7 +73,7 @@ if(icon_overlays) //whether it uses the overlays/uses its own version. src.icon_state = "[src.icon_type][src.storage_type][contents.len - itemremoved]" else - icon_state = "[initial(icon_state)][src.opened]" + icon_state = opened_icon_state ? opened_icon_state : "[initial(icon_state)][src.opened]" ..() else ClearOverlays() @@ -909,3 +910,73 @@ else if(contents.len <= 10) item_state = "heartbox_open" icon_state = "heartbox_full" + +/obj/item/storage/box/fancy/food/sliced_bread + name = "sliced bread" + desc = "The best thing since... ever, basically! This store-bought bread might not have the heart and soul of a fresh loaf of bread baked at home, but it's... uh... Well, at least it's supsiciously square!" + icon = 'icons/obj/item/reagent_containers/food/bread.dmi' + icon_state = "slicedbread_full" + icon_type = "bread slice" + use_sound = 'sound/items/storage/wrapper.ogg' + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' + storage_type = "bag" + storage_slots = 8 + max_storage_space = 8 + can_hold = list( + /obj/item/reagent_containers/food/snacks/breadslice/filled + ) + starts_with = list(/obj/item/reagent_containers/food/snacks/breadslice/filled = 8) + opened = TRUE + closable = FALSE + throwforce = 1 + +/obj/item/storage/box/fancy/food/sliced_bread/update_icon() + . = ..() + var/storage_space_used + for(var/obj/item/I in contents) + storage_space_used += I.get_storage_cost() + + if(!storage_space_used) + icon_state = "slicedbread_empty" + else if(storage_space_used <= 0.25 * max_storage_space) + icon_state = "slicedbread_last" + else if(storage_space_used <= 0.5 * max_storage_space) + icon_state = "slicedbread_half" + else if(storage_space_used <= 0.875 * max_storage_space) + icon_state = "slicedbread_nearfull" + else if(storage_space_used <= max_storage_space) + icon_state = "slicedbread_full" + + +/obj/item/storage/box/fancy/food/packaged_shrimp + name = "packaged shrimp" + desc = "A package containing raw shrimp, as fresh as packaged shellfish shipped halfway across the universe can be!" + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' + icon_state = "shrimp_pack" + icon_type = "raw shrimp" + use_sound = 'sound/items/storage/wrapper.ogg' + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' + storage_slots = 4 + max_storage_space = 4 + can_hold = list( + /obj/item/reagent_containers/food/snacks/fish/raw_shrimp + ) + starts_with = list(/obj/item/reagent_containers/food/snacks/fish/raw_shrimp = 4) + opened = TRUE + closable = FALSE + throwforce = 1 + +/obj/item/storage/box/fancy/food/packaged_shrimp/update_icon() + . = ..() + var/storage_space_used + for(var/obj/item/I in contents) + storage_space_used += I.get_storage_cost() + + if(!storage_space_used) + icon_state = "shrimp_pack_empty" + else if(storage_space_used <= 0.5 * max_storage_space) + icon_state = "shrimp_pack_half" + else if(storage_space_used <= max_storage_space) + icon_state = "shrimp_pack" diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index a466a4f9a7c..0df0c4bd8ee 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -541,6 +541,7 @@ /obj/item/reagent_containers/food/condiment/syrup_simple = 1, /obj/item/reagent_containers/food/condiment/vanilla = 1, /obj/item/reagent_containers/food/condiment/rice = 1, + /obj/item/storage/box/fancy/food/sliced_bread = 1, /obj/item/reagent_containers/food/condiment/cocoa = 1 ) diff --git a/code/modules/cargo/items/hospitality.dm b/code/modules/cargo/items/hospitality.dm index 32ba053c720..0513cd61d11 100644 --- a/code/modules/cargo/items/hospitality.dm +++ b/code/modules/cargo/items/hospitality.dm @@ -194,6 +194,34 @@ groupable = TRUE spawn_amount = 1 +/singleton/cargo_item/sliced_bread + category = "hospitality" + name = "sliced bread" + supplier = "getmore" + description = "Factory-grade, machine-baked, machine-sliced, machine-bagged bread. Just like mama used to make." + price = 8 + items = list( + /obj/item/storage/box/fancy/food/sliced_bread + ) + access = 0 + container_type = "freezer" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/packaged_shrimp + category = "hospitality" + name = "packaged shrimp" + supplier = "getmore" + description = "Frozen shrimp available at reasonable prices for any place in the Spur that can't get them fresh! Each pack contains 4 servings' worth of shrimp." + price = 90 + items = list( + /obj/item/storage/box/fancy/food/packaged_shrimp + ) + access = 0 + container_type = "freezer" + groupable = TRUE + spawn_amount = 1 + /singleton/cargo_item/peppermill category = "hospitality" name = "pepper mill" diff --git a/code/modules/cooking/recipes/cultural/recipes_human.dm b/code/modules/cooking/recipes/cultural/recipes_human.dm index 7d633b7aba9..baf5092b91b 100644 --- a/code/modules/cooking/recipes/cultural/recipes_human.dm +++ b/code/modules/cooking/recipes/cultural/recipes_human.dm @@ -209,6 +209,18 @@ reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/bowl/mozzarella_sticks +/singleton/recipe/jambalaya + appliance = SKILLET + fruit = list("tomato" = 1) + reagents = list(/singleton/reagent/spacespice = 3, /singleton/reagent/nutriment/rice = 5) + items = list( + /obj/item/reagent_containers/food/snacks/meat/chicken, + /obj/item/reagent_containers/food/snacks/fish/raw_shrimp, + /obj/item/reagent_containers/food/snacks/sausage + ) + result = /obj/item/reagent_containers/food/snacks/jambalaya + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + // Konyang /singleton/recipe/mossbowl @@ -293,6 +305,7 @@ reagents = list(/singleton/reagent/water = 10) items = list(/obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/soup/pozole + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product /singleton/recipe/elotes appliance = OVEN | GRILL diff --git a/code/modules/cooking/recipes/cultural/recipes_unathi.dm b/code/modules/cooking/recipes/cultural/recipes_unathi.dm index 879adbaa9a5..2740b0ff779 100644 --- a/code/modules/cooking/recipes/cultural/recipes_unathi.dm +++ b/code/modules/cooking/recipes/cultural/recipes_unathi.dm @@ -224,3 +224,13 @@ /obj/item/reagent_containers/food/snacks/fish ) result = /obj/item/reagent_containers/food/snacks/orszi + +/singleton/recipe/sth_fish + appliance = SKILLET | SAUCEPAN + fruit = list("S'th berry" = 1, "seaweed" = 1) + reagents = list(/singleton/reagent/drink/milk/cream = 5, /singleton/reagent/spacespice = 2) + items = list( + /obj/item/reagent_containers/food/snacks/fish + ) + result = /obj/item/reagent_containers/food/snacks/sth_fish + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/cooking/recipes/recipes_breads.dm b/code/modules/cooking/recipes/recipes_breads.dm index a92fc90fda2..0a81c45710b 100644 --- a/code/modules/cooking/recipes/recipes_breads.dm +++ b/code/modules/cooking/recipes/recipes_breads.dm @@ -172,6 +172,22 @@ ) result = /obj/item/reagent_containers/food/snacks/stuffing +/singleton/recipe/stuffing_alt + appliance = OVEN | MICROWAVE + reagents = list(/singleton/reagent/water = 5, /singleton/reagent/sodiumchloride = 1, /singleton/reagent/blackpepper = 1) + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice + ) + result = /obj/item/reagent_containers/food/snacks/stuffing + + /singleton/recipe/angry_bread appliance = OVEN fruit = list("carrot" = 1) @@ -359,7 +375,7 @@ result = /obj/item/reagent_containers/food/snacks/grilled_triple_cheese_crunch_sandwich /singleton/recipe/crab_leg_grilled_cheese_sandwich - appliance = SKILLET | MICROWAVE + appliance = SKILLET items = list( /obj/item/reagent_containers/food/snacks/breadslice, /obj/item/reagent_containers/food/snacks/breadslice, diff --git a/code/modules/cooking/recipes/recipes_fryer.dm b/code/modules/cooking/recipes/recipes_fryer.dm index 65292604a2f..b37f01ed7ba 100644 --- a/code/modules/cooking/recipes/recipes_fryer.dm +++ b/code/modules/cooking/recipes/recipes_fryer.dm @@ -70,7 +70,7 @@ result = /obj/item/reagent_containers/food/snacks/sweet_and_sour /singleton/recipe/wingfangchu - appliance = FRYER | MICROWAVE + appliance = FRYER reagents = list(/singleton/reagent/nutriment/soysauce = 5) items = list( /obj/item/reagent_containers/food/snacks/xenomeat @@ -86,7 +86,7 @@ result = /obj/item/reagent_containers/food/snacks/roefritters /singleton/recipe/fries_olympia_cheesy - appliance = FRYER | MICROWAVE + appliance = FRYER reagents = list(/singleton/reagent/spacespice = 3) fruit = list("potato" = 1) items = list( @@ -96,7 +96,7 @@ result = /obj/item/reagent_containers/food/snacks/fries_olympia_with_cheese /singleton/recipe/fries_olympia_no_cheese - appliance = FRYER | MICROWAVE + appliance = FRYER reagents = list(/singleton/reagent/spacespice = 3) fruit = list("potato" = 1) reagent_mix = RECIPE_REAGENT_REPLACE //So we don't end up with a ton of potato juice @@ -187,7 +187,9 @@ /singleton/recipe/north60squid appliance = FRYER - items = list(/obj/item/reagent_containers/food/snacks/squidmeat = 1) + items = list(/obj/item/reagent_containers/food/snacks/squidmeat = 1, + /obj/item/reagent_containers/food/snacks/fish/raw_shrimp = 1 + ) reagents = list(/singleton/reagent/drink/lemonjuice = 5 , /singleton/reagent/drink/applejuice = 5, /singleton/reagent/nutriment/garlicsauce = 10) coating = /singleton/reagent/nutriment/coating/beerbatter reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product @@ -198,3 +200,13 @@ fruit = list("chickpeas" = 2) result = /obj/item/reagent_containers/food/snacks/falafelballs +/singleton/recipe/pop_shrimp + appliance = FRYER + reagents = list(/singleton/reagent/spacespice = 2) + coating = /singleton/reagent/nutriment/coating/batter + items = list( + /obj/item/reagent_containers/food/snacks/fish/raw_shrimp, + /obj/item/reagent_containers/food/snacks/fish/raw_shrimp + ) + result = /obj/item/reagent_containers/food/snacks/bowl/pop_shrimp_bowl + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product diff --git a/code/modules/cooking/recipes/recipes_meat.dm b/code/modules/cooking/recipes/recipes_meat.dm index df57ca11c4f..a42b5e9d23e 100644 --- a/code/modules/cooking/recipes/recipes_meat.dm +++ b/code/modules/cooking/recipes/recipes_meat.dm @@ -147,3 +147,14 @@ items = list(/obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/steak_tartare reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/meatloaf + appliance = OVEN + fruit = list("onion" = 1) + reagents = list(/singleton/reagent/nutriment/protein/egg = 3, /singleton/reagent/nutriment/ketchup = 5) + items = list( + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/sliceable/meatloaf + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/cooking/recipes/recipes_mexican.dm b/code/modules/cooking/recipes/recipes_mexican.dm index f85feaab1b2..014a3e9f2c7 100644 --- a/code/modules/cooking/recipes/recipes_mexican.dm +++ b/code/modules/cooking/recipes/recipes_mexican.dm @@ -78,7 +78,7 @@ reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together. /singleton/recipe/hummus - appliance = MIX | MICROWAVE + appliance = MIX reagents = list(/singleton/reagent/nutriment/garlicsauce = 10, /singleton/reagent/spacespice = 2) fruit = list("chickpeas" = 2) result = /obj/item/reagent_containers/food/snacks/dip/hummus diff --git a/code/modules/cooking/recipes/recipes_microwave.dm b/code/modules/cooking/recipes/recipes_microwave.dm new file mode 100644 index 00000000000..46d20ec6d5e --- /dev/null +++ b/code/modules/cooking/recipes/recipes_microwave.dm @@ -0,0 +1,113 @@ +/singleton/recipe/microwave_olive_pizza + appliance = MICROWAVE | OVEN + items = list( + /obj/item/reagent_containers/food/snacks/frozen_microwave_pizza/olive + ) + result = /obj/item/reagent_containers/food/snacks/microwave_pizza/olive + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/microwave_district6_pizza + appliance = MICROWAVE | OVEN + items = list( + /obj/item/reagent_containers/food/snacks/frozen_microwave_pizza/district6 + ) + result = /obj/item/reagent_containers/food/snacks/microwave_pizza/district6 + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/microwave_pepperoni_pizza + appliance = MICROWAVE | OVEN + items = list( + /obj/item/reagent_containers/food/snacks/frozen_microwave_pizza/district6 + ) + result = /obj/item/reagent_containers/food/snacks/microwave_pizza/district6 + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/microwave_pizza_homemade + appliance = MICROWAVE | OVEN + reagents = list(/singleton/reagent/nutriment/ketchup = 10) + items = list( + /obj/item/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + result = /obj/item/reagent_containers/food/snacks/microwave_pizza + +/singleton/recipe/microwave_pizza + appliance = MICROWAVE | OVEN + items = list( + /obj/item/reagent_containers/food/snacks/frozen_microwave_pizza + ) + result = /obj/item/reagent_containers/food/snacks/microwave_pizza + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/instant_mac_and_cheeze + appliance = MICROWAVE + items = list( + /obj/item/reagent_containers/food/snacks/packaged_microwave_mac_and_cheeze + ) + result = /obj/item/reagent_containers/food/snacks/instant_mac + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/instant_fiery_mac_and_cheeze + appliance = MICROWAVE + items = list( + /obj/item/reagent_containers/food/snacks/packaged_microwave_fiery_mac_and_cheeze + ) + result = /obj/item/reagent_containers/food/snacks/instant_mac_fiery + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/microwave_burger + appliance = MICROWAVE | OVEN + items = list( + /obj/item/reagent_containers/food/snacks/frozen_burger + ) + result = /obj/item/reagent_containers/food/snacks/quick_e_burger + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/microwave_mossburger + appliance = MICROWAVE | OVEN + items = list( + /obj/item/reagent_containers/food/snacks/frozen_mossburger + ) + result = /obj/item/reagent_containers/food/snacks/burger/moss/sad + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/microwave_curry + appliance = MICROWAVE + items = list( + /obj/item/reagent_containers/food/snacks/quick_curry + ) + result = /obj/item/reagent_containers/food/snacks/quick_curry_prepared + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/microwave_hv_dinner + appliance = MICROWAVE + items = list( + /obj/item/reagent_containers/food/snacks/hv_dinner + ) + result = /obj/item/reagent_containers/food/snacks/hv_dinner_prepared + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/strawberry_toptart + appliance = MICROWAVE | OVEN + items = list( + /obj/item/reagent_containers/food/snacks/toptart_strawberry_raw + ) + result = /obj/item/reagent_containers/food/snacks/toptart_strawberry + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/chocolate_peanutbutter_toptart + appliance = MICROWAVE | OVEN + items = list( + /obj/item/reagent_containers/food/snacks/toptart_chocolate_peanutbutter_raw + ) + result = /obj/item/reagent_containers/food/snacks/toptart_chocolate_peanutbutter + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/blueberry_toptart + appliance = MICROWAVE | OVEN + items = list( + /obj/item/reagent_containers/food/snacks/toptart_blueberry_raw + ) + result = /obj/item/reagent_containers/food/snacks/toptart_blueberry + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/cooking/recipes/recipes_pastries.dm b/code/modules/cooking/recipes/recipes_pastries.dm index 351d22a185c..8efd702baa0 100644 --- a/code/modules/cooking/recipes/recipes_pastries.dm +++ b/code/modules/cooking/recipes/recipes_pastries.dm @@ -205,6 +205,18 @@ reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/storage/box/fancy/food/cakepopjar +/singleton/recipe/cranberry_orange_rolls + appliance = OVEN + fruit = list("cranberries" = 1, "orange" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/doughslice, + /obj/item/reagent_containers/food/snacks/doughslice, + /obj/item/reagent_containers/food/snacks/doughslice + ) + reagents = list(/singleton/reagent/sugar = 5, /singleton/reagent/drink/milk/cream = 5) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify and replace + result = /obj/item/reagent_containers/food/snacks/sliceable/cranberry_orange_rolls + // Cakes. //============ /singleton/recipe/cake @@ -325,6 +337,12 @@ reagents = list(/singleton/reagent/sugar = 10) result = /obj/item/reagent_containers/food/snacks/cherrypie +/singleton/recipe/pie/cranberry + fruit = list("cranberries" = 1) + reagents = list(/singleton/reagent/sugar = 10) + result = /obj/item/reagent_containers/food/snacks/sliceable/cranberry_pie + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify and replace + /singleton/recipe/pie/amanita fruit = null reagents = list(/singleton/reagent/toxin/amatoxin = 5) diff --git a/code/modules/cooking/recipes/recipes_pizza.dm b/code/modules/cooking/recipes/recipes_pizza.dm index 92b4a40a350..0d76ca6c808 100644 --- a/code/modules/cooking/recipes/recipes_pizza.dm +++ b/code/modules/cooking/recipes/recipes_pizza.dm @@ -104,16 +104,87 @@ ) result = /obj/item/reagent_containers/food/snacks/bacon_flatbread -/singleton/recipe/bacon_flatbreadflatbread - appliance = OVEN | MICROWAVE - fruit = list("tomato" = 2) - items = list( - /obj/item/reagent_containers/food/snacks/flatbread, - /obj/item/reagent_containers/food/snacks/cheesewedge, - /obj/item/reagent_containers/food/snacks/bacon, - /obj/item/reagent_containers/food/snacks/bacon, - /obj/item/reagent_containers/food/snacks/bacon, - /obj/item/reagent_containers/food/snacks/bacon - ) - result = /obj/item/reagent_containers/food/snacks/bacon_flatbread +//Deep Dish +/singleton/recipe/deepdish_margherita + appliance = OVEN + fruit = list("tomato" = 3) + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + reagent_mix = RECIPE_REAGENT_REPLACE // simplify and replace + result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/margherita + +/singleton/recipe/deepdish_mushroompizza + appliance = OVEN + fruit = list("mushroom" = 3, "tomato" = 3) + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + reagent_mix = RECIPE_REAGENT_REPLACE // simplify and replace + result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/mushroom + +/singleton/recipe/deepdish_pepperonipizza + appliance = OVEN + fruit = list("tomato" = 3) + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/pepperoni + ) + reagent_mix = RECIPE_REAGENT_REPLACE // simplify and replace + result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/pepperoni + +/singleton/recipe/deepdish_district6 + appliance = OVEN + fruit = list("tomato" = 3, "dirtberries" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/earthenroot_chopped + ) + reagent_mix = RECIPE_REAGENT_REPLACE // simplify and replace + result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/district6 + +/singleton/recipe/deepdish_mendell + appliance = OVEN + fruit = list("tomato" = 3, "bellpepper" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/fish + ) + reagent_mix = RECIPE_REAGENT_REPLACE // simplify and replace + result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/mendell + +/singleton/recipe/deepdish_seafood + appliance = OVEN + fruit = list("tomato" = 3, "onion" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/fish/raw_shrimp + ) + reagent_mix = RECIPE_REAGENT_REPLACE // simplify and replace + result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/seafood diff --git a/code/modules/cooking/recipes/recipes_soup.dm b/code/modules/cooking/recipes/recipes_soup.dm index 75ecd94bcf3..e8d0427d66a 100644 --- a/code/modules/cooking/recipes/recipes_soup.dm +++ b/code/modules/cooking/recipes/recipes_soup.dm @@ -101,6 +101,20 @@ reagents = list(/singleton/reagent/water = 10) result = /obj/item/reagent_containers/food/snacks/soup/pea +/singleton/recipe/gazpacho + appliance = MIX + reagents = list(/singleton/reagent/water = 10, /singleton/reagent/sodiumchloride = 1, /singleton/reagent/blackpepper = 1) + fruit = list("tomato" = 1, "bellpepper" = 1) //if cucumbers are added to the game please add them to this recipe + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/soup/gazpacho + +/singleton/recipe/pumpkin_soup + appliance = SAUCEPAN | POT | MICROWAVE + fruit = list("pumpkin" = 1) //if cucumbers are added to the game please add them to this recipe + reagents = list(/singleton/reagent/water = 5, /singleton/reagent/drink/milk/cream = 5) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/soup/pumpkin + // Stews /singleton/recipe/stew appliance = POT diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_unathi.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_unathi.dm index 7e179a5e85a..752c1247b23 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_unathi.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_unathi.dm @@ -31,7 +31,7 @@ /singleton/reagent/drink/sthberryjuice name = "S'th Berry Juice" description = "The sweet, delectable juice of the S'th berry, a Moghresian fruit found in the Izweski Heartland" - color = "" + color = "#880029" taste_description = "sweet berry juice" glass_icon_state = "berryjuice" glass_name = "glass of S'th berry juice" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_drinks.dm index 6541dd3aed7..84a6ec455e8 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_drinks.dm @@ -1794,6 +1794,32 @@ glass_desc = "A relatively sweet and fruity 46 proof liquor." glass_center_of_mass = list("x"=16, "y"=5) +/singleton/reagent/alcohol/limoncello + name = "Limoncello" + description = "A lemon liquor beloved in Italy and Assunzione alike." + color = "#ffef16" + strength = 24 + taste_description = "lemon liquor" + + value = 0.15 + + glass_icon_state = "limoncello" + glass_name = "glass of Limoncello" + glass_desc = "A citrusy sweet and sour liquor originating in southern Italy." + +/singleton/reagent/alcohol/bon_bon + name = "Bon Bon" + description = "A citrusy, sweet and sour blast from the past." + color = "#fff891" + strength = 32 + taste_description = "sour candy" + + value = 0.17 + + glass_icon_state = "bonbon" + glass_name = "glass of Bon Bon" + glass_desc = "Candy is dandy but liquor is quicker!" + /singleton/reagent/alcohol/rum name = "Rum" description = "Yohoho and all that." diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 6f03a66d3be..39d21568384 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2176,6 +2176,21 @@ catalysts = list(/singleton/reagent/enzyme = 5) result_amount = 10 +/datum/chemical_reaction/limoncello + name = "Limoncello" + id = "limoncello" + result = /singleton/reagent/alcohol/limoncello + required_reagents = list(/singleton/reagent/drink/lemonjuice = 1, /singleton/reagent/condiment/syrup_simple = 1) + catalysts = list(/singleton/reagent/enzyme = 5) + result_amount = 2 + +/datum/chemical_reaction/bon_bon + name = "Bon Bon" + id = "bonbon" + result = /singleton/reagent/alcohol/bon_bon + required_reagents = list(/singleton/reagent/alcohol/limoncello = 1, /singleton/reagent/drink/lemonjuice = 1, /singleton/reagent/condiment/syrup_vanilla = 1, /singleton/reagent/alcohol/vodka = 3) + result_amount = 6 + /datum/chemical_reaction/melonliquor name = "Melon Liquor" id = "melonliquor" diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index fc15b2c7ee0..77ca5f87f51 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -579,6 +579,14 @@ center_of_mass = list("x"=16, "y"=7) reagents_to_add = list(/singleton/reagent/alcohol/absinthe = 100) +/obj/item/reagent_containers/food/drinks/bottle/limoncello + name = "Limoncello Mediterraneo" + desc = "A lemon liquor popular in Italy and in Assunzione." + desc_extended = DRINK_FLUFF_SILVERPORT + icon_state = "limoncello" + center_of_mass = list("x"=16, "y"=6) + reagents_to_add = list(/singleton/reagent/alcohol/limoncello = 100) + /obj/item/reagent_containers/food/drinks/bottle/melonliquor name = "Emeraldine melon liquor" desc = "A bottle of 46 proof Emeraldine Melon Liquor, made from a Silversun-grown variety of melon. Sweet and light, and surprisingly cheap considering the manufacturer." diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm index 61c959d604a..6a16ce3febf 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm @@ -296,6 +296,53 @@ icon_state = "mozzarella_stick" filling_color = "#fabe17" +/obj/item/reagent_containers/food/snacks/jambalaya + name = "jambalaya" + desc = "A Creole/Cajun-American dish popularized in Louisiana with origins in Africa and Asia. It is a flavorful mixture of seafood, meats, rice, spices and vegetables. A real celebration of all that is food." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "jambalaya" + trash = /obj/item/trash/shakshouka + reagents_to_add = list(/singleton/reagent/nutriment/protein = 6, /singleton/reagent/nutriment = 6) + reagent_data = list(/singleton/reagent/nutriment/protein = list("chicken" = 5, "shrimp" = 5, "sausage" = 4), /singleton/reagent/nutriment = list("rice" = 5, "rich spicy flavors" = 5)) + filling_color = "#c06917" + +/obj/item/reagent_containers/food/snacks/jambalaya/update_icon() + var/percent_jambalaya = round((reagents.total_volume / 12) * 100) + switch(percent_jambalaya) + if(0 to 50) + icon_state = "jambalaya_half" + else + icon_state = "jambalaya" + +/obj/item/reagent_containers/food/snacks/bowl/pop_shrimp_bowl + name = "bowl of pop shrimp" //Popcorn shrimp were invented in the 70's (after the timeline divergence date) so I figured I'd call them something similar but different in this universe. + desc = "A bowl of fried shrimp so small and crunchy you can just pop them right in your mouth!" + icon = 'icons/obj/item/reagent_containers/food/fryer.dmi' + icon_state = "popshrimp_full" + unitname = "pop shrimp" + filling_color = "#be7017" + trash = /obj/item/trash/snack_bowl + vendingobject = /obj/item/reagent_containers/food/snacks/pop_shrimp + bitesize = 1 + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 5, /singleton/reagent/nutriment = 1) + reagent_data = list(/singleton/reagent/nutriment/protein/seafood = list("crunchy fried shrimp" = 5), /singleton/reagent/nutriment = list("seasoning" = 5)) + +/obj/item/reagent_containers/food/snacks/bowl/pop_shrimp_bowl/update_icon() + switch(reagents.total_volume) + if(1 to 3) + icon_state = "popshrimp_half" + if(4 to INFINITY) + icon_state = "popshrimp_full" + +/obj/item/reagent_containers/food/snacks/pop_shrimp + name = "pop shrimp" + gender = PLURAL + desc = "A handful of crunchy, fried shrampies!" + icon = 'icons/obj/item/reagent_containers/food/fryer.dmi' + icon_state = "popshrimp" + bitesize = 10 + filling_color = "#be7017" + // Konyang /obj/item/reagent_containers/food/snacks/mossbowl @@ -499,7 +546,7 @@ icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' icon_state = "dynpozole" reagent_data = list(/singleton/reagent/nutriment = list("peppermint" = 2, "salad" = 4, "hot stew" = 2)) - reagents_to_add = list(/singleton/reagent/nutriment = 8, /singleton/reagent/water = 5, /singleton/reagent/drink/dynjuice =2) + reagents_to_add = list(/singleton/reagent/nutriment/protein = 5, /singleton/reagent/nutriment = 4, /singleton/reagent/water = 5, /singleton/reagent/drink/dynjuice =2) /obj/item/reagent_containers/food/snacks/elotes name = "elotes" diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm index 44810721868..11ca6455da0 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm @@ -311,3 +311,22 @@ icon_state = "orszi_half" if(50 to INFINITY) icon_state = "orszi" + +/obj/item/reagent_containers/food/snacks/sth_fish + name = "S'th fish" + desc = "A high-end, flavorful dish fit for Unathi nobility. It is made of a few strips of well-seasoned, pan-fried fish served in or next to a bowl of hot S'th-berry soup. You dip the fish strips in the soup and eat them. It is intentionally big but not very filling, as if to say 'I am wealthy enough that this is not my only meal today'. Noble Unathi will likely avoid finishing the soup once they've already eaten the fish, as it is considered to be lower-class behavior unbefitting of the well-fed nobility, akin to licking your plate clean." + icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' + icon_state = "sthfish" + trash = /obj/item/trash/snack_bowl + filling_color = "#882936" + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 4, /singleton/reagent/nutriment = 2, /singleton/reagent/drink/sthberryjuice = 5) + reagent_data = list(/singleton/reagent/nutriment/protein/seafood = list("grilled fish" = 5, "seasoning" = 3), /singleton/reagent/nutriment = list("rich berry soup" = 5)) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/sth_fish/update_icon() + var/percent_sthfish = round((reagents.total_volume / 10) * 100) + switch(percent_sthfish) + if(0 to 44) + icon_state = "sthfish_soup" + if(45 to INFINITY) + icon_state = "sthfish" diff --git a/code/modules/reagents/reagent_containers/food/snacks/fish.dm b/code/modules/reagents/reagent_containers/food/snacks/fish.dm index 78bd32a8fbb..6b664398e5b 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/fish.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/fish.dm @@ -50,6 +50,12 @@ fish_type = "cosmozoan" reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood/cosmozoan = 3) +/obj/item/reagent_containers/food/snacks/fish/raw_shrimp + name = "raw shrimp" + desc = "They're so small! Shrimpy, even." + icon_state = "shrimp_raw" + fish_type = "shrimp" + // Molluscs! /obj/item/trash/mollusc_shell name = "mollusc shell" diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index f4ef0d68359..60d4da1cc9b 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -474,3 +474,26 @@ icon_state = "tartare_half" if(50 to INFINITY) icon_state = "tartare" + +/obj/item/reagent_containers/food/snacks/sliceable/meatloaf + name = "meatloaf" + desc = "It's a loaf. Of meat. It's coated in a shiny red glaze." + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' + icon_state = "meatloaf" + slice_path = /obj/item/reagent_containers/food/snacks/meatloaf_slice + slices_num = 5 + filling_color = "#68451c" + center_of_mass = list("x"=16, "y"=9) + reagents_to_add = list(/singleton/reagent/nutriment = 10, /singleton/reagent/nutriment/protein = 15) + reagent_data = list(/singleton/reagent/nutriment = list("meat" = 5, "loaf" = 5, "tomatoes" = 3)) + bitesize = 2 + trash = /obj/item/trash/plate + +/obj/item/reagent_containers/food/snacks/meatloaf_slice + name = "meatloaf slice" + desc = "A slice of meatloaf. Very meaty, with some kind of zesty red glaze and added spices for extra flavor." + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' + icon_state = "meatloaf_slice" + trash = /obj/item/trash/plate + filling_color = "#68451c" + bitesize = 2 diff --git a/code/modules/reagents/reagent_containers/food/snacks/microwave.dm b/code/modules/reagents/reagent_containers/food/snacks/microwave.dm new file mode 100644 index 00000000000..8fca2af2993 --- /dev/null +++ b/code/modules/reagents/reagent_containers/food/snacks/microwave.dm @@ -0,0 +1,254 @@ +/obj/item/reagent_containers/food/snacks/frozen_microwave_pizza + name = "frozen microwave pizza" + desc = "A personal sized frozen 'pizza', using that term very, very loosely." + icon = 'icons/obj/item/reagent_containers/food/microwave.dmi' + icon_state = "pizza_plain_frozen" + center_of_mass = list("x"=16, "y"=11) + filling_color = "#ce7667" + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/drink/ice = 4) + reagent_data = list(/singleton/reagent/nutriment = list("self loathing" = 10)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/microwave_pizza + name = "microwave pizza" + desc = "A personal sized 'pizza' - using that term very, very loosely. Never tell the chef you're eating this. Or anyone from Italy. Or, honestly, anyone over the age of 10." + icon = 'icons/obj/item/reagent_containers/food/microwave.dmi' + icon_state = "pizza_plain" + center_of_mass = list("x"=16, "y"=11) + filling_color = "#b32b13" + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein/cheese = 2, /singleton/reagent/drink/tomatojuice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("pizza" = 10)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/microwave_pizza/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_microwave_pizza = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_microwave_pizza) + if(0 to 49) + icon_state = "pizza_plain_half" + if(50 to INFINITY) + icon_state = "pizza_plain" + +/obj/item/reagent_containers/food/snacks/frozen_microwave_pizza/olive + name = "frozen microwave olive pizza" + desc = "A personal sized frozen 'pizza', using that term very, very loosely. There's a few tiny green circles on it, hidden under a sheet of ice and thin strings of cheese. There's a lot fewer of them than you expected." + icon_state = "pizza_olive_frozen" + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/drink/ice = 4) + reagent_data = list(/singleton/reagent/nutriment = list("self loathing" = 10)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/microwave_pizza/olive + name = "microwave olive pizza" + desc = "A personal sized 'pizza' - using that term very, very loosely. There's a few mysterious green circles on it which you believe are called 'olives', whatever those are." + icon_state = "pizza_olive" + reagent_data = list(/singleton/reagent/nutriment = list("pizza" = 10, "olives" = 3)) + +/obj/item/reagent_containers/food/snacks/microwave_pizza/olive/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_microwave_olive_pizza = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_microwave_olive_pizza) + if(0 to 49) + icon_state = "pizza_olive_half" + if(50 to INFINITY) + icon_state = "pizza_olive" + +/obj/item/reagent_containers/food/snacks/frozen_microwave_pizza/district6 + name = "frozen microwave district6 pizza" + desc = "A personal sized frozen 'pizza', using that term very, very loosely. There's a few limp strings of earthenroot and some unevenly scattered dirtberries on it in an attempt to recreate the famous pizza from District 6 of Mendell." + icon_state = "pizza_district6_frozen" + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/drink/ice = 4) + reagent_data = list(/singleton/reagent/nutriment = list("self loathing" = 10)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/microwave_pizza/district6 + name = "microwave district 6 pizza" + desc = "A personal sized 'pizza' - using that term very, very loosely. There's a few loose, limp earthenroot slices and chopped dirtberries lying on it haphazardly. Honestly, given the economy in district 6, this is probably more authentic than anything you'd find in any actual pizza place." + icon_state = "pizza_district6" + reagent_data = list(/singleton/reagent/nutriment = list("earthenroot pizza" = 10, "crunchy dirtberries" = 3)) + +/obj/item/reagent_containers/food/snacks/microwave_pizza/district6/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_microwave_district6_pizza = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_microwave_district6_pizza) + if(0 to 49) + icon_state = "pizza_district6_half" + else + icon_state = "pizza_district6" + +/obj/item/reagent_containers/food/snacks/frozen_microwave_pizza/pepperoni + name = "frozen microwave pepperoni pizza" + desc = "A personal sized frozen 'pizza', using that term very, very loosely. Oh wow, there's three whole lumps of something vaguely resembling sausage slices on this. The culinary thrills you'll have." + icon_state = "pizza_pepperoni_frozen" + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein/ = 3, /singleton/reagent/drink/ice = 4) + reagent_data = list(/singleton/reagent/nutriment = list("self loathing" = 10)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/microwave_pizza/pepperoni + name = "microwave pepperoni pizza" + desc = "A personal sized 'pizza' - using that term very, very loosely. Those lumps could, uh... KIND of pass for pepperoni, you guess. Maybe if you squint?" + icon_state = "pizza_pepperoni" + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein/ = 3, /singleton/reagent/nutriment/protein/cheese = 2, /singleton/reagent/drink/tomatojuice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("pizza" = 10, "pepperonish" = 3)) + +/obj/item/reagent_containers/food/snacks/microwave_pizza/pepperoni/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_microwave_pepperoni_pizza = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_microwave_pepperoni_pizza) + if(0 to 49) + icon_state = "pizza_pepperoni_half" + else + icon_state = "pizza_pepperoni" + +/obj/item/reagent_containers/food/snacks/frozen_burger + name = "frozen hamburger" + desc = "Millions of these are being shipped to branches of quick-e-burger all across the spur right at this moment. Isn't it amazing? Wait... Weren't there fries on the wrapper? I thought there'd be fries." + icon = 'icons/obj/item/reagent_containers/food/microwave.dmi' + icon_state = "quick_e_burger_frozen" + w_class = WEIGHT_CLASS_SMALL + center_of_mass = list("x"=16, "y"=11) + filling_color = "#7e603e" + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein/ = 3, /singleton/reagent/drink/ice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("self loathing" = 10), /singleton/reagent/nutriment/protein/ = list("health code violations" = 3)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/quick_e_burger + name = "quick-e-burger" + desc = "Listen, it doesn't have to look good, it just has to be ready quickly and taste vaguely burgerish." + icon = 'icons/obj/item/reagent_containers/food/microwave.dmi' + icon_state = "quick_e_burger" + filling_color = "#4b2d15" + w_class = WEIGHT_CLASS_SMALL + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein/ = 4) + reagent_data = list(/singleton/reagent/nutriment = list("soggy bun" = 10), /singleton/reagent/nutriment/protein/ = list("probably meat" = 10)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/quick_e_burger/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_quickeburger = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_quickeburger) + if(0 to 50) + icon_state = "quick_e_burger_half" + if(51 to INFINITY) + icon_state = "quick_e_burger" + +/obj/item/reagent_containers/food/snacks/frozen_mossburger + name = "frozen mossburger" + desc = "A small frozen burger with a bit of limp moss on it, waiting to be heated up in a microwave so it can gain some semblence of normality." + icon = 'icons/obj/item/reagent_containers/food/microwave.dmi' + icon_state = "quick_e_burger_moss_frozen" + w_class = WEIGHT_CLASS_SMALL + filling_color = "#7e603e" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein/ = 3, /singleton/reagent/drink/ice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("self loathing" = 10), /singleton/reagent/nutriment/protein/ = list("health code violations" = 3)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/toptart_strawberry_raw + name = "uncooked strawberry toptart" + desc = "A very pink Getmore Toptart. Might want to warm it up before eating it, or you might not!" + icon = 'icons/obj/item/reagent_containers/food/microwave.dmi' + icon_state = "toptart_strawberry_raw" + w_class = WEIGHT_CLASS_SMALL + filling_color = "#c57896" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/drink/strawberryjuice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("strawberry jelly" = 5, "cold pastry" = 4)) + +/obj/item/reagent_containers/food/snacks/toptart_strawberry + name = "strawberry toptart" + desc = "A very pink Getmore Toptart. It has been toasted golden brown, mmmmm!" + icon = 'icons/obj/item/reagent_containers/food/microwave.dmi' + icon_state = "toptart_strawberry" + w_class = WEIGHT_CLASS_SMALL + filling_color = "#c57896" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/drink/strawberryjuice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("strawberry jelly" = 5, "crumbly dough" = 4)) + +/obj/item/reagent_containers/food/snacks/toptart_strawberry/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_toptart_strawberry = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_toptart_strawberry) + if(0 to 50) + icon_state = "toptart_strawberry_half" + else + icon_state = "toptart_strawberry" + +/obj/item/reagent_containers/food/snacks/toptart_chocolate_peanutbutter_raw + name = "uncooked chocolate peanut butter toptart" + desc = "A Getmore Toptart coated in chocolate and filled with peanut butter. Might want to warm it up before eating it, or you might not!" + icon = 'icons/obj/item/reagent_containers/food/microwave.dmi' + icon_state = "toptart_chocolate_raw" + w_class = WEIGHT_CLASS_SMALL + filling_color = "#6d462d" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/nutriment/peanutbutter = 2) + reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 5, "peanut butter" = 5, "cold pastry" = 5)) + +/obj/item/reagent_containers/food/snacks/toptart_chocolate_peanutbutter + name = "chocolate peanut butter toptart" + desc = "A Getmore Toptart coated in chocolate and filled with peanut butter. It's been toasted and the chocolate is just a tiny bit melty." + icon = 'icons/obj/item/reagent_containers/food/microwave.dmi' + icon_state = "toptart_chocolate" + w_class = WEIGHT_CLASS_SMALL + filling_color = "#8a5d22" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/nutriment/peanutbutter = 2) + reagent_data = list(/singleton/reagent/nutriment = list("gooey chocolate" = 5, "peanut butter" = 5, "crumbly dough" = 5)) + +/obj/item/reagent_containers/food/snacks/toptart_chocolate_peanutbutter/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_toptart_chocolate = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_toptart_chocolate) + if(0 to 50) + icon_state = "toptart_chocolate_half" + else + icon_state = "toptart_chocolate" + +/obj/item/reagent_containers/food/snacks/toptart_blueberry_raw + name = "uncooked blueberry toptart" + desc = "A Getmore Toptart filled with blueberry jelly. It's the only kind that isn't frosted so it's probably not as bad for you as the other ones. Hurray for being health concious? Might want to warm it up before eating it, or you might not!" + icon = 'icons/obj/item/reagent_containers/food/microwave.dmi' + icon_state = "toptart_blueberry_raw" + w_class = WEIGHT_CLASS_SMALL + filling_color = "#506c91" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/drink/blueberryjuice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("blueberries" = 5, "cold pastry" = 5)) + +/obj/item/reagent_containers/food/snacks/toptart_blueberry + name = "blueberry toptart" + desc = "A Getmore Toptart filled with blueberry jelly. It's the only kind that isn't frosted so it's probably not as bad for you as the other ones. Hurray for being health concious? It's been toasted golden brown." + icon = 'icons/obj/item/reagent_containers/food/microwave.dmi' + icon_state = "toptart_blueberry" + w_class = WEIGHT_CLASS_SMALL + filling_color = "#18569c" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/drink/blueberryjuice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("blueberries" = 5, "crumbly dough" = 5)) + +/obj/item/reagent_containers/food/snacks/toptart_blueberry/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_toptart_blueberry = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_toptart_blueberry) + if(0 to 50) + icon_state = "toptart_blueberry_half" + else + icon_state = "toptart_blueberry" diff --git a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm index 1823dfdccde..1577a70affe 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm @@ -340,6 +340,38 @@ reagents_to_add = list(/singleton/reagent/nutriment = 1, /singleton/reagent/browniemix = 1, /singleton/reagent/drugs/ambrosia_extract = 1, /singleton/reagent/bicaridine = 1, /singleton/reagent/kelotane = 1, /singleton/reagent/toxin = 1) reagent_data = list(/singleton/reagent/nutriment = list("brownies" = 2)) +/obj/item/reagent_containers/food/snacks/sliceable/cranberry_orange_rolls + name = "cranberry orange rolls" + desc = "A tray full of one big, gooey pastry, ready to become a bunch of lovely individual sweet rolls once you slice them apart." + icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' + icon_state = "cranberryrolls" + slice_path = /obj/item/reagent_containers/food/snacks/cranberry_orange_roll + slices_num = 5 + trash = /obj/item/trash/brownies + filling_color = "#c43934" + center_of_mass = list("x"=15, "y"=9) + reagents_to_add = list(/singleton/reagent/nutriment = 15) + reagent_data = list(/singleton/reagent/nutriment = list("cranberry" = 5, "orange" = 5, "sweet dough" = 5)) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/cranberry_orange_roll + name = "cranberry orange roll" + desc = "A lovely glazed sweet roll full of cranberry-orange flavor. A delicious treat whether for a thanksgiving meal in Sol, or a nice walk through Xanu Prime's many pastry shops." + icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' + icon_state = "cranberryroll" + filling_color = "#c43934" + bitesize = 1 + +/obj/item/reagent_containers/food/snacks/cranberry_orange_roll/update_icon() + if(bitecount>=1) + icon_state = "cranberryroll_half" + else + icon_state = "cranberryroll" + +/obj/item/reagent_containers/food/snacks/cranberry_orange_roll/filled + reagents_to_add = list(/singleton/reagent/nutriment = 3) + reagent_data = list(/singleton/reagent/nutriment = list("cranberry" = 5, "orange" = 5, "sweet dough" = 5)) + // Cakes. //============ /obj/item/reagent_containers/food/snacks/sliceable/cake @@ -727,6 +759,30 @@ reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 2, "cherry" = 2, "pie" = 2)) bitesize = 3 +/obj/item/reagent_containers/food/snacks/sliceable/cranberry_pie + name = "cranberry pie" + desc = "A perfectly delicious pie to be divided and shared among friends and family... Or secretly scarfed down all by yourself! Don't worry, I won't tell, I'm just a food description!" + icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' + icon_state = "cranberry_pie" + item_state = "pie" + filling_color = "#9e0057" + slice_path = /obj/item/reagent_containers/food/snacks/cranberry_pie_slice + slices_num = 3 + trash = /obj/item/trash/plate + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/drink/cranberryjuice = 3, /singleton/reagent/nutriment/glucose = 2) + reagent_data = list(/singleton/reagent/nutriment = list("cranberry" = 4, "crumbly pie dough" = 4)) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/cranberry_pie_slice + name = "slice of cranberry pie" + desc = "A delightful sweet and tangy slice of cranberry pie in a crumbly crust." + icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' + icon_state = "cranberry_pie_slice" + trash = /obj/item/trash/plate + filling_color = "#9e0057" + bitesize = 1 + center_of_mass = list("x"=16, "y"=12) /obj/item/reagent_containers/food/snacks/amanita_pie name = "amanita pie" diff --git a/code/modules/reagents/reagent_containers/food/snacks/pizza.dm b/code/modules/reagents/reagent_containers/food/snacks/pizza.dm index 4a10bffc197..3e0fd7597b1 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/pizza.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/pizza.dm @@ -193,3 +193,130 @@ reagents_to_add = list(/singleton/reagent/nutriment = 5, /singleton/reagent/nutriment/protein = 5) reagent_data = list(/singleton/reagent/nutriment = list("flatbread" = 5)) filling_color = "#BD8939" + +//Deep Dish + +ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/) + icon = 'icons/obj/item/reagent_containers/food/pizza.dmi' + desc = "If you're seeing this, something has gone wrong." + slices_num = 6 + +/obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/margherita + name = "deep dish margherita pizza" + desc = "Just as New York and Chicago took the concept of pizza from Italy, claimed it as part of their own identity, forever warring about which is better - deep dish or thin crust, so did Biesel, taking the concept of Deep Dish pizza from Chicago and then arguing with the rest of the universe about it." + icon_state = "deepdish_margherita" + slice_path = /obj/item/reagent_containers/food/snacks/deepdish/margheritaslice + filling_color = "#b32b13" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 36, /singleton/reagent/nutriment/protein/cheese = 6, /singleton/reagent/drink/tomatojuice = 9) + reagent_data = list(/singleton/reagent/nutriment = list("soft dough" = 10, "tomato" = 10, "gooey cheese" = 10)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/deepdish/margheritaslice + name = "deep dish margherita slice" + icon = 'icons/obj/item/reagent_containers/food/pizza.dmi' + desc = "There are only two places in the spur where you can find an authentic deep dish pizza - Chicago and Biesel." + icon_state = "deepdish_margherita_slice" + filling_color = "#b32b13" + bitesize = 2 + center_of_mass = list("x"=18, "y"=13) + +/obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/mushroom + name = "deep dish mushroom pizza" + desc = "Oh boy, it's like a big cake with mushrooms on it! Yummy...?" + icon_state = "deepdish_mushroom" + slice_path = /obj/item/reagent_containers/food/snacks/deepdish/mushroom_slice + filling_color = "#ebd780" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 36, /singleton/reagent/nutriment/protein/cheese = 6, /singleton/reagent/drink/tomatojuice = 9) + reagent_data = list(/singleton/reagent/nutriment = list("soft dough" = 10, "mushrooms" = 10, "tomato" = 10, "gooey cheese" = 10)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/deepdish/mushroom_slice + name = "deep dish mushroom pizza slice" + desc = "In a deep dish, there is mushroom for your pizza." //*air horn noise* + icon = 'icons/obj/item/reagent_containers/food/pizza.dmi' + icon_state = "deepdish_mushroom_slice" + filling_color = "#ebd780" + bitesize = 2 + center_of_mass = list("x"=18, "y"=13) + +/obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/pepperoni + name = "deep dish pepperoni pizza" + desc = "Wow! Who knew this much cholesterol in one place is legal to sell?" + icon_state = "deepdish_pepperoni" + slice_path = /obj/item/reagent_containers/food/snacks/deepdish/pepperoni_slice + filling_color = "#b32b13" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 30, /singleton/reagent/nutriment/protein= 6, /singleton/reagent/nutriment/protein/cheese = 6, /singleton/reagent/drink/tomatojuice = 9) + reagent_data = list(/singleton/reagent/nutriment = list("soft dough" = 10, "tomato" = 10, "gooey cheese" = 10), /singleton/reagent/nutriment/protein = list("spicy sausage" = 10)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/deepdish/pepperoni_slice + name = "deep dish pepperoni pizza slice" + desc = "A thick, cakey slice of pizza with slices of zesty pepperoni on it. Not quite what our Italian ancestors imagined, but delicious nevertheless." + icon = 'icons/obj/item/reagent_containers/food/pizza.dmi' + icon_state = "deepdish_pepperoni_slice" + filling_color = "#b32b13" + bitesize = 2 + center_of_mass = list("x"=18, "y"=13) + +/obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/district6 + name = "deep dish district 6 pizza" + desc = "A dish originating from Mendell's 'Little Adhomai' district. It's a deep dish pizza with slices of earthenroot and roasted dirtberries spread evenly for a bit of extra crunch." + icon_state = "deepdish_district6" + slice_path = /obj/item/reagent_containers/food/snacks/deepdish/district6_slice + filling_color = "#b36813" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 36, /singleton/reagent/nutriment/protein/cheese = 6, /singleton/reagent/drink/tomatojuice = 9) + reagent_data = list(/singleton/reagent/nutriment = list("soft cheesy dough" = 10, "sweet potato" = 10, "tomato" = 10, "crunchy dirtberries" = 10)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/deepdish/district6_slice + name = "deep dish district 6 pizza slice" + desc = "A slice of deep dish pizza with earthenroot slices and roast dirtberries on it. A mashup of Tajaran and Human cuisine that could only come from the cultural hub that is Mendell." + icon = 'icons/obj/item/reagent_containers/food/pizza.dmi' + icon_state = "deepdish_district6_slice" + filling_color = "#b36813" + bitesize = 2 + center_of_mass = list("x"=18, "y"=13) + +/obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/mendell + name = "deep dish mendell style pizza" + desc = "If a pizza place anywhere in the universe has a sign reading 'Mendell style pizza' but the pizza doesn't have bell peppers and anchovies on it, you need to leave." + icon_state = "deepdish_mendell" + slice_path = /obj/item/reagent_containers/food/snacks/deepdish/mendell_slice + filling_color = "#b32b13" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 30, /singleton/reagent/nutriment/protein/cheese = 6, /singleton/reagent/nutriment/protein/seafood = 6, /singleton/reagent/drink/tomatojuice = 9) + reagent_data = list(/singleton/reagent/nutriment = list("soft cheesy dough" = 10, "tomato" = 10, "peppers" = 8), /singleton/reagent/nutriment/protein/seafood = list("anchovies" = 10)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/deepdish/mendell_slice + name = "deep dish mendell style pizza slice" + desc = "Anchovies and bell peppers. People from Mendell swear by it. The rest of the universe usually raises an eyebrow and asks for something else." + icon = 'icons/obj/item/reagent_containers/food/pizza.dmi' + icon_state = "deepdish_mendell_slice" + filling_color = "#b32b13" + bitesize = 2 + center_of_mass = list("x"=18, "y"=13) + +/obj/item/reagent_containers/food/snacks/sliceable/pizza/deepdish/seafood + name = "deep dish seafood pizza" + desc = "A deep dish pizza in the style of Craterview. A mixture of shrimp and onions befitting of only the finest touristy marinas." + icon_state = "deepdish_seafood" + slice_path = /obj/item/reagent_containers/food/snacks/deepdish/seafood_slice + filling_color = "#b32b13" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 30, /singleton/reagent/nutriment/protein/cheese = 6, /singleton/reagent/nutriment/protein/seafood = 6, /singleton/reagent/drink/tomatojuice = 9) + reagent_data = list(/singleton/reagent/nutriment = list("soft cheesy dough" = 10, "tomato" = 10, "onions" = 8), /singleton/reagent/nutriment/protein/seafood = list("shrimp" = 10)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/deepdish/seafood_slice + name = "deep dish seafood pizza slice" + desc = "A delicious Craterview-style slice of deep dish pizza for people on a seafood diet. They sea food, they... uh... pizza. Uhm. Yeah, hang on, I need to workshop this one." + icon = 'icons/obj/item/reagent_containers/food/pizza.dmi' + icon_state = "deepdish_seafood_slice" + filling_color = "#b32b13" + bitesize = 2 + center_of_mass = list("x"=18, "y"=13) diff --git a/code/modules/reagents/reagent_containers/food/snacks/processed.dm b/code/modules/reagents/reagent_containers/food/snacks/processed.dm index 7aa0ef6cd1e..87dc9b82f00 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/processed.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/processed.dm @@ -827,3 +827,252 @@ reagents_to_add = list(/singleton/reagent/nutriment = 0.5) reagent_data = list(/singleton/reagent/nutriment = list("light cocoa" = 2)) bitesize = 1 + +//Microwave food packages + +/obj/item/storage/box/fancy/quick_microwave_pizza + name = "quick-e-meals microwave pizza" + desc = "A package containing one microwavable 'quick-e-meals' brand pizza. Remove from packaging then heat for 2 minutes for best results. Oh wow, it says it contains 5 times your recommended daily intake of sodium! 5 times what's healthy?! This must be SUPER healthy! Who knew pizza is health food?" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "pizza_plain_box" + icon_type = "pizza" + storage_type = "packaging" + starts_with = list(/obj/item/reagent_containers/food/snacks/frozen_microwave_pizza = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/frozen_microwave_pizza) + make_exact_fit = TRUE + opened_icon_state = "microwave_trash" + + use_sound = 'sound/items/storage/wrapper.ogg' + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' + + trash = /obj/item/trash/microwave_package + closable = FALSE + icon_overlays = FALSE + +/obj/item/storage/box/fancy/quick_microwave_pizza/olive + name = "quick-e-meals microwave olive pizza" + desc = "A package containing one microwavable 'quick-e-meals' brand pizza. Remove from packaging then heat for 2 minutes for best results. Yum, olives!... (Psst, hey, what's an olive?)" //If olives get added to the game one day please change this joke. + icon_state = "pizza_olive_box" + starts_with = list(/obj/item/reagent_containers/food/snacks/frozen_microwave_pizza/olive = 1) + +/obj/item/storage/box/fancy/quick_microwave_pizza/district6 + name = "quick-e-meals microwave district 6 pizza" + desc = "A package containing one microwavable 'quick-e-meals' brand pizza. Remove from packaging then heat for 2 minutes for best results. This one has Earthenroot and ground dirtberries on it. They look so plump, plentiful and tasty, surely they look just as good inside." + icon_state = "pizza_district6_box" + starts_with = list(/obj/item/reagent_containers/food/snacks/frozen_microwave_pizza/district6 = 1) + +/obj/item/storage/box/fancy/quick_microwave_pizza/pepperoni + name = "quick-e-meals microwave pepperoni pizza" + desc = "A package containing one microwavable 'quick-e-meals' brand pizza. Remove from packaging then heat for 2 minutes for best results. This one has a lovely pepperoni pizza on the package, covered in lots of slices and glistening temptingly in the light." + icon_state = "pizza_pepperoni_box" + starts_with = list(/obj/item/reagent_containers/food/snacks/frozen_microwave_pizza/pepperoni = 1) + +/obj/item/reagent_containers/food/snacks/packaged_microwave_mac_and_cheeze + name = "microwave mac and cheeze" + desc = "Is it a typo? Is it just a cool way to brand your product? Is it a legal distinction from anything that can be legally referred to as cheese in Tau Ceti? You decide! Instructions: Add 5u. of water and heat up for 2 minutes in the microwave. This hasn't been prepared yet." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "mac_pack" + trash = /obj/item/trash/mac_cheeze + filling_color = "#E8C31E" + reagents_to_add = list(/singleton/reagent/nutriment = 5) + reagent_data = list(/singleton/reagent/nutriment = list("uncooked pasta" = 5, "dry cheeze powder" = 5)) + +/obj/item/reagent_containers/food/snacks/packaged_microwave_mac_and_cheeze/update_icon() + var/percent_mac_cheeze = round((reagents.total_volume / 5) * 100) + switch(percent_mac_cheeze) + if(0 to 90) + icon_state = "mac_pack_open" + else + icon_state = "mac_pack" + +/obj/item/reagent_containers/food/snacks/instant_mac + name = "mac and cheeze" + desc = "Is it a typo? Is it just a cool way to brand your product? Is it a legal distinction from anything that can be legally referred to as cheese in Tau Ceti? You decide! It seems someone already prepared this one." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "mac_pack_open" + filling_color = "#E8C31E" + trash = /obj/item/trash/mac_cheeze + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein/cheese = 3) + reagent_data = list(/singleton/reagent/nutriment = list("pasta" = 5), /singleton/reagent/nutriment/protein/cheese = list("cheezy flavoring" = 5)) + +/obj/item/reagent_containers/food/snacks/packaged_microwave_fiery_mac_and_cheeze + name = "microwave fiery hot mac and cheeze" + desc = "The fire adorning the package invites you to get ready for delicious pain. It hasn't been prepared yet, though." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "mac_fiery" + trash = /obj/item/trash/mac_fiery + filling_color = "#e40000" + reagents_to_add = list(/singleton/reagent/nutriment = 5, /singleton/reagent/capsaicin = 2) + reagent_data = list(/singleton/reagent/nutriment = list("uncooked pasta" = 5, "mouth pain powder" = 5)) + +/obj/item/reagent_containers/food/snacks/packaged_microwave_fiery_mac_and_cheeze/update_icon() + var/percent_mac_fiery = round((reagents.total_volume / 7) * 100) + switch(percent_mac_fiery) + if(0 to 95) + icon_state = "mac_fiery_open" + if(96 to INFINITY) + icon_state = "mac_fiery" + +/obj/item/reagent_containers/food/snacks/instant_mac_fiery + name = "fiery hot mac and cheeze" + desc = "Oh wow, that is red. That is very, very red. Is it supposed to be this neon shade red? Everything about this screams that you shouldn't eat it... You're absolutely going to eat it, aren't you?" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "mac_fiery_open" + filling_color = "#e40000" + trash = /obj/item/trash/mac_fiery + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/capsaicin = 2, /singleton/reagent/nutriment/protein/cheese = 3) + reagent_data = list(/singleton/reagent/nutriment = list("pasta" = 5), /singleton/reagent/nutriment/protein/cheese = list("delicious pain" = 5)) + +/obj/item/storage/box/fancy/packaged_burger + name = "\improper quick-e-meals instaburger" + desc = "'Mama, mama! Can we stop at quick-e-burger?!' -'No, dears! We have quick-e-burger at home!' Quick-e-burger at home: is... surprisingly accurate, actually. The instructions recommend removing the burger from the package and heating it for 2 minutes." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "burger_box" + icon_type = "burger" + storage_type = "packaging" + starts_with = list(/obj/item/reagent_containers/food/snacks/frozen_burger = 1, /obj/item/reagent_containers/food/condiment/small/packet/ketchup =1) + can_hold = list(/obj/item/reagent_containers/food/snacks/frozen_burger, /obj/item/reagent_containers/food/condiment/small/packet/ketchup) + make_exact_fit = TRUE + opened_icon_state = "microwave_trash" + + use_sound = 'sound/items/storage/wrapper.ogg' + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' + + trash = /obj/item/trash/microwave_package + closable = FALSE + icon_overlays = FALSE + +/obj/item/storage/box/fancy/packaged_mossburger + name = "\improper UP! burger microwave burger" + desc = "A microwave-friendly version of the famous UP! Burger for you to take home. They typically only sell these in Konyang. All the text on the package is in sol common. There is a little drawing of a clock with the number 2 next to it, though." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "burger_box_moss" + icon_type = "burger" + storage_type = "packaging" + starts_with = list(/obj/item/reagent_containers/food/snacks/frozen_mossburger = 1, /obj/item/reagent_containers/food/condiment/small/packet/ketchup =1) + can_hold = list(/obj/item/reagent_containers/food/snacks/frozen_mossburger, /obj/item/reagent_containers/food/condiment/small/packet/ketchup) + make_exact_fit = TRUE + opened_icon_state = "microwave_trash" + + use_sound = 'sound/items/storage/wrapper.ogg' + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' + + trash = /obj/item/trash/microwave_package + closable = FALSE + icon_overlays = FALSE + +/obj/item/reagent_containers/food/snacks/quick_curry + name = "\improper quick-e-meals mild curry" + desc = "A microwave curry dish boasting a mixture of rice and curry with a spiciness rating of 'mild'. The instructions recommend heating it up for 2 minutes without removing it from the packaging." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "curry_box" + trash = /obj/item/trash/microwave_package + filling_color = "#ad6a32" + reagents_to_add = list(/singleton/reagent/nutriment = 5, /singleton/reagent/drink/ice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("frozen solid rice" = 10, "regrets" = 8)) + +/obj/item/reagent_containers/food/snacks/quick_curry_prepared + name = "\improper quick-e-meals mild curry" + desc = "A fair amount of rice with sitting in a disposable container with a small bit of brown sauce sitting next to it, separated. There's mysterious chunks floating around in the sauce, but it's okay. According to the picture on the box, they're supposed to be there." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "curry" + trash = /obj/item/trash/microwave_package + filling_color = "#ad6a32" + reagents_to_add = list(/singleton/reagent/nutriment = 7) + reagent_data = list(/singleton/reagent/nutriment = list("rice" = 5, "mild curry sauce" = 5, "probably potatoes" = 3)) + +/obj/item/reagent_containers/food/snacks/quick_curry_prepared/update_icon() + var/percent_curry = round((reagents.total_volume / 7) * 100) + switch(percent_curry) + if(0 to 50) + icon_state = "curry_half" + else + icon_state = "curry" + +/obj/item/reagent_containers/food/snacks/hv_dinner + name = "\improper quick-e-meals HV dinner" + desc = "These used to be called TV dinners for the longest time even after the invention of holovision. They finally rebranded them a few years ago. The instructions read: 'Heat package in microwave for 2 minutes before opening.' It's still cold." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "hv_dinner_box" + trash = /obj/item/trash/microwave_package + filling_color = "#805532" + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein = 3, /singleton/reagent/drink/ice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("regret" = 5), /singleton/reagent/nutriment/protein = list("poor life choices" = 5)) + +/obj/item/reagent_containers/food/snacks/hv_dinner_prepared + name = "\improper quick-e-meals HV dinner" + desc = "Some kind of meat, a thing of mashed potatoes, and some peas with small chunks of carrot mixed in, everything you need to convince yourself that this is a balanced meal and you're definitely a functional adult." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "hv_dinner" + trash = /obj/item/trash/microwave_package + filling_color = "#805532" + reagents_to_add = list(/singleton/reagent/nutriment = 5, /singleton/reagent/nutriment/protein = 3) + reagent_data = list(/singleton/reagent/nutriment = list("mashed potatoes" = 5, "peas" = 5), /singleton/reagent/nutriment/protein = list("some kind of protein" = 6)) + +/obj/item/reagent_containers/food/snacks/hv_dinner_prepared/update_icon() + var/percent_hvdinner = round((reagents.total_volume / 7) * 100) + switch(percent_hvdinner) + if(0 to 49) + icon_state = "hv_dinner_half" + else + icon_state = "hv_dinner" + +/obj/item/storage/box/fancy/toptarts_strawberry + name = "\improper toptarts supreme strawberry" + desc = "A box containing four Getmore brand Toptarts. These ones are strawberry flavored! There are instructions on the box recommending you remove them from the box and heat them up for one minute per pastry." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "toptart_strawberry_box" + icon_type = "toptart" + storage_type = "box" + starts_with = list(/obj/item/reagent_containers/food/snacks/toptart_strawberry_raw = 4) + can_hold = list( + /obj/item/reagent_containers/food/snacks/toptart_strawberry_raw, + /obj/item/reagent_containers/food/snacks/toptart_chocolate_peanutbutter_raw, + /obj/item/reagent_containers/food/snacks/toptart_blueberry_raw + ) + make_exact_fit = TRUE + use_sound = 'sound/items/storage/wrapper.ogg' + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' + icon_overlays = FALSE + +/obj/item/storage/box/fancy/toptarts_chocolate_peanutbutter + name = "\improper toptarts chocolate peanutbutter pow-wow" + desc = "A box containing four Getmore brand Toptarts. These ones are chocolate-peanut butter flavored! There are instructions on the box recommending you remove them from the box and heat them up for one minute per pastry." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "toptart_chocolate_box" + icon_type = "toptart" + storage_type = "box" + starts_with = list(/obj/item/reagent_containers/food/snacks/toptart_chocolate_peanutbutter_raw = 4) + can_hold = list( + /obj/item/reagent_containers/food/snacks/toptart_strawberry_raw, + /obj/item/reagent_containers/food/snacks/toptart_chocolate_peanutbutter_raw, + /obj/item/reagent_containers/food/snacks/toptart_blueberry_raw + ) + make_exact_fit = TRUE + use_sound = 'sound/items/storage/wrapper.ogg' + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' + icon_overlays = FALSE + +/obj/item/storage/box/fancy/toptarts_blueberry + name = "\improper toptarts bursting blueberry" + desc = "A box containing four Getmore brand Toptarts. These ones are blueberry flavored! There are instructions on the box recommending you remove them from the box and heat them up for one minute per pastry." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "toptart_blueberry_box" + icon_type = "toptart" + storage_type = "box" + starts_with = list(/obj/item/reagent_containers/food/snacks/toptart_blueberry_raw = 4) + can_hold = list( + /obj/item/reagent_containers/food/snacks/toptart_strawberry_raw, + /obj/item/reagent_containers/food/snacks/toptart_chocolate_peanutbutter_raw, + /obj/item/reagent_containers/food/snacks/toptart_blueberry_raw + ) + make_exact_fit = TRUE + use_sound = 'sound/items/storage/wrapper.ogg' + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' + icon_overlays = FALSE diff --git a/code/modules/reagents/reagent_containers/food/snacks/soup.dm b/code/modules/reagents/reagent_containers/food/snacks/soup.dm index fc79ffbf91c..34f4490d5c5 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/soup.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/soup.dm @@ -203,6 +203,48 @@ reagent_data = list(/singleton/reagent/nutriment = list("peas" = 5, "vegetables" = 4)) bitesize = 2 +/obj/item/reagent_containers/food/snacks/soup/gazpacho + name = "gazpacho" + desc = "Excuse me, waiter, my tomato soup is cold! Wha- They serve it like this in Spain?! Well... uh... I knew that! I just meant it should be colder! Everyone knows they don't have stoves back in Sol!... Right?" + icon = 'icons/obj/item/reagent_containers/food/soup.dmi' + icon_state = "gazpacho" + filling_color = "#e2520f" + bitesize = 2 + reagents_to_add = list(/singleton/reagent/drink/tomatojuice = 5, /singleton/reagent/nutriment = 5) + reagent_data = list(/singleton/reagent/nutriment = list("tomato soup" = 5, "peppers" = 4, "cold zest" = 3)) + +/obj/item/reagent_containers/food/snacks/soup/gazpacho/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_gazpacho = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_gazpacho) + if(0 to 50) + icon_state = "gazpacho_half" + if(51 to INFINITY) + icon_state = "gazpacho" + +/obj/item/reagent_containers/food/snacks/soup/pumpkin + name = "pumpkin soup" + desc = "Creamy pumpkin soup to have on a cold autumn day. Or whenever, really! I'm not your parole officer." + icon = 'icons/obj/item/reagent_containers/food/soup.dmi' + icon_state = "pumpkinsoup" + filling_color = "#f89500" + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/water = 4) + reagent_data = list(/singleton/reagent/nutriment = list("creamy pumpkin" = 5)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/soup/pumpkin/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_pumpkinsoup = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_pumpkinsoup) + if(0 to 49) + icon_state = "pumpkinsoup_half" + if(50 to INFINITY) + icon_state = "pumpkinsoup" + // Stew /obj/item/reagent_containers/food/snacks/stew diff --git a/html/changelogs/TOMIXCOMICS-PR.yml b/html/changelogs/TOMIXCOMICS-PR.yml new file mode 100644 index 00000000000..be091617a8d --- /dev/null +++ b/html/changelogs/TOMIXCOMICS-PR.yml @@ -0,0 +1,67 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Tomixcomics + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added many new food dishes and ingredients (many of them pizzas)." + - rscadd: "Added some of the new ingredients to the Cargo order form." + - rscadd: "Added 2 new drinks and a drink bottle for one of them." + - rscadd: "Created new vending machine that sells microwave/instant foods." + - rscadd: "Added shrimp to the required ingredients for North 60 squid." + - rscdel: "Nerfed a few dishes that require cooking seafood or frying so that you can no longer make them with the microwave (Before adding a bunch of new microwave foods to make up for it)." + - qol: "Renamed empty Shakshouka pan to be something more generic so it can be used for other dishes." + - qol: "Adjusted the contents of Dyn Pozole so it doesn't take five years to finish eating." + - code_imp: "Defined a color for S'th berry juice." + - code_imp: "Created new pages and files for microwave foods." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index d13994fa85c..a43d0c113c5 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/item/reagent_containers/food/bread.dmi b/icons/obj/item/reagent_containers/food/bread.dmi index 71ab72c91f3..20de40139e1 100644 Binary files a/icons/obj/item/reagent_containers/food/bread.dmi and b/icons/obj/item/reagent_containers/food/bread.dmi differ diff --git a/icons/obj/item/reagent_containers/food/cultural/human.dmi b/icons/obj/item/reagent_containers/food/cultural/human.dmi index ade266ff3b9..71e5ad76620 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/human.dmi and b/icons/obj/item/reagent_containers/food/cultural/human.dmi differ diff --git a/icons/obj/item/reagent_containers/food/cultural/unathi.dmi b/icons/obj/item/reagent_containers/food/cultural/unathi.dmi index acd6895a21c..8713adda88e 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/unathi.dmi and b/icons/obj/item/reagent_containers/food/cultural/unathi.dmi differ diff --git a/icons/obj/item/reagent_containers/food/drinks/bottle.dmi b/icons/obj/item/reagent_containers/food/drinks/bottle.dmi index 70e63bccd48..8efc226aa31 100644 Binary files a/icons/obj/item/reagent_containers/food/drinks/bottle.dmi and b/icons/obj/item/reagent_containers/food/drinks/bottle.dmi differ diff --git a/icons/obj/item/reagent_containers/food/fryer.dmi b/icons/obj/item/reagent_containers/food/fryer.dmi index 9259fd861ac..1ed798c697f 100644 Binary files a/icons/obj/item/reagent_containers/food/fryer.dmi and b/icons/obj/item/reagent_containers/food/fryer.dmi differ diff --git a/icons/obj/item/reagent_containers/food/meat.dmi b/icons/obj/item/reagent_containers/food/meat.dmi index ff265488784..ffdda927881 100644 Binary files a/icons/obj/item/reagent_containers/food/meat.dmi and b/icons/obj/item/reagent_containers/food/meat.dmi differ diff --git a/icons/obj/item/reagent_containers/food/microwave.dmi b/icons/obj/item/reagent_containers/food/microwave.dmi new file mode 100644 index 00000000000..5917af27068 Binary files /dev/null and b/icons/obj/item/reagent_containers/food/microwave.dmi differ diff --git a/icons/obj/item/reagent_containers/food/pastries.dmi b/icons/obj/item/reagent_containers/food/pastries.dmi index d4e80fd26df..2350b97fbe3 100644 Binary files a/icons/obj/item/reagent_containers/food/pastries.dmi and b/icons/obj/item/reagent_containers/food/pastries.dmi differ diff --git a/icons/obj/item/reagent_containers/food/pizza.dmi b/icons/obj/item/reagent_containers/food/pizza.dmi index cd120308dff..7e9b874f97d 100644 Binary files a/icons/obj/item/reagent_containers/food/pizza.dmi and b/icons/obj/item/reagent_containers/food/pizza.dmi differ diff --git a/icons/obj/item/reagent_containers/food/processed.dmi b/icons/obj/item/reagent_containers/food/processed.dmi index fcea48fca77..cd032d3e71a 100644 Binary files a/icons/obj/item/reagent_containers/food/processed.dmi and b/icons/obj/item/reagent_containers/food/processed.dmi differ diff --git a/icons/obj/item/reagent_containers/food/soup.dmi b/icons/obj/item/reagent_containers/food/soup.dmi index a27ee148d42..f22420a1242 100644 Binary files a/icons/obj/item/reagent_containers/food/soup.dmi and b/icons/obj/item/reagent_containers/food/soup.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 11a54556c8e..d3e2c3508ec 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index c8b27d29575..429a6ca6f7b 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ