Ports MREs from Baystation (#6424)

* Ports MREs from Baystation

- Ports MREs from Baystation
- Adds an 'Emergency ration' that contains liquidfood rations
- Two new ration packs that have the new rations.

* Placates travis

* Lynxlog

* Adds liquidprotein rations

* Sacrifice for travis

* Changes desc

* Fixing missing filling in crayon paste

* Fixes missing side for random rations

* Renames Paste Supplypack

* aaaaa minor error

* Slight organization

* Fixes some errors

* Why am I like this

code/datums/supplypacks/misc.dm

@@ -143,4 +143,30 @@
 			)
 	cost = 25
 	containertype = /obj/structure/closet/crate
-	containername = "Glucose Hypo Crate"
+	containername = "Glucose Hypo Crate"
+
+/datum/supply_pack/misc/mre_rations
+	num_contained = 6
+	name = "Emergency - MREs"
+	contains = list(/obj/item/weapon/storage/mre,
+					/obj/item/weapon/storage/mre/menu2,
+					/obj/item/weapon/storage/mre/menu3,
+					/obj/item/weapon/storage/mre/menu4,
+					/obj/item/weapon/storage/mre/menu5,
+					/obj/item/weapon/storage/mre/menu6,
+					/obj/item/weapon/storage/mre/menu7,
+					/obj/item/weapon/storage/mre/menu8,
+					/obj/item/weapon/storage/mre/menu9,
+					/obj/item/weapon/storage/mre/menu10)
+	cost = 50
+	containertype = /obj/structure/closet/crate/freezer
+	containername = "ready to eat rations"
+
+/datum/supply_pack/misc/paste_rations
+	name = "Emergency - Paste"
+	contains = list(
+			/obj/item/weapon/storage/mre/menu11 = 2
+			)
+	cost = 25
+	containertype = /obj/structure/closet/crate/freezer
+	containername = "emergency rations"

code/game/objects/items/trash.dm

@@ -76,6 +76,10 @@
 	name = "\improper \"LiquidFood\" ration"
 	icon_state = "liquidfood"
 
+/obj/item/trash/liquidprotein
+	name = "\improper \"LiquidProtein\" ration"
+	icon_state = "liquidprotein"
+
 /obj/item/trash/tastybread
 	name = "bread tube"
 	icon_state = "tastybread"

code/game/objects/items/weapons/storage/fancy.dm

@@ -67,6 +67,7 @@
 	item_state = "candlebox5"
 	throwforce = 2
 	slot_flags = SLOT_BELT
+	max_storage_space = ITEMSIZE_COST_SMALL * 5
 	starts_with = list(/obj/item/weapon/flame/candle = 5)
 
 /obj/item/weapon/storage/fancy/whitecandle_box
@@ -78,6 +79,7 @@
 	item_state = "whitecandlebox5"
 	throwforce = 2
 	slot_flags = SLOT_BELT
+	max_storage_space = ITEMSIZE_COST_SMALL * 5
 	starts_with = list(/obj/item/weapon/flame/candle/white = 5)
 
 /obj/item/weapon/storage/fancy/blackcandle_box
@@ -89,6 +91,7 @@
 	item_state = "blackcandlebox5"
 	throwforce = 2
 	slot_flags = SLOT_BELT
+	max_storage_space = ITEMSIZE_COST_SMALL * 5
 	starts_with = list(/obj/item/weapon/flame/candle/black = 5)
 
 
@@ -179,6 +182,21 @@
 				return
 	..()
 
+/*
+ * Cracker Packet
+ */
+
+/obj/item/weapon/storage/fancy/crackers
+	name = "\improper Getmore Crackers"
+	icon = 'icons/obj/food.dmi'
+	icon_state = "crackerbox"
+	icon_type = "cracker"
+	max_storage_space = ITEMSIZE_COST_TINY * 6
+	max_w_class = ITEMSIZE_TINY
+	w_class = ITEMSIZE_SMALL
+	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/cracker)
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/cracker = 6)
+
 ////////////
 //CIG PACK//
 ////////////

code/game/objects/items/weapons/storage/mre.dm

