Fermi1

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -398,8 +398,8 @@
 	OptimalTempMin 		= 200 // Lower area of bell curve for determining heat based rate reactions
 	OptimalTempMax		= 950 // Upper end for above
 	ExplodeTemp			= 999 //Temperature at which reaction explodes
-	OptimalpHMin		= 2 // Lowest value of pH determining pH a 1 value for pH based rate reactions (Plateu phase)
-	OptimalpHMax		= 3 // Higest value for above
+	OptimalpHMin		= 4.6 // Lowest value of pH determining pH a 1 value for pH based rate reactions (Plateu phase)
+	OptimalpHMax		= 5.2 // Higest value for above
 	ReactpHLim			= 5 // How far out pH wil react, giving impurity place (Exponential phase)
 	CatalystFact		= 0 // How much the catalyst affects the reaction (0 = no catalyst)
 	CurveSharpT 		= 2 // How sharp the temperature exponential curve is (to the power of value)

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -307,6 +307,7 @@
 	emote_see = list("looks at you eagerly for pets!", "wiggles enthusiastically.")
 	gold_core_spawnable = NO_SPAWN
 	var/pseudo_death = FALSE
+	var/mob/living/carbon/human/origin = null
 
 /mob/living/simple_animal/pet/cat/custom_cat/death()
 	if (pseudo_death == TRUE) //secret cat chem

code/modules/reagents/chemistry/reagents.dm

@@ -221,4 +221,4 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
 	for (var/datum/reagent/R in reagent_list)
 		rs += "[R.name], [R.volume]"
 
-	return rs.Join(" | ")
+	return rs.Join(" | ")

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -1374,7 +1374,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_icon_state = "neurotoxinglass"
 	glass_name = "Neurotoxin"
 	glass_desc = "A drink that is guaranteed to knock you silly."
-	pH = 4.3
 	//SplitChem			= TRUE
 	impure_chem 			= /datum/reagent/consumable/ethanol/neuroweak
 	inverse_chem_val 		= 0.5 //Clear conversion
@@ -1419,11 +1418,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	name = "Neuro-Smash"
 	description = "A mostly safe alcoholic drink for the true daredevils. Counteracts Neurotoxins."
 	boozepwr = 60
-	quality = DRINK_VERYGOOD
-	taste_description = "a numbing sensation"
-	glass_icon_state = "neurosmashglass"
-	glass_name = "Neurosmash"
-	glass_desc = "A mostly safe alcoholic drink for the true daredevils. Do not mix with Neurotoxin."
 	pH = 8
 	value = 3
 
@@ -1435,7 +1429,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1*REM, 150)
 		M.reagents.remove_reagent(/datum/reagent/toxin/fentanyl, 0.75 * REAGENTS_METABOLISM, FALSE)
 	else
-		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1.0*REM, 150)
+		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -0.5*REM, 150)
 		M.dizziness +=2
 	..()
 
@@ -2186,7 +2180,7 @@ datum/reagent/consumable/ethanol/creme_de_coconut
 	glass_icon_state = "commander_and_chief"
 	glass_name = "Commander and Chief"
 	glass_desc = "The gems of this majestic chalice represent the departments and their Heads."
-	
+
 /datum/reagent/consumable/ethanol/commander_and_chief/on_mob_life(mob/living/carbon/M)
 	if(M.mind && HAS_TRAIT(M.mind, TRAIT_CAPTAIN_METABOLISM))
 		M.heal_bodypart_damage(2,2,2)

code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -12,6 +12,7 @@
 	glass_icon_state = "glass_orange"
 	glass_name = "glass of orange juice"
 	glass_desc = "Vitamins! Yay!"
+	pH = 3.3
 
 /datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/M)
 	if(M.getOxyLoss() && prob(30))
@@ -42,6 +43,7 @@
 	glass_icon_state = "glass_green"
 	glass_name = "glass of lime juice"
 	glass_desc = "A glass of sweet-sour lime juice."
+	pH = 2.2
 
 /datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/M)
 	if(M.getToxLoss() && prob(20))
@@ -117,6 +119,7 @@
 	glass_icon_state  = "lemonglass"
 	glass_name = "glass of lemon juice"
 	glass_desc = "Sour..."
+	pH = 2
 
 /datum/reagent/consumable/strawberryjuice
 	name = "Strawberry Juice"