diff --git a/_maps/RandomRuins/JungleRuins/jungle_witch.dmm b/_maps/RandomRuins/JungleRuins/jungle_witch.dmm index 70080ddae51b..e84d83563522 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_witch.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_witch.dmm @@ -165,7 +165,7 @@ "vf" = ( /obj/structure/table/wood/fancy/cyan, /obj/item/reagent_containers/food/snacks/burger/spell, -/obj/item/reagent_containers/food/snacks/dankpocket{ +/obj/item/reagent_containers/food/snacks/donkpocket/dankpocket{ pixel_x = 8; pixel_y = 10 }, diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index f2b6a8fd196d..312cf8328a18 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -14,11 +14,10 @@ #define BREAKFAST (1<<13) #define CLOTH (1<<14) #define GRILLED (1<<15) -/*#define NUTS (1<<16) +#define NUTS (1<<16) #define SEAFOOD (1<<17) -#define ORANGES (1<<18) -#define BUGS (1<<19)*/ -#define GORE (1<<20) +#define BUGS (1<<18) +#define GORE (1<<19) /// IC meaning (more or less) for food flags #define FOOD_FLAGS_IC list( \ @@ -39,7 +38,6 @@ "Clothing", \ "Nuts", \ "Seafood", \ - "Oranges", \ "Bugs", \ ) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 0091b88fa15f..f92cedc2bd26 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -232,6 +232,11 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/storage/box/donkpockets/donkpocketberry = 1, /obj/item/storage/box/donkpockets/donkpockethonk = 1, ) = 1, + list(//Donk-dinner Varieties + /obj/item/reagent_containers/food/snacks/ready_donk = 1, + /obj/item/reagent_containers/food/snacks/ready_donk/mac_n_cheese = 1, + /obj/item/reagent_containers/food/snacks/ready_donk/donkhiladas = 1, + ) = 1, /obj/item/reagent_containers/food/snacks/monkeycube = 1, /obj/effect/spawner/lootdrop/ration = 1, ) = 8, diff --git a/code/datums/mapgen/planetary/LavaGenerator.dm b/code/datums/mapgen/planetary/LavaGenerator.dm index 6e6d4d898ac1..8252629751fb 100644 --- a/code/datums/mapgen/planetary/LavaGenerator.dm +++ b/code/datums/mapgen/planetary/LavaGenerator.dm @@ -244,7 +244,8 @@ /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/ash/fern = 2, - /obj/structure/flora/ash/puce = 2 + /obj/structure/flora/ash/puce = 2, + /obj/structure/flora/ash/seraka = 2 ) /datum/biome/cave/lavaland/rocky @@ -265,7 +266,8 @@ /obj/structure/flora/ash/cap_shroom = 2, /obj/structure/flora/ash/stem_shroom = 2, /obj/structure/flora/ash/cacti = 1, - /obj/structure/flora/ash/tall_shroom = 2 + /obj/structure/flora/ash/tall_shroom = 2, + /obj/structure/flora/ash/seraka = 2 ) /datum/biome/cave/lavaland/lava diff --git a/code/datums/mapgen/planetary/SandGenerator.dm b/code/datums/mapgen/planetary/SandGenerator.dm index e50223744a7c..9208adf7bf9a 100644 --- a/code/datums/mapgen/planetary/SandGenerator.dm +++ b/code/datums/mapgen/planetary/SandGenerator.dm @@ -118,6 +118,7 @@ /obj/structure/flora/ash/stem_shroom = 4, /obj/effect/decal/remains/human = 4, /obj/effect/spawner/lootdrop/maintenance = 40, + /obj/structure/flora/ash/seraka = 4 ) /datum/biome/sand/grass @@ -145,6 +146,7 @@ /obj/structure/flora/tree/dead/barren = 4, /obj/structure/flora/rock = 3, /obj/structure/flora/rock/pile = 3, + /obj/structure/flora/ash/seraka = 2 ) /datum/biome/sand/icecap @@ -157,6 +159,7 @@ /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/rock = 3, /obj/structure/flora/rock/pile = 3, + /obj/structure/flora/ash/seraka = 2 ) /datum/biome/sand/riverbed diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index dbaac99c4296..6d0127a09c37 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -239,3 +239,8 @@ description = "Fishing is relaxing" mood_change = 5 timeout = 3 MINUTES + +/datum/mood_event/memories_of_home + description = "This taste seems oddly nostalgic...\n" + mood_change = 3 + timeout = 5 MINUTES diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index b32169951c46..e1804726b312 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) /obj/item/a_gift name = "gift" desc = "PRESENTS!!!! eek!" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "giftdeliverypackage3" item_state = "gift" resistance_flags = FLAMMABLE diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 2dbec7311bd1..77f4724aff34 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -264,7 +264,7 @@ /obj/item/conversion_kit name = "conversion kit" desc = "A strange box containing wood working tools and an instruction paper to turn stun batons into something else." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "uk" custom_price = 450 diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index e87691b651a9..d8a382cf589c 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -550,7 +550,7 @@ /obj/item/borg/upgrade/rped name = "engineering cyborg RPED" desc = "A rapid part exchange device for the engineering cyborg." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "borgrped" require_module = TRUE module_type = list(/obj/item/robot_module/engineering, /obj/item/robot_module/saboteur) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index b4ec267bd770..32f0ea888964 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -226,7 +226,7 @@ /obj/item/storage/backpack/satchel/leather name = "leather satchel" desc = "It's a very fancy satchel made with fine leather." - icon = 'icons/obj/storage.dmi' //WS Edit - Suitcases + icon = 'icons/obj/storage/storage.dmi' //WS Edit - Suitcases icon_state = "satchel" item_state = "satchel" @@ -359,7 +359,7 @@ /obj/item/storage/backpack/messenger name = "messenger bag" desc = "A sturdy backpack worn over one shoulder." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' mob_overlay_icon = 'icons/mob/clothing/back.dmi' icon_state = "courierbag" item_state = "courierbag" diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index a0ce4670c0bf..c602f3786bdc 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -32,7 +32,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", /obj/item/storage/book/bible name = "bible" desc = "Apply to head repeatedly." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "bible" item_state = "bible" lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' @@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", if(!GLOB.bible_icon_state && H.mind.holy_role == HOLY_ROLE_HIGHPRIEST) var/dat = "Pick Bible Style

Pick a bible style

" for(var/i in 1 to GLOB.biblestates.len) - var/icon/bibleicon = icon('icons/obj/storage.dmi', GLOB.biblestates[i]) + var/icon/bibleicon = icon('icons/obj/storage/storage.dmi', GLOB.biblestates[i]) var/nicename = GLOB.biblenames[i] H << browse_rsc(bibleicon, nicename) dat += {""} diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 7b1710cd8960..bc619ef80e9a 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -254,7 +254,7 @@ /obj/item/storage/box/hypospray name = "hypospray mk. II kit" - icon = 'icons/obj/storage.dmi' //WS Edit - Suitcases + icon = 'icons/obj/storage/storage.dmi' //WS Edit - Suitcases icon_state = "medbriefcase" illustration = null @@ -465,6 +465,7 @@ name = "box of donk-pockets" desc = "Instructions:Heat in microwave. Product will cool if not eaten within seven minutes." icon_state = "donkpocketbox" + icon = 'icons/obj/storage/donk.dmi' illustration=null var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket @@ -736,7 +737,7 @@ /obj/item/storage/box/lights name = "box of replacement bulbs" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' illustration = "light" desc = "This box is shaped on the inside so that only light tubes and bulbs fit." item_state = "syringe_kit" @@ -886,7 +887,7 @@ /obj/item/storage/box/slugshot name = "box of 12-gauge slug shotgun shells" desc = "a box full of slug shots, designed for riot shotguns" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "slugshot_box" illustration = null @@ -1478,6 +1479,7 @@ name = "bubblegum packet" desc = "The packaging is entirely in japanese, apparently. You can't make out a single word of it." icon_state = "bubblegum_generic" + icon = 'icons/obj/storage/gum.dmi' w_class = WEIGHT_CLASS_TINY illustration = null foldable = null diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index 895b94acf574..db7212dc7d76 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -1,7 +1,7 @@ /obj/item/storage/briefcase name = "briefcase" desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." - icon = 'icons/obj/storage.dmi' //WS edit - Better briefcases + icon = 'icons/obj/storage/storage.dmi' //WS edit - Better briefcases icon_state = "briefcase" lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi' diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 4505f596907f..cb81fcec1613 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -12,7 +12,7 @@ /obj/item/storage/firstaid name = "first-aid kit" desc = "It's an emergency medical kit for those serious boo-boos." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "firstaid" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' @@ -119,7 +119,7 @@ generate_items_inside(items_inside,src) /obj/item/storage/firstaid/ancient - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "firstaid" desc = "A first aid kit with the ability to heal common types of injuries." diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 6d6690106b4d..37cd3378142e 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -3,7 +3,7 @@ desc = "A locked box." icon_state = "lockbox+l" item_state = "syringe_kit" - icon = 'icons/obj/storage.dmi' //WS edit - better briefcases + icon = 'icons/obj/storage/storage.dmi' //WS edit - better briefcases lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' w_class = WEIGHT_CLASS_BULKY diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index c1014716c323..6549daee51ee 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -117,7 +117,7 @@ // ----------------------------- /obj/item/storage/secure/briefcase name = "secure briefcase" - icon = 'icons/obj/storage.dmi' //WS edit - better briefcases + icon = 'icons/obj/storage/storage.dmi' //WS edit - better briefcases icon_state = "secure" item_state = "sec-case" lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' @@ -158,7 +158,7 @@ /obj/item/storage/secure/safe name = "secure safe" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "safe" icon_opened = "safe0" icon_locking = "safeb" diff --git a/code/game/objects/items/storage/sixpack.dm b/code/game/objects/items/storage/sixpack.dm index 1a229909aa82..f426ba1dbd4e 100644 --- a/code/game/objects/items/storage/sixpack.dm +++ b/code/game/objects/items/storage/sixpack.dm @@ -1,7 +1,7 @@ /obj/item/storage/cans name = "can ring" desc = "Holds up to six drink cans, and select bottles." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "canholder" item_state = "cola" lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index c2619eef4c14..6992bac55688 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -1,6 +1,6 @@ /obj/item/storage name = "storage" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' w_class = WEIGHT_CLASS_NORMAL var/rummage_if_nodrop = TRUE var/component_type = /datum/component/storage/concrete diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index bdcb89796bc4..b61bba3de62f 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -69,6 +69,25 @@ name = "semki pack" icon_state = "semki_pack" +/obj/item/trash/peanuts + name = "\improper Gallery peanuts packet" + desc = "This thread is trash!" + icon_state = "peanuts" + +/obj/item/trash/cnds + name = "\improper C&Ds packet" + icon_state = "cnds" + +/obj/item/trash/spacers_sidekick + name = "\improper Spacer's Sidekick packet" + icon_state = "spacers_sidekick" + +/obj/item/trash/ready_donk + name = "empty Ready-donk" + desc = "It's been Donk-decimated." + icon_state = "ready_donk" + icon = 'icons/obj/food/donk.dmi' + /obj/item/trash/tray name = "tray" icon_state = "tray" @@ -79,15 +98,26 @@ icon = 'icons/obj/candle.dmi' icon_state = "candle4" +/obj/item/trash/can/Initialize() + . = ..() + pixel_x = rand(-4,4) + pixel_y = rand(-4,4) + +/obj/item/trash/attack(mob/M, mob/living/user) + return + /obj/item/trash/can name = "crushed can" icon_state = "cola" resistance_flags = NONE grind_results = list(/datum/reagent/aluminium = 10) +/obj/item/trash/can/food + name = "canned peaches" + icon_state = "peachcan_empty" + icon = 'icons/obj/food/canned.dmi' /obj/item/trash/can/food/peaches name = "canned peaches" - icon = 'icons/obj/food/food.dmi' icon_state = "peachcan_empty" /obj/item/trash/can/food/peaches/maint @@ -96,13 +126,24 @@ /obj/item/trash/can/food/beans name = "tin of beans" - icon = 'icons/obj/food/food.dmi' icon_state = "beans_empty" -/obj/item/trash/can/Initialize() - . = ..() - pixel_x = rand(-4,4) - pixel_y = rand(-4,4) +/obj/item/trash/can/food/tomatoes + name = "canned San Marzano tomatoes" + icon_state = "tomatoescan_empty" -/obj/item/trash/attack(mob/M, mob/living/user) - return +/obj/item/trash/can/food/pine_nuts + name = "canned pine nuts" + icon_state = "pinenutscan_empty" + +/obj/item/trash/can/food/jellyfish + name = "canned gunner jellyfish" + icon_state = "jellyfish_empty" + +/obj/item/trash/can/food/desert_snails + name = "canned desert snails" + icon_state = "snails_empty" + +/obj/item/trash/can/food/larvae + name = "canned bee larva" + icon_state = "larvae_empty" diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index a5d7531b0aa8..cc488c9215f7 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -76,4 +76,5 @@ open_sound_volume = 35 close_sound_volume = 50 material_drop = /obj/item/stack/sheet/plasteel + #undef SNAKE_SPAM_TICKS diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 05dccfc0ca75..9da4af8b984d 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -17,7 +17,7 @@ if(src.client.handle_spam_prevention(msg,MUTE_PRAY)) return - var/mutable_appearance/cross = mutable_appearance('icons/obj/storage.dmi', "bible") + var/mutable_appearance/cross = mutable_appearance('icons/obj/storage/storage.dmi', "bible") var/font_color = "purple" var/prayer_type = "PRAYER" var/deity diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm index 398233a64488..586562dc9b28 100644 --- a/code/modules/cargo/packs/food.dm +++ b/code/modules/cargo/packs/food.dm @@ -246,6 +246,26 @@ crate_name = "beekeeping starter crate" crate_type = /obj/structure/closet/crate/hydroponics +/datum/supply_pack/food/ready_donk + name = "Ready-Donk Single Meal" + desc = "A complete meal package for the terminally lazy. Contains one Ready-Donk meal." + cost = 100 + contains = list(/obj/item/reagent_containers/food/snacks/ready_donk) + +/datum/supply_pack/food/randomized/ready_donk + name = "Ready-Donk Variety Crate" + desc = "Featuring a line up of Donk Co.'s most popular pastry!" + cost = 600 + contains = list(/obj/item/reagent_containers/food/snacks/ready_donk, + /obj/item/reagent_containers/food/snacks/ready_donk/mac_n_cheese, + /obj/item/reagent_containers/food/snacks/ready_donk/donkhiladas) + crate_name = "\improper Ready-Donk crate" + +/datum/supply_pack/food/randomized/ready_donk/fill(obj/structure/closet/crate/C) + for(var/i in 1 to 3) + var/item = pick(contains) + new item(C) + /datum/supply_pack/food/ration name = "Ration Crate" desc = "6 standerd issue rations." diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index 3ca5e48930a4..b8cb31e1a895 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -3,7 +3,7 @@ /obj/item/evidencebag name = "evidence bag" desc = "An empty evidence bag." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "evidenceobj" item_state = "" w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index b4d8cf8090c9..d0f4506976b2 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -360,6 +360,25 @@ icon_state = "fernetbottle" list_reagents = list(/datum/reagent/consumable/ethanol/fernet = 100) +/obj/item/reagent_containers/food/drinks/bottle/bitters + name = "Andromeda Bitters" + desc = "An aromatic addition to any drink. Made in New Trinidad, now and forever." + icon_state = "bitters_bottle" + volume = 30 + list_reagents = list(/datum/reagent/consumable/ethanol/bitters = 30) + +/obj/item/reagent_containers/food/drinks/bottle/curacao + name = "Beekhof Blauw Curaçao" + desc = "Still produced on the island of Curaçao, after all these years." + icon_state = "curacao_bottle" + list_reagents = list(/datum/reagent/consumable/ethanol/curacao = 100) + +/obj/item/reagent_containers/food/drinks/bottle/navy_rum + name = "Pride of the Union Navy-Strength Rum" + desc = "Ironically named, given it's made in Bermuda." + icon_state = "navy_rum_bottle" + list_reagents = list(/datum/reagent/consumable/ethanol/navy_rum = 100) + //////////////////////////JUICES AND STUFF /////////////////////// /obj/item/reagent_containers/food/drinks/bottle/orangejuice @@ -494,6 +513,14 @@ list_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 100) isGlass = TRUE +/obj/item/reagent_containers/food/drinks/bottle/mushroom_kombucha + name = "Miner’s Might Mushroom Kombucha" + desc = "Best drunk over ice to savor the mushroomy flavor. Some refer to it as ‘shroombucha’." + icon_state = "shroomy_bottle" + volume = 30 + list_reagents = list(/datum/reagent/consumable/ethanol/mushi_kombucha = 30) + isGlass = FALSE + ////////////////////////// MOLOTOV /////////////////////// /obj/item/reagent_containers/food/drinks/bottle/molotov name = "molotov cocktail" @@ -652,7 +679,7 @@ /obj/item/storage/bottles name = "bottle crate" desc = "A small crate for storing bottles" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "bottlecrate" item_state = "deliverypackage" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/bread.dm similarity index 82% rename from code/modules/food_and_drinks/food/snacks_bread.dm rename to code/modules/food_and_drinks/food/bread.dm index 13342a968900..cf698ca64fd9 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/bread.dm @@ -1,6 +1,6 @@ /obj/item/reagent_containers/food/snacks/store/bread - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' volume = 80 slices_num = 5 tastes = list("bread" = 10) @@ -11,7 +11,7 @@ AddElement(/datum/element/dunkable, 10) /obj/item/reagent_containers/food/snacks/breadslice - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' bitesize = 2 custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/sandwich filling_color = "#FFA500" @@ -41,6 +41,7 @@ icon_state = "breadslice" customfoodfilling = 1 foodtype = GRAIN + cooked_type = /obj/item/reagent_containers/food/snacks/griddle_toast /obj/item/reagent_containers/food/snacks/breadslice/moldy name = "moldy bread slice" @@ -185,7 +186,7 @@ /obj/item/reagent_containers/food/snacks/baguette name = "baguette" desc = "Bon appetit!" - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' icon_state = "baguette" item_state = "baguette" bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) @@ -197,10 +198,21 @@ tastes = list("bread" = 1) foodtype = GRAIN +/obj/item/reagent_containers/food/snacks/griddle_toast + name = "griddle toast" + desc = "Thick cut bread, griddled to perfection." + icon = 'icons/obj/food/bread.dmi' + icon_state = "griddle_toast" + item_state = "garlicbread" + list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3) + tastes = list("toast" = 1) + foodtype = GRAIN + w_class = WEIGHT_CLASS_SMALL + /obj/item/reagent_containers/food/snacks/garlicbread name = "garlic bread" desc = "Alas, it is limited." - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' icon_state = "garlicbread" item_state = "garlicbread" bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 2) @@ -300,3 +312,52 @@ /obj/item/reagent_containers/food/snacks/butterdog/ComponentInitialize() . = ..() AddComponent(/datum/component/slippery, 80) + +/obj/item/reagent_containers/food/snacks/store/bread/corn + name = "cornbread" + desc = "Some good down-home country-style, rootin'-tootin', revolver-shootin', dad-gum yeehaw cornbread." + icon_state = "cornbread" + list_reagents = list(/datum/reagent/consumable/nutriment = 18) + tastes = list("cornbread" = 10) + foodtype = GRAIN + w_class = WEIGHT_CLASS_SMALL + slice_path = /obj/item/reagent_containers/food/snacks/breadslice/corn + slices_num = 6 + +/obj/item/reagent_containers/food/snacks/breadslice/corn + name = "cornbread slice" + desc = "A chunk of crispy, cowboy-style cornbread. Consume contentedly." + icon_state = "cornbread_slice" + foodtype = GRAIN + list_reagents = list(/datum/reagent/consumable/nutriment = 3) + +/obj/item/reagent_containers/food/snacks/rootdough/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/kitchen/rollingpin)) + if(isturf(loc)) + new /obj/item/reagent_containers/food/snacks/flatrootdough(loc) + to_chat(user, "You flatten [src].") + qdel(src) + else + to_chat(user, "You need to put [src] on a surface to roll it out!") + else + ..() + +/obj/item/reagent_containers/food/snacks/store/bread/root + name = "rootbread" + desc = "The lizard equivalent to bread, made from tubers like potatoes and yams mixed with ground nuts and seeds. Noticably denser than regular bread." + icon_state = "lizard_bread" + list_reagents = list(/datum/reagent/consumable/nutriment = 20) + tastes = list("bread" = 8, "nuts" = 2) + foodtype = VEGETABLES | NUTS + w_class = WEIGHT_CLASS_SMALL + slice_path = /obj/item/reagent_containers/food/snacks/breadslice/root + custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/bread + +/obj/item/reagent_containers/food/snacks/breadslice/root + name = "rootbread slice" + desc = "A slice of dense, chewy rootbread." + icon_state = "lizard_breadslice" + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + tastes = list("bread" = 8, "nuts" = 2) + foodtype = VEGETABLES | NUTS + customfoodfilling = 1 diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/burgers.dm similarity index 99% rename from code/modules/food_and_drinks/food/snacks_burgers.dm rename to code/modules/food_and_drinks/food/burgers.dm index 44ee559641e3..3cb8e2c5390e 100644 --- a/code/modules/food_and_drinks/food/snacks_burgers.dm +++ b/code/modules/food_and_drinks/food/burgers.dm @@ -1,6 +1,6 @@ /obj/item/reagent_containers/food/snacks/burger filling_color = "#CD853F" - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/burger.dmi' icon_state = "hburger" bitesize = 3 list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1) diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/cake.dm similarity index 90% rename from code/modules/food_and_drinks/food/snacks_cake.dm rename to code/modules/food_and_drinks/food/cake.dm index a048fb0e4371..bfdc964bb0ec 100644 --- a/code/modules/food_and_drinks/food/snacks_cake.dm +++ b/code/modules/food_and_drinks/food/cake.dm @@ -1,5 +1,5 @@ /obj/item/reagent_containers/food/snacks/store/cake - icon = 'icons/obj/food/piecake.dmi' + icon = 'icons/obj/food/cake.dmi' slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/plain slices_num = 5 bitesize = 3 @@ -9,7 +9,7 @@ foodtype = GRAIN | DAIRY /obj/item/reagent_containers/food/snacks/cakeslice - icon = 'icons/obj/food/piecake.dmi' + icon = 'icons/obj/food/cake.dmi' trash = /obj/item/trash/plate list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1) customfoodfilling = 0 //to avoid infinite cake-ception @@ -429,3 +429,52 @@ filling_color = "#7A3D80" tastes = list("cake" = 4, "violets" = 2, "jam" = 2) foodtype = GRAIN | DAIRY | FRUIT | SUGAR + +/obj/item/reagent_containers/food/snacks/store/cake/mothmallow + name = "mothmallow tray" + desc = "A light and fluffy vegan marshmallow flavoured with vanilla and rum and topped with soft chocolate. These are known to the moths as höllflöfstarkken: cloud squares." //höllflöf = cloud (höll = wind, flöf = cotton), starkken = squares + icon_state = "mothmallow_tray" + list_reagents = list( + /datum/reagent/consumable/nutriment = 20, + /datum/reagent/consumable/sugar = 20, + ) + tastes = list("vanilla" = 1, "clouds" = 1, "chocolate" = 1) + foodtype = VEGETABLES | SUGAR + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/mothmallow + slices_num = 6 + +/obj/item/reagent_containers/food/snacks/cakeslice/mothmallow + name = "mothmallow" + desc = "Fluffy little clouds of joy- in a strangely moth-like colour." + icon_state = "mothmallow_slice" + list_reagents = list( + /datum/reagent/consumable/nutriment = 4, + /datum/reagent/consumable/sugar = 4, + ) + tastes = list("vanilla" = 1, "clouds" = 1, "chocolate" = 1) + foodtype = VEGETABLES | SUGAR + +/obj/item/reagent_containers/food/snacks/store/cake/korta_brittle + name = "korta brittle slab" + desc = "A big slab of korta nut brittle. So sugary it should be a crime!" + icon_state = "korta_brittle" + list_reagents = list( + /datum/reagent/consumable/sugar = 20, + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/korta_nectar = 15, + ) + tastes = list("peppery heat" = 1, "sweetness" = 1) + foodtype = NUTS | SUGAR + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/korta_brittle + +/obj/item/reagent_containers/food/snacks/cakeslice/korta_brittle + name = "korta brittle slice" + desc = "A little slice of korta nut brittle. A diabetic's worst enemy." + icon_state = "korta_brittle_slice" + list_reagents = list( + /datum/reagent/consumable/sugar = 4, + /datum/reagent/consumable/nutriment = 3, + /datum/reagent/consumable/korta_nectar = 3, + ) + tastes = list("peppery heat" = 1, "sweetness" = 1) + foodtype = NUTS | SUGAR diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 589e986aaeeb..9aaa32c1ebbc 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -212,6 +212,44 @@ icon_state = "mayonnaise" list_reagents = list(/datum/reagent/consumable/mayonnaise = 50) +/obj/item/reagent_containers/food/condiment/peanut_butter + name = "peanut butter" + desc = "Tasty, fattening processed peanuts in a jar." + icon_state = "peanutbutter" + list_reagents = list(/datum/reagent/consumable/peanut_butter = 50) + fill_icon_thresholds = null + +/obj/item/reagent_containers/food/condiment/vinegar + name = "vinegar" + desc = "Perfect for chips, if you're feeling Space British." + icon_state = "vinegar" + list_reagents = list(/datum/reagent/consumable/vinegar = 50) + fill_icon_thresholds = null + +/obj/item/reagent_containers/food/condiment/quality_oil + name = "quality oil" + desc = "For the fancy chef inside everyone." + icon_state = "oliveoil" + list_reagents = list(/datum/reagent/consumable/quality_oil = 50) + fill_icon_thresholds = null + +/obj/item/reagent_containers/food/condiment/cornmeal + name = "cornmeal box" + desc = "A big box of cornmeal. Great for southern style cooking." + icon_state = "cornmeal" + item_state = "carton" + lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' + list_reagents = list(/datum/reagent/consumable/cornmeal = 30) + fill_icon_thresholds = null + +/obj/item/reagent_containers/food/condiment/yoghurt + name = "yoghurt carton" + desc = "Creamy and smooth." + icon_state = "yoghurt" + list_reagents = list(/datum/reagent/consumable/yoghurt = 50) + fill_icon_thresholds = null + //Food packs. To easily apply deadly toxi... delicious sauces to your food! /obj/item/reagent_containers/food/condiment/pack diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index c4daa88869a7..6353c48337f0 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -157,7 +157,7 @@ name = "burger" desc = "A timeless classic." ingredients_placement = INGREDIENTS_STACKPLUSTOP - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/burger.dmi' icon_state = "custburg" foodtype = GRAIN @@ -167,7 +167,7 @@ ingMax = 6 slice_path = /obj/item/reagent_containers/food/snacks/breadslice/custom slices_num = 5 - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' icon_state = "tofubread" foodtype = GRAIN @@ -177,7 +177,7 @@ ingMax = 6 slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/custom slices_num = 5 - icon = 'icons/obj/food/piecake.dmi' + icon = 'icons/obj/food/cake.dmi' icon_state = "plaincake" foodtype = GRAIN | DAIRY @@ -196,7 +196,7 @@ desc = "Noodles. With stuff. Delicious." ingredients_placement = INGREDIENTS_SCATTER ingMax = 6 - icon = 'icons/obj/food/pizzaspaghetti.dmi' + icon = 'icons/obj/food/spaghetti.dmi' icon_state = "spaghettiboiled" foodtype = GRAIN @@ -204,7 +204,7 @@ /obj/item/reagent_containers/food/snacks/customizable/pie name = "pie" ingMax = 6 - icon = 'icons/obj/food/piecake.dmi' + icon = 'icons/obj/food/pie.dmi' icon_state = "pie" foodtype = GRAIN | DAIRY @@ -216,7 +216,7 @@ ingMax = 8 slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/custom slices_num = 6 - icon = 'icons/obj/food/pizzaspaghetti.dmi' + icon = 'icons/obj/food/pizza.dmi' icon_state = "pizzamargherita" foodtype = GRAIN | DAIRY @@ -234,7 +234,7 @@ name = "toast" desc = "A timeless classic." ingredients_placement = INGREDIENTS_STACK - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' icon_state = "breadslice" var/finished = 0 foodtype = GRAIN diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/egg.dm similarity index 80% rename from code/modules/food_and_drinks/food/snacks_egg.dm rename to code/modules/food_and_drinks/food/egg.dm index 360053c28ca4..9c6cd36a5e5d 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/modules/food_and_drinks/food/egg.dm @@ -14,6 +14,7 @@ /obj/item/reagent_containers/food/snacks/egg name = "egg" desc = "An egg!" + icon = 'icons/obj/food/egg.dmi' icon_state = "egg" list_reagents = list(/datum/reagent/consumable/eggyolk = 5) cooked_type = /obj/item/reagent_containers/food/snacks/boiledegg @@ -89,6 +90,7 @@ /obj/item/reagent_containers/food/snacks/friedegg name = "fried egg" desc = "A fried egg, with a touch of salt and pepper." + icon = 'icons/obj/food/egg.dmi' icon_state = "friedegg" bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) bitesize = 1 @@ -100,6 +102,7 @@ /obj/item/reagent_containers/food/snacks/boiledegg name = "boiled egg" desc = "A hard boiled egg." + icon = 'icons/obj/food/egg.dmi' icon_state = "egg" bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) filling_color = "#FFFFF0" @@ -110,6 +113,7 @@ /obj/item/reagent_containers/food/snacks/omelette //FUCK THIS name = "omelette du fromage" desc = "That's all you can say!" + icon = 'icons/obj/food/egg.dmi' icon_state = "omelette" trash = /obj/item/trash/plate bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) @@ -140,6 +144,7 @@ /obj/item/reagent_containers/food/snacks/benedict name = "eggs benedict" desc = "There is only one egg on this, how rude." + icon = 'icons/obj/food/egg.dmi' icon_state = "benedict" bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4) trash = /obj/item/trash/plate @@ -152,9 +157,49 @@ /obj/item/reagent_containers/food/snacks/eggrolls name = "eggrolls" desc = "A core of fried eggs, packed into rice with a layer of seaweed protecting the inner sweetness" + icon = 'icons/obj/food/egg.dmi' icon_state = "eggroll" bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1) list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 5) filling_color = "#d3ceba" tastes = list("rice" = 1, "dried seaweed" = 1, "eggs" = 1) foodtype = BREAKFAST | FRIED + +/obj/item/reagent_containers/food/snacks/eggwrap + name = "egg wrap" + desc = "The precursor to Pigs in a Blanket." + icon = 'icons/obj/food/egg.dmi' + icon_state = "eggwrap" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3) + list_reagents = list(/datum/reagent/consumable/nutriment = 5) + filling_color = "#F0E68C" + tastes = list("egg" = 1) + foodtype = MEAT | GRAIN + +/obj/item/reagent_containers/food/snacks/black_eggs + name = "black scrambled eggs" + desc = "A country dish from rural Kalixcis. Made with eggs, animal blood, and foraged greens. Traditionally eaten with rootbread and a spicy sauce." + icon = 'icons/obj/food/egg.dmi' + icon_state = "black_eggs" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("eggs" = 1, "greens" = 1, "blood" = 1) + foodtype = MEAT | BREAKFAST | GORE + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/patzikula + name = "patzikula" + desc = "A smooth and spicy tomato-based sauce topped with eggs and baked. Delicious." + icon = 'icons/obj/food/egg.dmi' + icon_state = "patzikula" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/nutriment/vitamin = 8, + /datum/reagent/consumable/capsaicin = 2, + ) + tastes = list("eggs" = 1, "tomato" = 1, "heat" = 1) + foodtype = VEGETABLES | MEAT | BREAKFAST + w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/frozen.dm similarity index 95% rename from code/modules/food_and_drinks/food/snacks_frozen.dm rename to code/modules/food_and_drinks/food/frozen.dm index dfbed9ba9112..d14a62eb05ef 100644 --- a/code/modules/food_and_drinks/food/snacks_frozen.dm +++ b/code/modules/food_and_drinks/food/frozen.dm @@ -57,6 +57,17 @@ tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1) foodtype = FRUIT | DAIRY | SUGAR +/obj/item/reagent_containers/food/snacks/cornuto + name = "cornuto" + w_class = WEIGHT_CLASS_SMALL + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "cornuto" + desc = "A neapolitan vanilla and chocolate icecream cone. It menaces with a sprinkling of caramelized nuts." + tastes = list("chopped hazelnuts", "waffle") + list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 4, /datum/reagent/consumable/sugar = 2) + bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 4, /datum/reagent/consumable/sugar = 1) + foodtype = DAIRY | SUGAR + ///////////// //SNOWCONES// ///////////// @@ -181,7 +192,6 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/spacemountainwind = 5) tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5) - /obj/item/reagent_containers/food/snacks/snowcones/pwrgame name = "pwrgame snowcone" desc = "Pwrgame soda drizzled over a snowball in a paper cup." @@ -203,6 +213,23 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/laughter = 25) tastes = list("ice" = 1, "water" = 1, "sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3) +/obj/item/reagent_containers/food/snacks/snowcones/korta_ice + name = "korta ice" + desc = "Shaved ice, korta nectar and berries. A sweet treat to eat to beat summer heat!" + icon_state = "korta_ice" + list_reagents = list( + /datum/reagent/consumable/nutriment/vitamin = 8, + /datum/reagent/consumable/ice = 4, + /datum/reagent/consumable/berryjuice = 6, + ) + tastes = list("peppery sweet" = 1, "berry" = 1) + foodtype = NUTS | SUGAR | FRUIT + + +///////////// +//POPSICLES// +///////////// + /obj/item/reagent_containers/food/snacks/popsicle name = "bug popsicle" desc = "Mmmm, this should not exist." @@ -231,15 +258,6 @@ . = ..() update_appearance() -/obj/item/popsicle_stick - name = "popsicle stick" - icon = 'icons/obj/food/frozen_treats.dmi' - icon_state = "popsicle_stick" - desc = "This humble little stick usually carries a frozen treat, at the moment it seems freed from this atlassian burden." - custom_materials = list(/datum/material/wood=20) - w_class = WEIGHT_CLASS_TINY - force = 0 - /obj/item/reagent_containers/food/snacks/popsicle/creamsicle_orange name = "orange creamsicle" desc = "A classic orange creamsicle. A sunny frozen treat." @@ -262,21 +280,19 @@ bonus_reagents = list(/datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 3, /datum/reagent/consumable/sugar = 2) overlay_state = "jumbo" -/obj/item/reagent_containers/food/snacks/popsicle/licorice - name = "licorice icecream" - desc = "A salty licorice icecream." +/obj/item/reagent_containers/food/snacks/popsicle/creamsicle_licorice + name = "Milky Way™" + desc = "A salty licorice ice cream. A salty frozen treat." list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4) bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4) tastes = list("salty liquorice") - overlay_state = "nogga_black" + overlay_state = "licorice_creamsicle" -/obj/item/reagent_containers/food/snacks/cornuto - name = "cornuto" - w_class = WEIGHT_CLASS_SMALL +/obj/item/popsicle_stick + name = "popsicle stick" icon = 'icons/obj/food/frozen_treats.dmi' - icon_state = "cornuto" - desc = "A neapolitan vanilla and chocolate icecream cone. It menaces with a sprinkling of caramelized nuts." - tastes = list("chopped hazelnuts", "waffle") - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 4, /datum/reagent/consumable/sugar = 2) - bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 4, /datum/reagent/consumable/sugar = 1) - foodtype = DAIRY | SUGAR + icon_state = "popsicle_stick" + desc = "This humble little stick usually carries a frozen treat, at the moment it seems freed from this atlassian burden." + custom_materials = list(/datum/material/wood=20) + w_class = WEIGHT_CLASS_TINY + force = 0 diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/meat.dm similarity index 97% rename from code/modules/food_and_drinks/food/snacks_meat.dm rename to code/modules/food_and_drinks/food/meat.dm index 510130ce08be..56909c0899d0 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/meat.dm @@ -19,6 +19,7 @@ name = "fish fillet" desc = "A fillet of fish meat." icon_state = "fishfillet" + icon = 'icons/obj/food/meat.dmi' list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) bitesize = 6 filling_color = "#FA8072" @@ -85,7 +86,7 @@ /obj/item/reagent_containers/food/snacks/vegetariansushiroll name = "vegetarian sushi roll" desc = "A roll of simple vegetarian sushi with rice, carrots, and potatoes. Sliceable into pieces!" - icon_state = "vegan-sushi-roll" + icon_state = "vegan_sushi_roll" bonus_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 4) list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 4) filling_color = "#7daa70" @@ -97,7 +98,7 @@ /obj/item/reagent_containers/food/snacks/vegetariansushislice name = "vegetarian sushi slice" desc = "A slice of simple vegetarian sushi with rice, carrots, and potatoes." - icon_state = "vegan-sushi-slice" + icon_state = "vegan_sushi_slice" bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) filling_color = "#7daa70" @@ -107,7 +108,7 @@ /obj/item/reagent_containers/food/snacks/spicyfiletsushiroll name = "spicy filet sushi roll" desc = "A roll of tasty, spicy sushi made with fish and vegetables. Sliceable into pieces!" - icon_state = "spicy-sushi-roll" + icon_state = "spicy_sushi_roll" bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2) list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 4) filling_color = "#d8b02c" @@ -119,7 +120,7 @@ /obj/item/reagent_containers/food/snacks/spicyfiletsushislice name = "spicy filet sushi slice" desc = "A slice of tasty, spicy sushi made with fish and vegetables. Don't eat it too fast!." - icon_state = "spicy-sushi-slice" + icon_state = "spicy_sushi_slice" bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) filling_color = "#d8b02c" @@ -137,9 +138,9 @@ foodtype = VEGETABLES /obj/item/reagent_containers/food/snacks/fishi - name = "Fi-shi roll" + name = "Fi_shi roll" desc = "An entire fish, surrounded by a thick layer of seaweed. is this... edible?" - icon_state = "fi-shi" + icon_state = "fi_shi" bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/toxin/carpotoxin = 2) list_reagents = list(/datum/reagent/consumable/nutriment = 18, /datum/reagent/consumable/nutriment/vitamin = 8, /datum/reagent/toxin/carpotoxin = 8) filling_color = "#eac57b" @@ -430,6 +431,13 @@ tastes = list("tofu" = 3, "metal" = 1) foodtype = VEGETABLES +/obj/item/reagent_containers/food/snacks/kebab/tail + name = "lizard-tail kebab" + desc = "Severed lizard tail on a stick." + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("meat" = 8, "metal" = 4, "scales" = 1) + foodtype = MEAT // NOT GORE, tastes delicious! + /obj/item/reagent_containers/food/snacks/kebab/rat name = "rat-kebab" desc = "Not so delicious rat meat, on a stick." diff --git a/code/modules/food_and_drinks/food/other.dm b/code/modules/food_and_drinks/food/other.dm new file mode 100644 index 000000000000..bb927ec240b9 --- /dev/null +++ b/code/modules/food_and_drinks/food/other.dm @@ -0,0 +1,1690 @@ + +////////////////////////////////////////////OTHER//////////////////////////////////////////// + +/obj/item/reagent_containers/food/snacks/store/cheesewheel + name = "cheese wheel" + desc = "A big wheel of delcious Cheddar." + icon_state = "cheesewheel" + slice_path = /obj/item/reagent_containers/food/snacks/cheesewedge + slices_num = 5 + list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment/vitamin = 5) + w_class = WEIGHT_CLASS_NORMAL + tastes = list("cheese" = 1) + foodtype = DAIRY + +/obj/item/reagent_containers/food/snacks/royalcheese + name = "royal cheese" + desc = "Ascend the throne. Consume the wheel. Feel the POWER." + icon_state = "royalcheese" + list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/gold = 20, /datum/reagent/toxin/mutagen = 5) + w_class = WEIGHT_CLASS_BULKY + tastes = list("cheese" = 4, "royalty" = 1) + foodtype = DAIRY + +/obj/item/reagent_containers/food/snacks/cheesewedge + name = "cheese wedge" + desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far." + icon_state = "cheesewedge" + filling_color = "#FFD700" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) + tastes = list("cheese" = 1) + foodtype = DAIRY + +/obj/item/reagent_containers/food/snacks/watermelonslice + name = "watermelon slice" + desc = "A slice of watery goodness." + icon_state = "watermelonslice" + filling_color = "#FF1493" + tastes = list("watermelon" = 1) + foodtype = FRUIT + juice_results = list(/datum/reagent/consumable/watermelonjuice = 5) + +/obj/item/reagent_containers/food/snacks/candy_corn + name = "candy corn" + desc = "It's a handful of candy corn. Can be stored in a detective's hat." + icon_state = "candy_corn" + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2) + filling_color = "#FF8C00" + tastes = list("candy corn" = 1) + foodtype = JUNKFOOD | SUGAR + +/obj/item/reagent_containers/food/snacks/candy_corn/prison + name = "desiccated candy corn" + desc = "If this candy corn were any harder Security would confiscate it for being a potential shiv." + force = 1 // the description isn't lying + throwforce = 1 // if someone manages to bust out of jail with candy corn god bless them + tastes = list("bitter wax" = 1) + foodtype = GROSS + +/obj/item/reagent_containers/food/snacks/chocolatebar + name = "chocolate bar" + desc = "Such, sweet, fattening food." + icon_state = "chocolatebar" + list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2) + filling_color = "#A0522D" + tastes = list("chocolate" = 1) + foodtype = JUNKFOOD | SUGAR + +/obj/item/reagent_containers/food/snacks/hugemushroomslice + name = "huge mushroom slice" + desc = "A slice from a huge mushroom." + icon_state = "hugemushroomslice" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) + tastes = list("mushroom" = 1) + foodtype = VEGETABLES + +/obj/item/reagent_containers/food/snacks/popcorn + name = "popcorn" + desc = "Now let's find some cinema." + icon_state = "popcorn" + trash = /obj/item/trash/popcorn + list_reagents = list(/datum/reagent/consumable/nutriment = 2) + bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0 + filling_color = "#FFEFD5" + tastes = list("popcorn" = 3, "butter" = 1) + foodtype = JUNKFOOD + +/obj/item/reagent_containers/food/snacks/popcorn/Initialize() + . = ..() + eatverb = pick("bite","nibble","gnaw","gobble","chomp") + +/obj/item/reagent_containers/food/snacks/loadedbakedpotato + name = "loaded baked potato" + desc = "Totally baked." + icon_state = "loadedbakedpotato" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 6) + filling_color = "#D2B48C" + tastes = list("potato" = 1) + foodtype = VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/fries + name = "space fries" + desc = "AKA: French Fries, Freedom Fries, etc." + icon_state = "fries" + trash = /obj/item/trash/plate + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + filling_color = "#FFD700" + tastes = list("fries" = 3, "salt" = 1) + foodtype = VEGETABLES | GRAIN | FRIED + +/obj/item/reagent_containers/food/snacks/fries/Initialize() + . = ..() + AddElement(/datum/element/dunkable, 10) + +/obj/item/reagent_containers/food/snacks/tatortot + name = "tator tot" + desc = "A large fried potato nugget that may or may not try to valid you." + icon_state = "tatortot" + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + filling_color = "FFD700" + tastes = list("potato" = 3, "valids" = 1) + foodtype = FRIED | VEGETABLES + +/obj/item/reagent_containers/food/snacks/tatortot/Initialize() + . = ..() + AddElement(/datum/element/dunkable, 10) + +/obj/item/reagent_containers/food/snacks/soydope + name = "soy dope" + desc = "Dope from a soy." + icon_state = "soydope" + trash = /obj/item/trash/plate + list_reagents = list(/datum/reagent/consumable/nutriment = 2) + filling_color = "#DEB887" + tastes = list("soy" = 1) + foodtype = VEGETABLES + +/obj/item/reagent_containers/food/snacks/cheesyfries + name = "cheesy fries" + desc = "Fries. Covered in cheese. Duh." + icon_state = "cheesyfries" + trash = /obj/item/trash/plate + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 6) + filling_color = "#FFD700" + tastes = list("fries" = 3, "cheese" = 1) + foodtype = VEGETABLES | GRAIN | DAIRY + +/obj/item/reagent_containers/food/snacks/cheesyfries/Initialize() + . = ..() + AddElement(/datum/element/dunkable, 10) + +/obj/item/reagent_containers/food/snacks/badrecipe + name = "burned mess" + desc = "Someone should be demoted from cook for this." + icon_state = "badrecipe" + list_reagents = list(/datum/reagent/toxin/bad_food = 30) + filling_color = "#8B4513" + foodtype = GROSS + +/obj/item/reagent_containers/food/snacks/carrotfries + name = "carrot fries" + desc = "Tasty fries from fresh Carrots." + icon_state = "carrotfries" + trash = /obj/item/trash/plate + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/oculine = 3, /datum/reagent/consumable/nutriment/vitamin = 2) + filling_color = "#FFA500" + tastes = list("carrots" = 3, "salt" = 1) + foodtype = VEGETABLES + +/obj/item/reagent_containers/food/snacks/carrotfries/Initialize() + . = ..() + AddElement(/datum/element/dunkable, 10) + +/obj/item/reagent_containers/food/snacks/candiedapple + name = "candied apple" + desc = "An apple coated in sugary sweetness." + icon_state = "candiedapple" + bitesize = 3 + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 3) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/caramel = 5) + filling_color = "#FF4500" + tastes = list("apple" = 2, "caramel" = 3) + foodtype = JUNKFOOD | FRUIT | SUGAR + +/obj/item/reagent_containers/food/snacks/mint + name = "mint" + desc = "It is only wafer thin." + icon_state = "mint" + bitesize = 1 + trash = /obj/item/trash/plate + list_reagents = list(/datum/reagent/toxin/minttoxin = 2) + filling_color = "#800000" + foodtype = TOXIC | SUGAR + +/obj/item/reagent_containers/food/snacks/spidereggs + name = "spider eggs" + desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health." + icon_state = "spidereggs" + list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin = 2) + filling_color = "#008000" + tastes = list("cobwebs" = 1) + foodtype = MEAT | TOXIC + +/obj/item/reagent_containers/food/snacks/spiderling + name = "spiderling" + desc = "It's slightly twitching in your hand. Ew..." + icon_state = "spiderling" + list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin = 4) + filling_color = "#00800" + tastes = list("cobwebs" = 1, "guts" = 2) + foodtype = MEAT | TOXIC + +/obj/item/reagent_containers/food/snacks/spiderlollipop + name = "spider lollipop" + desc = "Still gross, but at least it has a mountain of sugar on it." + icon_state = "spiderlollipop" + list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/omnizine = 2) //lollipop, but vitamins = toxins + filling_color = "#00800" + tastes = list("cobwebs" = 1, "sugar" = 2) + foodtype = JUNKFOOD | SUGAR + +/obj/item/reagent_containers/food/snacks/chococoin + name = "chocolate coin" + desc = "A completely edible but nonflippable festive coin." + icon_state = "chococoin" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/coco = 1) + filling_color = "#A0522D" + tastes = list("chocolate" = 1) + foodtype = JUNKFOOD | SUGAR + +/obj/item/reagent_containers/food/snacks/fudgedice + name = "fudge dice" + desc = "A little cube of chocolate that tends to have a less intense taste if you eat too many at once." + icon_state = "chocodice" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/coco = 1) + filling_color = "#A0522D" + trash = /obj/item/dice/fudge + tastes = list("fudge" = 1) + foodtype = JUNKFOOD | SUGAR + +/obj/item/reagent_containers/food/snacks/chocoorange + name = "chocolate orange" + desc = "A festive chocolate orange." + icon_state = "chocoorange" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 1) + filling_color = "#A0522D" + tastes = list("chocolate" = 3, "oranges" = 1) + foodtype = JUNKFOOD | SUGAR + +/obj/item/reagent_containers/food/snacks/eggplantparm + name = "eggplant parmigiana" + desc = "The only good recipe for eggplant." + icon_state = "eggplantparm" + trash = /obj/item/trash/plate + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3) + list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2) + filling_color = "#BA55D3" + tastes = list("eggplant" = 3, "cheese" = 1) + foodtype = VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/burrito + name = "burrito" + desc = "Tortilla wrapped goodness." + icon_state = "burrito" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1) + filling_color = "#FFEFD5" + tastes = list("torilla" = 2, "meat" = 3) + foodtype = GRAIN | MEAT + +/obj/item/reagent_containers/food/snacks/cheesyburrito + name = "cheesy burrito" + desc = "It's a burrito filled with cheese." + icon_state = "cheesyburrito" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) + filling_color = "#FFD800" + tastes = list("torilla" = 2, "meat" = 3, "cheese" = 1) + foodtype = GRAIN | MEAT | DAIRY + +/obj/item/reagent_containers/food/snacks/carneburrito + name = "carne asada burrito" + desc = "The best burrito for meat lovers." + icon_state = "carneburrito" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1) + filling_color = "#A0522D" + tastes = list("torilla" = 2, "meat" = 4) + foodtype = GRAIN | MEAT + +/obj/item/reagent_containers/food/snacks/fuegoburrito + name = "fuego plasma burrito" + desc = "A super spicy burrito." + icon_state = "fuegoburrito" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3) + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/capsaicin = 5, /datum/reagent/consumable/nutriment/vitamin = 3) + filling_color = "#FF2000" + tastes = list("torilla" = 2, "meat" = 3, "hot peppers" = 1) + foodtype = GRAIN | MEAT + +/obj/item/reagent_containers/food/snacks/yakiimo + name = "yaki imo" + desc = "Made with roasted sweet potatoes!" + icon_state = "yakiimo" + trash = /obj/item/trash/plate + list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 4) + filling_color = "#8B1105" + tastes = list("sweet potato" = 1) + foodtype = GRAIN | VEGETABLES | SUGAR + +/obj/item/reagent_containers/food/snacks/roastparsnip + name = "roast parsnip" + desc = "Sweet and crunchy." + icon_state = "roastparsnip" + trash = /obj/item/trash/plate + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 4) + filling_color = "#FF5500" + tastes = list("parsnip" = 1) + foodtype = VEGETABLES + +/obj/item/reagent_containers/food/snacks/melonfruitbowl + name = "melon fruit bowl" + desc = "For people who wants edible fruit bowls." + icon_state = "melonfruitbowl" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4) + filling_color = "#FF5500" + w_class = WEIGHT_CLASS_NORMAL + tastes = list("melon" = 1) + foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/nachos + name = "nachos" + desc = "Chips from Space Mexico." + icon_state = "nachos" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2) + filling_color = "#F4A460" + tastes = list("nachos" = 1) + foodtype = VEGETABLES | FRIED + +/obj/item/reagent_containers/food/snacks/cheesynachos + name = "cheesy nachos" + desc = "The delicious combination of nachos and melting cheese." + icon_state = "cheesynachos" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3) + filling_color = "#FFD700" + tastes = list("nachos" = 2, "cheese" = 1) + foodtype = VEGETABLES | FRIED | DAIRY + +/obj/item/reagent_containers/food/snacks/cubannachos + name = "Cuban nachos" + desc = "That's some dangerously spicy nachos." + icon_state = "cubannachos" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3) + list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/capsaicin = 8, /datum/reagent/consumable/nutriment/vitamin = 4) + filling_color = "#DC143C" + tastes = list("nachos" = 2, "hot pepper" = 1) + foodtype = VEGETABLES | FRIED | DAIRY + +/obj/item/reagent_containers/food/snacks/melonkeg + name = "melon keg" + desc = "Who knew vodka was a fruit?" + icon_state = "melonkeg" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 3) + list_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/ethanol/vodka = 15, /datum/reagent/consumable/nutriment/vitamin = 4) + filling_color = "#FFD700" + volume = 80 + bitesize = 5 + tastes = list("grain alcohol" = 1, "fruit" = 1) + foodtype = FRUIT | ALCOHOL + +/obj/item/reagent_containers/food/snacks/honeybar + name = "honey nut bar" + desc = "Oats and nuts compressed together into a bar, held together with a honey glaze." + icon_state = "honeybar" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/honey = 2, /datum/reagent/consumable/nutriment/vitamin = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/honey = 5) + filling_color = "#F2CE91" + tastes = list("oats" = 3, "nuts" = 2, "honey" = 1) + foodtype = GRAIN | SUGAR + +/obj/item/reagent_containers/food/snacks/stuffedlegion + name = "stuffed legion" + desc = "The former skull of a damned human, filled with goliath meat. It has a decorative lava pool made of ketchup and hotsauce." + icon_state = "stuffed_legion" + bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/consumable/capsaicin = 1, /datum/reagent/medicine/tricordrazine = 5) + list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/capsaicin = 2, /datum/reagent/medicine/tricordrazine = 10) + tastes = list("death" = 2, "rock" = 1, "meat" = 1, "hot peppers" = 1) + foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/powercrepe + name = "Powercrepe" + desc = "With great power, comes great crepes. It looks like a pancake filled with jelly but packs quite a punch." + icon_state = "powercrepe" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/iron = 10) + list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/cherryjelly = 5) + force = 30 + throwforce = 15 + block_chance = 55 + armour_penetration = 80 + attack_verb = list("slapped", "slathered") + w_class = WEIGHT_CLASS_BULKY + tastes = list("cherry" = 1, "crepe" = 1) + foodtype = GRAIN | FRUIT | SUGAR + +/obj/item/reagent_containers/food/snacks/chewable + slot_flags = ITEM_SLOT_MASK + ///How long it lasts before being deleted + var/succ_dur = 180 + ///The delay between each time it will handle reagents + var/succ_int = 100 + ///Stores the time set for the next handle_reagents + var/next_succ = 0 + + //makes snacks actually wearable as masks and still edible the old fashioned way. +/obj/item/reagent_containers/food/snacks/chewable/proc/handle_reagents() + if(reagents.total_volume) + if(iscarbon(loc)) + var/mob/living/carbon/C = loc + if (src == C.wear_mask) // if it's in the human/monkey mouth, transfer reagents to the mob + if(!reagents.trans_to(C, REAGENTS_METABOLISM, method = INGEST)) + reagents.remove_any(REAGENTS_METABOLISM) + return + reagents.remove_any(REAGENTS_METABOLISM) + +/obj/item/reagent_containers/food/snacks/chewable/process() + if(iscarbon(loc)) + if(succ_dur < 1) + qdel(src) + return + succ_dur-- + if((reagents && reagents.total_volume) && (next_succ <= world.time)) + handle_reagents() + next_succ = world.time + succ_int + +/obj/item/reagent_containers/food/snacks/chewable/equipped(mob/user, slot) + . = ..() + if(slot == ITEM_SLOT_MASK) + START_PROCESSING(SSobj, src) + else + STOP_PROCESSING(SSobj, src) + +/obj/item/reagent_containers/food/snacks/chewable/Destroy() + STOP_PROCESSING(SSobj, src) + . = ..() + +/obj/item/reagent_containers/food/snacks/chewable/lollipop + name = "lollipop" + desc = "A delicious lollipop. Makes for a great Valentine's present." + icon = 'icons/obj/lollipop.dmi' + icon_state = "lollipop_stick" + item_state = "lollipop_stick" + list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/omnizine = 2) //Honk + var/mutable_appearance/head + var/headcolor = rgb(0, 0, 0) + succ_dur = 180 + succ_int = 100 + next_succ = 0 + tastes = list("candy" = 1) + foodtype = JUNKFOOD | SUGAR + +/obj/item/reagent_containers/food/snacks/chewable/lollipop/Initialize() + . = ..() + head = mutable_appearance('icons/obj/lollipop.dmi', "lollipop_head") + change_head_color(rgb(rand(0, 255), rand(0, 255), rand(0, 255))) + +/obj/item/reagent_containers/food/snacks/chewable/lollipop/proc/change_head_color(C) + headcolor = C + cut_overlay(head) + head.color = C + add_overlay(head) + +/obj/item/reagent_containers/food/snacks/chewable/lollipop/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + ..(hit_atom) + throw_speed = 1 + throwforce = 0 + +/obj/item/reagent_containers/food/snacks/chewable/lollipop/cyborg + var/spamchecking = TRUE + +/obj/item/reagent_containers/food/snacks/chewable/lollipop/cyborg/Initialize() + . = ..() + addtimer(CALLBACK(src, PROC_REF(spamcheck)), 1200) + +/obj/item/reagent_containers/food/snacks/chewable/lollipop/cyborg/equipped(mob/living/user, slot) + . = ..(user, slot) + spamchecking = FALSE + +/obj/item/reagent_containers/food/snacks/chewable/lollipop/cyborg/proc/spamcheck() + if(spamchecking) + qdel(src) + +/obj/item/reagent_containers/food/snacks/chewable/bubblegum + name = "bubblegum" + desc = "A rubbery strip of gum. Not exactly filling, but it keeps you busy." + icon_state = "bubblegum" + item_state = "bubblegum" + color = "#E48AB5" // craftable custom gums someday? + list_reagents = list(/datum/reagent/consumable/sugar = 5) + tastes = list("candy" = 1) + +/obj/item/reagent_containers/food/snacks/chewable/bubblegum/nicotine + name = "nicotine gum" + list_reagents = list(/datum/reagent/drug/nicotine = 10, /datum/reagent/consumable/menthol = 5) + tastes = list("mint" = 1) + color = "#60A584" + +/obj/item/reagent_containers/food/snacks/chewable/bubblegum/happiness + name = "HP+ gum" + desc = "A rubbery strip of gum. It smells funny." + list_reagents = list(/datum/reagent/drug/happiness = 15) + tastes = list("paint thinner" = 1) + color = "#EE35FF" + +/obj/item/reagent_containers/food/snacks/chewable/bubblegum/bubblegum + name = "bubblegum gum" + desc = "A rubbery strip of gum. You don't feel like eating it is a good idea." + color = "#913D3D" + list_reagents = list(/datum/reagent/blood = 15) + tastes = list("hell" = 1) + +/obj/item/reagent_containers/food/snacks/chewable/bubblegum/bubblegum/process() + . = ..() + if(iscarbon(loc)) + hallucinate(loc) + + +/obj/item/reagent_containers/food/snacks/chewable/bubblegum/bubblegum/On_Consume(mob/living/eater) + . = ..() + if(iscarbon(eater)) + hallucinate(eater) + +///This proc has a 5% chance to have a bubblegum line appear, with an 85% chance for just text and 15% for a bubblegum hallucination and scarier text. +/obj/item/reagent_containers/food/snacks/chewable/bubblegum/bubblegum/proc/hallucinate(mob/living/carbon/victim) + if(!prob(5)) //cursed by bubblegum + return + if(prob(15)) + new /datum/hallucination/oh_yeah(victim) + to_chat(victim, "[pick("I AM IMMORTAL.","I SHALL TAKE YOUR WORLD.","I SEE YOU.","YOU CANNOT ESCAPE ME FOREVER.","NOTHING CAN HOLD ME.")]") + else + to_chat(victim, "[pick("You hear faint whispers.","You smell ash.","You feel hot.","You hear a roar in the distance.")]") + +/obj/item/reagent_containers/food/snacks/gumball + name = "gumball" + desc = "A colorful, sugary gumball." + icon = 'icons/obj/lollipop.dmi' + icon_state = "gumball" + list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/bicaridine = 2, /datum/reagent/medicine/kelotane = 2) //Kek + tastes = list("candy") + foodtype = JUNKFOOD + +/obj/item/reagent_containers/food/snacks/gumball/Initialize() + . = ..() + color = rgb(rand(0, 255), rand(0, 255), rand(0, 255)) + +/obj/item/reagent_containers/food/snacks/gumball/cyborg + var/spamchecking = TRUE + +/obj/item/reagent_containers/food/snacks/gumball/cyborg/Initialize() + . = ..() + addtimer(CALLBACK(src, PROC_REF(spamcheck)), 1200) + +/obj/item/reagent_containers/food/snacks/gumball/cyborg/equipped(mob/living/user, slot) + . = ..(user, slot) + spamchecking = FALSE + +/obj/item/reagent_containers/food/snacks/gumball/cyborg/proc/spamcheck() + if(spamchecking) + qdel(src) + +/obj/item/reagent_containers/food/snacks/taco + name = "taco" + desc = "A traditional taco with meat, cheese, and lettuce." + icon_state = "taco" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) + filling_color = "F0D830" + tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1) + foodtype = MEAT | DAIRY | GRAIN | VEGETABLES + +/obj/item/reagent_containers/food/snacks/taco/plain + desc = "A traditional taco with meat and cheese, minus the rabbit food." + icon_state = "taco_plain" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) + tastes = list("taco" = 4, "meat" = 2, "cheese" = 2) + foodtype = MEAT | DAIRY | GRAIN + +/obj/item/reagent_containers/food/snacks/branrequests + name = "Bran Requests Cereal" + desc = "A dry cereal that satiates your requests for bran. Tastes uniquely like raisins and salt." + icon_state = "bran_requests" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/sodiumchloride = 5) + bonus_reagents = list(/datum/reagent/consumable/sodiumchloride = 10) + tastes = list("bran" = 4, "raisins" = 3, "salt" = 1) + foodtype = GRAIN | FRUIT | BREAKFAST + +/obj/item/reagent_containers/food/snacks/butter + name = "stick of butter" + desc = "A stick of delicious, golden, fatty goodness." + icon_state = "butter" + list_reagents = list(/datum/reagent/consumable/nutriment = 5) + filling_color = "#FFD700" + tastes = list("butter" = 1) + foodtype = DAIRY + +/obj/item/reagent_containers/food/snacks/butter/examine(mob/user) + . = ..() + . += "If you had a rod you could make butter on a stick." + +/obj/item/reagent_containers/food/snacks/butter/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/stack/rods)) + var/obj/item/stack/rods/R = W + if(!R.use(1))//borgs can still fail this if they have no metal + to_chat(user, "You do not have enough metal to put [src] on a stick!") + return ..() + to_chat(user, "You stick the rod into the stick of butter.") + var/obj/item/reagent_containers/food/snacks/butter/on_a_stick/new_item = new(usr.loc) + var/replace = (user.get_inactive_held_item() == R) + if(!R && replace) + user.put_in_hands(new_item) + qdel(src) + return TRUE + ..() + +/obj/item/reagent_containers/food/snacks/butter/on_a_stick //there's something so special about putting it on a stick. + name = "butter on a stick" + desc = "delicious, golden, fatty goodness on a stick." + icon_state = "butteronastick" + trash = /obj/item/stack/rods + +/obj/item/reagent_containers/food/snacks/onionrings + name = "onion rings" + desc = "Onion slices coated in batter." + icon_state = "onionrings" + list_reagents = list(/datum/reagent/consumable/nutriment = 3) + filling_color = "#C0C9A0" + gender = PLURAL + tastes = list("batter" = 3, "onion" = 1) + foodtype = VEGETABLES + +/obj/item/reagent_containers/food/snacks/pineappleslice + name = "pineapple slice" + desc = "A sliced piece of juicy pineapple." + icon_state = "pineapple_slice" + filling_color = "#F6CB0B" + juice_results = list(/datum/reagent/consumable/pineapplejuice = 3) + tastes = list("pineapple" = 1) + foodtype = FRUIT | PINEAPPLE + +/obj/item/reagent_containers/food/snacks/tinychocolate + name = "chocolate" + desc = "A tiny and sweet chocolate." + icon_state = "tiny_chocolate" + list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/coco = 1) + filling_color = "#A0522D" + tastes = list("chocolate" = 1) + foodtype = JUNKFOOD | SUGAR + +/obj/item/reagent_containers/food/snacks/canned + name = "Canned Air" + desc = "If you ever wondered where air came from..." + list_reagents = list(/datum/reagent/oxygen = 6, /datum/reagent/nitrogen = 24) + icon = 'icons/obj/food/canned.dmi' + icon_state = "peachcan" + in_container = TRUE + reagent_flags = NONE + spillable = FALSE + w_class = WEIGHT_CLASS_NORMAL + volume = 30 + +/obj/item/reagent_containers/food/snacks/canned/proc/open_can(mob/user) + to_chat(user, "You pull back the tab of \the [src].") + playsound(user.loc, 'sound/items/foodcanopen.ogg', 50) + reagents.flags |= OPENCONTAINER + spillable = TRUE + +/obj/item/reagent_containers/food/snacks/canned/attack_self(mob/user) + if(!is_drainable()) + open_can(user) + icon_state = "[icon_state]_open" + return ..() + +/obj/item/reagent_containers/food/snacks/canned/attack(mob/living/M, mob/user, def_zone) + if (!is_drainable()) + to_chat(user, "[src]'s lid hasn't been opened!") + return 0 + return ..() + +/obj/item/reagent_containers/food/snacks/canned/beans + name = "tin of beans" + desc = "Musical fruit in a slightly less musical container." + icon_state = "beans" + trash = /obj/item/trash/can/food/beans + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 10) + filling_color = "#B22222" + tastes = list("beans" = 1) + foodtype = VEGETABLES + +/obj/item/reagent_containers/food/snacks/canned/peaches + name = "canned peaches" + desc = "Just a nice can of ripe peaches swimming in their own juices." + icon_state = "peachcan" + trash = /obj/item/trash/can/food/peaches + list_reagents = list(/datum/reagent/consumable/peachjuice = 20, /datum/reagent/consumable/sugar = 8, /datum/reagent/consumable/nutriment = 2) + filling_color = "#ffdf26" + tastes = list("peaches" = 7, "tin" = 1) + foodtype = FRUIT | SUGAR + +/obj/item/reagent_containers/food/snacks/canned/peaches/maint + name = "maintenance peaches" + desc = "I have a mouth and I must eat." + icon_state = "peachcanmaint" + trash = /obj/item/trash/can/food/peaches/maint + tastes = list("peaches" = 1, "tin" = 7) + +/obj/item/reagent_containers/food/snacks/canned/tomatoes + name = "canned San Marzano tomatoes" + desc = "A can of premium San Marzano tomatoes, from the hills of Southern Italy." + icon_state = "tomatoescan" + trash = /obj/item/trash/can/food/tomatoes + list_reagents = list(/datum/reagent/consumable/tomatojuice = 20, /datum/reagent/consumable/sodiumchloride = 2) + tastes = list("tomato" = 7, "tin" = 1) + foodtype = VEGETABLES //fuck you, real life! + +/obj/item/reagent_containers/food/snacks/canned/pine_nuts + name = "canned pine nuts" + desc = "A small can of pine nuts. Can be eaten on their own, if you're into that." + icon_state = "pinenutscan" + trash = /obj/item/trash/can/food/pine_nuts + list_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 3) + tastes = list("pine nuts" = 1) + foodtype = NUTS + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/canned/jellyfish + name = "canned gunner jellyfish" + desc = "A can of gunner jellyfish packed in brine. Contains a mild hallucinogen which is destroyed by cooking." + icon_state = "jellyfish" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/toxin/mindbreaker = 2, + /datum/reagent/consumable/sodiumchloride = 1, + ) + trash = /obj/item/trash/can/food/jellyfish + tastes = list("slime" = 1, "burning" = 1, "salt" = 1) + foodtype = SEAFOOD | GORE + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/canned/desert_snails + name = "canned desert snails" + desc = "Giant snails from the Kalixcis' oceanic environment, packaged in brine. Shells included. Probably best not eaten raw, unless you're a Kalixcian." + icon_state = "snails" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/sodiumchloride = 2, + ) + trash = /obj/item/trash/can/food/desert_snails + tastes = list("snails" = 1) + foodtype = MEAT | GORE + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/canned/larvae + name = "canned bee larva" + desc = "A can of bee larva packaged in honey. Probably appetizing to someone." + icon_state = "larvae" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/honey = 2, + ) + trash = /obj/item/trash/can/food/larvae + tastes = list("sweet bugs" = 1) + foodtype = MEAT | GORE | BUGS + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/crab_rangoon + name = "crab rangoon" + desc = "Has many names, like crab puffs, cheese wontons, crab dumplings? Whatever you call them, they're a fabulous blast of cream cheesy crab." + icon_state = "crabrangoon" + list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 5) + filling_color = "#f2efdc" + w_class = WEIGHT_CLASS_SMALL + tastes = list("cream cheese" = 4, "crab" = 3, "crispiness" = 2) + foodtype = MEAT | DAIRY | GRAIN + +/obj/item/reagent_containers/food/snacks/cornchips + name = "boritos corn chips" + desc = "Triangular corn chips. They do seem a bit bland but would probably go well with some kind of dipping sauce." + icon_state = "boritos" + trash = /obj/item/trash/boritos + bitesize = 2 + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/sodiumchloride = 3) + junkiness = 20 + filling_color = "#ECA735" + tastes = list("fried corn" = 1) + foodtype = JUNKFOOD | FRIED + +//Curd cheese, a general term which I will now proceed to stretch as thin as the toppings on a supermarket sandwich: +//I'll use it as a substitute for ricotta, cottage cheese and quark, as well as any other non-aged, soft grainy cheese +/obj/item/reagent_containers/food/snacks/curd_cheese + name = "curd cheese" + desc = "Known by many names throughout human cuisine, curd cheese is useful for a wide variety of dishes." + icon_state = "curd_cheese" + cooked_type = /obj/item/reagent_containers/food/snacks/cheese_curds + list_reagents = list(/datum/reagent/consumable/cooking_oil = 3, /datum/reagent/consumable/cream = 1) + tastes = list("cream" = 1, "cheese" = 1) + foodtype = DAIRY + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/cheese_curds + name = "cheese curds" + desc = "Not to be mistaken for curd cheese. Tasty deep fried." + icon_state = "cheese_curds" + list_reagents = list(/datum/reagent/consumable/cooking_oil = 3) + tastes = list("cheese" = 1) + foodtype = DAIRY + w_class = WEIGHT_CLASS_SMALL + dried_type = /obj/item/reagent_containers/food/snacks/firm_cheese + +/obj/item/reagent_containers/food/snacks/firm_cheese + name = "firm cheese" + desc = "Firm aged cheese, similar in texture to firm tofu. Due to its lack of moisture it's particularly useful for cooking with, as it doesn't melt easily." + icon_state = "firm_cheese" + list_reagents = list(/datum/reagent/consumable/cooking_oil = 3) + tastes = list("aged cheese" = 1) + foodtype = DAIRY | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + slice_path = /obj/item/reagent_containers/food/snacks/firm_cheese_slice + slices_num = 3 + +/obj/item/reagent_containers/food/snacks/firm_cheese_slice + name = "firm cheese slice" + desc = "A slice of firm cheese. Perfect for grilling or making into delicious pesto." + icon_state = "firm_cheese_slice" + list_reagents = list(/datum/reagent/consumable/cooking_oil = 3) + tastes = list("aged cheese" = 1) + foodtype = DAIRY | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + cooked_type = /obj/item/reagent_containers/food/snacks/grilled_cheese + +/obj/item/reagent_containers/food/snacks/mozzarella + name = "mozzarella cheese" + desc = "Delicious, creamy, and cheesy, all in one simple package." + icon_state = "mozzarella" + list_reagents = list(/datum/reagent/consumable/cooking_oil = 3) + tastes = list("mozzarella" = 1) + foodtype = DAIRY + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/pesto + name = "pesto" + desc = "A combination of firm cheese, salt, herbs, garlic, oil, and pine nuts. Frequently used as a sauce for pasta or pizza, or eaten on bread." + icon_state = "pesto" + list_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 3) + tastes = list("pesto" = 1) + foodtype = VEGETABLES | DAIRY | NUTS + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/tomato_sauce + name = "tomato sauce" + desc = "Tomato sauce, perfect for pizza or pasta. Mamma mia!" + icon_state = "tomato_sauce" + list_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 3) + tastes = list("tomato" = 1, "herbs" = 1) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/bechamel_sauce + name = "béchamel sauce" + desc = "A classic white sauce common to several European cultures." + icon_state = "bechamel_sauce" + list_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 3) + tastes = list("cream" = 1) + foodtype = DAIRY | GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/roasted_bell_pepper + name = "roasted bell pepper" + desc = "A blackened, blistered bell pepper. Great for making sauces." + icon_state = "roasted_bell_pepper" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/char = 1) + tastes = list("bell pepper" = 1, "char" = 1) + foodtype = VEGETABLES + +//DONK DINNER: THE INNOVATIVE WAY TO GET YOUR DAILY RECOMMENDED ALLOWANCE OF SALT... AND THEN SOME! +/obj/item/reagent_containers/food/snacks/ready_donk + name = "\improper Ready-Donk: Bachelor Chow" + desc = "A quick Donk-dinner: now with flavour!" + icon_state = "ready_donk" + icon = 'icons/obj/food/donk.dmi' + trash = /obj/item/trash/ready_donk + list_reagents = list(/datum/reagent/consumable/nutriment = 5) + cooked_type = /obj/item/reagent_containers/food/snacks/ready_donk/warm + tastes = list("food?" = 2, "laziness" = 1) + foodtype = MEAT | JUNKFOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/ready_donk/examine_more(mob/user) + var/list/msg = list(span_notice("You browse the back of the box...")) + msg += "\t[span_info("Ready-Donk: a product of Donk Co.")]" + msg += "\t[span_info("Heating instructions: open box and pierce film, heat in microwave on high for 2 minutes. Allow to stand for 60 seconds prior to eating. Product will be hot.")]" + msg += "\t[span_info("Per 200g serving contains: 8g Sodium; 25g Fat, of which 22g are saturated; 2g Sugar.")]" + return msg + +/obj/item/reagent_containers/food/snacks/ready_donk/warm + name = "warm Ready-Donk: Bachelor Chow" + desc = "A quick Donk-dinner, now with flavour! And it's even hot!" + icon = 'icons/obj/food/donk.dmi' + icon_state = "ready_donk_warm" + list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/omnizine = 3) + cooked_type = null + tastes = list("food?" = 2, "laziness" = 1) + +/obj/item/reagent_containers/food/snacks/ready_donk/mac_n_cheese + name = "\improper Ready-Donk: Donk-a-Roni" + desc = "Neon-orange mac n' cheese in seconds!" + cooked_type = /obj/item/reagent_containers/food/snacks/ready_donk/warm/mac_n_cheese + tastes = list("cheesy pasta" = 2, "laziness" = 1) + foodtype = GRAIN | DAIRY | JUNKFOOD + +/obj/item/reagent_containers/food/snacks/ready_donk/warm/mac_n_cheese + name = "warm Ready-Donk: Donk-a-Roni" + desc = "Neon-orange mac n' cheese, ready to eat!" + icon_state = "ready_donk_warm_mac" + tastes = list("cheesy pasta" = 2, "laziness" = 1) + foodtype = GRAIN | DAIRY | JUNKFOOD + +/obj/item/reagent_containers/food/snacks/ready_donk/donkhiladas + name = "\improper Ready-Donk: Donkhiladas" + desc = "Donk Co's signature Donkhiladas with Donk sauce, for an 'authentic' taste of Mexico." + cooked_type = /obj/item/reagent_containers/food/snacks/ready_donk/warm/donkhiladas + tastes = list("enchiladas" = 2, "laziness" = 1) + foodtype = GRAIN | DAIRY | MEAT | VEGETABLES | JUNKFOOD + +/obj/item/reagent_containers/food/snacks/ready_donk/warm/donkhiladas + name = "warm Ready-Donk: Donkhiladas" + desc = "Donk Co's signature Donkhiladas with Donk sauce, served as hot as the Mexican sun." + icon_state = "ready_donk_warm_mex" + tastes = list("enchiladas" = 2, "laziness" = 1) + foodtype = GRAIN | DAIRY | JUNKFOOD + +/obj/item/reagent_containers/food/snacks/herby_cheese + name = "herby cheese" + desc = "As a staple of spacer cuisine, cheese is often augmented with various flavours to keep variety in their diet whilst traveling without reliable access to refrigeration. \ + Herbs are one such addition, and are particularly beloved." + icon_state = "herby_cheese" + list_reagents = list(/datum/reagent/consumable/cooking_oil = 6) + tastes = list("cheese" = 1, "herbs" = 1) + foodtype = DAIRY | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/grilled_cheese + name = "grilled cheese" + desc = "A staple sandwich, the classic grilled cheese consists simply of griddled bread and cheese. Anything else, *and it's a melt*." + icon_state = "grilled_cheese" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/char = 1, + ) + tastes = list("cheese" = 1, "char" = 1) + foodtype = DAIRY + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/mothic_salad + name = "basic salad" + desc = "A basic salad of cabbage, red onion and tomato. Can serve as a perfect base for a million different salads." + icon_state = "mothic_salad" + list_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("salad" = 1) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/toasted_seeds + name = "toasted seeds" + desc = "While they're far from filling, toasted seeds are a popular snack amongst travelers. \ + Salt, sugar, or even some more exotic flavours may be added for some extra pep." + icon_state = "toasted_seeds" + list_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("seeds" = 1) + foodtype = GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/engine_fodder + name = "comet trail" + desc = "A common snack for engineers on modern military vessels, made of seeds, nuts, chocolate, popcorn, and potato chips- \ + designed to be dense with calories and easy to snack on when an extra boost is needed." + icon_state = "engine_fodder" + list_reagents = list( + /datum/reagent/consumable/nutriment/vitamin = 6, + /datum/reagent/consumable/sugar = 4, + /datum/reagent/consumable/nutriment = 4, + /datum/reagent/consumable/sodiumchloride = 2, + ) + tastes = list("seeds" = 1, "nuts" = 1, "chocolate" = 1, "salt" = 1, "popcorn" = 1, "potato" = 1) + foodtype = GRAIN | NUTS | VEGETABLES | SUGAR + w_class = WEIGHT_CLASS_SMALL + +//Entrees: categorising food that is 90% cheese and salad is not easy +/obj/item/reagent_containers/food/snacks/squeaking_stir_fry + name = "squeaking stir fry" + desc = "A Solarian classic made with cheese curds and tofu (amongst other things). \ + It gets its name from the distinctive squeak of the proteins." + icon_state = "squeaking_stir_fry" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("cheese" = 1, "tofu" = 1, "veggies" = 1) + foodtype = DAIRY | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/sweet_chili_cabbage_wrap + name = "sweet chili cabbage wrap" + desc = "Grilled cheese and salad in a cabbage wrap, topped with delicious sweet chili sauce." + icon_state = "sweet_chili_cabbage_wrap" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/nutriment/vitamin = 8, + /datum/reagent/consumable/capsaicin = 1, + ) + tastes = list("cheese" = 1, "salad" = 1, "sweet chili" = 1) + foodtype = DAIRY | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/loaded_curds + name = "chili poutine" + desc = "What's better than cheese curds? Deep fried cheese curds! What's better than deep fried cheese curds? \ + Deep fried cheese curds with chili (and more cheese) on top! And what's better than that? Putting it on fries!" + icon_state = "loaded_curds" + list_reagents = list( + /datum/reagent/consumable/nutriment = 4, + /datum/reagent/consumable/cooking_oil = 10, + /datum/reagent/consumable/nutriment/vitamin = 4, + /datum/reagent/consumable/capsaicin = 1, + ) + tastes = list("cheese" = 1, "oil" = 1, "chili" = 1, "fries" = 1) + foodtype = DAIRY | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/baked_cheese + name = "baked cheese wheel" + desc = "A baked cheese wheel, melty and delicious." + icon_state = "baked_cheese" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 10, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/nutriment = 5, + ) + tastes = list("cheese" = 1) + foodtype = DAIRY + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/baked_cheese_platter + name = "oven-baked cheese" + desc = "A baked cheese wheel: a Solarian favourite for sharing. Usually served with crispy bread slices for dipping, \ + because the only thing better than good cheese is good cheese on bread. A popular fixture at SolGov office parties." + icon_state = "baked_cheese_platter" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 12, + /datum/reagent/consumable/nutriment/vitamin = 6, + /datum/reagent/consumable/nutriment = 8, + ) + tastes = list("cheese" = 1, "bread" = 1) + foodtype = DAIRY | GRAIN + w_class = WEIGHT_CLASS_SMALL + +//Baked Green Lasagna at the Whistlestop Cafe +/obj/item/reagent_containers/food/snacks/raw_green_lasagne + name = "raw green lasagne al forno" + desc = "A fine lasagne made with pesto and a herby white sauce, ready to bake. Good for multiple servings." + icon_state = "raw_green_lasagne" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 6, + /datum/reagent/consumable/nutriment/vitamin = 10, + ) + tastes = list("cheese" = 1, "pesto" = 1, "pasta" = 1) + foodtype = VEGETABLES | GRAIN | NUTS | RAW + w_class = WEIGHT_CLASS_NORMAL + cooked_type = /obj/item/reagent_containers/food/snacks/green_lasagne + +/obj/item/reagent_containers/food/snacks/green_lasagne + name = "green lasagne al forno" + desc = "A fine lasagne made with pesto and a herby white sauce. Good for multiple servings." + icon_state = "green_lasagne" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 24, + /datum/reagent/consumable/nutriment/vitamin = 18, + ) + tastes = list("cheese" = 1, "pesto" = 1, "pasta" = 1) + foodtype = VEGETABLES | GRAIN | NUTS + w_class = WEIGHT_CLASS_NORMAL + slice_path = /obj/item/reagent_containers/food/snacks/green_lasagne_slice + slices_num = 6 + +/obj/item/reagent_containers/food/snacks/green_lasagne_slice + name = "green lasagne al forno slice" + desc = "A slice of herby, pesto-y lasagne." + icon_state = "green_lasagne_slice" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 4, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + tastes = list("cheese" = 1, "pesto" = 1, "pasta" = 1) + foodtype = VEGETABLES | GRAIN | NUTS + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/raw_baked_rice + name = "big rice pan" + desc = "A big pan of layered potatoes topped with rice and vegetable stock, ready to be baked into a delicious sharing meal." + icon_state = "raw_baked_rice" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 4, + /datum/reagent/consumable/nutriment/vitamin = 10, + ) + tastes = list("rice" = 1, "potato" = 1, "veggies" = 1) + foodtype = VEGETABLES | GRAIN | RAW + w_class = WEIGHT_CLASS_NORMAL + cooked_type = /obj/item/reagent_containers/food/snacks/big_baked_rice + +/obj/item/reagent_containers/food/snacks/big_baked_rice + name = "big baked rice" + desc = "A Solarian favourite, baked rice can be filled with a variety of vegetable fillings to make a delicious meal to share. \ + Potatoes are also often layered on the bottom of the cooking vessel to create a flavourful crust which is hotly contested amongst diners. Originates from the flotillas formed in Polynesia after the Night of Fire." + icon_state = "big_baked_rice" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 18, + /datum/reagent/consumable/nutriment/vitamin = 42, + ) + tastes = list("rice" = 1, "potato" = 1, "veggies" = 1) + foodtype = VEGETABLES | GRAIN + w_class = WEIGHT_CLASS_NORMAL + slice_path = /obj/item/reagent_containers/food/snacks/lil_baked_rice + slices_num = 6 + +/obj/item/reagent_containers/food/snacks/lil_baked_rice + name = "lil baked rice" + desc = "A single portion of baked rice, perfect as a side dish, or even as a full meal." + icon_state = "lil_baked_rice" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 3, + /datum/reagent/consumable/nutriment/vitamin = 7, + ) + tastes = list("rice" = 1, "potato" = 1, "veggies" = 1) + foodtype = VEGETABLES | GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/oven_baked_corn + name = "oven-baked corn" + desc = "A cob of corn, baked in the roasting heat of an oven until it blisters and blackens. \ + Beloved as a quick yet flavourful and filling component for dishes on the Fleet." + icon_state = "oven_baked_corn" + list_reagents = list( + /datum/reagent/consumable/nutriment/vitamin = 6, + /datum/reagent/consumable/char = 1, + ) + tastes = list("corn" = 1, "char" = 1) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/buttered_baked_corn + name = "buttered baked corn" + desc = "What's better than baked corn? Baked corn with butter!" + icon_state = "buttered_baked_corn" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 4, + /datum/reagent/consumable/nutriment/vitamin = 6, + /datum/reagent/consumable/char = 1, + ) + tastes = list("corn" = 1, "char" = 1) + foodtype = VEGETABLES | DAIRY + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/fiesta_corn_skillet + name = "fiesta corn skillet" + desc = "Sweet, spicy, saucy, and all kinds of corny." + icon_state = "fiesta_corn_skillet" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 5, + /datum/reagent/consumable/nutriment/vitamin = 10, + /datum/reagent/consumable/char = 1, + ) + tastes = list("corn" = 1, "chili" = 1, "char" = 1) + foodtype = VEGETABLES | DAIRY + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/raw_ratatouille + name = "raw ratatouille" //rawtatouille? + desc = "Sliced vegetables with a roasted pepper sauce. Delicious, for such a simple food." + icon_state = "raw_ratatouille" + list_reagents = list( + /datum/reagent/consumable/nutriment = 4, + /datum/reagent/consumable/nutriment/vitamin = 8, + /datum/reagent/consumable/char = 1, + ) + tastes = list("veggies" = 1, "roasted peppers" = 1) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + cooked_type = /obj/item/reagent_containers/food/snacks/ratatouille + +/obj/item/reagent_containers/food/snacks/ratatouille + name = "ratatouille" + desc = "The perfect dish to save your restaurant from a vindictive food critic. Bonus points if you've got a rat in your hat." + icon_state = "ratatouille" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 10, + /datum/reagent/consumable/char = 1, + ) + tastes = list("veggies" = 1, "roasted peppers" = 1, "char" = 1) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/mozzarella_sticks + name = "mozzarella sticks" + desc = "Little sticks of mozzarella, breaded and fried." + icon_state = "mozzarella_sticks" + list_reagents = list( + /datum/reagent/consumable/nutriment = 4, + /datum/reagent/consumable/cooking_oil = 6, + ) + tastes = list("creamy cheese" = 1, "breading" = 1, "oil" = 1) + foodtype = DAIRY | GRAIN | FRIED + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/raw_stuffed_peppers + name = "raw stuffed pepper" + desc = "A pepper with the top removed and a herby cheese and onion mix stuffed inside. Probably shouldn't be eaten raw." + icon_state = "raw_stuffed_pepper" + list_reagents = list( + /datum/reagent/consumable/nutriment = 4, + /datum/reagent/consumable/cooking_oil = 6, + ) + tastes = list("creamy cheese" = 1, "herbs" = 1, "onion" = 1, "bell pepper" = 1) + foodtype = DAIRY | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + cooked_type = /obj/item/reagent_containers/food/snacks/stuffed_peppers + +/obj/item/reagent_containers/food/snacks/stuffed_peppers + name = "baked stuffed pepper" + desc = "A soft yet still crisp bell pepper, with a wonderful melty cheesy interior." + icon_state = "stuffed_pepper" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/cooking_oil = 8, + ) + tastes = list("creamy cheese" = 1, "herbs" = 1, "onion" = 1, "bell pepper" = 1) + foodtype = DAIRY | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/fueljacks_lunch + name = "Astrengi's lunch" + desc = "A dish made from fried vegetables, popular amongst astrengis - the brave technicans who repair damaged hulls from asteroid impacts or ship-to-ship weapons whilst in transit. \ + Given the constant need for repair during protracted conflict, and the limited windows in which a lull in the fields or fire provides time for patching, \ + they'll often take packed meals to save on trips to the mess, which they heat using their welding torches." + icon_state = "fueljacks_lunch" + list_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/cooking_oil = 8, + ) + tastes = list("cabbage" = 1, "potato" = 1, "onion" = 1, "chili" = 1, "cheese" = 1) + foodtype = DAIRY | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/mac_balls + name = "macheronirölen" + desc = "Fried balls of macaroni cheese dipped in corn batter, served with tomato sauce. \ + A popular snack across the galaxy, and especially on ex-Syndicate-majority Inteq vessels - where they tend to use Ready-Donk as the base, as a holdover from their ICW days." + icon_state = "mac_balls" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/cooking_oil = 10, + ) + tastes = list("pasta" = 1, "cornbread" = 1, "cheese" = 1) + foodtype = DAIRY | VEGETABLES | FRIED | GRAIN + w_class = WEIGHT_CLASS_SMALL + +//Sweets +/obj/item/reagent_containers/food/snacks/moth_cheese_cakes + name = "\improper ælorölen" //ælo = cheese, rölen = balls + desc = "Ælorölen (cheese balls) are a traditional Solar dessert, made of soft cheese, powdered sugar and flour, rolled into balls, battered and then deep fried. They're often served with either chocolate sauce or honey, or sometimes both!" + icon_state = "moth_cheese_cakes" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/sugar = 12, + ) + tastes = list("cheesecake" = 1, "chocolate" = 1, "honey" = 1) + foodtype = SUGAR | FRIED | DAIRY | GRAIN + w_class = WEIGHT_CLASS_SMALL + +//misc food +/obj/item/reagent_containers/food/snacks/bubblegum/wake_up + name = "wake-up gum" + desc = "A rubbery strip of gum. It's stamped with the emblem of the Solar Fleet." + list_reagents = list( + /datum/reagent/consumable/sugar = 13, + /datum/reagent/drug/methamphetamine = 2, + ) + tastes = list("herbs" = 1) + color = "#567D46" + +/obj/item/storage/box/gum/wake_up + name = "\improper Activin 12 Hour medicated gum packet" + desc = "Stay awake during long shifts in the maintenance tunnels with Activin! The approval seal of the Solar Fleet \ + is emblazoned on the packaging, alongside a litany of health and safety disclaimers in both Solar and Galactic Common." + icon_state = "bubblegum_wake_up" + custom_premium_price = 50 * 1.5 + +/obj/item/storage/box/gum/wake_up/examine_more(mob/user) + . = ..() + . += span_notice("You read some of the health and safety information...") + . += "\t[span_info("For the relief of tiredness and drowsiness while working.")]" + . += "\t[span_info("Do not chew more than one strip every 12 hours. Do not use as a complete substitute for sleep.")]" + . += "\t[span_info("Do not give to children under 16. Do not exceed the maximum dosage. Do not ingest. Do not take for more than 3 days consecutively. Do not take in conjunction with other medication. May cause adverse reactions in patients with pre-existing heart conditions.")]" + . += "\t[span_info("Side effects of Activin use may include twitchy antennae, overactive wings, loss of keratin sheen, loss of setae coverage, arrythmia, blurred vision, and euphoria. Cease taking the medication if side effects occur.")]" + . += "\t[span_info("Repeated use may cause addiction.")]" + . += "\t[span_info("If the maximum dosage is exceeded, inform a member of your assigned vessel's medical staff immediately. Do not induce vomiting.")]" + . += "\t[span_info("Ingredients: each strip contains 500mg of Activin (dextro-methamphetamine). Other ingredients include Green Dye 450 (Verdant Meadow) and artificial herb flavouring.")]" + . += "\t[span_info("Storage: keep in a cool dry place. Do not use after the use-by date: 32/4/350.")]" + return . + +/obj/item/storage/box/gum/wake_up/PopulateContents() + for(var/i in 1 to 4) + new/obj/item/reagent_containers/food/snacks/bubblegum/wake_up(src) + +/obj/item/reagent_containers/food/snacks/spacers_sidekick + name = "\improper Spacer's Sidekick mints" + desc = "Spacer's Sidekick: Breathe easy with a friend at your side!" + icon_state = "spacers_sidekick" + trash = /obj/item/trash/spacers_sidekick + list_reagents = list( + /datum/reagent/consumable/sugar = 1, + /datum/reagent/consumable/menthol = 1, + /datum/reagent/medicine/salbutamol = 1, + ) + tastes = list("strong mint" = 1) + junkiness = 15 + foodtype = JUNKFOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/raw_kalixcian_sausage + name = "raw Kalixcian blood sausage" + desc = "A raw Kalixcian blood sausage, ready to be cured on a drying rack." + icon_state = "raw_lizard_sausage" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 5, + /datum/reagent/consumable/nutriment/vitamin = 2, + /datum/reagent/blood = 3, + ) + tastes = list("meat" = 1, "black pudding" = 1) + foodtype = MEAT + w_class = WEIGHT_CLASS_SMALL + dried_type = /obj/item/reagent_containers/food/snacks/kalixcian_sausage + +/obj/item/reagent_containers/food/snacks/kalixcian_sausage + name = "\improper Kalixcian blood sausage" + desc = "A coarse dry-cured blood sausage, traditionally made by farmers in the farmlands of the Central Plateau region in former Switzerland. Similar in texture to chorizo." + icon_state = "lizard_sausage" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 6, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + tastes = list("meat" = 1, "black pudding" = 1) + foodtype = MEAT + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/raw_headcheese + name = "raw headcheese block" + desc = "A common staple in Zalish food culture, headcheese is traditionally made of an animal’s head, with the organs removed, boiled until it falls apart, at which point it is collected, strained of moisture, salted heavily, packed into blocks, and left to dry and age for several months. The resulting hard block tastes similar to cheese." + icon_state = "raw_lizard_cheese" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 15, + /datum/reagent/consumable/sodiumchloride = 5, + ) + tastes = list("meat" = 1, "salt" = 1) + foodtype = MEAT | GORE + w_class = WEIGHT_CLASS_SMALL + dried_type = /obj/item/reagent_containers/food/snacks/headcheese + +/obj/item/reagent_containers/food/snacks/headcheese + name = "headcheese block" + desc = "A cured block of headcheese. Delicious, if you're a lizard." + icon_state = "lizard_cheese" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 15, + /datum/reagent/consumable/sodiumchloride = 5, + ) + tastes = list("cheese" = 1, "salt" = 1) + foodtype = MEAT | GORE + w_class = WEIGHT_CLASS_SMALL + slice_path = /obj/item/reagent_containers/food/snacks/headcheese_slice + slices_num = 5 + +/obj/item/reagent_containers/food/snacks/headcheese_slice + name = "headcheese slice" + desc = "A slice of headcheese, useful for making sandwiches and snacks. Or surviving the cold Kalixcis' winters." + icon_state = "lizard_cheese_slice" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 3, + /datum/reagent/consumable/sodiumchloride = 1, + ) + tastes = list("cheese" = 1, "salt" = 1) + foodtype = MEAT | GORE + w_class = WEIGHT_CLASS_TINY + +/obj/item/reagent_containers/food/snacks/shredded_lungs + name = "crispy shredded lung stirfry" + desc = "Crispy lung strips, with veggies and a spicy sauce. Delicious, if you like lungs." + icon_state = "lung_stirfry" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 6, + /datum/reagent/consumable/nutriment/vitamin = 4, + /datum/reagent/consumable/capsaicin = 2, + ) + tastes = list("meat" = 1, "heat" = 1, "veggies" = 1) + foodtype = MEAT | VEGETABLES | GORE + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/tsatsikh + name = "stlakis" + desc = "A Kalixcian dish consisting of spiced ground offal, stuffed into a stomach and boiled. Pretty foul to anyone who's not used to the taste" + icon_state = "tsatsikh" + list_reagents = list(/datum/reagent/consumable/cooking_oil = 10) + tastes = list("assorted minced organs" = 1) + foodtype = MEAT | GORE + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/liver_pate + name = "liver pate" + desc = "A rich, meaty paste made from liver, meat, and a few additions for extra flavour." + icon_state = "pate" + list_reagents = list(/datum/reagent/consumable/cooking_oil = 5) + tastes = list("liver" = 1) + foodtype = MEAT + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/moonfish_eggs + name = "moonfish eggs" + desc = "The moonfish lays large, transparent white eggs which are prized in lizard cooking. Their flavour is similar to caviar, but generally is described as deeper and more complex." + icon_state = "moonfish_eggs" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 5, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + tastes = list("caviar" = 1) + foodtype = SEAFOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/moonfish_caviar + name = "moonfish caviar paste" + desc = "A rich paste made from moonfish eggs. Generally the only way most lizards can get them, and used fairly heavily in coastal cooking." + icon_state = "moonfish_caviar" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 6, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + tastes = list("caviar" = 1) + foodtype = SEAFOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/lizard_escargot + name = "desert snail cocleas" + desc = "Another example of cultural crossover between Sarathi and humans, desert snail escargot is closer to the Roman dish cocleas than the contemporary escargot. It's a common street food in arid cities." + icon_state = "lizard_escargot" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 6, + /datum/reagent/consumable/nutriment/vitamin = 4, + /datum/reagent/consumable/garlic = 2, + ) + tastes = list("snails" = 1, "garlic" = 1, "oil" = 1) + foodtype = MEAT | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/fried_blood_sausage + name = "fried blood sausage" + desc = "A blood sausage, battered and deep fried. Commonly served with fries as a quick and simple snack as street food." + icon_state = "fried_blood_sausage" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 6, + /datum/reagent/consumable/nutriment/vitamin = 2, + /datum/reagent/consumable/sodiumchloride = 1, + /datum/reagent/consumable/cooking_oil = 1, + ) + tastes = list("black pudding" = 1, "batter" = 1, "oil" = 1) + foodtype = MEAT | FRIED + w_class = WEIGHT_CLASS_SMALL + +//Why does like, every language on the planet besides English call them pommes? Who knows, who cares- the lizards call them it too, because funny. +/obj/item/reagent_containers/food/snacks/lizard_fries + name = "loaded poms-franzisks" + desc = "One of the many human foods to make its way to Kalixcis shortly after first contact was french fries, which are called pommes-embreis in Kalixcian Common. When topped with barbecued meat and sauce, they make a hearty meal." + icon_state = "lizard_fries" + list_reagents = list( + /datum/reagent/consumable/nutriment = 4, + /datum/reagent/consumable/cooking_oil = 6, + /datum/reagent/consumable/sodiumchloride = 1, + /datum/reagent/consumable/bbqsauce = 2, + ) + tastes = list("fries" = 2, "bbq sauce" = 1, "barbecued meat" = 1) + foodtype = MEAT | VEGETABLES | FRIED + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/brain_pate + name = "eyeball-and-brain pate" + desc = "A thick pink puree made from finely chopped poached eyeballs and brains, fried onions, and fat. Lizards swear it's delicious!" + icon_state = "brain_pate" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/liquidgibs = 2, + ) + tastes = list("brains" = 2) + foodtype = MEAT | VEGETABLES | GORE + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/crispy_headcheese + name = "crispy breaded headcheese" + desc = "A delicious snack from the streets of Fenistrad in the Antechannel League, consisting of headcheese coated in rootbread breadcrumbs. Commonly served with fries." + icon_state = "crispy_headcheese" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 5, + /datum/reagent/consumable/nutriment = 3, + /datum/reagent/consumable/cooking_oil = 2, + ) + tastes = list("cheese" = 1, "oil" = 1) + foodtype = MEAT | VEGETABLES | NUTS | GORE + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/kebab/picoss_skewers + name = "armada skewer" + desc = "A popular Ring streetfood consisting of vinegar-marinated armorfish on a skewer with onion and chillis." + icon_state = "picoss_skewer" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/nutriment/vitamin = 4, + /datum/reagent/consumable/vinegar = 1, + /datum/reagent/consumable/capsaicin = 1, + ) + tastes = list("fish" = 1, "acid" = 1, "onion" = 1, "heat" = 1) + foodtype = SEAFOOD | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/nectar_larvae + name = "nectar larvae" + desc = "Little crispy larvae in a korta nectar based sweet and spicy sauce. Bugtastic!" + icon_state = "nectar_larvae" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 7, + /datum/reagent/consumable/korta_nectar = 3, + /datum/reagent/consumable/capsaicin = 1, + ) + tastes = list("meat" = 1, "sweet" = 1, "heat" = 1) + foodtype = GORE | MEAT | BUGS + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/mushroomy_stirfry + name = "mushroomy stirfry" + desc = "A medley of mushrooms, made to meet your monstrous munchies. Marvelous!" + icon_state = "mushroomy_stirfry" + list_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + tastes = list("marvelous mushrooms" = 1, "sublime shrooms" = 1) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/grilled_moonfish + name = "grilled moonfish" + desc = "A slab of grilled moonfish. Traditionally served over scalloped roots with a wine-based sauce." + icon_state = "grilled_moonfish" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + tastes = list("fish" = 1) + foodtype = SEAFOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/moonfish_demiglace + name = "moonfish demiglace" + desc = "A slab of beautifully seared moonfish on a bed of potatoes and carrots, with a wine and demiglace reduction on top. Simply marvelous." + icon_state = "moonfish_demiglace" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/nutriment/vitamin = 6, + /datum/reagent/consumable/nutriment = 2, + ) + tastes = list("fish" = 2, "potatoes" = 1, "carrots" = 1) + foodtype = SEAFOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/lizard_surf_n_turf + name = "\improper Channeler surf 'n' turf smorgasbord" + desc = "A massive platter of Kalixcis' finest meat and seafood, typically shared by groups on the river beaches. Of course, nothing's stopping you eating it on your own…" + icon_state = "surf_n_turf" + list_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/cooking_oil = 10, + /datum/reagent/consumable/nutriment/vitamin = 10, + ) + tastes = list("surf" = 1, "turf" = 1) + foodtype = MEAT | SEAFOOD | VEGETABLES + w_class = WEIGHT_CLASS_BULKY + +/obj/item/reagent_containers/food/snacks/rootroll + name = "rootroll" + desc = "A dense, chewy roll, made from roots. A nice companion to a bowl of soup." + icon_state = "rootroll" + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + w_class = WEIGHT_CLASS_SMALL + tastes = list("roll" = 1) // the roll tastes of roll. + foodtype = VEGETABLES | NUTS + +/obj/item/reagent_containers/food/snacks/emperor_roll + name = "emperor roll" + desc = "A popular sandwich on Kalixcis, named in honour of the Zale families." + icon_state = "emperor_roll" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/nutriment/vitamin = 2, + ) + tastes = list("bread" = 1, "cheese" = 1, "liver" = 1, "caviar" = 1) + foodtype = VEGETABLES | NUTS | MEAT | GORE | SEAFOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/honey_roll + name = "honey sweetroll" + desc = "A sweetened rootroll with sliced fruit, enjoyed as a seasonal dessert on Kalixcis." + icon_state = "honey_roll" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 8, + /datum/reagent/consumable/honey = 2, + ) + tastes = list("bread" = 1, "honey" = 1, "fruit" = 1) + foodtype = VEGETABLES | NUTS | FRUIT + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/kebab/candied_mushrooms + name = "candied mushrooms" + desc = "A slightly bizarre dish from Kalixcis, consisting of seraka mushrooms coated with caramel on a skewer. Carries a pronounced 'sweet and savoury' kick." + icon_state = "candied_mushrooms" + list_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/nutriment/vitamin = 6, + /datum/reagent/consumable/caramel = 4, + ) + tastes = list("savouriness" = 1, "sweetness" = 1) + foodtype = SUGAR | VEGETABLES + +//Misc Dishes +/obj/item/reagent_containers/food/snacks/sauerkraut + name = "sauerkraut" + desc = "Pickled cabbage, as made famous by Germans, and which has become common in lizard cooking, where it is known as Zauerkrat." + icon_state = "sauerkraut" + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + tastes = list("cabbage" = 1, "acid" = 1) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/lizard_dumplings + name = "\improper Kalixcian dumplings" + desc = "Mashed root vegetables, mixed with korta flour and boiled to produce a large, round and slightly spicy dumpling. Commonly eaten in soup." + icon_state = "lizard_dumplings" + list_reagents = list( + /datum/reagent/consumable/nutriment = 4, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + tastes = list("potato" = 1, "earthy heat" = 1) + foodtype = VEGETABLES | NUTS + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/steeped_mushrooms + name = "steeped seraka mushrooms" + desc = "Seraka mushrooms that have been steeped in alkaline water to remove the extract, thereby making them completely safe to consume." + icon_state = "steeped_mushrooms" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 2, + ) + tastes = list("savouriness" = 1, "nuttiness" = 1) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/pastry.dm similarity index 99% rename from code/modules/food_and_drinks/food/snacks_pastry.dm rename to code/modules/food_and_drinks/food/pastry.dm index d060dc1c2969..f57421e15aa8 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/pastry.dm @@ -414,6 +414,7 @@ /obj/item/reagent_containers/food/snacks/donkpocket name = "\improper Donk-pocket" desc = "The food of choice for the seasoned traitor." + icon = 'icons/obj/food/donk.dmi' icon_state = "donkpocket" list_reagents = list(/datum/reagent/consumable/nutriment = 4) cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm @@ -430,10 +431,11 @@ tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) foodtype = GRAIN -/obj/item/reagent_containers/food/snacks/dankpocket +/obj/item/reagent_containers/food/snacks/donkpocket/dankpocket name = "\improper Dank-pocket" desc = "The food of choice for the seasoned botanist." icon_state = "dankpocket" + bonus_reagents = list(/datum/reagent/drug/space_drugs = 3) list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4) filling_color = "#00FF00" tastes = list("meat" = 2, "dough" = 2) diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/pie.dm similarity index 98% rename from code/modules/food_and_drinks/food/snacks_pie.dm rename to code/modules/food_and_drinks/food/pie.dm index 1ac3b49c0112..054d1c444380 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/pie.dm @@ -1,6 +1,7 @@ /obj/item/reagent_containers/food/snacks/pie - icon = 'icons/obj/food/piecake.dmi' + icon = 'icons/obj/food/pie.dmi' + icon_state = "pie" trash = /obj/item/trash/plate bitesize = 3 w_class = WEIGHT_CLASS_NORMAL @@ -12,7 +13,6 @@ /obj/item/reagent_containers/food/snacks/pie/plain name = "plain pie" desc = "A simple pie, still delicious." - icon_state = "pie" custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/pie bonus_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("pie" = 1) @@ -21,7 +21,6 @@ /obj/item/reagent_containers/food/snacks/pie/cream name = "banana cream pie" desc = "Just like back home, on clown planet! HONK!" - icon_state = "pie" trash = /obj/item/trash/plate bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 2) @@ -156,7 +155,7 @@ /obj/item/reagent_containers/food/snacks/pumpkinpieslice name = "pumpkin pie slice" desc = "A slice of pumpkin pie, with whipped cream on top. Perfection." - icon = 'icons/obj/food/piecake.dmi' + icon = 'icons/obj/food/pie.dmi' icon_state = "pumpkinpieslice" trash = /obj/item/trash/plate filling_color = "#FFA500" @@ -222,7 +221,7 @@ /obj/item/reagent_containers/food/snacks/blumpkinpieslice name = "blumpkin pie slice" desc = "A slice of blumpkin pie, with whipped cream on top. Is this edible?" - icon = 'icons/obj/food/piecake.dmi' + icon = 'icons/obj/food/pie.dmi' icon_state = "blumpkinpieslice" trash = /obj/item/trash/plate filling_color = "#1E90FF" @@ -243,7 +242,7 @@ /obj/item/reagent_containers/food/snacks/dulcedebatataslice name = "dulce de batata slice" desc = "A slice of sweet dulce de batata jelly." - icon = 'icons/obj/food/piecake.dmi' + icon = 'icons/obj/food/pie.dmi' icon_state = "dulcedebatataslice" trash = /obj/item/trash/plate filling_color = "#8B4513" @@ -272,7 +271,7 @@ /obj/item/reagent_containers/food/snacks/baklavaslice name = "baklava dish" desc = "A portion of a delightful healthy snack made of nut layers with thin bread" - icon = 'icons/obj/food/piecake.dmi' + icon = 'icons/obj/food/pie.dmi' icon_state = "baklavaslice" trash = /obj/item/trash/plate filling_color = "#1E90FF" diff --git a/code/modules/food_and_drinks/food/pizza.dm b/code/modules/food_and_drinks/food/pizza.dm new file mode 100644 index 000000000000..b54d2ba9497b --- /dev/null +++ b/code/modules/food_and_drinks/food/pizza.dm @@ -0,0 +1,565 @@ + +/////////////////////////////////////////////////PIZZA//////////////////////////////////////// + +/obj/item/reagent_containers/food/snacks/pizza + icon = 'icons/obj/food/pizza.dmi' + w_class = WEIGHT_CLASS_NORMAL + slices_num = 6 + volume = 80 + list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) + foodtype = GRAIN | DAIRY | VEGETABLES + +/obj/item/reagent_containers/food/snacks/pizzaslice + icon = 'icons/obj/food/pizza.dmi' + list_reagents = list(/datum/reagent/consumable/nutriment = 5) + foodtype = GRAIN | DAIRY | VEGETABLES + +/obj/item/reagent_containers/food/snacks/pizza/margherita + name = "pizza margherita" + desc = "The most cheezy pizza in galaxy." + icon_state = "pizzamargherita" + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/margherita + bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/pizza/margherita/robo/Initialize() + bonus_reagents += list(/datum/reagent/nanomachines = 70) + return ..() + +/obj/item/reagent_containers/food/snacks/pizzaslice/margherita + name = "margherita slice" + desc = "A slice of the most cheezy pizza in galaxy." + icon_state = "pizzamargheritaslice" + filling_color = "#FFA500" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/pizza/meat + name = "meatpizza" + desc = "Greasy pizza with delicious meat." + icon_state = "meatpizza" + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/meat + bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 8) + list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 8) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) + foodtype = GRAIN | VEGETABLES| DAIRY | MEAT + +/obj/item/reagent_containers/food/snacks/pizzaslice/meat + name = "meatpizza slice" + desc = "A nutritious slice of meatpizza." + icon_state = "meatpizzaslice" + filling_color = "#A52A2A" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT + +/obj/item/reagent_containers/food/snacks/pizza/mushroom + name = "mushroom pizza" + desc = "Very special pizza." + icon_state = "mushroompizza" + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/mushroom + bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5) + list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/pizzaslice/mushroom + name = "mushroom pizza slice" + desc = "Maybe it is the last slice of pizza in your life." + icon_state = "mushroompizzaslice" + filling_color = "#FFE4C4" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/pizza/vegetable + name = "vegetable pizza" + desc = "No one of Tomatos Sapiens were harmed during making this pizza." + icon_state = "vegetablepizza" + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/vegetable + bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5) + list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/oculine = 12, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/pizzaslice/vegetable + name = "vegetable pizza slice" + desc = "A slice of the most green pizza of all pizzas not containing green ingredients." + icon_state = "vegetablepizzaslice" + filling_color = "#FFA500" + tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/pizza/donkpocket + name = "donkpocket pizza" + desc = "Who thought this would be a good idea?" + icon_state = "donkpocketpizza" + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/donkpocket + bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5) + list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/omnizine = 10, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD + +/obj/item/reagent_containers/food/snacks/pizzaslice/donkpocket + name = "donkpocket pizza slice" + desc = "Smells like donkpocket." + icon_state = "donkpocketpizzaslice" + filling_color = "#FFA500" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD + +/obj/item/reagent_containers/food/snacks/pizza/dank + name = "dank pizza" + desc = "The hippie's pizza of choice." + icon_state = "dankpizza" + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/dank + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6) + list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/pizzaslice/dank + name = "dank pizza slice" + desc = "So good, man..." + icon_state = "dankpizzaslice" + filling_color = "#2E8B57" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/pizza/sassysage + name = "sassysage pizza" + desc = "You can really smell the sassiness." + icon_state = "sassysagepizza" + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/sassysage + bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/pizzaslice/sassysage + name = "sassysage pizza slice" + desc = "Deliciously sassy." + icon_state = "sassysagepizzaslice" + filling_color = "#FF4500" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/pizza/pineapple + name = "\improper Hawaiian pizza" + desc = "The pizza equivalent of Einstein's riddle." + icon_state = "pineapplepizza" + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/pineapple + bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2) + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE + +/obj/item/reagent_containers/food/snacks/pizzaslice/pineapple + name = "\improper Hawaiian pizza slice" + desc = "A slice of delicious controversy." + icon_state = "pineapplepizzaslice" + filling_color = "#FF4500" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2) + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE + +/obj/item/reagent_containers/food/snacks/pizza/arnold + name = "\improper Arnold pizza" + desc = "Hello, you've reached Arnold's pizza shop. I'm not here now, I'm out killing pepperoni." + icon_state = "arnoldpizza" + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/arnold + bonus_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, /datum/reagent/medicine/omnizine = 30) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2) + +/obj/item/reagent_containers/food/snacks/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm + var/obj/item/bodypart/l_arm = user.get_bodypart(BODY_ZONE_L_ARM) + var/obj/item/bodypart/r_arm = user.get_bodypart(BODY_ZONE_R_ARM) + if(prob(50) && iscarbon(user) && M == user && (r_arm || l_arm)) + user.visible_message("\The [src] breaks off [user]'s arm!!", "\The [src] breaks off your arm!") + if(l_arm) + l_arm.dismember() + else + r_arm.dismember() + playsound(user, "desceration" ,50, TRUE, -1) + +/obj/item/reagent_containers/food/snacks/proc/i_kill_you(obj/item/I, mob/user) + if(istype(I, /obj/item/reagent_containers/food/snacks/pineappleslice)) + to_chat(user, "If you want something crazy like pineapple, I kill you.") + user.gib() //if you want something crazy like pineapple, i kill you + +/obj/item/reagent_containers/food/snacks/pizza/arnold/attack(mob/living/M, mob/living/user) + . = ..() + try_break_off(M, user) + +/obj/item/reagent_containers/food/snacks/pizza/arnold/attackby(obj/item/I, mob/user) + i_kill_you(I, user) + . = ..() + + +/obj/item/reagent_containers/food/snacks/pizzaslice/arnold + name = "\improper Arnold pizza slice" + desc = "I come over, maybe I give you a pizza, maybe I break off your arm." + icon_state = "arnoldpizzaslice" + filling_color = "#A52A2A" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2) + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT + +/obj/item/reagent_containers/food/snacks/pizzaslice/arnold/attack(mob/living/M, mob/living/user) + . =..() + try_break_off(M, user) + +/obj/item/reagent_containers/food/snacks/pizzaslice/arnold/attackby(obj/item/I, mob/user) + i_kill_you(I, user) + . = ..() + + +/obj/item/reagent_containers/food/snacks/pizzaslice/custom + name = "pizza slice" + icon_state = "pizzamargheritaslice" + filling_color = "#FFFFFF" + foodtype = GRAIN | VEGETABLES + +/obj/item/reagent_containers/food/snacks/pizzaslice/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/kitchen/rollingpin)) + if(!isturf(loc)) + to_chat(user, "You need to put [src] on a surface to roll it out!") + return + new /obj/item/stack/sheet/pizza(loc) + to_chat(user, "You smoosh [src] into a cheesy sheet.") + qdel(src) + return + return ..() + +//Pizza +/obj/item/reagent_containers/food/snacks/raw_mothic_margherita + name = "raw Solar margherita pizza" + desc = "A variation on a classic dish, Solar pizza is characterised by the use of fresh ingredients, \ + particularly fresh mozzarella, and the use of strong flour to produce a glutenous dough." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "raw_margherita_pizza" + list_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/cooking_oil = 5, + /datum/reagent/consumable/tomatojuice = 6, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + tastes = list("dough" = 1, "tomato" = 1, "cheese" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | RAW + cooked_type = /obj/item/reagent_containers/food/snacks/pizza/mothic_margherita + +/obj/item/reagent_containers/food/snacks/pizza/mothic_margherita + name = "Solar margherita pizza" + desc = "Margherita pizza, Solar-style. Known to cause arguments between people of different cultures about whose pizza is better." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "margherita_pizza" + list_reagents = list( + /datum/reagent/consumable/nutriment = 25, + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/tomatojuice = 6, + /datum/reagent/consumable/nutriment/vitamin = 5, + ) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/mothic_margherita + +/obj/item/reagent_containers/food/snacks/pizzaslice/mothic_margherita + name = "Solar margherita slice" + desc = "A slice of Solar margherita pizza, the most humble of pizzas." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "margherita_slice" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/raw_mothic_firecracker + name = "raw Solar firecracker pizza" + desc = "A favourite amongst the more adventurous Solarians, firecracker pizza is HOT HOT HOT!" + icon = 'icons/obj/food/pizza.dmi' + icon_state = "raw_firecracker_pizza" + list_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/cooking_oil = 5, + /datum/reagent/consumable/bbqsauce = 6, + /datum/reagent/consumable/nutriment/vitamin = 3, + /datum/reagent/consumable/capsaicin = 10, + ) + tastes = list("dough" = 1, "chili" = 1, "corn" = 1, "cheese" = 1, "bbq sauce" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | RAW + cooked_type = /obj/item/reagent_containers/food/snacks/pizza/mothic_firecracker + +/obj/item/reagent_containers/food/snacks/pizza/mothic_firecracker + name = "Solar firecracker pizza" + desc = "They're not kidding when they call this a hot pizza pie." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "firecracker_pizza" + list_reagents = list( + /datum/reagent/consumable/nutriment = 25, + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/bbqsauce = 6, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/capsaicin = 10, + ) + tastes = list("crust" = 1, "chili" = 1, "corn" = 1, "cheese" = 1, "bbq sauce" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/mothic_firecracker + +/obj/item/reagent_containers/food/snacks/pizzaslice/mothic_firecracker + name = "Solar firecracker slice" + desc = "A spicy slice of something quite nice." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "firecracker_slice" + tastes = list("crust" = 1, "chili" = 1, "corn" = 1, "cheese" = 1, "bbq sauce" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/raw_mothic_five_cheese + name = "raw Solar five-cheese pizza" + desc = "For centuries, scholars have asked: how much cheese is too much cheese?" + icon = 'icons/obj/food/pizza.dmi' + icon_state = "raw_five_cheese_pizza" + list_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/cooking_oil = 5, + /datum/reagent/consumable/tomatojuice = 6, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + tastes = list("dough" = 1, "cheese" = 1, "more cheese" = 1, "excessive amounts of cheese" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | RAW + cooked_type = /obj/item/reagent_containers/food/snacks/pizza/mothic_five_cheese + +/obj/item/reagent_containers/food/snacks/pizza/mothic_five_cheese + name = "Solar five-cheese pizza" + desc = "A favourite amongst mice, rats, and English inventors." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "five_cheese_pizza" + list_reagents = list( + /datum/reagent/consumable/nutriment = 25, + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/tomatojuice = 6, + /datum/reagent/consumable/nutriment/vitamin = 5, + ) + tastes = list("crust" = 1, "cheese" = 1, "more cheese" = 1, "excessive amounts of cheese" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/mothic_five_cheese + +/obj/item/reagent_containers/food/snacks/pizzaslice/mothic_five_cheese + name = "Solar five-cheese slice" + desc = "It's the cheesiest slice in the galaxy!" + icon = 'icons/obj/food/pizza.dmi' + icon_state = "five_cheese_slice" + tastes = list("crust" = 1, "cheese" = 1, "more cheese" = 1, "excessive amounts of cheese" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/raw_mothic_white_pie + name = "raw Solar white-pie pizza" + desc = "A pizza made for the tomato haters." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "raw_white_pie_pizza" + list_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/cooking_oil = 5, + /datum/reagent/consumable/tomatojuice = 6, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + tastes = list("dough" = 1, "cheese" = 1, "herbs" = 1, "garlic" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | RAW + cooked_type = /obj/item/reagent_containers/food/snacks/pizza/mothic_white_pie + +/obj/item/reagent_containers/food/snacks/pizza/mothic_white_pie + name = "Solar white-pie pizza" + desc = "You say to-may-to, I say to-mah-to, and we put neither on this pizza." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "white_pie_pizza" + list_reagents = list( + /datum/reagent/consumable/nutriment = 25, + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/tomatojuice = 6, + /datum/reagent/consumable/nutriment/vitamin = 5, + ) + tastes = list("crust" = 1, "cheese" = 1, "herbs" = 1, "garlic" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/mothic_white_pie + +/obj/item/reagent_containers/food/snacks/pizzaslice/mothic_white_pie + name = "Solar white-pie slice" + desc = "Cheesy, garlicky, herby, delicious!" + icon = 'icons/obj/food/pizza.dmi' + icon_state = "white_pie_slice" + tastes = list("crust" = 1, "cheese" = 1, "more cheese" = 1, "excessive amounts of cheese" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY + +/obj/item/reagent_containers/food/snacks/raw_mothic_pesto + name = "raw Solar pesto pizza" + desc = "Pesto is most commonly seen on pasta, but pizza is a proving ground for all sorts of culinary innovation." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "raw_pesto_pizza" + list_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/cooking_oil = 5, + /datum/reagent/consumable/tomatojuice = 6, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + tastes = list("dough" = 1, "pesto" = 1, "cheese" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | NUTS | RAW + cooked_type = /obj/item/reagent_containers/food/snacks/pizza/mothic_pesto + +/obj/item/reagent_containers/food/snacks/pizza/mothic_pesto + name = "Solar pesto pizza" + desc = "Green as the grass in the garden. Not that there's many of those on spaceships." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "pesto_pizza" + list_reagents = list( + /datum/reagent/consumable/nutriment = 25, + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/tomatojuice = 6, + /datum/reagent/consumable/nutriment/vitamin = 5, + ) + tastes = list("crust" = 1, "pesto" = 1, "cheese" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | NUTS | RAW + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/mothic_pesto + +/obj/item/reagent_containers/food/snacks/pizzaslice/mothic_pesto + name = "Solar pesto slice" + desc = "A slice of presto pesto pizza." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "pesto_slice" + tastes = list("crust" = 1, "pesto" = 1, "cheese" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | NUTS + +/obj/item/reagent_containers/food/snacks/raw_mothic_garlic + name = "raw Solar garlic pizzabread" + desc = "Ahh, garlic. A universally loved ingredient, except possibly by vampires." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "raw_garlic_pizza" + list_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/cooking_oil = 5, + /datum/reagent/consumable/tomatojuice = 6, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + tastes = list("dough" = 1, "garlic" = 1, "butter" = 1) + foodtype = GRAIN | VEGETABLES | RAW + cooked_type = /obj/item/reagent_containers/food/snacks/pizza/mothic_garlic + +/obj/item/reagent_containers/food/snacks/pizza/mothic_garlic + name = "Solar garlic pizzabread" + desc = "The best food in the galaxy, hands down." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "garlic_pizza" + list_reagents = list( + /datum/reagent/consumable/nutriment = 25, + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/tomatojuice = 6, + /datum/reagent/consumable/nutriment/vitamin = 5, + ) + tastes = list("crust" = 1, "garlic" = 1, "butter" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | NUTS + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/mothic_garlic + +/obj/item/reagent_containers/food/snacks/pizzaslice/mothic_garlic + name = "Solar garlic pizzabread slice" + desc = "The best combination of oily, garlicky, and crusty known to mothkind." + icon = 'icons/obj/food/pizza.dmi' + icon_state = "garlic_slice" + tastes = list("dough" = 1, "garlic" = 1, "butter" = 1) + foodtype = GRAIN | VEGETABLES + +/obj/item/reagent_containers/food/snacks/pizza/flatbread + slice_path = null + +/obj/item/reagent_containers/food/snacks/pizza/flatbread/rustic + name = "rustic flatbread" + desc = "A simple Zohilian country dish, popular as a side to meat or fish dishes. Topped with herbs and oil" + icon_state = "rustic_flatbread" + list_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/nutriment/vitamin = 15, + /datum/reagent/consumable/garlic = 2, + ) + tastes = list("bread" = 1, "herb" = 1, "oil" = 1, "garlic" = 1) + foodtype = VEGETABLES | NUTS + +/obj/item/reagent_containers/food/snacks/pizza/flatbread/italic + name = "\improper Mediterranean flatbread" + desc = "The introduction of Solarian foods to Kalixcis led to an advancement in Sarathi cooking - the Mediterranean flatbread is now a common sight on the menus of takeout stores on the planet" + icon_state = "italic_flatbread" + list_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/cooking_oil = 10, + /datum/reagent/consumable/nutriment/vitamin = 15, + ) + tastes = list("bread" = 1, "herb" = 1, "oil" = 1, "garlic" = 1, "tomato" = 1, "meat" = 1) + foodtype = VEGETABLES | NUTS | MEAT + +/obj/item/reagent_containers/food/snacks/pizza/flatbread/imperial + name = "\improper Royal flatbread" + desc = "A flatbread topped with pate, pickled vegetables, and cubed headcheese, named in honor of the Zalish royals. Not very suited to anyone's tastes but the Sarathi." + icon_state = "imperial_flatbread" + list_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/cooking_oil = 15, + /datum/reagent/consumable/nutriment/vitamin = 10, + ) + tastes = list("bread" = 1, "herb" = 1, "oil" = 1, "garlic" = 1, "tomato" = 1, "meat" = 1) + foodtype = VEGETABLES | MEAT | NUTS | GORE + +/obj/item/reagent_containers/food/snacks/pizza/flatbread/rawmeat + name = "meatlovers flatbread" + desc = "Oddly enough, this Pan-Genezan dish is actually a favorite of some health-minded humans." + icon_state = "rawmeat_flatbread" + list_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/cooking_oil = 10, + ) + tastes = list("bread" = 1, "meat" = 1) + foodtype = MEAT | NUTS | RAW | GORE + +/obj/item/reagent_containers/food/snacks/pizza/flatbread/stinging + name = "\improper Stinging flatbread" + desc = "The electric mix of jellyfish and bee larva makes for a flavor sensation that leaves you asking for more!" + icon_state = "stinging_flatbread" + list_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/cooking_oil = 20, + /datum/reagent/consumable/honey = 2, + ) + tastes = list("bread" = 1, "sweetness" = 1, "stinging" = 1, "slime" = 1) + foodtype = BUGS | NUTS | SEAFOOD | GORE + +/obj/item/reagent_containers/food/snacks/pizza/flatbread/zmorgast // Name is based off of the Swedish dish Smörgåstårta + name = "\improper Swedish flatbread" + desc = "A Pan-Genezan spin on the original Swedish sandwich cake inherited by the Solarians, the 'swedeflat' is a common dish at family gatherings." + icon_state = "zmorgast_flatbread" + list_reagents = list( + /datum/reagent/consumable/nutriment = 16, + /datum/reagent/consumable/cooking_oil = 6, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("bread" = 1, "liver" = 1, "family" = 1) + foodtype = VEGETABLES | NUTS | MEAT + +/obj/item/reagent_containers/food/snacks/pizza/flatbread/fish + name = "\improper BBQ fish flatbread" + desc = "Superengine delamination, nuclear operatives, too cold outside, I just want to grill for Fangs' sake!" + icon_state = "fish_flatbread" + list_reagents = list( + /datum/reagent/consumable/nutriment = 20, + /datum/reagent/consumable/cooking_oil = 15, + /datum/reagent/consumable/bbqsauce = 2, + ) + tastes = list("bread" = 1, "fish" = 1) + foodtype = SEAFOOD | NUTS + +/obj/item/reagent_containers/food/snacks/pizza/flatbread/mushroom + name = "mushroom and tomato flatbread" + desc = "A simple alternative to the Italic flatbread, for when you've already filled up on meat elsewhere." + icon_state = "mushroom_flatbread" + list_reagents = list( + /datum/reagent/consumable/nutriment = 18, + /datum/reagent/consumable/nutriment/vitamin = 5, + ) + tastes = list("bread" = 1, "mushroom" = 1, "tomatoes" = 1) + foodtype = VEGETABLES | NUTS + +/obj/item/reagent_containers/food/snacks/pizza/flatbread/nutty + name = "nut paste flatbread" + desc = "Modern advances in cuisine now allow for a double helping of the delicious taste of korta nuts, both as the base and as a topping on this flatbread." + icon_state = "nutty_flatbread" + list_reagents = list(/datum/reagent/consumable/nutriment = 20) + tastes = list("bread" = 1, "nuts" = 2) + foodtype = NUTS diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/salad.dm similarity index 74% rename from code/modules/food_and_drinks/food/snacks_salad.dm rename to code/modules/food_and_drinks/food/salad.dm index c1385146781c..f6e5f9d6e3bc 100644 --- a/code/modules/food_and_drinks/food/snacks_salad.dm +++ b/code/modules/food_and_drinks/food/salad.dm @@ -134,3 +134,56 @@ list_reagents = list(/datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/consumable/nutriment = 5) tastes = list("building heat" = 2, "savory meat and vegtables" = 1) foodtype = GRAIN | MEAT | VEGETABLES + +/obj/item/reagent_containers/food/snacks/caprese_salad + name = "caprese salad" + desc = " A classic Solarian salad, \ + due to how simple it is to prepare yet how tasty it is. In Sol Common, it's known as zaileskenknusksolt: \ + two tone salad, in GalCom." //zail = two, esken = colour/tone, knuskolt = salad + icon_state = "caprese_salad" + icon = 'icons/obj/food/soupsalad.dmi' + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 6, + /datum/reagent/consumable/nutriment/vitamin = 8, + ) + tastes = list("mozzarella" = 1, "tomato" = 1, "balsamic" = 1) + foodtype = DAIRY | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/salad/fleet_salad + name = "wingman's salad" //lörton = fleet, knusksolt = salad (knusk = crisp, solt = bowl) + desc = "Wingman's salad is commonly seen at the snack bars and canteens of Solar Company mercenary vessels. \ + The grilled cheese makes it particularly filling, while the croutons provide a crunchy kick." + icon_state = "fleet_salad" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 10, + /datum/reagent/consumable/nutriment/vitamin = 12, + ) + tastes = list("cheese" = 1, "salad" = 1, "bread" = 1) + foodtype = DAIRY | VEGETABLES | GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/salad/cotton_salad + name = "cotton ball salad" + desc = "A salad with added cotton and a basic dressing. A contribution to Solarian food culture from soon after the emergence of the moth conclaves." + icon_state = "cotton_salad" + list_reagents = list(, + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/nutriment/vitamin = 14, + ) + tastes = list("cheese" = 1, "salad" = 1, "bread" = 1) + foodtype = VEGETABLES | CLOTH + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/salad/moth_kachumbari + name = "Kenyan salad" + desc = "Originally a Kenyan recipe - \ + though some ingredients have been necessarily changed." + icon_state = "moth_kachumbari" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 18, + ) + tastes = list("onion" = 1, "tomato" = 1, "corn" = 1, "chili" = 1, "cilantro" = 1) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/sandwichtoast.dm similarity index 94% rename from code/modules/food_and_drinks/food/snacks_sandwichtoast.dm rename to code/modules/food_and_drinks/food/sandwichtoast.dm index c15a6606be97..14b988cab659 100644 --- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm +++ b/code/modules/food_and_drinks/food/sandwichtoast.dm @@ -1,7 +1,7 @@ /obj/item/reagent_containers/food/snacks/sandwich name = "sandwich" desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud." - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' icon_state = "sandwich" trash = /obj/item/trash/plate bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) @@ -13,7 +13,7 @@ /obj/item/reagent_containers/food/snacks/toastedsandwich name = "toasted sandwich" desc = "Now if you only had a pepper bar." - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' icon_state = "toastedsandwich" trash = /obj/item/trash/plate bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/carbon = 2) @@ -24,7 +24,7 @@ /obj/item/reagent_containers/food/snacks/grilledcheese name = "cheese sandwich" desc = "Goes great with Tomato soup!" - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' icon_state = "toastedsandwich" trash = /obj/item/trash/plate bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) @@ -35,7 +35,7 @@ /obj/item/reagent_containers/food/snacks/jellysandwich name = "jelly sandwich" desc = "You wish you had some peanut butter to go with this..." - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' icon_state = "jellysandwich" trash = /obj/item/trash/plate bitesize = 3 @@ -55,7 +55,7 @@ /obj/item/reagent_containers/food/snacks/notasandwich name = "not-a-sandwich" desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache." - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' icon_state = "notasandwich" trash = /obj/item/trash/plate bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 6) @@ -66,7 +66,7 @@ /obj/item/reagent_containers/food/snacks/jelliedtoast name = "jellied toast" desc = "A slice of toast covered with delicious jam." - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' icon_state = "jellytoast" trash = /obj/item/trash/plate bitesize = 3 @@ -98,7 +98,7 @@ /obj/item/reagent_containers/food/snacks/twobread name = "two bread" desc = "This seems awfully bitter." - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' icon_state = "twobread" bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) @@ -108,7 +108,7 @@ /obj/item/reagent_containers/food/snacks/blt name = "BLT" desc = "A classic bacon, lettuce, and tomato sandwich." - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/bread.dmi' icon_state = "blt" bitesize = 4 list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 3) diff --git a/code/modules/food_and_drinks/food/snacks/dough.dm b/code/modules/food_and_drinks/food/snacks/dough.dm index 9567690dc71c..38732246fa76 100644 --- a/code/modules/food_and_drinks/food/snacks/dough.dm +++ b/code/modules/food_and_drinks/food/snacks/dough.dm @@ -52,7 +52,6 @@ tastes = list("bread" = 1) foodtype = GRAIN - /obj/item/reagent_containers/food/snacks/doughslice name = "dough slice" desc = "A slice of dough. Can be cooked into a bun." @@ -69,7 +68,7 @@ /obj/item/reagent_containers/food/snacks/bun name = "bun" desc = "A base for any self-respecting burger." - icon = 'icons/obj/food/burgerbread.dmi' + icon = 'icons/obj/food/burger.dmi' icon_state = "bun" list_reagents = list(/datum/reagent/consumable/nutriment = 1) custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/burger @@ -133,3 +132,68 @@ filling_color = "#CD853F" tastes = list("pastry" = 1) foodtype = GRAIN | DAIRY + +/obj/item/reagent_containers/food/snacks/tortilla + name = "tortilla" + desc = "The base for all your burritos." + icon = 'icons/obj/food/food_ingredients.dmi' + icon_state = "tortilla" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) + filling_color = "#FFEFD5" + tastes = list("tortilla" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/solar_pizza_dough + name = "Solar pizza dough" + desc = "A strong, glutenous dough, made with cornmeal and flour, designed to hold up to cheese and sauce." + icon = 'icons/obj/food/food_ingredients.dmi' + icon_state = "solar_pizza_dough" + list_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("raw flour" = 1) + foodtype = GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/rootdough + name = "root dough" + desc = "A root based dough, made with nuts and tubers. Used in a wide range of Kalixcian cooking." + icon = 'icons/obj/food/food_ingredients.dmi' + icon_state = "rootdough" + list_reagents = list(/datum/reagent/consumable/nutriment = 6) + w_class = WEIGHT_CLASS_SMALL + tastes = list("potato" = 1, "earthy heat" = 1) + foodtype = VEGETABLES | NUTS + cooked_type = /obj/item/reagent_containers/food/snacks/store/bread/root + +/obj/item/reagent_containers/food/snacks/flatrootdough + name = "flat rootdough" + desc = "Flattened rootdough, ready to be made into a flatbread, or cut into segments." + icon = 'icons/obj/food/food_ingredients.dmi' + icon_state = "flat_rootdough" + list_reagents = list(/datum/reagent/consumable/nutriment = 6) + tastes = list("potato" = 1, "earthy heat" = 1) + foodtype = VEGETABLES | NUTS + cooked_type = /obj/item/reagent_containers/food/snacks/root_flatbread + slice_path = /obj/item/reagent_containers/food/snacks/rootdoughslice + slices_num = 3 + +/obj/item/reagent_containers/food/snacks/rootdoughslice + name = "rootdough ball" + desc = "A ball of root dough. Perfect for making pasta or rolls." + icon = 'icons/obj/food/food_ingredients.dmi' + icon_state = "rootdough_slice" + list_reagents = list(/datum/reagent/consumable/nutriment = 2) + w_class = WEIGHT_CLASS_SMALL + tastes = list("potato" = 1, "earthy heat" = 1) + foodtype = VEGETABLES | NUTS + slice_path = /obj/item/reagent_containers/food/snacks/spaghetti/nizaya + slices_num = 1 + cooked_type = /obj/item/reagent_containers/food/snacks/rootroll + +/obj/item/reagent_containers/food/snacks/root_flatbread + name = "root flatbread" + desc = "A plain grilled root flatbread. Can be topped with a variety of foods that lizards like to eat." + icon = 'icons/obj/food/food_ingredients.dmi' + icon_state = "root_flatbread" + list_reagents = list(/datum/reagent/consumable/nutriment = 8) + tastes = list("bread" = 1, "earthy heat" = 1) + foodtype = VEGETABLES | NUTS diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm index e4ccbd1c8f90..9bd4c809a818 100644 --- a/code/modules/food_and_drinks/food/snacks/meat.dm +++ b/code/modules/food_and_drinks/food/snacks/meat.dm @@ -2,6 +2,8 @@ var/subjectname = "" var/subjectjob = null custom_materials = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT * 4) + icon = 'icons/obj/food/meat.dmi' + icon_state = "meat" material_flags = MATERIAL_NO_EFFECTS //Remove this once we refactor food, prevents meat literaly being eaten twice /obj/item/reagent_containers/food/snacks/meat/slab diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm deleted file mode 100644 index 3d5adf18e6fd..000000000000 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ /dev/null @@ -1,765 +0,0 @@ - -////////////////////////////////////////////OTHER//////////////////////////////////////////// - -/obj/item/reagent_containers/food/snacks/store/cheesewheel - name = "cheese wheel" - desc = "A big wheel of delcious Cheddar." - icon_state = "cheesewheel" - slice_path = /obj/item/reagent_containers/food/snacks/cheesewedge - slices_num = 5 - list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment/vitamin = 5) - w_class = WEIGHT_CLASS_NORMAL - tastes = list("cheese" = 1) - foodtype = DAIRY - -/obj/item/reagent_containers/food/snacks/royalcheese - name = "royal cheese" - desc = "Ascend the throne. Consume the wheel. Feel the POWER." - icon_state = "royalcheese" - list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/gold = 20, /datum/reagent/toxin/mutagen = 5) - w_class = WEIGHT_CLASS_BULKY - tastes = list("cheese" = 4, "royalty" = 1) - foodtype = DAIRY - -/obj/item/reagent_containers/food/snacks/cheesewedge - name = "cheese wedge" - desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far." - icon_state = "cheesewedge" - filling_color = "#FFD700" - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) - tastes = list("cheese" = 1) - foodtype = DAIRY - -/obj/item/reagent_containers/food/snacks/watermelonslice - name = "watermelon slice" - desc = "A slice of watery goodness." - icon_state = "watermelonslice" - filling_color = "#FF1493" - tastes = list("watermelon" = 1) - foodtype = FRUIT - juice_results = list(/datum/reagent/consumable/watermelonjuice = 5) - -/obj/item/reagent_containers/food/snacks/candy_corn - name = "candy corn" - desc = "It's a handful of candy corn. Can be stored in a detective's hat." - icon_state = "candy_corn" - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2) - filling_color = "#FF8C00" - tastes = list("candy corn" = 1) - foodtype = JUNKFOOD | SUGAR - -/obj/item/reagent_containers/food/snacks/candy_corn/prison - name = "desiccated candy corn" - desc = "If this candy corn were any harder Security would confiscate it for being a potential shiv." - force = 1 // the description isn't lying - throwforce = 1 // if someone manages to bust out of jail with candy corn god bless them - tastes = list("bitter wax" = 1) - foodtype = GROSS - -/obj/item/reagent_containers/food/snacks/chocolatebar - name = "chocolate bar" - desc = "Such, sweet, fattening food." - icon_state = "chocolatebar" - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2) - filling_color = "#A0522D" - tastes = list("chocolate" = 1) - foodtype = JUNKFOOD | SUGAR - -/obj/item/reagent_containers/food/snacks/hugemushroomslice - name = "huge mushroom slice" - desc = "A slice from a huge mushroom." - icon_state = "hugemushroomslice" - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) - tastes = list("mushroom" = 1) - foodtype = VEGETABLES - -/obj/item/reagent_containers/food/snacks/popcorn - name = "popcorn" - desc = "Now let's find some cinema." - icon_state = "popcorn" - trash = /obj/item/trash/popcorn - list_reagents = list(/datum/reagent/consumable/nutriment = 2) - bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0 - filling_color = "#FFEFD5" - tastes = list("popcorn" = 3, "butter" = 1) - foodtype = JUNKFOOD - -/obj/item/reagent_containers/food/snacks/popcorn/Initialize() - . = ..() - eatverb = pick("bite","nibble","gnaw","gobble","chomp") - -/obj/item/reagent_containers/food/snacks/loadedbakedpotato - name = "loaded baked potato" - desc = "Totally baked." - icon_state = "loadedbakedpotato" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 6) - filling_color = "#D2B48C" - tastes = list("potato" = 1) - foodtype = VEGETABLES | DAIRY - -/obj/item/reagent_containers/food/snacks/fries - name = "space fries" - desc = "AKA: French Fries, Freedom Fries, etc." - icon_state = "fries" - trash = /obj/item/trash/plate - list_reagents = list(/datum/reagent/consumable/nutriment = 4) - filling_color = "#FFD700" - tastes = list("fries" = 3, "salt" = 1) - foodtype = VEGETABLES | GRAIN | FRIED - -/obj/item/reagent_containers/food/snacks/fries/Initialize() - . = ..() - AddElement(/datum/element/dunkable, 10) - -/obj/item/reagent_containers/food/snacks/tatortot - name = "tator tot" - desc = "A large fried potato nugget that may or may not try to valid you." - icon_state = "tatortot" - list_reagents = list(/datum/reagent/consumable/nutriment = 4) - filling_color = "FFD700" - tastes = list("potato" = 3, "valids" = 1) - foodtype = FRIED | VEGETABLES - -/obj/item/reagent_containers/food/snacks/tatortot/Initialize() - . = ..() - AddElement(/datum/element/dunkable, 10) - -/obj/item/reagent_containers/food/snacks/soydope - name = "soy dope" - desc = "Dope from a soy." - icon_state = "soydope" - trash = /obj/item/trash/plate - list_reagents = list(/datum/reagent/consumable/nutriment = 2) - filling_color = "#DEB887" - tastes = list("soy" = 1) - foodtype = VEGETABLES - -/obj/item/reagent_containers/food/snacks/cheesyfries - name = "cheesy fries" - desc = "Fries. Covered in cheese. Duh." - icon_state = "cheesyfries" - trash = /obj/item/trash/plate - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 6) - filling_color = "#FFD700" - tastes = list("fries" = 3, "cheese" = 1) - foodtype = VEGETABLES | GRAIN | DAIRY - -/obj/item/reagent_containers/food/snacks/cheesyfries/Initialize() - . = ..() - AddElement(/datum/element/dunkable, 10) - -/obj/item/reagent_containers/food/snacks/badrecipe - name = "burned mess" - desc = "Someone should be demoted from cook for this." - icon_state = "badrecipe" - list_reagents = list(/datum/reagent/toxin/bad_food = 30) - filling_color = "#8B4513" - foodtype = GROSS - -/obj/item/reagent_containers/food/snacks/carrotfries - name = "carrot fries" - desc = "Tasty fries from fresh Carrots." - icon_state = "carrotfries" - trash = /obj/item/trash/plate - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/oculine = 3, /datum/reagent/consumable/nutriment/vitamin = 2) - filling_color = "#FFA500" - tastes = list("carrots" = 3, "salt" = 1) - foodtype = VEGETABLES - -/obj/item/reagent_containers/food/snacks/carrotfries/Initialize() - . = ..() - AddElement(/datum/element/dunkable, 10) - -/obj/item/reagent_containers/food/snacks/candiedapple - name = "candied apple" - desc = "An apple coated in sugary sweetness." - icon_state = "candiedapple" - bitesize = 3 - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 3) - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/caramel = 5) - filling_color = "#FF4500" - tastes = list("apple" = 2, "caramel" = 3) - foodtype = JUNKFOOD | FRUIT | SUGAR - -/obj/item/reagent_containers/food/snacks/mint - name = "mint" - desc = "It is only wafer thin." - icon_state = "mint" - bitesize = 1 - trash = /obj/item/trash/plate - list_reagents = list(/datum/reagent/toxin/minttoxin = 2) - filling_color = "#800000" - foodtype = TOXIC | SUGAR - -/obj/item/reagent_containers/food/snacks/eggwrap - name = "egg wrap" - desc = "The precursor to Pigs in a Blanket." - icon_state = "eggwrap" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3) - list_reagents = list(/datum/reagent/consumable/nutriment = 5) - filling_color = "#F0E68C" - tastes = list("egg" = 1) - foodtype = MEAT | GRAIN - -/obj/item/reagent_containers/food/snacks/spidereggs - name = "spider eggs" - desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health." - icon_state = "spidereggs" - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin = 2) - filling_color = "#008000" - tastes = list("cobwebs" = 1) - foodtype = MEAT | TOXIC - -/obj/item/reagent_containers/food/snacks/spiderling - name = "spiderling" - desc = "It's slightly twitching in your hand. Ew..." - icon_state = "spiderling" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin = 4) - filling_color = "#00800" - tastes = list("cobwebs" = 1, "guts" = 2) - foodtype = MEAT | TOXIC - -/obj/item/reagent_containers/food/snacks/spiderlollipop - name = "spider lollipop" - desc = "Still gross, but at least it has a mountain of sugar on it." - icon_state = "spiderlollipop" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/omnizine = 2) //lollipop, but vitamins = toxins - filling_color = "#00800" - tastes = list("cobwebs" = 1, "sugar" = 2) - foodtype = JUNKFOOD | SUGAR - -/obj/item/reagent_containers/food/snacks/chococoin - name = "chocolate coin" - desc = "A completely edible but nonflippable festive coin." - icon_state = "chococoin" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/coco = 1) - filling_color = "#A0522D" - tastes = list("chocolate" = 1) - foodtype = JUNKFOOD | SUGAR - -/obj/item/reagent_containers/food/snacks/fudgedice - name = "fudge dice" - desc = "A little cube of chocolate that tends to have a less intense taste if you eat too many at once." - icon_state = "chocodice" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/coco = 1) - filling_color = "#A0522D" - trash = /obj/item/dice/fudge - tastes = list("fudge" = 1) - foodtype = JUNKFOOD | SUGAR - -/obj/item/reagent_containers/food/snacks/chocoorange - name = "chocolate orange" - desc = "A festive chocolate orange." - icon_state = "chocoorange" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 1) - filling_color = "#A0522D" - tastes = list("chocolate" = 3, "oranges" = 1) - foodtype = JUNKFOOD | SUGAR - -/obj/item/reagent_containers/food/snacks/eggplantparm - name = "eggplant parmigiana" - desc = "The only good recipe for eggplant." - icon_state = "eggplantparm" - trash = /obj/item/trash/plate - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2) - filling_color = "#BA55D3" - tastes = list("eggplant" = 3, "cheese" = 1) - foodtype = VEGETABLES | DAIRY - -/obj/item/reagent_containers/food/snacks/tortilla - name = "tortilla" - desc = "The base for all your burritos." - icon = 'icons/obj/food/food_ingredients.dmi' - icon_state = "tortilla" - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) - filling_color = "#FFEFD5" - tastes = list("tortilla" = 1) - foodtype = GRAIN - -/obj/item/reagent_containers/food/snacks/burrito - name = "burrito" - desc = "Tortilla wrapped goodness." - icon_state = "burrito" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1) - filling_color = "#FFEFD5" - tastes = list("torilla" = 2, "meat" = 3) - foodtype = GRAIN | MEAT - -/obj/item/reagent_containers/food/snacks/cheesyburrito - name = "cheesy burrito" - desc = "It's a burrito filled with cheese." - icon_state = "cheesyburrito" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) - filling_color = "#FFD800" - tastes = list("torilla" = 2, "meat" = 3, "cheese" = 1) - foodtype = GRAIN | MEAT | DAIRY - -/obj/item/reagent_containers/food/snacks/carneburrito - name = "carne asada burrito" - desc = "The best burrito for meat lovers." - icon_state = "carneburrito" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1) - filling_color = "#A0522D" - tastes = list("torilla" = 2, "meat" = 4) - foodtype = GRAIN | MEAT - -/obj/item/reagent_containers/food/snacks/fuegoburrito - name = "fuego plasma burrito" - desc = "A super spicy burrito." - icon_state = "fuegoburrito" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/capsaicin = 5, /datum/reagent/consumable/nutriment/vitamin = 3) - filling_color = "#FF2000" - tastes = list("torilla" = 2, "meat" = 3, "hot peppers" = 1) - foodtype = GRAIN | MEAT - -/obj/item/reagent_containers/food/snacks/yakiimo - name = "yaki imo" - desc = "Made with roasted sweet potatoes!" - icon_state = "yakiimo" - trash = /obj/item/trash/plate - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 4) - filling_color = "#8B1105" - tastes = list("sweet potato" = 1) - foodtype = GRAIN | VEGETABLES | SUGAR - -/obj/item/reagent_containers/food/snacks/roastparsnip - name = "roast parsnip" - desc = "Sweet and crunchy." - icon_state = "roastparsnip" - trash = /obj/item/trash/plate - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 4) - filling_color = "#FF5500" - tastes = list("parsnip" = 1) - foodtype = VEGETABLES - -/obj/item/reagent_containers/food/snacks/melonfruitbowl - name = "melon fruit bowl" - desc = "For people who wants edible fruit bowls." - icon_state = "melonfruitbowl" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4) - filling_color = "#FF5500" - w_class = WEIGHT_CLASS_NORMAL - tastes = list("melon" = 1) - foodtype = FRUIT - -/obj/item/reagent_containers/food/snacks/nachos - name = "nachos" - desc = "Chips from Space Mexico." - icon_state = "nachos" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2) - filling_color = "#F4A460" - tastes = list("nachos" = 1) - foodtype = VEGETABLES | FRIED - -/obj/item/reagent_containers/food/snacks/cheesynachos - name = "cheesy nachos" - desc = "The delicious combination of nachos and melting cheese." - icon_state = "cheesynachos" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3) - filling_color = "#FFD700" - tastes = list("nachos" = 2, "cheese" = 1) - foodtype = VEGETABLES | FRIED | DAIRY - -/obj/item/reagent_containers/food/snacks/cubannachos - name = "Cuban nachos" - desc = "That's some dangerously spicy nachos." - icon_state = "cubannachos" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3) - list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/capsaicin = 8, /datum/reagent/consumable/nutriment/vitamin = 4) - filling_color = "#DC143C" - tastes = list("nachos" = 2, "hot pepper" = 1) - foodtype = VEGETABLES | FRIED | DAIRY - -/obj/item/reagent_containers/food/snacks/melonkeg - name = "melon keg" - desc = "Who knew vodka was a fruit?" - icon_state = "melonkeg" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 3) - list_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/ethanol/vodka = 15, /datum/reagent/consumable/nutriment/vitamin = 4) - filling_color = "#FFD700" - volume = 80 - bitesize = 5 - tastes = list("grain alcohol" = 1, "fruit" = 1) - foodtype = FRUIT | ALCOHOL - -/obj/item/reagent_containers/food/snacks/honeybar - name = "honey nut bar" - desc = "Oats and nuts compressed together into a bar, held together with a honey glaze." - icon_state = "honeybar" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/honey = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/honey = 5) - filling_color = "#F2CE91" - tastes = list("oats" = 3, "nuts" = 2, "honey" = 1) - foodtype = GRAIN | SUGAR - -/obj/item/reagent_containers/food/snacks/stuffedlegion - name = "stuffed legion" - desc = "The former skull of a damned human, filled with goliath meat. It has a decorative lava pool made of ketchup and hotsauce." - icon_state = "stuffed_legion" - bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/consumable/capsaicin = 1, /datum/reagent/medicine/tricordrazine = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/capsaicin = 2, /datum/reagent/medicine/tricordrazine = 10) - tastes = list("death" = 2, "rock" = 1, "meat" = 1, "hot peppers" = 1) - foodtype = MEAT - -/obj/item/reagent_containers/food/snacks/powercrepe - name = "Powercrepe" - desc = "With great power, comes great crepes. It looks like a pancake filled with jelly but packs quite a punch." - icon_state = "powercrepe" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/iron = 10) - list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/cherryjelly = 5) - force = 30 - throwforce = 15 - block_chance = 55 - armour_penetration = 80 - attack_verb = list("slapped", "slathered") - w_class = WEIGHT_CLASS_BULKY - tastes = list("cherry" = 1, "crepe" = 1) - foodtype = GRAIN | FRUIT | SUGAR - -/obj/item/reagent_containers/food/snacks/chewable - slot_flags = ITEM_SLOT_MASK - ///How long it lasts before being deleted - var/succ_dur = 180 - ///The delay between each time it will handle reagents - var/succ_int = 100 - ///Stores the time set for the next handle_reagents - var/next_succ = 0 - - //makes snacks actually wearable as masks and still edible the old fashioned way. -/obj/item/reagent_containers/food/snacks/chewable/proc/handle_reagents() - if(reagents.total_volume) - if(iscarbon(loc)) - var/mob/living/carbon/C = loc - if (src == C.wear_mask) // if it's in the human/monkey mouth, transfer reagents to the mob - if(!reagents.trans_to(C, REAGENTS_METABOLISM, method = INGEST)) - reagents.remove_any(REAGENTS_METABOLISM) - return - reagents.remove_any(REAGENTS_METABOLISM) - -/obj/item/reagent_containers/food/snacks/chewable/process() - if(iscarbon(loc)) - if(succ_dur < 1) - qdel(src) - return - succ_dur-- - if((reagents && reagents.total_volume) && (next_succ <= world.time)) - handle_reagents() - next_succ = world.time + succ_int - -/obj/item/reagent_containers/food/snacks/chewable/equipped(mob/user, slot) - . = ..() - if(slot == ITEM_SLOT_MASK) - START_PROCESSING(SSobj, src) - else - STOP_PROCESSING(SSobj, src) - -/obj/item/reagent_containers/food/snacks/chewable/Destroy() - STOP_PROCESSING(SSobj, src) - . = ..() - -/obj/item/reagent_containers/food/snacks/chewable/lollipop - name = "lollipop" - desc = "A delicious lollipop. Makes for a great Valentine's present." - icon = 'icons/obj/lollipop.dmi' - icon_state = "lollipop_stick" - item_state = "lollipop_stick" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/omnizine = 2) //Honk - var/mutable_appearance/head - var/headcolor = rgb(0, 0, 0) - succ_dur = 180 - succ_int = 100 - next_succ = 0 - tastes = list("candy" = 1) - foodtype = JUNKFOOD | SUGAR - -/obj/item/reagent_containers/food/snacks/chewable/lollipop/Initialize() - . = ..() - head = mutable_appearance('icons/obj/lollipop.dmi', "lollipop_head") - change_head_color(rgb(rand(0, 255), rand(0, 255), rand(0, 255))) - -/obj/item/reagent_containers/food/snacks/chewable/lollipop/proc/change_head_color(C) - headcolor = C - cut_overlay(head) - head.color = C - add_overlay(head) - -/obj/item/reagent_containers/food/snacks/chewable/lollipop/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) - ..(hit_atom) - throw_speed = 1 - throwforce = 0 - -/obj/item/reagent_containers/food/snacks/chewable/lollipop/cyborg - var/spamchecking = TRUE - -/obj/item/reagent_containers/food/snacks/chewable/lollipop/cyborg/Initialize() - . = ..() - addtimer(CALLBACK(src, PROC_REF(spamcheck)), 1200) - -/obj/item/reagent_containers/food/snacks/chewable/lollipop/cyborg/equipped(mob/living/user, slot) - . = ..(user, slot) - spamchecking = FALSE - -/obj/item/reagent_containers/food/snacks/chewable/lollipop/cyborg/proc/spamcheck() - if(spamchecking) - qdel(src) - -/obj/item/reagent_containers/food/snacks/chewable/bubblegum - name = "bubblegum" - desc = "A rubbery strip of gum. Not exactly filling, but it keeps you busy." - icon_state = "bubblegum" - item_state = "bubblegum" - color = "#E48AB5" // craftable custom gums someday? - list_reagents = list(/datum/reagent/consumable/sugar = 5) - tastes = list("candy" = 1) - -/obj/item/reagent_containers/food/snacks/chewable/bubblegum/nicotine - name = "nicotine gum" - list_reagents = list(/datum/reagent/drug/nicotine = 10, /datum/reagent/consumable/menthol = 5) - tastes = list("mint" = 1) - color = "#60A584" - -/obj/item/reagent_containers/food/snacks/chewable/bubblegum/happiness - name = "HP+ gum" - desc = "A rubbery strip of gum. It smells funny." - list_reagents = list(/datum/reagent/drug/happiness = 15) - tastes = list("paint thinner" = 1) - color = "#EE35FF" - -/obj/item/reagent_containers/food/snacks/chewable/bubblegum/bubblegum - name = "bubblegum gum" - desc = "A rubbery strip of gum. You don't feel like eating it is a good idea." - color = "#913D3D" - list_reagents = list(/datum/reagent/blood = 15) - tastes = list("hell" = 1) - -/obj/item/reagent_containers/food/snacks/chewable/bubblegum/bubblegum/process() - . = ..() - if(iscarbon(loc)) - hallucinate(loc) - - -/obj/item/reagent_containers/food/snacks/chewable/bubblegum/bubblegum/On_Consume(mob/living/eater) - . = ..() - if(iscarbon(eater)) - hallucinate(eater) - -///This proc has a 5% chance to have a bubblegum line appear, with an 85% chance for just text and 15% for a bubblegum hallucination and scarier text. -/obj/item/reagent_containers/food/snacks/chewable/bubblegum/bubblegum/proc/hallucinate(mob/living/carbon/victim) - if(!prob(5)) //cursed by bubblegum - return - if(prob(15)) - new /datum/hallucination/oh_yeah(victim) - to_chat(victim, "[pick("I AM IMMORTAL.","I SHALL TAKE YOUR WORLD.","I SEE YOU.","YOU CANNOT ESCAPE ME FOREVER.","NOTHING CAN HOLD ME.")]") - else - to_chat(victim, "[pick("You hear faint whispers.","You smell ash.","You feel hot.","You hear a roar in the distance.")]") - -/obj/item/reagent_containers/food/snacks/gumball - name = "gumball" - desc = "A colorful, sugary gumball." - icon = 'icons/obj/lollipop.dmi' - icon_state = "gumball" - list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/bicaridine = 2, /datum/reagent/medicine/kelotane = 2) //Kek - tastes = list("candy") - foodtype = JUNKFOOD - -/obj/item/reagent_containers/food/snacks/gumball/Initialize() - . = ..() - color = rgb(rand(0, 255), rand(0, 255), rand(0, 255)) - -/obj/item/reagent_containers/food/snacks/gumball/cyborg - var/spamchecking = TRUE - -/obj/item/reagent_containers/food/snacks/gumball/cyborg/Initialize() - . = ..() - addtimer(CALLBACK(src, PROC_REF(spamcheck)), 1200) - -/obj/item/reagent_containers/food/snacks/gumball/cyborg/equipped(mob/living/user, slot) - . = ..(user, slot) - spamchecking = FALSE - -/obj/item/reagent_containers/food/snacks/gumball/cyborg/proc/spamcheck() - if(spamchecking) - qdel(src) - -/obj/item/reagent_containers/food/snacks/taco - name = "taco" - desc = "A traditional taco with meat, cheese, and lettuce." - icon_state = "taco" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) - filling_color = "F0D830" - tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1) - foodtype = MEAT | DAIRY | GRAIN | VEGETABLES - -/obj/item/reagent_containers/food/snacks/taco/plain - desc = "A traditional taco with meat and cheese, minus the rabbit food." - icon_state = "taco_plain" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) - tastes = list("taco" = 4, "meat" = 2, "cheese" = 2) - foodtype = MEAT | DAIRY | GRAIN - -/obj/item/reagent_containers/food/snacks/branrequests - name = "Bran Requests Cereal" - desc = "A dry cereal that satiates your requests for bran. Tastes uniquely like raisins and salt." - icon_state = "bran_requests" - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/sodiumchloride = 5) - bonus_reagents = list(/datum/reagent/consumable/sodiumchloride = 10) - tastes = list("bran" = 4, "raisins" = 3, "salt" = 1) - foodtype = GRAIN | FRUIT | BREAKFAST - -/obj/item/reagent_containers/food/snacks/butter - name = "stick of butter" - desc = "A stick of delicious, golden, fatty goodness." - icon_state = "butter" - list_reagents = list(/datum/reagent/consumable/nutriment = 5) - filling_color = "#FFD700" - tastes = list("butter" = 1) - foodtype = DAIRY - -/obj/item/reagent_containers/food/snacks/butter/examine(mob/user) - . = ..() - . += "If you had a rod you could make butter on a stick." - -/obj/item/reagent_containers/food/snacks/butter/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/stack/rods)) - var/obj/item/stack/rods/R = W - if(!R.use(1))//borgs can still fail this if they have no metal - to_chat(user, "You do not have enough metal to put [src] on a stick!") - return ..() - to_chat(user, "You stick the rod into the stick of butter.") - var/obj/item/reagent_containers/food/snacks/butter/on_a_stick/new_item = new(usr.loc) - var/replace = (user.get_inactive_held_item() == R) - if(!R && replace) - user.put_in_hands(new_item) - qdel(src) - return TRUE - ..() - -/obj/item/reagent_containers/food/snacks/butter/on_a_stick //there's something so special about putting it on a stick. - name = "butter on a stick" - desc = "delicious, golden, fatty goodness on a stick." - icon_state = "butteronastick" - trash = /obj/item/stack/rods - -/obj/item/reagent_containers/food/snacks/onionrings - name = "onion rings" - desc = "Onion slices coated in batter." - icon_state = "onionrings" - list_reagents = list(/datum/reagent/consumable/nutriment = 3) - filling_color = "#C0C9A0" - gender = PLURAL - tastes = list("batter" = 3, "onion" = 1) - foodtype = VEGETABLES - -/obj/item/reagent_containers/food/snacks/pineappleslice - name = "pineapple slice" - desc = "A sliced piece of juicy pineapple." - icon_state = "pineapple_slice" - filling_color = "#F6CB0B" - juice_results = list(/datum/reagent/consumable/pineapplejuice = 3) - tastes = list("pineapple" = 1) - foodtype = FRUIT | PINEAPPLE - -/obj/item/reagent_containers/food/snacks/tinychocolate - name = "chocolate" - desc = "A tiny and sweet chocolate." - icon_state = "tiny_chocolate" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/coco = 1) - filling_color = "#A0522D" - tastes = list("chocolate" = 1) - foodtype = JUNKFOOD | SUGAR - -/obj/item/reagent_containers/food/snacks/canned - name = "Canned Air" - desc = "If you ever wondered where air came from..." - list_reagents = list(/datum/reagent/oxygen = 6, /datum/reagent/nitrogen = 24) - icon_state = "peachcan" - in_container = TRUE - reagent_flags = NONE - spillable = FALSE - w_class = WEIGHT_CLASS_NORMAL - volume = 30 - -/obj/item/reagent_containers/food/snacks/canned/proc/open_can(mob/user) - to_chat(user, "You pull back the tab of \the [src].") - playsound(user.loc, 'sound/items/foodcanopen.ogg', 50) - reagents.flags |= OPENCONTAINER - spillable = TRUE - -/obj/item/reagent_containers/food/snacks/canned/attack_self(mob/user) - if(!is_drainable()) - open_can(user) - icon_state = "[icon_state]_open" - return ..() - -/obj/item/reagent_containers/food/snacks/canned/attack(mob/living/M, mob/user, def_zone) - if (!is_drainable()) - to_chat(user, "[src]'s lid hasn't been opened!") - return 0 - return ..() - -/obj/item/reagent_containers/food/snacks/canned/beans - name = "tin of beans" - desc = "Musical fruit in a slightly less musical container." - icon_state = "beans" - trash = /obj/item/trash/can/food/beans - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 10) - filling_color = "#B22222" - tastes = list("beans" = 1) - foodtype = VEGETABLES - -/obj/item/reagent_containers/food/snacks/canned/peaches - name = "canned peaches" - desc = "Just a nice can of ripe peaches swimming in their own juices." - icon_state = "peachcan" - trash = /obj/item/trash/can/food/peaches - list_reagents = list(/datum/reagent/consumable/peachjuice = 20, /datum/reagent/consumable/sugar = 8, /datum/reagent/consumable/nutriment = 2) - filling_color = "#ffdf26" - tastes = list("peaches" = 7, "tin" = 1) - foodtype = FRUIT | SUGAR - -/obj/item/reagent_containers/food/snacks/canned/peaches/maint - name = "maintenance peaches" - desc = "I have a mouth and I must eat." - icon_state = "peachcanmaint" - trash = /obj/item/trash/can/food/peaches/maint - tastes = list("peaches" = 1, "tin" = 7) - -/obj/item/reagent_containers/food/snacks/crab_rangoon - name = "crab rangoon" - desc = "Has many names, like crab puffs, cheese wontons, crab dumplings? Whatever you call them, they're a fabulous blast of cream cheesy crab." - icon_state = "crabrangoon" - list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 5) - filling_color = "#f2efdc" - w_class = WEIGHT_CLASS_SMALL - tastes = list("cream cheese" = 4, "crab" = 3, "crispiness" = 2) - foodtype = MEAT | DAIRY | GRAIN - -/obj/item/reagent_containers/food/snacks/cornchips - name = "boritos corn chips" - desc = "Triangular corn chips. They do seem a bit bland but would probably go well with some kind of dipping sauce." - icon_state = "boritos" - trash = /obj/item/trash/boritos - bitesize = 2 - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/sodiumchloride = 3) - junkiness = 20 - filling_color = "#ECA735" - tastes = list("fried corn" = 1) - foodtype = JUNKFOOD | FRIED - - diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm deleted file mode 100644 index 9b8e949b06e6..000000000000 --- a/code/modules/food_and_drinks/food/snacks_pizza.dm +++ /dev/null @@ -1,228 +0,0 @@ - -/////////////////////////////////////////////////PIZZA//////////////////////////////////////// - -/obj/item/reagent_containers/food/snacks/pizza - icon = 'icons/obj/food/pizzaspaghetti.dmi' - w_class = WEIGHT_CLASS_NORMAL - slices_num = 6 - volume = 80 - list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5) - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) - foodtype = GRAIN | DAIRY | VEGETABLES - -/obj/item/reagent_containers/food/snacks/pizzaslice - icon = 'icons/obj/food/pizzaspaghetti.dmi' - list_reagents = list(/datum/reagent/consumable/nutriment = 5) - foodtype = GRAIN | DAIRY | VEGETABLES - -/obj/item/reagent_containers/food/snacks/pizza/margherita - name = "pizza margherita" - desc = "The most cheezy pizza in galaxy." - icon_state = "pizzamargherita" - slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/margherita - bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY - -/obj/item/reagent_containers/food/snacks/pizza/margherita/robo/Initialize() - bonus_reagents += list(/datum/reagent/nanomachines = 70) - return ..() - -/obj/item/reagent_containers/food/snacks/pizzaslice/margherita - name = "margherita slice" - desc = "A slice of the most cheezy pizza in galaxy." - icon_state = "pizzamargheritaslice" - filling_color = "#FFA500" - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY - -/obj/item/reagent_containers/food/snacks/pizza/meat - name = "meatpizza" - desc = "Greasy pizza with delicious meat." - icon_state = "meatpizza" - slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/meat - bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 8) - list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 8) - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) - foodtype = GRAIN | VEGETABLES| DAIRY | MEAT - -/obj/item/reagent_containers/food/snacks/pizzaslice/meat - name = "meatpizza slice" - desc = "A nutritious slice of meatpizza." - icon_state = "meatpizzaslice" - filling_color = "#A52A2A" - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY | MEAT - -/obj/item/reagent_containers/food/snacks/pizza/mushroom - name = "mushroom pizza" - desc = "Very special pizza." - icon_state = "mushroompizza" - slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/mushroom - bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 5) - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY - -/obj/item/reagent_containers/food/snacks/pizzaslice/mushroom - name = "mushroom pizza slice" - desc = "Maybe it is the last slice of pizza in your life." - icon_state = "mushroompizzaslice" - filling_color = "#FFE4C4" - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY - -/obj/item/reagent_containers/food/snacks/pizza/vegetable - name = "vegetable pizza" - desc = "No one of Tomatos Sapiens were harmed during making this pizza." - icon_state = "vegetablepizza" - slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/vegetable - bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/oculine = 12, /datum/reagent/consumable/nutriment/vitamin = 5) - tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY - -/obj/item/reagent_containers/food/snacks/pizzaslice/vegetable - name = "vegetable pizza slice" - desc = "A slice of the most green pizza of all pizzas not containing green ingredients." - icon_state = "vegetablepizzaslice" - filling_color = "#FFA500" - tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY - -/obj/item/reagent_containers/food/snacks/pizza/donkpocket - name = "donkpocket pizza" - desc = "Who thought this would be a good idea?" - icon_state = "donkpocketpizza" - slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/donkpocket - bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/omnizine = 10, /datum/reagent/consumable/nutriment/vitamin = 5) - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD - -/obj/item/reagent_containers/food/snacks/pizzaslice/donkpocket - name = "donkpocket pizza slice" - desc = "Smells like donkpocket." - icon_state = "donkpocketpizzaslice" - filling_color = "#FFA500" - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD - -/obj/item/reagent_containers/food/snacks/pizza/dank - name = "dank pizza" - desc = "The hippie's pizza of choice." - icon_state = "dankpizza" - slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/dank - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6) - list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5) - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY - -/obj/item/reagent_containers/food/snacks/pizzaslice/dank - name = "dank pizza slice" - desc = "So good, man..." - icon_state = "dankpizzaslice" - filling_color = "#2E8B57" - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY - -/obj/item/reagent_containers/food/snacks/pizza/sassysage - name = "sassysage pizza" - desc = "You can really smell the sassiness." - icon_state = "sassysagepizza" - slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/sassysage - bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6) - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY - -/obj/item/reagent_containers/food/snacks/pizzaslice/sassysage - name = "sassysage pizza slice" - desc = "Deliciously sassy." - icon_state = "sassysagepizzaslice" - filling_color = "#FF4500" - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY - -/obj/item/reagent_containers/food/snacks/pizza/pineapple - name = "\improper Hawaiian pizza" - desc = "The pizza equivalent of Einstein's riddle." - icon_state = "pineapplepizza" - slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/pineapple - bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6) - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2) - foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE - -/obj/item/reagent_containers/food/snacks/pizzaslice/pineapple - name = "\improper Hawaiian pizza slice" - desc = "A slice of delicious controversy." - icon_state = "pineapplepizzaslice" - filling_color = "#FF4500" - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2) - foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE - -/obj/item/reagent_containers/food/snacks/pizza/arnold - name = "\improper Arnold pizza" - desc = "Hello, you've reached Arnold's pizza shop. I'm not here now, I'm out killing pepperoni." - icon_state = "arnoldpizza" - slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/arnold - bonus_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, /datum/reagent/medicine/omnizine = 30) - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2) - -/obj/item/reagent_containers/food/snacks/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm - var/obj/item/bodypart/l_arm = user.get_bodypart(BODY_ZONE_L_ARM) - var/obj/item/bodypart/r_arm = user.get_bodypart(BODY_ZONE_R_ARM) - if(prob(50) && iscarbon(user) && M == user && (r_arm || l_arm)) - user.visible_message("\The [src] breaks off [user]'s arm!!", "\The [src] breaks off your arm!") - if(l_arm) - l_arm.dismember() - else - r_arm.dismember() - playsound(user, "desceration" ,50, TRUE, -1) - -/obj/item/reagent_containers/food/snacks/proc/i_kill_you(obj/item/I, mob/user) - if(istype(I, /obj/item/reagent_containers/food/snacks/pineappleslice)) - to_chat(user, "If you want something crazy like pineapple, I kill you.") - user.gib() //if you want something crazy like pineapple, i kill you - -/obj/item/reagent_containers/food/snacks/pizza/arnold/attack(mob/living/M, mob/living/user) - . = ..() - try_break_off(M, user) - -/obj/item/reagent_containers/food/snacks/pizza/arnold/attackby(obj/item/I, mob/user) - i_kill_you(I, user) - . = ..() - - -/obj/item/reagent_containers/food/snacks/pizzaslice/arnold - name = "\improper Arnold pizza slice" - desc = "I come over, maybe I give you a pizza, maybe I break off your arm." - icon_state = "arnoldpizzaslice" - filling_color = "#A52A2A" - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2) - foodtype = GRAIN | VEGETABLES | DAIRY | MEAT - -/obj/item/reagent_containers/food/snacks/pizzaslice/arnold/attack(mob/living/M, mob/living/user) - . =..() - try_break_off(M, user) - -/obj/item/reagent_containers/food/snacks/pizzaslice/arnold/attackby(obj/item/I, mob/user) - i_kill_you(I, user) - . = ..() - - -/obj/item/reagent_containers/food/snacks/pizzaslice/custom - name = "pizza slice" - icon_state = "pizzamargheritaslice" - filling_color = "#FFFFFF" - foodtype = GRAIN | VEGETABLES - -/obj/item/reagent_containers/food/snacks/pizzaslice/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/kitchen/rollingpin)) - if(!isturf(loc)) - to_chat(user, "You need to put [src] on a surface to roll it out!") - return - new /obj/item/stack/sheet/pizza(loc) - to_chat(user, "You smoosh [src] into a cheesy sheet.") - qdel(src) - return - return ..() diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/soup.dm similarity index 58% rename from code/modules/food_and_drinks/food/snacks_soup.dm rename to code/modules/food_and_drinks/food/soup.dm index c7bcf963faf2..82f0885447e5 100644 --- a/code/modules/food_and_drinks/food/snacks_soup.dm +++ b/code/modules/food_and_drinks/food/soup.dm @@ -280,3 +280,244 @@ tastes = list("creamy peas"= 2, "parsnip" = 1) filling_color = "#9dc530" foodtype = VEGETABLES + +/obj/item/reagent_containers/food/snacks/soup/moth_cotton_soup + name = "cotton ball soup" + desc = "A soup made from raw cotton in a flavourful vegetable broth, originating from one of the largest Solarian moth-dominated conclaves from when they were first discovered. Enjoyed only by moths and the criminally tasteless." + icon_state = "moth_cotton_soup" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 12, + /datum/reagent/water = 5, + ) + tastes = list("cotton" = 1, "broth" = 1) + foodtype = VEGETABLES | CLOTH + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/moth_cheese_soup + name = "cheese melt soup" + desc = "A simple and filling soup made from homemade cheese and sweet potato. \ + The curds provide texture while the whey provides volume- and they both provide deliciousness!" + icon_state = "moth_cheese_soup" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 12, + /datum/reagent/consumable/nutriment/vitamin = 4, + /datum/reagent/consumable/nutriment = 4, + ) + tastes = list("cheese" = 1, "cream" = 1, "sweet potato" = 1) + foodtype = DAIRY | GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/moth_seed_soup + name = "seedy soup" + desc = "A seed based soup, made by germinating seeds and then boiling them. \ + Produces a particularly bitter broth which is usually balanced by the addition of vinegar." + icon_state = "moth_seed_soup" + list_reagents = list( + /datum/reagent/consumable/nutriment/vitamin = 12, + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/water = 5, + ) + tastes = list("bitterness" = 1, "sourness" = 1) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/vegetarian_chili + name = "chili sin carne" + desc = "For the hombres who don't want carne." + icon_state = "hotchili" + list_reagents = list( + /datum/reagent/consumable/nutriment = 4, + /datum/reagent/consumable/cooking_oil = 4, + /datum/reagent/consumable/capsaicin = 3, + /datum/reagent/consumable/tomatojuice = 4, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("bitterness" = 1, "sourness" = 1) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/moth_bean_stew + name = "pickled bean stew" + desc = "A spicy bean stew with lots of veggies, commonly served in Solarian homes as a filling and satisfying meal with rice or bread." + icon_state = "moth_bean_stew" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 6, + /datum/reagent/consumable/nutriment/vitamin = 14, + /datum/reagent/consumable/nutriment = 4, + ) + tastes = list("beans" = 1, "cabbage" = 1, "spicy sauce" = 1) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/moth_oat_stew + name = "oat stew" + desc = "A hearty oat stew, prepared with oats, sweet potatoes, and various winter vegetables." + icon_state = "moth_oat_stew" + list_reagents = list( + /datum/reagent/consumable/nutriment/vitamin = 14, + /datum/reagent/consumable/nutriment = 8, + ) + tastes = list("oats" = 1, "sweet potato" = 1, "carrot" = 1, "parsnip" = 1, "pumpkin" = 1) + foodtype = VEGETABLES | GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/moth_fire_soup + name = "fireball soup" + desc = "Fireball soup, or heartburn soup, is a cold soup dish that originated amongst the South American elements of SolGov, \ + and is named for two things- its rosy pink colour, and its scorchingly hot chili heat." + icon_state = "moth_fire_soup" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 10, + /datum/reagent/consumable/nutriment/vitamin = 10, + ) + tastes = list("love" = 1, "hate" = 1) + foodtype = VEGETABLES | DAIRY + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/rice_porridge + name = "rice porridge" + desc = "A plate of rice porridge. It's mostly flavourless, but it does fill a spot. \ + Solarians favor it on winter mornings when in a rush." + icon_state = "rice_porridge" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 8, + ) + tastes = list("nothing" = 1) + foodtype = GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/hua_mulan_congee + name = "\improper Hua Mulan congee" + desc = "Nobody is quite sure why this smiley bowl of rice porridge with eggs and bacon is named after a mythological Chinese figure - \ + it's just sorta what it's always been called." + icon_state = "hua_mulan_congee" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 10, + /datum/reagent/consumable/cooking_oil = 6, + ) + tastes = list("bacon" = 1, "eggs" = 1) + foodtype = MEAT | GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/toechtauese_rice_porridge + name = "töchtaüse rice porridge" + desc = "Commonly served in Solarian homes, rice porridge with töchtaüse syrup is more palatable than the regular stuff, if even just because it's spicier than normal." + icon_state = "toechtauese_rice_porridge" + list_reagents = list(/datum/reagent/consumable/cooking_oil = 6, /datum/reagent/consumable/nutriment/vitamin = 12) + tastes = list("sugar" = 1, "spice" = 1) + foodtype = GRAIN | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/cornmeal_porridge + name = "cornmeal porridge" + desc = "A plate of cornmeal porridge. It's more flavourful than most porridges, and makes a good base for other flavours, too." + icon_state = "cornmeal_porridge" + list_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + tastes = list("cornmeal" = 1) + foodtype = GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/cheesy_porridge //milk, polenta, firm cheese, curd cheese, butter + name = "cheesy porridge" + desc = "A rich and creamy bowl of cheesy cornmeal porridge." + icon_state = "cheesy_porridge" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/nutriment/vitamin = 4, + /datum/reagent/consumable/nutriment = 8, + ) + tastes = list("cornmeal" = 1, "cheese" = 1, "more cheese" = 1, "lots of cheese" = 1) + foodtype = DAIRY | GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/fried_eggplant_polenta + name = "fried eggplant and polenta" + desc = "Polenta loaded with cheese, served with a few discs of fried eggplant and some tomato sauce. Lække!" + icon_state = "fried_eggplant_polenta" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 12, + /datum/reagent/consumable/nutriment/vitamin = 6, + /datum/reagent/consumable/nutriment = 10, + ) + tastes = list("cornmeal" = 1, "cheese" = 1, "eggplant" = 1, "tomato sauce" = 1) + foodtype = DAIRY | GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/soup/red_porridge + name = "red porridge" + desc = "Red porridge with yoghurt. The name and vegetable ingredients obscure the sweet nature of the dish, which is commonly served as a dessert aboard the fleet." + icon_state = "red_porridge" + list_reagents = list( + /datum/reagent/consumable/nutriment/vitamin = 8, + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/sugar = 8, + ) + tastes = list("sweet beets" = 1, "sugar" = 1, "sweetened yoghurt" = 1) + foodtype = VEGETABLES | SUGAR | DAIRY + +/obj/item/reagent_containers/food/snacks/soup/atrakor_dumplings + name = "\improper Meat dumpling soup" + desc = "A bowl of rich, meaty dumpling soup. Pleasant and hearty fare for holidays, especially during the winter" + icon_state = "atrakor_dumplings" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/cooking_oil = 10, + /datum/reagent/consumable/nutriment/vitamin = 4, + /datum/reagent/water = 5, + ) + tastes = list("bone broth" = 1, "onion" = 1, "potato" = 1) + foodtype = MEAT | VEGETABLES | NUTS + +/obj/item/reagent_containers/food/snacks/soup/meatball_noodles //No growable peanuts. No recipe. No food. + name = "meatball noodle soup" + desc = "A hearty noodle soup made from meatballs and nizaya in a rich broth. Commonly topped with a handful of chopped nuts." + icon_state = "meatball_noodles" + list_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/cooking_oil = 8, + /datum/reagent/consumable/nutriment/vitamin = 6, + /datum/reagent/water = 5, + ) + tastes = list("bone broth" = 1, "meat" = 1, "gnocchi" = 1, "peanuts" = 1) + foodtype = MEAT | VEGETABLES | NUTS + +/obj/item/reagent_containers/food/snacks/soup/black_broth + name = "\improper Kalixcian black broth" + desc = "A bowl of sausage, onion, blood and vinegar, served ice cold. Every bit as rough as it sounds." + icon_state = "black_broth" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 10, + /datum/reagent/blood = 8, + /datum/reagent/liquidgibs = 2, + ) + tastes = list("vinegar" = 1, "metal" = 1) + foodtype = MEAT | VEGETABLES | GORE + +/obj/item/reagent_containers/food/snacks/soup/jellyfish + name = "jellyfish stew" + desc = "A slimy bowl of jellyfish stew. It jiggles if you shake it." + icon_state = "jellyfish_stew" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 10, + /datum/reagent/consumable/nutriment = 6, + ) + tastes = list("slime" = 1) + foodtype = MEAT | VEGETABLES | GORE + +/obj/item/reagent_containers/food/snacks/soup/rootbread_soup + name = "rootbread soup" + desc = "A big bowl of spicy, savoury soup made with rootbread. Heavily seasoned, and very tasty." + icon_state = "rootbread_soup" + list_reagents = list( + /datum/reagent/consumable/cooking_oil = 6, + /datum/reagent/consumable/nutriment = 10, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("bread" = 1, "egg" = 1, "chili" = 1, "garlic" = 1) + foodtype = MEAT | VEGETABLES diff --git a/code/modules/food_and_drinks/food/snacks_spaghetti.dm b/code/modules/food_and_drinks/food/spaghetti.dm similarity index 64% rename from code/modules/food_and_drinks/food/snacks_spaghetti.dm rename to code/modules/food_and_drinks/food/spaghetti.dm index 88c1188f1dee..a715ceaf285d 100644 --- a/code/modules/food_and_drinks/food/snacks_spaghetti.dm +++ b/code/modules/food_and_drinks/food/spaghetti.dm @@ -2,7 +2,7 @@ /obj/item/reagent_containers/food/snacks/spaghetti name = "spaghetti" desc = "Now that's a nic'e pasta!" - icon = 'icons/obj/food/pizzaspaghetti.dmi' + icon = 'icons/obj/food/spaghetti.dmi' icon_state = "spaghetti" list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) cooked_type = /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti @@ -104,3 +104,68 @@ cooked_type = null tastes = list("noodle" = 1, "butter" = 1) foodtype = GRAIN | DAIRY + +/obj/item/reagent_containers/food/snacks/spaghetti/mac_n_cheese + name = "mac n' cheese" + desc = "Made the proper way with only the finest cheese and breadcrumbs. And yet, it can't scratch the same itch as Ready-Donk." + icon_state = "mac_n_cheese" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("cheese" = 1, "breadcrumbs" = 1, "pasta" = 1) + foodtype = GRAIN | DAIRY + +/obj/item/reagent_containers/food/snacks/spaghetti/nizaya + name = "rustic pasta" + desc = "A form of root and nut pasta originally native to the oceanside regions of Kalixcis. It's similar in texture and appearance to gnocchi." + icon_state = "nizaya" + list_reagents = list( + /datum/reagent/consumable/nutriment = 2, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + tastes = list("gnocchi" = 1) + foodtype = VEGETABLES | NUTS + +/obj/item/reagent_containers/food/snacks/spaghetti/snail_nizaya + name = "desert snail rustic pasta" + desc = "A high class pasta dish adopted by Solarian chefs based on Kalixcian pasta traditions. Traditionally made with only the finest Solarian wine… but box will do, in a pinch." + icon_state = "snail_nizaya" + list_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/cooking_oil = 4, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("snails" = 1, "wine" = 1, "gnocchi" = 1) + foodtype = VEGETABLES | MEAT | NUTS + +/obj/item/reagent_containers/food/snacks/spaghetti/garlic_nizaya + name = "garlic-and-oil nizaya" + desc = "A lizard adaptation of the Italian pasta dish, aglio e olio, made with nizaya pasta." + icon_state = "garlic_nizaya" + list_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/nutriment/vitamin = 10, + ) + tastes = list("garlic" = 1, "oil" = 1, "gnocchi" = 1) + foodtype = VEGETABLES | NUTS + +/obj/item/reagent_containers/food/snacks/spaghetti/demit_nizaya + name = "demit nizaya" + desc = "A sweet, creamy nizaya pasta dish made with korta milk and nectar." + icon_state = "demit_nizaya" + list_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/korta_nectar = 4, + /datum/reagent/consumable/nutriment/vitamin = 2, + ) + tastes = list("peppery sweet" = 1, "veggies" = 1, "gnocchi" = 1) + foodtype = VEGETABLES | SUGAR | NUTS + +/obj/item/reagent_containers/food/snacks/spaghetti/mushroom_nizaya + name = "mushroom nizaya" + desc = "A nizaya pasta dish made with seraka mushrooms and quality oil. Has a pronounced nutty flavour." + icon_state = "mushroom_nizaya" + list_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/nutriment/vitamin = 10, + ) + tastes = list("savouriness" = 1, "nuttiness" = 1, "gnocchi" = 1) + foodtype = VEGETABLES diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/vend.dm similarity index 55% rename from code/modules/food_and_drinks/food/snacks_vend.dm rename to code/modules/food_and_drinks/food/vend.dm index 8bff9db3384f..2bf1c02e600d 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/vend.dm @@ -146,3 +146,112 @@ filling_color = "#97ee63" tastes = list("pure electricity" = 3, "fitness" = 2) foodtype = TOXIC + +/obj/item/reagent_containers/food/snacks/peanuts + name = "\improper Gallery's peanuts" + desc = "A favourite amongst the terminally angry." + icon_state = "peanuts" + trash = /obj/item/trash/peanuts + list_reagents = list(/datum/reagent/consumable/nutriment = 2) + tastes = list("peanuts" = 4, "anger" = 1) + foodtype = JUNKFOOD | NUTS + junkiness = 10 //less junky than other options, since peanuts are a decently healthy snack option + w_class = WEIGHT_CLASS_SMALL + grind_results = list(/datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/cooking_oil = 2) + +/obj/item/reagent_containers/food/snacks/peanuts/salted + name = "\improper Gallery's salt reserves peanuts" + desc = "Tastes salty." + list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sodiumchloride = 1) + tastes = list("peanuts" = 3, "salt" = 1, "high blood pressure" = 1) + +/obj/item/reagent_containers/food/snacks/peanuts/wasabi + name = "\improper Gallery's raging wasabi peanuts" + desc = "The angriest of all peanut flavours." + list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/capsaicin = 1) + tastes = list("peanuts" = 3, "wasabi" = 1, "rage" = 1) + +/obj/item/reagent_containers/food/snacks/peanuts/honey_roasted + name = "\improper Gallery's delete sweet peanuts" + desc = "Oddly bitter for a sweet treat." + list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 1) + tastes = list("peanuts" = 3, "honey" = 1, "bitterness" = 1) + +/obj/item/reagent_containers/food/snacks/peanuts/barbecue + name = "\improper Gallery's IDEDBBQ peanuts" + desc = "Where there's smoke, there's not necessarily fire- sometimes it's just BBQ sauce." + list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/bbqsauce = 1) + tastes = list("peanuts" = 3, "bbq sauce" = 1, "arguments" = 1) + +/obj/item/reagent_containers/food/snacks/peanuts/random + name = "\improper Gallery's every-flavour peanuts" + desc = "What flavour will you get?" + icon_state = "peanuts" + +/obj/item/reagent_containers/food/snacks/peanuts/random/Initialize() + // Generate a sample p + var/peanut_type = pick(subtypesof(/obj/item/reagent_containers/food/snacks/peanuts) - /obj/item/reagent_containers/food/snacks/peanuts/random) + var/obj/item/reagent_containers/food/snacks/sample = new peanut_type(loc) + + name = sample.name + desc = sample.desc + list_reagents = sample.list_reagents + tastes = sample.tastes + + qdel(sample) + + . = ..() + +/obj/item/reagent_containers/food/snacks/cnds + name = "\improper C&Ds" + desc = "Legally, we cannot say that these won't melt in your hands." + icon_state = "cnds" + trash = /obj/item/trash/cnds + list_reagents = list(/datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/coco = 1) + tastes = list("chocolate candy" = 3) + junkiness = 25 + foodtype = JUNKFOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/cnds/caramel + name = "caramel C&Ds" + desc = "Stuffed with sugary sweet caramel, making them a diabetic's worst nightmare." + list_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 1, /datum/reagent/consumable/caramel = 1) + tastes = list("chocolate candy" = 2, "caramel" = 1) + +/obj/item/reagent_containers/food/snacks/cnds/pretzel + name = "pretzel C&Ds" + desc = "Eine köstliche Begleitung zu Ihrem Lieblingsbier." + list_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/coco = 1) + tastes = list("chocolate candy" = 2, "pretzel" = 1) + foodtype = JUNKFOOD | GRAIN + +/obj/item/reagent_containers/food/snacks/cnds/peanut_butter + name = "peanut butter C&Ds" + desc = "Beloved by small children and aliens alike." + list_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 1, /datum/reagent/consumable/peanut_butter = 1) + tastes = list("chocolate candy" = 2, "peanut butter" = 1) + +/obj/item/reagent_containers/food/snacks/cnds/banana_honk + name = "banana honk C&Ds" + desc = "An unpopular banana-flavoured variety of C&D’s which became taboo in the wake of the Inter-Corporate War." + list_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 1, /datum/reagent/consumable/banana = 1) + tastes = list("chocolate candy" = 2, "banana" = 1) + +/obj/item/reagent_containers/food/snacks/cnds/random + name = "mystery filled C&Ds" + desc = "Filled with one of four delicious flavours!" + +/obj/item/reagent_containers/food/snacks/cnds/random/Initialize() + var/random_flavour = pick(subtypesof(/obj/item/reagent_containers/food/snacks/cnds) - /obj/item/reagent_containers/food/snacks/cnds/random) + + var/obj/item/reagent_containers/food/snacks/sample = new random_flavour(loc) + + name = sample.name + desc = sample.desc + list_reagents = sample.list_reagents + tastes = sample.tastes + + qdel(sample) + + . = ..() diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index 772893e3ff16..3d3aa65491ec 100644 --- a/code/modules/food_and_drinks/pizzabox.dm +++ b/code/modules/food_and_drinks/pizzabox.dm @@ -308,6 +308,46 @@ pizza = new /obj/item/reagent_containers/food/snacks/pizza/pineapple(src) boxtag = "Honolulu Chew" +/obj/item/pizzabox/rustic/Initialize() + . = ..() + pizza = new /obj/item/reagent_containers/food/snacks/pizza/flatbread/italic(src) + boxtag = "Rustic Zohilian Flatbread" + +/obj/item/pizzabox/imperial/Initialize() + . = ..() + pizza = new /obj/item/reagent_containers/food/snacks/pizza/flatbread/imperial(src) + boxtag = "Royal Zalish Flatbread" + +/obj/item/pizzabox/mothic_margherita/Initialize() + . = ..() + pizza = new /obj/item/reagent_containers/food/snacks/pizza/mothic_margherita(src) + boxtag = "Margherita alla Moffuchi" + +/obj/item/pizzabox/mothic_firecracker/Initialize() + . = ..() + pizza = new /obj/item/reagent_containers/food/snacks/pizza/mothic_firecracker(src) + boxtag = "Vesuvian Firecracker" + +/obj/item/pizzabox/mothic_five_cheese/Initialize() + . = ..() + pizza = new /obj/item/reagent_containers/food/snacks/pizza/mothic_five_cheese(src) + boxtag = "Cheeseplosion" + +/obj/item/pizzabox/mothic_white_pie/Initialize() + . = ..() + pizza = new /obj/item/reagent_containers/food/snacks/pizza/mothic_white_pie(src) + boxtag = "Pane Bianco" + +/obj/item/pizzabox/mothic_pesto/Initialize() + . = ..() + pizza = new /obj/item/reagent_containers/food/snacks/pizza/mothic_pesto(src) + boxtag = "Presto Pesto" + +/obj/item/pizzabox/mothic_garlic/Initialize() + . = ..() + pizza = new /obj/item/reagent_containers/food/snacks/pizza/mothic_garlic(src) + boxtag = "Garlic Bread alla Moffuchi" + //An anomalous pizza box that, when opened, produces the opener's favorite kind of pizza. /obj/item/pizzabox/infinite resistance_flags = FIRE_PROOF | LAVA_PROOF | ACID_PROOF //hard to destroy diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index acd768347327..274ad4183c32 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -680,3 +680,71 @@ required_reagents = list(/datum/reagent/consumable/ethanol/gin = 3, /datum/reagent/toxin/plasma = 1, /datum/reagent/consumable/tinlux = 1) required_container = /obj/structure/fermenting_barrel/distiller mix_sound ='sound/weapons/laser.ogg' + +/datum/chemical_reaction/drink/mushroom_tea + results = list(/datum/reagent/consumable/mushroom_tea = 5) + required_reagents = list(/datum/reagent/toxin/mushroom_powder = 1, /datum/reagent/water = 5) + +/datum/chemical_reaction/drink/mushi_kombucha + results = list(/datum/reagent/consumable/ethanol/mushi_kombucha = 5) + required_reagents = list(/datum/reagent/consumable/mushroom_tea = 3, /datum/reagent/consumable/korta_nectar = 2) + required_catalysts = list(/datum/reagent/consumable/enzyme = 1) + +/datum/chemical_reaction/drink/sea_breeze + results = list(/datum/reagent/consumable/ethanol/sea_breeze = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/kortara = 3, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ethanol/creme_de_cacao = 1) + +/datum/chemical_reaction/drink/white_gezenan + results = list(/datum/reagent/consumable/ethanol/white_gezenan = 8) + required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 5, /datum/reagent/consumable/ethanol/kortara = 3) + +/datum/chemical_reaction/drink/drunken_espatier + results = list(/datum/reagent/consumable/ethanol/drunken_espatier = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/mushi_kombucha = 2, /datum/reagent/consumable/ethanol/moonshine = 2, /datum/reagent/consumable/berryjuice = 1) + mix_message = "The drink seems to let out a grim sigh..." + +/datum/chemical_reaction/drink/protein_blend + results = list(/datum/reagent/consumable/ethanol/protein_blend = 5) + required_reagents = list(/datum/reagent/yuck = 1, /datum/reagent/consumable/korta_flour = 1, /datum/reagent/blood = 1, /datum/reagent/consumable/ethanol = 2) + +/datum/chemical_reaction/drink/dragons_fang + results = list(/datum/reagent/consumable/ethanol/dragons_fang = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/mushi_kombucha = 5, /datum/reagent/consumable/ethanol/grappa = 2, /datum/reagent/consumable/lemonjuice = 2, /datum/reagent/gold = 1) + mix_message = "The mixture turns a deep golden hue." + +/datum/chemical_reaction/drink/admiralty + results = list(/datum/reagent/consumable/ethanol/admiralty = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/navy_rum = 3, /datum/reagent/consumable/ethanol/vermouth = 1, /datum/reagent/consumable/ethanol/fernet = 1) + +/datum/chemical_reaction/drink/long_haul + results = list(/datum/reagent/consumable/ethanol/long_haul = 25) + required_reagents = list(/datum/reagent/consumable/ethanol/navy_rum = 4, /datum/reagent/consumable/ethanol/curacao = 3, /datum/reagent/consumable/sugar= 2, /datum/reagent/consumable/ethanol/bitters = 1, /datum/reagent/consumable/sodawater = 15) + +/datum/chemical_reaction/drink/long_john_silver + results = list(/datum/reagent/consumable/ethanol/long_john_silver = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/navy_rum = 4, /datum/reagent/consumable/ethanol/bitters = 1, /datum/reagent/consumable/lemonade = 5) + +/datum/chemical_reaction/drink/tropical_storm + results = list(/datum/reagent/consumable/ethanol/tropical_storm = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/ethanol/curacao = 2, /datum/reagent/consumable/triple_citrus = 4, /datum/reagent/consumable/pineapplejuice = 2) + +/datum/chemical_reaction/drink/dark_n_stormy + results = list(/datum/reagent/consumable/ethanol/dark_and_stormy = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/rum = 3, /datum/reagent/consumable/sol_dry = 7) + +/datum/chemical_reaction/drink/salt_and_swell + results = list(/datum/reagent/consumable/ethanol/salt_and_swell = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/navy_rum = 4, /datum/reagent/consumable/toechtauese_syrup = 3, /datum/reagent/consumable/eggyolk = 2, /datum/reagent/medicine/salglu_solution = 1) + +/datum/chemical_reaction/drink/tiltaellen + results = list(/datum/reagent/consumable/ethanol/tiltaellen = 10) + required_reagents = list(/datum/reagent/consumable/yoghurt = 8, /datum/reagent/consumable/vinegar = 1, /datum/reagent/consumable/sodiumchloride = 1) + mix_message = "The mixture curdles and thickens." + +/datum/chemical_reaction/drink/tich_toch + results = list(/datum/reagent/consumable/ethanol/tich_toch = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/tiltaellen = 6, /datum/reagent/consumable/toechtauese_syrup = 2, /datum/reagent/consumable/ethanol/vodka = 2) + +/datum/chemical_reaction/drink/toechtauese_syrup + results = list(/datum/reagent/consumable/toechtauese_syrup = 10) + required_reagents = list(/datum/reagent/consumable/toechtauese_juice = 6, /datum/reagent/consumable/sugar = 4) diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index d9d651b5f36a..dcd520a08cf1 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -136,3 +136,48 @@ /datum/chemical_reaction/bbqsauce results = list(/datum/reagent/consumable/bbqsauce = 5) required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/tomatojuice = 1, /datum/reagent/medicine/salglu_solution = 3, /datum/reagent/consumable/blackpepper = 1) + +/datum/chemical_reaction/food/solar_pizza_dough + required_reagents = list(/datum/reagent/consumable/milk = 5, /datum/reagent/consumable/quality_oil = 2, /datum/reagent/medicine/salglu_solution = 5, /datum/reagent/consumable/cornmeal = 10, /datum/reagent/consumable/flour = 5) + mix_message = "The ingredients form a pizza dough." + +/datum/chemical_reaction/food/solar_pizza_dough/on_reaction(datum/reagents/holder, created_volume) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= created_volume, i++) + new /obj/item/reagent_containers/food/snacks/solar_pizza_dough(location) + +/datum/chemical_reaction/food/curd_cheese + required_reagents = list(/datum/reagent/consumable/milk = 15, /datum/reagent/consumable/vinegar = 5, /datum/reagent/consumable/cream = 5) + mix_message = "The milk curdles into cheese." + required_temp = 353 + +/datum/chemical_reaction/food/curd_cheese/on_reaction(datum/reagents/holder, created_volume) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= created_volume, i++) + new /obj/item/reagent_containers/food/snacks/curd_cheese(location) + +/datum/chemical_reaction/food/mozzarella + required_reagents = list(/datum/reagent/consumable/milk = 10, /datum/reagent/consumable/cream = 10) + required_catalysts = list(/datum/reagent/consumable/enzyme = 1) + mix_message = "Fine ribbons of curd form in the milk." + required_temp = 353 + +/datum/chemical_reaction/food/mozzarella/on_reaction(datum/reagents/holder, created_volume) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= created_volume, i++) + new /obj/item/reagent_containers/food/snacks/mozzarella(location) + +/datum/chemical_reaction/food/cornmeal_batter + results = list(/datum/reagent/consumable/cornmeal_batter = 35) + required_reagents = list(/datum/reagent/consumable/cornmeal = 20, /datum/reagent/consumable/yoghurt = 10, /datum/reagent/consumable/eggyolk = 5) + mix_message = "A silky batter forms." + +/datum/chemical_reaction/food/cornbread + required_reagents = list(/datum/reagent/consumable/cornmeal_batter = 25) + mix_message = "The batter bakes into cornbread- somehow!" + required_temp = 473 + +/datum/chemical_reaction/food/cornbread/on_reaction(datum/reagents/holder, created_volume) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= created_volume, i++) + new /obj/item/reagent_containers/food/snacks/store/bread/corn(location) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm index dcae05095ae8..bf3d4f6511db 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -206,3 +206,26 @@ ) result = /mob/living/simple_animal/pet/cat/cak subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT? We get it - Love Felines + +/datum/crafting_recipe/food/mothmallow + name = "Mothmallows" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/soybeans = 1, + /datum/reagent/consumable/vanilla = 5, + /datum/reagent/consumable/sugar = 15, + /datum/reagent/consumable/ethanol/rum = 5 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/mothmallow + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/korta_brittle + name = "Korta brittle slab" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/korta_nut = 2, + /obj/item/reagent_containers/food/snacks/butter = 1, + /datum/reagent/consumable/korta_nectar = 5, + /datum/reagent/consumable/sugar = 5, + /datum/reagent/consumable/sodiumchloride = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/korta_brittle + subcategory = CAT_CAKE diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm index 522f362e777e..2ca3aedbd918 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm @@ -61,3 +61,24 @@ ) result = /obj/item/reagent_containers/food/snacks/eggrolls subcategory = CAT_EGG + +/datum/crafting_recipe/food/black_eggs + name = "Black scrambled eggs" + reqs = list( + /obj/item/reagent_containers/food/snacks/egg = 2, + /datum/reagent/blood = 5, + /datum/reagent/consumable/vinegar = 2 + ) + result = /obj/item/reagent_containers/food/snacks/black_eggs + subcategory = CAT_EGG + +/datum/crafting_recipe/food/patzikula + name = "Patzikula" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/tomato = 2, + /obj/item/reagent_containers/food/snacks/grown/onion = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/egg = 2 + ) + result = /obj/item/reagent_containers/food/snacks/patzikula + subcategory = CAT_EGG diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index 92647559d9cd..1bf2ac233adb 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -252,6 +252,17 @@ result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow subcategory = CAT_ICE +/datum/crafting_recipe/food/korta_ice + name = "Korta ice" + reqs = list( + /obj/item/paper = 1, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/korta_nectar = 5, + /obj/item/reagent_containers/food/snacks/grown/berries = 1 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/korta_ice + subcategory = CAT_ICE + //////////////////////////POPSICLES/////////////////////// // This section includes any frozen treat served on a stick. @@ -296,8 +307,8 @@ result = /obj/item/reagent_containers/food/snacks/popsicle/jumbo subcategory = CAT_ICE -/datum/crafting_recipe/food/licorice - name = "Licorice icecream" +/datum/crafting_recipe/food/creamsicle_licorice + name = "Milky Way™" reqs = list( /obj/item/popsicle_stick = 1, /datum/reagent/consumable/blumpkinjuice = 4, //natural source of ammonium chloride @@ -307,5 +318,5 @@ /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 2 ) - result = /obj/item/reagent_containers/food/snacks/popsicle/licorice + result = /obj/item/reagent_containers/food/snacks/popsicle/creamsicle_licorice subcategory = CAT_ICE diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 1bb3d250a9ae..0c1e81368b48 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -355,6 +355,40 @@ result = /obj/item/reagent_containers/food/snacks/royalcheese subcategory = CAT_MISCFOOD +/datum/crafting_recipe/food/pesto + name = "Pesto" + reqs = list( + /obj/item/reagent_containers/food/snacks/firm_cheese_slice = 1, + /datum/reagent/consumable/sodiumchloride = 5, + /obj/item/reagent_containers/food/snacks/grown/herbs = 2, + /obj/item/reagent_containers/food/snacks/grown/garlic = 1, + /datum/reagent/consumable/quality_oil = 5, + /obj/item/reagent_containers/food/snacks/canned/pine_nuts = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pesto + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/tomato_sauce + name = "Tomato sauce" + reqs = list( + /obj/item/reagent_containers/food/snacks/canned/tomatoes = 1, + /datum/reagent/consumable/sodiumchloride = 2, + /obj/item/reagent_containers/food/snacks/grown/herbs = 1, + /datum/reagent/consumable/quality_oil = 5 + ) + result = /obj/item/reagent_containers/food/snacks/tomato_sauce + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/bechamel_sauce + name = "Bechamel sauce" + reqs = list( + /datum/reagent/consumable/milk = 10, + /datum/reagent/consumable/flour = 5, + /obj/item/reagent_containers/food/snacks/butter = 1 + ) + result = /obj/item/reagent_containers/food/snacks/bechamel_sauce + subcategory = CAT_MISCFOOD + /datum/crafting_recipe/food/vegetariansushiroll name = "Vegetarian sushi roll" reqs = list( @@ -374,3 +408,445 @@ ) result = /obj/item/reagent_containers/food/snacks/onigiri subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/herby_cheese + name = "Herby cheese" + reqs = list( + /obj/item/reagent_containers/food/snacks/curd_cheese = 1, + /obj/item/reagent_containers/food/snacks/grown/herbs = 4 + ) + result = /obj/item/reagent_containers/food/snacks/herby_cheese + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/mothic_salad + name = "Mothic salad" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + /obj/item/reagent_containers/food/snacks/onion_slice/red = 2, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/mothic_salad + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/toasted_seeds + name = "Toasted seeds" + reqs = list( + /obj/item/seeds/sunflower = 1, + /obj/item/seeds/pumpkin = 1, + /obj/item/seeds/poppy = 1, + /datum/reagent/consumable/quality_oil = 2 + ) + result = /obj/item/reagent_containers/food/snacks/toasted_seeds + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/engine_fodder + name = "Engine fodder" + reqs = list( + /obj/item/reagent_containers/food/snacks/toasted_seeds = 1, + /obj/item/reagent_containers/food/snacks/cnds = 1, + /obj/item/reagent_containers/food/snacks/popcorn = 1, + /obj/item/reagent_containers/food/snacks/peanuts = 1, + /obj/item/reagent_containers/food/snacks/chips = 1 + ) + result = /obj/item/reagent_containers/food/snacks/engine_fodder + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/squeaking_stir_fry + name = "Skeklitmischtpoppl (Squeaking stir fry)" + reqs = list( + /obj/item/reagent_containers/food/snacks/cheese_curds = 1, + /obj/item/reagent_containers/food/snacks/tofu = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /obj/item/reagent_containers/food/snacks/onion_slice = 1 + ) + result = /obj/item/reagent_containers/food/snacks/squeaking_stir_fry + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/sweet_chili_cabbage_wrap + name = "Sweet chili cabbage wrap" + reqs = list( + /obj/item/reagent_containers/food/snacks/grilled_cheese = 1, + /obj/item/reagent_containers/food/snacks/mothic_salad = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + /datum/reagent/consumable/honey = 5 + ) + result = /obj/item/reagent_containers/food/snacks/sweet_chili_cabbage_wrap + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/loaded_curds + name = "Ozlsettitæloskekllön ede pommes (Loaded curds and fries)" + reqs = list( + /obj/item/reagent_containers/food/snacks/cheese_curds = 1, + /obj/item/reagent_containers/food/snacks/soup/vegetarian_chili = 1, + /obj/item/reagent_containers/food/snacks/onion_slice = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/fries = 1 + ) + result = /obj/item/reagent_containers/food/snacks/loaded_curds + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/baked_cheese_platter + name = "Stanntkraktælo (Baked cheese platter)" + reqs = list( + /obj/item/reagent_containers/food/snacks/baked_cheese = 1, + /obj/item/reagent_containers/food/snacks/griddle_toast = 3 + ) + result = /obj/item/reagent_containers/food/snacks/baked_cheese_platter + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/raw_green_lasagne + name = "Green lasagne al forno" + reqs = list( + /obj/item/reagent_containers/food/snacks/pesto = 1, + /obj/item/reagent_containers/food/snacks/spaghetti = 2, + /obj/item/reagent_containers/food/snacks/bechamel_sauce = 1, + /obj/item/reagent_containers/food/snacks/firm_cheese = 1 + ) + result = /obj/item/reagent_containers/food/snacks/raw_green_lasagne + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/raw_baked_rice + name = "Big baked rice" + reqs = list( + /obj/item/reagent_containers/food/snacks/salad/boiledrice = 2, + /obj/item/reagent_containers/food/snacks/soup/vegetable = 1, + /obj/item/reagent_containers/food/snacks/grown/potato = 2, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/grown/herbs = 1 + ) + result = /obj/item/reagent_containers/food/snacks/raw_baked_rice + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/buttered_baked_corn + name = "Buttered baked corn" + reqs = list( + /obj/item/reagent_containers/food/snacks/oven_baked_corn = 1, + /obj/item/reagent_containers/food/snacks/butter = 1 + ) + result = /obj/item/reagent_containers/food/snacks/buttered_baked_corn + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/fiesta_corn_skillet + name = "Fiesta corn skillet" + reqs = list( + /obj/item/reagent_containers/food/snacks/oven_baked_corn = 1, + /obj/item/reagent_containers/food/snacks/cornchips = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 2, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1, + /obj/item/reagent_containers/food/snacks/onion_slice = 2, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fiesta_corn_skillet + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/ratatouille + name = "Ratatouille" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/tomato = 1, + /obj/item/reagent_containers/food/snacks/grown/onion/red = 1, + /obj/item/reagent_containers/food/snacks/grown/eggplant = 1, + /obj/item/reagent_containers/food/snacks/roasted_bell_pepper = 1 + ) + result = /obj/item/reagent_containers/food/snacks/raw_ratatouille + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/mozzarella_sticks + name = "Mozzarella sticks" + reqs = list( + /obj/item/reagent_containers/food/snacks/mozzarella = 1, + /obj/item/reagent_containers/food/snacks/breadslice = 2, + /obj/item/reagent_containers/food/snacks/tomato_sauce = 1 + ) + result = /obj/item/reagent_containers/food/snacks/mozzarella_sticks + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/raw_stuffed_peppers + name = "Voltölpapriken (Stuffed peppers)" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/bell_pepper = 1, + /obj/item/reagent_containers/food/snacks/herby_cheese = 1, + /obj/item/reagent_containers/food/snacks/onion_slice = 2 + ) + result = /obj/item/reagent_containers/food/snacks/raw_stuffed_peppers + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/fueljacks_lunch + name = "Fueljack's lunch" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + /obj/item/reagent_containers/food/snacks/grown/potato = 1, + /obj/item/reagent_containers/food/snacks/onion_slice = 2, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/firm_cheese_slice = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fueljacks_lunch + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/mac_balls + name = "Macheronirölen (Mac balls)" + reqs = list( + /obj/item/reagent_containers/food/snacks/ready_donk/warm/mac_n_cheese = 1, + /obj/item/reagent_containers/food/snacks/tomato_sauce = 1, + /datum/reagent/consumable/cornmeal_batter = 5 + ) + result = /obj/item/reagent_containers/food/snacks/mac_balls + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/moth_cheese_cakes + name = "Ælorölen (Cheesecake balls)" + reqs = list( + /obj/item/reagent_containers/food/snacks/curd_cheese = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /datum/reagent/consumable/flour = 5, + /datum/reagent/consumable/sugar = 5, + /datum/reagent/consumable/honey = 5 + ) + result = /obj/item/reagent_containers/food/snacks/moth_cheese_cakes + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/kalixcian_sausage + name = "Raw Kalixcian blood sausage" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/rawcutlet = 1, + /obj/item/reagent_containers/food/snacks/meat/rawbacon = 1, + /datum/reagent/blood = 5, + /datum/reagent/consumable/sodiumchloride = 2 + ) + result = /obj/item/reagent_containers/food/snacks/raw_kalixcian_sausage + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/headcheese + name = "Raw headcheese" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/slab = 1, + /datum/reagent/consumable/sodiumchloride = 10, + /datum/reagent/consumable/blackpepper = 5 + ) + result = /obj/item/reagent_containers/food/snacks/raw_headcheese + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/shredded_lungs + name = "Crispy shredded lung stirfry" + reqs = list( + /obj/item/organ/lungs = 1, + /obj/item/reagent_containers/food/snacks/grown/onion = 1, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1 + ) + result = /obj/item/reagent_containers/food/snacks/shredded_lungs + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/tsatsikh + name = "Tsatsikh" + reqs = list( + /obj/item/organ/heart = 1, + /obj/item/organ/liver = 1, + /obj/item/organ/lungs = 1, + /obj/item/organ/stomach = 1, + /datum/reagent/consumable/sodiumchloride = 2, + /datum/reagent/consumable/blackpepper = 2 + ) + result = /obj/item/reagent_containers/food/snacks/tsatsikh + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/liver_pate + name = "Liver pate" + reqs = list( + /obj/item/organ/liver = 1, + /obj/item/reagent_containers/food/snacks/meat/rawcutlet = 1, + /obj/item/reagent_containers/food/snacks/grown/onion = 1 + ) + result = /obj/item/reagent_containers/food/snacks/liver_pate + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/moonfish_caviar + name = "Moonfish caviar paste" + reqs = list( + /obj/item/reagent_containers/food/snacks/moonfish_eggs = 1, + /datum/reagent/consumable/sodiumchloride = 2 + ) + result = /obj/item/reagent_containers/food/snacks/moonfish_caviar + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/lizard_escargot + name = "Desert snail cocleas" + reqs = list( + /obj/item/reagent_containers/food/snacks/canned/desert_snails = 1, + /obj/item/reagent_containers/food/snacks/grown/garlic = 1, + /datum/reagent/consumable/lemonjuice = 3, + /datum/reagent/consumable/blackpepper = 2, + /datum/reagent/consumable/quality_oil = 3 + ) + result = /obj/item/reagent_containers/food/snacks/lizard_escargot + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/fried_blood_sausage + name = "Fried blood sausage" + reqs = list( + /obj/item/reagent_containers/food/snacks/raw_kalixcian_sausage = 1, + /datum/reagent/consumable/korta_flour = 5, + /datum/reagent/water = 5 + ) + result = /obj/item/reagent_containers/food/snacks/fried_blood_sausage + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/lizard_fries + name = "Loaded poms-franzisks" + reqs = list( + /obj/item/reagent_containers/food/snacks/fries = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, + /datum/reagent/consumable/bbqsauce = 5 + ) + result = /obj/item/reagent_containers/food/snacks/lizard_fries + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/brain_pate + name = "Eyeball-and-brain pate" + reqs = list( + /obj/item/organ/brain = 1, + /obj/item/organ/eyes = 1, + /obj/item/reagent_containers/food/snacks/grown/onion = 1, + /datum/reagent/consumable/sodiumchloride = 3 + ) + result = /obj/item/reagent_containers/food/snacks/brain_pate + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/crispy_headcheese + name = "Crispy breaded headcheese" + reqs = list( + /obj/item/reagent_containers/food/snacks/headcheese_slice = 1, + /obj/item/reagent_containers/food/snacks/breadslice/root = 1 + ) + result = /obj/item/reagent_containers/food/snacks/crispy_headcheese + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/picoss_skewers + name = "Picoss skewers" + reqs = list( + /obj/item/reagent_containers/food/snacks/fishmeat = 2, + /obj/item/reagent_containers/food/snacks/grown/onion = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/stack/rods = 1, + /datum/reagent/consumable/vinegar = 5 + ) + result = /obj/item/reagent_containers/food/snacks/kebab/picoss_skewers + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/nectar_larvae + name = "Nectar larvae" + reqs = list( + /obj/item/reagent_containers/food/snacks/canned/larvae = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /datum/reagent/consumable/korta_nectar = 5 + ) + result = /obj/item/reagent_containers/food/snacks/nectar_larvae + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/mushroomy_stirfry + name = "Mushroomy Stirfry" + reqs = list( + /obj/item/reagent_containers/food/snacks/steeped_mushrooms = 1, + /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1, + /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1, + /datum/reagent/consumable/quality_oil = 5 + ) + result = /obj/item/reagent_containers/food/snacks/mushroomy_stirfry + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/moonfish_demiglace + name = "Moonfish demiglace" + reqs = list( + /obj/item/reagent_containers/food/snacks/grilled_moonfish = 1, + /obj/item/reagent_containers/food/snacks/grown/potato = 1, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /datum/reagent/consumable/korta_milk = 5, + /datum/reagent/consumable/ethanol/wine = 5 + ) + result = /obj/item/reagent_containers/food/snacks/moonfish_demiglace + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/lizard_surf_n_turf + name = "Zagosk surf n turf smorgasbord" + reqs = list( + /obj/item/reagent_containers/food/snacks/grilled_moonfish = 1, + /obj/item/reagent_containers/food/snacks/kebab/picoss_skewers = 2, + /obj/item/reagent_containers/food/snacks/meat/steak = 1, + /obj/item/reagent_containers/food/snacks/bbqribs = 1 + ) + result = /obj/item/reagent_containers/food/snacks/lizard_surf_n_turf + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/rootdough + name = "Rootdough" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/potato = 2, + /obj/item/reagent_containers/food/snacks/egg = 1, + /datum/reagent/consumable/korta_flour = 5, + /datum/reagent/water = 10 + ) + result = /obj/item/reagent_containers/food/snacks/rootdough + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/emperor_roll + name = "Emperor roll" + reqs = list( + /obj/item/reagent_containers/food/snacks/rootroll = 1, + /obj/item/reagent_containers/food/snacks/liver_pate = 1, + /obj/item/reagent_containers/food/snacks/headcheese_slice = 2, + /obj/item/reagent_containers/food/snacks/moonfish_caviar = 1 + ) + result = /obj/item/reagent_containers/food/snacks/emperor_roll + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/honey_sweetroll + name = "Honey sweetroll" + reqs = list( + /obj/item/reagent_containers/food/snacks/rootroll = 1, + /obj/item/reagent_containers/food/snacks/grown/berries = 1, + /obj/item/reagent_containers/food/snacks/grown/banana = 1, + /datum/reagent/consumable/honey = 5 + ) + result = /obj/item/reagent_containers/food/snacks/honey_roll + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/candied_mushrooms + name = "Candied mushrooms" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/reagent_containers/food/snacks/steeped_mushrooms = 1, + /datum/reagent/consumable/caramel = 5, + /datum/reagent/consumable/sodiumchloride = 1 + ) + result = /obj/item/reagent_containers/food/snacks/kebab/candied_mushrooms + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/sauerkraut + name = "Sauerkraut" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/cabbage = 2, + /datum/reagent/consumable/sodiumchloride = 10 + ) + result = /obj/item/reagent_containers/food/snacks/sauerkraut + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/lizard_dumplings + name = "Kalixcian dumplings" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/potato = 1, + /datum/reagent/consumable/korta_flour = 5 + ) + result = /obj/item/reagent_containers/food/snacks/lizard_dumplings + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/steeped_mushrooms + name = "Steeped mushrooms" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/ash_flora/seraka = 1, + /datum/reagent/lye = 5 + ) + result = /obj/item/reagent_containers/food/snacks/steeped_mushrooms + subcategory = CAT_MISCFOOD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index ec04dcaa4ec9..6df27c22eebe 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -334,7 +334,7 @@ /obj/item/reagent_containers/food/snacks/pastrybase = 1, /obj/item/reagent_containers/food/snacks/grown/cannabis = 1 ) - result = /obj/item/reagent_containers/food/snacks/dankpocket + result = /obj/item/reagent_containers/food/snacks/donkpocket/dankpocket subcategory = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/spicy diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm index 2cb668df4fd0..43f168b3156c 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm @@ -101,3 +101,171 @@ ) result = /obj/item/reagent_containers/food/snacks/pizza/pineapple subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/raw_mothic_margherita + name = "Mothic margherita pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/solar_pizza_dough = 1, + /obj/item/reagent_containers/food/snacks/tomato_sauce = 1, + /obj/item/reagent_containers/food/snacks/mozzarella = 1, + /obj/item/reagent_containers/food/snacks/firm_cheese = 1, + /obj/item/reagent_containers/food/snacks/grown/herbs = 1 + ) + result = /obj/item/reagent_containers/food/snacks/raw_mothic_margherita + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/raw_mothic_firecracker + name = "Mothic firecracker pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/solar_pizza_dough = 1, + /datum/reagent/consumable/bbqsauce = 10, + /obj/item/reagent_containers/food/snacks/firm_cheese = 1, + /obj/item/reagent_containers/food/snacks/oven_baked_corn = 1, + /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 1 + ) + result = /obj/item/reagent_containers/food/snacks/raw_mothic_firecracker + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/raw_mothic_five_cheese + name = "Mothic five cheese pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/solar_pizza_dough = 1, + /obj/item/reagent_containers/food/snacks/tomato_sauce = 1, + /obj/item/reagent_containers/food/snacks/firm_cheese = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/mozzarella = 1, + /obj/item/reagent_containers/food/snacks/herby_cheese = 1, + /obj/item/reagent_containers/food/snacks/cheese_curds = 1 + ) + result = /obj/item/reagent_containers/food/snacks/raw_mothic_five_cheese + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/raw_mothic_white_pie + name = "Mothic white pie pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/solar_pizza_dough = 1, + /obj/item/reagent_containers/food/snacks/bechamel_sauce = 1, + /obj/item/reagent_containers/food/snacks/firm_cheese = 1, + /obj/item/reagent_containers/food/snacks/grown/garlic = 1, + /obj/item/reagent_containers/food/snacks/mozzarella = 1, + /obj/item/reagent_containers/food/snacks/grown/herbs = 1 + ) + result = /obj/item/reagent_containers/food/snacks/raw_mothic_white_pie + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/raw_mothic_pesto + name = "Mothic pesto pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/solar_pizza_dough = 1, + /obj/item/reagent_containers/food/snacks/pesto = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1, + /obj/item/reagent_containers/food/snacks/mozzarella = 1 + ) + result = /obj/item/reagent_containers/food/snacks/raw_mothic_pesto + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/raw_mothic_garlic + name = "Mothic garlic pizzabread" + reqs = list( + /obj/item/reagent_containers/food/snacks/solar_pizza_dough = 1, + /obj/item/reagent_containers/food/snacks/butter = 1, + /obj/item/reagent_containers/food/snacks/grown/garlic = 1, + /obj/item/reagent_containers/food/snacks/grown/herbs = 1 + ) + result = /obj/item/reagent_containers/food/snacks/raw_mothic_garlic + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/rustic_flatbread + name = "Rustic flatbread" + reqs = list( + /obj/item/reagent_containers/food/snacks/root_flatbread = 1, + /obj/item/reagent_containers/food/snacks/grown/garlic = 1, + /datum/reagent/consumable/lemonjuice = 2, + /datum/reagent/consumable/quality_oil = 3 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/flatbread/rustic + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/italic_flatbread + name = "Italic flatbread" + reqs = list( + /obj/item/reagent_containers/food/snacks/root_flatbread = 1, + /obj/item/reagent_containers/food/snacks/grown/garlic = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1, + /obj/item/reagent_containers/food/snacks/meatball = 2, + /datum/reagent/consumable/quality_oil = 3 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/flatbread/italic + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/imperial_flatbread + name = "Imperial flatbread" + reqs = list( + /obj/item/reagent_containers/food/snacks/root_flatbread = 1, + /obj/item/reagent_containers/food/snacks/liver_pate = 1, + /obj/item/reagent_containers/food/snacks/sauerkraut = 1, + /obj/item/reagent_containers/food/snacks/headcheese = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/flatbread/imperial + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/rawmeat_flatbread + name = "Meatlovers flatbread" + reqs = list( + /obj/item/reagent_containers/food/snacks/root_flatbread = 1, + /obj/item/reagent_containers/food/snacks/meat/slab = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/flatbread/rawmeat + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/stinging_flatbread + name = "Stinging flatbread" + reqs = list( + /obj/item/reagent_containers/food/snacks/root_flatbread = 1, + /obj/item/reagent_containers/food/snacks/canned/larvae = 1, + /obj/item/reagent_containers/food/snacks/canned/jellyfish = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/flatbread/stinging + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/zmorgast_flatbread + name = "Zmorgast flatbread" + reqs = list( + /obj/item/reagent_containers/food/snacks/root_flatbread = 1, + /obj/item/reagent_containers/food/snacks/grown/eggplant = 2, + /obj/item/reagent_containers/food/snacks/egg = 1, + /obj/item/organ/liver = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/flatbread/zmorgast + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/fish_flatbread + name = "BBQ fish flatbread" + reqs = list( + /obj/item/reagent_containers/food/snacks/root_flatbread = 1, + /obj/item/reagent_containers/food/snacks/fishmeat = 2, + /datum/reagent/consumable/bbqsauce = 5 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/flatbread/fish + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/mushroom_flatbread + name = "Mushroom and tomato flatbread" + reqs = list( + /obj/item/reagent_containers/food/snacks/root_flatbread = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1, + /obj/item/reagent_containers/food/snacks/grown/mushroom = 3, + /datum/reagent/consumable/quality_oil = 3 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/flatbread/mushroom + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/nutty_flatbread + name = "Nut paste flatbread" + reqs = list( + /obj/item/reagent_containers/food/snacks/root_flatbread = 1, + /datum/reagent/consumable/korta_flour = 5, + /datum/reagent/consumable/korta_milk = 5 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/flatbread/nutty + subcategory = CAT_PIZZA diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm index 73ccc0f37897..50c8be88ab9b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -106,3 +106,53 @@ ) result = /obj/item/reagent_containers/food/snacks/salad/edensalad subcategory = CAT_SALAD + +/datum/crafting_recipe/food/caprese_salad + name = "Caprese salad" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/tomato = 1, + /obj/item/reagent_containers/food/snacks/mozzarella = 1, + /obj/item/reagent_containers/food/snacks/grown/herbs = 1, + /datum/reagent/consumable/quality_oil = 2, + /datum/reagent/consumable/vinegar = 2 + ) + result = /obj/item/reagent_containers/food/snacks/caprese_salad + subcategory = CAT_SALAD + +/datum/crafting_recipe/food/fleet_salad + name = "Lörtonknusksolt (Fleet salad)" + reqs = list( + /obj/item/reagent_containers/food/snacks/mothic_salad = 1, + /obj/item/reagent_containers/food/snacks/grilled_cheese = 1, + /obj/item/reagent_containers/food/snacks/breadslice = 1, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /datum/reagent/consumable/quality_oil = 2, + /datum/reagent/consumable/vinegar = 2 + ) + result = /obj/item/reagent_containers/food/snacks/salad/fleet_salad + subcategory = CAT_SALAD + +/datum/crafting_recipe/food/cotton_salad + name = "Flöfrölenknusksolt (Cotton salad)" + reqs = list( + /obj/item/reagent_containers/food/snacks/mothic_salad = 1, + /obj/item/grown/cotton = 2, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /datum/reagent/consumable/quality_oil = 2, + /datum/reagent/consumable/vinegar = 2 + ) + result = /obj/item/reagent_containers/food/snacks/salad/fleet_salad + subcategory = CAT_SALAD + +/datum/crafting_recipe/food/moth_kachumbari + name = "Kæniatknusksolt (Kenyan salad)" + reqs = list( + /obj/item/reagent_containers/food/snacks/oven_baked_corn = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/grown/onion/red = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1, + /obj/item/reagent_containers/food/snacks/grown/herbs = 1, + /datum/reagent/consumable/limejuice = 2 + ) + result = /obj/item/reagent_containers/food/snacks/salad/moth_kachumbari + subcategory = CAT_SALAD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm index 41829e9ec2b8..6f2a5cb30797 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -61,5 +61,5 @@ /obj/item/reagent_containers/food/snacks/grown/tomato = 1 ) result = /obj/item/reagent_containers/food/snacks/blt - category = CAT_SANDWICH + subcategory = CAT_SANDWICH diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm index 0d7f403b538d..b62224db7dde 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm @@ -304,3 +304,222 @@ ) result = /obj/item/reagent_containers/food/snacks/soup/peasoup subcategory = CAT_SOUP + +/datum/crafting_recipe/food/moth_cotton_soup + name = "Flöfrölenmæsch (Cottonball soup)" + reqs = list( + /obj/item/grown/cotton = 1, + /obj/item/reagent_containers/food/snacks/grown/onion = 1, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /obj/item/reagent_containers/food/snacks/grown/eggplant = 1, + /obj/item/reagent_containers/food/snacks/oven_baked_corn = 1, + /datum/reagent/water = 10, + /obj/item/reagent_containers/glass/bowl = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/moth_cotton_soup + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/moth_cheese_soup + name = "Ælosterrmæsch (Cheese soup)" + reqs = list( + /obj/item/reagent_containers/food/snacks/cheesewedge = 2, + /obj/item/reagent_containers/food/snacks/butter = 1, + /obj/item/reagent_containers/food/snacks/grown/potato/sweet = 1, + /datum/reagent/consumable/flour = 5, + /datum/reagent/consumable/milk = 5, + /obj/item/reagent_containers/glass/bowl = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/moth_cheese_soup + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/moth_seed_soup + name = "Misklmæsch (Seed soup)" + reqs = list( + /obj/item/seeds/sunflower = 1, + /obj/item/seeds/poppy/lily = 1, + /obj/item/seeds/ambrosia = 1, + /datum/reagent/water = 10, + /datum/reagent/consumable/vinegar = 5, + /obj/item/reagent_containers/glass/bowl = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/moth_seed_soup + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/moth_bean_stew + name = "Prickeldröndolhaskl (Spicy bean stew)" + reqs = list( + /obj/item/reagent_containers/food/snacks/canned/beans = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1, + /obj/item/reagent_containers/food/snacks/grown/onion = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/oven_baked_corn = 1, + /datum/reagent/water = 5, + /obj/item/reagent_containers/glass/bowl = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/moth_bean_stew + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/moth_oat_stew + name = "Häfmisklhaskl (Oat stew)" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/oat = 1, + /obj/item/reagent_containers/food/snacks/grown/potato/sweet = 1, + /obj/item/reagent_containers/food/snacks/grown/parsnip = 1, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /datum/reagent/water = 5, + /obj/item/reagent_containers/glass/bowl = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/moth_oat_stew + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/moth_fire_soup + name = "Tömpröttkrakklmæsch (Heartburn soup)" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 1, + /obj/item/reagent_containers/food/snacks/tofu = 1, + /datum/reagent/consumable/yoghurt = 10, + /datum/reagent/consumable/vinegar = 2, + /obj/item/reagent_containers/glass/bowl = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/moth_fire_soup + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/rice_porridge + name = "Rice porridge" + reqs = list( + /obj/item/reagent_containers/food/snacks/salad/ricebowl = 1, + /datum/reagent/water = 10, + /datum/reagent/consumable/sodiumchloride = 2 + ) + result = /obj/item/reagent_containers/food/snacks/soup/rice_porridge + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/hua_mulan_congee + name = "Hua Mulan congee" + reqs = list( + /obj/item/reagent_containers/food/snacks/soup/rice_porridge = 1, + /obj/item/reagent_containers/food/snacks/meat/bacon = 1, + /obj/item/reagent_containers/food/snacks/friedegg = 2 + ) + result = /obj/item/reagent_containers/food/snacks/soup/hua_mulan_congee + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/toechtauese_rice_porridge + name = "Töchtaüse rice porridge" + reqs = list( + /obj/item/reagent_containers/food/snacks/soup/rice_porridge = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /datum/reagent/consumable/toechtauese_syrup = 5 + ) + result = /obj/item/reagent_containers/food/snacks/soup/toechtauese_rice_porridge + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/cornmeal_porridge + name = "Cornmeal porridge" + reqs = list( + /datum/reagent/consumable/cornmeal = 10, + /datum/reagent/water = 10, + /obj/item/reagent_containers/glass/bowl = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/cornmeal_porridge + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/cheesy_porridge + name = "Cheesy porridge" + reqs = list( + /obj/item/reagent_containers/food/snacks/soup/cornmeal_porridge = 1, + /datum/reagent/consumable/milk = 5, + /obj/item/reagent_containers/food/snacks/firm_cheese = 1, + /obj/item/reagent_containers/food/snacks/curd_cheese = 1, + /obj/item/reagent_containers/food/snacks/butter = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/cheesy_porridge + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/fried_eggplant_polenta + name = "Fried eggplant and polenta" + reqs = list( + /obj/item/reagent_containers/food/snacks/soup/cheesy_porridge = 1, + /obj/item/reagent_containers/food/snacks/grown/eggplant = 1, + /obj/item/reagent_containers/food/snacks/breadslice = 2, + /obj/item/reagent_containers/food/snacks/tomato_sauce = 1, + /obj/item/reagent_containers/food/snacks/mozzarella = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/fried_eggplant_polenta + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/red_porridge + name = "Eltsløsk ül a priktæolk (Red Porridge and Yoghurt)" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/redbeet = 1, + /datum/reagent/consumable/vanilla = 5, + /datum/reagent/consumable/yoghurt = 10, + /datum/reagent/consumable/sugar = 5 + ) + result = /obj/item/reagent_containers/food/snacks/soup/red_porridge + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/atrakor_dumplings + name = "Atrakor dumpling soup" + reqs = list( + /datum/reagent/water = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/meat/rawcutlet = 2, + /obj/item/reagent_containers/food/snacks/grown/onion = 1, + /obj/item/reagent_containers/food/snacks/lizard_dumplings = 1, + /datum/reagent/consumable/soysauce = 5 + ) + result = /obj/item/reagent_containers/food/snacks/soup/atrakor_dumplings + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/meatball_noodles + name = "Meatball noodle soup" + reqs = list( + /datum/reagent/water = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/meat/rawcutlet = 2, + /obj/item/reagent_containers/food/snacks/grown/onion = 1, + /obj/item/reagent_containers/food/snacks/spaghetti/nizaya = 1, + /obj/item/reagent_containers/food/snacks/meatball = 2, + /obj/item/reagent_containers/food/snacks/grown/korta_nut = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/meatball_noodles + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/black_broth + name = "Kalixcian black broth" + reqs = list( + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/kalixcian_sausage = 1, + /obj/item/reagent_containers/food/snacks/grown/onion = 1, + /datum/reagent/consumable/vinegar = 5, + /datum/reagent/blood = 5, + /datum/reagent/consumable/ice = 2 + ) + result = /obj/item/reagent_containers/food/snacks/soup/black_broth + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/jellyfish_stew + name = "Jellyfish stew" + reqs = list( + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/canned/jellyfish = 1, + /obj/item/reagent_containers/food/snacks/grown/soybeans = 1, + /obj/item/reagent_containers/food/snacks/grown/redbeet = 1, + /obj/item/reagent_containers/food/snacks/grown/potato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/jellyfish + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/rootbread_soup + name = "Rootbread soup" + reqs = list( + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/breadslice/root = 2, + /obj/item/reagent_containers/food/snacks/grown/garlic = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/egg = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/rootbread_soup + subcategory = CAT_SOUP diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm index 796c360c3448..441d31e6df4e 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm @@ -68,3 +68,49 @@ ) result = /obj/item/reagent_containers/food/snacks/spaghetti/butternoodles subcategory = CAT_SPAGHETTI + +/datum/crafting_recipe/food/snail_nizaya + name = "Desert snail nizaya" + reqs = list( + /obj/item/reagent_containers/food/snacks/canned/desert_snails = 1, + /obj/item/reagent_containers/food/snacks/spaghetti/nizaya = 1, + /obj/item/reagent_containers/food/snacks/grown/garlic = 1, + /datum/reagent/consumable/ethanol/wine = 5 + ) + result = /obj/item/reagent_containers/food/snacks/spaghetti/snail_nizaya + subcategory = CAT_SPAGHETTI + +/datum/crafting_recipe/food/garlic_nizaya + name = "Garlic nizaya" + reqs = list( + /obj/item/reagent_containers/food/snacks/spaghetti/nizaya = 1, + /obj/item/reagent_containers/food/snacks/grown/garlic = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /datum/reagent/consumable/quality_oil = 5 + ) + result = /obj/item/reagent_containers/food/snacks/spaghetti/garlic_nizaya + subcategory = CAT_SPAGHETTI + +/datum/crafting_recipe/food/demit_nizaya + name = "Demit nizaya" + reqs = list( + /obj/item/reagent_containers/food/snacks/spaghetti/nizaya = 1, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /obj/item/reagent_containers/food/snacks/grown/onion = 1, + /obj/item/reagent_containers/food/snacks/grown/eggplant = 1, + /datum/reagent/consumable/korta_milk = 5, + /datum/reagent/consumable/korta_nectar = 5 + ) + result = /obj/item/reagent_containers/food/snacks/spaghetti/demit_nizaya + subcategory = CAT_SPAGHETTI + +/datum/crafting_recipe/food/mushroom_nizaya + name = "Mushroom nizaya" + reqs = list( + /obj/item/reagent_containers/food/snacks/spaghetti/nizaya = 1, + /obj/item/reagent_containers/food/snacks/steeped_mushrooms = 1, + /obj/item/reagent_containers/food/snacks/grown/garlic = 1, + /datum/reagent/consumable/quality_oil = 5 + ) + result = /obj/item/reagent_containers/food/snacks/spaghetti/mushroom_nizaya + subcategory = CAT_SPAGHETTI diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index 441cda30e69e..c49b3ae538dd 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -251,3 +251,33 @@ filling_color = "#7FFF00" tastes = list("green grape" = 1) distill_reagent = /datum/reagent/consumable/ethanol/cognac + +// Toechtauese Berries +/obj/item/seeds/toechtauese + name = "pack of töchtaüse berry seeds" + desc = "These seeds grow into töchtaüse bushes." + icon_state = "seed-toechtauese" + species = "toechtauese" + plantname = "Töchtaüse Bush" + product = /obj/item/reagent_containers/food/snacks/grown/toechtauese + lifespan = 20 + maturation = 5 + production = 5 + yield = 2 + instability = 30 + growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' + icon_grow = "toechtauese-grow" + icon_dead = "toechtauese-dead" + genes = list(/datum/plant_gene/trait/repeated_harvest) + reagents_add = list(/datum/reagent/consumable/toechtauese_juice = 0.1, /datum/reagent/toxin/itching_powder = 0.04) + +/obj/item/reagent_containers/food/snacks/grown/toechtauese + seed = /obj/item/seeds/toechtauese + name = "töchtaüse berries" + desc = "A branch with töchtaüse berries on it. They're a favourite on the Mothic Fleet, but not in this form." + icon_state = "toechtauese_branch" + foodtype = FRUIT + grind_results = list(/datum/reagent/consumable/toechtauese_juice = 0, /datum/reagent/toxin/itching_powder = 0) + juice_results = list(/datum/reagent/consumable/toechtauese_juice = 0, /datum/reagent/toxin/itching_powder = 0) + tastes = list("fiery itchy pain" = 1) + distill_reagent = /datum/reagent/toxin/itching_powder diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index bbb1379bcc74..f453b1bcb251 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -104,3 +104,28 @@ else held_mob = null ..() + +// Bell Pepper +/obj/item/seeds/chili/bell_pepper + name = "pack of bell pepper seeds" + desc = "These seeds grow into bell pepper plants. MILD! MILD! MILD!" + icon_state = "seed-bell-pepper" + species = "bellpepper" + plantname = "Bell Pepper Plants" + product = /obj/item/reagent_containers/food/snacks/grown/bell_pepper + endurance = 10 + maturation = 10 + production = 10 + yield = 3 + rarity = 20 + genes = list(/datum/plant_gene/trait/repeated_harvest) + mutatelist = null + reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.08, /datum/reagent/consumable/nutriment = 0.04) + +/obj/item/reagent_containers/food/snacks/grown/bell_pepper + seed = /obj/item/seeds/chili/bell_pepper + name = "bell pepper" + desc = "A big mild pepper that's good for many things." + icon_state = "bell_pepper" + foodtype = FRUIT + cooked_type = /obj/item/reagent_containers/food/snacks/roasted_bell_pepper diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm index c288633c5323..0f2e89651bf2 100644 --- a/code/modules/hydroponics/grown/corn.dm +++ b/code/modules/hydroponics/grown/corn.dm @@ -28,6 +28,7 @@ juice_results = list(/datum/reagent/consumable/corn_starch = 0) tastes = list("corn" = 1) distill_reagent = /datum/reagent/consumable/ethanol/whiskey + dried_type = /obj/item/reagent_containers/food/snacks/oven_baked_corn /obj/item/grown/corncob name = "corn cob" diff --git a/code/modules/hydroponics/grown/herbs.dm b/code/modules/hydroponics/grown/herbs.dm new file mode 100644 index 000000000000..2538d2a5a914 --- /dev/null +++ b/code/modules/hydroponics/grown/herbs.dm @@ -0,0 +1,27 @@ +// Herbs +/obj/item/seeds/herbs + name = "pack of herb seeds" + desc = "These seeds grow to produce an assortment of herbs and seasonings." + icon_state = "seed-herbs" + species = "herbs" + plantname = "Herbs" + product = /obj/item/reagent_containers/food/snacks/grown/herbs + growthstages = 2 + yield = 5 + potency = 20 + growing_icon = 'icons/obj/hydroponics/growing.dmi' + icon_grow = "herbs-grow" + icon_dead = "herbs-dead" + genes = list(/datum/plant_gene/trait/repeated_harvest) + reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) + +/obj/item/reagent_containers/food/snacks/grown/herbs + seed = /obj/item/seeds/herbs + name = "bundle of herbs" + desc = "A bundle of various herbs. Somehow, you're always able to pick what you need out." + icon_state = "herbs" + foodtype = VEGETABLES + grind_results = list(/datum/reagent/consumable/nutriment = 0) + juice_results = list(/datum/reagent/consumable/nutriment = 0) + tastes = list("nondescript herbs" = 1) + distill_reagent = /datum/reagent/consumable/ethanol/fernet diff --git a/code/modules/hydroponics/grown/korta_nut.dm b/code/modules/hydroponics/grown/korta_nut.dm new file mode 100644 index 000000000000..5b3ccc324c12 --- /dev/null +++ b/code/modules/hydroponics/grown/korta_nut.dm @@ -0,0 +1,52 @@ +//Korta Nut +/obj/item/seeds/korta_nut + name = "pack of korta nut seeds" + desc = "These seeds grow into korta nut bushes, native to Kalixcis." + icon_state = "seed-korta" + species = "kortanut" + plantname = "Korta Nut Bush" + product = /obj/item/reagent_containers/food/snacks/grown/korta_nut + lifespan = 55 + endurance = 35 + yield = 5 + growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' + icon_grow = "kortanut-grow" + icon_dead = "kortanut-dead" + genes = list(/datum/plant_gene/trait/repeated_harvest) + mutatelist = list(/obj/item/seeds/korta_nut/sweet) + reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) + +/obj/item/reagent_containers/food/snacks/grown/korta_nut + seed = /obj/item/seeds/korta_nut/sweet + name = "sweet korta nut" + desc = "A sweet Kalixcian treat originally from the Antechannel League." + icon_state = "korta_nut" + foodtype = NUTS + grind_results = list(/datum/reagent/consumable/korta_flour = 0) + juice_results = list(/datum/reagent/consumable/korta_milk = 0) + tastes = list("peppery heat" = 1) + distill_reagent = /datum/reagent/consumable/ethanol/kortara + +//Sweet Korta Nut +/obj/item/seeds/korta_nut/sweet + name = "pack of sweet korta nut seeds" + desc = "These seeds grow into sweet korta nuts, an Antechannel League cultivar of korta that produces a thick syrup that Kalixcians use for desserts." + icon_state = "seed-sweetkorta" + species = "kortanut" + plantname = "Sweet Korta Nut Bush" + product = /obj/item/reagent_containers/food/snacks/grown/korta_nut/sweet + maturation = 10 + production = 10 + mutatelist = null + reagents_add = list(/datum/reagent/consumable/korta_nectar = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) + rarity = 20 + +/obj/item/reagent_containers/food/snacks/grown/korta_nut/sweet + seed = /obj/item/seeds/korta_nut/sweet + name = "sweet korta nut" + desc = "A sweet treat lizards love to eat." + icon_state = "korta_nut" + grind_results = list(/datum/reagent/consumable/korta_flour = 0) + juice_results = list(/datum/reagent/consumable/korta_milk = 0, /datum/reagent/consumable/korta_nectar = 0) + tastes = list("peppery sweet" = 1) + distill_reagent = /datum/reagent/consumable/ethanol/kortara diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 0bade04d3fe8..108eee054a7b 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -151,6 +151,22 @@ // min dmg 3, max dmg 6, prob(70) AddComponent(/datum/component/caltrop, 3, 6, 70) +/obj/structure/flora/ash/seraka + icon_state = "seraka_mushroom" + name = "seraka mushrooms" + desc = "A small cluster of Kalixcian seraka mushrooms. Often found near Ashwalker dwellings in the Frontier." + needs_sharp_harvest = FALSE + harvested_name = "harvested seraka mushrooms" + harvested_desc = "A couple of small seraka mushrooms, with the larger ones clearly having been recently removed. They'll grow back... eventually." + harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/seraka + harvest_amount_high = 6 + harvest_time = 25 + harvest_message_low = "You pluck a few choice tasty mushrooms." + harvest_message_med = "You grab a good haul of mushrooms." + harvest_message_high = "You hit the mushroom motherlode and make off with a bunch of tasty mushrooms." + regrowth_time_low = 3000 + regrowth_time_high = 5400 + ///Snow flora to exist on icebox. /obj/structure/flora/ash/chilly icon_state = "chilly_pepper" @@ -234,6 +250,7 @@ pixel_y = rand(-4, 4) /obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings //So we can't craft bowls from everything. + grind_results = list(/datum/reagent/toxin/mushroom_powder = 5) /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf name = "mushroom leaf" @@ -288,6 +305,13 @@ /obj/item/reagent_containers/food/snacks/grown/ash_flora/puce/canconsume(mob/eater, mob/user) return FALSE +/obj/item/reagent_containers/food/snacks/grown/ash_flora/seraka + name = "seraka cap" + desc = "Small, deeply flavourful mushrooms originally native to Kalixcis." + icon_state = "seraka_cap" + seed = /obj/item/seeds/lavaland/seraka + wine_power = 40 + //SEEDS /obj/item/seeds/lavaland @@ -432,6 +456,17 @@ user.put_in_hands(result) to_chat(user, "You finish breaking [src]") +//So this really should have /datum/reagent/medicine/coagulant/seraka_extract = 0.02 but that's not in the codebase yet. I think we have to port a bunch of wound stuff from tg +/obj/item/seeds/lavaland/seraka + desc = "This mycelium grows into seraka mushrooms, a species of savoury mushrooms originally native to Kalixcis. Seraka mushrooms are used in both Kalixcian food and traditional medicine." + icon_state = "mycelium-seraka" + species = "seraka" + plantname = "Seraka Mushrooms" + product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/seraka + genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance) + growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' + reagents_add = list(/datum/reagent/toxin/mushroom_powder = 0.1) + //CRAFTING /datum/crafting_recipe/mushroom_bowl diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm index af19f1316ce2..dfe2da127a38 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -8,7 +8,7 @@ mutantstomach = /obj/item/organ/stomach/fly meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly disliked_food = null - liked_food = GORE | RAW // Sure, the raw... the bloody... but I think stuff GROSS, like baseball burgers, are liked + liked_food = GROSS | GORE changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT species_language_holder = /datum/language_holder/fly diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 885be6f5886a..a6975b4f234c 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -7,7 +7,7 @@ mutant_bodyparts = list("ears", "tail_human") use_skintones = TRUE skinned_type = /obj/item/stack/sheet/animalhide/human - disliked_food = GROSS | RAW | CLOTH + disliked_food = GROSS | RAW | CLOTH | BUGS | GORE liked_food = JUNKFOOD | FRIED | SUGAR changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT loreblurb = "Mostly hairless mammalians. Their home system, Sol, lies in a sort of \"bluespace dead-zone\" that blocks anything from entering or exiting Sol's dead-zone through bluespace without a relay. While it leaves Sol extremely well-defended, it meant that they went unnoticed and uncontacted until they were themselves able to breach it." diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 141efed98e12..b663c6f0c69a 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -19,7 +19,7 @@ skinned_type = /obj/item/stack/sheet/animalhide/lizard exotic_bloodtype = "L" disliked_food = GRAIN | DAIRY | CLOTH | GROSS - liked_food = GORE | MEAT + liked_food = GORE | MEAT | SEAFOOD | NUTS | BUGS inert_mutation = FIREBREATH deathsound = 'sound/voice/lizard/deathsound.ogg' wings_icons = list("Dragon") diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 02ddf79f6bc4..149b2bc30247 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -11,9 +11,9 @@ attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth - liked_food = FRUIT | SUGAR | CLOTH - disliked_food = GROSS - toxic_food = MEAT | RAW | GORE + liked_food = VEGETABLES | DAIRY | CLOTH + disliked_food = FRUIT | GROSS | BUGS | GORE + toxic_food = MEAT | RAW | SEAFOOD mutanteyes = /obj/item/organ/eyes/compound //WS Edit - Compound eyes mutanttongue = /obj/item/organ/tongue/moth //WS Edit - Insectoid language changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index ec9afd777f2c..388130953975 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -16,7 +16,7 @@ breathid = "tox" damage_overlay_type = ""//let's not show bloody wounds or burns over bones. var/internal_fire = FALSE //If the bones themselves are burning clothes won't help you much - disliked_food = FRUIT + disliked_food = FRUIT | CLOTH liked_food = VEGETABLES | DAIRY changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC outfit_important_for_life = /datum/outfit/plasmaman diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index daa645a662a8..a83b0a3d02cc 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -13,8 +13,8 @@ burnmod = 1.25 heatmod = 1.5 meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant - disliked_food = MEAT | DAIRY - liked_food = VEGETABLES | FRUIT | GRAIN | CLOTH //cannibals apparentely + disliked_food = MEAT | DAIRY | SEAFOOD | BUGS + liked_food = VEGETABLES | FRUIT | GRAIN changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT species_language_holder = /datum/language_holder/plant diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index 920115f52c02..1c59282c81b1 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -11,7 +11,7 @@ mutanttongue = /obj/item/organ/tongue/bone damage_overlay_type = ""//let's not show bloody wounds or burns over bones. disliked_food = NONE - liked_food = GROSS | MEAT | RAW | DAIRY + liked_food = GROSS | MEAT | RAW | DAIRY | GORE //They can technically be in an ERT changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN species_language_holder = /datum/language_holder/skeleton diff --git a/code/modules/mob/living/carbon/human/species_types/spider.dm b/code/modules/mob/living/carbon/human/species_types/spider.dm index f7ae4f6bef10..c74aa9b0e89b 100644 --- a/code/modules/mob/living/carbon/human/species_types/spider.dm +++ b/code/modules/mob/living/carbon/human/species_types/spider.dm @@ -51,7 +51,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt")) attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/spider - liked_food = MEAT | RAW | GORE // Regular spiders literally liquify the insides of their prey and drink em like a smoothie. I think this fits + liked_food = MEAT | RAW | GORE | BUGS // Regular spiders literally liquify the insides of their prey and drink em like a smoothie. I think this fits disliked_food = FRUIT | GROSS toxic_food = VEGETABLES | DAIRY | CLOTH mutanteyes = /obj/item/organ/eyes/night_vision/spider diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index 702adfb224a2..fdfb9fe98f20 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -12,7 +12,7 @@ mutanttongue = /obj/item/organ/tongue/zombie var/static/list/spooks = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg') disliked_food = NONE - liked_food = GROSS | MEAT | RAW + liked_food = GROSS | MEAT | RAW | GORE changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | ERT_SPAWN bodytemp_normal = T0C // They have no natural body heat, the environment regulates body temp bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_EXIST // Take damage at fire temp diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 0985ce758976..170bf4319874 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -520,6 +520,7 @@ /datum/reagent/consumable/ethanol/vodka, /datum/reagent/consumable/ethanol/gin, /datum/reagent/consumable/ethanol/rum, + /datum/reagent/consumable/ethanol/navy_rum, /datum/reagent/consumable/ethanol/tequila, /datum/reagent/consumable/ethanol/vermouth, /datum/reagent/consumable/ethanol/cognac, @@ -530,6 +531,7 @@ /datum/reagent/consumable/ethanol/creme_de_cacao, /datum/reagent/consumable/ethanol/creme_de_coconut, /datum/reagent/consumable/ethanol/triple_sec, + /datum/reagent/consumable/ethanol/curacao, /datum/reagent/consumable/ethanol/sake, /datum/reagent/consumable/ethanol/applejack ) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 123afbcf387c..1e5285d8ef26 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2456,6 +2456,227 @@ All effects don't start immediately, but rather get worse over time; the rate is M.stuttering = min(M.stuttering + 3, 3) ..() +/datum/reagent/consumable/ethanol/kortara + name = "Kortara" + description = "A sweet, milky alcoholic drink derived from fermented Korta Nut. This Kalixcian drink is enjoyed galaxywide, and frequently mixed with fruit juices and cocoa for extra refreshment." + boozepwr = 25 + color = "#EEC39A" + quality = DRINK_GOOD + taste_description = "sweet nectar" + glass_icon_state = "kortara_glass" + glass_name = "glass of kortara" + glass_desc = "The fermented nectar of the Korta nut, as enjoyed by Kalixcians galaxywide." + +/datum/reagent/consumable/ethanol/kortara/on_mob_life(mob/living/carbon/M, delta_time, times_fired) + if(M.getBruteLoss() && prob(10)) + M.heal_bodypart_damage(1,0, 0) + . = TRUE + +/datum/reagent/consumable/ethanol/sea_breeze + name = "Sea Breeze" + description = "Light and refreshing with a mint and cocoa hit- like mint choc chip ice cream you can drink!" + boozepwr = 15 + color = "#CFFFE5" + quality = DRINK_VERYGOOD + taste_description = "mint choc chip" + glass_icon_state = "sea_breeze" + glass_name = "Sea Breeze" + glass_desc = "Minty, chocolatey, and creamy. It's like drinkable mint chocolate chip!" + +/datum/reagent/consumable/ethanol/sea_breeze/on_mob_life(mob/living/carbon/M, delta_time, times_fired) + M.apply_status_effect(/datum/status_effect/throat_soothed) + ..() + +/datum/reagent/consumable/ethanol/white_gezenan + name = "White Gezenan" + description = "A potent mixture of vodka and kortara. This drink is used to commemorate Solar-Kalixcian first contact and often served at diplomatic affairs." + boozepwr = 65 + color = "#A68340" + quality = DRINK_GOOD + taste_description = "grain alcohol and nuts" + glass_icon_state = "white_gezenan" + glass_name = "White Gezenan" + glass_desc = "A potent mixture of vodka and kortara." + +/datum/reagent/consumable/ethanol/drunken_espatier + name = "Drunken Espatier" + description = "Look, if you had to get into a shootout in the cold vacuum of space, you'd want to be drunk too." + boozepwr = 65 + color = "#A68340" + quality = DRINK_GOOD + taste_description = "sorrow" + glass_icon_state = "drunken_espatier" + glass_name = "Drunken Espatier" + glass_desc = "A drink to make facing death easier." + +/datum/reagent/consumable/ethanol/drunken_espatier/on_mob_life(mob/living/carbon/C, delta_time, times_fired) + C.hal_screwyhud = SCREWYHUD_HEALTHY //almost makes you forget how much it hurts + SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "numb", /datum/mood_event/narcotic_medium, name) //comfortably numb + ..() + +/datum/reagent/consumable/ethanol/protein_blend + name = "Protein Blend" + description = "A vile blend of protein, pure grain alcohol, korta flour, and blood. Useful for bulking up, if you can keep it down." + boozepwr = 65 + color = "#FF5B69" + quality = DRINK_NICE + taste_description = "regret" + glass_icon_state = "protein_blend" + glass_name = "Protein Blend" + glass_desc = "Vile, even by lizard standards." + nutriment_factor = 3 * REAGENTS_METABOLISM + +/datum/reagent/consumable/ethanol/protein_blend/on_mob_life(mob/living/carbon/M, delta_time, times_fired) + M.adjust_nutrition(2 * REM * delta_time) + if(!islizard(M)) + M.adjust_disgust(5 * REM * delta_time) + else + M.adjust_disgust(2 * REM * delta_time) + ..() + +/datum/reagent/consumable/ethanol/mushi_kombucha + name = "Mushi Kombucha" + description = "A popular summer beverage on Kalixcis, made from sweetened mushroom tea." + boozepwr = 10 + color = "#C46400" + quality = DRINK_VERYGOOD + taste_description = "sweet 'shrooms" + glass_icon_state = "glass_orange" + glass_name = "glass of mushi kombucha" + glass_desc = "A glass of (slightly alcoholic) fermented sweetened mushroom tea. Refreshing, if a little strange." + +/datum/reagent/consumable/ethanol/dragons_fang + name = "Dragon's Fang" + description = "A famous old Zohilian drink re-imagined with modern ingredients. Traditional Kalixcian mushroom brew is blended with Solarian ingredients to produce this tangy dessert cocktail." + boozepwr = 60 + color = "#FFD700" + quality = DRINK_FANTASTIC + taste_description = "sweet, tangy, and bitter alcohol" + glass_icon_state = "dragons_fang" + glass_name = "Dragon's Fang" + glass_desc = "A famous old Zohilian drink re-imagined with modern ingredients." + +//Moth Drinks +/datum/reagent/consumable/ethanol/curacao + name = "Curaçao" + description = "Made with laraha oranges, for an aromatic finish." + boozepwr = 30 + color = "#1a5fa1" + quality = DRINK_NICE + taste_description = "blue orange" + glass_icon_state = "curacao" + glass_name = "glass of curaçao" + glass_desc = "It's blue, da ba dee." + +/datum/reagent/consumable/ethanol/navy_rum //IN THE NAVY + name = "Navy Rum" + description = "Rum as the finest sailors drink." + boozepwr = 90 //the finest sailors are often drunk + color = "#d8e8f0" + quality = DRINK_NICE + taste_description = "a life on the waves" + glass_icon_state = "ginvodkaglass" + glass_name = "glass of navy rum" + glass_desc = "Splice the mainbrace, and God save the King." + +/datum/reagent/consumable/ethanol/bitters //why do they call them bitters, anyway? they're more spicy than anything else + name = "Andromeda Bitters" + description = "A bartender's best friend, often used to lend a delicate spiciness to any drink. Produced in New Trinidad, now and forever." + boozepwr = 70 + color = "#1c0000" + quality = DRINK_NICE + taste_description = "spiced alcohol" + glass_icon_state = "bitters" + glass_name = "glass of bitters" + glass_desc = "Typically you'd want to mix this with something- but you do you." + +/datum/reagent/consumable/ethanol/admiralty //navy rum, vermouth, fernet + name = "Admiralty" + description = "A refined, bitter drink made with navy rum, vermouth and fernet." + boozepwr = 100 + color = "#1F0001" + quality = DRINK_VERYGOOD + taste_description = "haughty arrogance" + glass_icon_state = "admiralty" + glass_name = "Admiralty" + glass_desc = "Hail to the Admiral, for he brings fair tidings, and rum too." + +/datum/reagent/consumable/ethanol/long_haul //Rum, Curacao, Sugar, dash of bitters, lengthened with soda water + name = "Long Haul" + description = "A favourite amongst freighter pilots, unscrupulous smugglers, and nerf herders." + boozepwr = 35 + color = "#003153" + quality = DRINK_VERYGOOD + taste_description = "companionship" + glass_icon_state = "long_haul" + glass_name = "Long Haul" + glass_desc = "A perfect companion for a lonely long haul flight." + +/datum/reagent/consumable/ethanol/long_john_silver //navy rum, bitters, lemonade + name = "Long John Silver" + description = "A long drink of navy rum, bitters, and lemonade. Particularly popular aboard the Mothic Fleet as it's light on ration credits and heavy on flavour." + boozepwr = 50 + color = "#c4b35c" + quality = DRINK_VERYGOOD + taste_description = "rum and spices" + glass_icon_state = "long_john_silver" + glass_name = "Long John Silver" + glass_desc = "Named for a famous pirate, who may or may not have been fictional. But hey, why let the truth get in the way of a good yarn?" //Chopper Reid says "How the fuck are ya?" + +/datum/reagent/consumable/ethanol/tropical_storm //dark rum, pineapple juice, triple citrus, curacao + name = "Tropical Storm" + description = "A taste of the Caribbean in one glass." + boozepwr = 40 + color = "#00bfa3" + quality = DRINK_VERYGOOD + taste_description = "the tropics" + glass_icon_state = "tropical_storm" + glass_name = "Tropical Storm" + glass_desc = "Less destructive than the real thing." + +/datum/reagent/consumable/ethanol/dark_and_stormy //rum and ginger beer- simple and classic + name = "Dark and Stormy" + description = "A classic drink arriving to thunderous applause." //thank you, thank you, I'll be here forever + boozepwr = 50 + color = "#8c5046" + quality = DRINK_GOOD + taste_description = "ginger and rum" + glass_icon_state = "dark_and_stormy" + glass_name = "Dark and Stormy" + glass_desc = "Thunder and lightning, very very frightening." + +/datum/reagent/consumable/ethanol/salt_and_swell //navy rum, tochtause syrup, egg whites, dash of saline-glucose solution + name = "Salt and Swell" + description = "A bracing sour with an interesting salty taste." + boozepwr = 60 + color = "#b4abd0" + quality = DRINK_FANTASTIC + taste_description = "salt and spice" + glass_icon_state = "salt_and_swell" + glass_name = "Salt and Swell" + glass_desc = "Ah, I do like to be beside the seaside." + +/datum/reagent/consumable/ethanol/tiltaellen //yoghurt, salt, vinegar. This cant taste good + name = "Tiltällen" + description = "A lightly fermented yoghurt drink with salt and a light dash of vinegar. Has a distinct sour cheesy flavour." + boozepwr = 10 + color = "#F4EFE2" + quality = DRINK_NICE + taste_description = "sour cheesy yoghurt" + glass_icon_state = "tiltaellen" + glass_name = "glass of tiltällen" + glass_desc = "Eww... it's curdled." + +/datum/reagent/consumable/ethanol/tich_toch + name = "Tich Toch" + description = "A mix of Tiltällen, Töchtaüse Syrup, and vodka. It's not exactly to everyones' tastes." + boozepwr = 75 + color = "#b4abd0" + quality = DRINK_VERYGOOD + taste_description = "spicy sour cheesy yoghurt" + glass_icon_state = "tich_toch" + glass_name = "Tich Toch" + glass_desc = "Oh god." /datum/reagent/consumable/ethanol/shotinthedark name = "Shot in the Dark" description = "A coconut elixir with a golden tinge." diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index d359600b0102..957728bd92f2 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -954,3 +954,166 @@ M.drowsyness++ return ..() +/datum/reagent/consumable/mushroom_tea + name = "Mushroom Tea" + description = "A savoury glass of tea made from polypore mushroom shavings, originally native to Kalixcis" + color = "#674945" // rgb: 16, 16, 0 + nutriment_factor = 0 + taste_description = "mushrooms" + glass_icon_state = "mushroom_tea_glass" + glass_name = "glass of mushroom tea" + glass_desc = "Oddly savoury for a drink." + +/datum/reagent/consumable/mushroom_tea/on_mob_life(mob/living/carbon/M, delta_time, times_fired) + if(islizard(M)) + M.adjustOxyLoss(-0.5 * REM * delta_time, 0) + ..() + . = TRUE + +//Moth Stuff +/datum/reagent/consumable/toechtauese_juice + name = "Töchtaüse Juice" + description = "An unpleasant juice made from töchtaüse berries. Best made into a syrup, unless you enjoy pain." + color = "#554862" + nutriment_factor = 0 + taste_description = "fiery itchy pain" + glass_icon_state = "toechtauese_syrup" + glass_name = "glass of töchtaüse juice" + glass_desc = "Raw, unadulterated töchtaüse juice. One swig will fill you with regrets." + +/datum/reagent/consumable/toechtauese_syrup + name = "Töchtaüse Syrup" + description = "A harsh spicy and bitter syrup, made from töchtaüse berries. Useful as an ingredient, both for food and cocktails." + color = "#554862" + nutriment_factor = 0 + taste_description = "sugar, spice, and nothing nice" + glass_icon_state = "toechtauese_syrup" + glass_name = "glass of töchtaüse juice" + glass_desc = "Raw, unadulterated töchtaüse juice. One swig will fill you with regrets." + +/datum/reagent/consumable/strawberry_banana + name = "strawberry banana smoothie" + description = "A classic smoothie made from strawberries and bananas." + color = "#FF9999" + nutriment_factor = 0 + taste_description = "strawberry and banana" + glass_icon_state = "strawberry_banana" + glass_name = "strawberry banana smoothie" + glass_desc = "A classic drink which countless souls have bonded over..." + +/datum/reagent/consumable/berry_blast + name = "berry blast smoothie" + description = "A classic smoothie made from mixed berries." + color = "#A76DC5" + nutriment_factor = 0 + taste_description = "mixed berry" + glass_icon_state = "berry_blast" + glass_name = "berry blast smoothie" + glass_desc = "A classic drink, freshly made with hand picked berries. Or, maybe not." + +/datum/reagent/consumable/funky_monkey + name = "funky monkey smoothie" + description = "A classic smoothie made from chocolate and bananas." + color = "#663300" + nutriment_factor = 0 + taste_description = "chocolate and banana" + glass_icon_state = "funky_monkey" + glass_name = "funky monkey smoothie" + glass_desc = "A classic drink made with chocolate and banana. No monkeys were harmed, officially." + +/datum/reagent/consumable/green_giant + name = "green giant smoothie" + description = "A green vegetable smoothie, made without vegetables." + color = "#003300" + nutriment_factor = 0 + taste_description = "green, just green" + glass_icon_state = "green_giant" + glass_name = "green giant smoothie" + glass_desc = "A classic drink, if you enjoy juiced wheatgrass and chia seeds." + +/datum/reagent/consumable/melon_baller + name = "melon baller smoothie" + description = "A classic smoothie made from melons." + color = "#D22F55" + nutriment_factor = 0 + taste_description = "fresh melon" + glass_icon_state = "melon_baller" + glass_name = "melon baller smoothie" + glass_desc = "A wonderfully fresh melon smoothie. Guaranteed to brighten your day." + +/datum/reagent/consumable/vanilla_dream + name = "vanilla dream smoothie" + description = "A classic smoothie made from vanilla and fresh cream." + color = "#FFF3DD" + nutriment_factor = 0 + taste_description = "creamy vanilla" + glass_icon_state = "vanilla_dream" + glass_name = "vanilla dream smoothie" + glass_desc = "A classic drink made with vanilla and fresh cream." + +/datum/reagent/consumable/cucumberjuice + name = "Cucumber Juice" + description = "Ordinary cucumber juice, nothing from the fantasy world." + color = "#6cd87a" + taste_description = "light cucumber" + glass_icon_state = "glass_cucumber" + glass_name = "glass of cucumber juice" + glass_desc = "A glass of cucumber juice." + +/datum/reagent/consumable/cucumberlemonade + name = "Cucumber Lemonade" + description = "Cucumber juice, sugar and soda, what else is needed for happiness?" + color = "#6cd87a" + quality = DRINK_GOOD + taste_description = "citrus soda with cucumber" + glass_icon_state = "cucumber_lemonade" + glass_name = "cucumber lemonade" + glass_desc = "The smell of cucumber from lemonade, I'm sure I won't get poisoned?." + +/datum/reagent/consumable/cucumberlemonade/on_mob_life(mob/living/carbon/doll, delta_time, times_fired) + doll.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, doll.get_body_temp_normal()) + if(doll.getToxLoss() && prob(10)) + doll.adjustToxLoss(-0.5, FALSE) + return ..() + +/datum/reagent/consumable/mississippi_queen + name = "Mississippi Queen" + description = "If you think you're so hot, how about a victory drink?" + color = "#d4422f" // rgb: 212,66,47 + taste_description = "sludge seeping down your throat" + glass_icon_state = "mississippiglass" + glass_name = "Mississippi Queen" + glass_desc = "Mullets and cut-up jorts not included." + +//IDK how to make this work, so comment this for better times +/*datum/reagent/consumable/mississippi_queen/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) + switch(current_cycle) + if(10 to 20) + drinker.adjust_dizzy(4 SECONDS * REM * delta_time) + if(20 to 30) + if(prob(15)) + drinker.adjust_confusion(4 SECONDS * REM * delta_time) + if(30 to 200) + drinker.adjust_hallucinations(60 SECONDS * REM * delta_time) + return ..()*/ + +//Moth Stuff +/datum/reagent/consumable/toechtauese_juice + name = "Töchtaüse Juice" + description = "An unpleasant juice made from töchtaüse berries. Best made into a syrup, unless you enjoy pain." + color = "#554862" + nutriment_factor = 0 + taste_description = "fiery itchy pain" + glass_icon_state = "toechtauese_syrup" + glass_name = "glass of töchtaüse juice" + glass_desc = "Raw, unadulterated töchtaüse juice. One swig will fill you with regrets." + +/datum/reagent/consumable/toechtauese_syrup + name = "Töchtaüse Syrup" + description = "A harsh spicy and bitter syrup, made from töchtaüse berries. Useful as an ingredient, both for food and cocktails." + color = "#554862" + nutriment_factor = 0 + taste_description = "sugar, spice, and nothing nice" + glass_icon_state = "toechtauese_syrup" + glass_name = "glass of töchtaüse syrup" + glass_desc = "Not for drinking on its own." diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index e4e6bdd1d620..d436be20a42c 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -807,6 +807,66 @@ taste_mult = 2 taste_description = "fizzy sweetness" +/datum/reagent/consumable/korta_flour + name = "Korta Flour" + description = "A coarsely ground, peppery flour made from korta nut shells." + taste_description = "earthy heat" + color = "#EEC39A" + +/datum/reagent/consumable/korta_milk + name = "Korta Milk" + description = "A milky liquid made by crushing the centre of a korta nut." + taste_description = "sugary milk" + color = "#FFFFFF" + +/datum/reagent/consumable/korta_nectar + name = "Korta Nectar" + description = "A sweet, sugary syrup made from crushed sweet korta nuts." + color = "#d3a308" + nutriment_factor = 5 * REAGENTS_METABOLISM + metabolization_rate = 1 * REAGENTS_METABOLISM + taste_description = "peppery sweetness" + +/datum/reagent/consumable/peanut_butter + name = "Peanut Butter" + description = "A rich, creamy spread produced by grinding peanuts." + taste_description = "peanuts" + reagent_state = SOLID + color = "#D9A066" + nutriment_factor = 15 * REAGENTS_METABOLISM + +/datum/reagent/consumable/vinegar + name = "Vinegar" + description = "Useful for pickling, or putting on chips." + taste_description = "acid" + color = "#661F1E" + +//A better oil, representing choices like olive oil, argan oil, avocado oil, etc. +/datum/reagent/consumable/quality_oil + name = "Quality Oil" + description = "A high quality oil, suitable for dishes where the oil is a key flavour." + taste_description = "olive oil" + color = "#DBCF5C" + +/datum/reagent/consumable/cornmeal + name = "Cornmeal" + description = "Ground cornmeal, for making corn related things." + taste_description = "raw cornmeal" + color = "#ebca85" + +/datum/reagent/consumable/yoghurt + name = "Yoghurt" + description = "Creamy natural yoghurt, with applications in both food and drinks." + taste_description = "yoghurt" + color = "#efeff0" + nutriment_factor = 2 * REAGENTS_METABOLISM + +/datum/reagent/consumable/cornmeal_batter + name = "Cornmeal Batter" + description = "An eggy, milky, corny mixture that's not very good raw." + taste_description = "raw batter" + color = "#ebca85" + /datum/reagent/consumable/pyre_elementum name = "Pyre Elementum" description = "This is what makes Fireblossoms even hotter." diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index d95bd68759c7..ab391e9ba704 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -405,6 +405,14 @@ toxpwr = 0.1 taste_description = "green tea" +/datum/reagent/toxin/mushroom_powder + name = "Mushroom Powder" + description = "Finely ground polypore mushrooms, ready to be steeped in water to make mushroom tea." + reagent_state = SOLID + color = "#67423A" // rgb: 127, 132, 0 + toxpwr = 0.1 + taste_description = "mushrooms" + /datum/reagent/toxin/mutetoxin //the new zombie powder. name = "Mute Toxin" description = "A nonlethal poison that inhibits speech in its victim." diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 77525a1f309e..126b581de3cf 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -1,7 +1,7 @@ /obj/structure/bigDelivery name = "large parcel" desc = "A large delivery parcel." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "deliverycloset" density = TRUE mouse_drag_pointer = MOUSE_ACTIVE_POINTER @@ -165,7 +165,7 @@ /obj/item/smallDelivery name = "parcel" desc = "A brown paper delivery parcel." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "deliverypackage3" item_state = "deliverypackage" var/giftwrapped = 0 diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 7b5bd27a8ada..7e2f48a1c2d8 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -48,7 +48,7 @@ /obj/structure/cursed_money name = "bag of money" desc = "RICH! YES! YOU KNEW IT WAS WORTH IT! YOU'RE RICH! RICH! RICH!" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "moneybag" anchored = FALSE density = TRUE diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 0c535f58ae23..5a721b324dc2 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -20,7 +20,7 @@ desc = "A wall mounted safe containing space suits. Will only open in emergencies." anchored = TRUE density = FALSE - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "safe" var/unlocked = FALSE @@ -70,7 +70,7 @@ /obj/item/storage/overmap_ship name = "emergency space suits" desc = "A wall mounted safe containing space suits. Will only open in emergencies." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "safe" anchored = TRUE var/unlocked = FALSE diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 317297c4fe8d..d08b641bf027 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -192,7 +192,7 @@ /obj/item/organ_storage //allows medical cyborgs to manipulate organs without hands name = "organ storage bag" desc = "A container for holding body parts." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "evidenceobj" item_flags = SURGICAL_TOOL diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 6a9b3627dfb7..ff1363cc106a 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -29,9 +29,11 @@ /obj/item/reagent_containers/food/drinks/bottle/vodka = 5, /obj/item/reagent_containers/food/drinks/bottle/vermouth = 5, /obj/item/reagent_containers/food/drinks/bottle/rum = 5, + /obj/item/reagent_containers/food/drinks/bottle/navy_rum = 5, /obj/item/reagent_containers/food/drinks/bottle/wine = 5, /obj/item/reagent_containers/food/drinks/bottle/cognac = 5, /obj/item/reagent_containers/food/drinks/bottle/kahlua = 5, + /obj/item/reagent_containers/food/drinks/bottle/curacao = 5, /obj/item/reagent_containers/food/drinks/bottle/hcider = 5, /obj/item/reagent_containers/food/drinks/bottle/absinthe = 5, /obj/item/reagent_containers/food/drinks/bottle/grappa = 5, @@ -52,7 +54,8 @@ premium = list( /obj/item/reagent_containers/glass/bottle/ethanol = 4, /obj/item/reagent_containers/food/drinks/bottle/champagne = 5, - /obj/item/reagent_containers/food/drinks/bottle/trappist = 5) + /obj/item/reagent_containers/food/drinks/bottle/trappist = 5, + /obj/item/reagent_containers/food/drinks/bottle/bitters = 5,) product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty 'round this sector?" product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!" diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 8be6000ddc69..70e29a9913d9 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -15,7 +15,8 @@ /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, /obj/item/reagent_containers/food/drinks/waterbottle = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/efuel = 5) + /obj/item/reagent_containers/food/drinks/soda_cans/efuel = 5, + /obj/item/reagent_containers/food/drinks/bottle/mushroom_kombucha = 3) contraband = list( /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6) diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index bdb3ae4c02eb..7cd2fed5a29f 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -23,6 +23,7 @@ /obj/item/seeds/garlic = 3, /obj/item/seeds/grape = 3, /obj/item/seeds/grass = 3, + /obj/item/seeds/korta_nut = 3, /obj/item/seeds/lemon = 3, /obj/item/seeds/lime = 3, /obj/item/seeds/onion = 3, diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index 5f6a4b6d937a..116ca2d74f1f 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -12,12 +12,19 @@ /obj/item/reagent_containers/food/snacks/chips = 6, /obj/item/reagent_containers/food/snacks/sosjerky = 6, /obj/item/reagent_containers/food/snacks/no_raisin = 6, + /obj/item/reagent_containers/food/snacks/peanuts = 6, + /obj/item/reagent_containers/food/snacks/peanuts/random = 3, + /obj/item/reagent_containers/food/snacks/cnds = 6, + /obj/item/reagent_containers/food/snacks/cnds/random = 3, /obj/item/reagent_containers/food/drinks/dry_ramen = 3, /obj/item/storage/box/gum = 3, /obj/item/reagent_containers/food/snacks/energybar = 6) contraband = list( /obj/item/reagent_containers/food/snacks/syndicake = 6, /obj/item/reagent_containers/food/snacks/candy/bronx = 1) + premium = list( + /obj/item/reagent_containers/food/snacks/spacers_sidekick = 3 + ) refill_canister = /obj/item/vending_refill/snack canload_access_list = list(ACCESS_KITCHEN) default_price = 60 diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 03fdf63dd00b..9cbe8ada325f 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/food/bread.dmi b/icons/obj/food/bread.dmi new file mode 100644 index 000000000000..e408fe10b97a Binary files /dev/null and b/icons/obj/food/bread.dmi differ diff --git a/icons/obj/food/burger.dmi b/icons/obj/food/burger.dmi new file mode 100644 index 000000000000..8c5738ac3a22 Binary files /dev/null and b/icons/obj/food/burger.dmi differ diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi deleted file mode 100644 index 5115c64cefe9..000000000000 Binary files a/icons/obj/food/burgerbread.dmi and /dev/null differ diff --git a/icons/obj/food/cake.dmi b/icons/obj/food/cake.dmi new file mode 100644 index 000000000000..c0d4ae537eed Binary files /dev/null and b/icons/obj/food/cake.dmi differ diff --git a/icons/obj/food/canned.dmi b/icons/obj/food/canned.dmi new file mode 100644 index 000000000000..ed6e464c0f2a Binary files /dev/null and b/icons/obj/food/canned.dmi differ diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index aca64240a1cc..ccdf657abfbb 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ diff --git a/icons/obj/food/donk.dmi b/icons/obj/food/donk.dmi new file mode 100644 index 000000000000..1d65bad61ed5 Binary files /dev/null and b/icons/obj/food/donk.dmi differ diff --git a/icons/obj/food/egg.dmi b/icons/obj/food/egg.dmi new file mode 100644 index 000000000000..6ffdff42f633 Binary files /dev/null and b/icons/obj/food/egg.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index ddf9be7b356f..7261718c084f 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/food_ingredients.dmi b/icons/obj/food/food_ingredients.dmi index b761943de00a..658c98095200 100644 Binary files a/icons/obj/food/food_ingredients.dmi and b/icons/obj/food/food_ingredients.dmi differ diff --git a/icons/obj/food/frozen_treats.dmi b/icons/obj/food/frozen_treats.dmi index 389949dcfa08..1598ab44f14f 100644 Binary files a/icons/obj/food/frozen_treats.dmi and b/icons/obj/food/frozen_treats.dmi differ diff --git a/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi new file mode 100644 index 000000000000..ad2cf89b7e7c Binary files /dev/null and b/icons/obj/food/meat.dmi differ diff --git a/icons/obj/food/pie.dmi b/icons/obj/food/pie.dmi new file mode 100644 index 000000000000..cf07c0dfc11a Binary files /dev/null and b/icons/obj/food/pie.dmi differ diff --git a/icons/obj/food/piecake.dmi b/icons/obj/food/piecake.dmi deleted file mode 100644 index 16b6e0c2847a..000000000000 Binary files a/icons/obj/food/piecake.dmi and /dev/null differ diff --git a/icons/obj/food/pizza.dmi b/icons/obj/food/pizza.dmi new file mode 100644 index 000000000000..ce421bc95065 Binary files /dev/null and b/icons/obj/food/pizza.dmi differ diff --git a/icons/obj/food/pizzaspaghetti.dmi b/icons/obj/food/pizzaspaghetti.dmi deleted file mode 100644 index 439c65d639df..000000000000 Binary files a/icons/obj/food/pizzaspaghetti.dmi and /dev/null differ diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi index 1205fd888adc..88d4f48a5418 100644 Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ diff --git a/icons/obj/food/spaghetti.dmi b/icons/obj/food/spaghetti.dmi new file mode 100644 index 000000000000..14e9101e0cea Binary files /dev/null and b/icons/obj/food/spaghetti.dmi differ diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi index 2d8aecc78695..6a87cd8276d5 100644 Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi index dbfdd8524559..5db18b2837f7 100644 Binary files a/icons/obj/hydroponics/growing_fruits.dmi and b/icons/obj/hydroponics/growing_fruits.dmi differ diff --git a/icons/obj/hydroponics/growing_mushrooms.dmi b/icons/obj/hydroponics/growing_mushrooms.dmi index 20633cf85b3e..3328904afc2f 100644 Binary files a/icons/obj/hydroponics/growing_mushrooms.dmi and b/icons/obj/hydroponics/growing_mushrooms.dmi differ diff --git a/icons/obj/hydroponics/growing_vegetables.dmi b/icons/obj/hydroponics/growing_vegetables.dmi index e45eda91634e..8c8cc8a1a100 100644 Binary files a/icons/obj/hydroponics/growing_vegetables.dmi and b/icons/obj/hydroponics/growing_vegetables.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index b07ae679471d..0636d49135ab 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi index 266e7917e3cb..7c8d89a300ec 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index e084df73a37a..e7788fd594bd 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ diff --git a/icons/obj/lavaland/ash_flora.dmi b/icons/obj/lavaland/ash_flora.dmi index c804d82f1769..b1287cc34d04 100644 Binary files a/icons/obj/lavaland/ash_flora.dmi and b/icons/obj/lavaland/ash_flora.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi deleted file mode 100644 index 250f7220713d..000000000000 Binary files a/icons/obj/storage.dmi and /dev/null differ diff --git a/icons/obj/storage/donk.dmi b/icons/obj/storage/donk.dmi new file mode 100644 index 000000000000..c0cb7fcc39bb Binary files /dev/null and b/icons/obj/storage/donk.dmi differ diff --git a/icons/obj/storage/gum.dmi b/icons/obj/storage/gum.dmi new file mode 100644 index 000000000000..ed5140d84439 Binary files /dev/null and b/icons/obj/storage/gum.dmi differ diff --git a/icons/obj/storage/storage.dmi b/icons/obj/storage/storage.dmi new file mode 100644 index 000000000000..15b63621ae2e Binary files /dev/null and b/icons/obj/storage/storage.dmi differ diff --git a/shiptest.dme b/shiptest.dme index 543b4322394d..b85af8e5671f 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -2118,25 +2118,25 @@ #include "code\modules\food_and_drinks\drinks\drinks\drinkingglass.dm" #include "code\modules\food_and_drinks\drinks\drinks\modglass.dm" #include "code\modules\food_and_drinks\food\bait.dm" +#include "code\modules\food_and_drinks\food\bread.dm" +#include "code\modules\food_and_drinks\food\burgers.dm" +#include "code\modules\food_and_drinks\food\cake.dm" #include "code\modules\food_and_drinks\food\condiment.dm" #include "code\modules\food_and_drinks\food\customizables.dm" +#include "code\modules\food_and_drinks\food\egg.dm" +#include "code\modules\food_and_drinks\food\frozen.dm" +#include "code\modules\food_and_drinks\food\meat.dm" +#include "code\modules\food_and_drinks\food\other.dm" +#include "code\modules\food_and_drinks\food\pastry.dm" +#include "code\modules\food_and_drinks\food\pie.dm" +#include "code\modules\food_and_drinks\food\pizza.dm" #include "code\modules\food_and_drinks\food\ration.dm" +#include "code\modules\food_and_drinks\food\salad.dm" +#include "code\modules\food_and_drinks\food\sandwichtoast.dm" #include "code\modules\food_and_drinks\food\snacks.dm" -#include "code\modules\food_and_drinks\food\snacks_bread.dm" -#include "code\modules\food_and_drinks\food\snacks_burgers.dm" -#include "code\modules\food_and_drinks\food\snacks_cake.dm" -#include "code\modules\food_and_drinks\food\snacks_egg.dm" -#include "code\modules\food_and_drinks\food\snacks_frozen.dm" -#include "code\modules\food_and_drinks\food\snacks_meat.dm" -#include "code\modules\food_and_drinks\food\snacks_other.dm" -#include "code\modules\food_and_drinks\food\snacks_pastry.dm" -#include "code\modules\food_and_drinks\food\snacks_pie.dm" -#include "code\modules\food_and_drinks\food\snacks_pizza.dm" -#include "code\modules\food_and_drinks\food\snacks_salad.dm" -#include "code\modules\food_and_drinks\food\snacks_sandwichtoast.dm" -#include "code\modules\food_and_drinks\food\snacks_soup.dm" -#include "code\modules\food_and_drinks\food\snacks_spaghetti.dm" -#include "code\modules\food_and_drinks\food\snacks_vend.dm" +#include "code\modules\food_and_drinks\food\soup.dm" +#include "code\modules\food_and_drinks\food\spaghetti.dm" +#include "code\modules\food_and_drinks\food\vend.dm" #include "code\modules\food_and_drinks\food\snacks\dough.dm" #include "code\modules\food_and_drinks\food\snacks\meat.dm" #include "code\modules\food_and_drinks\kitchen_machinery\big_mortar.dm" @@ -2210,6 +2210,8 @@ #include "code\modules\hydroponics\grown\flowers.dm" #include "code\modules\hydroponics\grown\garlic.dm" #include "code\modules\hydroponics\grown\grass_carpet.dm" +#include "code\modules\hydroponics\grown\herbs.dm" +#include "code\modules\hydroponics\grown\korta_nut.dm" #include "code\modules\hydroponics\grown\kudzu.dm" #include "code\modules\hydroponics\grown\melon.dm" #include "code\modules\hydroponics\grown\misc.dm"
[nicename]