cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ice Cream Rework Part 1: Creamed (#22223)

Browse Source 
* Adds ice cream chems

* Added recipes for ice cream chems

* Added sprite for plain ice cream

* Changed icecream_mob sprite

* Added scooped ice cream food items

* Added ice cream solidification recipies

* Changed NULL to null

* Added mood event for eating ice cream

* Fixed bug, grammar, and description

* Started on adding ice cream cartons

* Changed misc frozen recipes

* Finished carton

* Renamed items for consistency

* Added ice cream crate to cargo console

* Switches milk with cream for chem recipes

* Update code/modules/food_and_drinks/food/snacks_frozen.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

* Update code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/snacks_frozen.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

* Refactored box flavor text to #define

* Honkdae switched from vanilla to banana ice cream

* Minimum temp added to ice cream chem recipe

* Fixed carton/pen interaction bug and chem typo

---------

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
This commit is contained in:
Scrambledeggs
2024-07-08 11:37:20 -04:00
committed by GitHub
parent 26e024f8ed
commit 089b7ad680
10 changed files with 563 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/datums/mood_events/generic_positive_events.dm
View File

@@ -207,6 +207,11 @@
description = span_nicegreen("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!\n")
mood_change = 10
/datum/mood_event/ice_cream
description = span_nicegreen("I recently enjoyed some nice and cool ice cream.\n")
mood_change = 2
timeout = 2 MINUTES
/datum/mood_event/area
description = "" //Fill this out in the area
mood_change = 0

1
code/game/objects/items/stacks/sheets/sheet_types.dm
View File

@@ -513,6 +513,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new/datum/stack_recipe("folder", /obj/item/folder), \
new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \
new/datum/stack_recipe("ice cream carton", /obj/item/storage/box/ice_cream_carton), \
null, \
//TO-DO: Find a proper way to just change the illustration on the box. Code isn't the issue, input is.
new/datum/stack_recipe_list("fancy boxes", list(

130
code/game/objects/items/storage/boxes.dm
View File

@@ -1357,3 +1357,133 @@
desc = "A bag containing fresh, dry coffee robusta beans. Ethically sourced and packaged by Waffle Corp."
beantype = /obj/item/reagent_containers/food/snacks/grown/coffee/robusta
#define CARTON_PLAIN "plain ice cream"
#define CARTON_VANILLA "vanilla ice cream"
#define CARTON_CHOCOLATE "chocolate ice cream"
#define CARTON_STRAWBERRY "strawberry ice cream"
#define CARTON_BLUE "blue ice cream"
#define CARTON_LEMON_SORBET "lemon sorbet"
#define CARTON_CARAMEL "caramel ice cream"
#define CARTON_BANANA "banana ice cream"
#define CARTON_ORANGE_CREAMSICKLE "orange creamsickle"
#define CARTON_PEACH "peach ice cream"
#define CARTON_CHERRY_CHOCOLATE "cherry chocolate ice cream"
#define CARTON_MEAT "meat lover's ice cream"
/obj/item/storage/box/ice_cream_carton
icon_state = "ice_cream"
icon = 'icons/obj/food/containers.dmi'
name = "Big Top plain ice cream carton"
desc = "A classic ice cream brand; this carton contains plain ice cream."
//What flavor will be inside the carton
var/ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop
/obj/item/storage/box/ice_cream_carton/Initialize(mapload)
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 7
STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/ice_cream_scoop))
/obj/item/storage/box/ice_cream_carton/PopulateContents()
for(var/i in 1 to 7)
new ice_cream_flavor(src)
/obj/item/storage/box/ice_cream_carton/attackby(obj/item/A, mob/user, params)
//Allow for name and desc to be changed with pen
if(istype(A, /obj/item/pen))
var/choice = input(usr, "Choose which flavor to change to", "Changing Carton Flavor") as null|anything in list(CARTON_PLAIN, CARTON_VANILLA, CARTON_CHOCOLATE, CARTON_STRAWBERRY, CARTON_BLUE, CARTON_LEMON_SORBET, CARTON_CARAMEL, CARTON_BANANA, CARTON_ORANGE_CREAMSICKLE, CARTON_PEACH, CARTON_CHERRY_CHOCOLATE, CARTON_MEAT)
if(choice != null)
name = "Big Top [choice] carton"
desc = "A classic ice cream brand; this carton contains [choice]."
return
..()
/obj/item/storage/box/ice_cream_carton/examine(mob/user)
. = ..()
. += span_notice("You can change the carton's flavor with a <b>Pen<b>.")
if(length(contents) == 0)
. += span_warning("This carton is <b>EMPTY<b>!!") //PANIC!!
/obj/item/storage/box/ice_cream_carton/update_overlays()
. = ..()
//How much ice cream is in the carton
var/inventory_count = length(contents)
//What icon to use for the overlay
var/carton_overlay = null
if(inventory_count == 0)
return .
else
carton_overlay = "_lid"
var/mutable_appearance/ice_cream_overlay = mutable_appearance(icon, "ice_cream[carton_overlay]")
. += ice_cream_overlay
/obj/item/storage/box/ice_cream_carton/vanilla
name = "Big Top vanilla ice cream carton"
desc = "A classic ice cream brand; this carton contains vanilla ice cream."
ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/vanilla
/obj/item/storage/box/ice_cream_carton/chocolate
name = "Big Top chocolate ice cream carton"
desc = "A classic ice cream brand; this carton contains chocolate ice cream."
ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/chocolate
/obj/item/storage/box/ice_cream_carton/strawberry
name = "Big Top strawberry ice cream carton"
desc = "A classic ice cream brand; this carton contains strawberry ice cream."
ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/strawberry
/obj/item/storage/box/ice_cream_carton/blue
name = "Big Top blue ice cream carton"
desc = "A classic ice cream brand; this carton contains blue ice cream."
ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/blue
/obj/item/storage/box/ice_cream_carton/lemon_sorbet
name = "Big Top lemon sorbet carton"
desc = "A classic ice cream brand; this carton contains lemon sorbet."
ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/lemon_sorbet
/obj/item/storage/box/ice_cream_carton/caramel
name = "Big Top caramel ice cream carton"
desc = "A classic ice cream brand; this carton contains caramel ice cream."
ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/caramel
/obj/item/storage/box/ice_cream_carton/banana
name = "Big Top banana ice cream carton"
desc = "A classic ice cream brand; this carton contains banana ice cream."
ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/banana
/obj/item/storage/box/ice_cream_carton/orange_creamsicle
name = "Big Top orange creamsicle carton"
desc = "A classic ice cream brand; this carton contains orange creamsicle."
ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/orange_creamsicle
/obj/item/storage/box/ice_cream_carton/peach
name = "Big Top peach ice cream carton"
desc = "A classic ice cream brand; this carton contains peach ice cream."
ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/peach
/obj/item/storage/box/ice_cream_carton/cherry_chocolate
name = "Big Top cherry chocolate ice cream carton"
desc = "A classic ice cream brand; this carton contains cherry chocolate ice cream."
ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/cherry_chocolate
/obj/item/storage/box/ice_cream_carton/meat
name = "Big Top meat lover's ice cream carton"
desc = "A classic ice cream brand; this carton contains meat lover's ice cream."
ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/meat
#undef CARTON_PLAIN
#undef CARTON_VANILLA
#undef CARTON_CHOCOLATE
#undef CARTON_STRAWBERRY
#undef CARTON_BLUE
#undef CARTON_LEMON_SORBET
#undef CARTON_CARAMEL
#undef CARTON_BANANA
#undef CARTON_ORANGE_CREAMSICKLE
#undef CARTON_PEACH
#undef CARTON_CHERRY_CHOCOLATE
#undef CARTON_MEAT

18
code/modules/cargo/packs.dm
View File

@@ -2406,6 +2406,24 @@
/obj/item/reagent_containers/food/snacks/grown/cucumber)
crate_name = "food crate"
/datum/supply_pack/organic/ice_cream
name = "Big Top Ice Cream Crate"
desc = "A crate with a carton of every flavor of Big Top brand ice cream."
cost = 2500
contains = list(/obj/item/storage/box/ice_cream_carton,
/obj/item/storage/box/ice_cream_carton/vanilla,
/obj/item/storage/box/ice_cream_carton/chocolate,
/obj/item/storage/box/ice_cream_carton/strawberry,
/obj/item/storage/box/ice_cream_carton/blue,
/obj/item/storage/box/ice_cream_carton/lemon_sorbet,
/obj/item/storage/box/ice_cream_carton/caramel,
/obj/item/storage/box/ice_cream_carton/banana,
/obj/item/storage/box/ice_cream_carton/orange_creamsicle,
/obj/item/storage/box/ice_cream_carton/peach,
/obj/item/storage/box/ice_cream_carton/cherry_chocolate,
/obj/item/storage/box/ice_cream_carton/meat)
crate_name = "ice cream crate"
/datum/supply_pack/organic/vending/hydro_refills
name = "Hydroponics Vending Machines Refills"
desc = "When the clown takes all the banana seeds. Contains a NutriMax refill and an MegaSeed Servitor refill."

