Adds ERP (#395)

code/game/objects/items/reagent_containers/food/condiment.dm

@@ -86,7 +86,7 @@
 		to_chat(user, SPAN_NOTICE(" You transfer [trans] units of the condiment to [target]."))
 
 /obj/item/reagent_container/food/condiment/on_reagent_change()
-	if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "hotsauce_cholula" || icon_state == "hotsauce_franks" || icon_state == "hotsauce_sriracha" || icon_state == "hotsauce_tabasco" || icon_state == "coldsauce_cole")
+	if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "hotsauce_cholula" || icon_state == "hotsauce_franks" || icon_state == "hotsauce_sriracha" || icon_state == "hotsauce_tabasco" || icon_state == "coldsauce_cole" || icon_state == "eggpowder" || icon_state == "milkpowder" || icon_state == "bjpowder" || icon_state == "ojpowder" || icon_state == "ajpowder" || icon_state == "wjpowder" || icon_state == "gjpowder" || icon_state == "pjpowder")
 		return
 	if(reagents.reagent_list.len > 0)
 		switch(reagents.get_master_reagent_id())
@@ -236,3 +236,79 @@
 /obj/item/reagent_container/food/condiment/coldsauce/Initialize()
 	. = ..()
 	reagents.add_reagent("frostoil", 60)
+
+/obj/item/reagent_container/food/condiment/juice
+	name = "Juice Packet"
+	desc = "A small packet of dehydrated fruit-juice powder. Mix with water for a 'tasty' beverage. This one appears to be missing the label indicating what flavor it is however."
+	w_class = SIZE_TINY
+	icon_state = "bjpowder"
+	amount_per_transfer_from_this = 1
+	volume = 6
+
+/obj/item/reagent_container/food/condiment/juice/orange
+	name = "Orange Juice Packet"
+	desc = "A small packet of dehydrated orange-juice powder. Mix with water for a 'tasty' beverage."
+	icon_state = "ojpowder"
+
+/obj/item/reagent_container/food/condiment/juice/orange/Initialize()
+	. = ..()
+	reagents.add_reagent("dehydrated_orange_juice", 6)
+
+/obj/item/reagent_container/food/condiment/juice/apple
+	name = "Apple Juice Packet"
+	desc = "A small packet of dehydrated apple-juice powder. Mix with water for a 'tasty' beverage."
+	icon_state = "ajpowder"
+
+/obj/item/reagent_container/food/condiment/juice/apple/Initialize()
+	. = ..()
+	reagents.add_reagent("dehydrated_apple_juice", 6)
+
+/obj/item/reagent_container/food/condiment/juice/watermelon
+	name = "Watermelon Juice Packet"
+	desc = "A small packet of dehydrated watermelon-juice powder. Mix with water for a 'tasty' beverage."
+	icon_state = "wjpowder"
+
+/obj/item/reagent_container/food/condiment/juice/watermelon/Initialize()
+	. = ..()
+	reagents.add_reagent("dehydrated_watermelon_juice", 6)
+
+/obj/item/reagent_container/food/condiment/juice/grape
+	name = "Grape Juice Packet"
+	desc = "A small packet of dehydrated grape-juice powder. Mix with water for a 'tasty' beverage."
+	icon_state = "gjpowder"
+
+/obj/item/reagent_container/food/condiment/juice/grape/Initialize()
+	. = ..()
+	reagents.add_reagent("dehydrated_grape_juice", 6)
+
+/obj/item/reagent_container/food/condiment/juice/pineapple
+	name = "Pineapple Juice Packet"
+	desc = "A small packet of dehydrated pineapple-juice powder. Mix with water for a 'tasty' beverage."
+	icon_state = "pjpowder"
+
+/obj/item/reagent_container/food/condiment/juice/pineapple/Initialize()
+	. = ..()
+	reagents.add_reagent("dehydrated_pineapple_juice", 6)
+
+/obj/item/reagent_container/food/condiment/juice/egg
+	name = "Powdered Egg Packet"
+	desc = "A small packet of dehydrated egg-whites and egg-yolk powder. Mix with water for a passable alternative to the real deal."
+	icon_state = "eggpowder"
+	volume = 12
+	w_class = SIZE_SMALL
+
+/obj/item/reagent_container/food/condiment/juice/egg/Initialize()
+	. = ..()
+	reagents.add_reagent("dehydrated_egg_powder", 12)
+
+/obj/item/reagent_container/food/condiment/juice/milk
+	name = "Dehydrated Milk Packet"
+	desc = "A small packet of dehydrated milk powder. Mix with water for a passable alternative to actual milk."
+	icon_state = "milkpowder"
+	amount_per_transfer_from_this = 1
+	volume = 12
+	w_class = SIZE_SMALL
+
+/obj/item/reagent_container/food/condiment/juice/milk/Initialize()
+	. = ..()
+	reagents.add_reagent("dehydrated_milk_powder", 12)

