Merge branch 'master' into upstream-merge-8298

code/modules/reagents/reactions/instant/food.dm

@@ -67,6 +67,7 @@
 	id = "cookingoilpeanut"
 	result = "cookingoil"
 	required_reagents = list("peanutoil" = 10)
+	inhibitors = list("sugar" = 1, "sodiumchloride" = 1)
 	catalysts = list("enzyme" = 5)
 	result_amount = 10
 

code/modules/reagents/reagents/_reagents.dm

@@ -25,7 +25,7 @@
 
 	var/affects_dead = 0	// Does this chem process inside a corpse?
 	var/affects_robots = 0	// Does this chem process inside a Synth?
-	
+
 	var/allergen_type		// What potential allergens does this contain?
 	var/allergen_factor = 1	// If the potential allergens are mixed and low-volume, they're a bit less dangerous. Needed for drinks because they're a single reagent compared to food which contains multiple seperate reagents.
 
@@ -117,23 +117,28 @@
 			else
 				var/obj/item/organ/internal/heart/machine/Pump = H.internal_organs_by_name[O_PUMP]
 				var/obj/item/organ/internal/stomach/machine/Cycler = H.internal_organs_by_name[O_CYCLER]
+				var/obj/item/organ/internal/nano/refactory/Refactory = H.internal_organs_by_name[O_FACT]		//VOREStation Addition: Proteans
 
 				if(active_metab.metabolism_class == CHEM_BLOOD)
 					if(Pump)
 						removed *= 1.1 - Pump.damage / Pump.max_damage
+					else if(Refactory)		//VOREStation Addition: Proteans
+						removed *= 1.1 - Refactory.damage / Refactory.max_damage
 					else
 						removed *= 0.1
 
 				else if(active_metab.metabolism_class == CHEM_INGEST)	// If the pump is damaged, we waste chems from the tank.
 					if(Pump)
 						ingest_abs_mult *= max(0.25, 1 - Pump.damage / Pump.max_damage)
-
+					else if(Refactory)		//VOREStation Addition: Proteans
+						ingest_abs_mult *= max(0.25, 1 - Refactory.damage / Refactory.max_damage)
 					else
 						ingest_abs_mult *= 0.2
 
 					if(Cycler)	// If we're damaged, we empty our tank slower.
 						ingest_rem_mult = max(0.1, 1 - (Cycler.damage / Cycler.max_damage))
-
+					else if(Refactory)		//VOREStation Addition: Proteans
+						ingest_rem_mult = max(0.1, 1 - (Refactory.damage / Refactory.max_damage))
 					else
 						ingest_rem_mult = 0.1
 
@@ -165,9 +170,9 @@
 				affect_touch(M, alien, removed)
 	if(overdose && (volume > overdose * M?.species.chemOD_threshold) && (active_metab.metabolism_class != CHEM_TOUCH && !can_overdose_touch))
 		overdose(M, alien, removed)
-	if(M.species.allergens & allergen_type)	//uhoh, we can't handle this!	
+	if(M.species.allergens & allergen_type)	//uhoh, we can't handle this!
 		var/damage_severity = M.species.allergen_damage_severity*allergen_factor
-		var/disable_severity = M.species.allergen_disable_severity*allergen_factor	
+		var/disable_severity = M.species.allergen_disable_severity*allergen_factor
 		if(M.species.allergen_reaction & AG_TOX_DMG)
 			M.adjustToxLoss(damage_severity)
 		if(M.species.allergen_reaction & AG_OXY_DMG)

code/modules/reagents/reagents/food_drinks.dm

@@ -43,7 +43,7 @@
 		return
 	affect_ingest(M, alien, removed)
 	//VOREStation Edits Start
-	if(M.isSynthetic() && M.nutrition < 500)
+	if(M.isSynthetic())
 		M.adjust_nutrition((nutriment_factor * removed) * M.species.synthetic_food_coeff)
 	//VOREStation Edits End
 	..()
@@ -60,6 +60,9 @@
 			M.heal_organ_damage(0.5 * removed, 0)
 			M.adjust_nutrition((nutriment_factor * removed) * M.species.organic_food_coeff)
 			M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
+	else
+		M.adjust_nutrition((nutriment_factor * removed) * M.species.synthetic_food_coeff)
+
 	//VOREStation Edits Stop
 
 // Aurora Cooking Port Insertion Begin
@@ -71,6 +74,8 @@
 	Generally coatings are intended for deep frying foods
 */
 /datum/reagent/nutriment/coating
+	name = "coating"
+	id = "coating"
 	nutriment_factor = 6 //Less dense than the food itself, but coatings still add extra calories
 	var/messaged = 0
 	var/icon_raw