137
code/modules/food_and_drinks/food/snacks_frozen.dm
View File

@@ -43,6 +43,143 @@
tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1)
foodtype = FRUIT | DAIRY | SUGAR
/////////////
//ICE CREAM//
/////////////
/obj/item/reagent_containers/food/snacks/ice_cream_scoop
name = "plain ice cream scoop"
desc = "Also known as sweet cream; it still makes for a tasty treat."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_plain"
bonus_reagents = list(/datum/reagent/consumable/ice_cream = 2)
list_reagents = list(/datum/reagent/consumable/ice_cream = 10)
filling_color = "#EDF7DF"
tastes = list("ice cream" = 1)
foodtype = DAIRY | SUGAR
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/vanilla
name = "vanilla ice cream scoop"
desc = "The most commonly known ice cream flavor; it has bean and still is widely popular."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_vanilla"
bonus_reagents = list(/datum/reagent/consumable/ice_cream/vanilla = 2)
list_reagents = list(/datum/reagent/consumable/ice_cream/vanilla = 10)
filling_color = "#ECE2C5"
tastes = list("ice cream" = 1, "vanilla" = 1)
foodtype = DAIRY | SUGAR
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/chocolate
name = "chocolate ice cream scoop"
desc = "Ice cream mixed with natural cocoa; made for those who can't get enough chocolate."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_chocolate"
bonus_reagents = list(/datum/reagent/consumable/ice_cream/chocolate = 2)
list_reagents = list(/datum/reagent/consumable/ice_cream/chocolate = 10)
filling_color = "#865C32"
tastes = list("ice cream" = 1, "chocolate" = 1)
foodtype = DAIRY | SUGAR | CHOCOLATE
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/strawberry
name = "strawberry ice cream scoop"
desc = "Ice cream supposedly made with real strawberries."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_strawberry"
bonus_reagents = list(/datum/reagent/consumable/ice_cream/strawberry = 2)
list_reagents = list(/datum/reagent/consumable/ice_cream/strawberry = 10)
filling_color = "#EFB8B8"
tastes = list("ice cream" = 1, "strawberries" = 1)
foodtype = DAIRY | SUGAR | FRUIT
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/blue
name = "blue ice cream scoop"
desc = "A faintly blue ice cream flavor; it is notorious for its ability to stain."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_blue"
bonus_reagents = list(/datum/reagent/consumable/ice_cream/blue = 2)
list_reagents = list(/datum/reagent/consumable/ice_cream/blue = 10)
filling_color = "#B8C5EF"
tastes = list("ice cream" = 1, "blue" = 1)
foodtype = DAIRY | SUGAR | ALCOHOL
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/lemon_sorbet
name = "lemon sorbet scoop"
desc = "An ancient frozen treat supposedly invented by the Persians that is still enjoyed today."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_lemon sorbet"
bonus_reagents = list(/datum/reagent/consumable/ice_cream/lemon_sorbet = 2)
list_reagents = list(/datum/reagent/consumable/ice_cream/lemon_sorbet = 10)
filling_color = "#D4DB86"
tastes = list("ice cream" = 1, "lemons" = 1)
foodtype = DAIRY | SUGAR | FRUIT
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/caramel
name = "caramel ice cream scoop"
desc = "Ice cream that has been flavored with caramel; a treat for sugar lovers."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_caramel"
bonus_reagents = list(/datum/reagent/consumable/ice_cream/caramel = 2)
list_reagents = list(/datum/reagent/consumable/ice_cream/caramel = 10)
filling_color = "#BC762F"
tastes = list("ice cream" = 1, "caramel" = 1)
foodtype = DAIRY | SUGAR
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/banana
name = "banana ice cream scoop"
desc = "The ice cream of choice for clowns everywhere. Honk!"
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_banana"
bonus_reagents = list(/datum/reagent/consumable/ice_cream/banana = 2)
list_reagents = list(/datum/reagent/consumable/ice_cream/banana = 10)
filling_color = "#DEDE00"
tastes = list("ice cream" = 1, "banana" = 1)
foodtype = DAIRY | SUGAR | FRUIT
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/orange_creamsicle
name = "orange creamsicle scoop"
desc = "An ice cream flavor made after a popular popsicle flavor. It is not quite the same off the stick..."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_orangesicle"
bonus_reagents = list(/datum/reagent/consumable/ice_cream/orange_creamsicle = 2)
list_reagents = list(/datum/reagent/consumable/ice_cream/orange_creamsicle = 10)
filling_color = "#D8B258"
tastes = list("ice cream" = 1, "oranges" = 1)
foodtype = DAIRY | SUGAR | FRUIT
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/peach
name = "peach ice cream scoop"
desc = "Ice cream flavored with peaches; it is rather uncommon due to wizards buying up most of it."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_peach"
bonus_reagents = list(/datum/reagent/consumable/ice_cream/peach = 2)
list_reagents = list(/datum/reagent/consumable/ice_cream/peach = 10)
filling_color = "#CD8D68"
tastes = list("ice cream" = 1, "peaches" = 1)
foodtype = DAIRY | SUGAR | FRUIT
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/cherry_chocolate
name = "cherry chocolate ice cream scoop"
desc = "A wonderfully tangy and sweet ice cream made with coco and cherries."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_cherry chocolate"
bonus_reagents = list(/datum/reagent/consumable/ice_cream/cherry_chocolate = 2)
list_reagents = list(/datum/reagent/consumable/ice_cream/cherry_chocolate = 10)
filling_color = "#6F0000"
tastes = list("ice cream" = 1, "cherries" = 1, "chocolate" = 1)
foodtype = DAIRY | SUGAR | FRUIT | CHOCOLATE
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/meat
name = "meat lover's ice cream scoop"
desc = "Ice cream flavored with meat, because someone wanted meat in their ice cream."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_mob"
bonus_reagents = list(/datum/reagent/consumable/ice_cream/meat = 2)
list_reagents = list(/datum/reagent/consumable/ice_cream/meat = 10)
filling_color = "#BD0000"
tastes = list("ice cream" = 1, "blood" = 1)
foodtype = DAIRY | SUGAR | MICE
/////////////
//SNOWCONES//
/////////////