code/game/objects/items/reagent_containers/food/snacks.dm

@@ -567,6 +567,16 @@
 	new newegg(loc)
 	qdel(src)
 
+/obj/item/reagent_container/food/snacks/egg/dried
+	name = "reconstituted egg"
+	desc = "An egg! Or it was in another life, at least. Now it's just a sad pile of goop that might work in recipes."
+	icon_state = "honeycomb"
+	filling_color = "#FDFFD1"
+
+/obj/item/reagent_container/food/snacks/egg/dried/Initialize()
+	. = ..()
+	reagents.add_reagent("egg", 1)
+
 /obj/item/reagent_container/food/snacks/friedegg
 	name = "Fried egg"
 	desc = "A fried egg, with a touch of salt and pepper."

code/game/objects/items/storage/boxes.dm

@@ -711,7 +711,7 @@
 	icon_state = "mealpack"
 	w_class = SIZE_SMALL
 	can_hold = list()
-	storage_slots = 7
+	storage_slots = 8
 	max_w_class = 0
 	use_sound = "rip"
 	var/isopened = 0
@@ -728,8 +728,9 @@
 	//1 in 3 chance of getting a fortune cookie
 	var/cookie = rand(1,3)
 	var/matches_type = rand(1, 5)
+	var/juice_type = rand(1, 5)
 	if(cookie == 1)
-		storage_slots = 8
+		storage_slots = 9
 	new /obj/item/reagent_container/food/snacks/packaged_meal(src, main)
 	new /obj/item/reagent_container/food/snacks/packaged_meal(src, second)
 	new /obj/item/reagent_container/food/snacks/packaged_meal(src, side)
@@ -749,6 +750,17 @@
 			new /obj/item/storage/fancy/cigar/matchbook/wy_gold(src)
 		if(5)
 			new /obj/item/storage/fancy/cigar/matchbook/brown(src)
+	switch(juice_type)
+		if(1)
+			new /obj/item/reagent_container/food/condiment/juice/orange(src)
+		if(2)
+			new /obj/item/reagent_container/food/condiment/juice/apple(src)
+		if(3)
+			new /obj/item/reagent_container/food/condiment/juice/watermelon(src)
+		if(4)
+			new /obj/item/reagent_container/food/condiment/juice/grape(src)
+		if(5)
+			new /obj/item/reagent_container/food/condiment/juice/pineapple(src)
 
 /obj/item/storage/box/MRE/Initialize()
 	. = ..()
@@ -761,3 +773,14 @@
 	else if(!isopened)
 		isopened = 1
 		icon_state = "mealpackopened"
+
+/obj/item/storage/box/powderedmilk
+	name = "box of powdered milk packets"
+	desc = "It has a weird stain on it."
+
+/obj/item/storage/box/powderedmilk/fill_preset_inventory()
+	new /obj/item/reagent_container/food/condiment/juice/milk(src)
+	new /obj/item/reagent_container/food/condiment/juice/milk(src)
+	new /obj/item/reagent_container/food/condiment/juice/milk(src)
+	new /obj/item/reagent_container/food/condiment/juice/milk(src)
+	new /obj/item/reagent_container/food/condiment/juice/milk(src)

code/modules/reagents/chemistry_reactions/food_drink.dm

@@ -186,6 +186,66 @@
 	required_reagents = list("hot_ramen" = 6, "hotsauce" = 1)
 	result_amount = 6
 
