Merge branch 'master' into ship_and_stuff

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm

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

@@ -327,6 +327,15 @@
 	condiment_desc = "A delicious oil used in cooking. Made from corn."
 	condiment_icon_state = "oliveoil"
 
+/decl/reagent/nutriment/triglyceride/oil/peanut
+	name = "Peanut Oil"
+	description = "A flavourful oil derived from roasted peanuts."
+	color = "#ba8002"
+	taste_description = "smoky peanut oil"
+	taste_mult = 1
+	condiment_name = "peanut oil"
+	condiment_desc = "Tasteful and rich peanut oil used in cooking. Made from roasted peanuts."
+	condiment_icon_state = "peanutoil"
 
 /decl/reagent/nutriment/honey
 	name = "Honey"
@@ -462,6 +471,35 @@
 	color = "#801E28"
 	taste_description = "cherry"
 	taste_mult = 1.3
+	condiment_name = "cherry jelly jar"
+	condiment_desc = "Great with peanut butter!"
+	condiment_icon_state = "jellyjar"
+	condiment_center_of_mass = list("x"=16, "y"=8)
+
+/decl/reagent/nutriment/peanutbutter
+	name = "Peanut Butter"
+	description = "Clearer the better spread, exception for those who are deathly allergic."
+	reagent_state = LIQUID
+	nutriment_factor = 5
+	color = "#AD7937"
+	taste_description = "peanut butter"
+	taste_mult = 2
+	condiment_name = "peanut butter jar"
+	condiment_desc = "Great with jelly!"
+	condiment_icon_state = "pbjar"
+	condiment_center_of_mass = list("x"=16, "y"=8)
+
+/decl/reagent/nutriment/groundpeanuts
+	name = "Ground Roasted Peanuts"
+	description = "Roughly ground roasted peanuts."
+	reagent_state = SOLID
+	nutriment_factor = 5
+	color = "#AD7937"
+	taste_description = "roasted peanuts"
+	taste_mult = 2
+	condiment_name = "ground roasted peanuts sack"
+	condiment_icon_state = "peanut_sack"
+	condiment_center_of_mass = list("x"=16, "y"=8)
 
 /decl/reagent/nutriment/virusfood
 	name = "Virus Food"
@@ -530,6 +568,18 @@
 	condiment_name = "garlic sauce"
 	condiment_desc = "Perfect for repelling vampires and/or potential dates."
 
+/decl/reagent/nutriment/mayonnaise
+	name = "Mayonnaise"
+	description = "Mayonnaise, a staple classic for sandwiches."
+	taste_description = "mayonnaise"
+	reagent_state = LIQUID
+	nutriment_factor = 4
+	color = "#F0EBD8"
+	condiment_name = "mayonnaise"
+	condiment_desc = "Great for sandwiches!"
+	condiment_icon_state = "mayojar"
+	condiment_center_of_mass = list("x"=16, "y"=8)
+
 /* Non-food stuff like condiments */
 
 /decl/reagent/sodiumchloride
@@ -4734,7 +4784,7 @@
 
 /decl/reagent/drink/hrozamal_soda
 	name = "Hro'zamal Soda"
-	description = "A cabornated version of the herbal tea made with Hro'zamal Ras'Nifs powder."
+	description = "A carbonated version of the herbal tea made with Hro'zamal Ras'Nifs powder."
 	color = "#F0C56C"
 	adj_sleepy = -1
 	caffeine = 0.2
@@ -4743,7 +4793,7 @@
 
 	glass_icon_state = "hrozamal_soda_glass"
 	glass_name = "glass of Hro'zamal Soda"
-	glass_desc = "A cabornated version of the herbal tea made with Hro'zamal Ras'Nifs powder."
+	glass_desc = "A carbonated version of the herbal tea made with Hro'zamal Ras'Nifs powder."
 
 /decl/reagent/nutriment/vanilla
 	name = "Vanilla Extract"

