From 4b28b7fe8c755d783bb8fa45f6e020c1f0799fe1 Mon Sep 17 00:00:00 2001 From: bobubeu <36081010+bobubeu@users.noreply.github.com> Date: Sat, 21 Mar 2020 18:26:31 +0200 Subject: [PATCH] Adds strawberry ice cream sandwiches (#50065) * Adds a new frozen food A strawberry ice cream sandwich * Typo in consumable * adds space in between ice cream --- code/modules/cargo/bounties/chef.dm | 7 +++++++ .../food_and_drinks/food/snacks_frozen.dm | 11 +++++++++++ .../recipes/tablecraft/recipes_frozen.dm | 10 ++++++++++ icons/obj/food/frozen_treats.dmi | Bin 3623 -> 3747 bytes 4 files changed, 28 insertions(+) diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm index a66d6cfd381..d0e946ba2a6 100644 --- a/code/modules/cargo/bounties/chef.dm +++ b/code/modules/cargo/bounties/chef.dm @@ -32,6 +32,13 @@ required_count = 3 wanted_types = list(/obj/item/reagent_containers/food/snacks/icecreamsandwich) +/datum/bounty/item/chef/strawberryicecreamsandwich + name = " Strawberry Ice Cream Sandwiches" + description = "Upper management has been screaming non-stop for more flavourful ice cream. Please send some." + reward = 5000 + required_count = 3 + wanted_types = list(/obj/item/reagent_containers/food/snacks/strawberryicecreamsandwich) + /datum/bounty/item/chef/bread name = "Bread" description = "Problems with central planning have led to bread prices skyrocketing. Ship some bread to ease tensions." diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm index 694fbd55fff..ce0aef118ce 100644 --- a/code/modules/food_and_drinks/food/snacks_frozen.dm +++ b/code/modules/food_and_drinks/food/snacks_frozen.dm @@ -13,6 +13,17 @@ tastes = list("ice cream" = 1) foodtype = GRAIN | DAIRY | SUGAR +/obj/item/reagent_containers/food/snacks/strawberryicecreamsandwich + name = "strawberry ice cream sandwich" + desc = "Portable ice-cream in its own packaging of the strawberry variety." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "strawberryicecreamsandwich" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/ice = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/ice = 2) + tastes = list("ice cream" = 2, "berry" = 2) + foodtype = FRUIT | DAIRY | SUGAR + + /obj/item/reagent_containers/food/snacks/spacefreezy name = "space freezy" desc = "The best icecream in space." 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 aec81e1785f..588eb863fbd 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -13,6 +13,16 @@ result = /obj/item/reagent_containers/food/snacks/icecreamsandwich subcategory = CAT_ICE +/datum/crafting_recipe/food/strawberryicecreamsandwich + name = "Strawberry ice cream sandwich" + reqs = list( + /datum/reagent/consumable/cream = 5, + /datum/reagent/consumable/ice = 5, + /obj/item/reagent_containers/food/snacks/grown/berries = 2, + ) + result = /obj/item/reagent_containers/food/snacks/strawberryicecreamsandwich + subcategory = CAT_ICE + /datum/crafting_recipe/food/spacefreezy name ="Space freezy" reqs = list( diff --git a/icons/obj/food/frozen_treats.dmi b/icons/obj/food/frozen_treats.dmi index 81a230a86342c7442ce62d4cee2af61a4a3a35bf..453bfaf277b735737af4a04857677fe67e85584f 100644 GIT binary patch delta 3153 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 delta 3031 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