+/datum/chemical_reaction/banana		//WHO DIDN'T MAKE ALL THE JUICES SUBTYPES OF A PARENT ONE AAAAAA
+	name = "Banana Juice"
+	id = "banana"
+	result = "banana"
+	required_reagents = list("dehydrated_juice" = 1, "water" = 5)
+	result_amount = 5
+
+/datum/chemical_reaction/orangejuice
+	name = "Orange Juice"
+	id = "orangejuice"
+	result = "orangejuice"
+	required_reagents = list("dehydrated_orange_juice" = 1, "water" = 5)
+	result_amount = 5
+
+/datum/chemical_reaction/applejuice
+	name = "Apple Juice"
+	id = "applejuice"
+	result = "applejuice"
+	required_reagents = list("dehydrated_apple_juice" = 1, "water" = 5)
+	result_amount = 5
+
+/datum/chemical_reaction/watermelonjuice
+	name = "Watermelon Juice"
+	id = "watermelonjuice"
+	result = "watermelonjuice"
+	required_reagents = list("dehydrated_watermelon_juice" = 1, "water" = 5)
+	result_amount = 5
+
+/datum/chemical_reaction/grapejuice
+	name = "Grape Juice"
+	id = "grapejuice"
+	result = "grapejuice"
+	required_reagents = list("dehydrated_grape_juice" = 1, "water" = 5)
+	result_amount = 5
+
+/datum/chemical_reaction/pineapplejuice
+	name = "Pineapple Juice"
+	id = "pineapplejuice"
+	result = "pineapplejuice"
+	required_reagents = list("dehydrated_pineapple_juice" = 1, "water" = 5)
+	result_amount = 5
+
+/datum/chemical_reaction/egg
+	name = "Rehydrated Egg Product"
+	id = "egg"
+	result = "egg"
+	required_reagents = list("dehydrated_egg_powder" = 1, "water" = 5)
+	result_amount = 1
+
+/datum/chemical_reaction/egg/on_reaction(datum/reagents/holder, created_volume)
+	var/location = get_turf(holder.my_atom)
+	new /obj/item/reagent_container/food/snacks/egg/dried(location)
+
+/datum/chemical_reaction/milk
+	name = "Rehydrated Milk"
+	id = "milk"
+	result = "milk"
+	required_reagents = list("dehydrated_milk_powder" = 1, "water" = 5)
+	result_amount = 5
+
 
 //*****************************************************************************************************/
 //******************************************Cocktails**************************************************/

code/modules/reagents/chemistry_reagents/drink.dm

@@ -151,6 +151,17 @@
 	description = "Made in the modern day with proper pomegranate substitute. Who uses real fruit, anyways?"
 	color = "#FF004F" // rgb: 255, 0, 79
 
+/datum/reagent/drink/pineapplejuice
+	name = "Pineapple Juice"
+	id = "pineapplejuice"
+	description = "Refreshingly citric, with a pleasant flavor."
+	color = "#FFC000" // rgb: 255, 192, 0
+
+/datum/reagent/drink/applejuice
+	name = "Apple Juice"
+	id = "applejuice"
+	description = "The pleasantly sweet taste of apples, now in liquid form."
+	color = "#f59a40" // rgb: 245, 154, 64
 
 
 //MILK//

code/modules/reagents/chemistry_reagents/food.dm

@@ -307,3 +307,83 @@
 	color = "#FFFF00"
 	chemclass = CHEM_CLASS_RARE
 	flags = REAGENT_NO_GENERATION