@@ -0,0 +1,276 @@
+/*
+MRE Stuff
+ */
+
+/obj/item/weapon/storage/mre
+	name = "standard MRE"
+	desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "mre"
+	max_storage_space = ITEMSIZE_COST_SMALL * 6
+	max_w_class = ITEMSIZE_SMALL
+	var/opened = FALSE
+	var/meal_desc = "This one is menu 1, meat pizza."
+	starts_with = list(
+	/obj/item/weapon/storage/mrebag,
+	/obj/item/weapon/storage/mrebag/side,
+	/obj/item/weapon/storage/mrebag/dessert,
+	/obj/item/weapon/storage/fancy/crackers,
+	/obj/random/mre/spread,
+	/obj/random/mre/drink,
+	/obj/random/mre/sauce,
+	/obj/item/weapon/material/kitchen/utensil/spoon/plastic
+	)
+
+/obj/item/weapon/storage/mre/examine(mob/user)
+	. = ..()
+	to_chat(user, meal_desc)
+
+/obj/item/weapon/storage/mre/update_icon()
+	if(opened)
+		icon_state = "[initial(icon_state)][opened]"
+	. = ..()
+
+/obj/item/weapon/storage/mre/attack_self(mob/user)
+	open(user)
+
+/obj/item/weapon/storage/mre/open(mob/user)
+	if(!opened)
+		to_chat(usr, "<span class='notice'>You tear open the bag, breaking the vacuum seal.</span>")
+		opened = 1
+		update_icon()
+	. = ..()
+
+/obj/item/weapon/storage/mre/menu2
+	meal_desc = "This one is menu 2, margherita."
+	starts_with = list(
+	/obj/item/weapon/storage/mrebag/menu2,
+	/obj/item/weapon/storage/mrebag/side,
+	/obj/item/weapon/storage/mrebag/dessert,
+	/obj/item/weapon/storage/fancy/crackers,
+	/obj/random/mre/spread,
+	/obj/random/mre/drink,
+	/obj/random/mre/sauce,
+	/obj/item/weapon/material/kitchen/utensil/spoon/plastic
+	)
+
+/obj/item/weapon/storage/mre/menu3
+	meal_desc = "This one is menu 3, vegetable pizza."
+	starts_with = list(
+	/obj/item/weapon/storage/mrebag/menu3,
+	/obj/item/weapon/storage/mrebag/side,
+	/obj/item/weapon/storage/mrebag/dessert,
+	/obj/item/weapon/storage/fancy/crackers,
+	/obj/random/mre/spread,
+	/obj/random/mre/drink,
+	/obj/random/mre/sauce,
+	/obj/item/weapon/material/kitchen/utensil/spoon/plastic
+	)
+
+/obj/item/weapon/storage/mre/menu4
+	meal_desc = "This one is menu 4, hamburger."
+	starts_with = list(
+	/obj/item/weapon/storage/mrebag/menu4,
+	/obj/item/weapon/storage/mrebag/side,
+	/obj/item/weapon/storage/mrebag/dessert,
+	/obj/item/weapon/storage/fancy/crackers,
+	/obj/random/mre/spread,
+	/obj/random/mre/drink,
+	/obj/random/mre/sauce,
+	/obj/item/weapon/material/kitchen/utensil/spoon/plastic
+	)
+
+/obj/item/weapon/storage/mre/menu5
+	meal_desc = "This one is menu 5, taco."
+	starts_with = list(
+	/obj/item/weapon/storage/mrebag/menu5,
+	/obj/item/weapon/storage/mrebag/side,
+	/obj/item/weapon/storage/mrebag/dessert,
+	/obj/item/weapon/storage/fancy/crackers,
+	/obj/random/mre/spread,
+	/obj/random/mre/drink,
+	/obj/random/mre/sauce,
+	/obj/item/weapon/material/kitchen/utensil/spoon/plastic
+	)
+
+/obj/item/weapon/storage/mre/menu6
+	meal_desc = "This one is menu 6, meatbread."
+	starts_with = list(
+	/obj/item/weapon/storage/mrebag/menu6,
+	/obj/item/weapon/storage/mrebag/side,
+	/obj/item/weapon/storage/mrebag/dessert,
+	/obj/item/weapon/storage/fancy/crackers,
+	/obj/random/mre/spread,
+	/obj/random/mre/drink,
+	/obj/random/mre/sauce,
+	/obj/item/weapon/material/kitchen/utensil/spoon/plastic
+	)
+
+/obj/item/weapon/storage/mre/menu7
+	meal_desc = "This one is menu 7, salad."
+	starts_with = list(
+	/obj/item/weapon/storage/mrebag/menu7,
+	/obj/item/weapon/storage/mrebag/side,
+	/obj/item/weapon/storage/mrebag/dessert,
+	/obj/item/weapon/storage/fancy/crackers,
+	/obj/random/mre/spread,
+	/obj/random/mre/drink,
+	/obj/random/mre/sauce,
+	/obj/item/weapon/material/kitchen/utensil/spoon/plastic
+	)
+
+/obj/item/weapon/storage/mre/menu8
+	meal_desc = " This one is menu 8, hot chili."
+	starts_with = list(
+	/obj/item/weapon/storage/mrebag/menu8,
+	/obj/item/weapon/storage/mrebag/side,
+	/obj/item/weapon/storage/mrebag/dessert,
+	/obj/item/weapon/storage/fancy/crackers,
+	/obj/random/mre/spread,
+	/obj/random/mre/drink,
+	/obj/random/mre/sauce,
+	/obj/item/weapon/material/kitchen/utensil/spoon/plastic
+	)
+
+/obj/item/weapon/storage/mre/menu9
+	name = "vegan MRE"
+	meal_desc = "This one is menu 9, boiled rice (skrell-safe)."
+	icon_state = "vegmre"
+	starts_with = list(
+	/obj/item/weapon/storage/mrebag/menu9,
+	/obj/item/weapon/storage/mrebag/side,
+	/obj/item/weapon/storage/mrebag/dessert/menu9,
+	/obj/item/weapon/storage/fancy/crackers,
+	/obj/random/mre/spread/vegan,
+	/obj/random/mre/drink,
+	/obj/random/mre/sauce/vegan,
+	/obj/item/weapon/material/kitchen/utensil/spoon/plastic
+	)
+
+/obj/item/weapon/storage/mre/menu10
+	name = "protein MRE"
+	meal_desc = "This one is menu 10, protein."
+	icon_state = "meatmre"
+	starts_with = list(
+	/obj/item/weapon/storage/mrebag/menu10,
+	/obj/item/weapon/storage/mrebag/menu10,
+	/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,
+	/obj/item/weapon/reagent_containers/food/condiment/small/packet/protein,
+	/obj/random/mre/sauce/sugarfree,
+	/obj/item/weapon/material/kitchen/utensil/spoon/plastic
+	)
+
+/obj/item/weapon/storage/mre/menu11
+	name = "emergency MRE"
+	meal_desc = "This one is menu 11, nutriment paste. Only for emergencies."
+	icon_state = "crayonmre"
+	starts_with = list(
+	/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
+	/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
+	/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
+	/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
+	/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
+	/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
+	)
+
+/obj/item/weapon/storage/mre/menu12
+	name = "crayon MRE"
+	meal_desc = "This one doesn't have a menu listing. How very odd."
+	icon_state = "crayonmre"
+	starts_with = list(
+	/obj/item/weapon/storage/fancy/crayons,
+	/obj/item/weapon/storage/mrebag/dessert/menu11,
+	/obj/random/mre/sauce/crayon,
+	/obj/random/mre/sauce/crayon,
+	/obj/random/mre/sauce/crayon
+	)
+
+/obj/item/weapon/storage/mre/random
+	meal_desc = "The menu label is faded out."
+	starts_with = list(
+	/obj/random/mre/main,
+	/obj/item/weapon/storage/mrebag/side,
+	/obj/item/weapon/storage/mrebag/dessert,
+	/obj/item/weapon/storage/fancy/crackers,
+	/obj/random/mre/spread,
+	/obj/random/mre/drink,
+	/obj/random/mre/sauce,
+	/obj/item/weapon/material/kitchen/utensil/spoon/plastic
+	)
+
+/obj/item/weapon/storage/mrebag
+	name = "main course"
+	desc = "A vacuum-sealed bag containing the MRE's main course. Self-heats when opened."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "pouch_medium"
+	storage_slots = 1
+	w_class = ITEMSIZE_SMALL
+	max_w_class = ITEMSIZE_SMALL
+	var/opened = FALSE
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza/filled)
+
+/obj/item/weapon/storage/mrebag/Initialize()
+	. = ..()
+
+/obj/item/weapon/storage/mrebag/update_icon()
+	if(opened)
+		icon_state = "[initial(icon_state)][opened]"
+	. = ..()
+
+/obj/item/weapon/storage/mrebag/attack_self(mob/user)
+	open(user)
+
+/obj/item/weapon/storage/mrebag/open(mob/user)
+	if(!opened)
+		to_chat(usr, "<span class='notice'>The pouch heats up as you break the vaccum seal.</span>")
+		opened = 1
+		update_icon()
+	. = ..()
+
+/obj/item/weapon/storage/mrebag/menu2
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/slice/margherita/filled)
+
+/obj/item/weapon/storage/mrebag/menu3
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza/filled)
+
+/obj/item/weapon/storage/mrebag/menu4
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeyburger)
+
+/obj/item/weapon/storage/mrebag/menu5
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/taco)
+
+/obj/item/weapon/storage/mrebag/menu6
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled)
+
+/obj/item/weapon/storage/mrebag/menu7
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/tossedsalad)
+
+/obj/item/weapon/storage/mrebag/menu8
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/hotchili)
+
+/obj/item/weapon/storage/mrebag/menu9
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/boiledrice)
+
+/obj/item/weapon/storage/mrebag/menu10
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/meatcube)
+
+/obj/item/weapon/storage/mrebag/side
+	name = "side dish"
+	desc = "A vacuum-sealed bag containing the MRE's side dish. Self-heats when opened."
+	icon_state = "pouch_small"
+	starts_with = list(/obj/random/mre/side)
+
+/obj/item/weapon/storage/mrebag/side/menu10
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/meatcube)
+
+/obj/item/weapon/storage/mrebag/dessert
+	name = "dessert"
+	desc = "A vacuum-sealed bag containing the MRE's dessert."
+	icon_state = "pouch_small"
+	starts_with = list(/obj/random/mre/dessert)
+
+/obj/item/weapon/storage/mrebag/dessert/menu9
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit)
+
+/obj/item/weapon/storage/mrebag/dessert/menu11
+	starts_with = list(/obj/item/weapon/pen/crayon/rainbow)

