diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 6cb351cb74..6865660d0b 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -464,6 +464,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ new /datum/stack_recipe("egg box", /obj/item/storage/fancy/egg_box), \ new /datum/stack_recipe("donk-pockets box", /obj/item/storage/box/donkpockets), \ new /datum/stack_recipe("monkey cube box", /obj/item/storage/box/monkeycubes), \ + new /datum/stack_recipe("nugget box", /obj/item/storage/fancy/nugget_box), \ new /datum/stack_recipe("box (internals)", /obj/item/storage/box/otwo), \ null, \ new /datum/stack_recipe("security-styled box", /obj/item/storage/box/seclooking), \ diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index f2c50b359e..3bc90d3615 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -357,6 +357,20 @@ STR.max_items = 8 STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/tinychocolate)) +/obj/item/storage/fancy/nugget_box + name = "nugget box" + desc = "A cardboard box used for holding chicken nuggies." + icon = 'icons/obj/food/containers.dmi' + icon_state = "nuggetbox" + icon_type = "nugget" + spawn_type = /obj/item/reagent_containers/food/snacks/nugget + +/obj/item/storage/fancy/nugget_box/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 6 + STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/nugget)) + /* * Ring Box */ diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index cdac6f49f2..ffc0d757b5 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -193,8 +193,8 @@ /obj/item/reagent_containers/food/snacks/meat/slab/bear, /obj/item/reagent_containers/food/snacks/meat/slab/xeno, /obj/item/reagent_containers/food/snacks/meat/slab/spider, + /obj/item/reagent_containers/food/snacks/spidereggs, /obj/item/reagent_containers/food/snacks/meat/rawcrab, - /obj/item/reagent_containers/food/snacks/meat/rawbacon, /obj/item/reagent_containers/food/snacks/spiderleg, /obj/item/reagent_containers/food/snacks/carpmeat, /obj/item/reagent_containers/food/snacks/meat/slab/human) diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm index 35b17e67f0..9a4ef2ce89 100644 --- a/code/modules/food_and_drinks/food/snacks_burgers.dm +++ b/code/modules/food_and_drinks/food/snacks_burgers.dm @@ -323,6 +323,14 @@ tastes = list("bun" = 4, "bacon" = 2) foodtype = GRAIN | MEAT +/obj/item/reagent_containers/food/snacks/burger/empoweredburger + name = "empowered burger" + desc = "It's shockingly good, if you live off of electricity that is." + icon_state = "empoweredburger" + list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/liquidelectricity = 5) + tastes = list("bun" = 2, "pure electricity" = 4) + foodtype = GRAIN | TOXIC + /obj/item/reagent_containers/food/snacks/burger/soylent name = "soylent burger" desc = "A eco-friendly burger made using upcycled low value biomass." @@ -331,6 +339,14 @@ tastes = list("bun" = 2, "assistant" = 4) foodtype = GRAIN | MEAT | DAIRY +/obj/item/reagent_containers/food/snacks/burger/crab + name = "crab burger" + desc = "A delicious patty of the crabby kind, slapped in between a bun." + icon_state = "crabburger" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3) + tastes = list("bun" = 2, "crab meat" = 4) + foodtype = GRAIN | MEAT + /obj/item/reagent_containers/food/snacks/burger/rib name = "mcrib" desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it." diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 7dc2188100..6c71318807 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -579,6 +579,16 @@ icon_state = "peachcanmaint" 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/chocolatestrawberry name = "Chocolate dipped strawberries" desc = "A strawberry dipped in a bit of chocolate." diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm index a0e1ebcb39..3d70b32f2e 100644 --- a/code/modules/food_and_drinks/food/snacks_soup.dm +++ b/code/modules/food_and_drinks/food/snacks_soup.dm @@ -228,6 +228,22 @@ tastes = list("beet" = 1) foodtype = VEGETABLES +/obj/item/reagent_containers/food/snacks/soup/onion + name = "french onion soup" + desc = "Good enough to make a grown mime cry." + icon_state = "onionsoup" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("caramelized onions" = 1) + foodtype = VEGETABLES + +/obj/item/reagent_containers/food/snacks/soup/bisque + name = "bisque" + desc = "A classic entree from Space-France." + icon_state = "bisque" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("creamy texture" = 1, "crab" = 4) + foodtype = MEAT + /obj/item/reagent_containers/food/snacks/soup/electron name = "electron soup" desc = "A gastronomic curiosity of ethereal origin. It is famed for the minature weather system formed over a properly prepared soup." diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index 0b297648c5..c15c1cd2f5 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -1,6 +1,7 @@ /datum/crafting_recipe/food var/real_parts category = CAT_FOOD + time = 5 /datum/crafting_recipe/food/New() real_parts = parts.Copy() diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm index cf96c01e7b..5789b8daeb 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm @@ -150,6 +150,24 @@ result = /obj/item/reagent_containers/food/snacks/burger/chicken subcategory = CAT_BURGER +/datum/crafting_recipe/food/crabburger + name = "Crab Burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/crab = 2, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/crab + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/empoweredburger + name = "Empowered Burger" + reqs = list( + /obj/item/stack/sheet/mineral/plasma = 2, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/empoweredburger + subcategory = CAT_BURGER + /datum/crafting_recipe/food/fishburger name = "Fish burger" reqs = list( 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 6a622d6719..479e116801 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -171,3 +171,16 @@ ) result = /obj/item/reagent_containers/food/snacks/salad/ricepudding subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/butterbear //ITS ALIVEEEEEE! + name = "Living bear/butter hybrid" + reqs = list( + /obj/item/organ/brain = 1, + /obj/item/organ/heart = 1, + /obj/item/reagent_containers/food/snacks/butter = 10, + /obj/item/reagent_containers/food/snacks/meat/slab = 5, + /datum/reagent/blood = 50, + /datum/reagent/teslium = 1 //To shock the whole thing into life + ) + result = /mob/living/simple_animal/hostile/bear/butter + subcategory = CAT_MISCFOOD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm index 4fc12f0777..45083e0374 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm @@ -97,6 +97,17 @@ result = /obj/item/reagent_containers/food/snacks/tuna subcategory = CAT_SEAFOOD +/datum/crafting_recipe/food/crab_rangoon + name = "Crab Rangoon" + reqs = list( + /obj/item/reagent_containers/food/snacks/doughslice = 1, + /datum/reagent/consumable/cream = 5, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/meat/crab = 1 + ) + result = /obj/item/reagent_containers/food/snacks/crab_rangoon + subcategory = CAT_SEAFOOD + /datum/crafting_recipe/food/cubancarp name = "Cuban carp" reqs = list( 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 0c966faf33..ac49537adf 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm @@ -24,6 +24,16 @@ result = /obj/item/reagent_containers/food/snacks/soup/beet subcategory = CAT_SOUP +/datum/crafting_recipe/food/bisque + name = "Bisque" + reqs = list( + /datum/reagent/water = 10, + /obj/item/reagent_containers/food/snacks/meat/crab = 1, + /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/bisque + subcategory = CAT_SOUP + /datum/crafting_recipe/food/bloodsoup name = "Blood soup" reqs = list( @@ -67,6 +77,17 @@ result = /obj/item/reagent_containers/food/snacks/soup/tomato/eyeball subcategory = CAT_SOUP +/datum/crafting_recipe/food/onionsoup + name = "French onion soup" + reqs = list( + /datum/reagent/water = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/onion = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + ) + result = /obj/item/reagent_containers/food/snacks/soup/onion + subcategory = CAT_SOUP + /datum/crafting_recipe/food/hotchili name = "Hot chili" reqs = list( diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index b019019c71..dca7bc7006 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -99,9 +99,57 @@ to_chat(user, "You strap the armor plating to [A] and sharpen [A.p_their()] claws with the nail filer. This was a great idea.") qdel(src) - - - +mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Several functions used from it. + name = "Terrygold" + icon_state = "butterbear" + icon_living = "butterbear" + icon_dead = "butterbear_dead" + desc = "I can't believe its not a bear!" + faction = list("neutral", "russian") + obj_damage = 11 + melee_damage_lower = 1 + melee_damage_upper = 1 + armour_penetration = 0 + response_harm = "takes a bite out of" + attacked_sound = 'sound/items/eatfood.ogg' + deathmessage = "loses its false life and collapses!" + butcher_results = list(/obj/item/reagent_containers/food/snacks/butter = 6, /obj/item/reagent_containers/food/snacks/meat/slab = 3, /obj/item/organ/brain = 1, /obj/item/organ/heart = 1) + attack_sound = 'sound/weapons/slap.ogg' + attacktext = "slaps" + +/mob/living/simple_animal/hostile/bear/butter/Life() //Heals butter bear really fast when he takes damage. + if(stat) + return + if(health < maxHealth) + heal_overall_damage(10) //Fast life regen, makes it hard for you to get eaten to death. + +/mob/living/simple_animal/hostile/bear/butter/attack_hand(mob/living/L) //Borrowed code from Cak, feeds people if they hit you. More nutriment but less vitamin to represent BUTTER. + ..() + if(L.a_intent == INTENT_HARM && L.reagents && !stat) + L.reagents.add_reagent(/datum/reagent/consumable/nutriment, 1) + L.reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 0.1) + +/mob/living/simple_animal/hostile/bear/butter/CheckParts(list/parts) //Borrowed code from Cak, allows the brain used to actually control the bear. + ..() + var/obj/item/organ/brain/B = locate(/obj/item/organ/brain) in contents + if(!B || !B.brainmob || !B.brainmob.mind) + return + B.brainmob.mind.transfer_to(src) + to_chat(src, "You are a butter bear! You're a mostly harmless bear/butter hybrid that everyone loves. People can take bites out of you if they're hungry, but you regenerate health \ + so quickly that it generally doesn't matter. You're remarkably resilient to any damage besides this and it's hard for you to really die at all. You should go around and bring happiness and \ + free butter to the station!") + var/new_name = stripped_input(src, "Enter your name, or press \"Cancel\" to stick with Terrygold.", "Name Change") + if(new_name) + to_chat(src, "Your name is now \"new_name\"!") + name = new_name + +mob/living/simple_animal/hostile/bear/butter/AttackingTarget() //Makes some attacks by the butter bear slip those who dare cross its path. + if(isliving(target)) + var/mob/living/L = target + if((L.mobility_flags & MOBILITY_STAND)) + L.Knockdown(20) + playsound(loc, 'sound/misc/slip.ogg', 15) + L.visible_message("[L] slips on butter!") diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index d3ffdb62e4..988ae1a30f 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index 2639d6860a..641715fd87 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 670269da00..9518640416 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