code/modules/reagents/Chemistry-Recipes.dm

@@ -1551,6 +1551,20 @@
 	required_reagents = list(/decl/reagent/drink/garlicjuice = 1, /decl/reagent/nutriment/triglyceride/oil/corn = 1)
 	result_amount = 2
 
+/datum/chemical_reaction/peanutbutter // Yes, this doesn't make sense. No, I don't know how to do this better
+	name = "Peanut Butter"
+	id = "peanutbutter"
+	result = /decl/reagent/nutriment/peanutbutter
+	required_reagents = list(/decl/reagent/nutriment/groundpeanuts = 5, /decl/reagent/sugar = 1, /decl/reagent/sodiumchloride = 1)
+	result_amount = 5
+
+/datum/chemical_reaction/mayonnaise
+	name = "Mayonnaise"
+	id = "mayonnaise"
+	result = /decl/reagent/nutriment/mayonnaise
+	required_reagents = list(/decl/reagent/nutriment/protein/egg = 3, /decl/reagent/drink/lemonjuice = 2, /decl/reagent/nutriment/triglyceride/oil/corn = 10)
+	result_amount = 15
+
 /datum/chemical_reaction/cheesewheel
 	name = "Cheesewheel"
 	id = "cheesewheel"

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -1920,6 +1920,16 @@
 	reagent_data = list(/decl/reagent/nutriment = list("bread" = 3, "cheese" = 3))
 	bitesize = 2
 
+/obj/item/reagent_containers/food/snacks/reubensandwich
+	name = "reuben sandwich"
+	desc = "A toasted sandwich packed with savory, meat and sour goodness!"
+	icon_state = "reubensandwich"
+	filling_color = "#BF8E60"
+	reagents_to_add = list(/decl/reagent/nutriment = 8, /decl/reagent/nutriment/protein = 4, /decl/reagent/nutriment/ketchup = 2, /decl/reagent/nutriment/mayonnaise = 2)
+	reagent_data = list(/decl/reagent/nutriment = list("a savory blend of sweet and salty ingredients" = 6, "toasted bread" = 2))
+	bitesize = 3
+	trash = /obj/item/trash/plate
+
 /obj/item/reagent_containers/food/snacks/toastedsandwich
 	name = "toasted sandwich"
 	desc = "Now if you only had a pepper bar."
@@ -1931,6 +1941,39 @@
 	reagent_data = list(/decl/reagent/nutriment = list("toasted bread" = 3, "cheese" = 3))
 	bitesize = 2
 
+/obj/item/reagent_containers/food/snacks/toast
+	name = "toasted bread"
+	desc = "Plain, but consistent and reliable toast."
+	icon_state = "toast"
+	item_state = "toast"
+	slot_flags = SLOT_MASK
+	contained_sprite = TRUE
+	trash = /obj/item/trash/plate
+	filling_color = "#D9BE29"
+	reagents_to_add = list(/decl/reagent/nutriment = 2)
+	reagent_data = list(/decl/reagent/nutriment = list("toasted bread" = 2))
+	bitesize = 1
+
+/obj/item/reagent_containers/food/snacks/egginthebasket
+	name = "egg in the basket"
+	desc = "Egg in the basket, also known as <i>egg in a hole</i>, or <i>bullseye egg</i>, or <i>egg in a nest</i>, or <i>framed egg</i>, or..."
+	icon_state = "egginthebasket"
+	trash = /obj/item/trash/plate
+	filling_color = "#D9BE29"
+	reagents_to_add = list(/decl/reagent/nutriment = 2)
+	reagent_data = list(/decl/reagent/nutriment = list("toasted bread" = 2))
+	bitesize = 2
+
+/obj/item/reagent_containers/food/snacks/garlicbread
+	name = "garlic bread"
+	desc = "Delicious garlic bread, but you probably shouldn't eat it for every meal."
+	icon_state = "garlicbread"
+	trash = /obj/item/trash/plate
+	filling_color = "#D9BE29"
+	reagents_to_add = list(/decl/reagent/nutriment = 5, /decl/reagent/nutriment/garlicsauce = 3)
+	reagent_data = list(/decl/reagent/nutriment = list("toasted bread" = 2, "flavorful butter" = 3))
+	bitesize = 3
+
 /obj/item/reagent_containers/food/snacks/grilledcheese
 	name = "grilled cheese sandwich"
 	desc = "Goes great with Tomato soup!"