33
code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
View File

@@ -6,9 +6,8 @@
/datum/crafting_recipe/food/icecreamsandwich
name = "Icecream sandwich"
reqs = list(
/datum/reagent/consumable/cream = 5,
/datum/reagent/consumable/ice = 5,
/obj/item/reagent_containers/food/snacks/icecream = 1
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/vanilla = 1,
/obj/item/reagent_containers/food/snacks/cookie = 2
)
result = /obj/item/reagent_containers/food/snacks/icecreamsandwich
category = CAT_ICE
@@ -18,7 +17,7 @@
reqs = list(
/datum/reagent/consumable/bluecherryjelly = 5,
/datum/reagent/consumable/spacemountainwind = 15,
/obj/item/reagent_containers/food/snacks/icecream = 1
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/vanilla = 1
)
result = /obj/item/reagent_containers/food/snacks/spacefreezy
category = CAT_ICE
@@ -26,10 +25,9 @@
/datum/crafting_recipe/food/sundae
name ="Sundae"
reqs = list(
/datum/reagent/consumable/cream = 5,
/obj/item/reagent_containers/food/snacks/grown/cherries = 1,
/obj/item/reagent_containers/food/snacks/grown/banana = 1,
/obj/item/reagent_containers/food/snacks/icecream = 1
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/vanilla = 1
)
result = /obj/item/reagent_containers/food/snacks/sundae
category = CAT_ICE
@@ -37,11 +35,10 @@
/datum/crafting_recipe/food/honkdae
name ="Honkdae"
reqs = list(
/datum/reagent/consumable/cream = 5,
/obj/item/clothing/mask/gas/clown_hat = 1,
/obj/item/reagent_containers/food/snacks/grown/cherries = 1,
/obj/item/reagent_containers/food/snacks/grown/banana = 2,
/obj/item/reagent_containers/food/snacks/icecream = 1
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/banana = 1
)
result = /obj/item/reagent_containers/food/snacks/honkdae
category = CAT_ICE
@@ -51,7 +48,7 @@
reqs = list(
/obj/item/reagent_containers/food/snacks/cookie = 1,
/obj/item/reagent_containers/food/snacks/grown/cherries = 1,
/obj/item/reagent_containers/food/snacks/icecream = 1,
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/vanilla = 1,
/datum/reagent/consumable/cooking_oil/fish = 1
)
result = /obj/item/reagent_containers/food/snacks/taiyaki
@@ -62,9 +59,8 @@
reqs = list(
/obj/item/reagent_containers/food/snacks/cookie = 1,
/obj/item/reagent_containers/food/snacks/grown/cherries = 1,
/obj/item/reagent_containers/food/snacks/icecream = 1,
/datum/reagent/consumable/cooking_oil/fish = 1,
/datum/reagent/consumable/coco = 2
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/chocolate = 1,
/datum/reagent/consumable/cooking_oil/fish = 1
)
result = /obj/item/reagent_containers/food/snacks/taiyaki/chocolate
category = CAT_ICE
@@ -74,9 +70,8 @@
reqs = list(
/obj/item/reagent_containers/food/snacks/cookie = 1,
/obj/item/reagent_containers/food/snacks/grown/bluecherries = 1,
/obj/item/reagent_containers/food/snacks/icecream = 1,
/datum/reagent/consumable/cooking_oil/fish = 1,
/datum/reagent/consumable/berryjuice = 2
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/strawberry = 1,
/datum/reagent/consumable/cooking_oil/fish = 1
)
result = /obj/item/reagent_containers/food/snacks/taiyaki/strawberry
category = CAT_ICE
@@ -86,9 +81,8 @@
reqs = list(
/obj/item/reagent_containers/food/snacks/cookie = 1,
/obj/item/reagent_containers/food/snacks/grown/cherries = 1,
/obj/item/reagent_containers/food/snacks/icecream = 1,
/datum/reagent/consumable/cooking_oil/fish = 1,
/datum/reagent/consumable/ethanol/singulo = 2
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/blue = 1,
/datum/reagent/consumable/cooking_oil/fish = 1
)
result = /obj/item/reagent_containers/food/snacks/taiyaki/blue
category = CAT_ICE
@@ -98,9 +92,8 @@
reqs = list(
/obj/item/reagent_containers/food/snacks/cookie = 1,
/obj/item/reagent_containers/food/snacks/grown/bluecherries = 1,
/obj/item/reagent_containers/food/snacks/icecream = 1,
/obj/item/reagent_containers/food/snacks/ice_cream_scoop/meat = 1,
/datum/reagent/consumable/cooking_oil/fish = 1,
/datum/reagent/blood = 2
)
result = /obj/item/reagent_containers/food/snacks/taiyaki/mobflavor
category = CAT_ICE