+
+/datum/reagent/dehydrated_juice
+	name = "Mystery Juice Powder"
+	id = "dehydrated_juice"
+	description = "Powderized fruit-juice ready to be mixed with water. Smells of artificial bananas."
+	reagent_state = SOLID
+	color = "#863333" // rgb: 175, 175, 0
+	chemclass = CHEM_CLASS_COMMON
+	properties = list(PROPERTY_NUTRITIOUS = 2)
+	flags = REAGENT_NO_GENERATION
+
+/datum/reagent/dehydrated_orange_juice
+	name = "Orange Juice Powder"
+	id = "dehydrated_orange_juice"
+	description = "Powderized orange-juice ready to be mixed with water. Smells of, surprise surprise, oranges."
+	reagent_state = SOLID
+	color = "#E78108" // rgb: 231, 129, 8
+	chemclass = CHEM_CLASS_COMMON
+	properties = list(PROPERTY_NUTRITIOUS = 2)
+	flags = REAGENT_NO_GENERATION
+
+/datum/reagent/dehydrated_apple_juice
+	name = "Apple Juice Powder"
+	id = "dehydrated_apple_juice"
+	description = "Powderized apple-juice ready to be mixed with water. Smells of, surprise surprise, apples."
+	reagent_state = SOLID
+	color = "#365E30" // rgb: 54, 94, 48
+	chemclass = CHEM_CLASS_COMMON
+	properties = list(PROPERTY_NUTRITIOUS = 2)
+	flags = REAGENT_NO_GENERATION
+
+/datum/reagent/dehydrated_watermelon_juice
+	name = "Watermelon Juice Powder"
+	id = "dehydrated_watermelon_juice"
+	description = "Powderized watermelon-juice ready to be mixed with water. Smells of, surprise surprise, watermelons."
+	reagent_state = SOLID
+	color = "#863333" // rgb: 134, 51, 51
+	chemclass = CHEM_CLASS_COMMON
+	properties = list(PROPERTY_NUTRITIOUS = 2)
+	flags = REAGENT_NO_GENERATION
+
+/datum/reagent/dehydrated_grape_juice
+	name = "Grape Juice Powder"
+	id = "dehydrated_grape_juice"
+	description = "Powderized grape-juice ready to be mixed with water. Smells of, surprise surprise, grapes."
+	reagent_state = SOLID
+	color = "#863333" // rgb: 134, 51, 51
+	chemclass = CHEM_CLASS_COMMON
+	properties = list(PROPERTY_NUTRITIOUS = 2)
+	flags = REAGENT_NO_GENERATION
+
+/datum/reagent/dehydrated_pineapple_juice
+	name = "Pineapple Juice Powder"
+	id = "dehydrated_pineapple_juice"
+	description = "Powderized pineapple-juice ready to be mixed with water. Smells of, surprise surprise, pineapples."
+	reagent_state = SOLID
+	color = "#FFC000" // rgb: 255, 192, 0
+	chemclass = CHEM_CLASS_COMMON
+	properties = list(PROPERTY_NUTRITIOUS = 2)
+	flags = REAGENT_NO_GENERATION
+
+/datum/reagent/dehydrated_egg_powder
+	name = "Powdered Egg"
+	id = "dehydrated_egg_powder"
+	description = "Powderized egg-whites and egg-yolk ready to be mixed with water."
+	reagent_state = SOLID
+	color = "#FFFFFF" // rgb: 255,255,255
+	chemclass = CHEM_CLASS_COMMON
+	properties = list(PROPERTY_NUTRITIOUS = 2)
+	flags = REAGENT_NO_GENERATION
+
+/datum/reagent/dehydrated_milk_powder
+	name = "Dehydrated Milk Powder"
+	id = "dehydrated_milk_powder"
+	description = "Dehydrated milk-product powder waiting to be mixed with water."
+	reagent_state = SOLID
+	color = "#DFDFDF" // rgb: 223, 223, 223
+	chemclass = CHEM_CLASS_COMMON
+	properties = list(PROPERTY_NUTRITIOUS = 2)
+	flags = REAGENT_NO_GENERATION

maps/map_files/golden_arrow/golden_arrow.dmm

@@ -7021,15 +7021,18 @@
 	},
 /area/golden_arrow/cryo_cells)
 "AV" = (
-/obj/structure/closet/secure_closet/freezer{
-	name = "Industrial Freezer";
-	desc = "An industrial-grade deep-freezer designed to keep ingredients within 'fresh' over the course of faster-than-light travel. Might impact the taste somewhat. Don't leave the door open too long!"
-	},
 /obj/item/reagent_container/food/condiment/sugar,
 /obj/item/reagent_container/food/condiment/enzyme,
-/obj/item/reagent_container/food/drinks/milk,
-/obj/item/reagent_container/food/drinks/milk,
-/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_container/food/snacks/flour,
+/obj/item/reagent_container/food/snacks/flour,
+/obj/item/reagent_container/food/snacks/flour,
+/obj/item/reagent_container/food/snacks/flour,
+/obj/structure/closet{
+	desc = "It's a fancy storage unit for long-life foodstuffs.";
+	name = "long-life foodstuff storage"
+	},
+/obj/item/storage/box/powderedmilk,
+/obj/item/reagent_container/food/condiment/juice/egg,
 /obj/item/reagent_container/food/snacks/flour,
 /obj/item/reagent_container/food/snacks/flour,
 /obj/item/reagent_container/food/snacks/flour,