@@ -1999,6 +2042,17 @@
 
 /obj/item/reagent_containers/food/snacks/jelliedtoast/slime/reagents_to_add = list(/decl/reagent/slimejelly = 5)
 
+/obj/item/reagent_containers/food/snacks/pbtoast
+	name = "peanut butter toast"
+	desc = "A slice of bread covered with appetizing peanut butter."
+	icon_state = "pbtoast"
+	trash = /obj/item/trash/plate
+	filling_color = "#B572AB"
+	center_of_mass = list("x"=16, "y"=8)
+	reagents_to_add = list(/decl/reagent/nutriment = 1)
+	reagent_data = list(/decl/reagent/nutriment = list("toasted bread" = 2))
+	bitesize = 2
+
 /obj/item/reagent_containers/food/snacks/burger/jelly
 	name = "jelly burger"
 	desc = "Culinary delight..?"
@@ -2181,6 +2235,16 @@
 
 /obj/item/reagent_containers/food/snacks/jellysandwich/cherry/reagents_to_add = list(/decl/reagent/nutriment/cherryjelly = 5)
 
+/obj/item/reagent_containers/food/snacks/pbjsandwich
+	name = "pbj sandwich"
+	desc = "A staple classic lunch of gooey jelly and peanut butter."
+	icon_state = "pbjsandwich"
+	trash = /obj/item/trash/plate
+	filling_color = "#BB6A54"
+	reagents_to_add = list(/decl/reagent/nutriment = 2)
+	reagent_data = list(/decl/reagent/nutriment = list("bread" = 2))
+	bitesize = 2	
+
 /obj/item/reagent_containers/food/snacks/mint
 	name = "mint"
 	desc = "It is only wafer thin."
@@ -4291,6 +4355,25 @@
 	reagent_data = list(/decl/reagent/nutriment = list("guacmole" = 20))
 	filling_color = "#35961D"
 
+// Roasted Peanuts (under chips/nachos because finger food)
+/obj/item/reagent_containers/food/snacks/roasted_peanut
+	name = "roasted peanut"
+	desc = "A singular roasted peanut. How peanut-ful."
+	icon_state = "roast_peanut"
+	bitesize = 2
+	filling_color = "#D89E37"
+
+/obj/item/reagent_containers/food/snacks/chipplate/peanuts_bowl
+	name = "bowl of roasted peanuts"
+	desc = "Peanuts roasted to flavourful and rich perfection."
+	icon_state = "roast_peanuts_bowl"
+	trash = /obj/item/trash/dipbowl
+	vendingobject = /obj/item/reagent_containers/food/snacks/roasted_peanut
+	bitesize = 4
+	reagents_to_add = list(/decl/reagent/nutriment/groundpeanuts = 15, /decl/reagent/nutriment/triglyceride/oil/peanut = 5)
+	unitname = "roasted peanut"
+	filling_color = "#D89E37"
+
 //burritos
 /obj/item/reagent_containers/food/snacks/burrito
 	name = "meat burrito"
@@ -5336,3 +5419,13 @@
 	reagents_to_add = list(/decl/reagent/toxin/phoron = 25)
 	bitesize = 5
 	trash = /obj/item/trash/phoroncandy
+
+/obj/item/reagent_containers/food/snacks/sauerkraut
+	name = "sauerkraut"
+	desc = "Finely cut and fermented cabbage. A light pickled delight!"
+	icon_state = "sauerkraut"
+	filling_color = "#EBE699"
+	reagents_to_add = list(/decl/reagent/nutriment = 4)
+	reagent_data = list(/decl/reagent/nutriment = list("pickled lettuce" = 4))
+	bitesize = 2
+	trash = /obj/item/trash/plate

code/modules/reagents/reagent_containers/food/snacks/meat.dm

@@ -52,8 +52,8 @@
 	reagents_to_add = list(/decl/reagent/nutriment/protein = 6, /decl/reagent/nutriment/triglyceride = 4)
 
 /obj/item/reagent_containers/food/snacks/meat/biogenerated
-	name = "bio meat"
-	desc = "Did this come from the Biogenerator, or is it a biohazard? Perhaps it is both."
+	name = "meat substitute"
+	desc = "A slab of extruded plant bits that pretends to be meat."
 	icon_state = "plantmeat"
 	filling_color = "#A8AA00"
 	reagents_to_add = list(/decl/reagent/nutriment = 6)
@@ -99,4 +99,4 @@
 	name = "bat wings"
 	desc = "Like chicken wings, but with even less meat!"
 	icon_state = "batmeat"
-	reagents_to_add = list(/decl/reagent/nutriment/protein = 1) 
+	reagents_to_add = list(/decl/reagent/nutriment/protein = 1)

code/modules/reagents/reagent_containers/inhaler.dm

@@ -154,103 +154,114 @@
 /obj/item/reagent_containers/inhaler/dexalin
 	name_label = "dexalin"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains dexalin."
+	flags = 0
 
-	Initialize()
-		. =..()
-		reagents.add_reagent(/decl/reagent/dexalin, volume)
-		update_icon()
-		return
+/obj/item/reagent_containers/inhaler/dexalin/Initialize()
+	. =..()
+	reagents.add_reagent(/decl/reagent/dexalin, volume)
+	update_icon()
+	return
 
 /obj/item/reagent_containers/inhaler/peridaxon
 	name_label = "peridaxon"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains peridaxon."
+	flags = 0
 
-	Initialize()
-		. =..()
-		reagents.add_reagent(/decl/reagent/peridaxon, volume)
-		update_icon()
-		return
+/obj/item/reagent_containers/inhaler/peridaxon/Initialize()
+	. =..()
+	reagents.add_reagent(/decl/reagent/peridaxon, volume)
+	update_icon()
+	return
 
 /obj/item/reagent_containers/inhaler/hyperzine
 	name_label = "hyperzine"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains hyperzine."
+	flags = 0
 
-	Initialize()
-		. =..()
-		reagents.add_reagent(/decl/reagent/hyperzine, volume)
-		update_icon()
-		return
+/obj/item/reagent_containers/inhaler/hyperzine/Initialize()
+	. =..()
+	reagents.add_reagent(/decl/reagent/hyperzine, volume)
+	update_icon()
+	return
 
 /obj/item/reagent_containers/inhaler/phoron
 	name_label = "phoron"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains phoron."
+	flags = 0
 
-	Initialize()
-		. =..()
-		reagents.add_reagent(/decl/reagent/toxin/phoron, volume)
-		update_icon()
-		return
+/obj/item/reagent_containers/inhaler/phoron/Initialize()
+	. =..()
+	reagents.add_reagent(/decl/reagent/toxin/phoron, volume)
+	update_icon()
+	return
 
 /obj/item/reagent_containers/inhaler/phoron_special
 	name = "vaurca autoinhaler (phoron)"
 	desc = "A strange device that contains some sort of heavy-duty bag and mouthpiece combo."
 	icon_state = "anthaler1"
-	var/empty_state = "anthaler0"
+	flags = 0
 	volume = 10
-	Initialize()
-		. =..()
-		reagents.add_reagent(/decl/reagent/toxin/phoron, volume)
-		update_icon()
-		return
+	var/empty_state = "anthaler0"
+
+/obj/item/reagent_containers/inhaler/phoron_special/Initialize()
+	. =..()
+	reagents.add_reagent(/decl/reagent/toxin/phoron, volume)
+	update_icon()
+	return
 
 /obj/item/reagent_containers/inhaler/soporific
 	name_label = "soporific"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains soporific."
 	volume = 10
+	flags = 0
 
-	Initialize()
-		. =..()
-		reagents.add_reagent(/decl/reagent/soporific, volume)
-		update_icon()
-		return
+/obj/item/reagent_containers/inhaler/soporific/Initialize()
+	. =..()
+	reagents.add_reagent(/decl/reagent/soporific, volume)
+	update_icon()
+	return
 
 /obj/item/reagent_containers/inhaler/space_drugs
 	name_label = "space drugs"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains space drugs."
+	flags = 0
 
-	Initialize()
-		. =..()
-		reagents.add_reagent(/decl/reagent/space_drugs, volume)
-		update_icon()
-		return
+/obj/item/reagent_containers/inhaler/space_drugs/Initialize()
+	. =..()
+	reagents.add_reagent(/decl/reagent/space_drugs, volume)
+	update_icon()
+	return
 
 /obj/item/reagent_containers/inhaler/ammonia
 	name_label = "ammonia"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains ammonia."
+	flags = 0
 
-	Initialize()
-		. =..()
-		reagents.add_reagent(/decl/reagent/ammonia, volume)
-		update_icon()
-		return
+/obj/item/reagent_containers/inhaler/ammonia/Initialize()
+	. =..()
+	reagents.add_reagent(/decl/reagent/ammonia, volume)
+	update_icon()
+	return
 
 /obj/item/reagent_containers/inhaler/pulmodeiectionem
 	name_label = "pulmodeiectionem"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains pulmodeiectionem."
+	flags = 0
 
-	Initialize()
-		. =..()
-		reagents.add_reagent(/decl/reagent/pulmodeiectionem, volume)
-		update_icon()
-		return
+/obj/item/reagent_containers/inhaler/pulmodeiectionem/Initialize()
+	. =..()
+	reagents.add_reagent(/decl/reagent/pulmodeiectionem, volume)
+	update_icon()
+	return
 
 /obj/item/reagent_containers/inhaler/pneumalin
 	name_label = "pneumalin"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains pneumalin."
 	volume = 10
+	flags = 0
 
-	Initialize()
-		. =..()
-		reagents.add_reagent(/decl/reagent/pneumalin, volume)
-		update_icon()
-		return
+/obj/item/reagent_containers/inhaler/pneumalin/Initialize()
+	. =..()
+	reagents.add_reagent(/decl/reagent/pneumalin, volume)
+	update_icon()
+	return

code/modules/reagents/reagent_containers/syringes.dm

@@ -251,8 +251,6 @@
 					user.visible_message("<b>[user]</b> fumbles with \the [src]!", SPAN_NOTICE("You fumble with \the [src]!"))
 					return
 
-				user.visible_message(SPAN_WARNING("[user] injects [target] with the syringe!"))
-
 			var/trans
 			if(ismob(target))
 				var/contained = reagentlist()
@@ -261,7 +259,7 @@
 				admin_inject_log(user, target, src, contained, reagents.get_temperature(), trans)
 			else
 				trans = reagents.trans_to(target, amount_per_transfer_from_this)
-			to_chat(user, SPAN_NOTICE("You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units."))
+			user.visible_message(SPAN_WARNING("[user] injects [target] with \the [src]!"),SPAN_NOTICE("You inject [trans] units of the solution. \The [src] now contains [src.reagents.total_volume] units."),2)
 			if (reagents.total_volume <= 0 && mode == SYRINGE_INJECT)
 				mode = SYRINGE_DRAW
 				update_icon()