105
code/modules/reagents/chemistry/reagents/food_reagents.dm
View File

@@ -945,6 +945,111 @@
color = "#D9A066" // rgb: 217, 160, 102
taste_description = "peanuts"
/datum/reagent/consumable/ice_cream
name = "Plain Ice Cream"
description = "Also known as sweet cream; it still makes for a tasty treat."
reagent_state = LIQUID //Melted ice cream, you need ice to make it solid
nutriment_factor = 1 * REAGENTS_METABOLISM
color = "#EDF7DF"
taste_description = "creamy"
var/flavor_chem = null //Chem added to flavored ice creams
var/flavor_chem_extra = null
var/flavor_chem_amount = 0.4 //How much of the flavor chem to add on metabolism
/datum/reagent/consumable/ice_cream/on_mob_life(mob/living/carbon/M)
//Add flavor chem if there is one
if(flavor_chem != null)
holder.add_reagent(flavor_chem, flavor_chem_amount)
if(flavor_chem_extra != null)
holder.add_reagent(flavor_chem_extra, flavor_chem_amount)
//Ice cream cools you down
M.adjust_bodytemperature(-10 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
//Ice cream makes you happy
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "ice cream", /datum/mood_event/ice_cream, name)
..()
/datum/reagent/consumable/ice_cream/vanilla
name = "Vanilla Ice Cream"
description = "The most commonly known ice cream flavor; it has been and still is widely popular."
color = "#ECE2C5"
flavor_chem = /datum/reagent/consumable/vanilla
/datum/reagent/consumable/ice_cream/chocolate
name = "Chocolate Ice Cream"
description = "Ice cream mixed with natural cocoa; made for those who can't get enough chocolate."
color = "#865C32"
flavor_chem = /datum/reagent/consumable/coco
taste_description = "creamy chocolate"
/datum/reagent/consumable/ice_cream/strawberry
name = "Strawberry Ice Cream"
description = "Ice cream supposedly made with real strawberries."
color = "#EFB8B8"
flavor_chem = /datum/reagent/consumable/berryjuice
taste_description = "fruity"
/datum/reagent/consumable/ice_cream/blue
name = "Blue Ice Cream"
description = "A faintly blue ice cream flavor; it is notorious for its ability to stain."
color = "#B8C5EF"
flavor_chem = /datum/reagent/consumable/ethanol/singulo
taste_description = "alcoholic"
/datum/reagent/consumable/ice_cream/lemon_sorbet
name = "Lemon Sorbet"
description = "An ancient frozen treat supposedly invented by the Persians that is still enjoyed today."
color = "#D4DB86"
flavor_chem = /datum/reagent/consumable/lemonjuice
taste_description = "sour"
/datum/reagent/consumable/ice_cream/caramel
name = "Caramel Ice Cream"
description = "Ice cream that has been flavored with caramel; a treat for sugar lovers."
color = "#BC762F"
flavor_chem = /datum/reagent/consumable/caramel
taste_description = "sweet"
/datum/reagent/consumable/ice_cream/banana
name = "Banana Ice Cream"
description = "The ice cream of choice for clowns everywhere. Honk!"
color = "#DEDE00"
flavor_chem = /datum/reagent/consumable/banana
taste_description = "fruity"
/datum/reagent/consumable/ice_cream/orange_creamsicle
name = "Orange Creamsicle"
description = "An ice cream flavor made after a popular popsicle flavor. It is not quite the same off the stick..."
color = "#D8B258"
flavor_chem = /datum/reagent/consumable/orangejuice
taste_description = "creamy fruit"
/datum/reagent/consumable/ice_cream/peach
name = "Peach Ice Cream"
description = "Ice cream flavored with peaches; it is rather uncommon due to wizards buying up most of it."
color = "#CD8D68"
flavor_chem = /datum/reagent/consumable/peachjuice
taste_description = "creamy fruit"
/datum/reagent/consumable/ice_cream/cherry_chocolate
name = "Cherry Chocolate Ice Cream"
description = "A wonderfully tangy and sweet ice cream made with coco and cherries."
color = "#6F0000"
flavor_chem = /datum/reagent/consumable/coco
flavor_chem_extra = /datum/reagent/consumable/cherryjelly
taste_description = "tangy and sweet"
/datum/reagent/consumable/ice_cream/meat
name = "Meat Lover's Ice Cream"
description = "Ice cream flavored with meat, because someone wanted meat in their ice cream."
color = "#BD0000"
flavor_chem = /datum/reagent/liquidgibs
taste_description = "meaty"
/// Gets just how much nutrition this reagent is worth for the passed mob
/datum/reagent/consumable/proc/get_nutriment_factor(mob/living/carbon/eater)
return nutriment_factor * REAGENTS_METABOLISM * 2