code/game/objects/random/misc.dm

@@ -540,3 +540,150 @@
 	var/possible_object_paths = list(/obj/item/weapon/paper/carbon/cursedform)
 	possible_object_paths |= subtypesof(/obj/item/clothing/head/psy_crown)
 	return pick(possible_object_paths)
+
+//Random MRE stuff
+
+/obj/random/mre
+	name = "random MRE"
+	desc = "This is a random single MRE."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "mre"
+	drop_get_turf = FALSE
+
+/obj/random/mre/item_to_spawn()
+	return pick(/obj/item/weapon/storage/mre,
+				/obj/item/weapon/storage/mre/menu2,
+				/obj/item/weapon/storage/mre/menu3,
+				/obj/item/weapon/storage/mre/menu4,
+				/obj/item/weapon/storage/mre/menu5,
+				/obj/item/weapon/storage/mre/menu6,
+				/obj/item/weapon/storage/mre/menu7,
+				/obj/item/weapon/storage/mre/menu8,
+				/obj/item/weapon/storage/mre/menu9,
+				/obj/item/weapon/storage/mre/menu10)
+
+
+/obj/random/mre/main
+	name = "random MRE main course"
+	desc = "This is a random main course for MREs."
+	icon_state = "pouch"
+	drop_get_turf = FALSE
+
+/obj/random/mre/main/item_to_spawn()
+	return pick(/obj/item/weapon/storage/mrebag,
+				/obj/item/weapon/storage/mrebag/menu2,
+				/obj/item/weapon/storage/mrebag/menu3,
+				/obj/item/weapon/storage/mrebag/menu4,
+				/obj/item/weapon/storage/mrebag/menu5,
+				/obj/item/weapon/storage/mrebag/menu6,
+				/obj/item/weapon/storage/mrebag/menu7,
+				/obj/item/weapon/storage/mrebag/menu8)
+
+/obj/random/mre/side
+	name = "random MRE side dish"
+	desc = "This is a random side dish for MREs."
+	icon_state = "pouch"
+	drop_get_turf = FALSE
+
+/obj/random/mre/side/item_to_spawn()
+	return pick(/obj/item/weapon/reagent_containers/food/snacks/tossedsalad,
+				/obj/item/weapon/reagent_containers/food/snacks/boiledrice,
+				/obj/item/weapon/reagent_containers/food/snacks/poppypretzel,
+				/obj/item/weapon/reagent_containers/food/snacks/twobread,
+				/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast)
+
+/obj/random/mre/dessert
+	name = "random MRE dessert"
+	desc = "This is a random dessert for MREs."
+	icon_state = "pouch"
+	drop_get_turf = FALSE
+
+/obj/random/mre/dessert/item_to_spawn()
+	return pick(/obj/item/weapon/reagent_containers/food/snacks/candy,
+				/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,
+				/obj/item/weapon/reagent_containers/food/snacks/donut/normal,
+				/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly,
+				/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
+				/obj/item/weapon/reagent_containers/food/snacks/cookie)
+
+/obj/random/mre/dessert/vegan
+	name = "random vegan MRE dessert"
+	desc = "This is a random vegan dessert for MREs."
+
+/obj/random/mre/dessert/vegan/item_to_spawn()
+	return pick(/obj/item/weapon/reagent_containers/food/snacks/candy,
+				/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
+				/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly,
+				/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit)
+
+/obj/random/mre/drink
+	name = "random MRE drink"
+	desc = "This is a random drink for MREs."
+	icon_state = "packet"
+	drop_get_turf = FALSE
+
+/obj/random/mre/drink/item_to_spawn()
+	return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/coffee,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/tea,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/cocoa,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/grape,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/orange,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/watermelon,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/apple)
+
+/obj/random/mre/spread
+	name = "random MRE spread"
+	desc = "This is a random spread packet for MREs."
+	icon_state = "packet"
+	drop_get_turf = FALSE
+
+/obj/random/mre/spread/item_to_spawn()
+	return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/jelly,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/honey)
+
+/obj/random/mre/spread/vegan
+	name = "random vegan MRE spread"
+	desc = "This is a random vegan spread packet for MREs"
+
+/obj/random/mre/spread/vegan/item_to_spawn()
+	return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/jelly)
+
+/obj/random/mre/sauce
+	name = "random MRE sauce"
+	desc = "This is a random sauce packet for MREs."
+	icon_state = "packet"
+	drop_get_turf = FALSE
+
+/obj/random/mre/sauce/item_to_spawn()
+	return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/sugar,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/capsaicin,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/ketchup,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/mayo,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/soy)
+
+/obj/random/mre/sauce/vegan/item_to_spawn()
+	return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/sugar,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/soy)
+
+/obj/random/mre/sauce/sugarfree/item_to_spawn()
+	return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/capsaicin,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/ketchup,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/mayo,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/soy)
+
+/obj/random/mre/sauce/crayon/item_to_spawn()
+	return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/generic,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/red,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/orange,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/yellow,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/green,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/blue,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/purple,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/grey,
+				/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/brown)

