Merge pull request #6085 from Fox-McCloud/food-rework

Food rework

code/modules/reagents/chemistry/reagents.dm

@@ -73,7 +73,7 @@
 
 /datum/reagent/proc/on_mob_life(mob/living/M)
 	current_cycle++
-	holder.remove_reagent(id, metabolization_rate) //By default it slowly disappears.
+	holder.remove_reagent(id, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
 
 /datum/reagent/proc/on_mob_death(mob/living/M)	//use this to have chems have a "death-triggered" effect
 	return

code/modules/reagents/chemistry/reagents/alcohol.dm

@@ -37,7 +37,7 @@
 	name = "Beer"
 	id = "beer"
 	description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
-	nutriment_factor = 2 * REAGENTS_METABOLISM
+	nutriment_factor = 1 * REAGENTS_METABOLISM
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.2
 	drink_icon ="beerglass"
@@ -49,6 +49,7 @@
 	id = "cider"
 	description = "An alcoholic beverage derived from apples."
 	color = "#174116"
+	nutriment_factor = 1 * REAGENTS_METABOLISM
 	alcohol_perc = 0.2
 	drink_icon = "rewriter"
 	drink_name = "Cider"
@@ -217,6 +218,7 @@
 	description = "A potent mixture of caffeine and alcohol."
 	reagent_state = LIQUID
 	color = "#102000" // rgb: 16, 32, 0
+	nutriment_factor = 1 * REAGENTS_METABOLISM
 	alcohol_perc = 0.3
 	heart_rate_increase = 1
 	drink_icon = "thirteen_loko_glass"
@@ -240,6 +242,7 @@
 	description = "This appears to be beer mixed with milk. Disgusting."
 	reagent_state = LIQUID
 	color = "#895C4C" // rgb: 137, 92, 76
+	nutriment_factor = 2 * REAGENTS_METABOLISM
 	alcohol_perc = 0.2
 	drink_icon = "glass_brown"
 	drink_name = "Glass of bilk"
@@ -714,6 +717,7 @@
 	description = "A Vikings drink, though a cheap one."
 	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
+	nutriment_factor = 1 * REAGENTS_METABOLISM
 	alcohol_perc = 0.2
 	drink_icon = "meadglass"
 	drink_name = "Mead"

code/modules/reagents/chemistry/reagents/drinks.dm

@@ -213,7 +213,7 @@
 	name = "Hot Chocolate"
 	id = "hot_coco"
 	description = "Made with love! And coco beans."
-	nutriment_factor = 2 * REAGENTS_METABOLISM
+	nutriment_factor = 3 * REAGENTS_METABOLISM
 	color = "#403010" // rgb: 64, 48, 16
 	adj_temp_hot = 5
 	drink_icon = "hot_coco"
@@ -225,6 +225,7 @@
 	id = "coffee"
 	description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant."
 	color = "#482000" // rgb: 72, 32, 0
+	nutriment_factor = 0
 	adj_dizzy = -5
 	adj_drowsy = -3
 	adj_sleepy = -2
@@ -307,6 +308,7 @@
 	id = "tea"
 	description = "Tasty black tea: It has antioxidants. It's good for you!"
 	color = "#101000" // rgb: 16, 16, 0
+	nutriment_factor = 0
 	adj_dizzy = -2
 	adj_drowsy = -1
 	adj_sleepy = -3

code/modules/reagents/chemistry/reagents/food.dm

@@ -21,7 +21,7 @@
 	id = "nutriment"
 	description = "A questionable mixture of various pure nutrients commonly found in processed foods."
 	reagent_state = SOLID
-	nutriment_factor = 12 * REAGENTS_METABOLISM
+	nutriment_factor = 15 * REAGENTS_METABOLISM
 	color = "#664330" // rgb: 102, 67, 48
 
 /datum/reagent/consumable/nutriment/on_mob_life(mob/living/M)
@@ -42,14 +42,12 @@
 	name = "Protein"
 	id = "protein"
 	description = "Various essential proteins and fats commonly found in animal flesh and blood."
-	nutriment_factor = 15 * REAGENTS_METABOLISM
 	diet_flags = DIET_CARN | DIET_OMNI
 
 /datum/reagent/consumable/nutriment/plantmatter		// Plant-based biomatter, digestable by herbivores and omnivores, worthless to carnivores
 	name = "Plant-matter"
 	id = "plantmatter"
 	description = "Vitamin-rich fibers and natural sugars commonly found in fresh produce."
-	nutriment_factor = 15 * REAGENTS_METABOLISM
 	diet_flags = DIET_HERB | DIET_OMNI
 
 /datum/reagent/consumable/vitamin
@@ -63,6 +61,8 @@
 	if(prob(50))
 		M.adjustBruteLoss(-1)
 		M.adjustFireLoss(-1)
+	if(M.satiety < 600)
+		M.satiety += 30
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		if(H.species.exotic_blood)
@@ -72,6 +72,38 @@
 				H.vessel.add_reagent("blood", 0.5)
 	..()
 
+/datum/reagent/consumable/sugar
+	name = "Sugar"
+	id = "sugar"
+	description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
+	reagent_state = SOLID
+	color = "#FFFFFF" // rgb: 255, 255, 255
+	nutriment_factor = 5 * REAGENTS_METABOLISM
+	overdose_threshold = 200 // Hyperglycaemic shock
+
+/datum/reagent/consumable/sugar/on_mob_life(mob/living/M)
+	M.AdjustDrowsy(-5)
+	if(current_cycle >= 90)
+		M.AdjustJitter(2)
+	if(prob(50))
+		M.AdjustParalysis(-1)
+		M.AdjustStunned(-1)
+		M.AdjustWeakened(-1)
+	if(prob(4))
+		M.reagents.add_reagent("epinephrine", 1.2)
+	..()
+
+/datum/reagent/consumable/sugar/overdose_start(mob/living/M)
+	to_chat(M, "<span class='danger'>You pass out from hyperglycemic shock!</span>")
+	M.emote("collapse")
+	..()
+
+/datum/reagent/consumable/sugar/overdose_process(mob/living/M, severity)
+	M.Paralyse(3 * severity)
+	M.Weaken(4 * severity)
+	if(prob(8))
+		M.adjustToxLoss(severity)
+
 /datum/reagent/consumable/soysauce
 	name = "Soysauce"
 	id = "soysauce"
@@ -351,6 +383,7 @@
 	id = "rice"
 	description = "Enjoy the great taste of nothing."
 	reagent_state = SOLID
+	nutriment_factor = 3 * REAGENTS_METABOLISM
 	color = "#FFFFFF" // rgb: 0, 0, 0
 
 /datum/reagent/consumable/cherryjelly
@@ -409,9 +442,10 @@
 	description = "A sweet substance produced by bees through partial digestion. Bee barf."
 	reagent_state = LIQUID
 	color = "#d3a308"
+	nutriment_factor = 15 * REAGENTS_METABOLISM
 
 /datum/reagent/consumable/honey/on_mob_life(mob/living/M)
-	M.reagents.add_reagent("sugar", 0.4)
+	M.reagents.add_reagent("sugar", 3)
 	if(prob(20))
 		M.adjustBruteLoss(-3)
 		M.adjustFireLoss(-1)
@@ -671,37 +705,6 @@
 
 ///Food Related, but non-nutritious
 
-/datum/reagent/sugar
-	name = "Sugar"
-	id = "sugar"
-	description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
-	reagent_state = SOLID
-	color = "#FFFFFF" // rgb: 255, 255, 255
-	overdose_threshold = 200 // Hyperglycaemic shock
-
-/datum/reagent/sugar/on_mob_life(mob/living/M)
-	M.AdjustDrowsy(-5)
-	if(current_cycle >= 90)
-		M.AdjustJitter(2)
-	if(prob(50))
-		M.AdjustParalysis(-1)
-		M.AdjustStunned(-1)
-		M.AdjustWeakened(-1)
-	if(prob(4))
-		M.reagents.add_reagent("epinephrine", 1.2)
-	..()
-
-/datum/reagent/sugar/overdose_start(mob/living/M)
-	to_chat(M, "<span class='danger'>You pass out from hyperglycemic shock!</span>")
-	M.emote("collapse")
-	..()
-
-/datum/reagent/sugar/overdose_process(mob/living/M, severity)
-	M.Paralyse(3 * severity)
-	M.Weaken(4 * severity)
-	if(prob(8))
-		M.adjustToxLoss(severity)
-
 /datum/reagent/questionmark // food poisoning
 	name = "????"
 	id = "????"

code/modules/reagents/chemistry/reagents/medicine.dm

@@ -2,6 +2,10 @@
 	name = "Medicine"
 	id = "medicine"
 
+/datum/reagent/medicine/on_mob_life(mob/living/M)
+	current_cycle++
+	holder.remove_reagent(id, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
+
 /datum/reagent/medicine/hydrocodone
 	name = "Hydrocodone"
 	id = "hydrocodone"