154
code/modules/reagents/chemistry/recipes/others.dm
View File

@@ -860,3 +860,157 @@
results = list(/datum/reagent/plastic_polymers = 10)
required_reagents = list(/datum/reagent/microplastics = 10)
required_temp = 600
/datum/chemical_reaction/ice_cream
name = /datum/reagent/consumable/ice_cream
id = /datum/reagent/consumable/ice_cream
results = list(/datum/reagent/consumable/ice_cream = 10)
required_reagents = list(/datum/reagent/consumable/cream = 5, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/sodiumchloride = 2)
required_temp = 272
is_cold_recipe = TRUE
/datum/chemical_reaction/ice_cream_vanilla
name = /datum/reagent/consumable/ice_cream/vanilla
id = /datum/reagent/consumable/ice_cream/vanilla
results = list(/datum/reagent/consumable/ice_cream/vanilla = 10)
required_reagents = list(/datum/reagent/consumable/ice_cream = 10, /datum/reagent/consumable/vanilla = 2)
/datum/chemical_reaction/ice_cream_chocolate
name = /datum/reagent/consumable/ice_cream/chocolate
id = /datum/reagent/consumable/ice_cream/chocolate
results = list(/datum/reagent/consumable/ice_cream/chocolate = 10)
required_reagents = list(/datum/reagent/consumable/ice_cream = 10, /datum/reagent/consumable/coco = 2)
/datum/chemical_reaction/ice_cream_strawberry
name = /datum/reagent/consumable/ice_cream/strawberry
id = /datum/reagent/consumable/ice_cream/strawberry
results = list(/datum/reagent/consumable/ice_cream/strawberry = 10)
required_reagents = list(/datum/reagent/consumable/ice_cream = 10, /datum/reagent/consumable/berryjuice = 2)
/datum/chemical_reaction/ice_cream_blue
name = /datum/reagent/consumable/ice_cream/blue
id = /datum/reagent/consumable/ice_cream/blue
results = list(/datum/reagent/consumable/ice_cream/blue = 10)
required_reagents = list(/datum/reagent/consumable/ice_cream = 10, /datum/reagent/consumable/ethanol/singulo = 2)
/datum/chemical_reaction/ice_cream_lemon_sorbet
name = /datum/reagent/consumable/ice_cream/lemon_sorbet
id = /datum/reagent/consumable/ice_cream/lemon_sorbet
results = list(/datum/reagent/consumable/ice_cream/lemon_sorbet = 10)
required_reagents = list(/datum/reagent/consumable/ice_cream = 10, /datum/reagent/consumable/lemonjuice = 2)
/datum/chemical_reaction/ice_cream_caramel
name = /datum/reagent/consumable/ice_cream/caramel
id = /datum/reagent/consumable/ice_cream/caramel
results = list(/datum/reagent/consumable/ice_cream/caramel = 10)
required_reagents = list(/datum/reagent/consumable/ice_cream = 10, /datum/reagent/consumable/caramel = 2)
/datum/chemical_reaction/ice_cream_banana
name = /datum/reagent/consumable/ice_cream/banana
id = /datum/reagent/consumable/ice_cream/banana
results = list(/datum/reagent/consumable/ice_cream/banana = 10)
required_reagents = list(/datum/reagent/consumable/ice_cream = 10, /datum/reagent/consumable/banana = 2)
/datum/chemical_reaction/ice_cream_orange_creamsicle
name = /datum/reagent/consumable/ice_cream/orange_creamsicle
id = /datum/reagent/consumable/ice_cream/orange_creamsicle
results = list(/datum/reagent/consumable/ice_cream/orange_creamsicle = 10)
required_reagents = list(/datum/reagent/consumable/ice_cream = 10, /datum/reagent/consumable/orangejuice = 2)
/datum/chemical_reaction/ice_cream_peach
name = /datum/reagent/consumable/ice_cream/peach
id = /datum/reagent/consumable/ice_cream/peach
results = list(/datum/reagent/consumable/ice_cream/peach = 10)
required_reagents = list(/datum/reagent/consumable/ice_cream = 10, /datum/reagent/consumable/peachjuice = 2)
/datum/chemical_reaction/ice_cream_cherry_chocolate
name = /datum/reagent/consumable/ice_cream/cherry_chocolate
id = /datum/reagent/consumable/ice_cream/cherry_chocolate
results = list(/datum/reagent/consumable/ice_cream/cherry_chocolate = 10)
required_reagents = list(/datum/reagent/consumable/ice_cream/chocolate = 10, /datum/reagent/consumable/cherryjelly = 2)
/datum/chemical_reaction/ice_cream_meat
name = /datum/reagent/consumable/ice_cream/meat
id = /datum/reagent/consumable/ice_cream/meat
results = list(/datum/reagent/consumable/ice_cream/meat = 10)
required_reagents = list(/datum/reagent/consumable/ice_cream = 10, /datum/reagent/liquidgibs = 2)
/datum/chemical_reaction/ice_cream_solidification
name = "Ice Cream Solidification"
id = "ice_cream"
required_reagents = list(/datum/reagent/consumable/ice_cream = 10, /datum/reagent/consumable/ice = 2)
mob_react = FALSE
//What scoop it will create
var/ice_cream_scoop = /obj/item/reagent_containers/food/snacks/ice_cream_scoop
/datum/chemical_reaction/ice_cream_solidification/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new ice_cream_scoop(location)
/datum/chemical_reaction/ice_cream_solidification/vanilla
name = "Vanilla Ice Cream Solidification"
id = "ice_cream_vanilla"
required_reagents = list(/datum/reagent/consumable/ice_cream/vanilla = 10, /datum/reagent/consumable/ice = 2)
ice_cream_scoop = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/vanilla
/datum/chemical_reaction/ice_cream_solidification/chocolate
name = "Chocolate Ice Cream Solidification"
id = "ice_cream_chocolate"
required_reagents = list(/datum/reagent/consumable/ice_cream/chocolate = 10, /datum/reagent/consumable/ice = 2)
ice_cream_scoop = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/chocolate
/datum/chemical_reaction/ice_cream_solidification/strawberry
name = "Strawberry Ice Cream Solidification"
id = "ice_cream_strawberry"
required_reagents = list(/datum/reagent/consumable/ice_cream/strawberry = 10, /datum/reagent/consumable/ice = 2)
ice_cream_scoop = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/strawberry
/datum/chemical_reaction/ice_cream_solidification/blue
name = "Blue Ice Cream Solidification"
id = "ice_cream_blue"
required_reagents = list(/datum/reagent/consumable/ice_cream/blue = 10, /datum/reagent/consumable/ice = 2)
ice_cream_scoop = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/blue
/datum/chemical_reaction/ice_cream_solidification/lemon_sorbet
name = "Lemon Sorbet Solidification"
id = "ice_cream_lemon_sorbet"
required_reagents = list(/datum/reagent/consumable/ice_cream/lemon_sorbet = 10, /datum/reagent/consumable/ice = 2)
ice_cream_scoop = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/lemon_sorbet
/datum/chemical_reaction/ice_cream_solidification/caramel
name = "Caramel Ice Cream Solidification"
id = "ice_cream_caramel"
required_reagents = list(/datum/reagent/consumable/ice_cream/caramel = 10, /datum/reagent/consumable/ice = 2)
ice_cream_scoop = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/caramel
/datum/chemical_reaction/ice_cream_solidification/banana
name = "Banana Ice Cream Solidification"
id = "ice_cream_banana"
required_reagents = list(/datum/reagent/consumable/ice_cream/banana = 10, /datum/reagent/consumable/ice = 2)
ice_cream_scoop = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/banana
/datum/chemical_reaction/ice_cream_solidification/orange_creamsicle
name = "Orange Creamsicle Solidification"
id = "ice_cream_orange_creamsicle"
required_reagents = list(/datum/reagent/consumable/ice_cream/orange_creamsicle = 10, /datum/reagent/consumable/ice = 2)
ice_cream_scoop = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/orange_creamsicle
/datum/chemical_reaction/ice_cream_solidification/peach
name = "Peach Ice Cream Solidification"
id = "ice_cream_peach"
required_reagents = list(/datum/reagent/consumable/ice_cream/peach = 10, /datum/reagent/consumable/ice = 2)
ice_cream_scoop = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/peach
/datum/chemical_reaction/ice_cream_solidification/cherry_chocolate
name = "Cherry Chocolate Ice Cream Solidification"
id = "ice_cream_cherry_chocolate"
required_reagents = list(/datum/reagent/consumable/ice_cream/cherry_chocolate = 10, /datum/reagent/consumable/ice = 2)
ice_cream_scoop = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/cherry_chocolate
/datum/chemical_reaction/ice_cream_solidification/meat
name = "Meat Ice Cream Solidification"
id = "ice_cream_meat"
required_reagents = list(/datum/reagent/consumable/ice_cream/meat = 10, /datum/reagent/consumable/ice = 2)
ice_cream_scoop = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/meat

BIN
icons/obj/food/containers.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
icons/obj/kitchen.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB