Merge branch 'master' into master

2019-07-06 16:03:17 +01:00
parent 7fa072030b bd675d3bae
commit cc39c9f896
34 changed files with 248 additions and 34 deletions
@@ -441,6 +441,14 @@
 		. = 1
 	..()

+/datum/reagent/consumable/peanut_butter
+	name = "Peanut Butter"
+	id = "peanut_butter"
+	description = "A popular food paste made from ground dry-roasted peanuts."
+	color = "#C29261"
+	nutriment_factor = 15 * REAGENTS_METABOLISM
+	taste_description = "peanuts"
+
 /datum/reagent/consumable/cornoil
 	name = "Corn Oil"
 	id = "cornoil"