code/game/objects/structures/crates_lockers/crates.dm

@@ -343,7 +343,7 @@
 	desc = "A crate of emergency rations."
 
 	starts_with = list(
-		/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 4)
+		/obj/random/mre = 6)
 
 
 /obj/structure/closet/crate/bin

code/modules/food/food/condiment.dm

@@ -182,6 +182,198 @@
 	. = ..()
 	reagents.add_reagent("sugar", 20)
 
+//MRE condiments and drinks.
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet
+	icon_state = "packet_small"
+	w_class = ITEMSIZE_TINY
+	possible_transfer_amounts = "1;5;10"
+	amount_per_transfer_from_this = 1
+	volume = 5
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt
+	name = "salt packet"
+	desc = "Contains 5u of table salt."
+	icon_state = "packet_small_white"
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt/Initialize()
+	. = ..()
+	reagents.add_reagent("sodiumchloride", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper
+	name = "pepper packet"
+	desc = "Contains 5u of black pepper."
+	icon_state = "packet_small_black"
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper/Initialize()
+	. = ..()
+	reagents.add_reagent("blackpepper", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/sugar
+	name = "sugar packet"
+	desc = "Contains 5u of refined sugar."
+	icon_state = "packet_small_white"
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/sugar/Initialize()
+	. = ..()
+	reagents.add_reagent("sugar", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/jelly
+	name = "jelly packet"
+	desc = "Contains 10u of cherry jelly. Best used for spreading on crackers."
+	icon_state = "packet_medium"
+	volume = 10
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/jelly/Initialize()
+	. = ..()
+	reagents.add_reagent("cherryjelly", 10)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/honey
+	name = "honey packet"
+	desc = "Contains 10u of honey."
+	icon_state = "packet_medium"
+	volume = 10
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/honey/Initialize()
+	. = ..()
+	reagents.add_reagent("honey", 10)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/capsaicin
+	name = "hot sauce packet"
+	desc = "Contains 5u of hot sauce. Enjoy in moderation."
+	icon_state = "packet_small_red"
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/capsaicin/Initialize()
+	. = ..()
+	reagents.add_reagent("capsaicin", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/ketchup
+	name = "ketchup packet"
+	desc = "Contains 5u of ketchup."
+	icon_state = "packet_small_red"
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/ketchup/Initialize()
+	. = ..()
+	reagents.add_reagent("ketchup", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/mayo
+	name = "mayonnaise packet"
+	desc = "Contains 5u of mayonnaise."
+	icon_state = "packet_small_white"
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/mayo/Initialize()
+	. = ..()
+	reagents.add_reagent("mayo", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/soy
+	name = "soy sauce packet"
+	desc = "Contains 5u of soy sauce."
+	icon_state = "packet_small_black"
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/soy/Initialize()
+	. = ..()
+	reagents.add_reagent("soysauce", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/coffee
+	name = "coffee powder packet"
+	desc = "Contains 5u of coffee powder. Mix with 25u of water and heat."
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/coffee/Initialize()
+	. = ..()
+	reagents.add_reagent("coffeepowder", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/tea
+	name = "tea powder packet"
+	desc = "Contains 5u of black tea powder. Mix with 25u of water and heat."
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/tea/Initialize()
+	. = ..()
+	reagents.add_reagent("tea", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/cocoa
+	name = "cocoa powder packet"
+	desc = "Contains 5u of cocoa powder. Mix with 25u of water and heat."
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/cocoa/Initialize()
+	. = ..()
+	reagents.add_reagent("coco", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/grape
+	name = "grape juice powder packet"
+	desc = "Contains 5u of powdered grape juice. Mix with 15u of water."
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/grape/Initialize()
+	. = ..()
+	reagents.add_reagent("instantgrape", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/orange
+	name = "orange juice powder packet"
+	desc = "Contains 5u of powdered orange juice. Mix with 15u of water."
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/orange/Initialize()
+	. = ..()
+	reagents.add_reagent("instantorange", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/watermelon
+	name = "watermelon juice powder packet"
+	desc = "Contains 5u of powdered watermelon juice. Mix with 15u of water."
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/watermelon/Initialize()
+	. = ..()
+	reagents.add_reagent("instantwatermelon", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/apple
+	name = "apple juice powder packet"
+	desc = "Contains 5u of powdered apple juice. Mix with 15u of water."
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/apple/Initialize()
+	. = ..()
+	reagents.add_reagent("instantapple", 5)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/protein
+	name = "protein powder packet"
+	desc = "Contains 10u of powdered protein. Mix with 20u of water."
+	icon_state = "packet_medium"
+	volume = 10
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/protein/Initialize()
+	. = ..()
+	reagents.add_reagent("protein", 10)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon
+	name = "crayon powder packet"
+	desc = "Contains 10u of powdered crayon. Mix with 30u of water."
+	volume = 10
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/generic/Initialize()
+	. = ..()
+	reagents.add_reagent("crayon_dust", 10)
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/red/Initialize()
+	. = ..()
+	reagents.add_reagent("crayon_dust_red", 10)
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/orange/Initialize()
+	. = ..()
+	reagents.add_reagent("crayon_dust_orange", 10)
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/yellow/Initialize()
+	. = ..()
+	reagents.add_reagent("crayon_dust_yellow", 10)
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/green/Initialize()
+	. = ..()
+	reagents.add_reagent("crayon_dust_green", 10)
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/blue/Initialize()
+	. = ..()
+	reagents.add_reagent("crayon_dust_blue", 10)
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/purple/Initialize()
+	. = ..()
+	reagents.add_reagent("crayon_dust_purple", 10)
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/grey/Initialize()
+	. = ..()
+	reagents.add_reagent("crayon_dust_grey", 10)
+/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/brown/Initialize()
+	. = ..()
+	reagents.add_reagent("crayon_dust_brown", 10)
+
+//End of MRE stuff.
+
 /obj/item/weapon/reagent_containers/food/condiment/flour
 	name = "flour sack"
 	desc = "A big bag of flour. Good for baking!"

code/modules/food/food/snacks.dm

@@ -21,12 +21,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/Initialize()
 	. = ..()
 	if(nutriment_amt)
-		reagents.add_reagent("nutriment",nutriment_amt,nutriment_desc)
+		reagents.add_reagent("nutriment",(nutriment_amt*2),nutriment_desc)
-
-/obj/item/weapon/reagent_containers/food/snacks/Initialize()
-	. = ..()
-	if(nutriment_amt)
-		reagents.add_reagent("nutriment", nutriment_amt)
 
 	//Placeholder for effect that trigger on eating that aren't tied to reagents.
 /obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/M)
@@ -3072,6 +3067,7 @@
 	filling_color = "#F5DEB8"
 	center_of_mass = list("x"=16, "y"=6)
 	nutriment_desc = list("salt" = 1, "cracker" = 2)
+	w_class = ITEMSIZE_TINY
 	nutriment_amt = 1
 
 
@@ -3722,6 +3718,33 @@
 	reagents.add_reagent("iron", 3)
 	bitesize = 4
 
+/obj/item/weapon/reagent_containers/food/snacks/liquidprotein
+	name = "\improper LiquidProtein Ration"
+	desc = "A variant of the liquidfood ration, designed for obligate carnivore species. Only barely more appealing than regular liquidfood. Should this be crunchy?"
+	icon_state = "liquidprotein"
+	trash = /obj/item/trash/liquidprotein
+	filling_color = "#A8A8A8"
+	survivalfood = TRUE
+	center_of_mass = list("x"=16, "y"=15)
+
+/obj/item/weapon/reagent_containers/food/snacks/liquidprotein/Initialize()
+	..()
+	reagents.add_reagent("protein", 30)
+	reagents.add_reagent("iron", 3)
+	bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/meatcube
+	name = "cubed meat"
+	desc = "Fried, salted lean meat compressed into a cube. Not very appetizing."
+	icon_state = "meatcube"
+	filling_color = "#7a3d11"
+	center_of_mass = list("x"=16, "y"=16)
+
+/obj/item/weapon/reagent_containers/food/snacks/meatcube/Initialize()
+	. = ..()
+	reagents.add_reagent("protein", 15)
+	bitesize = 3
+
 /obj/item/weapon/reagent_containers/food/snacks/tastybread
 	name = "bread tube"
 	desc = "Bread in a tube. Chewy...and surprisingly tasty."

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -142,6 +142,24 @@
 	if(!istype(T, /turf/space))
 		new /obj/effect/decal/cleanable/flour(T)
 
+/datum/reagent/nutriment/coffee
+	name = "Coffee Powder"
+	id = "coffeepowder"
+	description = "A bitter powder made by grinding coffee beans."
+	taste_description = "bitterness"
+	taste_mult = 1.3
+	nutriment_factor = 1
+	color = "#482000"
+
+/datum/reagent/nutriment/tea
+	name = "Tea Powder"
+	id = "teapowder"
+	description = "A dark, tart powder made from black tea leaves."
+	taste_description = "tartness"
+	taste_mult = 1.3
+	nutriment_factor = 1
+	color = "#101000"
+
 /datum/reagent/nutriment/coco
 	name = "Coco Powder"
 	id = "coco"
@@ -152,6 +170,41 @@
 	nutriment_factor = 5
 	color = "#302000"
 
+/datum/reagent/nutriment/instantjuice
+	name = "Juice Powder"
+	id = "instantjuice"
+	description = "Dehydrated, powdered juice of some kind."
+	taste_mult = 1.3
+	nutriment_factor = 1
+
+/datum/reagent/nutriment/instantjuice/grape
+	name = "Grape Juice Powder"
+	id = "instantgrape"
+	description = "Dehydrated, powdered grape juice."
+	taste_description = "dry grapes"
+	color = "#863333"
+
+/datum/reagent/nutriment/instantjuice/orange
+	name = "Orange Juice Powder"
+	id = "instantorange"
+	description = "Dehydrated, powdered orange juice."
+	taste_description = "dry oranges"
+	color = "#e78108"
+
+/datum/reagent/nutriment/instantjuice/watermelon
+	name = "Watermelon Juice Powder"
+	id = "instantwatermelon"
+	description = "Dehydrated, powdered watermelon juice."
+	taste_description = "dry sweet watermelon"
+	color = "#b83333"
+
+/datum/reagent/nutriment/instantjuice/apple
+	name = "Apple Juice Powder"
+	id = "instantapple"
+	description = "Dehydrated, powdered apple juice."
+	taste_description = "dry sweet apples"
+	color = "#c07c40"
+
 /datum/reagent/nutriment/soysauce
 	name = "Soysauce"
 	id = "soysauce"

code/modules/reagents/Chemistry-Recipes.dm

@@ -1183,6 +1183,20 @@
 		new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
 	return
 
+/datum/chemical_reaction/drinks/coffee
+	name = "Coffee"
+	id = "coffee"
+	result = "coffee"
+	required_reagents = list("water" = 5, "coffeepowder" = 1)
+	result_amount = 5
+
+/datum/chemical_reaction/drinks/tea
+	name = "Black tea"
+	id = "tea"
+	result = "tea"
+	required_reagents = list("water" = 5, "teapowder" = 1)
+	result_amount = 5
+
 /datum/chemical_reaction/drinks/hot_coco
 	name = "Hot Coco"
 	id = "hot_coco"
@@ -1197,6 +1211,34 @@
 	required_reagents = list("soymilk" = 4, "sacid" = 1)
 	result_amount = 5
 
+/datum/chemical_reaction/drinks/grapejuice
+	name = "Grape Juice"
+	id = "grapejuice"
+	result = "grapejuice"
+	required_reagents = list("water" = 3, "instantgrape" = 1)
+	result_amount = 3
+
+/datum/chemical_reaction/drinks/orangejuice
+	name = "Orange Juice"
+	id = "orangejuice"
+	result = "orangejuice"
+	required_reagents = list("water" = 3, "instantorange" = 1)
+	result_amount = 3
+
+/datum/chemical_reaction/drinks/watermelonjuice
+	name = "Watermelon Juice"
+	id = "watermelonjuice"
+	result = "watermelonjuice"
+	required_reagents = list("water" = 3, "instantwatermelon" = 1)
+	result_amount = 3
+
+/datum/chemical_reaction/drinks/applejuice
+	name = "Apple Juice"
+	id = "applejuice"
+	result = "applejuice"
+	required_reagents = list("water" = 3, "instantapple" = 1)
+	result_amount = 3
+
 /datum/chemical_reaction/food/ketchup
 	name = "Ketchup"
 	id = "ketchup"

html/changelogs/Novacat - MREs.yml

@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Novacat
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Ports MREs from Baystation, and adds a few supply crates with them to cargo."
+  - rscadd: "Adds liquidprotein rations, currently only found in emergency MREs."

polaris.dme

@@ -1048,6 +1048,7 @@
 #include "code\game\objects\items\weapons\storage\laundry_basket.dm"
 #include "code\game\objects\items\weapons\storage\lockbox.dm"
 #include "code\game\objects\items\weapons\storage\misc.dm"
+#include "code\game\objects\items\weapons\storage\mre.dm"
 #include "code\game\objects\items\weapons\storage\quickdraw.dm"
 #include "code\game\objects\items\weapons\storage\secure.dm"
 #include "code\game\objects\items\weapons\storage\storage.dm"