Newfood Atomization: Frozen & Ice Cream (#10286)

* frozen

* icecream vat

* paths

beestation.dme

@@ -1415,6 +1415,7 @@
 #include "code\game\objects\items\food\donuts.dm"
 #include "code\game\objects\items\food\dough.dm"
 #include "code\game\objects\items\food\egg.dm"
+#include "code\game\objects\items\food\frozen.dm"
 #include "code\game\objects\items\food\mexican.dm"
 #include "code\game\objects\items\food\packaged.dm"
 #include "code\game\objects\items\food\pancakes.dm"
@@ -2570,7 +2571,6 @@
 #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\snacks.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_vend.dm"

code/game/objects/items/food/frozen.dm

@@ -0,0 +1,294 @@
+/obj/item/food/icecreamsandwich
+	name = "icecream sandwich"
+	desc = "Portable Ice-cream in its own packaging."
+	icon = 'icons/obj/food/frozen_treats.dmi'
+	icon_state = "icecreamsandwich"
+	w_class = WEIGHT_CLASS_TINY
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 3,
+		/datum/reagent/consumable/ice = 4
+	)
+	tastes = list("ice cream" = 1)
+	foodtypes = GRAIN | DAIRY | SUGAR
+	food_flags = FOOD_FINGER_FOOD
+
+/obj/item/food/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"
+	w_class = WEIGHT_CLASS_TINY
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 4,
+		/datum/reagent/consumable/ice = 4
+	)
+	tastes = list("ice cream" = 2, "berry" = 2)
+	foodtypes = FRUIT | DAIRY | SUGAR
+	food_flags = FOOD_FINGER_FOOD
+
+
+/obj/item/food/spacefreezy
+	name = "space freezy"
+	desc = "The best icecream in space."
+	icon = 'icons/obj/food/frozen_treats.dmi'
+	icon_state = "spacefreezy"
+	w_class = WEIGHT_CLASS_TINY
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 8,
+		/datum/reagent/consumable/bluecherryjelly = 5,
+		/datum/reagent/consumable/nutriment/vitamin = 5
+	)
+	tastes = list("blue cherries" = 2, "ice cream" = 2)
+	foodtypes = FRUIT | DAIRY | SUGAR
+
+/obj/item/food/sundae
+	name = "sundae"
+	desc = "A classic dessert."
+	icon = 'icons/obj/food/frozen_treats.dmi'
+	icon_state = "sundae"
+	w_class = WEIGHT_CLASS_SMALL
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 6,
+		/datum/reagent/consumable/banana = 5,
+		/datum/reagent/consumable/nutriment/vitamin = 2
+	)
+	tastes = list("ice cream" = 1, "banana" = 1)
+	foodtypes = FRUIT | DAIRY | SUGAR
+
+/obj/item/food/honkdae
+	name = "honkdae"
+	desc = "The clown's favorite dessert."
+	icon = 'icons/obj/food/frozen_treats.dmi'
+	icon_state = "honkdae"
+	w_class = WEIGHT_CLASS_SMALL
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 6,
+		/datum/reagent/consumable/banana = 10,
+		/datum/reagent/consumable/nutriment/vitamin = 4
+	)
+	tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1)
+	foodtypes = FRUIT | DAIRY | SUGAR
+
+/////////////
+//SNOWCONES//
+/////////////
+
+/obj/item/food/snowcones //We use this as a base for all other snowcones
+	name = "flavorless snowcone"
+	desc = "It's just shaved ice. Still fun to chew on."
+	icon = 'icons/obj/food/frozen_treats.dmi'
+	icon_state = "flavorless_sc"
+	w_class = WEIGHT_CLASS_SMALL
+	trash_type = /obj/item/reagent_containers/food/drinks/sillycup //We dont eat paper cups
+	food_reagents = list(
+		/datum/reagent/water = 11 // We dont get food for water/juices
+	)
+	tastes = list("ice" = 1, "water" = 1)
+	foodtypes = SUGAR //We use SUGAR as a base line to act in as junkfood, other wise we use fruit
+	food_flags = FOOD_FINGER_FOOD
+
+/obj/item/food/snowcones/lime
+	name = "lime snowcone"
+	desc = "Lime syrup drizzled over a snowball in a paper cup."
+	icon_state = "lime_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/limejuice = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "limes" = 5)
+	foodtypes = FRUIT
+
+/obj/item/food/snowcones/lemon
+	name = "lemon snowcone"
+	desc = "Lemon syrup drizzled over a snowball in a paper cup."
+	icon_state = "lemon_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/lemonjuice = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "lemons" = 5)
+	foodtypes = FRUIT
+
+/obj/item/food/snowcones/apple
+	name = "apple snowcone"
+	desc = "Apple syrup drizzled over a snowball in a paper cup."
+	icon_state = "amber_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/applejuice = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "apples" = 5)
+	foodtypes = FRUIT
+
+/obj/item/food/snowcones/grape
+	name = "grape snowcone"
+	desc = "Grape syrup drizzled over a snowball in a paper cup."
+	icon_state = "grape_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/grapejuice = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "grape" = 5)
+	foodtypes = FRUIT
+
+/obj/item/food/snowcones/orange
+	name = "orange snowcone"
+	desc = "Orange syrup drizzled over a snowball in a paper cup."
+	icon_state = "orange_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/orangejuice = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "orange" = 5)
+	foodtypes = FRUIT
+
+/obj/item/food/snowcones/blue
+	name = "bluecherry snowcone"
+	desc = "Bluecherry syrup drizzled over a snowball in a paper cup, how rare!"
+	icon_state = "blue_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/bluecherryjelly = 5
+	)
+	tastes = list("ice" = 1, "water" = 1, "blue" = 5, "cherries" = 5)
+	foodtypes = FRUIT
+
+/obj/item/food/snowcones/red
+	name = "cherry snowcone"
+	desc = "Cherry syrup drizzled over a snowball in a paper cup."
+	icon_state = "red_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/cherryjelly = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "red" = 5, "cherries" = 5)
+	foodtypes = FRUIT
+
+/obj/item/food/snowcones/berry
+	name = "berry snowcone"
+	desc = "Berry syrup drizzled over a snowball in a paper cup."
+	icon_state = "berry_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/berryjuice = 5, \
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "berries" = 5)
+	foodtypes = FRUIT
+
+/obj/item/food/snowcones/fruitsalad
+	name = "fruit salad snowcone"
+	desc = "A delightful mix of citrus syrups drizzled over a snowball in a paper cup."
+	icon_state = "fruitsalad_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/lemonjuice = 5,
+		/datum/reagent/consumable/limejuice = 5,
+		/datum/reagent/consumable/orangejuice = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "limes" = 5, "lemons" = 5, "citrus" = 5, "salad" = 5)
+	foodtypes = FRUIT
+
+/obj/item/food/snowcones/pineapple
+	name = "pineapple snowcone"
+	desc = "Pineapple syrup drizzled over a snowball in a paper cup."
+	icon_state = "pineapple_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/pineapplejuice = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "pineapples" = 5)
+	foodtypes = PINEAPPLE //Pineapple to allow all that like pineapple to enjoy
+
+/obj/item/food/snowcones/mime
+	name = "mime snowcone"
+	desc = "..."
+	icon_state = "mime_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/nothing = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "nothing" = 5)
+	foodtypes = SUGAR
+
+/obj/item/food/snowcones/clown
+	name = "clown snowcone"
+	desc = "Laughter drizzled over a snowball in a paper cup."
+	icon_state = "clown_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/laughter = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "jokes" = 5, "brainfreeze" = 5, "joy" = 5)
+	foodtypes = SUGAR | FRUIT
+
+/obj/item/food/snowcones/soda
+	name = "space cola snowcone"
+	desc = "Space Cola drizzled over a snowball in a paper cup."
+	icon_state = "soda_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/space_cola = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "cola" = 5)
+	foodtypes = SUGAR
+
+/obj/item/food/snowcones/spacemountainwind
+	name = "Space Mountain Wind snowcone"
+	desc = "Space Mountain Wind drizzled over a snowball in a paper cup."
+	icon_state = "mountainwind_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/spacemountainwind = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5)
+	foodtypes = SUGAR
+
+
+/obj/item/food/snowcones/pwrgame
+	name = "pwrgame snowcone"
+	desc = "Pwrgame soda drizzled over a snowball in a paper cup."
+	icon_state = "pwrgame_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/pwr_game = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "valid" = 5, "salt" = 5, "wats" = 5)
+	foodtypes = SUGAR
+
+/obj/item/food/snowcones/honey
+	name = "honey snowcone"
+	desc = "Honey drizzled over a snowball in a paper cup."
+	icon_state = "amber_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/honey = 5,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "flowers" = 5, "sweetness" = 5, "wax" = 1)
+	foodtypes = SUGAR
+
+/obj/item/food/snowcones/rainbow
+	name = "rainbow snowcone"
+	desc = "A very colorful snowball in a paper cup."
+	icon_state = "rainbow_sc"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 5,
+		/datum/reagent/consumable/laughter = 25,
+		/datum/reagent/water = 11
+	)
+	tastes = list("ice" = 1, "water" = 1, "sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3)
+	foodtypes = SUGAR

code/game/objects/items/robot/robot_items.dm

@@ -486,8 +486,8 @@
 		if(DISPENSE_LOLLIPOP_MODE)
 			L = new /obj/item/food/lollipop(T)
 		if(DISPENSE_ICECREAM_MODE)
-			L = new /obj/item/reagent_containers/food/snacks/icecream(T)
-			var/obj/item/reagent_containers/food/snacks/icecream/I = L
+			L = new /obj/item/food/icecream(T)
+			var/obj/item/food/icecream/I = L
 			I.add_ice_cream("vanilla")
 			I.desc = "Eat the ice cream."
 

code/game/objects/structures/morgue.dm

@@ -304,7 +304,7 @@ GLOBAL_LIST_EMPTY(crematoriums)
 /obj/structure/bodycontainer/crematorium/creamatorium/cremate(mob/user)
 	var/list/icecreams = new()
 	for(var/i_scream in GetAllContents(/mob/living))
-		var/obj/item/reagent_containers/food/snacks/icecream/IC = new()
+		var/obj/item/food/icecream/IC = new()
 		IC.set_cone_type("waffle")
 		IC.add_mob_flavor(i_scream)
 		icecreams += IC

code/modules/cargo/bounties/chef.dm

@@ -30,14 +30,14 @@
 	description = "Upper management has been screaming non-stop for ice cream. Please send some."
 	reward = 4000
 	required_count = 3
-	wanted_types = list(/obj/item/reagent_containers/food/snacks/icecreamsandwich)
+	wanted_types = list(/obj/item/food/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)
+	wanted_types = list(/obj/item/food/strawberryicecreamsandwich)
 
 /datum/bounty/item/chef/bread
 	name = "Bread"